X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/25aa8a7c81609525d300f38bc5b7d2344c4e1cdf..394ebdfd13fe40a7096f484c46a353d2537f4c9a:/src/views/favorite-panel/favorite-panel.tsx diff --git a/src/views/favorite-panel/favorite-panel.tsx b/src/views/favorite-panel/favorite-panel.tsx index 125ea27d..0b6532c1 100644 --- a/src/views/favorite-panel/favorite-panel.tsx +++ b/src/views/favorite-panel/favorite-panel.tsx @@ -2,25 +2,46 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; -import { FavoritePanelItem } from './favorite-panel-item'; +import React from 'react'; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core'; -import { DataExplorer } from "~/views-components/data-explorer/data-explorer"; -import { DispatchProp, connect } from 'react-redux'; -import { DataColumns } from '~/components/data-table/data-table'; +import { DataExplorer } from "views-components/data-explorer/data-explorer"; +import { connect, DispatchProp } from 'react-redux'; +import { DataColumns } from 'components/data-table/data-table'; import { RouteComponentProps } from 'react-router'; -import { RootState } from '~/store/store'; -import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters'; -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 { ArvadosTheme } from '~/common/custom-theme'; -import { renderName, renderStatus, renderType, renderOwner, renderFileSize, renderDate } from '~/views-components/data-explorer/renderers'; -import { FAVORITE_PANEL_ID } from "~/store/favorite-panel/favorite-panel-action"; -import { FavoriteIcon } from '~/components/icon/icon'; - -type CssRules = "toolbar" | "button"; +import { DataTableFilterItem } from 'components/data-table-filters/data-table-filters'; +import { SortDirection } from 'components/data-table/data-column'; +import { ResourceKind } from 'models/resource'; +import { ArvadosTheme } from 'common/custom-theme'; +import { FAVORITE_PANEL_ID } from "store/favorite-panel/favorite-panel-action"; +import { + ProcessStatus, + ResourceFileSize, + ResourceLastModifiedDate, + ResourceName, + ResourceOwner, + ResourceType +} from 'views-components/data-explorer/renderers'; +import { FavoriteIcon } from 'components/icon/icon'; +import { + openContextMenu, + resourceUuidToContextMenuKind +} from 'store/context-menu/context-menu-actions'; +import { loadDetailsPanel } from 'store/details-panel/details-panel-action'; +import { navigateTo } from 'store/navigation/navigation-action'; +import { ContainerRequestState } from "models/container-request"; +import { FavoritesState } from 'store/favorites/favorites-reducer'; +import { RootState } from 'store/store'; +import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view'; +import { createTree } from 'models/tree'; +import { getSimpleObjectTypeFilters } from 'store/resource-type-filters/resource-type-filters'; +import { getResource, ResourcesState } from 'store/resources/resources'; +import { GroupContentsResource } from 'services/groups-service/groups-service'; +import { GroupClass, GroupResource } from 'models/group'; +import { getProperty } from 'store/properties/properties'; +import { PROJECT_PANEL_CURRENT_UUID } from 'store/project-panel/project-panel-action'; +import { CollectionResource } from 'models/collection'; + +type CssRules = "toolbar" | "button" | "root"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ toolbar: { @@ -30,6 +51,9 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ button: { marginLeft: theme.spacing.unit }, + root: { + width: '100%', + }, }); export enum FavoritePanelColumnNames { @@ -45,130 +69,128 @@ export interface FavoritePanelFilter extends DataTableFilterItem { type: ResourceKind | ContainerRequestState; } -export const columns: DataColumns = [ +export const favoritePanelColumns: DataColumns = [ { name: FavoritePanelColumnNames.NAME, selected: true, configurable: true, - sortDirection: SortDirection.ASC, - filters: [], - render: renderName, - width: "450px" + sortDirection: SortDirection.NONE, + filters: createTree(), + render: uuid => }, { name: "Status", selected: true, configurable: true, - sortDirection: SortDirection.NONE, - 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" + filters: createTree(), + render: uuid => }, { name: FavoritePanelColumnNames.TYPE, selected: true, configurable: true, - sortDirection: SortDirection.NONE, - 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" + filters: getSimpleObjectTypeFilters(), + render: uuid => }, { name: FavoritePanelColumnNames.OWNER, - selected: true, + selected: false, configurable: true, - sortDirection: SortDirection.NONE, - filters: [], - render: item => renderOwner(item.owner), - width: "200px" + filters: createTree(), + render: uuid => }, { name: FavoritePanelColumnNames.FILE_SIZE, selected: true, configurable: true, - sortDirection: SortDirection.NONE, - filters: [], - render: item => renderFileSize(item.fileSize), - width: "50px" + filters: createTree(), + render: uuid => }, { name: FavoritePanelColumnNames.LAST_MODIFIED, selected: true, configurable: true, - sortDirection: SortDirection.NONE, - filters: [], - render: item => renderDate(item.lastModified), - width: "150px" + sortDirection: SortDirection.DESC, + filters: createTree(), + render: uuid => } ]; interface FavoritePanelDataProps { - currentItemId: string; + currentItemId: any; + favorites: FavoritesState; + resources: ResourcesState; + userUuid: string; } interface FavoritePanelActionProps { - onItemClick: (item: FavoritePanelItem) => void; - onContextMenu: (event: React.MouseEvent, item: FavoritePanelItem) => void; + onItemClick: (item: string) => void; onDialogOpen: (ownerUuid: string) => void; - onItemDoubleClick: (item: FavoritePanelItem) => void; - onItemRouteChange: (itemId: string) => void; + onItemDoubleClick: (item: string) => void; } +const mapStateToProps = (state : RootState): FavoritePanelDataProps => ({ + favorites: state.favorites, + resources: state.resources, + userUuid: state.auth.user!.uuid, + currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties), +}); type FavoritePanelProps = FavoritePanelDataProps & FavoritePanelActionProps & DispatchProp - & WithStyles & RouteComponentProps<{ id: string }>; + & WithStyles & RouteComponentProps<{ id: string }>; export const FavoritePanel = withStyles(styles)( - connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }))( + connect(mapStateToProps)( class extends React.Component { - render() { - return item.uuid} - defaultIcon={FavoriteIcon} - defaultMessages={['Your favorites list is empty.']}/> - ; - } - componentWillReceiveProps({ match, currentItemId, onItemRouteChange }: FavoritePanelProps) { - if (match.params.id !== currentItemId) { - onItemRouteChange(match.params.id); + handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { + const { resources } = this.props; + const resource = getResource(resourceUuid)(resources); + + let readonly = false; + const project = getResource(this.props.currentItemId)(resources); + + if (project && project.groupClass === GroupClass.FILTER) { + readonly = true; } + + const menuKind = this.props.dispatch(resourceUuidToContextMenuKind(resourceUuid, readonly)); + + if (menuKind && resource) { + this.props.dispatch(openContextMenu(event, { + name: resource.name, + uuid: resource.uuid, + ownerUuid: resource.ownerUuid, + isTrashed: ('isTrashed' in resource) ? resource.isTrashed: false, + kind: resource.kind, + menuKind, + description: resource.description, + storageClassesDesired: (resource as CollectionResource).storageClassesDesired, + })); + } + this.props.dispatch(loadDetailsPanel(resourceUuid)); + } + + handleRowDoubleClick = (uuid: string) => { + this.props.dispatch(navigateTo(uuid)); + } + + handleRowClick = (uuid: string) => { + this.props.dispatch(loadDetailsPanel(uuid)); + } + + render() { + return
+ } />
; } } )