19275: Fix for race conditions in the full text search bar

[arvados-workbench2.git] / src / services / groups-service / groups-service.ts

diff --git a/src/services/groups-service/groups-service.ts b/src/services/groups-service/groups-service.ts
index f61b9eff05ab2d7b420d9ef764be8cdaf3cb215b..b69483cb3b2a45e6f74d6b2e0befcfc6753537e4 100644 (file)
--- a/src/services/groups-service/groups-service.ts
+++ b/src/services/groups-service/groups-service.ts
@@ -2,18 +2,19 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as _ from "lodash";
-import { CommonResourceService } from '~/services/common-service/common-resource-service';
-import { ListResults, ListArguments } from '~/services/common-service/common-service';
+import { CancelToken } from 'axios';
+import { snakeCase, camelCase } from "lodash";
+import { CommonResourceService } from 'services/common-service/common-resource-service';
+import { ListResults, ListArguments } from 'services/common-service/common-service';
 import { AxiosInstance, AxiosRequestConfig } from "axios";
-import { CollectionResource } from "~/models/collection";
-import { ProjectResource } from "~/models/project";
-import { ProcessResource } from "~/models/process";
-import { WorkflowResource } from "~/models/workflow";
-import { TrashableResourceService } from "~/services/common-service/trashable-resource-service";
-import { ApiActions } from "~/services/api/api-actions";
-import { GroupResource } from "~/models/group";
-import { Session } from "~/models/session";
+import { CollectionResource } from "models/collection";
+import { ProjectResource } from "models/project";
+import { ProcessResource } from "models/process";
+import { WorkflowResource } from "models/workflow";
+import { TrashableResourceService } from "services/common-service/trashable-resource-service";
+import { ApiActions } from "services/api/api-actions";
+import { GroupResource } from "models/group";
+import { Session } from "models/session";
 
 export interface ContentsArguments {
     limit?: number;
@@ -41,7 +42,7 @@ export class GroupsService<T extends GroupResource = GroupResource> extends Tras
         super(serverApi, "groups", actions);
     }
 
-    async contents(uuid: string, args: ContentsArguments = {}, session?: Session): Promise<ListResults<GroupContentsResource>> {
+    async contents(uuid: string, args: ContentsArguments = {}, session?: Session, cancelToken?: CancelToken): Promise<ListResults<GroupContentsResource>> {
         const { filters, order, ...other } = args;
         const params = {
             ...other,
@@ -50,17 +51,21 @@ export class GroupsService<T extends GroupResource = GroupResource> extends Tras
         };
         const pathUrl = uuid ? `/${uuid}/contents` : '/contents';
 
-        const cfg: AxiosRequestConfig = { params: CommonResourceService.mapKeys(_.snakeCase)(params) };
+        const cfg: AxiosRequestConfig = { params: CommonResourceService.mapKeys(snakeCase)(params) };
         if (session) {
             cfg.baseURL = session.baseUrl;
             cfg.headers = { 'Authorization': 'Bearer ' + session.token };
         }
 
+        if (cancelToken) {
+            cfg.cancelToken = cancelToken;
+        }
+
         const response = await CommonResourceService.defaultResponse(
             this.serverApi.get(this.resourceType + pathUrl, cfg), this.actions, false
         );
 
-        return { ...TrashableResourceService.mapKeys(_.camelCase)(response), clusterId: session && session.clusterId };
+        return { ...TrashableResourceService.mapKeys(camelCase)(response), clusterId: session && session.clusterId };
     }
 
     shared(params: SharedArguments = {}): Promise<ListResults<GroupContentsResource>> {