From 456af8f373d9fbbda4c0b5e5b43c12900873dd42 Mon Sep 17 00:00:00 2001
From: "peng.jianhua" <peng.jianhua@zte.com.cn>
Date: Tue, 12 Dec 2017 10:09:44 +0800
Subject: [PATCH 1/1] KYLIN-3061 When we cancel the Topic modification for
 'Kafka Setting' of streaming table, the 'Cancel' operation will make a
 mistake.

---
 webapp/app/js/controllers/streamingConfig.js       | 35 +++++++++++++++++++---
 .../app/partials/cubeDesigner/streamingConfig.html | 20 +++++++++----
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/webapp/app/js/controllers/streamingConfig.js b/webapp/app/js/controllers/streamingConfig.js
index 32b09c6..3e0ed66 100644
--- a/webapp/app/js/controllers/streamingConfig.js
+++ b/webapp/app/js/controllers/streamingConfig.js
@@ -68,11 +68,17 @@ KylinApp.controller('streamingConfigCtrl', function ($scope,StreamingService, $q
 
   $scope.addBroker = function (cluster,broker) {
     //$scope.modelsManager.selectedModel = model;
-    cluster.newBroker=(!!broker)?broker:StreamingModel.createBrokerConfig();
+	if(!!broker){
+	  cluster.newBroker = {};
+	  angular.copy(broker, cluster.newBroker);
+	  cluster.edit_index = cluster.brokers.indexOf(broker);
+	}else{
+	  cluster.newBroker = StreamingModel.createBrokerConfig();
+	}
   };
 
   $scope.removeNewBroker = function (cluster){
-    delete cluster.newBroker;
+    $scope.clearNewBroker(cluster);
   }
 
   $scope.removeElement = function (cluster, element) {
@@ -80,16 +86,37 @@ KylinApp.controller('streamingConfigCtrl', function ($scope,StreamingService, $q
     if (index > -1) {
       cluster.brokers.splice(index, 1);
     }
+    $scope.clearNewBroker(cluster);
   };
 
   $scope.saveNewBroker = function(cluster){
-    if (cluster.brokers.indexOf(cluster.newBroker) === -1) {
+    if ($scope.isIDExistentInArray(cluster.brokers,cluster.newBroker)) {
+      if (cluster.edit_index > -1) {
+        cluster.brokers.splice(cluster.edit_index, 1, cluster.newBroker);
+      }else{
+        SweetAlert.swal('', 'The new record ID already exists.', 'warning');
+        return;
+      }
+	}else{
       cluster.brokers.push(cluster.newBroker);
     }
-    delete cluster.newBroker;
+    $scope.clearNewBroker(cluster);
   }
 
+  $scope.isIDExistentInArray = function(arr,obj){
+      if(!arr || arr.length === 0){
+        return false;
+      }
+      for(var i=0; i<arr.length; i++) {
+        if(arr[i].id == obj.id){
+            return true;
+        }
+      }
+      return false;
+    }
+
   $scope.clearNewBroker = function(cluster){
+	delete cluster.edit_index;
     delete cluster.newBroker;
   }
 
diff --git a/webapp/app/partials/cubeDesigner/streamingConfig.html b/webapp/app/partials/cubeDesigner/streamingConfig.html
index 24b3438..3b7801e 100644
--- a/webapp/app/partials/cubeDesigner/streamingConfig.html
+++ b/webapp/app/partials/cubeDesigner/streamingConfig.html
@@ -66,12 +66,22 @@
             </thead>
             <tbody>
             <tr ng-repeat="broker in cluster.brokers| filter: state.measureFilter track by $index">
-              <td>{{broker.id}}</td>
-              <td>{{broker.host}}</td>
-              <td>{{broker.port}}</td>
+              <td style="vertical-align: middle;">{{broker.id}}</td>
+              <td ng-if="cluster.edit_index!=$index">{{broker.host}}</td>
+              <td ng-if="cluster.edit_index==$index">
+                <div class="input-group">
+                  <input class="form-control" type="text" ng-model="cluster.newBroker.host" name="broker_host" placeholder="Input broker host">
+                </div>
+              </td>
+              <td ng-if="cluster.edit_index!=$index">{{broker.port}}</td>
+              <td ng-if="cluster.edit_index==$index">
+                <div class="input-group">
+                  <input class="form-control" type="text" ng-model="cluster.newBroker.port" name="broker_port" placeholder="Input broker port" onInput="this.value=this.value.replace(/[^0-9]/g, '')">
+                </div>
+              </td>
               <td ng-if="state.mode=='edit'">
                 <!--Edit Button -->
-                <button class="btn btn-xs btn-info" ng-click="addBroker(cluster,broker)">
+                <button ng-if="cluster.edit_index!=$index" class="btn btn-xs btn-info" ng-click="addBroker(cluster,broker)">
                   <i class="fa fa-pencil"></i>
                 </button>
 
@@ -79,7 +89,7 @@
                 </button>
               </td>
             </tr>
-            <tr ng-if="cluster.newBroker">
+            <tr ng-if="cluster.newBroker&&cluster.edit_index===undefined">
               <td>
                 <div class="input-group">
                   <input class="form-control" type="text" ng-model="cluster.newBroker.id" name="broker_id" placeholder="Input broker ID" onInput="this.value=this.value.replace(/[^0-9]/g, '')"/>
-- 
2.7.2.windows.1