From 46bb6c3da94118dabc77a01429900b0ecdd70343 Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Wed, 21 Nov 2018 17:01:00 +0100 Subject: [PATCH] Update filters in views so that the code can be compiled, leave TODO markers to guide the future work Feature #14258 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- .../favorite-panel-middleware-service.ts | 5 ++- .../project-panel-middleware-service.ts | 5 ++- .../trash-panel-middleware-service.ts | 5 ++- .../data-explorer/data-explorer.tsx | 4 +- src/views/favorite-panel/favorite-panel.tsx | 34 +++++--------- src/views/project-panel/project-panel.tsx | 34 +++++--------- .../search-results-panel-view.tsx | 36 +++++---------- src/views/trash-panel/trash-panel.tsx | 29 +++++------- .../workflow-panel/workflow-panel-view.tsx | 45 ++++++++++--------- 9 files changed, 76 insertions(+), 121 deletions(-) diff --git a/src/store/favorite-panel/favorite-panel-middleware-service.ts b/src/store/favorite-panel/favorite-panel-middleware-service.ts index d7d54ded..0d75ad1f 100644 --- a/src/store/favorite-panel/favorite-panel-middleware-service.ts +++ b/src/store/favorite-panel/favorite-panel-middleware-service.ts @@ -32,7 +32,7 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic if (!dataExplorer) { api.dispatch(favoritesPanelDataExplorerIsNotSet()); } else { - const columns = dataExplorer.columns as DataColumns; + const columns = dataExplorer.columns as DataColumns; const sortColumn = getSortColumn(dataExplorer); const typeFilters = this.getColumnFilters(columns, FavoritePanelColumnNames.TYPE); @@ -59,7 +59,8 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic linkOrder: linkOrder.getOrder(), contentOrder: contentOrder.getOrder(), filters: new FilterBuilder() - .addIsA("headUuid", typeFilters.map(filter => filter.type)) + // TODO: update filters + // .addIsA("headUuid", typeFilters.map(filter => filter.type)) .addILike("name", dataExplorer.searchValue) .getFilters() }); diff --git a/src/store/project-panel/project-panel-middleware-service.ts b/src/store/project-panel/project-panel-middleware-service.ts index 458444f3..3d0a6c4b 100644 --- a/src/store/project-panel/project-panel-middleware-service.ts +++ b/src/store/project-panel/project-panel-middleware-service.ts @@ -115,11 +115,12 @@ export const getParams = (dataExplorer: DataExplorer, isProjectTrashed: boolean) }); export const getFilters = (dataExplorer: DataExplorer) => { - const columns = dataExplorer.columns as DataColumns; + const columns = dataExplorer.columns as DataColumns; const typeFilters = getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE); const statusFilters = getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.STATUS); return new FilterBuilder() - .addIsA("uuid", typeFilters.map(f => f.type)) + // TODO: update filters + // .addIsA("uuid", typeFilters.map(f => f.type)) .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.COLLECTION) .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROCESS) .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROJECT) diff --git a/src/store/trash-panel/trash-panel-middleware-service.ts b/src/store/trash-panel/trash-panel-middleware-service.ts index 9afc57b4..e6cee25e 100644 --- a/src/store/trash-panel/trash-panel-middleware-service.ts +++ b/src/store/trash-panel/trash-panel-middleware-service.ts @@ -31,7 +31,7 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService { async requestItems(api: MiddlewareAPI) { const dataExplorer = api.getState().dataExplorer[this.getId()]; - const columns = dataExplorer.columns as DataColumns; + const columns = dataExplorer.columns as DataColumns; const sortColumn = getSortColumn(dataExplorer); const typeFilters = this.getColumnFilters(columns, TrashPanelColumnNames.TYPE); @@ -56,7 +56,8 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService { ...dataExplorerToListParams(dataExplorer), order: order.getOrder(), filters: new FilterBuilder() - .addIsA("uuid", typeFilters.map(f => f.type)) + // TODO: update filters + // .addIsA("uuid", typeFilters.map(f => f.type)) .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.COLLECTION) .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROJECT) .addEqual("is_trashed", true) diff --git a/src/views-components/data-explorer/data-explorer.tsx b/src/views-components/data-explorer/data-explorer.tsx index 59555707..710d202d 100644 --- a/src/views-components/data-explorer/data-explorer.tsx +++ b/src/views-components/data-explorer/data-explorer.tsx @@ -9,8 +9,8 @@ import { getDataExplorer } from "~/store/data-explorer/data-explorer-reducer"; import { Dispatch } from "redux"; import { dataExplorerActions } from "~/store/data-explorer/data-explorer-action"; import { DataColumn } from "~/components/data-table/data-column"; -import { DataTableFilterItem } from "~/components/data-table-filters/data-table-filters"; import { DataColumns } from "~/components/data-table/data-table"; +import { DataTableFilters } from '~/components/data-table-filters/data-table-filters-tree'; interface Props { id: string; @@ -44,7 +44,7 @@ const mapDispatchToProps = () => { dispatch(dataExplorerActions.TOGGLE_SORT({ id, columnName: column.name })); }, - onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn) => { + onFiltersChange: (filters: DataTableFilters, column: DataColumn) => { dispatch(dataExplorerActions.SET_FILTERS({ id, columnName: column.name, filters })); }, diff --git a/src/views/favorite-panel/favorite-panel.tsx b/src/views/favorite-panel/favorite-panel.tsx index 33c901cb..40bf9a0c 100644 --- a/src/views/favorite-panel/favorite-panel.tsx +++ b/src/views/favorite-panel/favorite-panel.tsx @@ -31,7 +31,9 @@ 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 { getInitialResourceTypeFilters } from '../../store/resource-type-filters/resource-type-filters'; +// TODO: clean up code type CssRules = "toolbar" | "button"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ @@ -57,57 +59,41 @@ 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.ASC, - filters: [], + filters: createTree(), render: uuid => }, { name: "Status", selected: true, configurable: true, - filters: [], + filters: createTree(), render: uuid => }, { name: FavoritePanelColumnNames.TYPE, selected: true, configurable: true, - filters: [ - { - name: resourceLabel(ResourceKind.COLLECTION), - selected: true, - type: ResourceKind.COLLECTION - }, - { - name: resourceLabel(ResourceKind.PROCESS), - selected: true, - type: ResourceKind.PROCESS - }, - { - name: resourceLabel(ResourceKind.PROJECT), - selected: true, - type: ResourceKind.PROJECT - } - ], + filters: getInitialResourceTypeFilters(), render: uuid => }, { name: FavoritePanelColumnNames.OWNER, selected: true, configurable: true, - filters: [], + filters: createTree(), render: uuid => }, { name: FavoritePanelColumnNames.FILE_SIZE, selected: true, configurable: true, - filters: [], + filters: createTree(), render: uuid => }, { @@ -115,7 +101,7 @@ export const favoritePanelColumns: DataColumns = [ selected: true, configurable: true, sortDirection: SortDirection.NONE, - filters: [], + filters: createTree(), render: uuid => } ]; diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx index 1221d0d1..ffc1a7ab 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -27,7 +27,9 @@ import { DataTableDefaultView } from '~/components/data-table-default-view/data- import { StyleRulesCallback, WithStyles } from "@material-ui/core"; import { ArvadosTheme } from "~/common/custom-theme"; import withStyles from "@material-ui/core/styles/withStyles"; - +import { createTree } from '~/models/tree'; +import { getInitialResourceTypeFilters } from '../../store/resource-type-filters/resource-type-filters'; +// TODO: code cleanup type CssRules = 'root' | "button"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ @@ -54,57 +56,41 @@ export interface ProjectPanelFilter extends DataTableFilterItem { type: ResourceKind | ContainerRequestState; } -export const projectPanelColumns: DataColumns = [ +export const projectPanelColumns: DataColumns = [ { name: ProjectPanelColumnNames.NAME, selected: true, configurable: true, sortDirection: SortDirection.ASC, - filters: [], + filters: createTree(), render: uuid => }, { name: "Status", selected: true, configurable: true, - filters: [], + filters: createTree(), render: uuid => , }, { name: ProjectPanelColumnNames.TYPE, selected: true, configurable: true, - filters: [ - { - name: resourceLabel(ResourceKind.COLLECTION), - selected: true, - type: ResourceKind.COLLECTION - }, - { - name: resourceLabel(ResourceKind.PROCESS), - selected: true, - type: ResourceKind.PROCESS - }, - { - name: resourceLabel(ResourceKind.PROJECT), - selected: true, - type: ResourceKind.PROJECT - } - ], + filters: getInitialResourceTypeFilters(), render: uuid => }, { name: ProjectPanelColumnNames.OWNER, selected: true, configurable: true, - filters: [], + filters: createTree(), render: uuid => }, { name: ProjectPanelColumnNames.FILE_SIZE, selected: true, configurable: true, - filters: [], + filters: createTree(), render: uuid => }, { @@ -112,7 +98,7 @@ export const projectPanelColumns: DataColumns = [ selected: true, configurable: true, sortDirection: SortDirection.NONE, - filters: [], + filters: createTree(), render: uuid => } ]; diff --git a/src/views/search-results-panel/search-results-panel-view.tsx b/src/views/search-results-panel/search-results-panel-view.tsx index 009b2abe..ea658ee7 100644 --- a/src/views/search-results-panel/search-results-panel-view.tsx +++ b/src/views/search-results-panel/search-results-panel-view.tsx @@ -20,7 +20,9 @@ import { ResourceOwner, ResourceType } from '~/views-components/data-explorer/renderers'; - +import { createTree } from '~/models/tree'; +import { getInitialResourceTypeFilters } from '../../store/resource-type-filters/resource-type-filters'; +// TODO: code clean up export enum SearchResultsPanelColumnNames { NAME = "Name", PROJECT = "Project", @@ -48,64 +50,48 @@ export interface WorkflowPanelFilter extends DataTableFilterItem { type: ResourceKind | ContainerRequestState; } -export const searchResultsPanelColumns: DataColumns = [ +export const searchResultsPanelColumns: DataColumns = [ { name: SearchResultsPanelColumnNames.NAME, selected: true, configurable: true, sortDirection: SortDirection.ASC, - filters: [], + filters: createTree(), render: (uuid: string) => }, { name: SearchResultsPanelColumnNames.PROJECT, selected: true, configurable: true, - filters: [], + filters: createTree(), render: uuid => }, { name: SearchResultsPanelColumnNames.STATUS, selected: true, configurable: true, - filters: [], + filters: createTree(), render: uuid => }, { name: SearchResultsPanelColumnNames.TYPE, selected: true, configurable: true, - filters: [ - { - name: resourceLabel(ResourceKind.COLLECTION), - selected: true, - type: ResourceKind.COLLECTION - }, - { - name: resourceLabel(ResourceKind.PROCESS), - selected: true, - type: ResourceKind.PROCESS - }, - { - name: resourceLabel(ResourceKind.PROJECT), - selected: true, - type: ResourceKind.PROJECT - } - ], + filters: getInitialResourceTypeFilters(), render: (uuid: string) => , }, { name: SearchResultsPanelColumnNames.OWNER, selected: true, configurable: true, - filters: [], + filters: createTree(), render: uuid => }, { name: SearchResultsPanelColumnNames.FILE_SIZE, selected: true, configurable: true, - filters: [], + filters: createTree(), render: uuid => }, { @@ -113,7 +99,7 @@ export const searchResultsPanelColumns: DataColumns selected: true, configurable: true, sortDirection: SortDirection.NONE, - filters: [], + filters: createTree(), render: uuid => } ]; diff --git a/src/views/trash-panel/trash-panel.tsx b/src/views/trash-panel/trash-panel.tsx index a0cf3e4f..ae12425e 100644 --- a/src/views/trash-panel/trash-panel.tsx +++ b/src/views/trash-panel/trash-panel.tsx @@ -33,7 +33,9 @@ import { ContextMenuKind } from "~/views-components/context-menu/context-menu"; import { Dispatch } from "redux"; import { PanelDefaultView } from '~/components/panel-default-view/panel-default-view'; import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view'; - +import { createTree } from '~/models/tree'; +import { getInitialResourceTypeFilters } from '../../store/resource-type-filters/resource-type-filters'; +// TODO: code clean up type CssRules = "toolbar" | "button"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ @@ -79,13 +81,13 @@ export const ResourceRestore = ); -export const trashPanelColumns: DataColumns = [ +export const trashPanelColumns: DataColumns = [ { name: TrashPanelColumnNames.NAME, selected: true, configurable: true, sortDirection: SortDirection.ASC, - filters: [], + filters: createTree(), render: uuid => }, { @@ -93,18 +95,7 @@ export const trashPanelColumns: DataColumns = [ selected: true, configurable: true, sortDirection: SortDirection.NONE, - filters: [ - { - name: resourceLabel(ResourceKind.COLLECTION), - selected: true, - type: ResourceKind.COLLECTION - }, - { - name: resourceLabel(ResourceKind.PROJECT), - selected: true, - type: ResourceKind.PROJECT - } - ], + filters: getInitialResourceTypeFilters(), render: uuid => , }, { @@ -112,7 +103,7 @@ export const trashPanelColumns: DataColumns = [ selected: true, configurable: true, sortDirection: SortDirection.NONE, - filters: [], + filters: createTree(), render: uuid => }, { @@ -120,7 +111,7 @@ export const trashPanelColumns: DataColumns = [ selected: true, configurable: true, sortDirection: SortDirection.NONE, - filters: [], + filters: createTree(), render: uuid => }, { @@ -128,7 +119,7 @@ export const trashPanelColumns: DataColumns = [ selected: true, configurable: true, sortDirection: SortDirection.NONE, - filters: [], + filters: createTree(), render: uuid => }, { @@ -136,7 +127,7 @@ export const trashPanelColumns: DataColumns = [ selected: true, configurable: false, sortDirection: SortDirection.NONE, - filters: [], + filters: createTree(), render: uuid => } ]; diff --git a/src/views/workflow-panel/workflow-panel-view.tsx b/src/views/workflow-panel/workflow-panel-view.tsx index 18a254bd..b8e0e436 100644 --- a/src/views/workflow-panel/workflow-panel-view.tsx +++ b/src/views/workflow-panel/workflow-panel-view.tsx @@ -19,6 +19,7 @@ import { DataTableFilterItem } from '~/components/data-table-filters/data-table- import { Grid, Paper } from '@material-ui/core'; import { WorkflowDetailsCard } from './workflow-description-card'; import { WorkflowResource } from '../../models/workflow'; +import { createTree } from '~/models/tree'; export enum WorkflowPanelColumnNames { NAME = "Name", @@ -61,36 +62,38 @@ const resourceStatus = (type: string) => { } }; -export const workflowPanelColumns: DataColumns = [ +export const workflowPanelColumns: DataColumns = [ { name: WorkflowPanelColumnNames.NAME, selected: true, configurable: true, sortDirection: SortDirection.ASC, - filters: [], + filters: createTree(), render: (uuid: string) => }, { name: WorkflowPanelColumnNames.AUTHORISATION, selected: true, configurable: true, - filters: [ - { - name: resourceStatus(ResourceStatus.PUBLIC), - selected: true, - type: ResourceStatus.PUBLIC - }, - { - name: resourceStatus(ResourceStatus.PRIVATE), - selected: true, - type: ResourceStatus.PRIVATE - }, - { - name: resourceStatus(ResourceStatus.SHARED), - selected: true, - type: ResourceStatus.SHARED - } - ], + filters: createTree(), + // TODO: restore filters + // filters: [ + // { + // name: resourceStatus(ResourceStatus.PUBLIC), + // selected: true, + // type: ResourceStatus.PUBLIC + // }, + // { + // name: resourceStatus(ResourceStatus.PRIVATE), + // selected: true, + // type: ResourceStatus.PRIVATE + // }, + // { + // name: resourceStatus(ResourceStatus.SHARED), + // selected: true, + // type: ResourceStatus.SHARED + // } + // ], render: (uuid: string) => , }, { @@ -98,14 +101,14 @@ export const workflowPanelColumns: DataColumns = [ selected: true, configurable: true, sortDirection: SortDirection.NONE, - filters: [], + filters: createTree(), render: (uuid: string) => }, { name: '', selected: true, configurable: false, - filters: [], + filters: createTree(), render: (uuid: string) => } ]; -- 2.30.2