Firefly-1469: Update DCE to support rubin needs

 - support sia wavelength
 - support sia obscore options using ObsCore panel
 - support dataServiceId
 - clean up
 - improve UI layout
 - refactor some of DynComponents
 - included ServiceDescriptorPanel in the improvements
 - includes response to feedback

Author: robyww

src/firefly/js/metaConvert/AnalysisUtils.js

@@ -14,7 +14,6 @@ import {
 } from './DataProductsType.js';
 import {createGridImagesActivate} from './ImageDataProductsUtil.js';
 import {doUploadAndAnalysis} from './UploadAndAnalysis.js';
-import {getObsCoreDataProduct} from './vo/ObsCoreConverter';
 
 const LOADING_MSG= 'Loading...';
 

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

@@ -1,7 +1,7 @@
 import {isEmpty, isNumber} from 'lodash';
 import {getComponentState} from '../../core/ComponentCntlr.js';
 import {getCellValue} from '../../tables/TableUtil.js';
-import {makeCircleString} from '../../ui/dynamic/DynamicUISearchPanel';
+import {CONTEXT_PARAMS_STR, makeCircleString} from '../../ui/dynamic/DynamicUISearchPanel';
 import {isSIAStandardID} from '../../ui/dynamic/ServiceDefTools';
 import {findCutoutTarget, getCutoutErrorStr, getCutoutSize, setCutoutSize} from '../../ui/tap/Cutout';
 import {PlotAttribute} from '../../visualize/PlotAttribute';
