Merge branch '14505-admin-groups-panel'

[arvados.git] / src / store / groups-panel / groups-panel-middleware-service.ts

diff --git a/src/store/groups-panel/groups-panel-middleware-service.ts b/src/store/groups-panel/groups-panel-middleware-service.ts
index 0b6f89b539f8f7036f3aefb0c355c2119a23d427..7c70666e0c7cb798623fc32f9a9a08b11fc25e65 100644 (file)
--- a/src/store/groups-panel/groups-panel-middleware-service.ts
+++ b/src/store/groups-panel/groups-panel-middleware-service.ts
@@ -12,7 +12,7 @@ import { GroupsPanelActions } from '~/store/groups-panel/groups-panel-actions';
 import { FilterBuilder } from '~/services/api/filter-builder';
 import { updateResources } from '~/store/resources/resources-actions';
 import { OrderBuilder, OrderDirection } from '~/services/api/order-builder';
-import { GroupResource } from '~/models/group';
+import { GroupResource, GroupClass } from '~/models/group';
 import { SortDirection } from '~/components/data-table/data-column';
 import { GroupsPanelColumnNames } from '~/views/groups-panel/groups-panel';
 
@@ -46,7 +46,7 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
                 }
 
                 const filters = new FilterBuilder()
-                    .addEqual('groupClass', null)
+                    .addNotIn('groupClass', [GroupClass.PROJECT])
                     .addILike('name', dataExplorer.searchValue)
                     .getFilters();
 
@@ -64,6 +64,16 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
                     items: response.items.map(item => item.uuid),
                 }));
 
+                const permissions = await this.services.permissionService.list({
+
+                    filters: new FilterBuilder()
+                        .addIn('tailUuid', response.items.map(item => item.uuid))
+                        .getFilters()
+
+                });
+
+                api.dispatch(updateResources(permissions.items));
+
 
             } catch (e) {