From ba9ab932d3baac5e2f0292ee7738323a5e1acdf7 Mon Sep 17 00:00:00 2001
From: Zoe Wong <34023806+dake0805@users.noreply.github.com>
Date: Sat, 17 Jul 2021 23:06:14 +0800
Subject: [PATCH 1/3] feature: allow create public namespace in many formats

- change front-end and portal service to allow create new namespace in format json/yaml/xml/txt

- can not associating namespace of these formats now

- todo: change some documents on front-end page
---
 .../apollo/portal/service/AppNamespaceService.java       | 6 +++---
 apollo-portal/src/main/resources/static/namespace.html   | 2 +-
 .../static/scripts/controller/NamespaceController.js     | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java
index 2379be02d32..95973ec3a55 100644
--- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java
+++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppNamespaceService.java
@@ -128,9 +128,9 @@ public AppNamespace createAppNamespaceInLocal(AppNamespace appNamespace, boolean
     }
 
     // public namespaces only allow properties format
-    if (appNamespace.isPublic()) {
-      appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
-    }
+//    if (appNamespace.isPublic()) {
+//      appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
+//    }
 
     StringBuilder appNamespaceName = new StringBuilder();
     //add prefix postfix
diff --git a/apollo-portal/src/main/resources/static/namespace.html b/apollo-portal/src/main/resources/static/namespace.html
index ce0798f54a6..c90653664c3 100644
--- a/apollo-portal/src/main/resources/static/namespace.html
+++ b/apollo-portal/src/main/resources/static/namespace.html
@@ -123,7 +123,7 @@
                                 </div>
 
                                 <!--public namespace can only be properties -->
-                                <div class="col-sm-2" ng-show="!appNamespace.isPublic">
+                                <div class="col-sm-2">
                                     <select class="form-control" name="format" ng-model="appNamespace.format">
                                         <option value="properties">properties</option>
                                         <option value="xml">xml</option>
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/NamespaceController.js b/apollo-portal/src/main/resources/static/scripts/controller/NamespaceController.js
index df34660badb..2dae42b56bb 100644
--- a/apollo-portal/src/main/resources/static/scripts/controller/NamespaceController.js
+++ b/apollo-portal/src/main/resources/static/scripts/controller/NamespaceController.js
@@ -86,7 +86,8 @@ namespace_module.controller("LinkNamespaceController",
             };
 
             function shouldAppendNamespacePrefix() {
-                 return $scope.appNamespace.isPublic ? $scope.appendNamespacePrefix : false;
+                //return $scope.appNamespace.isPublic ? $scope.appendNamespacePrefix : false;
+                return  $scope.appendNamespacePrefix;
             }
 
             var selectedClusters = [];
@@ -150,9 +151,9 @@ namespace_module.controller("LinkNamespaceController",
                     }
 
                     // public namespaces only allow properties format
-                    if ($scope.appNamespace.isPublic) {
-                        $scope.appNamespace.format = 'properties';
-                    }
+                    // if ($scope.appNamespace.isPublic) {
+                    //     $scope.appNamespace.format = 'properties';
+                    // }
 
                     $scope.submitBtnDisabled = true;
                     //only append namespace prefix for public app namespace

From 7650b7c348f027cf37da4562bf27469a1ce5e2bc Mon Sep 17 00:00:00 2001
From: ZoeWong <dake0805@gmail.com>
Date: Sun, 18 Jul 2021 18:20:37 +0800
Subject: [PATCH 2/3] feature: portal front-end can request associate namespace
 info

---
 .../static/scripts/directive/namespace-panel-directive.js      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
