change-snakecase-to-uppercase-in-enums

Feature #13830

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --git a/src/common/labels.ts b/src/common/labels.ts
index 9567ce14936b7d880ea06a42069feb85b9ab16d3..ed3a43d1427e6622e55c9059cddc7bfbf77eff46 100644 (file)
--- a/src/common/labels.ts
+++ b/src/common/labels.ts
@@ -6,11 +6,11 @@ import { ResourceKind } from "../models/resource";
 
 export const resourceLabel = (type: string) => {
     switch (type) {
-        case ResourceKind.Collection:
+        case ResourceKind.COLLECTION:
             return "Data collection";
-        case ResourceKind.Project:
+        case ResourceKind.PROJECT:
             return "Project";
-        case ResourceKind.Process:
+        case ResourceKind.PROCESS:
             return "Process";
         default:
             return "Unknown";

diff --git a/src/components/data-table/data-column.ts b/src/components/data-table/data-column.ts
index 06744c3a21bce90b9246ed74c06c984f9020cdf7..96ef952493aa895e24b778b22716b024c9ade851 100644 (file)
--- a/src/components/data-table/data-column.ts
+++ b/src/components/data-table/data-column.ts
@@ -17,9 +17,9 @@ export interface DataColumn<T, F extends DataTableFilterItem = DataTableFilterIt
 }
 
 export enum SortDirection {
-    Asc = "asc",
-    Desc = "desc",
-    None = "none"
+    ASC = "asc",
+    DESC = "desc",
+    NONE = "none"
 }
 
 export const isColumnConfigurable = <T>(column: DataColumn<T>) => {
@@ -28,12 +28,12 @@ export const isColumnConfigurable = <T>(column: DataColumn<T>) => {
 
 export const toggleSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
     return column.sortDirection
-        ? column.sortDirection === SortDirection.Asc
-            ? { ...column, sortDirection: SortDirection.Desc }
-            : { ...column, sortDirection: SortDirection.Asc }
+        ? column.sortDirection === SortDirection.ASC
+            ? { ...column, sortDirection: SortDirection.DESC }
+            : { ...column, sortDirection: SortDirection.ASC }
         : column;
 };
 
 export const resetSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
-    return column.sortDirection ? { ...column, sortDirection: SortDirection.None } : column;
+    return column.sortDirection ? { ...column, sortDirection: SortDirection.NONE } : column;
 };

diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx
index 829bc84ebe86aa348c00f8a8f0c4abd2508403eb..f92f97b72f94b74d7da7dc23ff175ceeec225829 100644 (file)
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -74,8 +74,8 @@ export const DataTable = withStyles(styles)(
                         </DataTableFilters>
                         : sortDirection
                             ? <TableSortLabel
-                                active={sortDirection !== SortDirection.None}
-                                direction={sortDirection !== SortDirection.None ? sortDirection : undefined}
+                                active={sortDirection !== SortDirection.NONE}
+                                direction={sortDirection !== SortDirection.NONE ? sortDirection : undefined}
                                 onClick={() =>
                                     onSortToggle &&
                                     onSortToggle(column)}>

diff --git a/src/components/tree/tree.tsx b/src/components/tree/tree.tsx
index 799e821704d4288bc24d972f0c95d5490fdbe153..604ba4923b47b085432da100b580349f8f9079c5 100644 (file)
--- a/src/components/tree/tree.tsx
+++ b/src/components/tree/tree.tsx
@@ -44,9 +44,9 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
 });
 
 export enum TreeItemStatus {
-    Initial,
-    Pending,
-    Loaded
+    INITIAL,
+    PENDING,
+    LOADED
 }
 
 export interface TreeItem<T> {
@@ -80,7 +80,7 @@ export const Tree = withStyles(styles)(
                         <ListItem button className={list} style={{ paddingLeft: (level + 1) * 20 }}
                             onClick={() => toggleItemActive(it.id, it.status)}
                             onContextMenu={this.handleRowContextMenu(it)}>
-                            {it.status === TreeItemStatus.Pending ?
+                            {it.status === TreeItemStatus.PENDING ?
                                 <CircularProgress size={10} className={loader} /> : null}
                             <i onClick={() => this.props.toggleItemOpen(it.id, it.status)}
                                 className={toggableIconContainer}>

diff --git a/src/index.tsx b/src/index.tsx
index 7443aeaeba7ddfccdfbe43f31c355ac76d474370..77d5763b478cc3884d44c644fea7de6e3929a37c 100644 (file)
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -25,10 +25,10 @@ import { projectActionSet } from "./views-components/context-menu/action-sets/pr
 import { resourceActionSet } from './views-components/context-menu/action-sets/resource-action-set';
 import { favoriteActionSet } from "./views-components/context-menu/action-sets/favorite-action-set";
 
-addMenuActionSet(ContextMenuKind.RootProject, rootProjectActionSet);
-addMenuActionSet(ContextMenuKind.Project, projectActionSet);
-addMenuActionSet(ContextMenuKind.Resource, resourceActionSet);
-addMenuActionSet(ContextMenuKind.Favorite, favoriteActionSet);
+addMenuActionSet(ContextMenuKind.ROOT_PROJECT, rootProjectActionSet);
+addMenuActionSet(ContextMenuKind.PROJECT, projectActionSet);
+addMenuActionSet(ContextMenuKind.RESOURCE, resourceActionSet);
+addMenuActionSet(ContextMenuKind.FAVORITE, favoriteActionSet);
 
 fetchConfig()
     .then(config => {

diff --git a/src/models/collection.ts b/src/models/collection.ts
index 2a92594473cac819263e0af8ece34044475ba37f..9cb8bb84f6d0963ac59eaf1db2d3276211ceedd8 100644 (file)
--- a/src/models/collection.ts
+++ b/src/models/collection.ts
@@ -5,7 +5,7 @@
 import { Resource, ResourceKind } from "./resource";
 
 export interface CollectionResource extends Resource {
-    kind: ResourceKind.Collection;
+    kind: ResourceKind.COLLECTION;
     name: string;
     description: string;
     properties: any;

diff --git a/src/models/container-request.ts b/src/models/container-request.ts
index 4e5481570e6844100791c8b27b712a9498622963..d1bcc36c81e9a548e34006c9696e47340a422002 100644 (file)
--- a/src/models/container-request.ts
+++ b/src/models/container-request.ts
@@ -5,13 +5,13 @@
 import { Resource, ResourceKind } from "./resource";
 
 export enum ContainerRequestState {
-    Uncommitted = "Uncommitted",
-    Committed = "Committed",
-    Final = "Final"
+    UNCOMMITTED = "Uncommitted",
+    COMMITTED = "Committed",
+    FINAL = "Final"
 }
 
 export interface ContainerRequestResource extends Resource {
-    kind: ResourceKind.ContainerRequest;
+    kind: ResourceKind.CONTAINER_REQUEST;
     name: string;
     description: string;
     properties: any;

diff --git a/src/models/group.ts b/src/models/group.ts
index d8efae267118b9274754fd9b92155e6a87ec3066..5e8d7a1e0b4a2e76ceaf9c80d035f55417aa55d6 100644 (file)
--- a/src/models/group.ts
+++ b/src/models/group.ts
@@ -5,7 +5,7 @@
 import { Resource, ResourceKind } from "./resource";
 
 export interface GroupResource extends Resource {
-    kind: ResourceKind.Group;
+    kind: ResourceKind.GROUP;
     name: string;
     groupClass: GroupClass | null;
     description: string;
@@ -17,5 +17,5 @@ export interface GroupResource extends Resource {
 }
 
 export enum GroupClass {
-    Project = "project"
+    PROJECT = "project"
 }
\ No newline at end of file

diff --git a/src/models/project.ts b/src/models/project.ts
index 1373ca7d509976d82962efd9cc48f17e07f90aa3..eaf60904609974223e091bb244067e4da9b2b667 100644 (file)
--- a/src/models/project.ts
+++ b/src/models/project.ts
@@ -5,5 +5,5 @@
 import { GroupResource, GroupClass } from "./group";
 
 export interface ProjectResource extends GroupResource {
-    groupClass: GroupClass.Project;
+    groupClass: GroupClass.PROJECT;
 }

diff --git a/src/models/resource.ts b/src/models/resource.ts
index 2d72fbcd82631482e524110da02f723875c6d1f8..6a76b070452146734b2a9f64a36bf3d4eac6ff4f 100644 (file)
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@ -15,10 +15,10 @@ export interface Resource {
 }
 
 export enum ResourceKind {
-    Collection = "arvados#collection",
-    ContainerRequest = "arvados#containerRequest",
-    Group = "arvados#group",
-    Process = "arvados#containerRequest",
-    Project = "arvados#group",
-    Workflow = "arvados#workflow"
+    COLLECTION = "arvados#collection",
+    CONTAINER_REQUEST = "arvados#containerRequest",
+    GROUP = "arvados#group",
+    PROCESS = "arvados#containerRequest",
+    PROJECT = "arvados#group",
+    WORKFLOW = "arvados#workflow"
 }

diff --git a/src/models/test-utils.ts b/src/models/test-utils.ts
index 3f49dba6a3b27990a1161f0918393abf087f4392..6723430c34872848c26a6b9fa8be172b780f5603 100644 (file)
--- a/src/models/test-utils.ts
+++ b/src/models/test-utils.ts
@@ -14,7 +14,7 @@ export const mockGroupResource = (data: Partial<GroupResource> = {}): GroupResou
     groupClass: null,
     href: "",
     isTrashed: false,
-    kind: ResourceKind.Group,
+    kind: ResourceKind.GROUP,
     modifiedAt: "",
     modifiedByClientUuid: "",
     modifiedByUserUuid: "",
@@ -28,7 +28,7 @@ export const mockGroupResource = (data: Partial<GroupResource> = {}): GroupResou
 });
 
 export const mockProjectResource = (data: Partial<ProjectResource> = {}): ProjectResource =>
-    mockGroupResource({ ...data, groupClass: GroupClass.Project }) as ProjectResource;
+    mockGroupResource({ ...data, groupClass: GroupClass.PROJECT }) as ProjectResource;
 
 export const mockCommonResource = (data: Partial<Resource>): Resource => ({
     createdAt: "",

diff --git a/src/models/workflow.ts b/src/models/workflow.ts
index e0a5df4381c2dd8c4ed9c04fddd8b083559ffec3..d644b7909047b0c28db876f3dc1dbe9a96cd0c43 100644 (file)
--- a/src/models/workflow.ts
+++ b/src/models/workflow.ts
@@ -5,7 +5,7 @@
 import { Resource, ResourceKind } from "./resource";
 
 export interface WorkflowResource extends Resource {
-    kind: ResourceKind.Workflow;
+    kind: ResourceKind.WORKFLOW;
     name: string;
     description: string;
     definition: string;

diff --git a/src/services/favorite-service/favorite-order-builder.ts b/src/services/favorite-service/favorite-order-builder.ts
index 33214a0dc8c55ac3fbaa56c0248e9d79f32a6885..0d9a75eb483053ddfc2858124302f958577a9de5 100644 (file)
--- a/src/services/favorite-service/favorite-order-builder.ts
+++ b/src/services/favorite-service/favorite-order-builder.ts
@@ -22,18 +22,18 @@ export class FavoriteOrderBuilder {
     addAsc(attribute: "name") {
         const linkOrder = this.linkOrder.addAsc(attribute);
         const contentOrder = this.contentOrder
-            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Collection).addAsc(attribute))
-            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Process).addAsc(attribute))
-            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Project).addAsc(attribute));
+            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.COLLECTION).addAsc(attribute))
+            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROCESS).addAsc(attribute))
+            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROJECT).addAsc(attribute));
         return FavoriteOrderBuilder.create(linkOrder, contentOrder);
     }
 
     addDesc(attribute: "name") {
         const linkOrder = this.linkOrder.addDesc(attribute);
         const contentOrder = this.contentOrder
-            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Collection).addDesc(attribute))
-            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Process).addDesc(attribute))
-            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Project).addDesc(attribute));
+            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.COLLECTION).addDesc(attribute))
+            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROCESS).addDesc(attribute))
+            .concat(OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROJECT).addDesc(attribute));
         return FavoriteOrderBuilder.create(linkOrder, contentOrder);
     }
 

