//
// 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 { ResourceKind } from 'models/resource';
+import { ArvadosTheme } from 'common/custom-theme';
import {
ProcessStatus,
ResourceFileSize,
ResourceLastModifiedDate,
+ ResourceType,
ResourceName,
- ResourceOwner,
- ResourceType
-} from '~/views-components/data-explorer/renderers';
-import { FavoriteIcon } from '~/components/icon/icon';
+ ResourceOwnerWithName
+} 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 { 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 { PUBLIC_FAVORITE_PANEL_ID } from '~/store/public-favorites-panel/public-favorites-action';
+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 { 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';
+import { toggleOne } from 'store/multiselect/multiselect-actions';
-type CssRules = "toolbar" | "button";
+type CssRules = "toolbar" | "button" | "root";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
toolbar: {
button: {
marginLeft: theme.spacing.unit
},
+ root: {
+ width: '100%',
+ },
});
-export enum FavoritePanelColumnNames {
+export enum PublicFavoritePanelColumnNames {
NAME = "Name",
STATUS = "Status",
TYPE = "Type",
type: ResourceKind | ContainerRequestState;
}
-export const favoritePanelColumns: DataColumns<string> = [
+export const publicFavoritePanelColumns: DataColumns<string, GroupContentsResource> = [
{
- name: FavoritePanelColumnNames.NAME,
+ name: PublicFavoritePanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
render: uuid => <ProcessStatus uuid={uuid} />
},
{
- name: FavoritePanelColumnNames.TYPE,
+ name: PublicFavoritePanelColumnNames.TYPE,
selected: true,
configurable: true,
filters: getSimpleObjectTypeFilters(),
render: uuid => <ResourceType uuid={uuid} />
},
{
- name: FavoritePanelColumnNames.OWNER,
- selected: true,
+ name: PublicFavoritePanelColumnNames.OWNER,
+ selected: false,
configurable: true,
filters: createTree(),
- render: uuid => <ResourceOwner uuid={uuid} />
+ render: uuid => <ResourceOwnerWithName uuid={uuid} />
},
{
- name: FavoritePanelColumnNames.FILE_SIZE,
+ name: PublicFavoritePanelColumnNames.FILE_SIZE,
selected: true,
configurable: true,
filters: createTree(),
render: uuid => <ResourceFileSize uuid={uuid} />
},
{
- name: FavoritePanelColumnNames.LAST_MODIFIED,
+ name: PublicFavoritePanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
}
];
-interface FavoritePanelDataProps {
- favorites: FavoritesState;
+interface PublicFavoritePanelDataProps {
+ publicFavorites: PublicFavoritesState;
+ resources: ResourcesState;
}
-interface FavoritePanelActionProps {
+interface PublicFavoritePanelActionProps {
onItemClick: (item: string) => void;
- onContextMenu: (event: React.MouseEvent<HTMLElement>, item: string) => void;
+ onContextMenu: (resources: ResourcesState) => (event: React.MouseEvent<HTMLElement>, item: string) => void;
onDialogOpen: (ownerUuid: string) => void;
onItemDoubleClick: (item: string) => void;
}
-const mapStateToProps = ({ favorites }: RootState): FavoritePanelDataProps => ({
- favorites
+const mapStateToProps = ({ publicFavorites, resources }: RootState): PublicFavoritePanelDataProps => ({
+ publicFavorites,
+ resources,
});
-const mapDispatchToProps = (dispatch: Dispatch): FavoritePanelActionProps => ({
- onContextMenu: (event, resourceUuid) => {
- const kind = resourceKindToContextMenuKind(resourceUuid);
- if (kind) {
+const mapDispatchToProps = (dispatch: Dispatch): PublicFavoritePanelActionProps => ({
+ onContextMenu: (resources: ResourcesState) => (event, resourceUuid) => {
+ const resource = getResource<GroupContentsResource>(resourceUuid)(resources);
+ const kind = dispatch<any>(resourceUuidToContextMenuKind(resourceUuid));
+ if (kind && resource) {
dispatch<any>(openContextMenu(event, {
- name: '',
+ name: resource.name,
+ description: resource.description,
+ storageClassesDesired: (resource as CollectionResource).storageClassesDesired,
uuid: resourceUuid,
ownerUuid: '',
kind: ResourceKind.NONE,
dispatch<any>(loadDetailsPanel(resourceUuid));
},
onDialogOpen: (ownerUuid: string) => { return; },
- onItemClick: (resourceUuid: string) => {
- dispatch<any>(loadDetailsPanel(resourceUuid));
+ onItemClick: (uuid: string) => {
+ dispatch<any>(toggleOne(uuid))
+ dispatch<any>(loadDetailsPanel(uuid));
},
onItemDoubleClick: uuid => {
dispatch<any>(navigateTo(uuid));
}
});
-type FavoritePanelProps = FavoritePanelDataProps & FavoritePanelActionProps & DispatchProp
+type FavoritePanelProps = PublicFavoritePanelDataProps & PublicFavoritePanelActionProps & DispatchProp
& WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
export const PublicFavoritePanel = withStyles(styles)(
connect(mapStateToProps, mapDispatchToProps)(
class extends React.Component<FavoritePanelProps> {
render() {
- return <DataExplorer
+ return <div className={this.props.classes.root}><DataExplorer
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={
- <DataTableDefaultView
- icon={FavoriteIcon}
- messages={['Public favorites list is empty.']}
- />
- } />;
+ defaultViewIcon={PublicFavoriteIcon}
+ defaultViewMessages={['Public favorites list is empty.']} />
+ </div>;
}
}
)