Support grayscale feature for non-properties namespaces(#4316)

CHANGES.md

@@ -29,6 +29,6 @@ Apollo 2.2.0
 * [[Multi-Database Support][h2] Support run on h2](https://github.com/apolloconfig/apollo/pull/4851)
 * [Fix the issue that env special case handling is missing in some case](https://github.com/apolloconfig/apollo/pull/4887)
 * [Fix the issue that namespace content being cleared when identical content is pasted into the namespace](https://github.com/apolloconfig/apollo/pull/4922)
-
+* [Support grayscale feature for non-properties namespaces](https://github.com/apolloconfig/apollo/pull/4952)
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/13?closed=1)

apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js

@@ -251,7 +251,7 @@ function controller($rootScope, $scope, $translate, toastr, AppUtil, EventManage
 
         $scope.item = _.clone(toEditItem);
         $scope.item.type = String($scope.item.type || 0)
-        if (namespace.isBranch || namespace.isLinkedNamespace) {
+        if (namespace.isBranch||namespace.isLinkedNamespace) {
             var existedItem = false;
             namespace.items.forEach(function (item) {
                 if (!item.isDeleted && item.item.key == toEditItem.key) {

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

@@ -39,7 +39,7 @@ <h4 class="modal-title">
                     </label>
                     <div class="col-sm-10" valdr-form-group>
                         <input type="text" name="key" class="form-control" ng-model="item.key" tabindex="1"
-                            ng-required="true" ng-disabled="item.tableViewOperType != 'create'" />
+                            ng-required="true" ng-disabled="item.tableViewOperType == 'update'||!toOperationNamespace.isPropertiesFormat" />
                     </div>
                 </div>
                 <div class="form-group">
@@ -48,7 +48,7 @@ <h4 class="modal-title">
                         {{'Component.ConfigItem.ItemTypeName' | translate }}
                     </label>
                     <div class="col-sm-10" valdr-form-group>
-                        <select class="form-control" name="type" ng-model="item.type" ng-change="changeType()">
+                        <select class="form-control" name="type" ng-model="item.type" ng-change="changeType()" ng-disabled="!toOperationNamespace.isPropertiesFormat">
                             <option value="0">{{'Component.ConfigItem.ItemTypeString' | translate }}</option>
                             <option value="1">{{'Component.ConfigItem.ItemTypeNumber' | translate }}</option>
                             <option value="2">{{'Component.ConfigItem.ItemTypeBoolean' | translate }}</option>
@@ -86,9 +86,9 @@ <h4 class="modal-title">
 
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-2 control-label">{{'Component.ConfigItem.ItemComment' | translate }}</label>
+                    <label class="col-sm-2 control-label" ng-show="toOperationNamespace.isPropertiesFormat">{{'Component.ConfigItem.ItemComment' | translate }}</label>
                     <div class="col-sm-10" valdr-form-group>
-                        <textarea class="form-control" name="comment" ng-model="item.comment" tabindex="3" rows="2">
+                        <textarea class="form-control" name="comment" ng-model="item.comment" tabindex="3" rows="2" ng-show="toOperationNamespace.isPropertiesFormat">
                         </textarea>
                     </div>
                 </div>

apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html

@@ -69,8 +69,7 @@
             <div class="row">
                 <div class="col-md-12 pull-left">
                     <ul class="nav nav-tabs">
-                        <li role="presentation" ng-click="switchView(namespace.branch, 'table')"
-                            ng-show="namespace.isPropertiesFormat">
+                        <li role="presentation" ng-click="switchView(namespace.branch, 'table')">
                             <a ng-class="{node_active:namespace.branch.viewType == 'table'}">
                                 <img src="img/table.png">
                                 {{'Component.Namespace.Branch.Tab.Configuration' | translate }}
@@ -111,7 +110,7 @@
                     <div class="panel-heading">
                         {{'Component.Namespace.Branch.Body.Item' | translate }}
                         <button type="button" class="btn btn-primary btn-sm pull-right" style="margin-top: -4px;"
-                            ng-show="namespace.hasModifyPermission" ng-click="createItem(namespace.branch)">
+                                ng-show="namespace.isPropertiesFormat && namespace.hasModifyPermission" ng-click="createItem(namespace.branch)">
                             <img src="img/plus.png">
                             {{'Component.Namespace.Branch.Body.AddedItem' | translate }}
                         </button>

apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html

@@ -91,7 +91,7 @@
 
                 <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
                     title="{{'Component.Namespace.Master.Items.GrayscaleTips' | translate }}"
-                    ng-show="!namespace.hasBranch && namespace.isPropertiesFormat && namespace.hasModifyPermission"
+                    ng-show="!namespace.hasBranch && namespace.hasModifyPermission"
                     ng-click="preCreateBranch(namespace)">
                     <img src="img/test.png">
                     {{'Component.Namespace.Master.Items.Grayscale' | translate }}