From 680b1ffd3369fb60134ce84c4de5aaa35fb77411 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Mon, 16 Dec 2019 19:10:10 -0300 Subject: [PATCH] 15672: More filter usage fixes. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../process-logs-panel-actions.ts | 4 ++-- src/store/processes/processes-actions.ts | 2 +- .../resource-type-filters/resource-type-filters.ts | 4 ++-- .../side-panel-tree/side-panel-tree-actions.ts | 4 ++-- src/store/tree-picker/tree-picker-actions.ts | 14 +++++++------- src/store/users/user-panel-middleware-service.ts | 4 ++-- .../virtual-machines/virtual-machines-actions.ts | 2 +- .../sharing-dialog/people-select.tsx | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/store/process-logs-panel/process-logs-panel-actions.ts b/src/store/process-logs-panel/process-logs-panel-actions.ts index fcb1b0ea..4eed9a96 100644 --- a/src/store/process-logs-panel/process-logs-panel-actions.ts +++ b/src/store/process-logs-panel/process-logs-panel-actions.ts @@ -68,8 +68,8 @@ export const addProcessLogsPanelItem = (message: ResourceEventMessage<{ text: st const loadContainerLogs = async (containerUuid: string, logService: LogService) => { const requestFilters = new FilterBuilder() - .addEqual('objectUuid', containerUuid) - .addIn('eventType', PROCESS_PANEL_LOG_EVENT_TYPES) + .addEqual('object_uuid', containerUuid) + .addIn('event_type', PROCESS_PANEL_LOG_EVENT_TYPES) .getFilters(); const requestOrder = new OrderBuilder() .addAsc('eventAt') diff --git a/src/store/processes/processes-actions.ts b/src/store/processes/processes-actions.ts index 47d6824a..a94e56d6 100644 --- a/src/store/processes/processes-actions.ts +++ b/src/store/processes/processes-actions.ts @@ -39,7 +39,7 @@ export const loadProcess = (containerRequestUuid: string) => export const loadSubprocesses = (containerUuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const containerRequests = await dispatch(loadContainerRequests( - new FilterBuilder().addEqual('requestingContainerUuid', containerUuid).getFilters() + new FilterBuilder().addEqual('requesting_container_uuid', containerUuid).getFilters() )) as ContainerRequestResource[]; const containerUuids: string[] = containerRequests.reduce((uuids, { containerUuid }) => diff --git a/src/store/resource-type-filters/resource-type-filters.ts b/src/store/resource-type-filters/resource-type-filters.ts index a6abf44b..e1a1b835 100644 --- a/src/store/resource-type-filters/resource-type-filters.ts +++ b/src/store/resource-type-filters/resource-type-filters.ts @@ -113,7 +113,7 @@ const serializeCollectionTypeFilters = ({ fb, selectedFilters }: ReturnType getMatchingFilters(values(CollectionTypeFilter), selectedFilters), filters => filters.map(collectionTypeToPropertyValue), mappedFilters => ({ - fb: buildCollectiomTypeFilters({ fb, filters: mappedFilters }), + fb: buildCollectionTypeFilters({ fb, filters: mappedFilters }), selectedFilters }) )(); @@ -124,7 +124,7 @@ const NON_GENERAL_COLLECTION_TYPES = difference(COLLECTION_TYPES, [CollectionTyp const COLLECTION_PROPERTIES_PREFIX = `${GroupContentsResourcePrefix.COLLECTION}.properties`; -const buildCollectiomTypeFilters = ({ fb, filters }: { fb: FilterBuilder, filters: CollectionType[] }) => { +const buildCollectionTypeFilters = ({ fb, filters }: { fb: FilterBuilder, filters: CollectionType[] }) => { switch (true) { case filters.length === 0 || filters.length === COLLECTION_TYPES.length: return fb; diff --git a/src/store/side-panel-tree/side-panel-tree-actions.ts b/src/store/side-panel-tree/side-panel-tree-actions.ts index 1bb1624d..9bdf2053 100644 --- a/src/store/side-panel-tree/side-panel-tree-actions.ts +++ b/src/store/side-panel-tree/side-panel-tree-actions.ts @@ -89,7 +89,7 @@ const loadProject = (projectUuid: string) => dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id: projectUuid, pickerId: SIDE_PANEL_TREE })); const params = { filters: new FilterBuilder() - .addEqual('ownerUuid', projectUuid) + .addEqual('owner_uuid', projectUuid) .getFilters(), order: new OrderBuilder() .addAsc('name') @@ -110,7 +110,7 @@ const loadSharedRoot = async (dispatch: Dispatch, _: () => RootState, services: const params = { filters: `[${new FilterBuilder() .addIsA('uuid', ResourceKind.PROJECT) - .addEqual('groupClass', GroupClass.PROJECT) + .addEqual('group_class', GroupClass.PROJECT) .getFilters()}]`, order: new OrderBuilder() .addAsc('name', GroupContentsResourcePrefix.PROJECT) diff --git a/src/store/tree-picker/tree-picker-actions.ts b/src/store/tree-picker/tree-picker-actions.ts index ff36e3e6..6b9be539 100644 --- a/src/store/tree-picker/tree-picker-actions.ts +++ b/src/store/tree-picker/tree-picker-actions.ts @@ -243,8 +243,8 @@ export const loadFavoritesProject = (params: LoadFavoritesProjectParams) => if (uuid) { const filters = pipe( (fb: FilterBuilder) => includeCollections - ? fb.addIsA('headUuid', [ResourceKind.PROJECT, ResourceKind.COLLECTION]) - : fb.addIsA('headUuid', [ResourceKind.PROJECT]), + ? fb.addIsA('head_uuid', [ResourceKind.PROJECT, ResourceKind.COLLECTION]) + : fb.addIsA('head_uuid', [ResourceKind.PROJECT]), fb => fb.getFilters(), )(new FilterBuilder()); @@ -276,11 +276,11 @@ export const loadPublicFavoritesProject = (params: LoadFavoritesProjectParams) = const filters = pipe( (fb: FilterBuilder) => includeCollections - ? fb.addIsA('headUuid', [ResourceKind.PROJECT, ResourceKind.COLLECTION]) - : fb.addIsA('headUuid', [ResourceKind.PROJECT]), + ? fb.addIsA('head_uuid', [ResourceKind.PROJECT, ResourceKind.COLLECTION]) + : fb.addIsA('head_uuid', [ResourceKind.PROJECT]), fb => fb - .addEqual('linkClass', LinkClass.STAR) - .addEqual('ownerUuid', uuid) + .addEqual('link_class', LinkClass.STAR) + .addEqual('owner_uuid', uuid) .addLike('name', '') .getFilters(), )(new FilterBuilder()); @@ -361,7 +361,7 @@ export const loadPublicFavoriteTreePickerProjects = (id: string) => const buildParams = (ownerUuid: string) => { return { filters: new FilterBuilder() - .addEqual('ownerUuid', ownerUuid) + .addEqual('owner_uuid', ownerUuid) .getFilters(), order: new OrderBuilder() .addAsc('name') diff --git a/src/store/users/user-panel-middleware-service.ts b/src/store/users/user-panel-middleware-service.ts index cffcce4d..c253f40a 100644 --- a/src/store/users/user-panel-middleware-service.ts +++ b/src/store/users/user-panel-middleware-service.ts @@ -56,14 +56,14 @@ const getParamsLastName = (dataExplorer: DataExplorer) => ({ const getFiltersFirstName = (dataExplorer: DataExplorer) => { const filters = new FilterBuilder() - .addILike("firstName", dataExplorer.searchValue) + .addILike("first_name", dataExplorer.searchValue) .getFilters(); return filters; }; const getFiltersLastName = (dataExplorer: DataExplorer) => { const filters = new FilterBuilder() - .addILike("lastName", dataExplorer.searchValue) + .addILike("last_name", dataExplorer.searchValue) .getFilters(); return filters; }; diff --git a/src/store/virtual-machines/virtual-machines-actions.ts b/src/store/virtual-machines/virtual-machines-actions.ts index 62564959..8e8a56e6 100644 --- a/src/store/virtual-machines/virtual-machines-actions.ts +++ b/src/store/virtual-machines/virtual-machines-actions.ts @@ -72,7 +72,7 @@ export const loadVirtualMachinesUserData = () => const virtualMachinesUuids = virtualMachines.items.map(it => it.uuid); const links = await services.linkService.list({ filters: new FilterBuilder() - .addIn("headUuid", virtualMachinesUuids) + .addIn("head_uuid", virtualMachinesUuids) .getFilters() }); dispatch(virtualMachinesActions.SET_VIRTUAL_MACHINES(virtualMachines)); diff --git a/src/views-components/sharing-dialog/people-select.tsx b/src/views-components/sharing-dialog/people-select.tsx index f6f6c092..90235cd5 100644 --- a/src/views-components/sharing-dialog/people-select.tsx +++ b/src/views-components/sharing-dialog/people-select.tsx @@ -117,7 +117,7 @@ export const PeopleSelect = connect()( requestSuggestions = async (_: void, __: void, { userService, groupsService }: ServiceRepository) => { const { value } = this.state; const filterGroups = new FilterBuilder() - .addNotIn('groupClass', [GroupClass.PROJECT]) + .addNotIn('group_class', [GroupClass.PROJECT]) .addILike('name', value) .getFilters(); const groupItems = await groupsService.list({ filters: filterGroups, limit: 5 }); -- 2.30.2