kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhongj...@apache.org
Subject [1/2] kylin git commit: KYLIN 2090 Allow updating cube level config even the cube is ready
Date Mon, 07 Nov 2016 06:15:31 GMT
Repository: kylin
Updated Branches:
  refs/heads/v1.6.0-rc1 bed38ccff -> f2003eeee


KYLIN 2090 Allow updating cube level config even the cube is ready

Signed-off-by: Jason <jiatuer@163.com>


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/bd37eaf0
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/bd37eaf0
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/bd37eaf0

Branch: refs/heads/v1.6.0-rc1
Commit: bd37eaf037006fb3fe95e4dd240be7a36a8f20dc
Parents: bed38cc
Author: chenzhx <346839943@qq.com>
Authored: Wed Nov 2 14:30:35 2016 +0800
Committer: Jason <jiatuer@163.com>
Committed: Mon Nov 7 14:14:51 2016 +0800

----------------------------------------------------------------------
 .../cubeDesigner/advanced_settings.html         | 38 ++++++++++----------
 .../app/partials/cubeDesigner/dimensions.html   | 10 +++---
 webapp/app/partials/cubeDesigner/info.html      |  2 +-
 webapp/app/partials/cubeDesigner/measures.html  |  6 ++--
 .../partials/cubeDesigner/refresh_settings.html | 11 +++---
 webapp/app/partials/cubes/cubes.html            |  2 +-
 6 files changed, 35 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/bd37eaf0/webapp/app/partials/cubeDesigner/advanced_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index f173a13..2728240 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -53,7 +53,7 @@
 
                       <ui-select
                         autofocus="true"
-                        close-on-select="false"
+                        close-on-select="false"    ng-disabled="instance.status=='READY'"
                         on-select="refreshAggregationGroup(cubeMetaFrame.aggregation_groups,
rowIndex, aggregation_group)"
                         on-remove="refreshAggregationGroup(cubeMetaFrame.aggregation_groups,
rowIndex, aggregation_group)"
                         ng-if="state.mode=='edit'" style="width: 100%" multiple ng-model="aggregation_group.includes">
@@ -77,7 +77,7 @@
                     <td class="col-xs-8">
                       <ui-select
                         close-on-select="false"
-                        autofocus="true"
+                        autofocus="true"       ng-disabled="instance.status=='READY'"
                         on-select="refreshAggregationGroup(cubeMetaFrame.aggregation_groups,
rowIndex, aggregation_group)"
                         on-remove="refreshAggregationGroup(cubeMetaFrame.aggregation_groups,
rowIndex, aggregation_group)"
                         ng-if="state.mode=='edit'" style="width: 100%" multiple ng-model="aggregation_group.select_rule.mandatory_dims">
@@ -104,7 +104,7 @@
                           <td class="col-xs-10">
                             <ui-select
                               close-on-select="false"
-                              autofocus="true"
+                              autofocus="true"      ng-disabled="instance.status=='READY'"
                               on-select="refreshAggregationHierarchy(cubeMetaFrame.aggregation_groups,
rowIndex, aggregation_group,$index,hierarchyDims)"
                               on-remove="refreshAggregationHierarchy(cubeMetaFrame.aggregation_groups,
rowIndex, aggregation_group,$index,hierarchyDims)"
                               ng-if="state.mode=='edit'" style="width: 100%" multiple ng-model="hierarchyDims">
@@ -118,7 +118,7 @@
                               {{hierarchyDims}}</p>
                           </td>
                           <td class="col-xs-2">
-                            <button class="btn btn-sm btn-info"
+                            <button class="btn btn-sm btn-info"  ng-disabled="instance.status=='READY'"
                                     ng-click="removeHierarchy(aggregation_group,hierarchyDims)"
                                     ng-show="state.mode=='edit'"><i class="fa fa-minus"></i>
                             </button>
@@ -126,7 +126,7 @@
                         </tr>
                         <tr class="row">
                           <td class="col-xs-12">
