From ea47b849700a89e15bc6a2e6b28317ee7a50b315 Mon Sep 17 00:00:00 2001 From: "Zhao, Qingwen" Date: Tue, 13 Jun 2017 20:22:15 +0800 Subject: [PATCH 1/2] update alertEditCtrl.js --- .../app/dev/public/js/ctrls/alertEditCtrl.js | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js index ae8cf7e908..f1f9476ff5 100644 --- a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js +++ b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js @@ -191,7 +191,7 @@ $scope.definition = data; // Input streams - $scope.policy.inputStreams = $.map(data.policyExecutionPlan.inputStreams, function (value, stream) { + var inputStreams = $.map(data.policyExecutionPlan.inputStreams, function (value, stream) { return stream; }); @@ -199,15 +199,30 @@ var outputStreams = $.map(data.policyExecutionPlan.outputStreams, function (value, stream) { return stream; }); + + // Partition + $scope.policy.partitionSpec = $.grep(data.policyExecutionPlan.streamPartitions, function (partition) { + return $.inArray(partition.streamId, outputStreams) == -1; + }); + console.log("partitionSpec", $scope.policy.partitionSpec); + + var tempStreams = $.grep(inputStreams, function (i) { + return $.inArray(i, outputStreams) > -1; + }); + console.log("tempStream", tempStreams); + + $.each(tempStreams, function (i, tempStream) { + inputStreams = common.array.remove(tempStream, inputStreams); + outputStreams = common.array.remove(tempStream, outputStreams); + }); + $scope.policy.outputStreams = outputStreams.concat(); + $scope.policy.inputStreams = inputStreams; $scope.outputStreams = outputStreams; autoDescription(); // Dedup fields $scope.refreshOutputSteamFields(); - - // Partition - $scope.policy.partitionSpec = data.policyExecutionPlan.streamPartitions; } } else { $scope.definition = {}; From 74a963343620d435005b14d07066eab5e35fbfe2 Mon Sep 17 00:00:00 2001 From: "Zhao, Qingwen" Date: Wed, 14 Jun 2017 11:04:45 +0800 Subject: [PATCH 2/2] remove useless console log --- .../src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js index f1f9476ff5..0a64a42c0f 100644 --- a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js +++ b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js @@ -202,14 +202,12 @@ // Partition $scope.policy.partitionSpec = $.grep(data.policyExecutionPlan.streamPartitions, function (partition) { - return $.inArray(partition.streamId, outputStreams) == -1; + return $.inArray(partition.streamId, outputStreams) === -1; }); - console.log("partitionSpec", $scope.policy.partitionSpec); var tempStreams = $.grep(inputStreams, function (i) { return $.inArray(i, outputStreams) > -1; }); - console.log("tempStream", tempStreams); $.each(tempStreams, function (i, tempStream) { inputStreams = common.array.remove(tempStream, inputStreams);