back to name - ProjectPanelColumnNames

Feature #13797

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>

diff --git a/src/store/project-panel/project-panel-middleware.ts b/src/store/project-panel/project-panel-middleware.ts
index 3ac3cc8fa743925901bbdec557b7b793e1f28fe7..881c4f17cf121fc58d3d6d106c9fa6fed6a6de0f 100644 (file)
--- a/src/store/project-panel/project-panel-middleware.ts
+++ b/src/store/project-panel/project-panel-middleware.ts
@@ -4,7 +4,7 @@
 
 import { Middleware } from "redux";
 import actions from "../data-explorer/data-explorer-action";
-import { PROJECT_PANEL_ID, ProjectPanelFilter, COLUMNS, ColumnNames } from "../../views/project-panel/project-panel";
+import { PROJECT_PANEL_ID, ProjectPanelFilter, COLUMNS, ProjectPanelColumnNames } from "../../views/project-panel/project-panel";
 import { groupsService } from "../../services/services";
 import { RootState } from "../store";
 import { getDataExplorer } from "../data-explorer/data-explorer-reducer";
@@ -51,8 +51,8 @@ export const projectPanelMiddleware: Middleware = store => next => {
                 const state = store.getState() as RootState;
                 const dataExplorer = getDataExplorer(state.dataExplorer, PROJECT_PANEL_ID);
                 const columns = dataExplorer.columns as DataColumns<ProjectPanelItem, ProjectPanelFilter>;
-                const typeFilters = getColumnFilters(columns, ColumnNames.TYPE);
-                const statusFilters = getColumnFilters(columns, ColumnNames.STATUS);
+                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;
                 if (typeFilters.length > 0) {
@@ -61,7 +61,7 @@ export const projectPanelMiddleware: Middleware = store => next => {
                             limit: dataExplorer.rowsPerPage,
                             offset: dataExplorer.page * dataExplorer.rowsPerPage,
                             order: sortColumn
-                                ? sortColumn.name === ColumnNames.NAME
+                                ? sortColumn.name === ProjectPanelColumnNames.NAME
                                     ? getOrder("name", sortDirection)
                                     : getOrder("createdAt", sortDirection)
                                 : OrderBuilder.create(),

diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index fbafdbe0cc50af0ed28b23c246c13efb9ddbf10d..107542eb28ff281a89b7b7da4d0af12a62d5d299 100644 (file)
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -136,7 +136,7 @@ const RENDER_STATUS = (item: ProjectPanelItem) =>
         {item.status || "-"}
     </Typography>;
 
-export enum ColumnNames {
+export enum ProjectPanelColumnNames {
     NAME = "Name",
     STATUS = "Status",
     TYPE = "Type",
@@ -148,7 +148,7 @@ export enum ColumnNames {
 
 export const COLUMNS: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
     {
-        name: ColumnNames.NAME,
+        name: ProjectPanelColumnNames.NAME,
         selected: true,
         sortDirection: SortDirection.Asc,
         render: RENDER_NAME,
@@ -178,7 +178,7 @@ export const COLUMNS: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
         width: "75px"
     },
     {
-        name: ColumnNames.TYPE,
+        name: ProjectPanelColumnNames.TYPE,
         selected: true,
         filters: [
             {
@@ -201,19 +201,19 @@ export const COLUMNS: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
         width: "125px"
     },
     {
-        name: ColumnNames.OWNER,
+        name: ProjectPanelColumnNames.OWNER,
         selected: true,
         render: item => RENDER_OWNER(item.owner),
         width: "200px"
     },
     {
-        name: ColumnNames.FILE_SIZE,
+        name: ProjectPanelColumnNames.FILE_SIZE,
         selected: true,
         render: item => RENDER_FILE_SIZE(item.fileSize),
         width: "50px"
     },
     {
-        name: ColumnNames.LAST_MODIFIED,
+        name: ProjectPanelColumnNames.LAST_MODIFIED,
         selected: true,
         sortDirection: SortDirection.None,
         render: item => RENDER_DATE(item.lastModified),