-                            <button class="btn btn-sm btn-info"
+                            <button class="btn btn-sm btn-info"     ng-disabled="instance.status=='READY'"
                                     ng-click="addNewHierarchy(aggregation_group)" ng-show="state.mode=='edit'">New
Hierarchy<i class="fa fa-plus"></i>
                             </button>
                           </td>
@@ -145,7 +145,7 @@
                             <!-- Dimensions -->
                             <ui-select
                               close-on-select="false"
-                              autofocus="true"
+                              autofocus="true"    ng-disabled="instance.status=='READY'"
                               on-select="refreshAggregationJoint(cubeMetaFrame.aggregation_groups,
rowIndex, aggregation_group,$index,jointDims)"
                               on-remove="refreshAggregationJoint(cubeMetaFrame.aggregation_groups,
rowIndex, aggregation_group,$index,jointDims)"
                               ng-if="state.mode=='edit'" style="width: 100%" multiple ng-model="jointDims">
@@ -159,7 +159,7 @@
                               {{jointDims}}</p>
                           </td>
                           <td class="col-xs-2">
-                            <button class="btn btn-sm btn-info"
+                            <button class="btn btn-sm btn-info"   ng-disabled="instance.status=='READY'"
                                     ng-click="removeJointDims(aggregation_group,jointDims)"
                                     ng-show="state.mode=='edit'"><i class="fa fa-minus"></i>
                             </button>
@@ -167,7 +167,7 @@
                         </tr>
                         <tr class="row">
                           <td class="col-xs-12">
-                            <button class="btn btn-sm btn-info"
+                            <button class="btn btn-sm btn-info"      ng-disabled="instance.status=='READY'"
                                     ng-click="addNewJoint(aggregation_group)" ng-show="state.mode=='edit'">New
Joint<i class="fa fa-plus"></i>
                             </button>
                           </td>
@@ -178,14 +178,14 @@
                 </table>
               </td>
               <td ng-if="state.mode=='edit'" class="col-xs-1">
-                <button class="btn btn-xs btn-info"
+                <button class="btn btn-xs btn-info"   ng-disabled="instance.status=='READY'"
                         ng-click="removeElement(cubeMetaFrame.aggregation_groups, aggregation_group)"><i
                   class="fa fa-minus"></i>
                 </button>
               </td>
             </tr>
           </table>
-          <button class="btn btn-sm btn-info" style="margin-left:42px" ng-click="addNewAggregationGroup()"
+          <button class="btn btn-sm btn-info" style="margin-left:42px" ng-click="addNewAggregationGroup()"
 ng-disabled="instance.status=='READY'"
                   ng-show="state.mode=='edit'">New Aggregation Group<i class="fa fa-plus"></i>
           </button>
         </div>
@@ -223,7 +223,7 @@
                     <td>
                       <!--Column Name -->
                       <input type="text" class="form-control" placeholder="Column Name.."
ng-if="state.mode=='edit'"
-                             ng-change="refreshRowKey(convertedRowkeys,$index,rowkey_column)"
+                             ng-change="refreshRowKey(convertedRowkeys,$index,rowkey_column)"
 ng-disabled="instance.status=='READY'"
                              tooltip="rowkey column name.." tooltip-trigger="focus"
                              ng-model="rowkey_column.column" class="form-control">
 
@@ -231,7 +231,7 @@
                     </td>
 
                     <td>
-                      <select ng-if="state.mode=='edit'" style="width:180px;"
+                      <select ng-if="state.mode=='edit'" style="width:180px;"     ng-disabled="instance.status=='READY'"
                               chosen ng-model="rowkey_column.encoding"
                               ng-change="refreshRowKey(convertedRowkeys,$index,rowkey_column);"
                               ng-options="dt.value as dt.name for dt in getEncodings(rowkey_column.column)">
@@ -244,7 +244,7 @@
                       <!--Column Length -->
                       <input type="text" class="form-control" placeholder="Column Length.."
