MMS4 Support, Branding Service, Configuration File

Dockerfile

@@ -1,8 +1,8 @@
 ################################################################################
 # Dockerfile
 # 
-# Josh Kaplan 
-# joshua.d.kaplan@lmco.com
+# Enquier
+# openmbee@gmail.com
 #
 # This is the Dockerfile for View Editor (VE). 
 # To build the container, run the following command: `docker build -t ve .` 
@@ -11,7 +11,7 @@
 ################################################################################
 FROM node:8
 
-MAINTAINER Josh Kaplan <joshua.d.kaplan@lmco.com>
+ENV VE_ENV 'example'
 
 WORKDIR /opt/mbee/ve
 COPY . /opt/mbee/ve
@@ -58,4 +58,4 @@ EXPOSE 9000
 
 # When the container runs, we run grunt. The second argument should reference a 
 # server defined in the angular-mms-grunt-servers.json file. 
-CMD ["grunt", "server:dev"]
+CMD ["sh", "-c", "grunt release:docker --env=${VE_ENV}"]

Gruntfile.js

@@ -7,6 +7,8 @@ module.exports = function(grunt) {
     configureProxies: 'grunt-connect-proxy-updated',
     artifactory: 'grunt-artifactory-artifact'
   });
+  // Project configuration.
+  var env = grunt.option('env') || 'example';
 
   var jsFiles = ['app/js/**/*.js', 'src/directives/**/*.js', 'src/services/*.js'];
 
