X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/eb7235a7a2cf4c6b6f52b42ac8313de388235aa9..486b1bf637827063cdedef283907da2dcc63ad22:/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 cad2f9ba..0b6532c1 100644 --- a/src/views/favorite-panel/favorite-panel.tsx +++ b/src/views/favorite-panel/favorite-panel.tsx @@ -2,17 +2,17 @@ // // 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, EditableResource } from '~/models/resource'; -import { ArvadosTheme } from '~/common/custom-theme'; -import { FAVORITE_PANEL_ID } from "~/store/favorite-panel/favorite-panel-action"; +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, @@ -20,21 +20,28 @@ import { ResourceName, ResourceOwner, ResourceType -} from '~/views-components/data-explorer/renderers'; -import { FavoriteIcon } from '~/components/icon/icon'; -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 { 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 { getResourceWithEditableStatus, ResourcesState } from '~/store/resources/resources'; -import { ProjectResource } from '~/models/project'; - -type CssRules = "toolbar" | "button"; +} 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: { @@ -44,6 +51,9 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ button: { marginLeft: theme.spacing.unit }, + root: { + width: '100%', + }, }); export enum FavoritePanelColumnNames { @@ -107,9 +117,9 @@ export const favoritePanelColumns: DataColumns = [ ]; interface FavoritePanelDataProps { + currentItemId: any; favorites: FavoritesState; resources: ResourcesState; - isAdmin: boolean; userUuid: string; } @@ -121,8 +131,8 @@ interface FavoritePanelActionProps { const mapStateToProps = (state : RootState): FavoritePanelDataProps => ({ favorites: state.favorites, resources: state.resources, - isAdmin: state.auth.user!.isAdmin, userUuid: state.auth.user!.uuid, + currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties), }); type FavoritePanelProps = FavoritePanelDataProps & FavoritePanelActionProps & DispatchProp @@ -133,16 +143,28 @@ export const FavoritePanel = withStyles(styles)( class extends React.Component { handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { - const { isAdmin, userUuid, resources } = this.props; - const resource = getResourceWithEditableStatus(resourceUuid, userUuid)(resources); - const menuKind = resourceKindToContextMenuKind(resourceUuid, isAdmin, (resource || {} as EditableResource).isEditable); - if (menuKind) { + 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: '', - uuid: resourceUuid, - ownerUuid: '', - kind: ResourceKind.NONE, - menuKind + 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)); @@ -157,7 +179,7 @@ export const FavoritePanel = withStyles(styles)( } render() { - return - } />; + } />; } } )