DM-6500: changes in response to reviews

loitly · loitly · commit f060aa6ded1e · 2016-06-14T16:54:55.000-07:00
set min-width
replaced with an IRSA's icon
fix xyplot and image overlay on table sort.
diff --git a/src/firefly/js/core/FireflyViewer.js b/src/firefly/js/core/FireflyViewer.js
@@ -81,15 +81,15 @@ export class FireflyViewer extends Component {
 
     render() {
         var {isReady, menu={}, appTitle, appIcon, altAppIcon, dropDown,
-                searchPanels, views, footer} = this.state;
+                searchPanels, views, footer, style} = this.state;
         const {visible, view} = dropDown || {};
         const searches = getDropDownNames();
 
         if (!isReady || !this.mounted) {
             return (<div style={{top: 0}} className='loading-mask'/>);
         } else {
             return (
-                <div id='App' className='rootStyle'>
+                <div id='App' className='rootStyle' style={style}>
                     <header>
                         <BannerSection {...{menu, appTitle, appIcon, altAppIcon}}/>
                         <DropDownContainer
@@ -121,7 +121,8 @@ FireflyViewer.propTypes = {
     altAppIcon: PropTypes.string,
     footer: PropTypes.element,
     searchPanels: PropTypes.arrayOf(PropTypes.element),
-    views: PropTypes.string     // combination of LO_VIEW separated by ' | '.  ie. 'images | tables'.
+    views: PropTypes.string,     // combination of LO_VIEW separated by ' | '.  ie. 'images | tables'.
+    style: PropTypes.object
 };
 
 FireflyViewer.defaultProps = {
diff --git a/src/firefly/js/core/LayoutCntlr.js b/src/firefly/js/core/LayoutCntlr.js
@@ -133,10 +133,10 @@ export function* layoutManager({title, views='tables | images | xyPlots'}) {
 
     while (true) {
         const action = yield take([
-                                ImagePlotCntlr.PLOT_IMAGE, ImagePlotCntlr.DELETE_PLOT_VIEW, REPLACE_IMAGES,
-                                TBL_RESULTS_ADDED, TABLE_REMOVE, TABLE_NEW,
-                                SHOW_DROPDOWN, SET_LAYOUT_MODE
-                            ]);
+                    REPLACE_IMAGES, ImagePlotCntlr.PLOT_IMAGE, ImagePlotCntlr.DELETE_PLOT_VIEW, ImagePlotCntlr.PLOT_IMAGE_FAIL,
+                    TBL_RESULTS_ADDED, TABLE_REMOVE, TABLE_NEW,
+                    SHOW_DROPDOWN, SET_LAYOUT_MODE
+                ]);
 
         var {hasImages, hasTables, hasXyPlots, mode, ...others} = getLayouInfo();
         // eslint-disable-next-line
diff --git a/src/firefly/js/tables/TablesCntlr.js b/src/firefly/js/tables/TablesCntlr.js
@@ -21,17 +21,16 @@ export const UI_PREFIX = 'tableUi';
 
 /*---------------------------- ACTIONS -----------------------------*/
 export const TABLE_SEARCH         = `${DATA_PREFIX}.search`;
-export const TABLE_FETCH          = `${DATA_PREFIX}.fetch`;
 export const TABLE_NEW            = `${DATA_PREFIX}.new`;
 export const TABLE_NEW_LOADED     = `${DATA_PREFIX}.newLoaded`;
-export const TABLE_UPDATE         = `${DATA_PREFIX}.update`;
-export const TABLE_REPLACE        = `${DATA_PREFIX}.replace`;
-
 export const TABLE_SORT           = `${DATA_PREFIX}.sort`;
-export const TABLE_FILTER         = `${DATA_PREFIX}.filter`;
 export const TABLE_REMOVE         = `${DATA_PREFIX}.remove`;
+
+export const TABLE_FETCH          = `${DATA_PREFIX}.fetch`;
 export const TABLE_SELECT         = `${DATA_PREFIX}.select`;
 export const TABLE_HIGHLIGHT      = `${DATA_PREFIX}.highlight`;
+export const TABLE_UPDATE         = `${DATA_PREFIX}.update`;
+export const TABLE_REPLACE        = `${DATA_PREFIX}.replace`;
 
 export const TBL_RESULTS_ADDED    = `${RESULTS_PREFIX}.added`;
 export const TBL_RESULTS_UPDATE   = `${RESULTS_PREFIX}.update`;
@@ -86,16 +85,13 @@ export function tableFetch(action) {
     return (dispatch) => {
         if (!action.err) {
             var {request, hlRowIdx} = action.payload;
-            var actionType, {tbl_id} = request;
-            switch (action.type) {
-                case (TABLE_SORT)  :
-                    actionType = TABLE_REPLACE;
-                    break;
-
-                case (TABLE_FETCH)  :
+            const {tbl_id} = request;
+            var actionType = action.type;
+            if (action.type === TABLE_FETCH) {
                     actionType = TABLE_NEW;
                     dispatchAddSaga(doOnTblLoaded, {tbl_id, callback:dispatchTableLoaded});
             }
+            
             request.startIdx = 0;
             dispatch({type: TABLE_REPLACE, payload: {tbl_id, isFetching: true}});
             TblUtil.doFetchTable(request, hlRowIdx).then ( (tableModel) => {
diff --git a/src/firefly/js/tables/reducer/TableDataReducer.js b/src/firefly/js/tables/reducer/TableDataReducer.js
@@ -30,7 +30,8 @@ export function dataReducer(state={data:{}}, action={}) {
         case (Cntlr.TABLE_UPDATE)  :
             return TblUtil.smartMerge(root, {[tbl_id] : action.payload});
 
-        case (Cntlr.TABLE_NEW)  :
+        case (Cntlr.TABLE_NEW)      :
+        case (Cntlr.TABLE_SORT)     :
         case (Cntlr.TABLE_REPLACE)  :
             const rowCount = action.payload.totalRows || get(action, 'payload.tableData.data.length', 0);
             const nTable = Object.assign({isFetching:false, selectInfo: SelectInfo.newInstance({rowCount}).data},action.payload);
diff --git a/src/firefly/js/tables/reducer/TableUiReducer.js b/src/firefly/js/tables/reducer/TableUiReducer.js
@@ -24,11 +24,12 @@ export function uiReducer(state={ui:{}}, action={}) {
             const {options} = action.payload || {}; 
             return Object.assign(root, {[tbl_ui_id]:{tbl_ui_id, tbl_id, ...options}});
 
-        case (Cntlr.TABLE_NEW)    :
-        case (Cntlr.TABLE_UPDATE) :
-        case (Cntlr.TABLE_REPLACE):
-        case (Cntlr.TABLE_SELECT)  :
-        case (Cntlr.TABLE_NEW_LOADED)  :
+        case (Cntlr.TABLE_NEW)      :
+        case (Cntlr.TABLE_SORT)     :
+        case (Cntlr.TABLE_UPDATE)   :
+        case (Cntlr.TABLE_REPLACE)  :
+        case (Cntlr.TABLE_SELECT)   :
+        case (Cntlr.TABLE_NEW_LOADED) :
         case (Cntlr.TABLE_HIGHLIGHT)  :
             // state is in-progress(fresh) data.. use it to reduce ui state.
             return uiStateReducer(root, get(state, ['data', tbl_id]));
diff --git a/src/firefly/js/visualize/saga/CatalogWatcher.js b/src/firefly/js/visualize/saga/CatalogWatcher.js
@@ -4,7 +4,7 @@
 
 import {take} from 'redux-saga/effects';
 import {isEmpty, get} from 'lodash';
-import {TABLE_NEW_LOADED,TABLE_SELECT,TABLE_HIGHLIGHT,TABLE_REMOVE,TABLE_UPDATE, TABLE_RESULTS_PATH} from '../../tables/TablesCntlr.js';
+import {TABLE_NEW_LOADED,TABLE_SORT, TABLE_SELECT,TABLE_HIGHLIGHT,TABLE_REMOVE,TABLE_UPDATE} from '../../tables/TablesCntlr.js';
 import {dispatchCreateDrawLayer,dispatchAttachLayerToPlot,dispatchDestroyDrawLayer, dispatchModifyCustomField} from '../DrawLayerCntlr.js';
 import ImagePlotCntlr, {visRoot} from '../ImagePlotCntlr.js';
 import {getTblById, doFetchTable, getTableGroup} from '../../tables/TableUtil.js';
@@ -42,10 +42,11 @@ export function* watchCatalogs() {
 
 
     while (true) {
-        const action= yield take([TABLE_NEW_LOADED,TABLE_SELECT,TABLE_HIGHLIGHT, TABLE_UPDATE,
+        const action= yield take([TABLE_NEW_LOADED, TABLE_SORT, TABLE_SELECT,TABLE_HIGHLIGHT, TABLE_UPDATE,
                                   TABLE_REMOVE, ImagePlotCntlr.PLOT_IMAGE]);
         const {tbl_id}= action.payload;
         switch (action.type) {
+            case TABLE_SORT:
             case TABLE_NEW_LOADED:
                 handleCatalogUpdate(tbl_id);
                 break;
diff --git a/src/firefly/js/visualize/saga/ChartsSync.js b/src/firefly/js/visualize/saga/ChartsSync.js
@@ -22,7 +22,7 @@ export function* syncCharts() {
     var tableStatsState, xyPlotState, histogramState;
 
     while (true) {
-        const action= yield take([TableStatsCntlr.SETUP_TBL_TRACKING, TablesCntlr.TABLE_NEW_LOADED]);
+        const action= yield take([TableStatsCntlr.SETUP_TBL_TRACKING, TablesCntlr.TABLE_NEW_LOADED, TablesCntlr.TABLE_SORT]);
         const request= action.payload.request;
         switch (action.type) {
             case TableStatsCntlr.SETUP_TBL_TRACKING:
@@ -31,6 +31,7 @@ export function* syncCharts() {
                     TableStatsCntlr.dispatchLoadTblStats(TableUtil.getTblById(tblId)['request']);
                 }
                 break;
+            case TablesCntlr.TABLE_SORT:
             case TablesCntlr.TABLE_NEW_LOADED:
                 const {tbl_id} = action.payload;
                 tableStatsState = flux.getState()[TableStatsCntlr.TBLSTATS_DATA_KEY];
