You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2015/05/27 11:30:08 UTC
incubator-kylin git commit: KYLIN-788 file cleanup
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8.0 60a4a1a0d -> 92c069679
KYLIN-788 file cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/92c06967
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/92c06967
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/92c06967
Branch: refs/heads/0.8.0
Commit: 92c069679ca591f17ea57ec6bc2c47621588a5a6
Parents: 60a4a1a
Author: jiazhong <ji...@ebay.com>
Authored: Wed May 27 17:23:13 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Wed May 27 17:29:45 2015 +0800
----------------------------------------------------------------------
webapp/.editorconfig | 17 ++
webapp/Gruntfile.js | 1 +
webapp/app/css/AdminLTE-fonts.css | 2 +-
webapp/app/css/AdminLTE.css | 1 +
webapp/app/htaccess.dist | 19 ++-
webapp/app/js/controllers/modelDimensions.js | 24 +--
webapp/app/js/controllers/models.js | 11 +-
webapp/app/js/model/modelsManager.js | 13 +-
webapp/app/less/animation.less | 17 ++
webapp/app/less/app.less | 17 ++
webapp/app/less/build.less | 17 ++
webapp/app/less/component.less | 17 ++
webapp/app/less/home.less | 17 ++
webapp/app/less/layout.less | 17 ++
webapp/app/less/navbar.less | 17 ++
.../app/partials/cubeDesigner/dimensions.html | 5 +-
webapp/app/partials/cubeDesigner/measures.html | 6 -
webapp/app/partials/cubes/cube_schema.html | 2 +-
webapp/app/partials/cubes/cubes.html | 156 -------------------
.../modelDesigner/model_dimensions.html | 16 +-
webapp/app/partials/tables/table_detail.html | 18 +++
webapp/app/routes.json | 8 -
22 files changed, 192 insertions(+), 226 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/.editorconfig
----------------------------------------------------------------------
diff --git a/webapp/.editorconfig b/webapp/.editorconfig
index c2cdfb8..b9d861d 100644
--- a/webapp/.editorconfig
+++ b/webapp/.editorconfig
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/Gruntfile.js
----------------------------------------------------------------------
diff --git a/webapp/Gruntfile.js b/webapp/Gruntfile.js
index 64dc859..9457051 100644
--- a/webapp/Gruntfile.js
+++ b/webapp/Gruntfile.js
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
'use strict';
module.exports = function (grunt) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/css/AdminLTE-fonts.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE-fonts.css b/webapp/app/css/AdminLTE-fonts.css
index 7e2f981..a8e0244 100644
--- a/webapp/app/css/AdminLTE-fonts.css
+++ b/webapp/app/css/AdminLTE-fonts.css
@@ -20,4 +20,4 @@
font-weight: 700;
src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(../fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/css/AdminLTE.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE.css b/webapp/app/css/AdminLTE.css
index 07b1c88..a5d26d1 100644
--- a/webapp/app/css/AdminLTE.css
+++ b/webapp/app/css/AdminLTE.css
@@ -5,6 +5,7 @@
* License: Open source - MIT
* Please visit http://opensource.org/licenses/MIT for more information
!*/
+
/*
* Core: Genral Layout Style
* -------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/htaccess.dist
----------------------------------------------------------------------
diff --git a/webapp/app/htaccess.dist b/webapp/app/htaccess.dist
index dfde85b..3915955 100644
--- a/webapp/app/htaccess.dist
+++ b/webapp/app/htaccess.dist
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# nginx rewrite rule
rewrite ^(.*)$ /index.html break;
-# end nginx rewrite rule
\ No newline at end of file
+# end nginx rewrite rule
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/js/controllers/modelDimensions.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/modelDimensions.js b/webapp/app/js/controllers/modelDimensions.js
index 41acd24..0e34582 100644
--- a/webapp/app/js/controllers/modelDimensions.js
+++ b/webapp/app/js/controllers/modelDimensions.js
@@ -33,7 +33,6 @@ KylinApp.controller('ModelDimensionsCtrl', function ($scope, $modal,MetaModel,mo
// Dump available columns plus column table name, whether is from lookup table.
$scope.initColumns = function () {
- var factTable = modelsManager.selectedModel.fact_table;
$scope.availableTables.push(modelsManager.selectedModel.fact_table);
var lookups = modelsManager.selectedModel.lookups;
@@ -41,23 +40,16 @@ KylinApp.controller('ModelDimensionsCtrl', function ($scope, $modal,MetaModel,mo
$scope.availableTables.push(lookups[j].table);
}
-// init dimension only when dimen
-// if(!modelsManager.selectedModel.dimensions.length){
+ for(var i = 0;i<$scope.availableTables.length;i++){
+ var tableInUse = _.some(modelsManager.selectedModel.dimensions,function(item){
+ return item.table == $scope.availableTables[i];
+ });
- for(var i = 0;i<$scope.availableTables.length;i++){
- var tableInUse = _.some(modelsManager.selectedModel.dimensions,function(item){
- return item.table == $scope.availableTables[i];
- });
-
- if(!tableInUse){
- modelsManager.selectedModel.dimensions.push(new Dimension($scope.availableTables[i]));
- }
+ if(!tableInUse){
+ modelsManager.selectedModel.dimensions = modelsManager.selectedModel.dimensions==null?[]:modelsManager.selectedModel.dimensions;
+ modelsManager.selectedModel.dimensions.push(new Dimension($scope.availableTables[i]));
}
-// }
-
- // At first dump the columns of fact table.
-// var cols = $scope.getColumnsByTable(factTable);
-
+ }
};
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/js/controllers/models.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/models.js b/webapp/app/js/controllers/models.js
index 6b1ae47..1b82f29 100644
--- a/webapp/app/js/controllers/models.js
+++ b/webapp/app/js/controllers/models.js
@@ -41,17 +41,12 @@ KylinApp.controller('ModelsCtrl', function ($scope, $q, $routeParams, $location,
$scope.loading = false;
$scope.action = {};
$scope.window = 0.68 * $window.innerHeight;
- $scope.listParams={
- cubeName: $routeParams.cubeName,
- projectName: $routeParams.projectName
- };
+
$scope.init = function(){
var queryParam = {};
- if ($scope.listParams.modelName) {
- queryParam.modelName = $scope.listParams.modelName;
- }
+
queryParam.projectName = $scope.projectModel.selectedProject;
modelsManager.generatorTreeData(queryParam).then(function(resp){
@@ -62,8 +57,6 @@ KylinApp.controller('ModelsCtrl', function ($scope, $q, $routeParams, $location,
$scope.$watch('projectModel.selectedProject', function (newValue, oldValue) {
modelsManager.removeAll();
- //init selected model
- modelsManager.selectedModel = {};
$scope.init();
});
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/js/model/modelsManager.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/modelsManager.js b/webapp/app/js/model/modelsManager.js
index 972df46..43bdf82 100644
--- a/webapp/app/js/model/modelsManager.js
+++ b/webapp/app/js/model/modelsManager.js
@@ -36,7 +36,6 @@ KylinApp.service('modelsManager',function(ModelService,CubeService,$q,AccessServ
var modelPermission = [];
ModelService.list(queryParam, function (_models) {
_this.removeAll();
- _this.loading = true;
angular.forEach(_models, function (model, index) {
$log.info("Add model permission info");
@@ -47,7 +46,6 @@ KylinApp.service('modelsManager',function(ModelService,CubeService,$q,AccessServ
)
$log.info("Add cube info to model ,not detail info");
cubeDetail.push(
-// CubeService.list({offset: 0, limit: 70,modelName:model.name}, function (_cubes) {
CubeService.list({modelName:model.name}, function (_cubes) {
model.cubes = _cubes;
}).$promise
@@ -58,7 +56,7 @@ KylinApp.service('modelsManager',function(ModelService,CubeService,$q,AccessServ
$q.all(cubeDetail,modelPermission).then(
function(result){
_models = _.filter(_models,function(models){return models.name!=undefined});
- _this.models = _this.models.concat(_models);
+ _this.models = _models;
defer.resolve(_this.models);
}
);
@@ -71,6 +69,7 @@ KylinApp.service('modelsManager',function(ModelService,CubeService,$q,AccessServ
//generator tree data info
this.generatorTreeData = function(queryParam){
+ _this.loading = true;
var defer = $q.defer();
_this.list(queryParam).then(function(resp){
_this.modelTreeData = [];
@@ -94,18 +93,11 @@ KylinApp.service('modelsManager',function(ModelService,CubeService,$q,AccessServ
onSelect:function(branch){
$log.info("cube selected:"+branch.data.name);
_this.cubeSelected = true;
-// $scope.cubeMetaFrame = branch.data;
-// _this.selectedCube = branch.data;
cubesManager.currentCube = branch.data;
_this.listAccess(cubesManager.currentCube, 'CubeInstance');
CubeDescService.get({cube_name: cube.name}, {}, function (detail) {
if (detail.length > 0&&detail[0].hasOwnProperty("name")) {
- //cubeMetaFrame for cube view and edit
-// $scope.cubeMetaFrame = detail[0];
- //for show detail info
-// $scope.cube.detail = detail[0];
- //add model info
cubesManager.currentCube.detail = detail[0];
cubesManager.cubeMetaFrame = detail[0];
_this.cubeModel = _this.getModelByCube(cubesManager.currentCube.name);
@@ -165,6 +157,7 @@ KylinApp.service('modelsManager',function(ModelService,CubeService,$q,AccessServ
this.removeAll = function(){
_this.models = [];
+ _this.selectedModel = {};
_this.modelTreeData = [];
};
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/less/animation.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/animation.less b/webapp/app/less/animation.less
index faba226..73fab87 100644
--- a/webapp/app/less/animation.less
+++ b/webapp/app/less/animation.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/** animation for data model **/
.data-model-animation.ng-enter {
-webkit-animation: fadeInRight 1s;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/less/app.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less
index ff51368..a1cbfc8 100644
--- a/webapp/app/less/app.less
+++ b/webapp/app/less/app.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/** override ace style - main style **/
body {
background-color: #FFF;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/less/build.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/build.less b/webapp/app/less/build.less
index a8d0bb2..be8f7df 100644
--- a/webapp/app/less/build.less
+++ b/webapp/app/less/build.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
@import 'layout.less';
@import 'navbar.less';
@import 'home.less';
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/less/component.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/component.less b/webapp/app/less/component.less
index bd47e1d..a160752 100644
--- a/webapp/app/less/component.less
+++ b/webapp/app/less/component.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/** table related **/
.dataTables_wrapper>.row:first-child {
padding-top: 12px;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/less/home.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/home.less b/webapp/app/less/home.less
index b0cf629..ed7a0a4 100644
--- a/webapp/app/less/home.less
+++ b/webapp/app/less/home.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/** Home page style **/
.bg-holder {
position: absolute;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/less/layout.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/layout.less b/webapp/app/less/layout.less
index 0f51359..b3ea6b6 100644
--- a/webapp/app/less/layout.less
+++ b/webapp/app/less/layout.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
.navbar-fixed-top+.main-container {
padding-top: 45px;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/less/navbar.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/navbar.less b/webapp/app/less/navbar.less
index cad2562..d56b98a 100644
--- a/webapp/app/less/navbar.less
+++ b/webapp/app/less/navbar.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
.navbar {
margin: 0;
padding-left: 0;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/partials/cubeDesigner/dimensions.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/dimensions.html b/webapp/app/partials/cubeDesigner/dimensions.html
index c2da223..8f50bfa 100644
--- a/webapp/app/partials/cubeDesigner/dimensions.html
+++ b/webapp/app/partials/cubeDesigner/dimensions.html
@@ -37,10 +37,7 @@
<i class="fa fa-building-o"></i> Auto Generator
</button>
</div>
- <div class="col-xs-6" ng-if="state.mode!='edit'">
- </div>
- <div class="col-xs-6">
- <b>Dimensions</b>
+ <div ng-class="(state.mode=='edit')?'col-xs-6':'col-xs-12'">
<span class="pull-right input-icon input-icon-right nav-search" style="margin-left: 22px;">
<input type="text" placeholder="Filter ..." class="nav-search-input" ng-model="dimState.filter"/>
<i class="ace-icon fa fa-search nav-search-icon"></i>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/partials/cubeDesigner/measures.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html
index 47e2d1f..bb873f5 100755
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -19,12 +19,6 @@
<!-- Measures Summary -->
<ng-form name="forms.cube_measure_form">
<div class="dataTables_wrapper form-inline no-footer" ng-if="cubesManager.cubeMetaFrame.measures.length > 0">
- <div class="row">
- <span class="nav-search input-icon input-icon-right" style="margin-left: 22px;">
- <input type="text" placeholder="Filter ..." class="nav-search-input" ng-model="state.dimensionFilter"/>
- <i class="ace-icon fa fa-search nav-search-icon"></i>
- </span>
- </div>
<table class="table table-striped table-hover">
<thead>
<tr>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/partials/cubes/cube_schema.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cube_schema.html b/webapp/app/partials/cubes/cube_schema.html
index b35e31a..7261507 100644
--- a/webapp/app/partials/cubes/cube_schema.html
+++ b/webapp/app/partials/cubes/cube_schema.html
@@ -39,7 +39,7 @@
<div class="row">
<div class="col-xs-8">
<div>
- <a href="cubes" class="pull-left"><i class="fa fa-arrow-left"></i> Back to My Cubes</a>
+ <a href="models" class="pull-left"><i class="fa fa-arrow-left"></i> Back to My Models</a>
</div>
</div>
<div class="col-xs-4">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/partials/cubes/cubes.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
deleted file mode 100644
index 6867f86..0000000
--- a/webapp/app/partials/cubes/cubes.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<div class="page-header row">
- <!--Project-->
- <div class="col-xs-3">
- <form ng-if="userService.isAuthorized()">
- <div class="form-group">
- <!--Project-->
- <a class="btn btn-xs btn-info" href="projects" tooltip="Manage Project"><i class="fa fa-gears"></i></a>
- <a class="btn btn-xs btn-primary" style="width: 29px" ng-if="userService.hasRole('ROLE_ADMIN')||userService.hasRole('ROLE_MODELER')&&kylinConfig.getDeployEnv()!=='PROD'" tooltip="Add Project" ng-click="toCreateProj()">
- <i class="fa fa-plus"></i>
- </a>
- </div>
- </form>
- </div>
- <!--Cube Name-->
- <div class="col-xs-3">
- <form ng-submit="cubeList.removeAll();list()" style="display: inline" >
- <span class="input-icon input-icon-right nav-search" style="font-size:14px;"><b>Cube Name:</b>
- <input type="text" placeholder="Filter ..." class="nav-search-input" ng-model="listParams.cubeName" />
- <i class="ace-icon fa fa-search blue" ng-click="cubeList.removeAll();list()"></i>
- </span>
- </form>
- </div>
- <div class="pull-right">
- <a class="btn btn-primary btn-sm" href="cubes/add/json" ng-if="userService.hasRole('ROLE_ADMIN')"><i class="fa fa-pencil-square-o"></i> Json Editor</a>
- <a class="btn btn-primary btn-sm" href="cubes/add" ng-if="userService.hasRole('ROLE_MODELER')" id="addCubeButton"><i class="fa fa-plus"></i> Cube</a>
- </div>
-</div>
-
-<div ng-if="!loading && cubeList.cubes.length == 0">
- <div no-result text="No Cube."></div>
-</div>
-<loading ng-if="loading" text="Loading Cubes..."></loading>
-
-<!--Table-->
-<div ng-if="cubeList.cubes.length > 0" class="dataTables_wrapper no-footer">
- <div class="row">
- <div class="col-xs-12"><label class="table-header-text">Cubes</label></div>
- </div>
- <table class="table table-striped table-bordered table-hover dataTable no-footer">
- <!--Header-->
- <thead>
- <tr style="cursor: pointer">
- <th ng-repeat="theaditem in cubeConfig.theaditems"
- ng-click="state.filterAttr= theaditem.attr;state.reverseColumn=theaditem.attr;state.filterReverse=!state.filterReverse;">
- {{theaditem.name}}
- <i ng-if="state.reverseColumn!= theaditem.attr"
- class="fa fa-unsorted"></i>
- <i ng-if="state.reverseColumn== theaditem.attr && !state.filterReverse"
- class="fa fa-sort-asc"></i>
- <i ng-if="state.reverseColumn== theaditem.attr && state.filterReverse"
- class="fa fa-sort-desc"></i>
- </th>
- <th>Actions</th>
- <th ng-if="userService.hasRole('ROLE_ADMIN')">Admins</th>
- </tr>
- </thead>
- <!--Body-->
- <tbody ng-repeat="cube in cubeList.cubes | orderObjectBy:state.filterAttr:state.filterReverse">
- <tr ng-class="{accordion:true}" style="cursor: pointer" ng-click="cube.showDetail=!cube.showDetail;loadDetail(cube)">
- <td>
- <i ng-show="!cube.showDetail" class="fa fa-chevron-circle-right blue"></i>
- <i ng-show="cube.showDetail" class="fa fa-chevron-circle-down blue"></i>
- {{ cube.name}}
- </td>
- <td>
- <span class="label"
- ng-class="{'label-success': cube.status=='READY', 'label-default': cube.status=='DISABLED'}">
- {{ cube.status}}
- </span>
- </td>
- <td><span tooltip-html-unsafe="<div style='text-align:left'>
- Source Table Size: {{dataSize(cube.input_records_size)}}<br/>
- Expansion Rate: {{(cube.input_records_size>0? cube.size_kb*1024/cube.input_records_size : 0) * 100 | number:2}}%
- </div>">{{dataSize(cube.size_kb*1024)}}</span></td>
- <td><span tooltip-html-unsafe="<div style='text-align:left'>
- Source Table Size: {{dataSize(cube.input_records_size)}}<br/>
- Expansion Rate: {{(cube.input_records_size>0? cube.size_kb*1024/cube.input_records_size : 0) * 100 | number:2}}%
- </div>">{{ cube.input_records_count | number:0}}</span></td>
- <td>{{ (cube.last_build_time | utcToConfigTimeZone) }}</td>
- <td>{{ cube.owner}}</td>
- <td>{{ cube.create_time_utc | utcToConfigTimeZone}}</td>
- <td>
- <div ng-click="$event.stopPropagation();" class="btn-group" ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission(cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask)">
- <button type="button" class="btn btn-default btn-xs dropdown-toggle"
- data-toggle="dropdown" ng-click="listAccess(cube, 'CubeInstance')">
- Action <span class="ace-icon fa fa-caret-down icon-on-right"></span>
- </button>
- <ul class="dropdown-menu" role="menu">
- <li ng-if="cube.status=='DISABLED' && userService.hasRole('ROLE_ADMIN') ">
- <a ng-click="dropCube(cube)" tooltip="Drop the cube, related jobs and data permanently.">Drop</a></li>
- <li ng-if="cube.status=='DISABLED' && (userService.hasRole('ROLE_ADMIN') || hasPermission(cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))">
- <a ng-click="cubeEdit(cube);">Edit</a></li>
- <li><a ng-click="startJobSubmit(cube);">Build</a></li>
- <li><a ng-click="startRefresh(cube)">Refresh</a></li>
- <li><a ng-click="startMerge(cube)">Merge</a></li>
- <li ng-if="cube.status!='DISABLED'"><a ng-click="disable(cube)">Disable</a></li>
- <li ng-if="cube.status=='DISABLED'"><a ng-click="enable(cube)">Enable</a></li>
- <li ng-if="cube.status=='DISABLED'"><a ng-click="purge(cube)">Purge</a></li>
- </ul>
- </div>
- <span ng-if="!(userService.hasRole('ROLE_ADMIN') || hasPermission(cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask))">
- N/A
- </span>
- </td>
- <td ng-if="userService.hasRole('ROLE_ADMIN')">
- <div ng-click="$event.stopPropagation();" class="btn-group">
- <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" ng-click="listAccess(cube, 'CubeInstance')">
- Action <span class="ace-icon fa fa-caret-down icon-on-right"></span>
- </button>
- <ul class="dropdown-menu" role="menu">
- <li ng-if="cube.status=='DISABLED'"><a href="cubes/edit/{{cube.name}}/json">Edit(JSON)</a></li>
- </ul>
- </div>
- </td>
- </tr>
- <tr ng-show="cube.showDetail">
- <td colspan="9" style="padding: 10px 30px 10px 30px;">
- <div ng-include src="'partials/cubes/cube_detail.html'"></div>
- </td>
- </tr>
- </tbody>
- </table>
-</div>
-
-<div class="row">
- <div class="col-xs-12">
- <kylin-pagination data="cubeList.cubes" load-func="list" action="action"/>
- </div>
-</div>
-<div class="pull-left font-color-default" style="font-size: 15px" >
- <strong>Storage: {{getTotalSize(cubeList.cubes)}}</strong>
-</div>
-
-<div ng-include="'partials/jobs/job_submit.html'"></div>
-<div ng-include="'partials/jobs/job_refresh.html'"></div>
-<div ng-include="'partials/jobs/job_merge.html'"></div>
-<div ng-include="'partials/projects/project_create.html'"></div>
-
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/partials/modelDesigner/model_dimensions.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/model_dimensions.html b/webapp/app/partials/modelDesigner/model_dimensions.html
index e17557a..46dd238 100644
--- a/webapp/app/partials/modelDesigner/model_dimensions.html
+++ b/webapp/app/partials/modelDesigner/model_dimensions.html
@@ -21,21 +21,9 @@
<ng-form name="forms.model_dimensions_form" novalidate>
<!-- Dimensions Summary -->
<div class="dataTables_wrapper form-inline no-footer">
- <div class="row" ng-if="state.mode=='view'&&modelsManager.selectedModel.dimensions.length > 0">
- <div class="col-xs-6">
- <b>Dimensions</b>
- </div>
- <div class="col-xs-6">
- <span class="pull-right input-icon input-icon-right nav-search" style="margin-left: 22px;">
- <input type="text" placeholder="Filter ..." class="nav-search-input" ng-model="dimState.filter"/>
- <i class="ace-icon fa fa-search nav-search-icon"></i>
- </span>
- </div>
- </div>
-
<!-- VIEW MODE -->
- <div class="row">
- <table class="table table-striped table-hover" ng-if="state.mode=='view'&&modelsManager.selectedModel.dimensions.length > 0">
+ <div class="row" ng-if="state.mode=='view'&&modelsManager.selectedModel.dimensions.length > 0">
+ <table class="table table-striped table-hover">
<thead>
<tr>
<th>ID</th>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/partials/tables/table_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/tables/table_detail.html b/webapp/app/partials/tables/table_detail.html
index d19addf..dc1492d 100644
--- a/webapp/app/partials/tables/table_detail.html
+++ b/webapp/app/partials/tables/table_detail.html
@@ -1,3 +1,21 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
<div ng-controller="SourceMetaCtrl" class="nav-tabs-custom">
<div class="col-xs-12" ng-show="tableModel.selectedSrcDb&&tableModel.selectedSrcTable.name">
<h3 class="text-info">Table Schema:{{ tableModel.selectedSrcTable.name}}</h3>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/92c06967/webapp/app/routes.json
----------------------------------------------------------------------
diff --git a/webapp/app/routes.json b/webapp/app/routes.json
index 3d7005c..c61f8c2 100644
--- a/webapp/app/routes.json
+++ b/webapp/app/routes.json
@@ -24,14 +24,6 @@
}
},
{
- "url": "/cubes/add/json",
- "params": {
- "templateUrl": "partials/cubes/cube_json_edit.html",
- "tab": "models",
- "controller": "CubeEditCtrl"
- }
- },
- {
"url": "/cubes/edit/:cubeName/json",
"params": {
"templateUrl": "partials/cubes/cube_json_edit.html",