projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19069-workflow-launching' into 19143-project-list-workflows
[arvados.git]
/
src
/
store
/
group-details-panel
/
group-details-panel-permissions-middleware-service.ts
diff --git
a/src/store/group-details-panel/group-details-panel-permissions-middleware-service.ts
b/src/store/group-details-panel/group-details-panel-permissions-middleware-service.ts
index 7ce2d380e42c1361f630bc1e0830fbeadbc519d3..85beecd726b8ac980a537b5b9ab3db0915e19ae1 100644
(file)
--- a/
src/store/group-details-panel/group-details-panel-permissions-middleware-service.ts
+++ b/
src/store/group-details-panel/group-details-panel-permissions-middleware-service.ts
@@
-12,6
+12,7
@@
import { FilterBuilder } from 'services/api/filter-builder';
import { updateResources } from 'store/resources/resources-actions';
import { getCurrentGroupDetailsPanelUuid, GroupPermissionsPanelActions } from 'store/group-details-panel/group-details-panel-actions';
import { LinkClass } from 'models/link';
import { updateResources } from 'store/resources/resources-actions';
import { getCurrentGroupDetailsPanelUuid, GroupPermissionsPanelActions } from 'store/group-details-panel/group-details-panel-actions';
import { LinkClass } from 'models/link';
+import { ResourceKind } from 'models/resource';
export class GroupDetailsPanelPermissionsMiddlewareService extends DataExplorerMiddlewareService {
export class GroupDetailsPanelPermissionsMiddlewareService extends DataExplorerMiddlewareService {
@@
-23,7
+24,7
@@
export class GroupDetailsPanelPermissionsMiddlewareService extends DataExplorerM
const dataExplorer = getDataExplorer(api.getState().dataExplorer, this.getId());
const groupUuid = getCurrentGroupDetailsPanelUuid(api.getState().properties);
if (!dataExplorer || !groupUuid) {
const dataExplorer = getDataExplorer(api.getState().dataExplorer, this.getId());
const groupUuid = getCurrentGroupDetailsPanelUuid(api.getState().properties);
if (!dataExplorer || !groupUuid) {
- api.dispatch(groupsDetailsPanelDataExplorerIsNotSet());
+ // No-op if data explorer is not set since refresh may be triggered from elsewhere
} else {
try {
const permissionsOut = await this.services.permissionService.list({
} else {
try {
const permissionsOut = await this.services.permissionService.list({
@@
-41,7
+42,9
@@
export class GroupDetailsPanelPermissionsMiddlewareService extends DataExplorerM
const usersOut = await this.services.userService.list({
filters: new FilterBuilder()
const usersOut = await this.services.userService.list({
filters: new FilterBuilder()
- .addIn('uuid', permissionsOut.items.map(item => item.headUuid))
+ .addIn('uuid', permissionsOut.items
+ .filter((item) => item.headKind === ResourceKind.USER)
+ .map(item => item.headUuid))
.getFilters(),
count: "none"
});
.getFilters(),
count: "none"
});
@@
-49,7
+52,9
@@
export class GroupDetailsPanelPermissionsMiddlewareService extends DataExplorerM
const collectionsOut = await this.services.collectionService.list({
filters: new FilterBuilder()
const collectionsOut = await this.services.collectionService.list({
filters: new FilterBuilder()
- .addIn('uuid', permissionsOut.items.map(item => item.headUuid))
+ .addIn('uuid', permissionsOut.items
+ .filter((item) => item.headKind === ResourceKind.COLLECTION)
+ .map(item => item.headUuid))
.getFilters(),
count: "none"
});
.getFilters(),
count: "none"
});
@@
-57,7
+62,9
@@
export class GroupDetailsPanelPermissionsMiddlewareService extends DataExplorerM
const projectsOut = await this.services.projectService.list({
filters: new FilterBuilder()
const projectsOut = await this.services.projectService.list({
filters: new FilterBuilder()
- .addIn('uuid', permissionsOut.items.map(item => item.headUuid))
+ .addIn('uuid', permissionsOut.items
+ .filter((item) => item.headKind === ResourceKind.PROJECT)
+ .map(item => item.headUuid))
.getFilters(),
count: "none"
});
.getFilters(),
count: "none"
});
@@
-69,12
+76,6
@@
export class GroupDetailsPanelPermissionsMiddlewareService extends DataExplorerM
}
}
}
}
-const groupsDetailsPanelDataExplorerIsNotSet = () =>
- snackbarActions.OPEN_SNACKBAR({
- message: 'Group permissions panel is not ready.',
- kind: SnackbarKind.ERROR
- });
-
const couldNotFetchGroupDetailsContents = () =>
snackbarActions.OPEN_SNACKBAR({
message: 'Could not fetch group permissions.',
const couldNotFetchGroupDetailsContents = () =>
snackbarActions.OPEN_SNACKBAR({
message: 'Could not fetch group permissions.',