DM-8385: PDAC v1 deployment

 - setup LSST/suit repo
 - added lsst logo onto the banner
 - make sure build scripts are fully functional
 - minor code refactoring

Author: loitly

buildScript/webpack.config.js

@@ -1,7 +1,6 @@
 /* eslint-env node */
 
 import webpack from 'webpack';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
 import ExtractTextPlugin from 'extract-text-webpack-plugin';
 import path from 'path';
 import fs from 'fs';
@@ -33,7 +32,6 @@ export default function makeWebpackConfig(config) {
         env         : process.env.NODE_ENV || 'development',
         dist        : process.env.WP_BUILD_DIR || path.resolve(config.project, `build/${config.name}/gwt/${config.name}`),
         do_lint     : process.env.DO_LINT || process.env.DO_LINT_STRICT || false,
-        index_html  : 'index.html',
         html_dir    : 'html',
         use_loader  : true,
         filename    : '[name]-dev.js',
@@ -116,20 +114,6 @@ export default function makeWebpackConfig(config) {
         );
     }
 
-    // if index_html exists, insert script tag to load built javascript bundles(s).
-    if (fs.existsSync(path.resolve(config.dist, config.index_html))) {
-        plugins.push(
-            new HtmlWebpackPlugin({
-                template : path.resolve(config.src, config.html_dir, config.index_html),
-                hash     : false,
-                filename : config.index_html,
-                minify   : PROD,
-                inject   : 'body'
-            })
-        );
-    }
-
-
     /*------------------------ MODULE -----------------------------*/
     var loaders = [
                     {   test : /\.(js|jsx)$/,

package.json

@@ -52,7 +52,6 @@
     "style-loader": "^0.12.3",
     "url-loader": "^0.5.7",
     "file-loader": "^0.9.0",
-    "html-webpack-plugin": "^1.6.1",
     "extract-text-webpack-plugin": "^0.8.0",
     "eslint"            : "^3.4.0",
     "eslint-loader"     : "^1.5.0",

src/firefly/js/FFEntryPoint.js

@@ -3,34 +3,10 @@
  */
 
 
-import React from 'react';
-import ReactDOM from 'react-dom';
 import {get} from 'lodash';
 
-import {firefly} from './Firefly.js';
-import {FireflyViewer} from './templates/fireflyviewer/FireflyViewer.js';
-import {LcViewer} from './templates/lightcurve/LcViewer.jsx';
-import {initApi} from './api/ApiBuild.js';
+import {firefly, Templates} from './Firefly.js';
 import {HELP_LOAD} from './core/AppDataCntlr.js';
-import {dispatchAppOptions} from './core/AppDataCntlr.js';
-
-firefly.bootstrap();
-
-
-/**
- * A list of available templates
- * @enum {string}
- */
-const Templates = {
-    /**
-     * This templates has multiple views:  'images', 'tables', and 'xyPlots'.
-     * They can be combined with ' | ', i.e.  'images | tables'
-     */
-    FireflyViewer,
-    LightCurveViewer : LcViewer
-};
-
-
 
 
 /**
@@ -50,7 +26,11 @@ const Templates = {
 
 /**
  * This entry point allows dynamic application loading.  Use firefly.app to configure
- * what this application should do
+ * what this application should do.
+ * By default, firefly.js will startup in api mode.
+ * If you want it to startup as an application, you need to at least
+ * define a firefly.app under window.
+ *
  * @namespace firefly
  * @type {object}
  * @prop {Templates} template  the name of the template to use. defaults to 'FireflyViewer'
@@ -70,39 +50,25 @@ const Templates = {
  *      window.firefly = {app: {views: 'images | tables', menu}};
  *   </script>
  */
-const app = get(window, 'firefly.app');
-
-if (get(app, 'options')) {
-    const defOps = {
-        MenuItemKeys: {},
-        imageTabs: undefined,
-        irsaCatalogFilter: undefined,
-        catalogSpacialOp: undefined
-    };
-    dispatchAppOptions(Object.assign({},defOps, app.options));
-}
-
-if (get(app, 'template')) {
-    const defaults = {
-        div: 'app',
-        template: 'FireflyViewer',
-        menu: [ {label:'Data Sets: Catalogs & Images', action:'AnyDataSetSearch'},
-                {label:'Catalogs CLASSIC', action:'IrsaCatalogDropDown'},
-                {label:'Test Searches', action:'TestSearches'},
-                {label:'Images', action:'ImageSelectDropDownCmd'},
-                {label:'Charts', action:'ChartSelectDropDownCmd'},
-                {label:'Help', action:HELP_LOAD, type:'COMMAND'},
-                {label:'Example Js Dialog', action:'exampleDialog', type:'COMMAND'}
-        ]
-    };
-    const props = Object.assign(defaults, app);
-    const viewer = Templates[props.template];
+const defaults = {
+    div: 'app',
+    template: 'FireflyViewer',
+    menu: [ {label:'Data Sets: Catalogs & Images', action:'AnyDataSetSearch'},
+        {label:'Catalogs CLASSIC', action:'IrsaCatalogDropDown'},
+        {label:'Test Searches', action:'TestSearches'},
+        {label:'Images', action:'ImageSelectDropDownCmd'},
+        {label:'Charts', action:'ChartSelectDropDownCmd'},
+        {label:'Help', action:HELP_LOAD, type:'COMMAND'},
+        {label:'Example Js Dialog', action:'exampleDialog', type:'COMMAND'}
+    ]
+};
 
-    ReactDOM.render(React.createElement(viewer, props),
-        document.getElementById(props.div));
-}
-else {
-    initApi();
+const app = get(window, 'firefly.app', {});
+var viewer, props;
+if (app.template) {
+    props = Object.assign({}, defaults, app);
+    viewer = Templates[props.template];
 }
 
+firefly.bootstrap(app.options, viewer, props);
 

src/firefly/js/Firefly.js

@@ -4,9 +4,10 @@
 /*global __$version_tag*/
 
 
-import 'babel-polyfill';
+// import 'babel-polyfill';
 import 'isomorphic-fetch';
 import React from 'react';
+import ReactDOM from 'react-dom';
 import 'styles/global.css';
 
 import {APP_LOAD} from './core/AppDataCntlr.js';
@@ -15,6 +16,9 @@ import {ExtensionResult } from './gwtinterface/ExtensionResult.js';
 import {PlotCmdExtension } from './visualize/PlotCmdExtension.js';
 import {ReactJavaInterface } from './gwtinterface/ReactJavaInterface.jsx';
 import {showExampleDialog}  from './ui/ExampleDialog.jsx';
+import {FireflyViewer} from './templates/fireflyviewer/FireflyViewer.js';
+import {LcViewer} from './templates/lightcurve/LcViewer.jsx';
+import {initApi} from './api/ApiBuild.js';
 
 import {ServerRequest } from './data/ServerRequest.js';
 import PlotState from './visualize/PlotState.js';
@@ -24,9 +28,25 @@ import ExternalAccessUtils from './core/ExternalAccessUtils.js';
 import {reduxFlux} from './core/ReduxFlux.js';
 import {wsConnect} from './core/messaging/WebSocketClient.js';
 import {ActionEventHandler} from './core/messaging/MessageHandlers.js';
+import {dispatchAppOptions} from './core/AppDataCntlr.js';
 
 export const flux = reduxFlux;
 
+/**
+ * A list of available templates
+ * @enum {string}
+ */
+export const Templates = {
+    /**
+     * This templates has multiple views:  'images', 'tables', and 'xyPlots'.
+     * They can be combined with ' | ', i.e.  'images | tables'
+     */
+    FireflyViewer,
+    LightCurveViewer : LcViewer
+};
+
+
+
 /**
  * work around for transition from flummox to redux
  */
@@ -90,15 +110,9 @@ export function getVersion() {
 } 
 
 
-export var firefly = {
+export const firefly = {
 
-    bootstrap() {
-        return new Promise(function(resolve, reject) {
-            fireflyInit();
-            flux.process( {type : APP_LOAD} );
-            resolve();
-        });
-    },
+    bootstrap,
 
     process(rawAction, condition) {
         return flux.process(rawAction, condition);
@@ -111,4 +125,33 @@ export var firefly = {
 };
 
 
+/**
+ * boostrap Firefly api or application.
+ * @param options   global options used by both application and api
+ * @param viewer    render this viewer onto the document.  if viewer does not exists, it will init api instead.
+ * @param props     viewer's props used for rendering.
+ * @returns {Promise.<boolean>}
+ */
+function bootstrap(options, viewer, props) {
+
+    fireflyInit();
+    flux.process( {type : APP_LOAD} );
 
+    if (options) {
+        const defOps = {
+            MenuItemKeys: {},
+            imageTabs: undefined,
+            irsaCatalogFilter: undefined,
+            catalogSpacialOp: undefined
+        };
+        dispatchAppOptions(Object.assign({},defOps, options));
+    }
+    if (viewer) {
+        ReactDOM.render(React.createElement(viewer, props),
+            document.getElementById(props.div));
+    } else {
+        initApi();
+
+    }
+    return Promise.resolve(true);
+}

src/firefly/js/core/ReduxFlux.js

@@ -235,12 +235,7 @@ function bootstrap() {
         redux = createRedux();
         startCoreSagas();
     }
-    return new Promise(
-        function (resolve, reject) {
-            // there may be async logic here..
-            // if not, simply invoke resolve.
-            resolve('success');
-        });
+    return Promise.resolve('success');
 }
 
 /**

src/firefly/js/ui/Banner.css

@@ -9,8 +9,6 @@
 
 .banner__left {
     flex-grow: 0;
-    width: 75px;
-    height: 75px;
 }
 
 .banner__middle {