From e2957660cfe8578b6ea1e32d8f944f0b2263104d Mon Sep 17 00:00:00 2001
From: falser101 <zjf_0731@163.com>
Date: Wed, 13 Jul 2022 21:00:41 +0800
Subject: [PATCH] feature: compare-config Signed-off-by: jianfei.zhang
 <jianfei.zhang@daocloud.io>

---
 apollo-portal/src/main/resources/static/config/diff.html   | 7 ++++++-
 apollo-portal/src/main/resources/static/i18n/en.json       | 1 +
 apollo-portal/src/main/resources/static/i18n/zh-CN.json    | 1 +
 .../scripts/controller/config/DiffConfigController.js      | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apollo-portal/src/main/resources/static/config/diff.html b/apollo-portal/src/main/resources/static/config/diff.html
index a2f2658b501..438c2f6c8d2 100644
--- a/apollo-portal/src/main/resources/static/config/diff.html
+++ b/apollo-portal/src/main/resources/static/config/diff.html
@@ -92,6 +92,11 @@ <h4 class="modal-title">{{'Config.Diff.Title' | translate }}
                     <div class="row" style="margin-top: 10px;">
                         <div class="form-horizontal">
                             <div class="col-sm-12">
+                                <label class="control-label">
+                                    <input type="text" class="comment-toggle"
+                                           ng-model="searchKey"
+                                           placeholder="{{'Config.Diff.SearchKey' | translate }}">
+                                </label>
                                 <label class="control-label">
                                     <input type="checkbox" class="comment-toggle" ng-checked="showCommentDiff"
                                         ng-click="showCommentDiff=!showCommentDiff">
@@ -117,7 +122,7 @@ <h4 class="modal-title">{{'Config.Diff.Title' | translate }}
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        <tr ng-repeat="(key, itemsKeyedByCluster) in itemsKeyedByKey" ng-if="!onlyShowDiffKeys || (onlyShowDiffKeys && !allNamespaceValueEqualed[key])">
+                                        <tr ng-repeat="(key, itemsKeyedByCluster) in itemsKeyedByKey" ng-if="(searchKey === '' || key.indexOf(searchKey) !== -1 ) && (!onlyShowDiffKeys || (onlyShowDiffKeys && !allNamespaceValueEqualed[key]))">
                                             <td width="15%" ng-bind="key"></td>
                                             <td ng-repeat="cluster in syncData.syncToNamespaces"
                                                 ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).value">
diff --git a/apollo-portal/src/main/resources/static/i18n/en.json b/apollo-portal/src/main/resources/static/i18n/en.json
index de2a646eb5b..743f42f3687 100644
--- a/apollo-portal/src/main/resources/static/i18n/en.json
+++ b/apollo-portal/src/main/resources/static/i18n/en.json
@@ -701,6 +701,7 @@
   "Config.Diff.Tips": "By comparing configuration, you can see configuration differences between multiple environments and clusters",
   "Config.Diff.DiffCluster": "Clusters to be compared",
   "Config.Diff.HasDiffComment": "Whether to compare comments or not",
+  "Config.Diff.SearchKey": "search configuration",
   "Config.Diff.OnlyShowDiffKeys": "Only display configuration items with different values",
   "Config.Diff.PleaseChooseTwoCluster": "Please select at least two clusters",
   "ConfigExport.Title": "Config Export/Import",
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 76bf68370b0..a8e14c3a838 100644
--- a/apollo-portal/src/main/resources/static/i18n/zh-CN.json
+++ b/apollo-portal/src/main/resources/static/i18n/zh-CN.json
@@ -701,6 +701,7 @@
   "Config.Diff.Tips": "通过比较配置功能，可以查看多个环境、集群间的配置差异",
   "Config.Diff.DiffCluster": "要比较的集群",
   "Config.Diff.HasDiffComment": "是否比较注释",
+  "Config.Diff.SearchKey": "搜索配置项",
   "Config.Diff.OnlyShowDiffKeys": "是否只显示值不一样的配置项",
   "Config.Diff.PleaseChooseTwoCluster": "请至少选择两个集群",
   "ConfigExport.Title": "配置导出导入",
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js b/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js
index 5d5d7e534f9..c296d8c2000 100644
--- a/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js
+++ b/apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.js
@@ -28,10 +28,10 @@ diff_item_module.controller("DiffItemController",
             var sourceItems = [];
 
             $scope.diff = diff;
+            $scope.searchKey = ''
             $scope.syncBtnDisabled = false;
             $scope.showCommentDiff = false;
             $scope.onlyShowDiffKeys = true;
-
             $scope.collectSelectedClusters = collectSelectedClusters;
 
             $scope.syncItemNextStep = syncItemNextStep;