Firefly-1469: Update DCE to support rubin needs

- support sia wavelength
- support dataServiceId
- clean up

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/ui/dynamic/DLGenAnalyzeSearch.js

@@ -9,7 +9,7 @@ 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 +44,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 +59,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 +81,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 +92,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 +103,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 +116,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));
     }

src/firefly/js/ui/dynamic/DLGeneratedDropDown.js

@@ -32,10 +32,10 @@ import {analyzeQueries, handleSearch} from './DLGenAnalyzeSearch.js';
 import {SideBarAnimation, SideBarTable} from './DLuiDecoration.jsx';
 import {DLuiServDescPanel, DLuiTabView} from './DLuiServDescPanel.jsx';
 import {CIRCLE, POINT, POSITION, RANGE} from './DynamicDef.js';
-import {convertRequest, findTargetFromRequest} from './DynamicUISearchPanel.jsx';
+import {convertRequest, DEFER_TO_CONTEXT, findTargetFromRequest} from './DynamicUISearchPanel.jsx';
 import {getSpacialSearchType, hasValidSpacialSearch} from './DynComponents.jsx';
 import {confirmDLMenuItem} from './FetchDatalinkTable.js';
-import { getStandardIdType, ingestInitArgs, makeFieldDefsWithOptions, makeSearchAreaInfo } from './ServiceDefTools.js';
+import { getStandardIdType, ingestInitArgs, sdToFieldDefAry, makeSearchAreaInfo } from './ServiceDefTools.js';
 
 
 export const DL_UI_LIST= 'DL_UI_LIST';
