X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/3c7e3cdc547ad5468421e1c049daa94b0d4b8bc0..17a3019e33d6d6820f50dabfa9d9ad7a4b02a4b8:/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 19f17138..2392d6fd 100644 --- a/src/views/favorite-panel/favorite-panel.tsx +++ b/src/views/favorite-panel/favorite-panel.tsx @@ -9,7 +9,6 @@ import { connect, DispatchProp } from 'react-redux'; 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"; @@ -18,7 +17,7 @@ import { ResourceFileSize, ResourceLastModifiedDate, ResourceName, - ResourceOwner, + ResourceOwnerWithName, ResourceType } from 'views-components/data-explorer/renderers'; import { FavoriteIcon } from 'components/icon/icon'; @@ -31,12 +30,16 @@ 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 { ResourcesState } from 'store/resources/resources'; +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"; +type CssRules = "toolbar" | "button" | "root"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ toolbar: { @@ -46,6 +49,9 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ button: { marginLeft: theme.spacing.unit }, + root: { + width: '100%', + }, }); export enum FavoritePanelColumnNames { @@ -61,12 +67,11 @@ 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.NONE, filters: createTree(), render: uuid => }, @@ -89,7 +94,7 @@ export const favoritePanelColumns: DataColumns = [ selected: false, configurable: true, filters: createTree(), - render: uuid => + render: uuid => }, { name: FavoritePanelColumnNames.FILE_SIZE, @@ -102,13 +107,13 @@ export const favoritePanelColumns: DataColumns = [ name: FavoritePanelColumnNames.LAST_MODIFIED, selected: true, configurable: true, - sortDirection: SortDirection.DESC, filters: createTree(), render: uuid => } ]; interface FavoritePanelDataProps { + currentItemId: any; favorites: FavoritesState; resources: ResourcesState; userUuid: string; @@ -123,6 +128,7 @@ 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 @@ -133,14 +139,28 @@ export const FavoritePanel = withStyles(styles)( class extends React.Component { handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { - const menuKind = this.props.dispatch(resourceUuidToContextMenuKind(resourceUuid)); - 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)); @@ -155,18 +175,15 @@ export const FavoritePanel = withStyles(styles)( } render() { - return - } />; + defaultViewIcon={FavoriteIcon} + defaultViewMessages={['Your favorites list is empty.']} /> + ; } } )