diff --git a/src/services/groups-service/groups-service.ts b/src/services/groups-service/groups-service.ts
index dfaf11d6e82ccfbc77ad4ba484e7577fa66b4bdf..a0f27a4abbe27f26939e4d5be7c368f580eb9b32 100644 (file)
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -47,7 +47,7 @@ export class GroupsService<T extends GroupResource = GroupResource> extends Comm
 }
 
 export enum GroupContentsResourcePrefix {
-    Collection = "collections",
-    Project = "groups",
-    Process = "container_requests"
+    COLLECTION = "collections",
+    PROJECT = "groups",
+    PROCESS = "container_requests"
 }

diff --git a/src/services/project-service/project-service.ts b/src/services/project-service/project-service.ts
index 7b1640ee021dfc1352816851149bf88a6938e72e..31a2ddd29cef813ea7f991d30db440c66934d506 100644 (file)
--- a/src/services/project-service/project-service.ts
+++ b/src/services/project-service/project-service.ts
@@ -11,7 +11,7 @@ import { FilterBuilder } from "../../common/api/filter-builder";
 export class ProjectService extends GroupsService<ProjectResource> {
 
     create(data: Partial<ProjectResource>) {
-        const projectData = { ...data, groupClass: GroupClass.Project };
+        const projectData = { ...data, groupClass: GroupClass.PROJECT };
         return super.create(projectData);
     }
 
@@ -30,6 +30,6 @@ export class ProjectService extends GroupsService<ProjectResource> {
                 : FilterBuilder.create())
             .concat(FilterBuilder
                 .create<ProjectResource>()
-                .addEqual("groupClass", GroupClass.Project));
+                .addEqual("groupClass", GroupClass.PROJECT));
     }
 }

