From e7cab8b6dde875c8e39b4d6f094a43b135aa16ce Mon Sep 17 00:00:00 2001
From: chenzhx <chen@apache.org>
Date: Mon, 4 Dec 2017 12:24:55 +0800
Subject: [PATCH] KYLIN 3067 provide dim cap in GUL

---
 webapp/app/js/controllers/cubeAdvanceSetting.js        |  6 ++++++
 .../app/partials/cubeDesigner/advanced_settings.html   | 18 +++++++++++++++++-
 webapp/app/partials/cubeDesigner/measures.html         |  3 ++-
 webapp/app/partials/cubeDesigner/streamingConfig.html  |  3 ++-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/webapp/app/js/controllers/cubeAdvanceSetting.js b/webapp/app/js/controllers/cubeAdvanceSetting.js
index 73616f257..ca71bf4e2 100755
--- a/webapp/app/js/controllers/cubeAdvanceSetting.js
+++ b/webapp/app/js/controllers/cubeAdvanceSetting.js
@@ -23,6 +23,7 @@ KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal,cubeConfi
 
   var needLengthKeyList=cubeConfig.needSetLengthEncodingList;
   $scope.convertedRowkeys = [];
+  $scope.dim_cap = $scope.cubeMetaFrame.aggregation_groups.length > 0 && $scope.cubeMetaFrame.aggregation_groups[0].select_rule.dim_cap ? $scope.cubeMetaFrame.aggregation_groups[0].select_rule.dim_cap : 0;
   angular.forEach($scope.cubeMetaFrame.rowkey.rowkey_columns,function(item){
     item.encoding=$scope.removeVersion(item.encoding);
     var _valueLength;
@@ -104,6 +105,11 @@ KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal,cubeConfi
   $scope.sortableOptions = {
     stop:$scope.resortRowkey
   };
+  $scope.changeDimCap  = function (dim_cap) {
+    angular.forEach($scope.cubeMetaFrame.aggregation_groups, function (agg) {
+      agg.select_rule.dim_cap = dim_cap
+    })
+  }
 
   $scope.addNewHierarchy = function(grp){
     grp.select_rule.hierarchy_dims.push([]);
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index 5d53075ae..b3dfcd90f 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -33,7 +33,15 @@
                  class="table table-hover list">
             <tr class="row">
               <th class="col-xs-1">ID</th>
-              <th class="col-xs-11">Aggregation Groups</th>
+              <th class="col-xs-3">
+                <span>Aggregation Groups</span>
+                <span style="margin-left:42px">
+                  <i kylinpopover placement="left" title="Max Dimension Combination" template="dimCapTip.html" class="fa fa-info-circle"></i>
+                  Max Dimension Combination:
+                  <input onInput="this.value=this.value.replace(/[^0-9]/g, '')" type="text" ng-model="dim_cap" ng-change="changeDimCap(dim_cap)" ng-disabled="state.mode !== 'edit'" style="margin-left:5px; width:20px;">
+                </span>
+              </th>
+              <th></th>
               <th ng-if="state.mode=='edit'" class="col-xs-1"></th>
             </tr>
 
@@ -511,6 +519,14 @@
    </ng-form>
  </div>
 
+<script type="text/ng-template" id="dimCapTip.html">
+  <div>
+    <ol style="font-size:12px;">
+      <li>Dimension limitations mean max dimensions may be contained within a group of SQL queries.</li>
+      <li>In a set of queries, if each query required the number of dimensions is not more than five, you can set 5 here.</li>
+    </ol>
+  </div>
+</script>
 <script type="text/ng-template" id="rowkeyTip.html">
   <div>
     <h4>Shard By this column?</h4>
diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html
index aa7a096f7..7d4a60641 100755
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -206,7 +206,8 @@
                                    type="text" placeholder="Kylin won’t save more than this number of bytes" class="form-control"
                                    tooltip-trigger="focus"
                                    ng-init="newMeasure.function.returntype=newMeasure.function.returntype?newMeasure.function.returntype:'extendedcolumn(100)'"
-                                   ng-model="newMeasure.function.returntype" required />
+                                   ng-model="newMeasure.function.returntype" required
+                                   onInput="this.value=this.value.replace(/[^0-9]/g, '')" />
 
                             <span class="font-color-default"
                                   ng-if="newMeasure.function.expression != 'COUNT_DISTINCT' && newMeasure.function.expression != 'TOP_N' && newMeasure.function.expression != 'EXTENDED_COLUMN' ">
diff --git a/webapp/app/partials/cubeDesigner/streamingConfig.html b/webapp/app/partials/cubeDesigner/streamingConfig.html
index b18b42500..24b343886 100644
--- a/webapp/app/partials/cubeDesigner/streamingConfig.html
+++ b/webapp/app/partials/cubeDesigner/streamingConfig.html
@@ -224,7 +224,8 @@
                 <input ng-if="state.mode=='edit'" name="timeout" required ng-model="kafkaMeta.timeout" type="text"
                        placeholder="Input kafkaConfig timeout"
                        ng-pattern="/^\+?[1-9][0-9]*$/"
-                       class="form-control"/>
+                       class="form-control"
+                       onInput="this.value=this.value.replace(/[^0-9]/g, '')"/>
                 <small class="help-block"
                        ng-show="!form.cube_streaming_form.timeout.$error.required && form.cube_streaming_form.timeout.$invalid && (form.cube_streaming_form.timeout.$dirty||form.cube_streaming_form.$submitted)">
                   Kafka timeout is invalid.
-- 
2.11.0 (Apple Git-81)