ng-if="state.mode=='edit'"
                              tooltip="rowkey column length.." tooltip-trigger="focus"
-                             ng-disabled="rowkey_column.encoding=='dict'||rowkey_column.encoding=='date'||rowkey_column.encoding=='time'||rowkey_column.encoding=='boolean'"
+                             ng-disabled="rowkey_column.encoding=='dict'||rowkey_column.encoding=='date'||rowkey_column.encoding=='time'||rowkey_column.encoding=='boolean'||instance.status=='READY'"
                              ng-change="refreshRowKey(convertedRowkeys,$index,rowkey_column);"
                              ng-model="rowkey_column.valueLength" class="form-control">
 
@@ -255,7 +255,7 @@
                     <td>
                       <select ng-if="state.mode=='edit'" style="width:180px;"
                               chosen ng-model="rowkey_column.isShardBy"
-                              tooltip="false by default"
+                              tooltip="false by default"     ng-disabled="instance.status=='READY'"
                               data-placeholder="false by default"
                               ng-change="refreshRowKey(convertedRowkeys,$index,rowkey_column,true)"
                               ng-options="dt as dt for dt in cubeConfig.rowKeyShardOptions">
@@ -266,7 +266,7 @@
                     </td>
 
                     <td ng-if="state.mode=='edit'">
-                      <button class="btn btn-xs btn-info"
+                      <button class="btn btn-xs btn-info"  ng-disabled="instance.status=='READY'"
                               ng-click="removeRowkey(convertedRowkeys, $index,rowkey_column)"><i
                         class="fa fa-minus"></i>
                       </button>
@@ -276,7 +276,7 @@
                 </table>
               </div>
           </div>
-          <button class="btn btn-sm btn-info" style="margin-left:42px"
+          <button class="btn btn-sm btn-info" style="margin-left:42px" ng-disabled="instance.status=='READY'"
                   ng-click="addNewRowkeyColumn()" ng-show="state.mode=='edit'">New Rowkey
Column<i class="fa fa-plus"></i>
           </button>
         </div>
@@ -310,11 +310,11 @@
                     </td>
                     <td ng-if="state.mode=='edit'">
                       <!--Edit Button -->
-                      <button class="btn btn-xs btn-info" ng-click="addNewDictionaries(dictionaries,
$index)" >
+                      <button class="btn btn-xs btn-info" ng-click="addNewDictionaries(dictionaries,
$index)" ng-disabled="instance.status=='READY'">
                         <i class="fa fa-pencil"></i>
                       </button>
                       <!--Remove Button -->
-                      <button class="btn btn-xs  btn-danger" ng-click="removeDictionaries(cubeMetaFrame.dictionaries,
dictionaries)">
+                      <button class="btn btn-xs  btn-danger" ng-click="removeDictionaries(cubeMetaFrame.dictionaries,
dictionaries)" ng-disabled="instance.status=='READY'">
                         <i class="fa fa-trash-o"></i>
                       </button>
                     </td>
@@ -326,7 +326,7 @@
         </div>
         <!--Add Dictionaries Button-->
         <div class="form-group" style="margin-left:42px;">
-          <button class="btn btn-sm btn-info" ng-click="addNewDictionaries()" ng-show="state.mode=='edit'
&& !addNew">
+          <button class="btn btn-sm btn-info" ng-click="addNewDictionaries()" ng-show="state.mode=='edit'
&& !addNew" ng-disabled="instance.status=='READY'">
             <i class="fa fa-plus"></i> Dictionaries
           </button>
        </div>

http://git-wip-us.apache.org/repos/asf/kylin/blob/bd37eaf0/webapp/app/partials/cubeDesigner/dimensions.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/dimensions.html b/webapp/app/partials/cubeDesigner/dimensions.html
index 9539250..ed265c4 100644
--- a/webapp/app/partials/cubeDesigner/dimensions.html
+++ b/webapp/app/partials/cubeDesigner/dimensions.html
@@ -23,7 +23,7 @@
         <div class="row">
             <div class="col-xs-6" ng-if="state.mode=='edit'">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
