[ARVADOS-WORKBENCH2] updated: 1.4.1-293-g14304aae
Git user
git at public.arvados.org
Fri Aug 14 21:14:58 UTC 2020
Summary of changes:
.../collections-content-address-middleware-service.ts | 10 ++++------
src/store/data-explorer/data-explorer-middleware-service.ts | 2 +-
.../group-details-panel-middleware-service.ts | 3 ++-
src/store/sharing-dialog/sharing-dialog-actions.ts | 4 ++--
src/store/users/users-actions.ts | 2 +-
src/store/workflow-panel/workflow-panel-actions.ts | 4 ++--
.../current-token-dialog/current-token-dialog.tsx | 2 +-
src/views-components/sharing-dialog/people-select.tsx | 4 ++--
8 files changed, 15 insertions(+), 16 deletions(-)
via 14304aae3f34e0cf0a5c5275416abc26113d65e0 (commit)
via be94d8139ea574dc9e07766cad5408a8e9587b91 (commit)
via a1ec1954154e42a374f28c2f625ebc1da9d4dd07 (commit)
via 964e3cd81197d2131b5de5a77abc33dd81b2e7a4 (commit)
from 0fca724529ecc364ebbdb7bb1366ffff0d08bbd9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 14304aae3f34e0cf0a5c5275416abc26113d65e0
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri Aug 14 15:41:31 2020 -0400
16683: Take count out from list params. Fix getPublicGroupUuid
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/src/store/data-explorer/data-explorer-middleware-service.ts b/src/store/data-explorer/data-explorer-middleware-service.ts
index a7c32f42..64e6e50b 100644
--- a/src/store/data-explorer/data-explorer-middleware-service.ts
+++ b/src/store/data-explorer/data-explorer-middleware-service.ts
@@ -35,8 +35,7 @@ export const getDataExplorerColumnFilters = <T>(columns: DataColumns<T>, columnN
export const dataExplorerToListParams = (dataExplorer: DataExplorer) => ({
limit: dataExplorer.rowsPerPage,
- offset: dataExplorer.page * dataExplorer.rowsPerPage,
- count: "none"
+ offset: dataExplorer.page * dataExplorer.rowsPerPage
});
export const listResultsToDataExplorerItemsMeta = <R>({ itemsAvailable, offset, limit }: ListResults<R>) => ({
diff --git a/src/store/workflow-panel/workflow-panel-actions.ts b/src/store/workflow-panel/workflow-panel-actions.ts
index 3f91c102..bfd899fd 100644
--- a/src/store/workflow-panel/workflow-panel-actions.ts
+++ b/src/store/workflow-panel/workflow-panel-actions.ts
@@ -50,11 +50,11 @@ export const openRunProcess = (uuid: string) =>
};
export const getPublicUserUuid = (state: RootState) => {
- const prefix = getProperty<string>(UUID_PREFIX_PROPERTY_NAME)(state.properties);
+ const prefix = state.auth.localCluster;
return `${prefix}-tpzed-anonymouspublic`;
};
export const getPublicGroupUuid = (state: RootState) => {
- const prefix = getProperty<string>(UUID_PREFIX_PROPERTY_NAME)(state.properties);
+ const prefix = state.auth.localCluster;
return `${prefix}-j7d0g-anonymouspublic`;
};
commit be94d8139ea574dc9e07766cad5408a8e9587b91
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri Aug 14 14:58:44 2020 -0400
16683: Remove reference to "klingenc"
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/src/views-components/current-token-dialog/current-token-dialog.tsx b/src/views-components/current-token-dialog/current-token-dialog.tsx
index bc0071af..e5208d44 100644
--- a/src/views-components/current-token-dialog/current-token-dialog.tsx
+++ b/src/views-components/current-token-dialog/current-token-dialog.tsx
@@ -57,7 +57,7 @@ export const CurrentTokenDialog =
</Typography>
</Typography>
<Typography paragraph={true}>
- Paste the following lines at a shell prompt to set up the necessary environment for Arvados SDKs to authenticate to your klingenc account.
+ Paste the following lines at a shell prompt to set up the necessary environment for Arvados SDKs to authenticate to your account.
</Typography>
<DefaultCodeSnippet lines={[getSnippet(data)]} />
<Typography >
commit a1ec1954154e42a374f28c2f625ebc1da9d4dd07
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri Aug 14 14:49:03 2020 -0400
16683: Tweak other calls to user listing to work with federated users
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts b/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts
index dc0f2c52..13c460f8 100644
--- a/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts
+++ b/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts
@@ -76,18 +76,16 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl
}
});
const responseUsers = await this.services.userService.list({
- limit: dataExplorer.rowsPerPage,
- offset: dataExplorer.page * dataExplorer.rowsPerPage,
filters: new FilterBuilder()
.addIn('uuid', userUuids)
- .getFilters()
+ .getFilters(),
+ count: "none"
});
const responseGroups = await this.services.groupsService.list({
- limit: dataExplorer.rowsPerPage,
- offset: dataExplorer.page * dataExplorer.rowsPerPage,
filters: new FilterBuilder()
.addIn('uuid', groupUuids)
- .getFilters()
+ .getFilters(),
+ count: "none"
});
responseUsers.items.map(it => {
api.dispatch<any>(ownerNameActions.SET_OWNER_NAME({ name: it.uuid === userUuid ? 'User: Me' : `User: ${it.firstName} ${it.lastName}`, uuid: it.uuid }));
diff --git a/src/store/data-explorer/data-explorer-middleware-service.ts b/src/store/data-explorer/data-explorer-middleware-service.ts
index 219e7603..a7c32f42 100644
--- a/src/store/data-explorer/data-explorer-middleware-service.ts
+++ b/src/store/data-explorer/data-explorer-middleware-service.ts
@@ -36,6 +36,7 @@ export const getDataExplorerColumnFilters = <T>(columns: DataColumns<T>, columnN
export const dataExplorerToListParams = (dataExplorer: DataExplorer) => ({
limit: dataExplorer.rowsPerPage,
offset: dataExplorer.page * dataExplorer.rowsPerPage,
+ count: "none"
});
export const listResultsToDataExplorerItemsMeta = <R>({ itemsAvailable, offset, limit }: ListResults<R>) => ({
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 94f78a58..5aff4e7b 100644
--- a/src/store/group-details-panel/group-details-panel-middleware-service.ts
+++ b/src/store/group-details-panel/group-details-panel-middleware-service.ts
@@ -36,7 +36,8 @@ export class GroupDetailsPanelMiddlewareService extends DataExplorerMiddlewareSe
const users = await this.services.userService.list({
filters: new FilterBuilder()
.addIn('uuid', permissions.items.map(item => item.headUuid))
- .getFilters()
+ .getFilters(),
+ count: "none"
});
api.dispatch(GroupDetailsPanelActions.SET_ITEMS({
...listResultsToDataExplorerItemsMeta(permissions),
diff --git a/src/store/users/users-actions.ts b/src/store/users/users-actions.ts
index 7b12fe75..8f696fa2 100644
--- a/src/store/users/users-actions.ts
+++ b/src/store/users/users-actions.ts
@@ -157,7 +157,7 @@ export const userBindedActions = bindDataExplorerActions(USERS_PANEL_ID);
export const loadUsersData = () =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- await services.userService.list();
+ await services.userService.list({ count: "none" });
};
export const loadUsersPanel = () =>
diff --git a/src/views-components/sharing-dialog/people-select.tsx b/src/views-components/sharing-dialog/people-select.tsx
index 90235cd5..181ff078 100644
--- a/src/views-components/sharing-dialog/people-select.tsx
+++ b/src/views-components/sharing-dialog/people-select.tsx
@@ -120,11 +120,11 @@ export const PeopleSelect = connect()(
.addNotIn('group_class', [GroupClass.PROJECT])
.addILike('name', value)
.getFilters();
- const groupItems = await groupsService.list({ filters: filterGroups, limit: 5 });
+ const groupItems = await groupsService.list({ filters: filterGroups, limit: 5, count: "none" });
const filterUsers = new FilterBuilder()
.addILike('email', value)
.getFilters();
- const userItems: any = await userService.list({ filters: filterUsers, limit: 5 });
+ const userItems: any = await userService.list({ filters: filterUsers, limit: 5, count: "none" });
const items = groupItems.items.concat(userItems.items);
this.setState({ suggestions: this.props.onlyPeople ? userItems.items : items });
}
commit 964e3cd81197d2131b5de5a77abc33dd81b2e7a4
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Aug 13 14:22:40 2020 -0400
16683: Add count: "none" to sharing dialog
To work with federated user listing.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/src/store/sharing-dialog/sharing-dialog-actions.ts b/src/store/sharing-dialog/sharing-dialog-actions.ts
index 671c10fc..58fc3198 100644
--- a/src/store/sharing-dialog/sharing-dialog-actions.ts
+++ b/src/store/sharing-dialog/sharing-dialog-actions.ts
@@ -79,8 +79,8 @@ const initializeManagementForm = (permissionLinks: PermissionResource[]) =>
.addIn('uuid', permissionLinks.map(({ tailUuid }) => tailUuid))
.getFilters();
- const { items: users } = await userService.list({ filters });
- const { items: groups} = await groupsService.list({ filters });
+ const { items: users } = await userService.list({ filters, count: "none" });
+ const { items: groups } = await groupsService.list({ filters, count: "none" });
const getEmail = (tailUuid: string) => {
const user = users.find(({ uuid }) => uuid === tailUuid);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list