[arvados-workbench2] updated: 2.7.0-229-g79b9d798
git repository hosting
git at public.arvados.org
Thu Nov 30 18:39:36 UTC 2023
Summary of changes:
src/components/multiselect-toolbar/MultiselectToolbar.tsx | 4 ++--
src/store/workbench/workbench-actions.ts | 2 +-
src/views-components/multiselect-toolbar/ms-project-action-set.ts | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
via 79b9d798b16384d7429124ab99ff5bf54ec36411 (commit)
from d6a6594331db032aa563ef7868eeae1426cba909 (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 79b9d798b16384d7429124ab99ff5bf54ec36411
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Thu Nov 30 13:39:30 2023 -0500
21128: fixed frozen move error handler Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index e1ddaae8..6cf94dd0 100644
--- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -83,7 +83,7 @@ export const MultiselectToolbar = connect(
<React.Fragment>
<Toolbar
className={classes.root}
- style={{ width: `${actions.length * 2.5}rem` }}
+ style={{ width: `${(actions.length * 2.5) + 1}rem` }}
>
{actions.length ? (
actions.map((action, i) =>
@@ -229,7 +229,7 @@ function selectActionsByKind(currentResourceKinds: Array<string>, filterSet: TMu
});
}
});
-console.log(currentResourceKinds,allFiltersArray)
+
const filteredNameSet = allFiltersArray.map(filterArray => {
const resultSet = new Set<string>();
filterArray.forEach(action => resultSet.add(action.name as string || ""));
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index f2dae2c5..72b818fd 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -334,7 +334,7 @@ export const moveProject =
} catch (e) {
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: e.message,
+ message: !!(project as any).frozenByUuid ? 'Could not move frozen project.' : e.message,
hideDuration: 2000,
kind: SnackbarKind.ERROR,
})
diff --git a/src/views-components/multiselect-toolbar/ms-project-action-set.ts b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
index da20584f..a7c97bc9 100644
--- a/src/views-components/multiselect-toolbar/ms-project-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
@@ -124,6 +124,6 @@ export const msProjectActionFilter = new Set<string>([
SHARE,
VIEW_DETAILS,
]);
-export const msReadOnlyProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, OPEN_W_3RD_PARTY_CLIENT]);
-export const msFrozenProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, OPEN_W_3RD_PARTY_CLIENT, SHARE, FREEZE_PROJECT])
-export const msFilterGroupActionFilter = new Set<string>([ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, OPEN_W_3RD_PARTY_CLIENT, EDIT_PPROJECT, SHARE, MOVE_TO, ADD_TO_TRASH])
+export const msReadOnlyProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS,]);
+export const msFrozenProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, FREEZE_PROJECT])
+export const msFilterGroupActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, ADD_TO_TRASH, EDIT_PPROJECT, MOVE_TO])
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list