From 6aab04e45dc3e4a8a3d33a958047eb8e5b2acc08 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Thu, 20 Nov 2014 23:21:03 +0800
Subject: [PATCH] add refresh rowkey&aggregation group

---
 webapp/app/js/controllers/cubeEdit.js            | 183 ++++++++++++++++++++++-
 webapp/app/js/controllers/cubeSchema.js          |   8 +-
 webapp/app/js/controllers/cubes.js               |   2 +-
 webapp/app/partials/cubeDesigner/dimensions.html |   2 +-
 webapp/app/partials/projects/project_detail.html |   2 +-
 webapp/app/routes.json                           |   2 +-
 6 files changed, 190 insertions(+), 9 deletions(-)

diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 13af908..9a9905b 100644
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -152,6 +152,8 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
         // generate default rowkey and aggregation groups.
         if ($scope.cubeMetaFrame.rowkey.rowkey_columns.length == 0 && $scope.cubeMetaFrame.rowkey.aggregation_groups.length == 0) {
             generateDefaultRowkey();
+        }else{
+            reGenerateRowKey();
         }
 
         // Clean up objects used in cube creation
@@ -165,6 +167,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
             }
         });
 
+
         if ($scope.cubeMetaFrame.cube_partition_desc.partition_date_start) {
             var dateStart = new Date($scope.cubeMetaFrame.cube_partition_desc.partition_date_start);
             dateStart = (dateStart.getFullYear() + "-" + (dateStart.getMonth() + 1) + "-" + dateStart.getDate());
@@ -238,6 +241,178 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
         }
     }
 
