Merge remote-tracking branch 'origin/main' into 18207-Workbench2-is-not-clearing...

[arvados-workbench2.git] / src / views-components / details-panel / project-details.tsx

diff --git a/src/views-components/details-panel/project-details.tsx b/src/views-components/details-panel/project-details.tsx
index 91c5e027ba61cb9a68deb9f4b8f214145d76561b..41ba6f00f154f2a5f3b9bf1f4fb2a8eb28b9f7e4 100644 (file)
--- a/src/views-components/details-panel/project-details.tsx
+++ b/src/views-components/details-panel/project-details.tsx
@@ -2,23 +2,29 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as React from 'react';
-import { compose } from 'redux';
+import React from 'react';
 import { connect } from 'react-redux';
-import { openProjectPropertiesDialog } from '~/store/details-panel/details-panel-action';
-import { ProjectIcon, RenameIcon } from '~/components/icon/icon';
-import { ProjectResource } from '~/models/project';
-import { formatDate } from '~/common/formatters';
-import { ResourceKind } from '~/models/resource';
-import { resourceLabel } from '~/common/labels';
+import { openProjectPropertiesDialog } from 'store/details-panel/details-panel-action';
+import { ProjectIcon, RenameIcon, FilterGroupIcon } from 'components/icon/icon';
+import { ProjectResource } from 'models/project';
+import { formatDate } from 'common/formatters';
+import { ResourceKind } from 'models/resource';
+import { resourceLabel } from 'common/labels';
 import { DetailsData } from "./details-data";
-import { DetailsAttribute } from "~/components/details-attribute/details-attribute";
-import { RichTextEditorLink } from '~/components/rich-text-editor-link/rich-text-editor-link';
-import { withStyles, StyleRulesCallback, Chip, WithStyles } from '@material-ui/core';
-import { ArvadosTheme } from '~/common/custom-theme';
+import { DetailsAttribute } from "components/details-attribute/details-attribute";
+import { RichTextEditorLink } from 'components/rich-text-editor-link/rich-text-editor-link';
+import { withStyles, StyleRulesCallback, WithStyles } from '@material-ui/core';
+import { ArvadosTheme } from 'common/custom-theme';
+import { Dispatch } from 'redux';
+import { getPropertyChip } from '../resource-properties-form/property-chip';
+import { ResourceOwnerWithName } from '../data-explorer/renderers';
+import { GroupClass } from "models/group";
 
 export class ProjectDetails extends DetailsData<ProjectResource> {
     getIcon(className?: string) {
+        if (this.item.groupClass === GroupClass.FILTER) {
+            return <FilterGroupIcon className={className} />;
+        }
         return <ProjectIcon className={className} />;
     }
 
@@ -40,7 +46,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     }
 });
 
-
 interface ProjectDetailsComponentDataProps {
     project: ProjectResource;
 }
@@ -49,39 +54,45 @@ interface ProjectDetailsComponentActionProps {
     onClick: () => void;
 }
 
-const mapDispatchToProps = ({ onClick: openProjectPropertiesDialog });
+const mapDispatchToProps = (dispatch: Dispatch) => ({
+    onClick: () => dispatch<any>(openProjectPropertiesDialog()),
+});
 
 type ProjectDetailsComponentProps = ProjectDetailsComponentDataProps & ProjectDetailsComponentActionProps & WithStyles<CssRules>;
 
 const ProjectDetailsComponent = connect(null, mapDispatchToProps)(
     withStyles(styles)(
         ({ classes, project, onClick }: ProjectDetailsComponentProps) => <div>
-            <DetailsAttribute label='Type' value={resourceLabel(ResourceKind.PROJECT)} />
-                {/* Missing attr */}
-                <DetailsAttribute label='Size' value='---' />
-                <DetailsAttribute label='Owner' value={project.ownerUuid} lowercaseValue={true} />
-                <DetailsAttribute label='Last modified' value={formatDate(project.modifiedAt)} />
-                <DetailsAttribute label='Created at' value={formatDate(project.createdAt)} />
-                {/* Missing attr */}
-                {/*<DetailsAttribute label='File size' value='1.4 GB' />*/}
-                <DetailsAttribute label='Description'>
-                    {project.description ?
-                        <RichTextEditorLink
-                            title={`Description of ${project.name}`}
-                            content={project.description}
-                            label='Show full description' />
-                        : '---'
-                    }
-                </DetailsAttribute>
-                <DetailsAttribute label='Properties'>
+            <DetailsAttribute label='Type' value={project.groupClass === GroupClass.FILTER ? 'Filter group' : resourceLabel(ResourceKind.PROJECT)} />
+            <DetailsAttribute label='Owner' linkToUuid={project.ownerUuid}
+                uuidEnhancer={(uuid: string) => <ResourceOwnerWithName uuid={uuid} />} />
+            <DetailsAttribute label='Last modified' value={formatDate(project.modifiedAt)} />
+            <DetailsAttribute label='Created at' value={formatDate(project.createdAt)} />
+            <DetailsAttribute label='UUID' linkToUuid={project.uuid} value={project.uuid} />
+            <DetailsAttribute label='Description'>
+                {project.description ?
+                    <RichTextEditorLink
+                        title={`Description of ${project.name}`}
+                        content={project.description}
+                        label='Show full description' />
+                    : '---'
+                }
+            </DetailsAttribute>
+            <DetailsAttribute label='Properties'>
+                {project.groupClass !== GroupClass.FILTER ?
                     <div onClick={onClick}>
                         <RenameIcon className={classes.editIcon} />
                     </div>
-                </DetailsAttribute>
-                {
-                    Object.keys(project.properties).map(k => {
-                        return <Chip key={k} className={classes.tag} label={`${k}: ${project.properties[k]}`} />;
-                    })
+                    : ''
                 }
+            </DetailsAttribute>
+            {
+                Object.keys(project.properties).map(k =>
+                    Array.isArray(project.properties[k])
+                    ? project.properties[k].map((v: string) =>
+                        getPropertyChip(k, v, undefined, classes.tag))
+                    : getPropertyChip(k, project.properties[k], undefined, classes.tag)
+                )
+            }
         </div>
-));
\ No newline at end of file
+    ));