From d312eee762a37db567eba839013813378dee1b72 Mon Sep 17 00:00:00 2001
From: nichunen <chunen.ni@kyligence.io>
Date: Fri, 8 Dec 2017 15:32:24 +0800
Subject: [PATCH] KYLIN-3062 Hide RAW measure by default in cube designer

---
 examples/test_case_data/sandbox/kylin.properties |  2 ++
 webapp/app/js/controllers/cubeMeasures.js        | 10 +++++++++-
 webapp/app/js/services/kylinProperties.js        |  4 ++++
 webapp/app/partials/cubeDesigner/measures.html   |  3 ++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties
index 55eb719ef..90c0b9590 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -158,6 +158,8 @@ kylin.web.help.1=odbc|ODBC Driver|
 kylin.web.help.2=tableau|Tableau Guide|
 kylin.web.help.3=onboard|Cube Design Tutorial|
 
+# Hide measures in measure list of cube designer, separate by comma
+kylin.web.hide-measures=RAW
 
 ### OTHER ###
 
diff --git a/webapp/app/js/controllers/cubeMeasures.js b/webapp/app/js/controllers/cubeMeasures.js
index 347f3b790..6f70e25e9 100644
--- a/webapp/app/js/controllers/cubeMeasures.js
+++ b/webapp/app/js/controllers/cubeMeasures.js
@@ -18,7 +18,7 @@
 
 'use strict';
 
-KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubesManager,CubeDescModel,SweetAlert,VdmUtil,TableModel,cubeConfig,modelsManager) {
+KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubesManager,CubeDescModel,SweetAlert,VdmUtil,TableModel,cubeConfig,modelsManager,kylinConfig) {
   $scope.num=0;
   $scope.convertedColumns=[];
   $scope.groupby=[];
@@ -433,6 +433,14 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes
     });
   }
 
+  $scope.isMeasureUnHidden = function(measure) {
+    if (kylinConfig.getHiddenMeasures().indexOf(measure) == -1) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
 });
 
 var NextParameterModalCtrl = function ($scope, scope,para,$modalInstance,cubeConfig, CubeService, MessageService, $location, SweetAlert,ProjectModel, loadingRequest,ModelService) {
diff --git a/webapp/app/js/services/kylinProperties.js b/webapp/app/js/services/kylinProperties.js
index a2af4ede7..fa92e5348 100644
--- a/webapp/app/js/services/kylinProperties.js
+++ b/webapp/app/js/services/kylinProperties.js
@@ -115,5 +115,9 @@ KylinApp.service('kylinConfig', function (AdminService, $log) {
     return true;
   }
 
+  this.getHiddenMeasures = function() {
+    var hide_measures = this.getProperty("kylin.web.hide-measures").replace(/\s/g,"").toUpperCase();
+    return hide_measures.split(",")
+  }
 });
 
diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html
index 7d4a60641..12d1af3e6 100755
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -104,7 +104,8 @@
                                   <select class="form-control"
                                       ng-init="newMeasure.function.expression = (!!newMeasure.function.expression)?newMeasure.function.expression:cubeConfig.dftSelections.measureExpression" chosen ng-model="newMeasure.function.expression" required
                                       ng-change="measureReturnTypeUpdate();measureParamValueUpdate();"
-                                      ng-options="me as me for me in cubeConfig.measureExpressions">
+                                      ng-options="me as me for me in cubeConfig.measureExpressions | filter: isMeasureUnHidden">
+
                                       <option value=""></option>
                                   </select>
                               </div>
-- 
2.11.0 (Apple Git-81)