projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15781: Fixes project tag add/delete error handling.
[arvados-workbench2.git]
/
src
/
store
/
group-details-panel
/
group-details-panel-middleware-service.ts
diff --git
a/src/store/group-details-panel/group-details-panel-middleware-service.ts
b/src/store/group-details-panel/group-details-panel-middleware-service.ts
index a318696de7835989db5843a94f01e9f0fb63a5a0..94f78a58e75116e32febd2164a6a346508a40fa4 100644
(file)
--- a/
src/store/group-details-panel/group-details-panel-middleware-service.ts
+++ b/
src/store/group-details-panel/group-details-panel-middleware-service.ts
@@
-20,48
+20,31
@@
export class GroupDetailsPanelMiddlewareService extends DataExplorerMiddlewareSe
}
async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
}
async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
-
const dataExplorer = getDataExplorer(api.getState().dataExplorer, this.getId());
const groupUuid = getCurrentGroupDetailsPanelUuid(api.getState().properties);
const dataExplorer = getDataExplorer(api.getState().dataExplorer, this.getId());
const groupUuid = getCurrentGroupDetailsPanelUuid(api.getState().properties);
-
if (!dataExplorer || !groupUuid) {
if (!dataExplorer || !groupUuid) {
-
api.dispatch(groupsDetailsPanelDataExplorerIsNotSet());
api.dispatch(groupsDetailsPanelDataExplorerIsNotSet());
-
} else {
} else {
-
try {
try {
-
const permissions = await this.services.permissionService.list({
const permissions = await this.services.permissionService.list({
-
filters: new FilterBuilder()
filters: new FilterBuilder()
- .addEqual('tail
U
uid', groupUuid)
- .addEqual('link
C
lass', LinkClass.PERMISSION)
+ .addEqual('tail
_u
uid', groupUuid)
+ .addEqual('link
_c
lass', LinkClass.PERMISSION)
.getFilters()
.getFilters()
-
});
});
-
api.dispatch(updateResources(permissions.items));
api.dispatch(updateResources(permissions.items));
-
- api.dispatch(GroupDetailsPanelActions.SET_ITEMS({
- ...listResultsToDataExplorerItemsMeta(permissions),
- items: permissions.items.map(item => item.uuid),
- }));
-
const users = await this.services.userService.list({
const users = await this.services.userService.list({
-
filters: new FilterBuilder()
.addIn('uuid', permissions.items.map(item => item.headUuid))
.getFilters()
filters: new FilterBuilder()
.addIn('uuid', permissions.items.map(item => item.headUuid))
.getFilters()
-
});
});
-
+ api.dispatch(GroupDetailsPanelActions.SET_ITEMS({
+ ...listResultsToDataExplorerItemsMeta(permissions),
+ items: users.items.map(item => item.uuid),
+ }));
api.dispatch(updateResources(users.items));
api.dispatch(updateResources(users.items));
-
} catch (e) {
} catch (e) {
-
api.dispatch(couldNotFetchGroupDetailsContents());
api.dispatch(couldNotFetchGroupDetailsContents());
-
}
}
}
}
}
}
@@
-69,7
+52,8
@@
export class GroupDetailsPanelMiddlewareService extends DataExplorerMiddlewareSe
const groupsDetailsPanelDataExplorerIsNotSet = () =>
snackbarActions.OPEN_SNACKBAR({
const groupsDetailsPanelDataExplorerIsNotSet = () =>
snackbarActions.OPEN_SNACKBAR({
- message: 'Group details panel is not ready.'
+ message: 'Group details panel is not ready.',
+ kind: SnackbarKind.ERROR
});
const couldNotFetchGroupDetailsContents = () =>
});
const couldNotFetchGroupDetailsContents = () =>