From ef94b0942a562939fea52400f4f98639eec17e2a Mon Sep 17 00:00:00 2001 From: luke <348358584@qq.com> Date: Sat, 11 Jan 2025 16:01:23 +0800 Subject: [PATCH] feat(auth): fix some naming error and bugs --- .../resources/static/app/cluster_manage.html | 30 +++++-------------- .../resources/static/cluster/ns_role.html | 2 +- .../src/main/resources/static/config.html | 2 +- .../src/main/resources/static/i18n/en.json | 9 +++++- .../src/main/resources/static/i18n/zh-CN.json | 10 ++++++- .../role/ClusterNamespaceRoleController.js | 8 ++--- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/apollo-portal/src/main/resources/static/app/cluster_manage.html b/apollo-portal/src/main/resources/static/app/cluster_manage.html index 99da776dee1..a530eec6807 100644 --- a/apollo-portal/src/main/resources/static/app/cluster_manage.html +++ b/apollo-portal/src/main/resources/static/app/cluster_manage.html @@ -26,7 +26,7 @@ - {{'Config.ClusterManage' | translate }} + {{'Config.ManageCluster' | translate }} @@ -38,13 +38,13 @@
-

{{'Config.ClusterManage' | translate }} ( - {{'Common.AppId' | translate }}: ) +

{{'Config.ManageCluster' | translate }} ( + {{'Common.AppId' | translate }}: )

{{'Common.ReturnToIndex' | translate }} + href="{{ '/config.html' | prefixPath }}?#appid={{appId}}">{{'Common.ReturnToIndex' | translate }}
@@ -53,24 +53,8 @@