ng-disabled="instance.status=='READY'">
                         <i class="fa fa-plus"></i> Add Dimension <span class="ace-icon
fa fa-caret-down icon-on-right"></span>
                     </button>
                     <ul class="dropdown-menu" role="menu">
@@ -32,8 +32,8 @@
                         <li><a ng-click="addDim('derived')">Derived</a></li>
                     </ul>
                 </div>
-                <button type="button" class="btn btn-default" ng-disabled="!metaModel.model.fact_table.length"
-                        ng-click="openAutoGenModal()">
+                <button type="button" class="btn btn-default" ng-disabled="!metaModel.model.fact_table.length||instance.status=='READY'"
+                        ng-click="openAutoGenModal()" >
                     <i class="fa fa-building-o"></i> Auto Generator
                 </button>
             </div>
@@ -94,11 +94,11 @@
                     </td>
                     <td ng-if="state.mode=='edit'">
                         <!--edit button-->
-                        <button class="btn btn-xs btn-info"
+                        <button class="btn btn-xs btn-info" ng-disabled="instance.status=='READY'"
                                 ng-click="editDim(dimension)"><i class="fa fa-pencil"></i>
                         </button>
                         <!-- remove button-->
-                        <button class="btn btn-xs btn-danger"
+                        <button class="btn btn-xs btn-danger" ng-disabled="instance.status=='READY'"
                                 ng-click="removeDim(dimension)"><i class="fa fa-trash-o"></i>
                         </button>
                     </td>

http://git-wip-us.apache.org/repos/asf/kylin/blob/bd37eaf0/webapp/app/partials/cubeDesigner/info.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/info.html b/webapp/app/partials/cubeDesigner/info.html
index 755fc12..b1e4d48 100644
--- a/webapp/app/partials/cubeDesigner/info.html
+++ b/webapp/app/partials/cubeDesigner/info.html
@@ -112,7 +112,7 @@
                         <b>Description</b>
                     </label>
                     <div class="col-xs-12 col-sm-6">
-                        <textarea ng-if="state.mode=='edit'" class="form-control box-default"
+                        <textarea ng-if="state.mode=='edit'" class="form-control box-default"
 ng-disabled="instance.status=='READY'"
                             name="comment" id="comment" ng-model="cubeMetaFrame.description"></textarea>
                         <span ng-if="state.mode=='view'">{{cubeMetaFrame.description}}</span>
                     </div>

http://git-wip-us.apache.org/repos/asf/kylin/blob/bd37eaf0/webapp/app/partials/cubeDesigner/measures.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html
index c85bfd2..8961cc6 100755
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -56,11 +56,11 @@
                           </td>
                           <td ng-if="state.mode=='edit'">
                               <!--Edit Button -->
-                              <button class="btn btn-xs btn-info" ng-click="addNewMeasure(measure,
$index)">
+                              <button class="btn btn-xs btn-info" ng-click="addNewMeasure(measure,
$index)" ng-disabled="instance.status=='READY'">
                                   <i class="fa fa-pencil"></i>
                               </button>
                               <!--Remove Button -->
-                              <button class="btn btn-xs  btn-danger" ng-click="removeElement(cubeMetaFrame.measures,
measure)">
+                              <button class="btn btn-xs  btn-danger" ng-click="removeElement(cubeMetaFrame.measures,
measure)" ng-disabled="instance.status=='READY'">
                                   <i class="fa fa-trash-o"></i>
                               </button>
                           </td>
@@ -72,7 +72,7 @@
 
   <!--Add Measures Button-->
   <div class="form-group">
