X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f9a41a09f7f884aeaf4291d155acf4bab74e71d8..e5dc88dd1a6c54610d92854d527e5048543d93ec:/src/views/public-favorites-panel/public-favorites-panel.tsx diff --git a/src/views/public-favorites-panel/public-favorites-panel.tsx b/src/views/public-favorites-panel/public-favorites-panel.tsx index 635ac621..ee09654a 100644 --- a/src/views/public-favorites-panel/public-favorites-panel.tsx +++ b/src/views/public-favorites-panel/public-favorites-panel.tsx @@ -2,16 +2,16 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; +import React from 'react'; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core'; -import { DataExplorer } from "~/views-components/data-explorer/data-explorer"; +import { DataExplorer } from "views-components/data-explorer/data-explorer"; import { connect, DispatchProp } from 'react-redux'; -import { DataColumns } from '~/components/data-table/data-table'; +import { DataColumns } from 'components/data-table/data-table'; 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 { ArvadosTheme } from '~/common/custom-theme'; +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 { ProcessStatus, ResourceFileSize, @@ -19,20 +19,25 @@ import { ResourceType, ResourceName, ResourceOwner -} from '~/views-components/data-explorer/renderers'; -import { PublicFavoriteIcon } from '~/components/icon/icon'; +} from 'views-components/data-explorer/renderers'; +import { PublicFavoriteIcon } from 'components/icon/icon'; import { Dispatch } from 'redux'; -import { openContextMenu, resourceKindToContextMenuKind } 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 { 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 { PUBLIC_FAVORITE_PANEL_ID } from '~/store/public-favorites-panel/public-favorites-action'; -import { PublicFavoritesState } from '~/store/public-favorites/public-favorites-reducer'; -import { getIsAdmin } from '~/store/public-favorites/public-favorites-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 { 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 { PUBLIC_FAVORITE_PANEL_ID } from 'store/public-favorites-panel/public-favorites-action'; +import { PublicFavoritesState } from 'store/public-favorites/public-favorites-reducer'; +import { getResource, ResourcesState } from 'store/resources/resources'; +import { GroupContentsResource } from 'services/groups-service/groups-service'; +import { CollectionResource } from 'models/collection'; type CssRules = "toolbar" | "button"; @@ -108,25 +113,29 @@ export const publicFavoritePanelColumns: DataColumns = [ interface PublicFavoritePanelDataProps { publicFavorites: PublicFavoritesState; + resources: ResourcesState; } interface PublicFavoritePanelActionProps { onItemClick: (item: string) => void; - onContextMenu: (event: React.MouseEvent, item: string) => void; + onContextMenu: (resources: ResourcesState) => (event: React.MouseEvent, item: string) => void; onDialogOpen: (ownerUuid: string) => void; onItemDoubleClick: (item: string) => void; } -const mapStateToProps = ({ publicFavorites }: RootState): PublicFavoritePanelDataProps => ({ - publicFavorites +const mapStateToProps = ({ publicFavorites, resources }: RootState): PublicFavoritePanelDataProps => ({ + publicFavorites, + resources, }); const mapDispatchToProps = (dispatch: Dispatch): PublicFavoritePanelActionProps => ({ - onContextMenu: (event, resourceUuid) => { - const isAdmin = dispatch(getIsAdmin()); - const kind = resourceKindToContextMenuKind(resourceUuid, isAdmin); - if (kind) { + onContextMenu: (resources: ResourcesState) => (event, resourceUuid) => { + const resource = getResource(resourceUuid)(resources); + const kind = dispatch(resourceUuidToContextMenuKind(resourceUuid)); + if (kind && resource) { dispatch(openContextMenu(event, { - name: '', + name: resource.name, + description: resource.description, + storageClassesDesired: (resource as CollectionResource).storageClassesDesired, uuid: resourceUuid, ownerUuid: '', kind: ResourceKind.NONE, @@ -155,7 +164,7 @@ export const PublicFavoritePanel = withStyles(styles)( id={PUBLIC_FAVORITE_PANEL_ID} onRowClick={this.props.onItemClick} onRowDoubleClick={this.props.onItemDoubleClick} - onContextMenu={this.props.onContextMenu} + onContextMenu={this.props.onContextMenu(this.props.resources)} contextMenuColumn={true} dataTableDefaultView={