diff --git a/src/store/data-explorer/data-explorer-reducer.test.tsx b/src/store/data-explorer/data-explorer-reducer.test.tsx
index 5b9f68ffbef75bdaa610cd8836668b326fd45660..c54a86af4aa6a44559d5b7f41624ac483ea6cd2b 100644 (file)
--- a/src/store/data-explorer/data-explorer-reducer.test.tsx
+++ b/src/store/data-explorer/data-explorer-reducer.test.tsx
@@ -25,12 +25,12 @@ describe('data-explorer-reducer', () => {
             name: "Column 1",
             render: jest.fn(),
             selected: true,
-            sortDirection: SortDirection.Asc
+            sortDirection: SortDirection.ASC
         }, {
             name: "Column 2",
             render: jest.fn(),
             selected: true,
-            sortDirection: SortDirection.None,
+            sortDirection: SortDirection.NONE,
         }];
         const state = dataExplorerReducer({ "Data explorer": { ...initialDataExplorer, columns } },
             dataExplorerActions.TOGGLE_SORT({ id: "Data explorer", columnName: "Column 2" }));

diff --git a/src/store/details-panel/details-panel-action.ts b/src/store/details-panel/details-panel-action.ts
index ba330f2e417dde4b07bd64914591258e255f084d..f37907d229a4a3d945c34f06c66c7b8b05c96d45 100644 (file)
--- a/src/store/details-panel/details-panel-action.ts
+++ b/src/store/details-panel/details-panel-action.ts
@@ -28,9 +28,9 @@ export const loadDetails = (uuid: string, kind: ResourceKind) =>
 
 const getService = (kind: ResourceKind) => {
     switch (kind) {
-        case ResourceKind.Project:
+        case ResourceKind.PROJECT:
             return new CommonResourceService(serverApi, "groups");
-        case ResourceKind.Collection:
+        case ResourceKind.COLLECTION:
             return new CommonResourceService(serverApi, "collections");
         default:
             return new CommonResourceService(serverApi, "");

diff --git a/src/store/favorite-panel/favorite-panel-middleware.ts b/src/store/favorite-panel/favorite-panel-middleware.ts
index 0ce13b461c36ed8aaabdec8cf568c5c54473301b..548a117814996519f76c6ee5c9ba83c725df1deb 100644 (file)
--- a/src/store/favorite-panel/favorite-panel-middleware.ts
+++ b/src/store/favorite-panel/favorite-panel-middleware.ts
@@ -67,7 +67,7 @@ export const favoritePanelMiddleware: Middleware = store => next => {
                             limit: dataExplorer.rowsPerPage,
                             offset: dataExplorer.page * dataExplorer.rowsPerPage,
                             order: sortColumn!.name === FavoritePanelColumnNames.NAME
-                                ? sortColumn!.sortDirection === SortDirection.Asc
+                                ? sortColumn!.sortDirection === SortDirection.ASC
                                     ? order.addDesc("name")
                                     : order.addAsc("name")
                                 : order,
@@ -104,14 +104,14 @@ export const favoritePanelMiddleware: Middleware = store => next => {
 const getOrder = (direction: SortDirection) => {
     const order = OrderBuilder.create<LinkResource>();
     const addRule = (builder: OrderBuilder<GroupContentsResource | LinkResource>, direction: SortDirection) =>
-        direction === SortDirection.Asc
+        direction === SortDirection.ASC
             ? builder.addAsc("name")
             : builder.addDesc("name");
 
     return [
-        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Collection),
-        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Process),
-        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Project)
+        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.COLLECTION),
+        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROCESS),
+        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROJECT)
     ].reduce((acc, b) =>
         acc.concat(addRule(b, direction)), addRule(OrderBuilder.create(), direction));
 };

diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts
index 50f6e205e096c3743819a2bc97c75e8537fc0b45..f3f9cafe7f268aa3fed71cff37494218917fd71c 100644 (file)
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -14,8 +14,8 @@ import { Resource, ResourceKind } from "../../models/resource";
 
 export const getResourceUrl = <T extends Resource>(resource: T): string => {
     switch (resource.kind) {
-        case ResourceKind.Project: return `/projects/${resource.uuid}`;
-        case ResourceKind.Collection: return `/collections/${resource.uuid}`;
+        case ResourceKind.PROJECT: return `/projects/${resource.uuid}`;
+        case ResourceKind.COLLECTION: return `/collections/${resource.uuid}`;
         default: return resource.href;
     }
 };
@@ -46,7 +46,7 @@ export const setProjectItem = (itemId: string, itemMode: ItemMode) =>
                 dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM_ACTIVE(treeItem.data.uuid));
             }
 
-            const promise = treeItem.status === TreeItemStatus.Loaded
+            const promise = treeItem.status === TreeItemStatus.LOADED
                 ? Promise.resolve()
                 : dispatch<any>(getProjectList(itemId));
 

diff --git a/src/store/project-panel/project-panel-middleware.ts b/src/store/project-panel/project-panel-middleware.ts
index faa22f0b85a9115165f860159e16f692b5dea508..b7ab03cecab3e74e14f912b45e3eb63b4aacf11d 100644 (file)
--- a/src/store/project-panel/project-panel-middleware.ts
+++ b/src/store/project-panel/project-panel-middleware.ts
@@ -55,7 +55,7 @@ export const projectPanelMiddleware: Middleware = store => next => {
                 const typeFilters = getColumnFilters(columns, ProjectPanelColumnNames.TYPE);
                 const statusFilters = getColumnFilters(columns, ProjectPanelColumnNames.STATUS);
                 const sortColumn = dataExplorer.columns.find(({ sortDirection }) => Boolean(sortDirection && sortDirection !== "none"));
-                const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.Asc ? SortDirection.Asc : SortDirection.Desc;
+                const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC ? SortDirection.ASC : SortDirection.DESC;
                 if (typeFilters.length > 0) {
                     groupsService
                         .contents(state.projects.currentItemId, {
@@ -72,7 +72,7 @@ export const projectPanelMiddleware: Middleware = store => next => {
                                     .create()
                                     .addIsA("uuid", typeFilters.map(f => f.type)))
                                 .concat(FilterBuilder
-                                    .create<ProcessResource>(GroupContentsResourcePrefix.Process)
+                                    .create<ProcessResource>(GroupContentsResourcePrefix.PROCESS)
                                     .addIn("state", statusFilters.map(f => f.type)))
                                 .concat(getSearchFilter(dataExplorer.searchValue))
                         })
@@ -108,20 +108,20 @@ const getColumnFilters = (columns: DataColumns<ProjectPanelItem, ProjectPanelFil
 
 const getOrder = (attribute: "name" | "createdAt", direction: SortDirection) =>
     [
-        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Collection),
-        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Process),
-        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Project)
+        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.COLLECTION),
+        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROCESS),
+        OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROJECT)
     ].reduce((acc, b) =>
-        acc.concat(direction === SortDirection.Asc
+        acc.concat(direction === SortDirection.ASC
             ? b.addAsc(attribute)
             : b.addDesc(attribute)), OrderBuilder.create());
 
 const getSearchFilter = (searchValue: string) =>
     searchValue
         ? [
-            FilterBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Collection),
-            FilterBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Process),
-            FilterBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Project)]
+            FilterBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.COLLECTION),
+            FilterBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROCESS),
+            FilterBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.PROJECT)]
             .reduce((acc, b) =>
                 acc.concat(b.addILike("name", searchValue)), FilterBuilder.create())
         : FilterBuilder.create();