@@ -255,22 +255,24 @@ export function createServDescMenuRet({ descriptors, positionWP, table, row,
 }
 
 export function makeUrlFromParams(url, serDef, rowIdx, userInputParams = {}) {
-    const sendParams = {};
+    if (!url) return undefined;
+    const sendParams = new URLSearchParams();
     serDef?.serDefParams  // if it is defaulted, then set it
         ?.filter(({value}) => isDefined(value))
-        .forEach(({name, value}) => sendParams[name] = value);
+        .forEach(({name, value}) => sendParams.set(name, value));
     serDef?.serDefParams // if it is referenced, then set it
         ?.filter(({ref}) => ref)
-        .forEach((p) => sendParams[p.name] = getCellValue(serDef.sdSourceTable, rowIdx, p.colName));
-    userInputParams && Object.entries(userInputParams).forEach(([k, v]) => v && (sendParams[k] = v));
-    const newUrl = new URL(url);
-    if (!newUrl) return undefined;
-    Object.entries(sendParams).forEach(([k, v]) => newUrl.searchParams.append(k, v));
-    logServiceDescriptor(newUrl, sendParams, newUrl.toString());
-    return newUrl.toString();
+        .forEach((p) => sendParams.set(p.name, getCellValue(serDef.sdSourceTable, rowIdx, p.colName)));
+    Object.entries(userInputParams)
+        .forEach(([k, v]) => v && k!==CONTEXT_PARAMS_STR && sendParams.set(k,v));
+
+    const additionalParams= new URLSearchParams(userInputParams?.[CONTEXT_PARAMS_STR]);
+    const params= new URLSearchParams([...sendParams, ...additionalParams]);
+    const newUrl= params.size ? url+'?'+params.toString() : url;
+    logServiceDescriptor(newUrl, params, newUrl);
+    return newUrl;
 }
-function logServiceDescriptor(baseUrl, sendParams, newUrl) {
-     //console.log(`service descriptor base URL: ${baseUrl}`);
-     //Object.entries(sendParams).forEach(([k,v]) => console.log(`param: ${k}, value: ${v}`));
-     //console.log(`service descriptor new URL: ${newUrl}`);
+function logServiceDescriptor(baseUrl, params, newUrl) {
+     // console.log(`service descriptor base URL: ${baseUrl}`);
+     // console.log(`service descriptor new URL: ${newUrl}`);
 }

src/firefly/js/ui/TargetFeedback.jsx

@@ -34,16 +34,27 @@ function formatExample(row, fieldKey, setFld) {
 }
 
 
+function stripQuotes(s) {
+    if (s.startsWith(`'`) && s.endsWith(`'`)) return s.substring(1, s.length-1);
+    if (s.startsWith('"') && s.endsWith('"')) return s.substring(1, s.length-1);
+    return s;
+}
+
+
 const ConfigExamples = ({targetPanelExampleRow1, targetPanelExampleRow2, fieldKey}) => {
     const {setFld}= useContext(FieldGroupCtx);
     const tpR1= !targetPanelExampleRow1 || isArray(targetPanelExampleRow1) ? targetPanelExampleRow1 : [targetPanelExampleRow1];
     const tpR2= !targetPanelExampleRow2 || isArray(targetPanelExampleRow2) ? targetPanelExampleRow2 : [targetPanelExampleRow2];
     const row1Op= tpR1 ?? getAppOptions()?.targetPanelExampleRow1 ?? defExampleEntries.row1;
     const row2Op= tpR2 ?? getAppOptions()?.targetPanelExampleRow2 ?? defExampleEntries.row2;
+
+    const r1= row1Op.map( (s) => stripQuotes(s));
+    const r2= row2Op.map( (s) => stripQuotes(s));
+
     return (
         <Stack {...{lineHeight : '1.2em', fontSize:'smaller', direction:'column', spacing:1/2, alignItems:'center'}}>
-            {formatExample(row1Op, fieldKey, setFld)}
-            {formatExample(row2Op, fieldKey, setFld)}
+            {formatExample(r1, fieldKey, setFld)}
+            {formatExample(r2, fieldKey, setFld)}
         </Stack>
         );
 };

src/firefly/js/ui/dynamic/DLGenAnalyzeSearch.js

@@ -3,15 +3,13 @@ import {MetaConst} from '../../data/MetaConst.js';
 import {dispatchTableSearch} from '../../tables/TablesCntlr.js';
 import {getMetaEntry} from '../../tables/TableUtil.js';
 import {Logger} from '../../util/Logger.js';
-import {getDataLinkData} from '../../voAnalyzer/VoDataLinkServDef.js';
 import {CONE_CHOICE_KEY, POLY_CHOICE_KEY} from '../../visualize/ui/CommonUIKeys.js';
+import {getDataLinkData} from '../../voAnalyzer/VoDataLinkServDef.js';
 import {CIRCLE, POINT, POLYGON} from './DynamicDef.js';
 import {
     convertCircleToPointArea, convertPointAreaToCircle, isCircleSearch, isPointAreaSearch, isPolySearch
 } from './DynamicUISearchPanel.jsx';
-import {findFieldDefType, makeFieldDefs, makeServiceDescriptorSearchRequest} from './ServiceDefTools.js';
-
-
+import {findFieldDefType, makeServiceDescriptorSearchRequest, sdToFieldDefAry} from './ServiceDefTools.js';
 
 
 /**
@@ -44,8 +42,8 @@ export function analyzeQueries(tbl_id) {
 }
 
 
-export function makeAllSearchRequest(request, primeSd, concurrentSDAry, primaryFdAry, extraPrimaryMeta) {
-    const primeRequest= makeServiceDescriptorSearchRequest(request,primeSd,extraPrimaryMeta);
+export function makeAllSearchRequest(request, siaConstraints, primeSd, concurrentSDAry, primaryFdAry, extraPrimaryMeta) {
+    const primeRequest= makeServiceDescriptorSearchRequest(request,siaConstraints, primeSd,extraPrimaryMeta);
     const concurrentRequestAry= concurrentSDAry
         .map( (sd) => {
             const newR= convertRequestToSecondary(request, primaryFdAry?.[0], sd.serviceDef, primeSd.standardID);
@@ -59,14 +57,14 @@ export function makeAllSearchRequest(request, primeSd, concurrentSDAry, primaryF
 /**
  * Do all the searches defined
  * @param request
+ * @param siaConstraints
  * @param {QueryAnalysis} qAna
  * @param primaryFdAry
  * @param idx
  * @param {object} extraMeta            // additional table meta to include with the TableSearch
  * @param {String} selectedConcurrent - space separated name of searches to execute
- * @param docRows   URLs to documentation
  */
-export function handleSearch(request, qAna, primaryFdAry, idx, extraMeta={}, selectedConcurrent) {
+export function handleSearch(request, siaConstraints, qAna, primaryFdAry, idx, extraMeta={}, selectedConcurrent) {
     const primeSd= qAna.primarySearchDef[idx].serviceDef;
     const {coverage,bandDesc}= qAna.primarySearchDef[idx];
     const {cisxUI}= qAna.primarySearchDef[0].serviceDef;
@@ -81,7 +79,7 @@ export function handleSearch(request, qAna, primaryFdAry, idx, extraMeta={}, sel
     extraMeta= {coverage,bandDesc, ...extraMeta};
     if (preferredHips) extraMeta[MetaConst.COVERAGE_HIPS]=preferredHips;
 
-    const tableRequestAry= makeAllSearchRequest(request, primeSd,concurrentSDAry, primaryFdAry, extraMeta);
+    const tableRequestAry= makeAllSearchRequest(request, siaConstraints, primeSd,concurrentSDAry, primaryFdAry, extraMeta);
 
     tableRequestAry.forEach( (dataTableReq) => {
         Logger('DLGeneratedDropDown').debug(dataTableReq);
@@ -92,7 +90,7 @@ export function handleSearch(request, qAna, primaryFdAry, idx, extraMeta={}, sel
 }
 
 function convertRequestToSecondary(request, primaryFdAry, secondServDef, primStandardID) {
-    const sFdAry= makeFieldDefs(secondServDef.serDefParams);
+    const sFdAry= sdToFieldDefAry({serviceDef:secondServDef});
     if (isCircleSearch(primaryFdAry) || isPointAreaSearch(sFdAry)) {
         return convertCircleToPointArea(request, primaryFdAry, sFdAry, primStandardID, secondServDef.standardID);
     }
@@ -103,7 +101,7 @@ function convertRequestToSecondary(request, primaryFdAry, secondServDef, primSta
 }
 
 function getServiceDefSpacialSupports(serviceDef) {
-    const fdAry= makeFieldDefs(serviceDef.serDefParams);
+    const fdAry= sdToFieldDefAry({serviceDef});
     const retAry=[];
     if (isCircleSearch(fdAry)) retAry.push(CIRCLE);
     if (isPointAreaSearch(fdAry)) retAry.push(POINT);
@@ -116,7 +114,7 @@ export function hasSpatialTypes(serviceDef) {
 }
 
 export function isSpatialTypeSupported(serviceDef, spacialType) {
-    const fdAry= makeFieldDefs(serviceDef.serDefParams);
+    const fdAry= sdToFieldDefAry({serviceDef});
     if (spacialType===CONE_CHOICE_KEY) {
         return isCircleSearch(fdAry) || isPointAreaSearch(fdAry) || Boolean(findFieldDefType(fdAry,POINT));
     }
@@ -135,6 +133,28 @@ export function isSpatialTypeSupported(serviceDef, spacialType) {
  */
 
 
+/**
+ * @param {QueryAnalysis|ServiceDescriptorDef} qAnaOrSd - accept a QueryAnalysis or a ServiceDescriptorDef
+ * @return {CISXui|Array} ui parameters or an empty array
+ */
+export function getCisxUI(qAnaOrSd) {
+    if (!qAnaOrSd) return [];
+    if (qAnaOrSd.primarySearchDef) { // is QueryAnalysis
+        return qAnaOrSd.primarySearchDef[0]?.serviceDef?.cisxUI ?? [];
+    } else if (qAnaOrSd.accessURL) { // is ServiceDescriptorDef
+        return qAnaOrSd.cisxUI ?? [];
+    }
+    return [];
+}
+
+export function getCisxUIValue(qAnaOrSd, name) {
+    return getCisxUI(qAnaOrSd).find((e) => e.name === name)?.value;
+}
+
+export function getCisxUIUCD(qAnaOrSd, name) {
+    return getCisxUI(qAnaOrSd).find((e) => e.name === name)?.UCD;
+}
+
 /**
  * @typedef {Object} SearchDefinition
  * This object is a combination of a row and its service descriptor if one exist
@@ -148,4 +168,4 @@ export function isSpatialTypeSupported(serviceDef, spacialType) {
  * @prop {String} semantic - from the semantic column
  * @prop {ServiceDescriptorDef} serviceDef - the service descriptor
  *
- */
+ */