Merge PR Caltech-IPAC#1697 from FIREFLY_1651-refactor

Firefly-1651: Refactor tapObsCore to dataServiceOptions and related code

Author: robyww

src/firefly/html/firefly-dev.html

@@ -57,7 +57,7 @@
                 image : {
                     defaultColorTable : 5
                 },
-                tapObsCore: {
+                dataServiceOptions: {
                     productTitleTemplate: '${obs_collection}-${instrument_name}: ${obs_id}',
                     enableObsCoreDownload: true,
                     filterDefinitions: [

src/firefly/js/Firefly.js

@@ -21,7 +21,7 @@ import {initApi} from './api/ApiBuild.js';
 import {dispatchUpdateLayoutInfo} from './core/LayoutCntlr.js';
 import {FireflyRoot} from './ui/FireflyRoot.jsx';
 import {SIAv2SearchPanel} from './ui/tap/SIASearchRootPanel';
-import {getSIAv2Services} from './ui/tap/SiaUtil';
+import {getSIAv2ServicesByName} from './ui/tap/SiaUtil';
 import {TapSearchPanel} from './ui/tap/TapSearchRootPanel';
 import {mergeServices} from './ui/tap/TapUtil';
 import {dispatchChangeReadoutPrefs} from './visualize/MouseReadoutCntlr.js';
@@ -41,7 +41,7 @@ import {showLostConnection} from './ui/LostConnection.jsx';
 import {recordHistory} from './core/History.js';
 import {setDefaultImageColorTable} from './visualize/WebPlotRequest.js';
 import {initWorkerContext} from './threadWorker/WorkerAccess.js';
-import {getTAPServices} from './ui/tap/TapKnownServices.js';
+import {getTAPServicesByName} from './ui/tap/TapKnownServices.js';
 import {loadAllJobs} from './core/background/BackgroundUtil.js';
 import {
     makeDefImageSearchActions, makeDefTableSearchActions, makeDefTapSearchActions, makeExternalSearchActions
@@ -196,7 +196,7 @@ const defFireflyOptions = {
         defaultColorTable: 1,
         canCreateExtractionTable: false,
     },
-    tapObsCore: {
+    dataServiceOptions: {
         enableObsCoreDownload: true,
         // debug: true,
     },
@@ -218,12 +218,12 @@ const defFireflyOptions = {
         ...makeDefImageSearchActions(),
     ],
     tap : {
-        services: getTAPServices( ['IRSA', 'NED', 'NASA Exoplanet Archive', 'KOA', 'HEASARC', 'MAST Images',
-                                   'CADC', 'VizieR (CDS)', 'Simbad (CDS)', 'Gaia', 'GAVO', 'HSA', 'NOIR Lab'] ),
+        services: getTAPServicesByName( ['IRSA', 'NED', 'ExoplanetArchive', 'KOA', 'HEASARC', 'MASTImages',
+                                   'CADC', 'VizieR', 'Simbad', 'Gaia', 'GAVO', 'HSA', 'NOIRLab'] ),
         defaultMaxrec: 50000
     },
     SIAv2 : {
-        services: getSIAv2Services( ['IRSA', 'CADC', ]),
+        services: getSIAv2ServicesByName( ['IRSA', 'CADC', ]),
         defaultMaxrec: 50000
     },
 };

src/firefly/js/data/MetaConst.js

@@ -200,7 +200,7 @@ export const MetaConst = {
     /**
      * any ID can be added to a table search to identify the source for the purpose of getting source specific obscore preferences
      */
-    OBSCORE_SOURCE_ID: 'OBSCORE_SOURCE_ID',
+    DATA_SERVICE_ID: 'DATA_SERVICE_ID',
 
     /**
      * If we are doing cutout, this is the default type, either: ROW_POSITION or SEARCH_POSITION

src/firefly/js/metaConvert/vo/DataLinkProcessor.js

@@ -1,4 +1,4 @@
-import {getPreferCutout} from '../../ui/tap/ObsCoreOptions';
+import {getPreferCutout} from '../../ui/tap/Cutout';
 import { getSearchTarget, makeWorldPtUsingCenterColumns } from '../../voAnalyzer/TableAnalysis.js';
 import {
     getDataLinkData, isDownloadType, isGzipType, isSimpleImageType, isTarType, isVoTable

src/firefly/js/metaConvert/vo/DataLinkStandAloneConverter.js

@@ -1,4 +1,4 @@
-import {getPreferCutout} from '../../ui/tap/ObsCoreOptions';
+import {getPreferCutout} from '../../ui/tap/Cutout';
 import {getDataLinkData} from '../../voAnalyzer/VoDataLinkServDef.js';
 import {DEFAULT_DATA_PRODUCTS_COMPONENT_KEY} from '../DataProductsCntlr';
 import {createDataLinkSingleRowItem} from './DataLinkProcessor.js';

src/firefly/js/metaConvert/vo/DatalinkProducts.js

@@ -1,5 +1,5 @@
 import {getCellValue} from '../../tables/TableUtil.js';
-import {getPreferCutout} from '../../ui/tap/ObsCoreOptions';
+import {getPreferCutout} from '../../ui/tap/Cutout';
 import {getSizeAsString} from '../../util/WebUtil';
 import {getDataLinkData} from '../../voAnalyzer/VoDataLinkServDef.js';
 import {Band} from '../../visualize/Band.js';

src/firefly/js/metaConvert/vo/ObsCoreConverter.js

@@ -1,6 +1,7 @@
 import {isEmpty, isUndefined} from 'lodash';
 import {getAppOptions} from '../../core/AppDataCntlr.js';
 import {getCellValue, getColumns, hasRowAccess} from '../../tables/TableUtil.js';
+import {getDataServiceOption} from '../../ui/tap/DataServicesOptions';
 import {
     getObsCoreAccessURL, getObsCoreProdTypeCol, getObsReleaseDate, getObsTitle, getProdTypeGuess, getSearchTarget,
     isFormatDataLink,
@@ -243,7 +244,7 @@ export function getObsCoreRowMetaInfo(table,row) {
 
 function createObsCoreTitle(table,row) {
  // 1. try a template
-    const template= getAppOptions().tapObsCore?.productTitleTemplate;
+    const template= getDataServiceOption('productTitleTemplate');
     if (template?.trim()==='') return ''; // setting template to empty string disables all title guessing
     if (!template) {
         const templateColNames= template && getColNameFromTemplate(template);

src/firefly/js/metaConvert/vo/ServDescProducts.js

@@ -3,7 +3,7 @@ import {getComponentState} from '../../core/ComponentCntlr.js';
 import {getCellValue} from '../../tables/TableUtil.js';
 import {makeCircleString} from '../../ui/dynamic/DynamicUISearchPanel';
 import {isSIAStandardID} from '../../ui/dynamic/ServiceDefTools';
-import {findCutoutTarget, getCutoutErrorStr, getCutoutSize, setCutoutSize, } from '../../ui/tap/ObsCoreOptions';
+import {findCutoutTarget, getCutoutErrorStr, getCutoutSize, setCutoutSize} from '../../ui/tap/Cutout';
 import {PlotAttribute} from '../../visualize/PlotAttribute';
 import {isObsCoreLike} from '../../voAnalyzer/TableAnalysis';
 import {CUTOUT_UCDs, DEC_UCDs, RA_UCDs} from '../../voAnalyzer/VoConst';

src/firefly/js/templates/common/ttFeatureWatchers.js

@@ -1,12 +1,14 @@
 import React from 'react';
 import {cloneDeep, once} from 'lodash';
-import {getAppOptions} from '../../core/AppDataCntlr.js';
 import {dispatchAddTableTypeWatcherDef} from '../../core/MasterSaga.js';
+import {MetaConst} from '../../data/MetaConst';
 import {dispatchTableUiUpdate, TABLE_LOADED} from '../../tables/TablesCntlr.js';
 import {getActiveTableId, getMetaEntry, getTableUiByTblId, getTblById} from '../../tables/TableUtil.js';
 import {DownloadButton, DownloadOptionPanel} from '../../ui/DownloadDialog.jsx';
-import {getTapObsCoreOptions, getTapObsCoreOptionsGuess} from '../../ui/tap/ObsCoreOptions';
-import {hasObsCoreLikeDataProducts, isObsCoreLikeWithProducts} from '../../voAnalyzer/TableAnalysis.js';
+import {
+    getDataServiceOption, getDataServiceOptionByTable, getDataServiceOptions, getDataServiceOptionsFallback,
+} from '../../ui/tap/DataServicesOptions';
+import {hasObsCoreLikeDataProducts} from '../../voAnalyzer/TableAnalysis.js';
 import {getCatalogWatcherDef} from '../../visualize/saga/CatalogWatcher.js';
 import {getUrlLinkWatcherDef} from '../../visualize/saga/UrlLinkWatcher.js';
 import {getActiveRowToImageDef } from '../../visualize/saga/ActiveRowToImageWatcher.js';
@@ -57,11 +59,11 @@ function setupObsCorePackaging(tbl_id) {
 
     const {request}=table;
     let enabled;
-    if (request.QUERY && request.serviceUrl && getMetaEntry(table,'serviceLabel')) { // if known TAP service request
-        enabled= getTapObsCoreOptions(getMetaEntry(table,'serviceLabel'))?.enableObsCoreDownload;
+    if (request.QUERY && request.serviceUrl) { // if known TAP service request
+        enabled= getDataServiceOptionByTable('enableObsCoreDownload',table);
     }
     else {
-        enabled= getAppOptions()?.tapObsCore?.enableObsCoreDownload;
+        enabled= getDataServiceOption('enableObsCoreDownload');
     }
     if (!enabled) return;
 
@@ -72,8 +74,10 @@ function setupObsCorePackaging(tbl_id) {
 
 function updateSearchRequest( tbl_id='', dlParams='', sRequest=null) {
     const hostname= new URL(sRequest.source ? sRequest.source : sRequest.serviceUrl)?.hostname;
-    const template= getTapObsCoreOptionsGuess(hostname)?.productTitleTemplate;
-    const useSourceUrlFileName= getTapObsCoreOptionsGuess(hostname)?.packagerUsesSourceUrlFileName;
+    const serviceId= getMetaEntry(tbl_id,MetaConst.DATA_SERVICE_ID);
+    const ops= getDataServiceOptionsFallback(serviceId, hostname) ?? {};
+    const template= ops.productTitleTemplate;
+    const useSourceUrlFileName= ops.packagerUsesSourceUrlFileName;
     const templateColNames= template && getColNameFromTemplate(template);
     const searchRequest = cloneDeep( sRequest);
     searchRequest.template = template;

src/firefly/js/ui/CutoutSizeDialog.jsx

@@ -17,7 +17,7 @@ import {RadioGroupInputField} from './RadioGroupInputField';
 import {
     getCutoutSize, getCutoutTargetType, ROW_POSITION, SEARCH_POSITION, setAllCutoutParams, setPreferCutout,
     USER_ENTERED_POSITION
-} from './tap/ObsCoreOptions';
+} from './tap/Cutout';
 import {intValidator} from '../util/Validate';
 import CompleteButton from './CompleteButton.jsx';
 import DialogRootContainer from './DialogRootContainer.jsx';