Move adding default chart to a separate saga to make sure it triggers layout update.

Author: tgoldina

src/firefly/js/templates/fireflyviewer/FireflyViewer.js

@@ -18,7 +18,7 @@ import {TriViewPanel} from './TriViewPanel.jsx';
 import {VisHeader} from '../../visualize/ui/VisHeader.jsx';
 import {getActionFromUrl} from '../../core/History.js';
 import {launchImageMetaDataSega} from '../../visualize/ui/TriViewImageSection.jsx';
-import {syncChartViewer} from '../../visualize/saga/ChartsSync.js';
+import {syncChartViewer, addDefaultScatter} from '../../visualize/saga/ChartsSync.js';
 import {dispatchAddSaga} from '../../core/MasterSaga.js';
 
 // import {deepDiff} from '../util/WebUtil.js';
@@ -45,6 +45,7 @@ export class FireflyViewer extends Component {
         this.state = this.getNextState();
         dispatchAddSaga(layoutManager,{views: props.views});
         dispatchAddSaga(syncChartViewer);
+        dispatchAddSaga(addDefaultScatter);
     }
 
     getNextState() {

src/firefly/js/templates/fireflyviewer/FireflyViewerManager.js

@@ -7,11 +7,10 @@ import {get, filter, omitBy, isNil, isEmpty} from 'lodash';
 
 import {LO_VIEW, LO_MODE, SHOW_DROPDOWN, SET_LAYOUT_MODE, getLayouInfo, dispatchUpdateLayoutInfo} from '../../core/LayoutCntlr.js';
 import {clone} from '../../util/WebUtil.js';
-import {findGroupByTblId, getTblIdsByGroup,getActiveTableId, getTableInGroup} from '../../tables/TableUtil.js';
+import {findGroupByTblId, getTblIdsByGroup,getActiveTableId} from '../../tables/TableUtil.js';
 import {TBL_RESULTS_ADDED, TABLE_LOADED, TABLE_REMOVE, TBL_RESULTS_ACTIVE} from '../../tables/TablesCntlr.js';
-import {CHART_ADD, CHART_REMOVE, getNumCharts, dispatchChartAdd} from '../../charts/ChartsCntlr.js';
-import {getDefaultXYPlotOptions, DT_XYCOLS} from '../../charts/dataTypes/XYColsCDT.js';
-import {SCATTER} from '../../charts/ChartUtil.js';
+import {CHART_ADD, CHART_REMOVE} from '../../charts/ChartsCntlr.js';
+
 import ImagePlotCntlr from '../../visualize/ImagePlotCntlr.js';
 import {isMetaDataTable, isCatalogTable} from '../../metaConvert/converterUtils.js';
 import {META_VIEWER_ID} from '../../visualize/ui/TriViewImageSection.jsx';
@@ -145,24 +144,6 @@ function handleNewTable(action, images, showImages, showTables, coverageLockedOn
 
     const {tbl_id} = action.payload;
 
-    // check if a default chart needs to be added
-    if (getNumCharts(tbl_id) === 0) {
-        // how do I know the default chart should be added?
-        // add a default chart if the group is main
-        if (getTableInGroup(tbl_id, 'main')) {
-            // default chart is xy plot of coordinate columns or first two numeric columns
-            const defaultOptions = getDefaultXYPlotOptions(tbl_id);
-            if (defaultOptions) {
-                dispatchChartAdd({
-                    chartId: 'xyplot-' + tbl_id,
-                    chartType: SCATTER,
-                    groupId: tbl_id,
-                    chartDataElements: [{tblId: tbl_id, type: DT_XYCOLS, options: defaultOptions}]
-                });
-            }
-        }
-    }
-
     // check for catalog or meta images
     if (!showTables) return [showImages, images, coverageLockedOn];        // ignores this if table is not visible
 

src/firefly/js/visualize/saga/ChartsSync.js

@@ -9,6 +9,9 @@ import * as TableStatsCntlr from '../../charts/TableStatsCntlr.js';
 import * as TableUtil from '../../tables/TableUtil.js';
 import * as ChartsCntlr from '../../charts/ChartsCntlr.js';
 
+import {getDefaultXYPlotOptions, DT_XYCOLS} from '../../charts/dataTypes/XYColsCDT.js';
+import {SCATTER} from '../../charts/ChartUtil.js';
+
 import {PLOT2D, DEFAULT_PLOT2D_VIEWER_ID, dispatchAddViewerItems, dispatchRemoveViewerItems, getViewerItemIds, getMultiViewRoot} from '../../visualize/MultiViewCntlr.js';
 
 /**
@@ -67,6 +70,33 @@ export function* syncChartViewer() {
     }
 }
 
+/**
+ * This saga adds a default chart
+ */
+export function* addDefaultScatter() {
+    while (true) {
+        const action = yield take([TablesCntlr.TABLE_LOADED]);
+        const {tbl_id} = action.payload;
+        // check if a default chart needs to be added
+        if (ChartsCntlr.getNumCharts(tbl_id) === 0) {
+            // how do I know the default chart should be added?
+            // add a default chart if the group is main
+            if (TableUtil.getTableInGroup(tbl_id, 'main')) {
+                // default chart is xy plot of coordinate columns or first two numeric columns
+                const defaultOptions = getDefaultXYPlotOptions(tbl_id);
+                if (defaultOptions) {
+                    ChartsCntlr.dispatchChartAdd({
+                        chartId: 'xyplot-' + tbl_id,
+                        chartType: SCATTER,
+                        groupId: tbl_id,
+                        chartDataElements: [{tblId: tbl_id, type: DT_XYCOLS, options: defaultOptions}]
+                    });
+                }
+            }
+        }
+    }
+}
+
 
 function updateDefaultViewer() {
     const tblId = TableUtil.getActiveTableId();