DM-11376: set backgroundable defaults to false. Enable backgrounding for catalog and suit searches.

Author: loitly

README.md

@@ -47,7 +47,7 @@ There are several branches the this repository.  Here are the ones that you shou
  -  [Java 1.8] http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
     This is the version we are using to compile and run Firefly.  
 
- -  [Gradle 2.3+] (https://gradle.org/downloads)
+ -  [Gradle 3.x] (https://gradle.org/downloads)
     Gradle is an open source build automation system.
 
 

src/firefly/js/api/ApiHighlevelBuild.js

@@ -100,7 +100,7 @@ function doShowTable(llApi, targetDiv, request, options={}) {
         request = oldApi(llApi, params, options);
     }
 
-    options = Object.assign({tbl_group: divToGrp(targetDiv), backgroundable:false}, options);
+    options = Object.assign({tbl_group: divToGrp(targetDiv)}, options);
     const contProps = {tbl_group: options.tbl_group};
 
     Object.keys(options).forEach( (k) => {

src/firefly/js/tables/TableUtil.js

@@ -19,11 +19,13 @@ import {doUpload} from '../ui/FileUpload.jsx';
 import {dispatchAddSaga} from '../core/MasterSaga.js';
 import {getWsConnId} from '../core/messaging/WebSocketClient.js';
 
+export const TableTagMeta = 'META_INFO.TableTag'; // a tag describing the content of this table.  ie. 'catalog', 'imagemeta'
 export const COL_TYPE = new Enum(['ALL', 'NUMBER', 'TEXT']);
 export const MAX_ROW = Math.pow(2,31) - 1;
 /* TABLE_REQUEST should match QueryUtil on the server-side */
 
-const LSSTQueryPID = 'LSSTCataLogSearch';
+
+
 
 
 /**
@@ -154,7 +156,7 @@ export function makeLsstCatalogRequest(title, project, database, catalog, params
     title = title || catalog;
     options.use = options.use || 'lsst_catalog_overlay';
     const tbl_id = options.tbl_id || uniqueTblId();
-    const id = get(params, 'SearchMethod')==='Table'?'LSSTMultiObjectSearch':LSSTQueryPID;
+    const id = get(params, 'SearchMethod')==='Table'?'LSSTMultiObjectSearch':'LSSTCataLogSearch';
     const UserTargetWorldPt = params.UserTargetWorldPt || params.position;  // may need to convert to worldpt.
     const table_name = catalog;
     const meta_table = catalog;

src/firefly/js/tables/TablesCntlr.js

@@ -316,7 +316,7 @@ function tableSearch(action) {
         if (!action.err) {
             dispatch(action);
             var {request={}, options={}} = action.payload;
-            const {tbl_ui_id, backgroundable = true} = options;
+            const {tbl_ui_id, backgroundable = false} = options;
             const {tbl_id} = request;
             const title = get(request, 'META_INFO.title');
             request.pageSize = options.pageSize = options.pageSize || request.pageSize || 100;

src/firefly/js/tables/ui/TablePanel.jsx

@@ -33,6 +33,19 @@ const TT_EXPAND = 'Expand this panel to take up a larger area';
 export class TablePanel extends PureComponent {
     constructor(props) {
         super(props);
+        this.componentWillReceiveProps(props);
+
+        this.toggleFilter = this.toggleFilter.bind(this);
+        this.toggleTextView = this.toggleTextView.bind(this);
+        this.clearFilter = this.clearFilter.bind(this);
+        this.saveTable = this.saveTable.bind(this);
+        this.toggleOptions = this.toggleOptions.bind(this);
+        this.expandTable = this.expandTable.bind(this);
+        this.onOptionUpdate = this.onOptionUpdate.bind(this);
+        this.onOptionReset = this.onOptionReset.bind(this);
+    }
+
+    componentWillReceiveProps(props) {
         var {tbl_id, tbl_ui_id, tableModel, showUnits, showFilters, pageSize} = props;
 
         if (!tbl_id && tableModel) {
@@ -45,15 +58,6 @@ export class TablePanel extends PureComponent {
         this.tableConnector = TableConnector.newInstance(tbl_id, tbl_ui_id, tableModel, showUnits, showFilters, pageSize);
         const uiState = TblUtil.getTableUiById(tbl_ui_id);
         this.state = Object.assign({}, this.props, uiState);
-
-        this.toggleFilter = this.toggleFilter.bind(this);
-        this.toggleTextView = this.toggleTextView.bind(this);
-        this.clearFilter = this.clearFilter.bind(this);
-        this.saveTable = this.saveTable.bind(this);
-        this.toggleOptions = this.toggleOptions.bind(this);
-        this.expandTable = this.expandTable.bind(this);
-        this.onOptionUpdate = this.onOptionUpdate.bind(this);
-        this.onOptionReset = this.onOptionReset.bind(this);
     }
 
     componentDidMount() {

src/firefly/js/visualize/ui/CatalogSelectViewPanel.jsx

@@ -5,10 +5,10 @@
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import {FormPanel} from '../../ui/FormPanel.jsx';
-import { get, merge, isEmpty, isFunction} from 'lodash';
+import { get, merge, isEmpty, isFunction, set} from 'lodash';
 import {updateMerge} from '../../util/WebUtil.js';
 import {ListBoxInputField} from '../../ui/ListBoxInputField.jsx';
-import {doFetchTable, makeTblRequest, makeIrsaCatalogRequest, makeVOCatalogRequest} from '../../tables/TableUtil.js';
+import {doFetchTable, makeTblRequest, makeIrsaCatalogRequest, makeVOCatalogRequest, TableTagMeta} from '../../tables/TableUtil.js';
 import {CatalogTableListField} from './CatalogTableListField.jsx';
 import {CatalogConstraintsPanel} from './CatalogConstraintsPanel.jsx';
 import {FieldGroup} from '../../ui/FieldGroup.jsx';
@@ -209,8 +209,8 @@ function doCatalog(request) {
         tReq.selcols = colsSearched;
     }
     //console.log('final request: ' + JSON.stringify(tReq));
-
-    dispatchTableSearch(tReq);
+    set(tReq, TableTagMeta, 'catalog');
+    dispatchTableSearch(tReq, {backgroundable:true});
 }
 
 //TODO parse whatever format and return SQL standard

src/firefly/js/visualize/ui/LSSTCatalogSelectViewPanel.jsx

@@ -21,7 +21,7 @@ import {dispatchHideDropDown} from '../../core/LayoutCntlr.js';
 import {getAppOptions} from '../../core/AppDataCntlr.js';
 import {ServerParams} from '../../data/ServerParams.js';
 import {dispatchTableSearch} from '../../tables/TablesCntlr.js';
-import {makeTblRequest, makeLsstCatalogRequest} from '../../tables/TableUtil.js';
+import {makeTblRequest, makeLsstCatalogRequest, TableTagMeta} from '../../tables/TableUtil.js';
 import {CatalogConstraintsPanel, getTblId} from './CatalogConstraintsPanel.jsx';
 import {validateSql, validateConstraints} from './CatalogSelectViewPanel.jsx';
 import {LSSTImageSpatialType} from './LSSTImageSpatialType.jsx';
@@ -426,7 +426,8 @@ function doImage(request, imgPart) {
 
                 );
             };
-    dispatchTableSearch(tReq, {leftButtons: [downloadButton]});
+    set(tReq, TableTagMeta, 'lsst-imagemeta');
+    dispatchTableSearch(tReq, {leftButtons: [downloadButton], backgroundable:true});
 }
 
 /**
@@ -494,7 +495,8 @@ function doCatalog(request, spatPart) {
 
     tReq = addConstraintToQuery(tReq);
 
-    dispatchTableSearch(tReq);
+    set(tReq, TableTagMeta, 'lsst-catalog');
+    dispatchTableSearch(tReq, {backgroundable:true});
 }
 
 /**