diff --git a/src/store/project/project-reducer.test.ts b/src/store/project/project-reducer.test.ts
index c8eed87c71a70bec3bdbcd7157b569d7fc660552..ca139e66117fd070c03c6e5846b0a6a50dfc6da9 100644 (file)
--- a/src/store/project/project-reducer.test.ts
+++ b/src/store/project/project-reducer.test.ts
@@ -136,7 +136,7 @@ describe("findTreeBranch", () => {
         active: false,
         data: "",
         open: false,
-        status: TreeItemStatus.Initial
+        status: TreeItemStatus.INITIAL
     });
 
     it("should return an array that matches path to the given item", () => {

diff --git a/src/store/project/project-reducer.ts b/src/store/project/project-reducer.ts
index 94a451a86574e70de24f6d143ede7217ce25cf9c..fa92f5f2349d8185992a8dcdefff9f1c063258f5 100644 (file)
--- a/src/store/project/project-reducer.ts
+++ b/src/store/project/project-reducer.ts
@@ -73,14 +73,14 @@ function updateProjectTree(tree: Array<TreeItem<ProjectResource>>, projects: Pro
     if (parentItemId) {
         treeItem = findTreeItem(tree, parentItemId);
         if (treeItem) {
-            treeItem.status = TreeItemStatus.Loaded;
+            treeItem.status = TreeItemStatus.LOADED;
         }
     }
     const items = projects.map(p => ({
         id: p.uuid,
         open: false,
         active: false,
-        status: TreeItemStatus.Initial,
+        status: TreeItemStatus.INITIAL,
         data: p,
         items: []
     } as TreeItem<ProjectResource>));
@@ -123,7 +123,7 @@ export const projectsReducer = (state: ProjectState = initialState, action: Proj
             const items = _.cloneDeep(state.items);
             const item = findTreeItem(items, itemId);
             if (item) {
-                item.status = TreeItemStatus.Pending;
+                item.status = TreeItemStatus.PENDING;
                 state.items = items;
             }
             return { ...state, items };

diff --git a/src/store/side-panel/side-panel-reducer.ts b/src/store/side-panel/side-panel-reducer.ts
index 263ecbdad0c6fbdcbe39b5b16a2d8cdccebeb67d..9d56102b149719e74454a69b7d3bf1d917ab7d8c 100644 (file)
--- a/src/store/side-panel/side-panel-reducer.ts
+++ b/src/store/side-panel/side-panel-reducer.ts
@@ -41,17 +41,17 @@ export const sidePanelReducer = (state: SidePanelState = sidePanelData, action:
 };
 
 export enum SidePanelIdentifiers {
-    Projects = "Projects",
-    SharedWithMe = "SharedWithMe",
-    Workflows = "Workflows",
-    RecentOpen = "RecentOpen",
-    Favourites = "Favourites",
-    Trash = "Trash"
+    PROJECTS = "Projects",
+    SHARED_WITH_ME = "SharedWithMe",
+    WORKFLOWS = "Workflows",
+    RECENT_OPEN = "RecentOpen",
+    FAVORITES = "Favourites",
+    TRASH = "Trash"
 }
 
 export const sidePanelData = [
     {
-        id: SidePanelIdentifiers.Projects,
+        id: SidePanelIdentifiers.PROJECTS,
         name: "Projects",
         icon: ProjectsIcon,
         open: false,
@@ -60,25 +60,25 @@ export const sidePanelData = [
         openAble: true
     },
     {
-        id: SidePanelIdentifiers.SharedWithMe,
+        id: SidePanelIdentifiers.SHARED_WITH_ME,
         name: "Shared with me",
         icon: ShareMeIcon,
         active: false,
     },
     {
-        id: SidePanelIdentifiers.Workflows,
+        id: SidePanelIdentifiers.WORKFLOWS,
         name: "Workflows",
         icon: WorkflowIcon,
         active: false,
     },
     {
-        id: SidePanelIdentifiers.RecentOpen,
+        id: SidePanelIdentifiers.RECENT_OPEN,
         name: "Recent open",
         icon: RecentIcon,
         active: false,
     },
     {
-        id: SidePanelIdentifiers.Favourites,
+        id: SidePanelIdentifiers.FAVORITES,
         name: "Favorites",
         icon: FavoriteIcon,
         active: false,
@@ -89,7 +89,7 @@ export const sidePanelData = [
         }
     },
     {
-        id: SidePanelIdentifiers.Trash,
+        id: SidePanelIdentifiers.TRASH,
         name: "Trash",
         icon: TrashIcon,
         active: false,

diff --git a/src/views-components/context-menu/context-menu.tsx b/src/views-components/context-menu/context-menu.tsx
index 9b339c624c4ed9c7304bdcc8d62f7a060dd2acbb..5b1049c13ed0e52c51409b594244a46d234638c0 100644 (file)
--- a/src/views-components/context-menu/context-menu.tsx
+++ b/src/views-components/context-menu/context-menu.tsx
@@ -56,8 +56,8 @@ const getMenuActionSet = (resource?: ContextMenuResource): ContextMenuActionSet
 };
 
 export enum ContextMenuKind {
-    RootProject = "RootProject",
-    Project = "Project",
-    Resource = "Resource",
-    Favorite = "Favorite"
+    ROOT_PROJECT = "RootProject",
+    PROJECT = "Project",
+    RESOURCE = "Resource",
+    FAVORITE = "Favorite"
 }

diff --git a/src/views-components/details-panel/collection-details.tsx b/src/views-components/details-panel/collection-details.tsx
index 288177663fd2d350ff9867313de450983b564855..f0be4497ec6a2075b150c55657f59fca90da713a 100644 (file)
--- a/src/views-components/details-panel/collection-details.tsx
+++ b/src/views-components/details-panel/collection-details.tsx
@@ -19,7 +19,7 @@ export class CollectionDetails extends DetailsData<CollectionResource> {
 
     getDetails() {
         return <div>
-            <DetailsAttribute label='Type' value={resourceLabel(ResourceKind.Collection)} />
+            <DetailsAttribute label='Type' value={resourceLabel(ResourceKind.COLLECTION)} />
             <DetailsAttribute label='Size' value='---' />
             <DetailsAttribute label='Owner' value={this.item.ownerUuid} />
             <DetailsAttribute label='Last modified' value={formatDate(this.item.modifiedAt)} />

diff --git a/src/views-components/details-panel/details-panel.tsx b/src/views-components/details-panel/details-panel.tsx
index ea8f2e40f6288fc27e56275dad668180bbda9484..20d3843f7787a8fbd4aa23bbe91b1abfaacd6b81 100644 (file)
--- a/src/views-components/details-panel/details-panel.tsx
+++ b/src/views-components/details-panel/details-panel.tsx
@@ -55,11 +55,11 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
 const getItem = (resource: DetailsResource): DetailsData => {
     const res = resource || { kind: undefined, name: 'Projects' };
     switch (res.kind) {
-        case ResourceKind.Project:
+        case ResourceKind.PROJECT:
             return new ProjectDetails(res);
-        case ResourceKind.Collection:
+        case ResourceKind.COLLECTION:
             return new CollectionDetails(res);
-        case ResourceKind.Process:
+        case ResourceKind.PROCESS:
             return new ProcessDetails(res);
         default:
             return new EmptyDetails(res as EmptyResource);

diff --git a/src/views-components/details-panel/process-details.tsx b/src/views-components/details-panel/process-details.tsx
index 931ff7ed92962d75028d898484ff49ac844d7f6b..e195d05f34d96fb2af1dad415c6852b604436830 100644 (file)
--- a/src/views-components/details-panel/process-details.tsx
+++ b/src/views-components/details-panel/process-details.tsx
@@ -19,7 +19,7 @@ export class ProcessDetails extends DetailsData<ProcessResource> {
 
     getDetails() {
         return <div>
-            <DetailsAttribute label='Type' value={resourceLabel(ResourceKind.Process)} />
+            <DetailsAttribute label='Type' value={resourceLabel(ResourceKind.PROCESS)} />
             <DetailsAttribute label='Size' value='---' />
             <DetailsAttribute label='Owner' value={this.item.ownerUuid} />
 

diff --git a/src/views-components/details-panel/project-details.tsx b/src/views-components/details-panel/project-details.tsx
index 84b3706633c9f6a0a2e78013748cb2c1f06a2e10..b46bdcdbe85f312579169e816a172ea7a121f5de 100644 (file)
--- a/src/views-components/details-panel/project-details.tsx
+++ b/src/views-components/details-panel/project-details.tsx
@@ -19,7 +19,7 @@ export class ProjectDetails extends DetailsData<ProjectResource> {
 
     getDetails() {
         return <div>
-            <DetailsAttribute label='Type' value={resourceLabel(ResourceKind.Project)} />
+            <DetailsAttribute label='Type' value={resourceLabel(ResourceKind.PROJECT)} />
             {/* Missing attr */}
             <DetailsAttribute label='Size' value='---' />
             <DetailsAttribute label='Owner' value={this.item.ownerUuid} />

diff --git a/src/views/favorite-panel/favorite-panel-item.ts b/src/views/favorite-panel/favorite-panel-item.ts
index 28f7f882f345aed753b5798fa8277ae2c51e20a5..da48298aa7ec6d2dd14fd6d44b3d0209e25ba4d7 100644 (file)
--- a/src/views/favorite-panel/favorite-panel-item.ts
+++ b/src/views/favorite-panel/favorite-panel-item.ts
@@ -25,7 +25,7 @@ export function resourceToDataItem(r: GroupContentsResource): FavoritePanelItem
         url: "",
         owner: r.ownerUuid,
         lastModified: r.modifiedAt,
-        status:  r.kind === ResourceKind.Process ? r.state : undefined
+        status:  r.kind === ResourceKind.PROCESS ? r.state : undefined
     };
 }
 

diff --git a/src/views/favorite-panel/favorite-panel.tsx b/src/views/favorite-panel/favorite-panel.tsx
index 8f4945051735bc2e5141852de8fc56439f64a3e2..36a3410763129b043c95c2d55af45a39814f0a15 100644 (file)
--- a/src/views/favorite-panel/favorite-panel.tsx
+++ b/src/views/favorite-panel/favorite-panel.tsx
@@ -52,11 +52,11 @@ const renderName = (item: FavoritePanelItem) =>
 
 const renderIcon = (item: FavoritePanelItem) => {
     switch (item.kind) {
-        case ResourceKind.Project:
+        case ResourceKind.PROJECT:
             return <ProjectIcon />;
-        case ResourceKind.Collection:
+        case ResourceKind.COLLECTION:
             return <CollectionIcon />;
-        case ResourceKind.Process:
+        case ResourceKind.PROCESS:
             return <ProcessIcon />;
         default:
             return <DefaultIcon />;
@@ -104,7 +104,7 @@ export const columns: DataColumns<FavoritePanelItem, FavoritePanelFilter> = [
     {
         name: FavoritePanelColumnNames.NAME,
         selected: true,
-        sortDirection: SortDirection.Asc,
+        sortDirection: SortDirection.ASC,
         render: renderName,
         width: "450px"
     },
@@ -113,19 +113,19 @@ export const columns: DataColumns<FavoritePanelItem, FavoritePanelFilter> = [
         selected: true,
         filters: [
             {
-                name: ContainerRequestState.Committed,
+                name: ContainerRequestState.COMMITTED,
                 selected: true,
-                type: ContainerRequestState.Committed
+                type: ContainerRequestState.COMMITTED
             },
             {
-                name: ContainerRequestState.Final,
+                name: ContainerRequestState.FINAL,
                 selected: true,
-                type: ContainerRequestState.Final
+                type: ContainerRequestState.FINAL
             },
             {
-                name: ContainerRequestState.Uncommitted,
+                name: ContainerRequestState.UNCOMMITTED,
                 selected: true,
-                type: ContainerRequestState.Uncommitted
+                type: ContainerRequestState.UNCOMMITTED
             }
         ],
         render: renderStatus,
@@ -136,19 +136,19 @@ export const columns: DataColumns<FavoritePanelItem, FavoritePanelFilter> = [
         selected: true,
         filters: [
             {
-                name: resourceLabel(ResourceKind.Collection),
+                name: resourceLabel(ResourceKind.COLLECTION),
                 selected: true,
-                type: ResourceKind.Collection
+                type: ResourceKind.COLLECTION
             },
             {
-                name: resourceLabel(ResourceKind.Process),
+                name: resourceLabel(ResourceKind.PROCESS),
                 selected: true,
-                type: ResourceKind.Process
+                type: ResourceKind.PROCESS
             },
             {
-                name: resourceLabel(ResourceKind.Project),
+                name: resourceLabel(ResourceKind.PROJECT),
                 selected: true,
-                type: ResourceKind.Project
+                type: ResourceKind.PROJECT
             }
         ],
         render: item => renderType(item.kind),
@@ -169,7 +169,7 @@ export const columns: DataColumns<FavoritePanelItem, FavoritePanelFilter> = [
     {
         name: FavoritePanelColumnNames.LAST_MODIFIED,
         selected: true,
-        sortDirection: SortDirection.None,
+        sortDirection: SortDirection.NONE,
         render: item => renderDate(item.lastModified),
         width: "150px"
     }

diff --git a/src/views/project-panel/project-panel-item.ts b/src/views/project-panel/project-panel-item.ts
index 1d665a66012d86f5e11a0c0e6dbac5361c289f66..d0609d6df73139bbf55ebf5e404cafe7664632d5 100644 (file)
--- a/src/views/project-panel/project-panel-item.ts
+++ b/src/views/project-panel/project-panel-item.ts
@@ -25,7 +25,7 @@ export function resourceToDataItem(r: GroupContentsResource): ProjectPanelItem {
         url: "",
         owner: r.ownerUuid,
         lastModified: r.modifiedAt,
-        status:  r.kind === ResourceKind.Process ? r.state : undefined
+        status:  r.kind === ResourceKind.PROCESS ? r.state : undefined
     };
 }
 

diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index c2b42a55deb4de79b35abae49b2c333e0e69cb30..17b0fd723db9f07f2c5c05d7e905aa6b6823bb71 100644 (file)
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -52,11 +52,11 @@ const renderName = (item: ProjectPanelItem) =>
 
 const renderIcon = (item: ProjectPanelItem) => {
     switch (item.kind) {
-        case ResourceKind.Project:
+        case ResourceKind.PROJECT:
             return <ProjectIcon />;
-        case ResourceKind.Collection:
+        case ResourceKind.COLLECTION:
             return <CollectionIcon />;
-        case ResourceKind.Process:
+        case ResourceKind.PROCESS:
             return <ProcessIcon />;
         default:
             return <DefaultIcon />;
@@ -104,7 +104,7 @@ export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
     {
         name: ProjectPanelColumnNames.NAME,
         selected: true,
-        sortDirection: SortDirection.Asc,
+        sortDirection: SortDirection.ASC,
         render: renderName,
         width: "450px"
     },
@@ -113,19 +113,19 @@ export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
         selected: true,
         filters: [
             {
-                name: ContainerRequestState.Committed,
+                name: ContainerRequestState.COMMITTED,
                 selected: true,
-                type: ContainerRequestState.Committed
+                type: ContainerRequestState.COMMITTED
             },
             {
-                name: ContainerRequestState.Final,
+                name: ContainerRequestState.FINAL,
                 selected: true,
-                type: ContainerRequestState.Final
+                type: ContainerRequestState.FINAL
             },
             {
-                name: ContainerRequestState.Uncommitted,
+                name: ContainerRequestState.UNCOMMITTED,
                 selected: true,
-                type: ContainerRequestState.Uncommitted
+                type: ContainerRequestState.UNCOMMITTED
             }
         ],
         render: renderStatus,
@@ -136,19 +136,19 @@ export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
         selected: true,
         filters: [
             {
-                name: resourceLabel(ResourceKind.Collection),
+                name: resourceLabel(ResourceKind.COLLECTION),
                 selected: true,
-                type: ResourceKind.Collection
+                type: ResourceKind.COLLECTION
             },
             {
-                name: resourceLabel(ResourceKind.Process),
+                name: resourceLabel(ResourceKind.PROCESS),
                 selected: true,
-                type: ResourceKind.Process
+                type: ResourceKind.PROCESS
             },
             {
-                name: resourceLabel(ResourceKind.Project),
+                name: resourceLabel(ResourceKind.PROJECT),
                 selected: true,
-                type: ResourceKind.Project
+                type: ResourceKind.PROJECT
             }
         ],
         render: item => renderType(item.kind),
@@ -169,7 +169,7 @@ export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
     {
         name: ProjectPanelColumnNames.LAST_MODIFIED,
         selected: true,
-        sortDirection: SortDirection.None,
+        sortDirection: SortDirection.NONE,
         render: item => renderDate(item.lastModified),
         width: "150px"
     }

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 8e2cb578361a8dcf652ccb787483e7645ed81083..3637528d49f8f8355dafe291a7b06e9155381e09 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -190,7 +190,7 @@ export const Workbench = withStyles(styles)(
                                     onContextMenu={(event) => this.openContextMenu(event, {
                                         uuid: authService.getUuid() || "",
                                         name: "",
-                                        kind: ContextMenuKind.RootProject
+                                        kind: ContextMenuKind.ROOT_PROJECT
                                     })}>
                                     <ProjectTree
                                         projects={this.props.projects}
@@ -198,12 +198,12 @@ export const Workbench = withStyles(styles)(
                                         onContextMenu={(event, item) => this.openContextMenu(event, {
                                             uuid: item.data.uuid,
                                             name: item.data.name,
-                                            kind: ContextMenuKind.Project
+                                            kind: ContextMenuKind.PROJECT
                                         })}
                                         toggleActive={itemId => {
                                             this.props.dispatch<any>(setProjectItem(itemId, ItemMode.ACTIVE));
-                                            this.props.dispatch<any>(loadDetails(itemId, ResourceKind.Project));
-                                            this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.Projects));
+                                            this.props.dispatch<any>(loadDetails(itemId, ResourceKind.PROJECT));
+                                            this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS));
                                         }} />
                                 </SidePanel>
                             </Drawer>}
@@ -230,7 +230,7 @@ export const Workbench = withStyles(styles)(
             renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => <ProjectPanel
                 onItemRouteChange={itemId => this.props.dispatch<any>(setProjectItem(itemId, ItemMode.ACTIVE))}
                 onContextMenu={(event, item) => {
-                    const kind = item.kind === ResourceKind.Project ? ContextMenuKind.Project : ContextMenuKind.Resource;
+                    const kind = item.kind === ResourceKind.PROJECT ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE;
                     this.openContextMenu(event, {
                         uuid: item.uuid,
                         name: item.name,
@@ -243,14 +243,14 @@ export const Workbench = withStyles(styles)(
                 }}
                 onItemDoubleClick={item => {
                     this.props.dispatch<any>(setProjectItem(item.uuid, ItemMode.ACTIVE));
-                    this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.Project));
+                    this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.PROJECT));
                 }}
                 {...props} />
 
             renderFavoritePanel = (props: RouteComponentProps<{ id: string }>) => <FavoritePanel
                 onItemRouteChange={() => this.props.dispatch<any>(dataExplorerActions.REQUEST_ITEMS({ id: FAVORITE_PANEL_ID }))}
                 onContextMenu={(event, item) => {
-                    const kind = item.kind === ResourceKind.Project ? ContextMenuKind.Project : ContextMenuKind.Resource;
+                    const kind = item.kind === ResourceKind.PROJECT ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE;
                     this.openContextMenu(event, {
                         uuid: item.uuid,
                         name: item.name,
@@ -262,16 +262,16 @@ export const Workbench = withStyles(styles)(
                     this.props.dispatch<any>(loadDetails(item.uuid, item.kind as ResourceKind));
                 }}
                 onItemDoubleClick={item => {
-                    this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.Project));
+                    this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.PROJECT));
                     this.props.dispatch<any>(setProjectItem(item.uuid, ItemMode.ACTIVE));
-                    this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.Projects));
+                    this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS));
                 }}
                 {...props} />
 
             mainAppBarActions: MainAppBarActionProps = {
                 onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => {
                     this.props.dispatch<any>(setProjectItem(itemId, ItemMode.BOTH));
-                    this.props.dispatch<any>(loadDetails(itemId, ResourceKind.Project));
+                    this.props.dispatch<any>(loadDetails(itemId, ResourceKind.PROJECT));
                 },
                 onSearch: searchText => {
                     this.setState({ searchText });
@@ -285,7 +285,7 @@ export const Workbench = withStyles(styles)(
                     this.openContextMenu(event, {
                         uuid: breadcrumb.itemId,
                         name: breadcrumb.label,
-                        kind: ContextMenuKind.Project
+                        kind: ContextMenuKind.PROJECT
                     });
                 }
             };