+
+    function reGenerateRowKey(){
+        var tmpRowKeyColumns = [];
+        var tmpAggretationItems = [];
+
+        angular.forEach($scope.cubeMetaFrame.dimensions, function (dimension, index) {
+            if (dimension.column == '{FK}' && dimension.join && dimension.join.foreign_key.length > 0) {
+                angular.forEach(dimension.join.foreign_key, function (fk, index) {
+                    for (var i = 0; i < tmpRowKeyColumns.length; i++) {
+                        if(tmpRowKeyColumns[i].column == fk)
+                            break;
+                    }
+                    if(i == tmpRowKeyColumns.length) {
+                        tmpRowKeyColumns.push({
+                            "column": fk,
+                            "length": 30,
+                            "dictionary": true,
+                            "mandatory": false
+                        });
+                    }
+                    tmpAggretationItems.push(fk);
+                });
+            }
+            else if (dimension.column) {
+                for (var i = 0; i < tmpRowKeyColumns.length; i++) {
+                    if(tmpRowKeyColumns.column == dimension.column)
+                        break;
+                }
+                if(i == tmpRowKeyColumns.length) {
+                    tmpRowKeyColumns.push({
+                        "column": dimension.column,
+                        "length": 30,
+                        "dictionary": true,
+                        "mandatory": false
+                    });
+                }
+                tmpAggretationItems.push(dimension.column);
+            }
+            if (dimension.hierarchy && dimension.hierarchy.length > 0) {
+                angular.forEach(dimension.hierarchy, function (hierarchy, index) {
+                    for (var i = 0; i < tmpRowKeyColumns.length; i++) {
+                        if(tmpRowKeyColumns.column == hierarchy.column)
+                            break;
+                    }
+                    if(i == tmpRowKeyColumns.length) {
+                        tmpRowKeyColumns.push({
+                            "column": hierarchy.column,
+                            "length": 30,
+                            "dictionary": true,
+                            "mandatory": false
+                        });
+                    }
+
+                    tmpAggretationItems.push(hierarchy.column);
+                });
+            }
+
+        });
+
+        var rowkeyColumns = $scope.cubeMetaFrame.rowkey.rowkey_columns;
+        var newRowKeyColumns = sortSharedData(rowkeyColumns,tmpRowKeyColumns);
+        var increasedColumns = increasedColumn(rowkeyColumns,tmpRowKeyColumns);
+        newRowKeyColumns = newRowKeyColumns.concat(increasedColumns);
+
+        //! here get the latest rowkey_columns
+        $scope.cubeMetaFrame.rowkey.rowkey_columns = newRowKeyColumns;
+
+
+        var aggregationGroups = $scope.cubeMetaFrame.rowkey.aggregation_groups;
+        // rm unused item from group
+        angular.forEach(aggregationGroups, function (group, index) {
+            for(var j = 0;j<group.length;j++){
+                var elemStillExist = false;
+                for(var k = 0;k<tmpAggretationItems.length;k++){
+                    if(group[j]==tmpAggretationItems[k]){
+                        elemStillExist = true;
+                        break;
+                    }
+                }
+                if(!elemStillExist){
+                    group.splice(j,1);
+                }
+            }
+        });
+
+        var uniqGroupItem = [];
+        angular.forEach(aggregationGroups, function (group, index) {
+            for(var j = 0;j<group.length;j++){
+                if (uniqGroupItem.indexOf(group[j]) == -1) {
+                    uniqGroupItem.push(group[j]);
+                }
+            }
+        });
+
+        var increasedGroupItem = increasedData(uniqGroupItem,tmpAggretationItems);
+        var increasedDataGroups = sliceGroupItemToGroups(increasedGroupItem);
+
+        //! here get the latest aggregation groups
+        $scope.cubeMetaFrame.rowkey.aggregation_groups.concat(increasedDataGroups);
+
+
+    }
+
+    function sortSharedData(oldArray,tmpArr){
+        var newArr = [];
+        for(var j=0;j<oldArray.length;j++){
+            var unit = oldArray[j];
+            for(var k=0;k<tmpArr.length;k++){
+                if(unit.column==tmpArr[k].column){
+                    newArr.push(unit);
+                }
+            }
+        }
+        return newArr;
+    }
+
+    function increasedData(oldArray,tmpArr){
+        var increasedData = [];
+        for(var j=0;j<tmpArr.length;j++){
+            var unit = tmpArr[j];
+            var exist = false;
+            for(var k=0;k<oldArray.length;k++){
+                if(unit==oldArray[k]){
+                    exist = true;
+                    break;
+                }
+            }
+            if(!exist){
+                increasedData.push(unit);
+            }
+        }
+        return increasedData;
+    }
+
+    function increasedColumn(oldArray,tmpArr){
+        var increasedData = [];
+        for(var j=0;j<tmpArr.length;j++){
+            var unit = tmpArr[j];
+            var exist = false;
+            for(var k=0;k<oldArray.length;k++){
+                if(unit.column==oldArray[k].column){
+                    exist = true;
+                    break;
+                }
+            }
+            if(!exist){
+                increasedData.push(unit);
+            }
+        }
+        return increasedData;
+    }
+
+    function sliceGroupItemToGroups(groupItems){
+        if(!groupItems.length){
+            return;
+        }
+        var groups = [];
+        var j = -1;
+        for(var i = 0;i<groupItems.length;i++){
+            if(i%10==0){
+                j++;
+                groups[j]=[];
+            }
+            groups[j].push(groupItems[i]);
+        }
+        if(groups[groups.length-1].length<10){
+            groups.pop();
+        }
+        return groups;
+    }
+
+
     // ~ private methods
     function generateColumnFamily() {
         $scope.cubeMetaFrame.hbase_mapping.column_family = [];
@@ -280,7 +455,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                         $scope.cubeMetaFrame.rowkey.rowkey_columns.push({
                             "column": fk,
                             "length": 30,
-                            "dictionary": null,
+                            "dictionary": true,
                             "mandatory": false
                         });
                     }
@@ -297,7 +472,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                     $scope.cubeMetaFrame.rowkey.rowkey_columns.push({
                         "column": dimension.column,
                         "length": 30,
-                        "dictionary": null,
+                        "dictionary": true,
                         "mandatory": false
                     });
                 }
@@ -315,7 +490,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                         $scope.cubeMetaFrame.rowkey.rowkey_columns.push({
                             "column": hierarchy.column,
                             "length": 30,
-                            "dictionary": null,
+                            "dictionary": true,
                             "mandatory": false
                         });
                     }
