[arvados] updated: 2.7.0-6573-g9e82519ebc
git repository hosting
git at public.arvados.org
Wed Apr 24 18:07:09 UTC 2024
Summary of changes:
.../multiselect-toolbar/ms-user-details-action-set.ts | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
via 9e82519ebc14c20423cb3eb712ef7581f609dc1f (commit)
from f71ef070efb44543c313e433b049875cde445062 (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 9e82519ebc14c20423cb3eb712ef7581f609dc1f
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Wed Apr 24 14:07:03 2024 -0400
21224: moved openuserattributes to resolve circular dep Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/services/workbench2/src/views-components/multiselect-toolbar/ms-user-details-action-set.ts b/services/workbench2/src/views-components/multiselect-toolbar/ms-user-details-action-set.ts
index d9ef110741..ff54d26dd2 100644
--- a/services/workbench2/src/views-components/multiselect-toolbar/ms-user-details-action-set.ts
+++ b/services/workbench2/src/views-components/multiselect-toolbar/ms-user-details-action-set.ts
@@ -4,10 +4,24 @@
import { AdvancedIcon, AttributesIcon, UserPanelIcon } from 'components/icon/icon';
import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
-import { openUserAttributes } from 'store/users/users-actions';
import { navigateToUserProfile } from 'store/navigation/navigation-action';
import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
import { MultiSelectMenuActionSet } from './ms-menu-actions';
+import { Dispatch } from 'redux';
+import { RootState } from 'store/store';
+import { ServiceRepository } from 'services/services';
+import { dialogActions } from 'store/dialog/dialog-actions';
+import { UserResource } from 'models/user';
+import { getResource } from 'store/resources/resources';
+
+const USER_ATTRIBUTES_DIALOG = 'userAttributesDialog';
+
+const msOpenUserAttributes = (uuid: string) =>
+ (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ const { resources } = getState();
+ const data = getResource<UserResource>(uuid)(resources);
+ dispatch(dialogActions.OPEN_DIALOG({ id: USER_ATTRIBUTES_DIALOG, data }));
+ };
export const UserDetailsActionSet: MultiSelectMenuActionSet= [
[
@@ -17,7 +31,7 @@ export const UserDetailsActionSet: MultiSelectMenuActionSet= [
hasAlts: false,
isForMulti: false,
execute: (dispatch, resources) => {
- dispatch<any>(openUserAttributes(resources[0].uuid));
+ dispatch<any>(msOpenUserAttributes(resources[0].uuid));
},
},
{
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list