index 2d4337ee2e2..d57a671b868 100644
--- a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
+++ b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
@@ -312,7 +312,7 @@ function directive($window, $translate, toastr, AppUtil, EventManager, Permissio
                 }
 
                 function initLinkedNamespace(namespace) {
-                    if (!namespace.isPublic || !namespace.isLinkedNamespace || namespace.format != 'properties') {
+                    if (!namespace.isPublic || !namespace.isLinkedNamespace) {
                         return;
                     }
                     //load public namespace
@@ -320,6 +320,7 @@ function directive($window, $translate, toastr, AppUtil, EventManager, Permissio
                         namespace.baseInfo.namespaceName)
                         .then(function (result) {
                             var publicNamespace = result;
+                            console.log(publicNamespace);
                             namespace.publicNamespace = publicNamespace;
 
                             var linkNamespaceItemKeys = [];

From 8b73d201c6ad1e5536b10a343b99068e41ebe232 Mon Sep 17 00:00:00 2001
From: ZoeWong <dake0805@gmail.com>
Date: Tue, 20 Jul 2021 22:18:51 +0800
Subject: [PATCH 3/3] feature: public namespace in many formats

---
 .../directive/namespace-panel-directive.js    |  9 ++++-
 .../component/namespace-panel-master-tab.html | 37 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
index d57a671b868..b2cee3a4561 100644
--- a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
+++ b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
@@ -320,7 +320,6 @@ function directive($window, $translate, toastr, AppUtil, EventManager, Permissio
                         namespace.baseInfo.namespaceName)
                         .then(function (result) {
                             var publicNamespace = result;
-                            console.log(publicNamespace);
                             namespace.publicNamespace = publicNamespace;
 
                             var linkNamespaceItemKeys = [];
@@ -345,9 +344,15 @@ function directive($window, $translate, toastr, AppUtil, EventManager, Permissio
                                     publicNamespace.hasPublishedItem = true;
                                 }
                             });
-
+                            loadParentNamespaceText(namespace);
                         });
+                }
 
+                function loadParentNamespaceText(namespace){
+                    namespace.publicNamespaceText = "";
+                    if(namespace.isLinkedNamespace) {
+                        namespace.publicNamespaceText = parseModel2Text(namespace.publicNamespace)
+                    }
                 }
 
                 function initNamespaceViewName(namespace) {
diff --git a/apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html b/apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
index acb4ac3af3e..8c5ffaa0dd0 100644
--- a/apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
+++ b/apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
@@ -713,11 +713,23 @@ <h5>{{'Component.Namespace.Master.Items.Body.NoPublished.Title' | translate }}</
             </div>
 
             <!--text view-->
+
+            <div class="panel-heading" ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace">
+                <div class="row">
+                    <div class="padding-top-5 col-md-4 col-sm-4">
+                        {{'Component.Namespace.Master.Items.Body.Link.Title' | translate }}
+                    </div>
+                </div>
+            </div>
+
             <!--只读模式下的文本内容,不替换换行符-->
             <div ui-ace="aceConfig" readonly="true" class="form-control no-radius"
                 rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
                 ng-show="namespace.viewType == 'text' && !namespace.isTextEditing" ng-model="namespace.text">
             </div>
+
+
+
             <!--编辑状态下的文本内容,会过滤掉换行符-->
             <div ui-ace="aceConfig" class="form-control no-radius"
                 rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
@@ -725,6 +737,31 @@ <h5>{{'Component.Namespace.Master.Items.Body.NoPublished.Title' | translate }}</
                 ng-model="namespace.editText">
             </div>
 
+
+
+            <div class="panel-heading" ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace">
+                <div class="row">
+                    <div class="padding-top-5 col-md-4 col-sm-4">
+                        {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }}
+                        <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}"
+                           target="_blank">
+                            <small>
+                                ({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}},
+                                {{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}})
+                            </small>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+
+            <!--关联的 Parent Namespace 内容,只读模式,不替换换行符-->
+            <div ui-ace="aceConfig" readonly="true" class="form-control no-radius"
+                 rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
+                 ng-show="namespace.viewType == 'text' && namespace.isLinkedNamespace"
+                 ng-model="namespace.publicNamespaceText">
+            </div>
+
             <!--history view-->
             <div class="J_historyview history-view" ng-show="namespace.viewType == 'history'">
                 <div class="media" ng-show="namespace.commits && namespace.commits.length"