projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15020-collection-with-the-same-content-adress'
[arvados-workbench2.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..7a5d93cc6e4ba1502f1efd01bd61bfa332f40196 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 { 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';
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()
}
const filters = new FilterBuilder()
- .add
Equal('groupClass', null
)
+ .add
NotIn('groupClass', [GroupClass.PROJECT]
)
.addILike('name', dataExplorer.searchValue)
.getFilters();
.addILike('name', dataExplorer.searchValue)
.getFilters();
@@
-64,6
+64,16
@@
export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
items: response.items.map(item => item.uuid),
}));
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) {
} catch (e) {
@@
-76,7
+86,8
@@
export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
const groupsPanelDataExplorerIsNotSet = () =>
snackbarActions.OPEN_SNACKBAR({
const groupsPanelDataExplorerIsNotSet = () =>
snackbarActions.OPEN_SNACKBAR({
- message: 'Groups panel is not ready.'
+ message: 'Groups panel is not ready.',
+ kind: SnackbarKind.ERROR
});
const couldNotFetchFavoritesContents = () =>
});
const couldNotFetchFavoritesContents = () =>