[arvados-workbench2] updated: 2.7.0-215-gbead3b28
git repository hosting
git at public.arvados.org
Fri Nov 24 17:56:38 UTC 2023
Summary of changes:
cypress/integration/project.spec.js | 2 +-
.../multiselect-toolbar/MultiselectToolbar.tsx | 3 -
src/store/collections/collection-info-actions.ts | 82 +++++++++++++++++++++-
src/views/collection-panel/collection-panel.tsx | 2 +-
4 files changed, 83 insertions(+), 6 deletions(-)
via bead3b2896eaaceb9b9a3c805d40e8048c93b218 (commit)
from 14e2af3f458ac220ff88cb059cea7f3568595cfc (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 bead3b2896eaaceb9b9a3c805d40e8048c93b218
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Fri Nov 24 12:56:31 2023 -0500
21128: copied collection action to fix dependency Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/cypress/integration/project.spec.js b/cypress/integration/project.spec.js
index a8663d86..e6113821 100644
--- a/cypress/integration/project.spec.js
+++ b/cypress/integration/project.spec.js
@@ -564,7 +564,7 @@ describe("Project tests", function () {
);
});
- it.only("sorts displayed items correctly", () => {
+ it("sorts displayed items correctly", () => {
cy.loginAs(activeUser);
cy.get('[data-cy=project-panel] button[title="Select columns"]').click();
diff --git a/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 780d7c43..72d375ff 100644
--- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -62,9 +62,6 @@ export const MultiselectToolbar = connect(
const currentPathIsTrash = window.location.pathname === "/trash";
-console.log(currentPathIsTrash && selectedToKindSet(checkedList).size)
-
-
const actions =
currentPathIsTrash && selectedToKindSet(checkedList).size
? [msToggleTrashAction]
diff --git a/src/store/collections/collection-info-actions.ts b/src/store/collections/collection-info-actions.ts
index 6107c409..772def29 100644
--- a/src/store/collections/collection-info-actions.ts
+++ b/src/store/collections/collection-info-actions.ts
@@ -2,12 +2,18 @@
//
// SPDX-License-Identifier: AGPL-3.0
+import { ofType, unionize } from 'common/unionize';
import { Dispatch } from "redux";
import { RootState } from "store/store";
import { ServiceRepository } from "services/services";
import { dialogActions } from 'store/dialog/dialog-actions';
-import { getNewExtraToken } from "../auth/auth-action";
import { CollectionResource } from "models/collection";
+import { SshKeyResource } from 'models/ssh-key';
+import { User } from "models/user";
+import { Session } from "models/session";
+import { Config } from 'common/config';
+import { createServices, setAuthorizationHeader } from "services/services";
+import { getTokenV2 } from 'models/api-client-authorization';
export const COLLECTION_WEBDAV_S3_DIALOG_NAME = 'collectionWebdavS3Dialog';
@@ -42,3 +48,77 @@ export const openWebDavS3InfoDialog = (uuid: string, activeTab?: number) =>
}
}));
};
+
+const authActions = unionize({
+ LOGIN: {},
+ LOGOUT: ofType<{ deleteLinkData: boolean, preservePath: boolean }>(),
+ SET_CONFIG: ofType<{ config: Config }>(),
+ SET_EXTRA_TOKEN: ofType<{ extraApiToken: string, extraApiTokenExpiration?: Date }>(),
+ RESET_EXTRA_TOKEN: {},
+ INIT_USER: ofType<{ user: User, token: string, tokenExpiration?: Date, tokenLocation?: string }>(),
+ USER_DETAILS_REQUEST: {},
+ USER_DETAILS_SUCCESS: ofType<User>(),
+ SET_SSH_KEYS: ofType<SshKeyResource[]>(),
+ ADD_SSH_KEY: ofType<SshKeyResource>(),
+ REMOVE_SSH_KEY: ofType<string>(),
+ SET_HOME_CLUSTER: ofType<string>(),
+ SET_SESSIONS: ofType<Session[]>(),
+ ADD_SESSION: ofType<Session>(),
+ REMOVE_SESSION: ofType<string>(),
+ UPDATE_SESSION: ofType<Session>(),
+ REMOTE_CLUSTER_CONFIG: ofType<{ config: Config }>(),
+});
+
+const getConfig = (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Config => {
+ const state = getState().auth;
+ return state.remoteHostsConfig[state.localCluster];
+};
+
+const getNewExtraToken =
+ (reuseStored: boolean = false) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ const extraToken = getState().auth.extraApiToken;
+ if (reuseStored && extraToken !== undefined) {
+ const config = dispatch<any>(getConfig);
+ const svc = createServices(config, { progressFn: () => {}, errorFn: () => {} });
+ setAuthorizationHeader(svc, extraToken);
+ try {
+ // Check the extra token's validity before using it. Refresh its
+ // expiration date just in case it changed.
+ const client = await svc.apiClientAuthorizationService.get('current');
+ dispatch(
+ authActions.SET_EXTRA_TOKEN({
+ extraApiToken: extraToken,
+ extraApiTokenExpiration: client.expiresAt ? new Date(client.expiresAt) : undefined,
+ })
+ );
+ return extraToken;
+ } catch (e) {
+ dispatch(authActions.RESET_EXTRA_TOKEN());
+ }
+ }
+ const user = getState().auth.user;
+ const loginCluster = getState().auth.config.clusterConfig.Login.LoginCluster;
+ if (user === undefined) {
+ return;
+ }
+ if (loginCluster !== '' && getState().auth.homeCluster !== loginCluster) {
+ return;
+ }
+ try {
+ // Do not show errors on the create call, cluster security configuration may not
+ // allow token creation and there's no way to know that from workbench2 side in advance.
+ const client = await services.apiClientAuthorizationService.create(undefined, false);
+ const newExtraToken = getTokenV2(client);
+ dispatch(
+ authActions.SET_EXTRA_TOKEN({
+ extraApiToken: newExtraToken,
+ extraApiTokenExpiration: client.expiresAt ? new Date(client.expiresAt) : undefined,
+ })
+ );
+ return newExtraToken;
+ } catch {
+ console.warn("Cannot create new tokens with the current token, probably because of cluster's security settings.");
+ return;
+ }
+ };
\ No newline at end of file
diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx
index d93d6e92..28983457 100644
--- a/src/views/collection-panel/collection-panel.tsx
+++ b/src/views/collection-panel/collection-panel.tsx
@@ -350,7 +350,7 @@ export const CollectionDetailsAttributes = (props: CollectionDetailsProps) => {
</Grid>
<Grid item xs={12} md={mdSize}>
<DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='Storage classes' value={item.storageClassesDesired.join(', ')} />
+ label='Storage classes' value={item.storageClassesDesired ? item.storageClassesDesired.join(', ') : ["default"]} />
</Grid>
{/*
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list