-      <button class="btn btn-sm btn-info" ng-click="addNewMeasure()" ng-show="state.mode=='edit'
&& !newMeasure">
+      <button class="btn btn-sm btn-info" ng-click="addNewMeasure()" ng-show="state.mode=='edit'
&& !newMeasure" ng-disabled="instance.status=='READY'">
           <i class="fa fa-plus"></i> Measure
       </button>
   </div>

http://git-wip-us.apache.org/repos/asf/kylin/blob/bd37eaf0/webapp/app/partials/cubeDesigner/refresh_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/refresh_settings.html b/webapp/app/partials/cubeDesigner/refresh_settings.html
index 0d88e7c..89b9de9 100755
--- a/webapp/app/partials/cubeDesigner/refresh_settings.html
+++ b/webapp/app/partials/cubeDesigner/refresh_settings.html
@@ -106,7 +106,6 @@
                   <div class="col-xs-12 col-sm-6">
                     <!--retention range is store in CubeInstance, will convert to cubeMetaFrame
for front end-->
                     <input type="text" retention-format class="form-control ng-scope ng-pristine
ng-valid"
-                           placeholder="how many days cube retention" ng-model="cubeMetaFrame.retention_range"
                            ng-if="state.mode=='edit'">
                     <span ng-if="state.mode=='view'">{{cubeMetaFrame.retention_range
| millisecondsToDay}}</span>
                   </div>
@@ -126,13 +125,15 @@
                     <!--<input type="text" class="form-control" datepicker-popup="yyyy-MM-dd"
datepicker-timezone-->
                            <!--ng-model="cubeMetaFrame.partition_date_start" ng-if="state.mode=='edit'"-->
                            <!--placeholder="Click to choose start date..." is-open="opened"/>-->
-                    <div ng-if="state.mode=='edit'" class="dropdown">
+                    <div ng-if="state.mode=='edit'" class="dropdown" >
                       <a class="dropdown-toggle" id="dropdown2" role="button" data-toggle="dropdown"
data-target="#" href="#">
-                        <div class="input-group"><input type="text" class="form-control"
date-timepicker-timezone data-ng-model="cubeMetaFrame.partition_date_start"><span class="input-group-addon"><i
class="glyphicon glyphicon-calendar"></i></span>
+                        <div class="input-group">
+                          <input type="text" class="form-control" date-timepicker-timezone
data-ng-model="cubeMetaFrame.partition_date_start" ng-disabled="instance.status=='READY'">
+                          <span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span>
                         </div>
                       </a>
-                      <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                        <datetimepicker  data-ng-model="cubeMetaFrame.partition_date_start"
data-datetimepicker-config="{ dropdownSelector: '#dropdown2' }"/>
+                      <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel" ng-if="!(instance.status=='READY')">
+                        <datetimepicker  data-ng-model="cubeMetaFrame.partition_date_start"
data-datetimepicker-config="{ dropdownSelector: '#dropdown2' }" />
                       </ul>
                     </div>
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/bd37eaf0/webapp/app/partials/cubes/cubes.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
index 7b3a533..0187523 100644
--- a/webapp/app/partials/cubes/cubes.html
+++ b/webapp/app/partials/cubes/cubes.html
@@ -91,7 +91,7 @@
                     <ul class="dropdown-menu" role="menu">
                         <li ng-if="cube.status!='READY' && 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!='READY' && (userService.hasRole('ROLE_ADMIN')
|| hasPermission(cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))">
+                        <li ng-if="(userService.hasRole('ROLE_ADMIN') || hasPermission(cube,
permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))">
                             <a ng-click="cubeEdit(cube);">Edit</a></li>
                         <li ng-if="cube.streaming && cube.status=='DISABLED' &&
(userService.hasRole('ROLE_ADMIN') || hasPermission(cube, permissions.ADMINISTRATION.mask,
permissions.MANAGEMENT.mask))"></li>
                         <li ng-if="cube.status!='DESCBROKEN'"><a ng-click="startJobSubmit(cube);">Build</a></li>


Mime
View raw message