projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18559: Remove dead code
[arvados-workbench2.git]
/
src
/
store
/
group-details-panel
/
group-details-panel-members-middleware-service.ts
diff --git
a/src/store/group-details-panel/group-details-panel-members-middleware-service.ts
b/src/store/group-details-panel/group-details-panel-members-middleware-service.ts
index 05a12d22a4f7afac41b13dc69d25c05fb5b511d7..3a58927aac7cd3da6a3c41d13aef2fa3161dc82a 100644
(file)
--- a/
src/store/group-details-panel/group-details-panel-members-middleware-service.ts
+++ b/
src/store/group-details-panel/group-details-panel-members-middleware-service.ts
@@
-12,6
+12,7
@@
import { FilterBuilder } from 'services/api/filter-builder';
import { updateResources } from 'store/resources/resources-actions';
import { getCurrentGroupDetailsPanelUuid, GroupMembersPanelActions } from 'store/group-details-panel/group-details-panel-actions';
import { LinkClass } from 'models/link';
import { updateResources } from 'store/resources/resources-actions';
import { getCurrentGroupDetailsPanelUuid, GroupMembersPanelActions } from 'store/group-details-panel/group-details-panel-actions';
import { LinkClass } from 'models/link';
+import { ResourceKind } from 'models/resource';
export class GroupDetailsPanelMembersMiddlewareService extends DataExplorerMiddlewareService {
export class GroupDetailsPanelMembersMiddlewareService extends DataExplorerMiddlewareService {
@@
-23,9
+24,13
@@
export class GroupDetailsPanelMembersMiddlewareService extends DataExplorerMiddl
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());
+ // Noop if data explorer refresh is triggered from another panel
+ return;
} else {
try {
} else {
try {
+ const groupResource = await this.services.groupsService.get(groupUuid);
+ api.dispatch(updateResources([groupResource]));
+
const permissionsIn = await this.services.permissionService.list({
filters: new FilterBuilder()
.addEqual('head_uuid', groupUuid)
const permissionsIn = await this.services.permissionService.list({
filters: new FilterBuilder()
.addEqual('head_uuid', groupUuid)
@@
-41,7
+46,9
@@
export class GroupDetailsPanelMembersMiddlewareService extends DataExplorerMiddl
const usersIn = await this.services.userService.list({
filters: new FilterBuilder()
const usersIn = await this.services.userService.list({
filters: new FilterBuilder()
- .addIn('uuid', permissionsIn.items.map(item => item.tailUuid))
+ .addIn('uuid', permissionsIn.items
+ .filter((item) => item.tailKind === ResourceKind.USER)
+ .map(item => item.tailUuid))
.getFilters(),
count: "none"
});
.getFilters(),
count: "none"
});
@@
-49,7
+56,9
@@
export class GroupDetailsPanelMembersMiddlewareService extends DataExplorerMiddl
const projectsIn = await this.services.projectService.list({
filters: new FilterBuilder()
const projectsIn = await this.services.projectService.list({
filters: new FilterBuilder()
- .addIn('uuid', permissionsIn.items.map(item => item.tailUuid))
+ .addIn('uuid', permissionsIn.items
+ .filter((item) => item.tailKind === ResourceKind.PROJECT)
+ .map(item => item.tailUuid))
.getFilters(),
count: "none"
});
.getFilters(),
count: "none"
});
@@
-61,12
+70,6
@@
export class GroupDetailsPanelMembersMiddlewareService extends DataExplorerMiddl
}
}
}
}
-const groupsDetailsPanelDataExplorerIsNotSet = () =>
- snackbarActions.OPEN_SNACKBAR({
- message: 'Group members panel is not ready.',
- kind: SnackbarKind.ERROR
- });
-
const couldNotFetchGroupDetailsContents = () =>
snackbarActions.OPEN_SNACKBAR({
message: 'Could not fetch group members.',
const couldNotFetchGroupDetailsContents = () =>
snackbarActions.OPEN_SNACKBAR({
message: 'Could not fetch group members.',