@@ -20,105 +22,99 @@ module.exports = function(grunt) {
   var connectObject = {
     docs: {
       options: {
-        hostname: 'localhost',
+        hostname: '*',
         port: 10000,
         base: './dist/docs'
       }
     }
   };
 
-  if (grunt.file.exists('angular-mms-grunt-servers.json')) {
-    var servers = grunt.file.readJSON('angular-mms-grunt-servers.json');
-
-    // Set proxie info for server list
-    for (var key in servers) {
-      var serverPort = 443;
-      var serverHttps = true;
-      if (key === "localhost") {
-        serverPort = 8080;
-        serverHttps = false;
-      }
-      connectObject[key] = {
+  //if (grunt.file.exists('angular-mms-grunt-servers.json')) {
+  //var server = grunt.file.readJSON('angular-mms-grunt-servers.json');
+  //ar serverPort = server.mms_port;
+  //var serverHttps = true;
+  var serveStatic = require('serve-static');
+  var modRewrite = require('connect-modrewrite');
+  connectObject["docker"] = {
+    options: {
+      hostname: '0.0.0.0',
+      port: 9000,
+      protocol: 'http',
+      //open: true,
+      //key: grunt.file.read('/run/secrets/server.key').toString(),
+      //cert: grunt.file.read('/run/secrets/server.crt').toString(),
+      debug: true,
+      base: {
+        path: './dist',
         options: {
-          hostname: '*',
-          port: 9000,
-          open: true,
-          base: {
-            path: './dist',
-            options: {
-              // Add this so that the browser doesn't re-validate static resources
-              // Also, we have cache-busting, so we don't have to worry about stale resources
-              maxAge: 31536000000
-            }
-          },
-          middleware: function (connect, options, middlewares) {
-            middlewares.unshift(
-              require('grunt-connect-proxy-updated/lib/utils').proxyRequest,
-              // add gzip compression to local server to reduce static resources' size and improve load speed
-              require('compression')(),
-              // need to add livereload as a middleware at this specific order to avoid issues with other middlewares
-              require('connect-livereload')());
-            return middlewares;
-          }
-        },
-        proxies: [
-          {
-            context: '/mms-ts',
-            host: 'mms-ts-uat.jpl.nasa.gov',//'localhost',//'100.64.243.161',
-            port: 8080
-          },
-          {
-            context: '/xlrapi',
-            https: serverHttps,
-            host: servers[key],
-            port: serverPort
-          },
-          {
-            context: '/api',
-            host: servers[key],
-            changeOrigin: true,
-            https: serverHttps,
-            port: serverPort,
-            rewrite: { '^/api': ''}
-          }
-        ]
-      };
+          index: 'mms.html',
+          // Add this so that the browser doesn't re-validate static resources
+          // Also, we have cache-busting, so we don't have to worry about stale resources
+          maxAge: 31536000000
+        }
+      },
+      middleware: function(connect, options) {
+        var middlewares;
+        middlewares = [];
+        if (!Array.isArray(options.base)) {
+          options.base = [options.base];
+        }
+        middlewares.push(
+            require('grunt-connect-proxy-updated/lib/utils').proxyRequest,
+            // add gzip compression to local server to reduce static resources' size and improve load speed
+            require('compression')()
+            //require('connect-modrewrite')(['!\\.html|\\.js|\\.css|\\.svg|\\.jp(e?)g|\\.png|\\.gif$ /mms.html']),
+
+            // need to add livereload as a middleware at this specific order to avoid issues with other middlewares
+        );
+        middlewares.push( modRewrite( ['^[^\\.]*$ /mms.html [L]'] ) );
+        options.base.forEach(function(base) {
+          // Serve static files.
+          var path = base.path || base;
+          var staticOptions = base.options || defaultStaticOptions;
+          middlewares.push(serveStatic(path, staticOptions));
+        });
+        return middlewares;
+      }
     }
-  }
+  };
+  //}
 
   var combineCustomJS = {
-        options: {
-            banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd HH:MM:ss") %> */\n',
-                wrap: 'mms',
-                mangle: true,
-                sourceMap: {
-                includeSources: true
-            }
-        },
-        files: {
-            'dist/js/ve-mms.min.js': [
-
-                // mms module
-                'src/mms.js',
-                'src/services/*.js',
-                'src/filters/*.js',
-
-                // mms.directives module (need mms, mms.directives.tpls.js module )
-                'dist/jsTemp/mms.directives.tpls.js',
-                'src/mms.directives.js',
-                'src/directives/**/*.js',
-
-                // app module ( need app.tpls.js, mms, mms.directives module )
-                'dist/jsTemp/app.tpls.js',
-                'app/js/mms/app.js',
-                'app/js/mms/controllers/*.js',
-                'app/js/mms/directives/*.js'
-            ]
-        }
+    options: {
+      banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd HH:MM:ss") %> */\n',
+      wrap: 'mms',
+      mangle: true,
+      sourceMap: {
+        includeSources: true
+      }
+    },
+    files: {
+      'dist/js/ve-mms.min.js': [
+
+        // mms module
+        'src/mms.js',
+        'src/services/*.js',
+        'src/filters/*.js',
+
+        // mms.directives module (need mms, mms.directives.tpls.js module )
+        'dist/jsTemp/mms.directives.tpls.js',
+        'src/mms.directives.js',
+        'src/directives/**/*.js',
+
+        // app module ( need app.tpls.js, mms, mms.directives module )
+        'dist/jsTemp/app.tpls.js',
+        'app/js/mms/app.js',
+        'app/js/mms/controllers/*.js',
+        'app/js/mms/directives/*.js',
+
+        // config files
+        'app/config/config.' + env + '.js'
+      ]
+    }
   };
-  // Project configuration.
-  grunt.initConfig({
 
+  grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
     concurrent: {
@@ -262,7 +258,7 @@ module.exports = function(grunt) {
 
     // concat only (no minification )
     concat: {
-        combineCustomJS: combineCustomJS
+      combineCustomJS: combineCustomJS
     },
 
     /** Concat + Minify JS files **/
@@ -300,6 +296,7 @@ module.exports = function(grunt) {
         evil: true, //allow eval for plot integration
         globalstrict: true,
         validthis: true,
+        esversion: 6,
         globals: {
           angular: true,
           window: true,
@@ -335,15 +332,15 @@ module.exports = function(grunt) {
 
     watch: {
       dev: {
-        files: ['app/**/*', '!app/bower_components/**', 'src/**/*'],
+        files: ['app/env.js', 'app/**/*', '!app/bower_components/**', 'src/**/*'],
         tasks: ['dev-build']
       },
       release: {
-        files: ['app/**/*', '!app/bower_components/**', 'src/**/*'],
+        files: ['app/env.js', 'app/**/*', '!app/bower_components/**', 'src/**/*'],
         tasks: ['release-build']
       },
       docs: {
-        files: ['app/**/*', '!app/bower_components/**', 'src/**/*'],
+        files: ['app/env.js', 'app/**/*', '!app/bower_components/**', 'src/**/*'],
         tasks: ['ngdocs']
       },
       options: {
@@ -354,7 +351,7 @@ module.exports = function(grunt) {
     artifactory: {
       options: {
         url: artifactoryUrl,
-        repository: snapshotRepo, //releaseRepo,
+        repository: releaseRepo,
         username: artifactoryUser,
         password: artifactoryPassword
       },
@@ -365,21 +362,21 @@ module.exports = function(grunt) {
         options: {
           publish: [{
             id: groupId + ':ve:zip',
-            version: '3.6.1-SNAPSHOT',
+            version: '3.7.0-SNAPSHOT',
             path: 'deploy/'
           }]
         }
       }
     },
 
     karma: {
-        unit:{
-            configFile:'config/develop/karma.develop.conf.js'
-        },
-        continuous:{
-          configFile:'config/develop/karma.develop.conf.js',
-          logLevel: 'ERROR'
-        }
+      unit:{
+        configFile:'config/develop/karma.develop.conf.js'
+      },
+      continuous:{
+        configFile:'config/develop/karma.develop.conf.js',
+        logLevel: 'ERROR'
+      }
     },
 
     protractor: {
@@ -430,11 +427,11 @@ module.exports = function(grunt) {
   grunt.registerTask('e2e-test', ['protractor']);
 
   grunt.registerTask('release', function(arg1) {
-      grunt.task.run('release-build');
-      if (arguments.length !== 0)
-        grunt.task.run('launch:release:' + arg1);
-      else
-        grunt.task.run('launch:release');
+    grunt.task.run('release-build');
+    if (arguments.length !== 0)
+      grunt.task.run('launch:release:' + arg1);
+    else
+      grunt.task.run('launch:release');
   });
 
   grunt.registerTask('server', function(arg1) {
@@ -446,9 +443,9 @@ module.exports = function(grunt) {
   });
 
   grunt.registerTask('docs', function() {
-      grunt.task.run('ngdocs');
-      grunt.task.run('connect:docs');
-      grunt.task.run('watch:docs');
+    grunt.task.run('ngdocs');
+    grunt.task.run('connect:docs');
+    grunt.task.run('watch:docs');
   });
 
   grunt.registerTask('launch', function(build, arg1) {
@@ -463,8 +460,8 @@ module.exports = function(grunt) {
   });
 
   grunt.registerTask('debug', function () {
-      grunt.log.writeln("Launching Karma");
-      grunt.task.run('test');
+    grunt.log.writeln("Launching Karma");
+    grunt.task.run('test');
   });
 
   grunt.registerTask('e2e',function(arg1) {