From 2903199054f8ac49ff15386fa576a0765032fa25 Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Wed, 25 May 2022 21:27:43 -0400 Subject: [PATCH] 19894: Change process type filter default values and collapse state Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- .../resource-type-filters/resource-type-filters.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/store/resource-type-filters/resource-type-filters.ts b/src/store/resource-type-filters/resource-type-filters.ts index 6f766b58..9f6d73ba 100644 --- a/src/store/resource-type-filters/resource-type-filters.ts +++ b/src/store/resource-type-filters/resource-type-filters.ts @@ -47,7 +47,7 @@ export enum ProcessTypeFilter { CHILD_PROCESS = 'Child', } -const initFilter = (name: string, parent = '', isSelected?: boolean) => +const initFilter = (name: string, parent = '', isSelected?: boolean, isExpanded?: boolean) => setNode({ id: name, value: { name }, @@ -55,8 +55,8 @@ const initFilter = (name: string, parent = '', isSelected?: boolean) => children: [], active: false, selected: isSelected !== undefined ? isSelected : true, - expanded: false, initialState: isSelected !== undefined ? isSelected : true, + expanded: isExpanded !== undefined ? isExpanded : false, status: TreeNodeStatus.LOADED, }); @@ -73,17 +73,17 @@ export const getSimpleObjectTypeFilters = pipe( export const getInitialResourceTypeFilters = pipe( (): DataTableFilters => createTree(), pipe( - initFilter(ObjectTypeFilter.PROJECT), + initFilter(ObjectTypeFilter.PROJECT, '', true, true), initFilter(GroupTypeFilter.PROJECT, ObjectTypeFilter.PROJECT), initFilter(GroupTypeFilter.FILTER_GROUP, ObjectTypeFilter.PROJECT), ), pipe( - initFilter(ObjectTypeFilter.PROCESS), + initFilter(ObjectTypeFilter.PROCESS, '', false, true), initFilter(ProcessTypeFilter.MAIN_PROCESS, ObjectTypeFilter.PROCESS), - initFilter(ProcessTypeFilter.CHILD_PROCESS, ObjectTypeFilter.PROCESS) + initFilter(ProcessTypeFilter.CHILD_PROCESS, ObjectTypeFilter.PROCESS, false) ), pipe( - initFilter(ObjectTypeFilter.COLLECTION), + initFilter(ObjectTypeFilter.COLLECTION, '', true, true), initFilter(CollectionTypeFilter.GENERAL_COLLECTION, ObjectTypeFilter.COLLECTION), initFilter(CollectionTypeFilter.OUTPUT_COLLECTION, ObjectTypeFilter.COLLECTION), initFilter(CollectionTypeFilter.INTERMEDIATE_COLLECTION, ObjectTypeFilter.COLLECTION), -- 2.30.2