The error message is not user-friendly when adding duplicate permissi…

…ons. (alibaba#12773)
littlesparklet · Oct 31, 2024 · 99e3eaf · 99e3eaf
1 parent e2d44f2
commit 99e3eaf
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 13 deletions.
diff --git a/console-ui/src/locales/en-US.js b/console-ui/src/locales/en-US.js
@@ -665,6 +665,7 @@ const I18N_CONF = {
     defaultFuzzyd: 'Default fuzzy query mode opened',
     fuzzyd: "Add wildcard '*' for fuzzy query",
     query: 'Search',
+    checkPermission: 'This role permission already exists!',
   },
   NewPermissions: {
     addPermission: 'Add Permission',

diff --git a/console-ui/src/locales/zh-CN.js b/console-ui/src/locales/zh-CN.js
@@ -660,6 +660,7 @@ const I18N_CONF = {
     defaultFuzzyd: '已开启默认模糊查询',
     fuzzyd: "添加通配符'*'进行模糊查询",
     query: '查询',
+    checkPermission: '此角色权限已存在！',
   },
   NewPermissions: {
     addPermission: '添加权限',

diff --git a/console-ui/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.js b/console-ui/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.js
@@ -25,9 +25,15 @@ import {
   Form,
   Input,
   Switch,
+  Message,
 } from '@alifd/next';
 import { connect } from 'react-redux';
-import { getPermissions, createPermission, deletePermission } from '../../../reducers/authority';
+import {
+  getPermissions,
+  checkPermission,
+  createPermission,
+  deletePermission,
+} from '../../../reducers/authority';
 import { getNamespaces } from '../../../reducers/namespace';
 import RegionGroup from '../../../components/RegionGroup';
 import NewPermissions from './NewPermissions';
@@ -217,9 +223,17 @@ class PermissionsManagement extends React.Component {
         <NewPermissions
           visible={createPermissionVisible}
           onOk={permission =>
-            createPermission(permission).then(res => {
-              this.setState({ pageNo: 1 }, () => this.getPermissions());
-              return res;
+            checkPermission(permission).then(res => {
+              if (res) {
+                Message.error({
+                  content: locale.checkPermission,
+                });
+              } else {
+                createPermission(permission).then(res => {
+                  this.setState({ pageNo: 1 }, () => this.getPermissions());
+                  return res;
+                });
+              }
             })
           }
           onCancel={() => this.colseCreatePermission()}

diff --git a/console-ui/src/reducers/authority.js b/console-ui/src/reducers/authority.js
@@ -119,6 +119,15 @@ const getPermissions = params => dispatch =>
     .get('v1/auth/permissions', { params })
     .then(data => dispatch({ type: PERMISSIONS_LIST, data }));
 
+/**
+ * 添加权限前置校验
+ * @param {*} param0
+ */
+const checkPermission = ([role, resource, action]) => {
+  const params = { role, resource, action };
+  return request.get('v1/auth/permissions', { params }).then(res => res);
+};
+
 /**
  * 给角色添加权限
  * @param {*} param0
@@ -157,6 +166,7 @@ export {
   createRole,
   deleteRole,
   getPermissions,
+  checkPermission,
   createPermission,
   deletePermission,
 };
diff --git a/console/src/main/resources/static/index.html b/console/src/main/resources/static/index.html
@@ -35,7 +35,7 @@
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
 	<!-- 第三方css结束 -->
-<link href="./css/main.css?1ef6e417bc5403fb7b6c" rel="stylesheet"></head>
+<link href="./css/main.css?be606327c742ceaabb05" rel="stylesheet"></head>
 
 <body>
 	<div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
 	<script src="console-ui/public/js/merge.js"></script>
 	<script src="console-ui/public/js/loader.js"></script>
 	<!-- 第三方js结束 -->
-<script type="text/javascript" src="./js/main.js?1ef6e417bc5403fb7b6c"></script></body>
+<script type="text/javascript" src="./js/main.js?be606327c742ceaabb05"></script></body>
 
 </html>
diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js