Allow users to delete AppNamespace

CHANGES.md

@@ -23,6 +23,6 @@ Apollo 2.1.0
 * [fix(#4474):'openjdk:8-jre-alpine' potentially causing wrong number of cpu cores](https://github.com/apolloconfig/apollo/pull/4475)
 * [Switching spring-session serialization mode to json for compatibility with spring-security version updates]()
 * [fix(#4483):Fixed overwrite JSON type configuration being empty](https://github.com/apolloconfig/apollo/pull/4486)
-
+* [Allow users to delete AppNamespace](https://github.com/apolloconfig/apollo/pull/4499)
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/11?closed=1)

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/NamespaceController.java

@@ -168,15 +168,21 @@ public ResponseEntity<Void> createNamespace(@PathVariable String appId,
   }
 
   @PreAuthorize(value = "@permissionValidator.hasDeleteNamespacePermission(#appId)")
-  @DeleteMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName:.+}")
-  public ResponseEntity<Void> deleteNamespace(@PathVariable String appId, @PathVariable String env,
-                                              @PathVariable String clusterName, @PathVariable String namespaceName) {
+  @DeleteMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/linked-namespaces/{namespaceName:.+}")
+  public ResponseEntity<Void> deleteLinkedNamespace(@PathVariable String appId, @PathVariable String env,
+      @PathVariable String clusterName, @PathVariable String namespaceName) {
 
     namespaceService.deleteNamespace(appId, Env.valueOf(env), clusterName, namespaceName);
 
     return ResponseEntity.ok().build();
   }
 
+  @PreAuthorize(value = "@permissionValidator.hasDeleteNamespacePermission(#appId)")
+  @DeleteMapping("/apps/{appId}/namespaces/{namespaceName:.+}")
+  public ResponseEntity<Void> deleteNamespace(@PathVariable String appId, @PathVariable String namespaceName) {
+    return this.deleteAppNamespace(appId, namespaceName);
+  }
+
   @PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
   @DeleteMapping("/apps/{appId}/appnamespaces/{namespaceName:.+}")
   public ResponseEntity<Void> deleteAppNamespace(@PathVariable String appId, @PathVariable String namespaceName) {

apollo-portal/src/main/resources/static/i18n/en.json

@@ -41,8 +41,9 @@
   "Common.Operation": "Operation",
   "Common.Delete": "Delete",
   "Component.DeleteNamespace.Title": "Delete Namespace",
-  "Component.DeleteNamespace.PublicContent": "Deleting namespace will cause the instances unable to get the configuration of this namespace. Are you sure to delete it?",
-  "Component.DeleteNamespace.PrivateContent": "Deleting a private Namespace will cause the instances unable to get the configuration of this namespace, and the page will prompt 'missing namespace' (unless the AppNamespace is deleted by admin tool). Are you sure to delete it?",
+  "Component.DeleteNamespace.PublicContent": "Note, that the public Namespace for all environments will be deleted! This will cause the instance and the associated Namespace to fail to obtain the configuration of this Namespace. Are you sure you want to delete it?",
+  "Component.DeleteNamespace.PrivateContent": "Note, that the private Namespace for all environments will be deleted! This will cause the instance to not get the configuration of this namespace. Are you sure you want to delete it?",
+  "Component.DeleteNamespace.LinkedContent": "Note, that the namespace associated with the current environment will be deleted! This will cause the instance to not get the configuration of this namespace. Are you sure you want to delete it?",
   "Component.GrayscalePublishRule.Title": "Edit Grayscale Rule",
   "Component.GrayscalePublishRule.AppId": "Grayscale AppId",
   "Component.GrayscalePublishRule.AcceptRule": "Grayscale Application Rule",
@@ -428,8 +429,8 @@
   "Delete.ClusterNameTips": "(Please query cluster information before deletion)",
   "Delete.ClusterInfo": "Cluster information",
   "Delete.DeleteNamespace": "Delete AppNamespace",
-  "Delete.DeleteNamespaceTips": "(Note that Namespace and AppNamespace in all environments will be deleted! If you just want to delete the namespace of some environment, let the user delete it on the project page!",
-  "Delete.DeleteNamespaceTips2": "Currently users can delete the associated namespace and private namespace by themselves, but they can not delete the AppNamespace. Because deleting AppNamespace has very large impacts, it is only allowed to be deleted by system administrators for the time being. For public Namespace, it is necessary to ensure that no application associates the AppNamespace",
+  "Delete.DeleteNamespaceTips": "(Note that Namespace and AppNamespace in all environments will be deleted!",
+  "Delete.DeleteNamespaceTips2": "For public Namespace, it is necessary to ensure that no application associates the AppNamespace",
   "Delete.AppNamespaceName": "AppNamespace name",
   "Delete.AppNamespaceNameTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)",
   "Delete.AppNamespaceInfo": "AppNamespace Information",

apollo-portal/src/main/resources/static/i18n/zh-CN.json

@@ -41,8 +41,9 @@
   "Common.Operation": "操作",
   "Common.Delete": "删除",
   "Component.DeleteNamespace.Title": "删除 Namespace",
-  "Component.DeleteNamespace.PublicContent": "删除 Namespace 将导致实例获取不到此 Namespace 的配置，确定要删除吗?",
-  "Component.DeleteNamespace.PrivateContent": "删除私有 Namespace 将导致实例获取不到此 Namespace 的配置，且页面会提示缺失 Namespace（除非使用管理员工具删除 AppNamespace），确定要删除吗?",
+  "Component.DeleteNamespace.PublicContent": "注意，所有环境的公共 Namespace 都会被删除！这将导致实例以及关联的 Namespace 获取不到此 Namespace 的配置,确定要删除吗?",
+  "Component.DeleteNamespace.PrivateContent": "注意，所有环境的私有 Namespace 都会被删除！这将导致实例获取不到此 Namespace 的配置，确定要删除吗?",
+  "Component.DeleteNamespace.LinkedContent": "注意，当前环境关联的 Namespace 会被删除！这将导致实例获取不到此 Namespace 的配置,确定要删除吗?",
   "Component.GrayscalePublishRule.Title": "编辑灰度规则",
   "Component.GrayscalePublishRule.AppId": "灰度的 AppId",
   "Component.GrayscalePublishRule.AcceptRule": "灰度应用规则",
@@ -428,8 +429,8 @@
   "Delete.ClusterNameTips": "（删除前请先查询应用集群信息）",
   "Delete.ClusterInfo": "集群信息",
   "Delete.DeleteNamespace": "删除 AppNamespace",
-  "Delete.DeleteNamespaceTips": "（注意，所有环境的 Namespace 和 AppNamespace 都会被删除！如果只是要删除某个环境的 Namespace，让用户到应用页面中自行删除！）",
-  "Delete.DeleteNamespaceTips2": "目前用户可以自行删除关联的 Namespace 和私有的 Namespace，不过无法删除 AppNamespace 元信息，因为删除 AppNamespace 影响面较大，所以现在暂时只允许系统管理员删除，对于公共 Namespace 需要确保没有应用关联了该 AppNamespace。",
+  "Delete.DeleteNamespaceTips": "（注意，所有环境的 Namespace 和 AppNamespace 都会被删除!）",
+  "Delete.DeleteNamespaceTips2": "对于公共 Namespace 需要确保没有应用关联了该 AppNamespace。",
   "Delete.AppNamespaceName": "AppNamespace 名称",
   "Delete.AppNamespaceNameTips": "（非 properties 类型的 Namespace 请加上类型后缀，例如 apollo.xml）",
   "Delete.AppNamespaceInfo": "AppNamespace 信息",

apollo-portal/src/main/resources/static/scripts/directive/delete-namespace-modal-directive.js

@@ -28,8 +28,6 @@ function deleteNamespaceModalDirective($window, $q, $translate, toastr, AppUtil,
         },
         link: function (scope) {
 
-
-
             scope.doDeleteNamespace = doDeleteNamespace;
 
             EventManager.subscribe(EventManager.EventType.PRE_DELETE_NAMESPACE, function (context) {
@@ -39,24 +37,18 @@ function deleteNamespaceModalDirective($window, $q, $translate, toastr, AppUtil,
                 //1. check operator has master permission
                 checkPermission(toDeleteNamespace).then(function () {
 
-                    //2. check namespace's master branch has not instances
-                    if (!checkMasterInstance(toDeleteNamespace)) {
-                        return;
-                    }
-
-                    //3. check namespace's gray branch has not instances
-                    if (!checkBranchInstance(toDeleteNamespace)) {
-                        return;
-                    }
+                    if(toDeleteNamespace.isLinkedNamespace){
+                        //2. check namespace's master branch has not instances
+                        if (!checkMasterInstance(toDeleteNamespace)) {
+                            return;
+                        }
 
-                    if (!toDeleteNamespace.isPublic || toDeleteNamespace.isLinkedNamespace) {
-                        showDeleteNamespaceConfirmDialog();
-                    } else {
-                        //5. check public namespace has not associated namespace
-                        checkPublicNamespace(toDeleteNamespace).then(function () {
-                            showDeleteNamespaceConfirmDialog();
-                        });
+                        //3. check namespace's gray branch has not instances
+                        if (!checkBranchInstance(toDeleteNamespace)) {
+                            return;
+                        }
                     }
+                    showDeleteNamespaceConfirmDialog();
                 })
 
             });
@@ -124,6 +116,9 @@ function deleteNamespaceModalDirective($window, $q, $translate, toastr, AppUtil,
                 return true;
             }
 
+            /**
+             * @deprecated
+             */
             function checkPublicNamespace(namespace) {
                 var d = $q.defer();
 
@@ -162,9 +157,10 @@ function deleteNamespaceModalDirective($window, $q, $translate, toastr, AppUtil,
 
             function doDeleteNamespace() {
                 var toDeleteNamespace = scope.toDeleteNamespace;
-                NamespaceService.deleteNamespace(toDeleteNamespace.baseInfo.appId, scope.env,
-                    toDeleteNamespace.baseInfo.clusterName,
-                    toDeleteNamespace.baseInfo.namespaceName)
+                if(toDeleteNamespace.isLinkedNamespace){
+                    NamespaceService.deleteLinkedNamespace(toDeleteNamespace.baseInfo.appId, scope.env,
+                        toDeleteNamespace.baseInfo.clusterName,
+                        toDeleteNamespace.baseInfo.namespaceName)
                     .then(function () {
                         toastr.success($translate.instant('Common.Deleted'));
 
@@ -175,7 +171,20 @@ function deleteNamespaceModalDirective($window, $q, $translate, toastr, AppUtil,
                     }, function (result) {
                         AppUtil.showErrorMsg(result, $translate.instant('Common.DeleteFailed'));
                     })
+                }else {
+                    NamespaceService.deleteNamespace(toDeleteNamespace.baseInfo.appId,
+                        toDeleteNamespace.baseInfo.namespaceName)
+                    .then(function () {
+                        toastr.success($translate.instant('Common.Deleted'));
+
+                        setTimeout(function () {
+                            $window.location.reload();
+                        }, 1000);
 
+                    }, function (result) {
+                        AppUtil.showErrorMsg(result, $translate.instant('Common.DeleteFailed'));
+                    })
+                }
             }
 
         }

apollo-portal/src/main/resources/static/scripts/services/NamespaceService.js

@@ -37,7 +37,11 @@ appService.service("NamespaceService", ['$resource', '$q', 'AppUtil', function (
         },
         deleteNamespace: {
             method: 'DELETE',
-            url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName'
+            url: AppUtil.prefixPath() + '/apps/:appId/namespaces/:namespaceName'
+        },
+        deleteLinkedNamespace: {
+            method: 'DELETE',
+            url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/linked-namespaces/:namespaceName'
         },
         getPublicAppNamespaceAllNamespaces: {
             method: 'GET',
@@ -102,12 +106,10 @@ appService.service("NamespaceService", ['$resource', '$q', 'AppUtil', function (
         return d.promise;
     }
 
-    function deleteNamespace(appId, env, clusterName, namespaceName) {
+    function deleteNamespace(appId, namespaceName) {
         var d = $q.defer();
         namespace_source.deleteNamespace({
                                              appId: appId,
-                                             env: env,
-                                             clusterName: clusterName,
                                              namespaceName: namespaceName
                                          },
                                          function (result) {
@@ -120,6 +122,24 @@ appService.service("NamespaceService", ['$resource', '$q', 'AppUtil', function (
         return d.promise;
     }
 
+    function deleteLinkedNamespace(appId, env, clusterName, namespaceName) {
+        var d = $q.defer();
+        namespace_source.deleteLinkedNamespace({
+                appId: appId,
+                env: env,
+                clusterName: clusterName,
+                namespaceName: namespaceName
+            },
+            function (result) {
+                d.resolve(result);
+            },
+            function (result) {
+                d.reject(result);
+            });
+
+        return d.promise;
+    }
+
     function getPublicAppNamespaceAllNamespaces(env, publicNamespaceName, page, size) {
         var d = $q.defer();
         namespace_source.getPublicAppNamespaceAllNamespaces({
@@ -175,6 +195,7 @@ appService.service("NamespaceService", ['$resource', '$q', 'AppUtil', function (
         createAppNamespace: createAppNamespace,
         getNamespacePublishInfo: getNamespacePublishInfo,
         deleteNamespace: deleteNamespace,
+        deleteLinkedNamespace: deleteLinkedNamespace,
         getPublicAppNamespaceAllNamespaces: getPublicAppNamespaceAllNamespaces,
         loadAppNamespace: loadAppNamespace,
         deleteAppNamespace: deleteAppNamespace

apollo-portal/src/main/resources/static/views/component/delete-namespace-modal.html

@@ -24,9 +24,12 @@ <h4 class="modal-title">
                         {{'Component.DeleteNamespace.Title' | translate }}
                 </h4>
             </div>
-            <div class="modal-body form-horizontal" ng-show="toDeleteNamespace.isPublic">
+            <div class="modal-body form-horizontal" ng-show="toDeleteNamespace.isPublic && !toDeleteNamespace.isLinkedNamespace">
                     {{'Component.DeleteNamespace.PublicContent' | translate }}
             </div>
+            <div class="modal-body form-horizontal" ng-show="toDeleteNamespace.isPublic && toDeleteNamespace.isLinkedNamespace">
+                {{'Component.DeleteNamespace.LinkedContent' | translate }}
+            </div>
             <div class="modal-body form-horizontal" ng-show="!toDeleteNamespace.isPublic">
                     {{'Component.DeleteNamespace.PrivateContent' | translate }}
             </div>