From 1dde4ffa7f6d72b7860e7f0010101ac6d9bd50e8 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 10 Nov 2023 22:57:57 +0300 Subject: [PATCH] Move operation condition from backend to client --- .../Grid/GridElements/GridOperations.vue | 3 +- client/src/components/Grid/GridList.vue | 1 + .../src/components/Grid/configs/adminUsers.ts | 113 +++++++++++++++++- client/src/components/plugins/icons.js | 2 + .../webapps/galaxy/controllers/admin.py | 19 --- 5 files changed, 112 insertions(+), 26 deletions(-) diff --git a/client/src/components/Grid/GridElements/GridOperations.vue b/client/src/components/Grid/GridElements/GridOperations.vue index d135109286f..758446765a3 100644 --- a/client/src/components/Grid/GridElements/GridOperations.vue +++ b/client/src/components/Grid/GridElements/GridOperations.vue @@ -10,6 +10,7 @@ library.add(faCaretDown); interface Props { rowData: RowData; operations: Array; + title: string; } const props = defineProps(); @@ -35,7 +36,7 @@ function hasCondition(conditionHandler: (rowData: RowData) => Boolean) { aria-expanded="false" class="ui-link font-weight-bold"> - {{ rowData.title }} + {{ title }}
diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue index 16254deeec9..d017fbc9913 100644 --- a/client/src/components/Grid/GridList.vue +++ b/client/src/components/Grid/GridList.vue @@ -254,6 +254,7 @@ watch(operationMessage, () => { v-if="fieldEntry.type == 'operations' && fieldEntry.operations" :operations="fieldEntry.operations" :row-data="rowData" + :title="rowData[fieldEntry.key]" @execute="onOperation($event, rowData)" /> { - window.location.href = withPrefix(`/plugins/visualizations/${data.type}/saved?id=${data.id}`); - }, + title: "Email", + type: "operations", + condition: (data: UserEntry) => !data.deleted, + operations: [ + { + title: "Manage Information", + icon: "user", + condition: (data: UserEntry) => !data.deleted, + handler: (data: UserEntry, router: Router) => { + router.push(`/user/information?id=${data.id}`); + }, + }, + { + title: "Manage Roles and Groups", + icon: "users", + condition: (data: UserEntry) => !data.deleted, + handler: (data: UserEntry, router: Router) => { + router.push(`/admin/form/manage_roles_and_groups_for_user?id=${data.id}`); + }, + }, + { + title: "Reset Password", + icon: "unlock", + condition: (data: UserEntry) => !data.deleted, + handler: (data: UserEntry, router: Router) => { + router.push(`/admin/form/reset_user_password?id=${data.id}`); + }, + }, + { + title: "Recalculate Disk Usage", + icon: "calculator", + condition: (data: UserEntry) => !data.deleted, + handler: async (data: UserEntry) => { + try { + await axios.put(`/api/visualizations/${data.id}`, { deleted: true }); + return { + status: "success", + message: `Disk usage of '${data.title}' has been recalculated.`, + }; + } catch (e) { + return { + status: "danger", + message: `Failed to recalculate disk usage of '${data.title}': ${errorMessageAsString(e)}.`, + }; + } + }, + }, + { + title: "Generate New API Key", + icon: "key", + condition: (data: UserEntry) => !data.deleted, + handler: async (data: UserEntry) => { + try { + await axios.put(`/api/visualizations/${data.id}`, { deleted: true }); + return { + status: "success", + message: `New API Key for '${data.title}' has been generated.`, + }; + } catch (e) { + return { + status: "danger", + message: `Failed to generate new API Key for '${data.title}': ${errorMessageAsString(e)}.`, + }; + } + }, + }, + { + title: "Delete", + icon: "trash", + condition: (data: UserEntry) => !data.deleted /* && config.allow_user_deletion */, + handler: async (data: UserEntry) => { + try { + await axios.delete(`/api/users/${data.id}`); + return { + status: "success", + message: `'${data.username}' has been deleted.`, + }; + } catch (e) { + return { + status: "danger", + message: `Failed to delete '${data.username}': ${errorMessageAsString(e)}`, + }; + } + }, + }, + { + title: "Restore", + icon: "trash-restore", + condition: (data: UserEntry) => data.deleted, + handler: async (data: UserEntry) => { + try { + await axios.post(`/api/users/deleted/${data.id}/undelete`); + return { + status: "success", + message: `'${data.username}' has been restored.`, + }; + } catch (e) { + return { + status: "danger", + message: `Failed to restore '${data.username}': ${errorMessageAsString(e)}`, + }; + } + }, + }, + ], }, { key: "username", diff --git a/client/src/components/plugins/icons.js b/client/src/components/plugins/icons.js index ea99ce1fe0f..f0d6d8688ef 100644 --- a/client/src/components/plugins/icons.js +++ b/client/src/components/plugins/icons.js @@ -4,6 +4,7 @@ import { faBell, faBolt, faBurn, + faCalculator, faChartArea, faChartBar, faCheckSquare, @@ -57,6 +58,7 @@ library.add( faBell, faBolt, faBurn, + faCalculator, faChartArea, faChartBar, faCheckSquare, diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py index ddc554fa192..dac3fc8522c 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -616,8 +616,6 @@ class AdminGalaxy(controller.JSAppLauncher): @web.json @web.require_admin def users_list(self, trans, **kwd): - message = kwd.get("message", "") - status = kwd.get("status", "") if "operation" in kwd: id = kwd.get("id") if not id: @@ -638,23 +636,6 @@ class AdminGalaxy(controller.JSAppLauncher): message, status = self._activate_user(trans, id) elif operation == "resend activation email": message, status = self._resend_activation_email(trans, id) - if message and status: - kwd["message"] = util.sanitize_text(message) - kwd["status"] = status - if trans.app.config.allow_user_deletion: - if self.delete_operation not in self.user_list_grid.operations: - self.user_list_grid.operations.append(self.delete_operation) - if self.undelete_operation not in self.user_list_grid.operations: - self.user_list_grid.operations.append(self.undelete_operation) - if self.purge_operation not in self.user_list_grid.operations: - self.user_list_grid.operations.append(self.purge_operation) - if trans.app.config.allow_user_impersonation: - if self.impersonate_operation not in self.user_list_grid.operations: - self.user_list_grid.operations.append(self.impersonate_operation) - if trans.app.config.user_activation_on: - if self.activate_operation not in self.user_list_grid.operations: - self.user_list_grid.operations.append(self.activate_operation) - self.user_list_grid.operations.append(self.resend_activation_email) return self.user_list_grid(trans, **kwd) @web.legacy_expose_api