{{'Config.ClusterManage' | translate }} (
- - - - - - - - - - - - - - - - - - + +

{{'Common.Environment' | translate }}: {{env.name}} @@ -80,7 +64,7 @@

{{'Common.Environment' | translate }}: {{env.name}}
- {{'Common.Cluster' | translate }}:{{cluster.name}} + {{'Common.Cluster' | translate }}: {{cluster.name}}
diff --git a/apollo-portal/src/main/resources/static/cluster/ns_role.html b/apollo-portal/src/main/resources/static/cluster/ns_role.html index 00518f88f3d..db9b1a6fdfc 100644 --- a/apollo-portal/src/main/resources/static/cluster/ns_role.html +++ b/apollo-portal/src/main/resources/static/cluster/ns_role.html @@ -54,7 +54,7 @@

{{'Common.ReturnToIndex' | translate }} + href="{{ '/app/cluster_manage.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToClusterManagePage' | translate }}
diff --git a/apollo-portal/src/main/resources/static/config.html b/apollo-portal/src/main/resources/static/config.html index efb80dd9ef6..79bb21b6965 100644 --- a/apollo-portal/src/main/resources/static/config.html +++ b/apollo-portal/src/main/resources/static/config.html @@ -140,7 +140,7 @@ apollo-img-src="'accesskey-manage'" apollo-href="'app/access_key.html?#/appid=' + pageContext.appId"> - diff --git a/apollo-portal/src/main/resources/static/i18n/en.json b/apollo-portal/src/main/resources/static/i18n/en.json index 1f3f6a5b142..e70d4190ae4 100644 --- a/apollo-portal/src/main/resources/static/i18n/en.json +++ b/apollo-portal/src/main/resources/static/i18n/en.json @@ -455,7 +455,14 @@ "Config.SortByKey": "Filter Config by Key", "Config.FilterConfig": "Filter", "Config.Reset": "Reset", - "Config.ClusterManage": "Cluster Manage", + "Config.ManageCluster": "Manage Cluster", + "Cluster.Role.InitClusterPermissionError": "Error initializing authorization", + "Cluster.Role.GetGrantUserError": "Failed to load authorized users", + "Cluster.Role.PleaseChooseUser": "Please select the user", + "Cluster.Role.Added": "Add Successfully", + "Cluster.Role.AddFailed": "Failed to add", + "Cluster.Role.Deleted": "Delete Successfully", + "Cluster.Role.DeleteFailed": "Failed to Delete", "Delete.Title": "Delete applications, clusters, AppNamespace", "Delete.DeleteApp": "Delete application", "Delete.DeleteAppTips": "(Because deleting applications has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the application before deleting it.)", diff --git a/apollo-portal/src/main/resources/static/i18n/zh-CN.json b/apollo-portal/src/main/resources/static/i18n/zh-CN.json index 9d51ab8e8b3..d1b00c0af4b 100644 --- a/apollo-portal/src/main/resources/static/i18n/zh-CN.json +++ b/apollo-portal/src/main/resources/static/i18n/zh-CN.json @@ -35,6 +35,7 @@ "Common.Deleted": "删除成功", "Common.DeleteFailed": "删除失败", "Common.ReturnToIndex": "返回到应用首页", + "Common.ReturnToClusterManagePage": "返回到管理集群页面", "Common.Cancel": "取消", "Common.Ok": "确定", "Common.Search": "查询", @@ -370,6 +371,13 @@ "Cluster.Role.GrantPublishTo2": "（可以发布配置）", "Cluster.Role.Add": "添加", "Cluster.Role.NoPermission": "您没有权限哟!", + "Cluster.Role.InitClusterPermissionError": "初始化授权出错", + "Cluster.Role.GetGrantUserError": "加载授权用户出错", + "Cluster.Role.PleaseChooseUser": "请选择用户", + "Cluster.Role.Added": "添加成功", + "Cluster.Role.AddFailed": "添加失败", + "Cluster.Role.Deleted": "删除成功", + "Cluster.Role.DeleteFailed": "删除失败", "Config.Title": "Apollo 配置中心", "Config.AppIdNotFound": "不存在，", "Config.ClickByCreate": "点击创建", @@ -455,7 +463,7 @@ "Config.SortByKey": "按Key值过滤", "Config.FilterConfig": "过滤配置", "Config.Reset": "重置", - "Config.ClusterManage": "集群管理", + "Config.ManageCluster": "管理集群", "Delete.Title": "删除应用、集群、AppNamespace", "Delete.DeleteApp": "删除应用", "Delete.DeleteAppTips": "（由于删除应用影响面较大，所以现在暂时只允许系统管理员删除，请确保没有客户端读取该应用的配置后再做删除动作）", diff --git a/apollo-portal/src/main/resources/static/scripts/controller/role/ClusterNamespaceRoleController.js b/apollo-portal/src/main/resources/static/scripts/controller/role/ClusterNamespaceRoleController.js index be957632511..7489d803248 100644 --- a/apollo-portal/src/main/resources/static/scripts/controller/role/ClusterNamespaceRoleController.js +++ b/apollo-portal/src/main/resources/static/scripts/controller/role/ClusterNamespaceRoleController.js @@ -28,7 +28,7 @@ role_module.controller('ClusterNamespaceRoleController', }; $scope.modifyRoleSubmitBtnDisabled = false; - $scope.ReleaseRoleSubmitBtnDisabled = false; + $scope.releaseRoleSubmitBtnDisabled = false; $scope.releaseRoleWidgetId = 'releaseRoleWidgetId'; $scope.modifyRoleWidgetId = 'modifyRoleWidgetId'; @@ -62,7 +62,7 @@ role_module.controller('ClusterNamespaceRoleController', toastr.warning($translate.instant('Cluster.Role.PleaseChooseUser')); return; } - $scope.ReleaseRoleSubmitBtnDisabled = true; + $scope.releaseRoleSubmitBtnDisabled = true; var toAssignReleaseNamespacesInClusterRoleUser = user.id; var assignReleaseNamespacesInClusterRoleFunc = function (appId, env, clusterName, user) { @@ -76,12 +76,12 @@ role_module.controller('ClusterNamespaceRoleController', toAssignReleaseNamespacesInClusterRoleUser ).then(function () { toastr.success($translate.instant('Cluster.Role.Added')); - $scope.ReleaseRoleSubmitBtnDisabled = false; + $scope.releaseRoleSubmitBtnDisabled = false; $scope.rolesAssignedUsers.releaseRoleUsers.push({ userId: toAssignReleaseNamespacesInClusterRoleUser }); $('.' + $scope.releaseRoleWidgetId).select2("val", ""); }, function (result) { - $scope.ReleaseRoleSubmitBtnDisabled = false; + $scope.releaseRoleSubmitBtnDisabled = false; toastr.error(AppUtil.errorMsg(result), $translate.instant('Cluster.Role.AddFailed')); }); } else if ("ModifyNamespacesInCluster" === roleType) {