@@ -280,7 +280,7 @@ const executeInitTargetOnce= makeSearchOnce(false);
 
 
 function DLGeneratedTableSearch({currentTblId, qAna, groupKey, initArgs, sideBar, regHasUrl, url,
-                                    sideBarShowing, slotProps, regLoaded, dataServiceId,
+                                    sideBarShowing, slotProps, regLoaded, dataServiceId:inDataServiceId,
                                     setSideBarShowing, defaultMaxMOCFetchDepth}) {
     const [,setCallId]= useState('none');
     const [{onClick},setClickFuncImpl]= useState({});
@@ -291,6 +291,7 @@ function DLGeneratedTableSearch({currentTblId, qAna, groupKey, initArgs, sideBar
         if (obj?.onClick && !onClick) setClickFuncImpl(obj);
     };
 
+    const dataServiceId= getCisxUIValue(qAna, 'data_service_id') ?? inDataServiceId;
 
     useEffect(() => {
         if (initArgs?.urlApi?.execute && onClick && matchUrl) {
@@ -328,7 +329,11 @@ function DLGeneratedTableSearch({currentTblId, qAna, groupKey, initArgs, sideBar
 
     const isAllSky= toBoolean(getCisxUI(qAna)?.find( (e) => e.name==='data_covers_allsky')?.value);
     const docRows= qAna?.urlRows.filter( ({semantic}) => semantic?.toLowerCase().endsWith('documentation'));
-    const submitSearch= (request) => doSubmitSearch(request,dataServiceId, docRows,qAna,fdAry,searchObjFds,tabsKey);
+
+    const submitSearch= (request,siaCtx) =>
+        doSubmitSearch(request,siaCtx,dataServiceId, docRows,qAna,fdAry,searchObjFds,tabsKey);
+
+
 
     return (
         <Sheet sx={{width:1,height:1}}>
@@ -338,10 +343,10 @@ function DLGeneratedTableSearch({currentTblId, qAna, groupKey, initArgs, sideBar
                     <FieldGroup groupKey={groupKey} keepState={true} style={{width:'100%'}}>
                         {(regLoaded && qAna) ? searchObjFds.length===1 ?
                                 <DLuiServDescPanel{...{initArgs, setSideBarShowing, sideBarShowing, fds:searchObjFds[0].fds,
-                                    setClickFunc, submitSearch, isAllSky, qAna, slotProps,
+                                    setClickFunc, submitSearch, isAllSky, qAna, slotProps,dataServiceId,
                                     sx:{width:1,height:1}, desc:searchObjFds[0].desc, docRows}} /> :
                                 <DLuiTabView{...{initArgs, tabsKey, setSideBarShowing, sideBarShowing, searchObjFds, qAna,
-                                    docRows, isAllSky, setClickFunc, submitSearch, slotProps}}/>
+                                    docRows, isAllSky, setClickFunc, submitSearch, slotProps, dataServiceId}}/>
                             :
                             <NotLoaded {...{regHasUrl,regLoaded,url}}/>
                         }
@@ -370,11 +375,11 @@ function alignHiPS(currentTblId, qAna, groupKey, fieldDefAry) {
     const tgt= findTargetFromRequest(request,fieldDefAry);
     if (tgt) return;
 
-    const cisxUI= getCisxUI(qAna);
-    const raStr= cisxUI.find( (e) => e.name==='hips_initial_ra')?.value;
-    const decStr= cisxUI.find( (e) => e.name==='hips_initial_dec')?.value;
-    const ucdStr= cisxUI.find( (e) => e.name==='hips_initial_ra')?.UCD;
-    const fovStr= cisxUI.find( (e) => e.name==='hips_initial_fov')?.value;
+    const raStr=  getCisxUIValue(qAna, 'hips_initial_ra');
+    const decStr= getCisxUIValue(qAna, 'hips_initial_dec');
+    const ucdStr= getCisxUIUCD('hips_initial_ra');
+    const fovStr=getCisxUIValue(qAna, 'hips_initial_fov');
+
     const coordSys= ucdStr==='pos.galactic.lon' ? CoordSys.GALACTIC : CoordSys.EQ_J2000;
     const centerProjPt= makeWorldPt(raStr, decStr, coordSys);
     if (!centerProjPt) return;
@@ -403,6 +408,17 @@ function getCisxUI(qAnaOrSd) {
     }
     return [];
 }
+
+function getCisxUIValue(qAnaOrSd, name) {
+    return getCisxUI(qAnaOrSd).find( (e) => e.name===name)?.value;
+}
+
+function getCisxUIUCD(qAnaOrSd, name) {
+    return getCisxUI(qAnaOrSd).find( (e) => e.name===name)?.UCD;
+}
+
+
+
 /**
  * map the primarySearchDef (a SearchDefinition) array in QueryAnalysis to an array of FieldDef arrays.
  * Usually there is only one primarySearchDef
@@ -416,21 +432,21 @@ function makePrimarySearchFieldDefAry(qAna, initArgs, defaultMaxMOCFetchDepth) {
     return qAna?.primarySearchDef.map( (fd) => {
         const {serviceDef}= fd; //todo handle case with only an access url
         if (!serviceDef) return;
-        const standId= getStandardId(serviceDef);
-        const utype= getUtype(serviceDef);
-        let fdEntryAry;
-        if (utype===cisxAdhocServiceUtype && standId.startsWith(standardIDs.tap) && serviceDef.cisxTokenSub) {
-            fdEntryAry= makeFieldDefsWithOptions({
-                serDefParams:serviceDef.cisxTokenSub,
-                searchAreaInfo:makeSearchAreaInfo(getCisxUI(serviceDef), defaultMaxMOCFetchDepth),
-                hidePredefinedStringFields:false});
-        }
-        else {
-            fdEntryAry= makeFieldDefsWithOptions({
-                serDefParams:serviceDef.serDefParams,
-                searchAreaInfo:makeSearchAreaInfo(getCisxUI(serviceDef), defaultMaxMOCFetchDepth)
+        // const standId= getStandardId(serviceDef);
+        // const utype= getUtype(serviceDef);
+        // let fdEntryAry;
+        // TODO: figure out how to better do TAP support
+        // if (utype===cisxAdhocServiceUtype && standId.startsWith(standardIDs.tap) && serviceDef.cisxTokenSub) {
+        //     fdEntryAry= sdParamsToFieldDefAry({
+        //         serDefParams:serviceDef.cisxTokenSub,
+        //         searchAreaInfo:makeSearchAreaInfo(getCisxUI(serviceDef), defaultMaxMOCFetchDepth),
+        //         hidePredefinedStringFields:false});
+        // }
+        // else {
+        const fdEntryAry= sdToFieldDefAry({
+                serviceDef, searchAreaInfo:makeSearchAreaInfo(getCisxUI(serviceDef), defaultMaxMOCFetchDepth)
             });
-        }
+        // }
         if (!isEmpty(initArgs.urlApi)) {
             const originalWp= fdEntryAry.find((fd) => fd.type===POSITION)?.initValue ?? fdEntryAry.find((fd) => fd.type===CIRCLE)?.targetDetails?.centerPt;
             const initFdEntryAry= ingestInitArgs(fdEntryAry,initArgs.urlApi);
@@ -463,7 +479,7 @@ const NotLoaded= ({regHasUrl,regLoaded, url}) => (
 );
 
 
-const doSubmitSearch= (r,dataServiceId, docRows,qAna,fdAry,searchObjFds,tabsKey) => {
+function doSubmitSearch(r,siaCtx,dataServiceId, docRows,qAna,fdAry,searchObjFds,tabsKey)  {
     const {fds, standardID, idx}=
         searchObjFds.length===1 ? searchObjFds[0] : searchObjFds.find(({ID}) => ID===r[tabsKey]) ?? {};
 
@@ -475,17 +491,29 @@ const doSubmitSearch= (r,dataServiceId, docRows,qAna,fdAry,searchObjFds,tabsKey)
         return false;
     }
 
-    const convertedR= convertRequest(r,fds,getStandardIdType(standardID));
+    const outReq= convertRequest(r,fds,getStandardIdType(standardID));
+    const requestKeyCnt= Object.keys(outReq).length;
+    const convertedR= Object.fromEntries(Object.entries(outReq).filter(([k,v]) => v!==DEFER_TO_CONTEXT));
     const selectedConcurrent= r.searchOptions ?? '';
 
+
+    let siaContraints= [];
+    if (siaCtx) {
+        const cAry= [...siaCtx.values()];
+        siaContraints= cAry.map( (f) =>  f.siaConstraints).filter( (c) => c?.length).flat();
+    }
+
     const numKeys= [...new Set(fds.map( ({key}) => key))].length;
-    if (Object.keys(convertedR).length<numKeys) {
+    if (requestKeyCnt<numKeys) {
         showInfoPopup('Please enter all of the fields', 'Error');
         return false;
     }
+
+
+
     const extraMeta = docRows?.[0] ? {[META.doclink.url]: docRows[0].accessUrl, [META.doclink.desc]: docRows[0].desc} : {};
     extraMeta[MetaConst.DATA_SERVICE_ID]= dataServiceId;
-    handleSearch(convertedR,qAna,fdAry, idx, extraMeta, selectedConcurrent);
+    handleSearch(convertedR,siaContraints, qAna,fdAry, idx, extraMeta, selectedConcurrent);
     return true;
-};
+}
 

src/firefly/js/ui/dynamic/DLuiServDescPanel.jsx

@@ -1,15 +1,17 @@
 import {Box, Link, Stack, Typography} from '@mui/joy';
 import {array, arrayOf, bool, func, node, object, oneOfType, string} from 'prop-types';
-import React from 'react';
+import React, {useContext} from 'react';
 import {CONE_CHOICE_KEY} from '../../visualize/ui/CommonUIKeys.js';
 import {CheckboxGroupInputField} from '../CheckboxGroupInputField.jsx';
+import {FieldGroupCtx} from '../FieldGroup';
 import {FieldGroupTabs, Tab} from '../panel/TabPanel';
 import {showInfoPopup} from '../PopupUtil.jsx';
 import {useFieldGroupValue} from '../SimpleComponent.jsx';
 import {hasSpatialTypes, isSpatialTypeSupported} from './DLGenAnalyzeSearch.js';
 import {DLSearchTitle} from './DLuiDecoration';
 import {CONE_AREA_KEY} from './DynamicDef.js';
 import {DynLayoutPanelTypes} from './DynamicUISearchPanel';
+import {ConstraintContext} from '../tap/Constraints';
 
 
 const HIPS_PLOT_ID= 'dlGeneratedHipsPlotId';
@@ -29,7 +31,8 @@ const DocRows= ({docRows=[], showLabel=true}) => (
 
 
 export function DLuiServDescPanel({fds, sx, desc, setSideBarShowing, sideBarShowing, docRows, setClickFunc,
-                                  submitSearch, isAllSky, qAna={},slotProps})  {
+                                  submitSearch, isAllSky, qAna={},dataServiceId, slotProps})  {
+    const {getVal,setVal} = useContext(FieldGroupCtx);
     const {concurrentSearchDef}= qAna;
 
     const coneAreaChoice = useFieldGroupValue(CONE_AREA_KEY)?.[0]() ?? CONE_CHOICE_KEY;
@@ -45,6 +48,14 @@ export function DLuiServDescPanel({fds, sx, desc, setSideBarShowing, sideBarShow
 
     const disDesc = coneAreaChoice === CONE_AREA_KEY ? 'w/ cone' : 'w/ polygon';
 
+    const constraintCtx= {
+        setConstraintFragment: (key,value) => {
+            const fragments= getVal('SIA_CTX') ?? new Map();
+            value ? fragments.set(key,value) : fragments.delete(key);
+            setVal('SIA_CTX',fragments);
+        }
+    };
+
     const options = (cNames || disableNames) ? (
         <Stack {...{alignItems: 'flex-start',}}>
             {Boolean(cNames?.length) &&
@@ -70,25 +81,28 @@ export function DLuiServDescPanel({fds, sx, desc, setSideBarShowing, sideBarShow
     return  (
         <Stack {...{justifyContent:'space-between', sx}}>
             <DLSearchTitle {...{desc,isAllSky,sideBarShowing,setSideBarShowing,...slotProps.searchTitle}}/>
-            <DynLayoutPanelTypes.Inset {...{fieldDefAry:fds, plotId:HIPS_PLOT_ID, style:{height:'100%', marginTop:4},
-                toolbarHelpId:'dlGenerated.VisualSelection',
-                slotProps:{
-                    FormPanel: {
-                        onSuccess:submitSearch,
-                        onError: () => showInfoPopup('Fix errors and search again', 'Error'),
-                        help_id:'search-collections-general',
-                        slotProps:{
-                            input: {border:0, p:0, mb:1},
-                            searchBar: {actions: <DocRows key='root' docRows={docRows}/>},
-                            completeBtn: {
-                                getDoOnClickFunc:(f) => setClickFunc({onClick: f})
+            <ConstraintContext.Provider value={constraintCtx}>
+                <DynLayoutPanelTypes.Inset {...{fieldDefAry:fds, plotId:HIPS_PLOT_ID, style:{height:'100%', marginTop:4},
+                    dataServiceId,
+                    toolbarHelpId:'dlGenerated.VisualSelection',
+                    slotProps:{
+                        FormPanel: {
+                            onSuccess: (r) => submitSearch(r,getVal('SIA_CTX') ?? new Map()),
+                            onError: () => showInfoPopup('Fix errors and search again', 'Error'),
+                            help_id:'search-collections-general',
+                            slotProps:{
+                                input: {border:0, p:0, mb:1},
+                                searchBar: {actions: <DocRows key='root' docRows={docRows}/>},
+                                completeBtn: {
+                                    getDoOnClickFunc:(f) => setClickFunc({onClick: f})
+                                }
                             }
-                        }
-                    }} }}>
-                <Stack {...{alignItems: 'flex-start',}}>
-                    {options}
-                </Stack>
-            </DynLayoutPanelTypes.Inset>
+                        }} }}>
+                    <Stack {...{alignItems: 'flex-start',}}>
+                        {options}
+                    </Stack>
+                </DynLayoutPanelTypes.Inset>
+            </ConstraintContext.Provider>
         </Stack>
     );
 }
@@ -105,23 +119,25 @@ DLuiServDescPanel.propTypes= {
     fds: array,
     sx: object,
     desc: string,
+    dataServiceId: string,
     setSideBarShowing: func,
     sideBarShowing: bool,
 };
 
 
 export const DLuiTabView = ({
-                            tabsKey,
-                            setSideBarShowing,
-                            sideBarShowing,
-                            searchObjFds,
-                            qAna,
-                            docRows,
-                            isAllSky,
-                            setClickFunc,
-                            submitSearch,
-                            slotProps
-                        }) => (
+                                tabsKey,
+                                setSideBarShowing,
+                                sideBarShowing,
+                                searchObjFds,
+                                qAna,
+                                docRows,
+                                isAllSky,
+                                setClickFunc,
+                                submitSearch,
+                                slotProps,
+                                dataServiceId
+                            }) => (
     <FieldGroupTabs style={{height: '100%', width: '100%'}} initialState={{value: searchObjFds[0]?.ID}}
                     fieldKey={tabsKey}>
         {
@@ -131,7 +147,7 @@ export const DLuiTabView = ({
                     <Tab name={`${qAna.primarySearchDef[idx].desc}`} id={ID} key={idx + ''}>
                         <DLuiServDescPanel{...{
                             fds, setSideBarShowing, sideBarShowing, sx: {width: 1}, desc, docRows,
-                            isAllSky, setClickFunc, submitSearch, qAna, slotProps
+                            isAllSky, setClickFunc, submitSearch, qAna, slotProps, dataServiceId,
                         }}/>
                     </Tab>
                 );