Fix the googlefonts build bug.

smart-zeppelin/zeppelin-web/Gruntfile.js

@@ -97,7 +97,7 @@ module.exports = function(grunt) {
         src: ['<%= yeoman.dist %>/index.html']
       }
     },
-
+/*
     googlefonts: {
       build: {
         options: {
@@ -126,7 +126,7 @@ module.exports = function(grunt) {
           ]
         }
       }
-    },
+    },*/
 
     // Watches files for changes and runs tasks based on the changed files
     watch: {
@@ -355,11 +355,6 @@ module.exports = function(grunt) {
           cwd: '<%= yeoman.app %>',
           dest: '<%= yeoman.dist %>',
           src: ['fonts/**/*.{eot,svg,ttf,woff}']
-        }, {
-          expand: true,
-          cwd: '<%= yeoman.app %>',
-          dest: '<%= yeoman.dist %>',
-          src: ['app/dashing-deps/0.1.3/roboto/fonts/**/*.{eot,svg,ttf,woff,woff2}']
         }, {
           expand: true,
           cwd: '<%= yeoman.app %>',
@@ -380,16 +375,6 @@ module.exports = function(grunt) {
           cwd: 'bower_components/bootstrap/dist',
           src: 'fonts/*',
           dest: '<%= yeoman.dist %>'
-        }, {
-          expand: true,
-          cwd: 'bower_components/select2/docs/vendor',
-          src: 'fonts/*',
-          dest: '<%= yeoman.dist %>'
-        }, {
-          expand: true,
-          cwd: 'bower_components/vis/docs',
-          src: 'fonts/*',
-          dest: '<%= yeoman.dist %>'
         }, {
           expand: true,
           cwd: 'bower_components/jquery-ui/themes/base/images',

smart-zeppelin/zeppelin-web/package.json

@@ -7,7 +7,7 @@
   },
   "scripts": {
     "clean": "rimraf dist && rimraf .tmp",
-    "postinstall": "bower install --silent --allow-root && grunt googlefonts",
+    "postinstall": "bower install --silent --allow-root",
     "prebuild": "npm-run-all clean",
     "build": "grunt pre-webpack-dist && webpack && grunt post-webpack-dist",
     "predev": "grunt pre-webpack-dev",

smart-zeppelin/zeppelin-web/pom.xml

@@ -38,8 +38,8 @@
   </prerequisites>
 
   <properties>
-    <node.version>v6.9.1</node.version>
-    <yarn.version>v0.18.1</yarn.version>
+    <node.version>v6.11.0</node.version>
+    <yarn.version>v0.27.5</yarn.version>
     <npm.version>4.2.0</npm.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
@@ -138,7 +138,7 @@
                     <goal>yarn</goal>
                   </goals>
                   <configuration>
-                    <arguments>run build</arguments>
+                    <arguments>run build --force</arguments>
                   </configuration>
                 </execution>
 

smart-zeppelin/zeppelin-web/src/app/dashboard/views/copy/copy.js

@@ -26,16 +26,15 @@ angular.module('zeppelinWebApp')
       cols: [
         // group 1/3 (4-col)
         $stb.indicator().key('state').canSort('state.condition+"_"+createTime').styleClass('td-no-padding').done(),
-        $stb.text('ID').key('id').canSort().sortDefaultDescent().done(),
-        $stb.text('Cmdlet ID').key('cid').canSort().done(),
-        $stb.datetime('Create Time').key('createTime').canSort().done(),
-        $stb.datetime('Finish Time').key('finishTime').canSort().done(),
-        $stb.duration("Running Time").key('runningTime').canSort().done(),
+        $stb.text('Rule ID').key('cid').canSort().done(),
         $stb.text('File Path').key('filePath').canSort().styleClass('col-md-1').done(),
         $stb.text('Target Path').key('targetPath').canSort().styleClass('col-md-1').done(),
-        $stb.text('Succeed').key('succeed').canSort().styleClass('col-md-1 hidden-sm hidden-xs').done(),
+        $stb.text('Status').key('succeed').canSort().styleClass('col-md-1 hidden-sm hidden-xs').done(),
+        $stb.duration("Running Time").key('runningTime').canSort().done(),
+        $stb.datetime('Create Time').key('createTime').canSort().done(),
+        $stb.datetime('Finish Time').key('finishTime').canSort().done(),
         $stb.progressbar('Progress').key('progress').sortBy('progress.usage').styleClass('col-md-1').done(),
-        $stb.button('Actions').key(['view']).styleClass('col-md-3').done()
+        $stb.button('Actions').key(['view']).styleClass('col-md-1').done()
       ],
       rows: null
     };

smart-zeppelin/zeppelin-web/src/app/dashboard/views/mover/mover.js

@@ -26,17 +26,17 @@ angular.module('zeppelinWebApp')
       cols: [
         // group 1/3 (4-col)
         $stb.indicator().key('state').canSort('state.condition+"_"+createTime').styleClass('td-no-padding').done(),
-        $stb.text('ID').key('id').canSort().sortDefaultDescent().done(),
-        $stb.text('Cmdlet ID').key('cid').canSort().done(),
-        $stb.datetime('Create Time').key('createTime').canSort().done(),
-        $stb.datetime('Finish Time').key('finishTime').canSort().done(),
-        $stb.duration("Running Time").key('runningTime').canSort().done(),
+        // $stb.text('ID').key('id').canSort().sortDefaultDescent().done(),
+        $stb.text('Rule ID').key('cid').canSort().done(),
         $stb.text('File').key('file').canSort().styleClass('col-md-1').done(),
+        $stb.text('File Size').key('fileSize').canSort().styleClass('col-md-1').done(),
         $stb.text('Storage Type').key('sourceType').canSort().styleClass('col-md-1').done(),
         $stb.text('Target Storage Type').key('targetType').canSort().styleClass('col-md-1').done(),
-        $stb.text('Succeed').key('succeed').canSort().styleClass('col-md-1 hidden-sm hidden-xs').done(),
+        $stb.datetime('Create Time').key('createTime').canSort().styleClass('col-md-2').done(),
         $stb.progressbar('Progress').key('progress').sortBy('progress.usage').styleClass('col-md-1').done(),
-        $stb.button('Actions').key(['view']).styleClass('col-md-3').done()
+        $stb.datetime('Finish Time').key('finishTime').canSort().styleClass('col-md-2').done(),
+        $stb.duration("Running Time").key('runningTime').canSort().styleClass('col-md-1').done(),
+        $stb.button('Actions').key(['view']).styleClass('col-md-1').done()
       ],
       rows: null
     };
@@ -45,7 +45,6 @@ angular.module('zeppelinWebApp')
       $scope.actionsTable.rows = $stb.$update($scope.actionsTable.rows,
         _.map(actions, function (action) {
           return {
-            id: action.actionId,
             cid: action.cmdletId,
             state: {tooltip: action.status, condition: action.finished ? '' : 'good', shape: 'stripe'},
             createTime: action.createTime,
@@ -66,6 +65,7 @@ angular.module('zeppelinWebApp')
                 // usage: action.progress * 100
             },
             file: "PATH",
+            fileSize: "1M",
             sourceType: "COOL",
             targetType: "ONESSD"
           };

smart-zeppelin/zeppelin-web/src/app/dashboard/views/rules/submit/submit.html

@@ -47,16 +47,11 @@ <h4 ng-bind="dialogTitle"></h4>
           <!-- right margin align to cancel button right -->
           <div class="row" style="margin-bottom: 18px">
             <div class="col-md-2">
-              <label class="control-label text-right" style="white-space: nowrap">
-                <span>Rule Spec</span>
-                <a href="app/dashboard/views/rules/submit/help.html" target="_blank">
-                  <span class="glyphicon glyphicon-question-sign"></span>
-                </a>
-              </label>
+              <span>Rule Spec</span>
             </div>
             <div class="col-md-10">
               <textarea help="Rule specifications."
-                        style="width: 97%; height: 100%; border-radius: 3px; "
+                        style="width: inherit; height: inherit;"
                         ng-model="launchArgs"></textarea>
             </div>
           </div>

smart-zeppelin/zeppelin-web/src/fonts/google-fonts.css

@@ -0,0 +1,49 @@
+@font-face {
+	font-family: 'Patua One';
+	font-style: normal;
+	font-weight: 400;
+	src: url(../fonts/patua-one-400-normal.eot);
+	src: local('Patua One'), local('PatuaOne-Regular'), url(../fonts/patua-one-400-normal.woff) format('woff'), url(../fonts/patua-one-400-normal.ttf) format('truetype'), url(../fonts/patua-one-400-normal.svg#PatuaOne) format('svg');
+}
+@font-face {
+	font-family: 'Source Code Pro';
+	font-style: normal;
+	font-weight: 300;
+	src: url(../fonts/source-code-pro-300-normal.eot);
+	src: local('Source Code Pro Light'), local('SourceCodePro-Light'), url(../fonts/source-code-pro-300-normal.woff) format('woff'), url(../fonts/source-code-pro-300-normal.ttf) format('truetype'), url(../fonts/source-code-pro-300-normal.svg#SourceCode Pro) format('svg');
+}
+@font-face {
+	font-family: 'Source Code Pro';
+	font-style: normal;
+	font-weight: 400;
+	src: url(../fonts/source-code-pro-400-normal.eot);
+	src: local('Source Code Pro'), local('SourceCodePro-Regular'), url(../fonts/source-code-pro-400-normal.woff) format('woff'), url(../fonts/source-code-pro-400-normal.ttf) format('truetype'), url(../fonts/source-code-pro-400-normal.svg#SourceCode Pro) format('svg');
+}
+@font-face {
+	font-family: 'Source Code Pro';
+	font-style: normal;
+	font-weight: 500;
+	src: url(../fonts/source-code-pro-500-normal.eot);
+	src: local('Source Code Pro Medium'), local('SourceCodePro-Medium'), url(../fonts/source-code-pro-500-normal.woff) format('woff'), url(../fonts/source-code-pro-500-normal.ttf) format('truetype'), url(../fonts/source-code-pro-500-normal.svg#SourceCode Pro) format('svg');
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 300;
+	src: url(../fonts/roboto-300-normal.eot);
+	src: local('Roboto Light'), local('Roboto-Light'), url(../fonts/roboto-300-normal.woff) format('woff'), url(../fonts/roboto-300-normal.ttf) format('truetype'), url(../fonts/roboto-300-normal.svg#Roboto) format('svg');
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 400;
+	src: url(../fonts/roboto-400-normal.eot);
+	src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto-400-normal.woff) format('woff'), url(../fonts/roboto-400-normal.ttf) format('truetype'), url(../fonts/roboto-400-normal.svg#Roboto) format('svg');
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 500;
+	src: url(../fonts/roboto-500-normal.eot);
+	src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto-500-normal.woff) format('woff'), url(../fonts/roboto-500-normal.ttf) format('truetype'), url(../fonts/roboto-500-normal.svg#Roboto) format('svg');
+}