Move js files directly included in index.html to lib, rework gruntfil…

…e to generate js files alongside typescript files, reduce watch to just concat/copy/reload and fix a couple issues
hawtio · Nov 15, 2013 · ad4c128 · ad4c128
1 parent 0cded0e
commit ad4c128
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 41 deletions.
diff --git a/hawtio-web/GruntFile.js b/hawtio-web/GruntFile.js
@@ -35,11 +35,11 @@ module.exports = function (grunt) {
         files: [
           {
             src: appFiles,
-            dest: "<%= grunt.option('webapp_outdir') %>/app/app.js"
+            dest:'src/main/webapp/app/'
           }
         ],
         options:{
-          sourcemap: false,
+          sourcemap: true,
           target: 'es5',
           //module:'amd',
           style:'eqeqeq;bitwise'
@@ -79,14 +79,18 @@ module.exports = function (grunt) {
     },
     concat: {
       main: {
-        src: ["target/schema/js/*.js", "<%= grunt.option('webapp_outdir') %>/app/app.js"],
+        src: ["target/schema/js/*.js", "src/main/webapp/app/**/*.js"],
         dest: "<%= grunt.option('webapp_outdir') %>/app/app.js"
       }
     },
     watch: {
       app: {
-        files: ["src/main/webapp/**", "target/schema/js/*.js"],
-        tasks: ['clean-appjs', 'type', 'concat', 'copy:dist'],
+        files: ["src/main/webapp/lib/**",
+                "src/main/webapp/app/**/*.js",
+                "src/main/webapp/img/**",
+                "src/main/webapp/css/**",
+                "target/schema/js/*.js"],
+        tasks: ['clean-appjs', 'concat', 'copy:dist'],
         options: {
           livereload: true
         }
@@ -99,6 +103,6 @@ module.exports = function (grunt) {
   grunt.registerTask('default', ['clean-appjs', 'type', 'concat', 'copy']);
 
   // watch source for changes
-  grunt.registerTask('watchSrc', ['clean-appjs', 'type', 'concat', 'copy', 'watch']);
+  grunt.registerTask('watchSrc', ['concat', 'copy', 'watch']);
 
 };
diff --git a/hawtio-web/src/main/webapp/app/camel/js/camelPlugin.ts b/hawtio-web/src/main/webapp/app/camel/js/camelPlugin.ts
@@ -16,7 +16,7 @@ module Camel {
 
 
   angular.module(pluginName, ['bootstrap', 'ui.bootstrap',
-            'ui.bootstrap.dialog', 'ui.bootstrap.tabs', 'ui.bootstrap.typeahead', 'ngResource', 'hawtioCore', 'hawtio-ui']).
+            'ui.bootstrap.dialog', 'ui.bootstrap.tabs', 'ui.bootstrap.typeahead', 'ngResource', 'hawtioCore', 'hawtio-ui', 'jmx']).
           config(($routeProvider) => {
             $routeProvider.
                     when('/camel/browseEndpoint', {templateUrl: 'app/camel/html/browseEndpoint.html'}).
@@ -221,24 +221,4 @@ module Camel {
 
   hawtioPluginLoader.addModule(pluginName);
 
-  // register the jmx lazy loader here as it won't have been invoked in the run methot
-  hawtioPluginLoader.loadPlugins(() => {
-    jmxModule.registerLazyLoadHandler(jmxDomain, (folder:Folder) => {
-      if (jmxDomain === folder.domain && "routes" === folder.typeName) {
-        return (workspace, folder, onComplete) => {
-          if ("routes" === folder.typeName) {
-            processRouteXml(workspace, workspace.jolokia, folder, (route) => {
-              if (route) {
-                addRouteChildren(folder, route);
-              }
-              onComplete();
-            });
-          } else {
-            onComplete();
-          }
-        }
-      }
-      return null;
-    });
-  });
 }
diff --git a/hawtio-web/src/main/webapp/app/core/js/dialog.ts b/hawtio-web/src/main/webapp/app/core/js/dialog.ts
@@ -1,3 +1,4 @@
+/// <reference path='corePlugin.ts'/>
 module Core {
 
   /**
@@ -19,4 +20,4 @@ module Core {
       this.show = false;
     }
   }
-}
+}
diff --git a/hawtio-web/src/main/webapp/app/jmx/js/helpers.ts b/hawtio-web/src/main/webapp/app/jmx/js/helpers.ts
@@ -9,7 +9,28 @@ module Jmx {
 
   var attributesToolBars = {};
 
-  export var lazyLoaders = null;
+  // TODO moved this from camel...
+  export var lazyLoaders:any = {
+    'org.apache.camel': [
+      (folder:Folder) => {
+        if ('org.apache.camel' === folder.domain && "routes" === folder.typeName) {
+          return (workspace, folder, onComplete) => {
+            if ("routes" === folder.typeName) {
+              Camel.processRouteXml(workspace, workspace.jolokia, folder, (route) => {
+                if (route) {
+                  Camel.addRouteChildren(folder, route);
+                }
+                onComplete();
+              });
+            } else {
+              onComplete();
+            }
+          }
+        }
+        return null;
+      }
+    ]
+  };
 
   export function findLazyLoadingFunction(workspace, folder) {
     var factories = workspace.jmxTreeLazyLoadRegistry[folder.domain];

diff --git a/hawtio-web/src/main/webapp/app/jmx/js/jmxPlugin.ts b/hawtio-web/src/main/webapp/app/jmx/js/jmxPlugin.ts
@@ -1,6 +1,7 @@
 /// <reference path='../../core/js/corePlugin.ts'/>
 /// <reference path='helpers.ts'/>
 /// <reference path='widgetRepository.ts'/>
+/// <reference path='../../camel/js/camelPlugin.ts'/>
 
 module Jmx {
   var pluginName = 'jmx';

diff --git a/hawtio-web/src/main/webapp/app/log/js/helpers.ts b/hawtio-web/src/main/webapp/app/log/js/helpers.ts
@@ -1,5 +1,8 @@
 /// <reference path='logPlugin.ts'/>
 module Log {
+
+  export var log:Logging.Logger = Logger.get("Logs");
+
   export function logSourceHref(row) {
     if (!row) {
       return "";

diff --git a/hawtio-web/src/main/webapp/app/log/js/logs.ts b/hawtio-web/src/main/webapp/app/log/js/logs.ts
@@ -190,6 +190,9 @@ module Log {
 
 
     var updateValues = function (response) {
+      if (!response.value) {
+        return;
+      }
       var scrollToBottom = false;
       if (!$scope.inDashboard) {
         var window = $($window);

diff --git a/hawtio-web/src/main/webapp/index.html b/hawtio-web/src/main/webapp/index.html
@@ -276,10 +276,10 @@ <h2 title="Status Code: {{connectFailure.status}}">Cannot Connect: {{connectFail
     <script type="text/javascript" src="lib/logger.min.js"></script>
     <script type="text/javascript" src="lib/json2-min.js"></script>
 
-    <script type="text/javascript" src="app/core/js/loggingInit.js"></script>
+    <script type="text/javascript" src="lib/loggingInit.js"></script>
 
     <!-- Now load and set up the plugin loader -->
-    <script type="text/javascript" src="app/core/js/hawtio-plugin-loader.js"></script>
+    <script type="text/javascript" src="lib/hawtio-plugin-loader.js"></script>
 
     <script type="text/javascript">
       hawtioPluginLoader.setLoaderCallback({
@@ -382,10 +382,10 @@ <h2 title="Status Code: {{connectFailure.status}}">Cannot Connect: {{connectFail
     <script type="text/javascript" src="lib/sugar-1.3.6-custom.min.js"></script>
 
     <!-- camel model definition -->
-    <script type="text/javascript" src="app/camel/js/camelModel.js"></script>
+    <script type="text/javascript" src="lib/camelModel.js"></script>
 
     <!-- json schema definition -->
-    <script type="text/javascript" src="app/forms/js/jsonschema.js"></script>
+    <script type="text/javascript" src="lib/jsonschema.js"></script>
 
     <!-- markdown renderer -->
     <script type="text/javascript" src="lib/marked.js"></script>

diff --git a/...rc/main/webapp/app/camel/js/camelModel.js → hawtio-web/src/main/webapp/lib/camelModel.js b/...rc/main/webapp/app/camel/js/camelModel.js → hawtio-web/src/main/webapp/lib/camelModel.js
diff --git a/...ebapp/app/core/js/hawtio-plugin-loader.js → ...c/main/webapp/lib/hawtio-plugin-loader.js b/...ebapp/app/core/js/hawtio-plugin-loader.js → ...c/main/webapp/lib/hawtio-plugin-loader.js
diff --git a/...rc/main/webapp/app/forms/js/jsonschema.js → hawtio-web/src/main/webapp/lib/jsonschema.js b/...rc/main/webapp/app/forms/js/jsonschema.js → hawtio-web/src/main/webapp/lib/jsonschema.js
diff --git a/...rc/main/webapp/app/core/js/loggingInit.js → ...io-web/src/main/webapp/lib/loggingInit.js b/...rc/main/webapp/app/core/js/loggingInit.js → ...io-web/src/main/webapp/lib/loggingInit.js
diff --git a/...b/src/main/webapp/app/core/js/mvGraphs.js → hawtio-web/src/main/webapp/lib/mvGraphs.js b/...b/src/main/webapp/app/core/js/mvGraphs.js → hawtio-web/src/main/webapp/lib/mvGraphs.js
diff --git a/hawtio-web/src/test/specs/SpecRunner.html b/hawtio-web/src/test/specs/SpecRunner.html
@@ -22,9 +22,9 @@
   <script type="text/javascript" src="../../main/webapp/lib/logger.min.js"></script>
   <script type="text/javascript" src="../../main/webapp/lib/json2-min.js"></script>
 
-  <script type="text/javascript" src="../../main/webapp/app/core/js/loggingInit.js"></script>
+  <script type="text/javascript" src="../../main/webapp/lib/loggingInit.js"></script>
 
-  <script type="text/javascript" src="../../main/webapp/app/core/js/hawtio-plugin-loader.js"></script>
+  <script type="text/javascript" src="../../main/webapp/lib/hawtio-plugin-loader.js"></script>
 
 
 
@@ -102,21 +102,19 @@
   <!-- helper libraries -->
   <script type="text/javascript" src="../../main/webapp/lib/sugar-1.3.6-custom.min.js"></script>
 
-
-  <script type="text/javascript" src="../../../target/hawtio-web-1.2-SNAPSHOT/app/app.js"></script>
-
   <!-- camel model definition -->
-  <script type="text/javascript" src="../../main/webapp/app/camel/js/camelModel.js"></script>
+  <script type="text/javascript" src="../../main/webapp/lib/camelModel.js"></script>
 
   <!-- json schema model -->
-  <script type="text/javascript" src="../../main/webapp/app/forms/js/jsonschema.js"></script>
+  <script type="text/javascript" src="../../main/webapp/lib/jsonschema.js"></script>
 
   <!-- markdown renderer -->
   <script type="text/javascript" src="../../main/webapp/lib/marked.js"></script>
 
-
+  <script type="text/javascript" src="../../../target/hawtio-web-1.2-SNAPSHOT/app/app.js"></script>
 
   <!-- include spec files here... -->
+
   <script type="text/javascript" src="spec/ApiSpec.js"></script>
   <script type="text/javascript" src="spec/FabricSpec.js"></script>
   <script type="text/javascript" src="spec/DozerSpec.js"></script>