Merge branch '13797-refatoring-part2'

refs #13797
2

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

diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts
index f412024a3613e20854ba3cf8954b250b31fe2b1e..c85acd9089b0011ac2a819068b55d1ce5fd35688 100644 (file)
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@ -19,7 +19,7 @@ export interface ArvadosTheme extends Theme {
     customs: any;
 }
 
-// const red = 
+const red900 = red["900"];
 const yellow700 = yellow["700"];
 const purple800 = purple["800"];
 const grey200 = grey["200"];

diff --git a/src/common/formatters.ts b/src/common/formatters.ts
index fe7df14c9d12670a3a9c2f88480b6d6e519a902a..38ef0223e957f1b134d1dfed10c23341af145fbc 100644 (file)
--- a/src/common/formatters.ts
+++ b/src/common/formatters.ts
@@ -10,7 +10,7 @@ export const formatDate = (isoDate: string) => {
 
 export const formatFileSize = (size?: number) => {
     if (typeof size === "number") {
-        for (const { base, unit } of fileSizes) {
+        for (const { base, unit } of FILE_SIZES) {
             if (size >= base) {
                 return `${(size / base).toFixed()} ${unit}`;
             }
@@ -19,7 +19,7 @@ export const formatFileSize = (size?: number) => {
     return "";
 };
 
-const fileSizes = [
+const FILE_SIZES = [
     {
         base: 1000000000000,
         unit: "TB"

diff --git a/src/store/project-panel/project-panel-middleware.ts b/src/store/project-panel/project-panel-middleware.ts
index 7ea2ffab5b7eba2d385691f2728dcee40036e3ac..fbed1783e260c45ae906f48529c9c55ef040a784 100644 (file)
--- a/src/store/project-panel/project-panel-middleware.ts
+++ b/src/store/project-panel/project-panel-middleware.ts
@@ -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, ProjectPanelColumnNames.Type);
-                const statusFilters = getColumnFilters(columns, ProjectPanelColumnNames.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 === ProjectPanelColumnNames.Name
+                                ? sortColumn.name === ProjectPanelColumnNames.NAME
                                     ? getOrder("name", sortDirection)
                                     : getOrder("createdAt", sortDirection)
                                 : OrderBuilder.create(),

diff --git a/src/views-components/details-panel/empty-details.tsx b/src/views-components/details-panel/empty-details.tsx
index f1ef274010f6f8b1cdf49e1330b63a928b4fa8ff..51112ce571cce6848b1c6b72c4ea63ea78cc0c49 100644 (file)
--- a/src/views-components/details-panel/empty-details.tsx
+++ b/src/views-components/details-panel/empty-details.tsx
@@ -33,7 +33,7 @@ export interface EmptyStateDataProps {
 type EmptyStateProps = EmptyStateDataProps & WithStyles<CssRules>;
 
 const EmptyState = withStyles(styles)(
-    ({ classes, details, message, children }: EmptyStateProps) =>
+    ({ classes, details, message, children, icon: Icon }: EmptyStateProps) =>
         <Typography className={classes.container} component="div">
             <Icon className={classes.icon}/>
             <Typography variant="body1" gutterBottom>{message}</Typography>

diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index 312a24858c6adb03ca67b2d839c354e261d1a6e3..daf22b11faca3b02e87441a625cf50f513f84191 100644 (file)
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -16,10 +16,12 @@ import { ContainerRequestState } from '../../models/container-request';
 import { SortDirection } from '../../components/data-table/data-column';
 import { ResourceKind } from '../../models/resource';
 import { resourceLabel } from '../../common/labels';
+import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon } from '../../components/icon/icon';
+import { ArvadosTheme } from '../../common/custom-theme';
 
 type CssRules = "toolbar" | "button";
 
-const styles: StyleRulesCallback<CssRules> = theme => ({
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     toolbar: {
         paddingBottom: theme.spacing.unit * 3,
         textAlign: "right"
@@ -30,11 +32,7 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
 });
 
 const renderName = (item: ProjectPanelItem) =>
-    <Grid
-        container
-        alignItems="center"
-        wrap="nowrap"
-        spacing={16}>
+    <Grid container alignItems="center" wrap="nowrap" spacing={16}>
         <Grid item>
             {renderIcon(item)}
         </Grid>
@@ -49,20 +47,19 @@ const renderName = (item: ProjectPanelItem) =>
 const renderIcon = (item: ProjectPanelItem) => {
     switch (item.kind) {
         case ResourceKind.Project:
-            return <i className="fas fa-folder fa-lg" />;
+            return <ProjectIcon />;
         case ResourceKind.Collection:
-            return <i className="fas fa-archive fa-lg" />;
+            return <CollectionIcon />;
         case ResourceKind.Process:
-            return <i className="fas fa-cogs fa-lg" />;
+            return <ProcessIcon />;
         default:
-            return <i />;
+            return <DefaultIcon />;
     }
 };
 
-const renderDate = (date: string) =>
-    <Typography noWrap>
-        {formatDate(date)}
-    </Typography>;
+const renderDate = (date: string) => {
+    return <Typography noWrap>{formatDate(date)}</Typography>;
+};
 
 const renderFileSize = (fileSize?: number) =>
     <Typography noWrap>
@@ -70,107 +67,124 @@ const renderFileSize = (fileSize?: number) =>
     </Typography>;
 
 const renderOwner = (owner: string) =>
-    <Typography noWrap color="primary">
+    <Typography noWrap color="primary" >
         {owner}
     </Typography>;
 
-const renderType = (type: string) => {
-    return <Typography noWrap>
+const renderType = (type: string) =>
+    <Typography noWrap>
         {resourceLabel(type)}
     </Typography>;
-};
 
 const renderStatus = (item: ProjectPanelItem) =>
-    <Typography noWrap align="center">
+    <Typography noWrap align="center" >
         {item.status || "-"}
     </Typography>;
 
 export enum ProjectPanelColumnNames {
-    Name = "Name",
-    Status = "Status",
-    Type = "Type",
-    Owner = "Owner",
-    FileSize = "File size",
-    LastModified = "Last modified"
+    NAME = "Name",
+    STATUS = "Status",
+    TYPE = "Type",
+    OWNER = "Owner",
+    FILE_SIZE = "File size",
+    LAST_MODIFIED = "Last modified"
 }
 
 export interface ProjectPanelFilter extends DataTableFilterItem {
     type: ResourceKind | ContainerRequestState;
 }
 
-export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [{
-    name: ProjectPanelColumnNames.Name,
-    selected: true,
-    sortDirection: SortDirection.Asc,
-    render: renderName,
-    width: "450px"
-}, {
-    name: "Status",
-    selected: true,
-    filters: [{
-        name: ContainerRequestState.Committed,
+export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [
+    {
+        name: ProjectPanelColumnNames.NAME,
         selected: true,
-        type: ContainerRequestState.Committed
-    }, {
-        name: ContainerRequestState.Final,
+        sortDirection: SortDirection.Asc,
+        render: renderName,
+        width: "450px"
+    },
+    {
+        name: "Status",
         selected: true,
-        type: ContainerRequestState.Final
-    }, {
-        name: ContainerRequestState.Uncommitted,
+        filters: [
+            {
+                name: ContainerRequestState.Committed,
+                selected: true,
+                type: ContainerRequestState.Committed
+            },
+            {
+                name: ContainerRequestState.Final,
+                selected: true,
+                type: ContainerRequestState.Final
+            },
+            {
+                name: ContainerRequestState.Uncommitted,
+                selected: true,
+                type: ContainerRequestState.Uncommitted
+            }
+        ],
+        render: renderStatus,
+        width: "75px"
+    },
+    {
+        name: ProjectPanelColumnNames.TYPE,
         selected: true,
-        type: ContainerRequestState.Uncommitted
-    }],
-    render: renderStatus,
-    width: "75px"
-}, {
-    name: ProjectPanelColumnNames.Type,
-    selected: true,
-    filters: [{
-        name: resourceLabel(ResourceKind.Collection),
+        filters: [
+            {
+                name: resourceLabel(ResourceKind.Collection),
+                selected: true,
+                type: ResourceKind.Collection
+            },
+            {
+                name: resourceLabel(ResourceKind.Process),
+                selected: true,
+                type: ResourceKind.Process
+            },
+            {
+                name: resourceLabel(ResourceKind.Project),
+                selected: true,
+                type: ResourceKind.Project
+            }
+        ],
+        render: item => renderType(item.kind),
+        width: "125px"
+    },
+    {
+        name: ProjectPanelColumnNames.OWNER,
         selected: true,
-        type: ResourceKind.Collection
-    }, {
-        name: resourceLabel(ResourceKind.Process),
+        render: item => renderOwner(item.owner),
+        width: "200px"
+    },
+    {
+        name: ProjectPanelColumnNames.FILE_SIZE,
         selected: true,
-        type: ResourceKind.Process
-    }, {
-        name: resourceLabel(ResourceKind.Project),
+        render: item => renderFileSize(item.fileSize),
+        width: "50px"
+    },
+    {
+        name: ProjectPanelColumnNames.LAST_MODIFIED,
         selected: true,
-        type: ResourceKind.Project
-    }],
-    render: item => renderType(item.kind),
-    width: "125px"
-}, {
-    name: ProjectPanelColumnNames.Owner,
-    selected: true,
-    render: item => renderOwner(item.owner),
-    width: "200px"
-}, {
-    name: ProjectPanelColumnNames.FileSize,
-    selected: true,
-    render: item => renderFileSize(item.fileSize),
-    width: "50px"
-}, {
-    name: ProjectPanelColumnNames.LastModified,
-    selected: true,
-    sortDirection: SortDirection.None,
-    render: item => renderDate(item.lastModified),
-    width: "150px"
-}];
+        sortDirection: SortDirection.None,
+        render: item => renderDate(item.lastModified),
+        width: "150px"
+    }
+];
 
 export const PROJECT_PANEL_ID = "projectPanel";
 
-type ProjectPanelProps = {
-    currentItemId: string,
-    onItemClick: (item: ProjectPanelItem) => void,
+interface ProjectPanelDataProps {
+    currentItemId: string;
+}
+
+interface ProjectPanelActionProps {
+    onItemClick: (item: ProjectPanelItem) => void;
     onContextMenu: (event: React.MouseEvent<HTMLElement>, item: ProjectPanelItem) => void;
     onDialogOpen: (ownerUuid: string) => void;
-    onItemDoubleClick: (item: ProjectPanelItem) => void,
-    onItemRouteChange: (itemId: string) => void
+    onItemDoubleClick: (item: ProjectPanelItem) => void;
+    onItemRouteChange: (itemId: string) => void;
 }
-    & DispatchProp
-    & WithStyles<CssRules>
-    & RouteComponentProps<{ id: string }>;
+
+type ProjectPanelProps = ProjectPanelDataProps & ProjectPanelActionProps & DispatchProp
+                        & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
 
 export const ProjectPanel = withStyles(styles)(
     connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))(
@@ -208,4 +222,4 @@ export const ProjectPanel = withStyles(styles)(
             }
         }
     )
-);
+);
\ No newline at end of file