X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/82908c571a492f19f2ea402e033fa84b6df15b61..ebe401635f60309539380f674d492a409a45d36c:/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 e9952910..3feb4a7e 100644 --- a/src/views-components/details-panel/project-details.tsx +++ b/src/views-components/details-panel/project-details.tsx @@ -3,10 +3,9 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { Dispatch } from 'redux'; import { connect } from 'react-redux'; import { openProjectPropertiesDialog } from '~/store/details-panel/details-panel-action'; -import { ProjectIcon, RenameIcon } from '~/components/icon/icon'; +import { ProjectIcon, RenameIcon, FilterGroupIcon } from '~/components/icon/icon'; import { ProjectResource } from '~/models/project'; import { formatDate } from '~/common/formatters'; import { ResourceKind } from '~/models/resource'; @@ -14,11 +13,18 @@ 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 { 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 { getIcon(className?: string) { + if (this.item.groupClass === GroupClass.FILTER) { + return ; + } return ; } @@ -40,7 +46,6 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ } }); - interface ProjectDetailsComponentDataProps { project: ProjectResource; } @@ -49,8 +54,8 @@ interface ProjectDetailsComponentActionProps { onClick: () => void; } -const mapDispatchToProps = (dispatch: Dispatch): ProjectDetailsComponentActionProps => ({ - onClick: () => dispatch(openProjectPropertiesDialog()) +const mapDispatchToProps = (dispatch: Dispatch) => ({ + onClick: () => dispatch(openProjectPropertiesDialog()), }); type ProjectDetailsComponentProps = ProjectDetailsComponentDataProps & ProjectDetailsComponentActionProps & WithStyles; @@ -58,32 +63,36 @@ type ProjectDetailsComponentProps = ProjectDetailsComponentDataProps & ProjectDe const ProjectDetailsComponent = connect(null, mapDispatchToProps)( withStyles(styles)( ({ classes, project, onClick }: ProjectDetailsComponentProps) =>
- - {/* Missing attr */} - - - - - {/* Missing attr */} - {/**/} - - {project.description ? - - : '---' - } - - + + } /> + + + + + {project.description ? + + : '---' + } + + + {project.groupClass !== GroupClass.FILTER ?
-
- { - Object.keys(project.properties).map(k => { - return ; - }) + : '' } +
+ { + 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) + ) + }
-)); \ No newline at end of file + ));