DM-8598: Dispatch TBL_RESULTS_ACTIVE when table is removed. Merge PR #261.

DM-8598: Dispatch TBL_RESULTS_ACTIVE when table is removed

Author: loitly

src/firefly/js/tables/TablesCntlr.js

@@ -2,7 +2,7 @@
  * License information at https://github.com/Caltech-IPAC/firefly/blob/master/License.txt
  */
 import {take} from 'redux-saga/effects';
-import {get, set, omitBy, pickBy, isNil, cloneDeep} from 'lodash';
+import {get, set, omitBy, pickBy, isNil, cloneDeep, findKey} from 'lodash';
 
 import {flux} from '../Firefly.js';
 import * as TblUtil from './TableUtil.js';
@@ -127,7 +127,8 @@ function actionCreators() {
         [TABLE_SORT]:       tableFetch,
         [TABLE_FILTER]:     tableFetch,
         [TABLE_FILTER_SELROW]:  tableFilterSelrow,
-        [TBL_RESULTS_ADDED]:    tblResultsAdded
+        [TBL_RESULTS_ADDED]:    tblResultsAdded,
+        [TABLE_REMOVE]:     tblRemove
     };
 }
 
@@ -346,6 +347,19 @@ function tblResultsAdded(action) {
     };
 }
 
+function tblRemove(action) {
+    return (dispatch) => {
+        dispatch(action);
+        const {tbl_id} = action.payload;
+        const results = get(flux.getState(), [TABLE_SPACE_PATH, 'results'], {});
+        Object.keys(results).forEach( (tbl_group) => {
+            if (get(results, [tbl_group, 'active']) === tbl_id) {
+                dispatchActiveTableChanged(findKey(results[tbl_group].tables), tbl_group);
+            }
+        });
+    };
+}
+
 function highlightRow(action) {
     return (dispatch) => {
         const {tbl_id, highlightedRow} = action.payload;

src/firefly/js/tables/reducer/TableResultsReducer.js

@@ -3,7 +3,7 @@
  */
 
 import {updateSet, updateDelete} from '../../util/WebUtil.js';
-import {set, get, has, findKey} from 'lodash';
+import {set, get, has} from 'lodash';
 
 import * as Cntlr from '../TablesCntlr.js';
 import * as TblUtil from '../TableUtil.js';
@@ -44,12 +44,6 @@ function removeTable(root, action) {
     Object.keys(root).forEach( (tbl_group) => {
         if (has(root, [tbl_group, 'tables', tbl_id])) {
             root = updateDelete(root, [tbl_group, 'tables'], tbl_id);
-
-            if (tbl_id === get(root, [tbl_group,'active'])) {
-                // active table have been remove. set it to the first available table
-                const newActiveId = findKey(root[tbl_group].tables);
-                root = updateSet(root, [tbl_group,'active'], newActiveId);
-            }
         }
     });
 

src/firefly/js/ui/panel/TabPanel.jsx

@@ -194,18 +194,18 @@ export class Tab extends Component {
         const textStyle = maxTitleWidth ? {float: 'left', width: maxTitleWidth-(removable?14:0)} : {};
 
         return (
-            <li className={tabClassName} onClick={() => !this.removed && onSelect(id,name)}>
+            <li className={tabClassName} onClick={() => onSelect(id,name)}>
                 <div>
                     <div style={textStyle} className='text-ellipsis' title={name}>
                          {name}
                     </div>
                     {removable &&
                             <div style={{right: -4, top: -2}} className='btn-close'
                                  title='Remove Tab'
-                                 onClick={() => {
+                                 onClick={(e) => {
                                  onTabRemove && onTabRemove(name);
-                                 this.removed = true;
-                                 }}/>
+                                 e.stopPropagation && e.stopPropagation();
+                            }}/>
                     }
                 </div>
             </li>);

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

@@ -60,13 +60,12 @@ export function* syncCharts() {
  */
 export function* syncChartViewer() {
     while (true) {
-        const action = yield take([ChartsCntlr.CHART_ADD, TablesCntlr.TBL_RESULTS_ACTIVE, TablesCntlr.TABLE_REMOVE]);
+        const action = yield take([ChartsCntlr.CHART_ADD, TablesCntlr.TBL_RESULTS_ACTIVE]);
         switch (action.type) {
             case ChartsCntlr.CHART_ADD:
-            case TablesCntlr.TABLE_REMOVE:
             case TablesCntlr.TBL_RESULTS_ACTIVE:
-                const {chartId} = action.payload;
-                updateDefaultViewer(chartId);
+                const {chartId, tbl_id} = action.payload;
+                updateDefaultViewer(chartId, tbl_id);
                 break;
         }
     }
@@ -100,8 +99,8 @@ export function* addDefaultScatter() {
 }
 
 
-function updateDefaultViewer(chartId) {
-    const tblId = TableUtil.getActiveTableId();
+function updateDefaultViewer(chartId, active_tbl_id) {
+    const tblId = active_tbl_id || TableUtil.getActiveTableId();
     const chartIds = [];
     chartIds.push(...ChartsCntlr.getChartIdsInGroup(tblId), ...ChartsCntlr.getChartIdsInGroup('default'));
     const currentIds = getViewerItemIds(getMultiViewRoot(),DEFAULT_PLOT2D_VIEWER_ID);