X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/2d9dcf3d61d410328e081b5b00c7175c7eb1d82b..38d27e9783f7f760cee84cc225e86144069848c4:/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 e7234009..82336b4a 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 } 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,17 +20,25 @@ 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'; +} 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'; type CssRules = "toolbar" | "button"; @@ -82,7 +90,7 @@ export const favoritePanelColumns: DataColumns = [ }, { name: FavoritePanelColumnNames.OWNER, - selected: true, + selected: false, configurable: true, filters: createTree(), render: uuid => @@ -105,8 +113,10 @@ export const favoritePanelColumns: DataColumns = [ ]; interface FavoritePanelDataProps { + currentItemId: any; favorites: FavoritesState; - isAdmin: boolean; + resources: ResourcesState; + userUuid: string; } interface FavoritePanelActionProps { @@ -116,7 +126,9 @@ interface FavoritePanelActionProps { } const mapStateToProps = (state : RootState): FavoritePanelDataProps => ({ favorites: state.favorites, - isAdmin: state.auth.user!.isAdmin + resources: state.resources, + userUuid: state.auth.user!.uuid, + currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties), }); type FavoritePanelProps = FavoritePanelDataProps & FavoritePanelActionProps & DispatchProp @@ -127,14 +139,27 @@ export const FavoritePanel = withStyles(styles)( class extends React.Component { handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { - const menuKind = resourceKindToContextMenuKind(resourceUuid, this.props.isAdmin); - 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, })); } this.props.dispatch(loadDetailsPanel(resourceUuid)); @@ -145,7 +170,7 @@ export const FavoritePanel = withStyles(styles)( } handleRowClick = (uuid: string) => { - this.props.dispatch(loadDetailsPanel(uuid)); + this.props.dispatch(loadDetailsPanel(uuid)); } render() {