@@ -330,7 +505,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
         $scope.cubeMetaFrame.project = $scope.state.project;
         angular.forEach($scope.cubeMetaFrame.dimensions, function (dimension, index) {
             dimension.status = {};
-            if (dimension.hierarchy.length) {
+            if (dimension.hierarchy&&dimension.hierarchy.length) {
                 dimension.status.useHierarchy = true;
                 dimension.status.joinCount = (!!dimension.join.primary_key) ? dimension.join.primary_key.length : 0;
                 dimension.status.hierarchyCount = (!!dimension.hierarchy) ? dimension.hierarchy.length : 0;
diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
index 9c129fc..e98f4da 100644
--- a/webapp/app/js/controllers/cubeSchema.js
+++ b/webapp/app/js/controllers/cubeSchema.js
@@ -93,7 +93,10 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic
 
     $scope.addNewDimension = function (dimension) {
         $scope.newDimension = (!!dimension)? dimension: Dimension.createNew();
-        if($scope.newDimension.status.useJoin||$scope.newDimension.join.foreign_key.length!=0){
+        if(!$scope.newDimension.join){
+            $scope.newDimension.join = { "type": "","primary_key": [],"foreign_key": []}
+        }
+        if($scope.newDimension.status&&$scope.newDimension.status.useJoin||$scope.newDimension.join.foreign_key.length!=0){
             $scope.newDimension.status.useJoin = true;
         }
     }
@@ -154,6 +157,9 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic
     }
 
     $scope.addNewDerived = function (dimension) {
+        if(!dimension.derived){
+            dimension.derived = [];
+        }
         dimension.derived.push("");
     }
 
diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index 9a4652c..96cc8d6 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -2,12 +2,12 @@
 
 KylinApp
     .controller('CubesCtrl', function ($scope, $q, $routeParams, $location, $modal, MessageService, CubeDescService, CubeService, JobService, UserService,  ProjectService) {
+        $scope.project.selectedProject = $routeParams.projectName;
         $scope.listParams={
             cubeName: $routeParams.cubeName,
             projectName: $scope.project.selectedProject
         };
         $scope.cubes = [];
-//        $scope.projects = [];
         $scope.loading = false;
         $scope.action = {};
 
diff --git a/webapp/app/partials/cubeDesigner/dimensions.html b/webapp/app/partials/cubeDesigner/dimensions.html
index 995eca5..3ac99fb 100644
--- a/webapp/app/partials/cubeDesigner/dimensions.html
+++ b/webapp/app/partials/cubeDesigner/dimensions.html
@@ -350,7 +350,7 @@ <h4 class="box-title">Tips</h4>
     </div>
     <div class="box-footer">
         <button class="btn btn-sm btn-info" ng-disabled="edit_dim_form.$invalid"
-                ng-click="saveNewDimension()" ng-show="state.mode=='edit'">Save</button>
+                ng-click="saveNewDimension()" ng-show="state.mode=='edit'">OK</button>
         <button class="btn btn-link" ng-click="clearNewDimension()">Cancel</button>
     </div>
 </div>
diff --git a/webapp/app/partials/projects/project_detail.html b/webapp/app/partials/projects/project_detail.html
index 8c8a948..c3f8fa7 100644
--- a/webapp/app/partials/projects/project_detail.html
+++ b/webapp/app/partials/projects/project_detail.html
@@ -24,7 +24,7 @@
                     <tbody>
                         <tr ng-repeat="cube in project.cubes" >
                             <td>{{cube}}</td>
-                            <td><a href='/cubes/{{cube}}?showDetail=true' style="color: #428BCA">Detail</a></td>
+                            <td><a href='/cubes/{{project.name}}/{{cube}}?showDetail=true' style="color: #428BCA">Detail</a></td>
                         </tr>
                     </tbody>
                 </table>
diff --git a/webapp/app/routes.json b/webapp/app/routes.json
index d887834..8a72f09 100644
--- a/webapp/app/routes.json
+++ b/webapp/app/routes.json
@@ -63,7 +63,7 @@
         }
     },
     {
-        "url": "/cubes/:cubeName",
+        "url": "/cubes/:projectName/:cubeName",
         "params": {
             "templateUrl": "partials/cubes/cubes.html",
             "tab": "cubes",