X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/88ce683068f65862b3b5e753e55989902be5f1a9..7bbd67535b2ee9e8abd3342d5a9de5a22ef786a3:/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 2cb30198..dcae6807 100644 --- a/src/views/favorite-panel/favorite-panel.tsx +++ b/src/views/favorite-panel/favorite-panel.tsx @@ -11,7 +11,6 @@ import { RouteComponentProps } from 'react-router'; import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters'; 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 { FAVORITE_PANEL_ID } from "~/store/favorite-panel/favorite-panel-action"; import { @@ -23,11 +22,23 @@ import { ResourceType } from '~/views-components/data-explorer/renderers'; import { FavoriteIcon } from '~/components/icon/icon'; -import { Dispatch } from 'redux'; -import { openContextMenu, resourceKindToContextMenuKind } from '~/store/context-menu/context-menu-actions'; +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'; type CssRules = "toolbar" | "button"; @@ -54,143 +65,127 @@ export interface FavoritePanelFilter extends DataTableFilterItem { type: ResourceKind | ContainerRequestState; } -export const favoritePanelColumns: DataColumns = [ +export const favoritePanelColumns: DataColumns = [ { name: FavoritePanelColumnNames.NAME, selected: true, configurable: true, - sortDirection: SortDirection.ASC, - filters: [], - render: uuid => , - 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: uuid => , - 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: uuid => , - width: "125px" + filters: getSimpleObjectTypeFilters(), + render: uuid => }, { name: FavoritePanelColumnNames.OWNER, - selected: true, + selected: false, configurable: true, - sortDirection: SortDirection.NONE, - filters: [], - render: uuid => , - width: "200px" + filters: createTree(), + render: uuid => }, { name: FavoritePanelColumnNames.FILE_SIZE, selected: true, configurable: true, - sortDirection: SortDirection.NONE, - filters: [], - render: uuid => , - width: "50px" + filters: createTree(), + render: uuid => }, { name: FavoritePanelColumnNames.LAST_MODIFIED, selected: true, configurable: true, - sortDirection: SortDirection.NONE, - filters: [], - render: uuid => , - 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: string) => void; - onContextMenu: (event: React.MouseEvent, item: string) => void; onDialogOpen: (ownerUuid: string) => void; onItemDoubleClick: (item: string) => void; } - -const mapDispatchToProps = (dispatch: Dispatch): FavoritePanelActionProps => ({ - onContextMenu: (event, resourceUuid) => { - const kind = resourceKindToContextMenuKind(resourceUuid); - if (kind) { - dispatch(openContextMenu(event, { - name: '', - uuid: resourceUuid, - ownerUuid: '', - kind: ResourceKind.NONE, - menuKind: kind - })); - } - }, - onDialogOpen: (ownerUuid: string) => { return; }, - onItemClick: (resourceUuid: string) => { - dispatch(loadDetailsPanel(resourceUuid)); - }, - onItemDoubleClick: uuid => { - dispatch(navigateTo(uuid)); - } +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 }>; export const FavoritePanel = withStyles(styles)( - connect(undefined, mapDispatchToProps)( + connect(mapStateToProps)( class extends React.Component { + + 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, + })); + } + this.props.dispatch(loadDetailsPanel(resourceUuid)); + } + + handleRowDoubleClick = (uuid: string) => { + this.props.dispatch(navigateTo(uuid)); + } + + handleRowClick = (uuid: string) => { + this.props.dispatch(loadDetailsPanel(uuid)); + } + render() { return ; + onRowClick={this.handleRowClick} + onRowDoubleClick={this.handleRowDoubleClick} + onContextMenu={this.handleContextMenu} + contextMenuColumn={true} + dataTableDefaultView={ + + } />; } } )