some more cleanup

Author: kpuriIpac

src/firefly/js/ui/ListBoxInputField.jsx

@@ -33,9 +33,9 @@ export function ListBoxInputFieldView({value:fieldValue='', onChange, fieldKey,
                     <Select {...{name: fieldKey, multiple, onChange, placeholder, renderValue, startDecorator,
                         disabled: readonly, size, value: multiple ? vAry : fieldValue,
                         ...slotProps?.input}}>
-                        {options?.map((({value,label,disabled=false}) => {
+                        {options?.map((({value,label,disabled=false},idx) => {
                             return (
-                                <Option key={`${value}::${label ?? ''}`} value={value} label={forceLabelToValue ? value : label} disabled={disabled}>
+                                <Option {...{value, key:`k${idx}`, label:forceLabelToValue?value:label, disabled}}>
                                     {isFunction(decorator) ? decorator(label,value) : (label || value)}
                                 </Option>
                             );

src/firefly/js/ui/tap/Constraints.js

@@ -3,7 +3,7 @@ import React from 'react';
 
 export const ConstraintContext = React.createContext({});
 
-function hasAdqlConstraint(constraintObj) {
+export function hasAdqlConstraint(constraintObj) {
     return Boolean(
         constraintObj?.adqlConstraint ||
         constraintObj?.adqlConstraintsAry?.length

src/firefly/js/ui/tap/SpatialSearch.jsx

@@ -241,7 +241,19 @@ export function SpatialSearch({sx, cols, serviceUrl, serviceLabel, serviceId, co
     const cornerCalcTypeVal = getVal(cornerCalcType);
     const closestVal = getVal(Closest);
 
+    const isSpatialPanelActive = checkHeaderCtl?.isPanelActive();
+
     const constraintResult = React.useMemo(() => {
+
+        //when spatial panel is inactive, it should not contribute constraints or errors
+        if (!isSpatialPanelActive) {
+            return {
+                adqlConstraintsAry: [],
+                constraintErrors: [],
+                simpleError: '',
+            };
+        }
+
         const constraints = makeSpatialConstraints(
             columnsModel, obsCoreEnabled, makeFldObj(fldListAry),
             uploadInfo, tableName, canUpload, useSIAv2
@@ -252,7 +264,7 @@ export function SpatialSearch({sx, cols, serviceUrl, serviceLabel, serviceId, co
             constraintErrors: [...(constraints.errAry ?? [])],
             simpleError: constraints.errAry?.[0] ?? '',
         };
-    }, [columnsModel, obsCoreEnabled, uploadInfo, tableName, canUpload,
+    }, [isSpatialPanelActive, columnsModel, obsCoreEnabled, uploadInfo, tableName, canUpload,
         useSIAv2, targetWp, spatialRegOp, spatialType, spatialMethodVal,
         radiusVal, polygonCornersVal, centerLonVal, centerLatVal,
         uploadCenterLonVal, uploadCenterLatVal, cornerCalcTypeVal, closestVal,

src/firefly/js/ui/tap/TapSearchRootPanel.jsx

@@ -125,6 +125,8 @@ function TapSearchPanelImpl({initArgs= {}, titleOn=true, lockService=false, lock
     const tapOps = useMemo(() => makeTapServiceOptions(tapConfig.services, tapConfig.additional?.services, userServices),
         [tapConfig.services, tapConfig.additional?.services, userServices]);
     const tapState= getTapBrowserState();
+    if (!initArgs?.urlApi?.execute) searchFromAPIOnce(true); //if not execute then mark as done, i.e. disable any auto searching
+    initApiAddedServiceOnce(initArgs);  //only look for the extra service the first time
     const {current:clickFuncRef} = useRef({clickFunc:undefined});
     const [selectBy, setSelectBy]= useState(() => {
         const val= getVal('selectBy');
@@ -135,7 +137,7 @@ function TapSearchPanelImpl({initArgs= {}, titleOn=true, lockService=false, lock
     const [servicesShowing, setServicesShowingInternal]= useState(tapState.lastServicesShowing);
     const [obsCoreTableModel, setObsCoreTableModel] = useState();
     const [serviceUrl, setServiceUrl]= useState(() => getInitServiceUrl(tapState,initArgs,tapOps,lockedServiceUrl,lockedServiceName));
-
+    activateInitArgsAdqlOnce(groupKey, tapState,initArgs,setSelectBy);
 
     const setServicesShowing= (showing) => {
         setServicesShowingInternal(showing);
@@ -144,10 +146,10 @@ function TapSearchPanelImpl({initArgs= {}, titleOn=true, lockService=false, lock
 
     const obsCoreEnabled = obsCoreTableModel?.tableData?.data?.length > 0;
 
-    const onDeleteServiceOption = (deletedValue) => {
+    const onDeleteServiceOption = (deletedValue, clearServiceOnDelete=false) => {
         deleteUserService(deletedValue);
 
-        if (serviceUrl === deletedValue) {
+        if (clearServiceOnDelete) {
             setServiceUrl('');
             setTapBrowserState({...getTapBrowserState(), serviceUrl: ''});
             setVal(ADQL_QUERY_KEY, '');
@@ -156,7 +158,6 @@ function TapSearchPanelImpl({initArgs= {}, titleOn=true, lockService=false, lock
         }
     };
 
-
     const onTapServiceOptionSelect= (selectedOption) => {
         if (!selectedOption) return;
         setVal(ADQL_QUERY_KEY, '');
@@ -167,18 +168,6 @@ function TapSearchPanelImpl({initArgs= {}, titleOn=true, lockService=false, lock
         setTapBrowserState({...getTapBrowserState(), serviceUrl: nextServiceUrl});
     };
 
-    useEffect(() => {
-        if (!initArgs?.urlApi?.execute) searchFromAPIOnce(true);
-    }, [initArgs?.urlApi?.execute]);
-
-    useEffect(() => {
-        initApiAddedServiceOnce(initArgs);
-    }, [initArgs]);
-
-    useEffect(() => {
-        activateInitArgsAdqlOnce(groupKey, tapState,initArgs,setSelectBy);
-    }, [groupKey, initArgs, setSelectBy, tapState]);
-
     useEffect(() => {
         const {serviceUrl:u}= initArgs?.searchParams ?? {};
         u && u!==serviceUrl && setServiceUrl(u);
@@ -380,9 +369,9 @@ function Services({serviceUrl, servicesShowing, tapOps, onTapServiceOptionSelect
                             },
                             renderValue:
                                 ({value}) =>
-                                    (<ServiceOpRender {...{ ops: tapOps, value,onDeleteServiceOption}}/>),
+                                    (<ServiceOpRender {...{ ops: tapOps, value,onDeleteServiceOption, clearServiceOnDelete: true}}/>),
                             decorator:
-                                (label,value) => (<ServiceOpRender {...{ ops: tapOps, value,onDeleteServiceOption}}/>),
+                                (label,value) => (<ServiceOpRender {...{ ops: tapOps, value,onDeleteServiceOption,clearServiceOnDelete: value === serviceUrl}}/>),
                         }} /> )}
                     <FormHelperText sx={{m: .25}}>
                         {enterUrl ? 'Type the url of a TAP service & press enter' : 'Choose a TAP service from the list'}
@@ -394,7 +383,7 @@ function Services({serviceUrl, servicesShowing, tapOps, onTapServiceOptionSelect
 }
 
 
-function ServiceOpRender({ops, value, sx, onDeleteServiceOption}) {
+function ServiceOpRender({ops, value, sx, onDeleteServiceOption, clearServiceOnDelete=false}) {
     const op = ops.find((t) => t.value === value);
     if (!op) return 'none';
     return (
@@ -409,18 +398,15 @@ function ServiceOpRender({ops, value, sx, onDeleteServiceOption}) {
                     </Typography>
                 </Stack>
                 { op.userAdded &&
-                    <ChipDelete
-                        component='div'
-                        size='sm'
-                        sx={{zIndex:2}}
+                    <ChipDelete component='div' size='sm' sx={{zIndex:2}}
                         onMouseDown={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
                         }}
                         onClick={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
-                            onDeleteServiceOption(value);
+                            onDeleteServiceOption(value, clearServiceOnDelete);
                         }}
                     />
                 }

src/firefly/js/ui/tap/TapSearchSubmit.js

@@ -9,7 +9,7 @@ import {
     getHelperConstraints,
     getTapUploadSchemaEntry,
     getUploadServerFile,
-    getUploadTableName,
+    getUploadTableName, hasAdqlConstraint,
     isTapUpload
 } from 'firefly/ui/tap/Constraints';
 import {makeTblRequest, setNoCache} from 'firefly/tables/TableRequestUtil';
@@ -105,9 +105,9 @@ export function onTapSearchSubmit({request, serviceUrl, tapBrowserState, additio
 
 function getCutoutType(tapBrowserState) {
     const spatial= tapBrowserState?.constraintFragments?.get('spatial');
-    if (spatial?.adqlConstraint?.length) return spatial.cutoutType;
+    if (hasAdqlConstraint(spatial)) return spatial.cutoutType;
     const location= tapBrowserState?.constraintFragments?.get('location');
-    if (location?.adqlConstraint?.length) return location.cutoutType;
+    if (hasAdqlConstraint(location)) return location.cutoutType;
     return ROW_POSITION;
 }
 
@@ -129,7 +129,7 @@ export function getAdqlQuery(tapBrowserState, additionalClauses, allowColumnCons
     if (isUpload) { //check for more than one upload file (in Spatial and in ObjectID col) - should this be a utility function in constraints.js?
         const { constraintFragments } = tapBrowserState;
         const entries = [...constraintFragments.values()];
-        const matchingEntries = entries.filter((c) => Boolean(c.uploadFile && c.TAP_UPLOAD && c.adqlConstraint));
+        const matchingEntries = entries.filter((c) => Boolean(c.uploadFile && c.TAP_UPLOAD && hasAdqlConstraint(c)));
         if (matchingEntries.length > 1) {
             if (showErrors) showInfoPopup('We currently do not support searches with more than one uploaded table.', 'Error');
             return;

src/firefly/js/ui/tap/TapUtil.js

@@ -574,13 +574,23 @@ export function getTapServices() {
 const baseName= 'User Entered';
 
 function getUserServiceAry() {
-    return [...getPreference(USER_SERVICE_PREFS, [])];
+    const seen = new Set();
+
+    return [...getPreference(USER_SERVICE_PREFS, [])]
+        .filter((entry) => entry?.value?.trim())
+        .filter((entry) => {
+            const key = normalizeTapUrl(entry.value);
+            if (!key || seen.has(key)) return false;
+            seen.add(key);
+            return true;
+        });
 }
 
+
 export function addUserService(serviceUrl) {
     const userServices = getUserServiceAry();
     const normalizedServiceUrl = normalizeTapUrl(serviceUrl);
-    if (getTapServiceByURL(normalizedServiceUrl)) return; // don't add if service already exist
+    if (getTapServices().some(({value}) => normalizeTapUrl(value) === normalizedServiceUrl)) return; //don't add if service already exists
 
     const usedNumAry = userServices
         .map((s) => s.label)
@@ -710,7 +720,7 @@ export const getServiceHiPS= (serviceUrl) => getTapServiceByURL(serviceUrl)?.hip
 export const normalizeTapUrl = (url='') => url.trim().replace(/\/+$/, '').toLowerCase();
 
 export function makeTapServiceOptions(baseServices, additionalServices, userServices=[]) {
-    const startingTapServices= hasElements(baseServices) ? [...baseServices] : getTAPServicesByName();
+    const startingTapServices= hasElements(baseServices) ? [...baseServices] : makeTAPDefaultServicesByName();
     const mergedServices= mergeServices(startingTapServices, additionalServices);
     const allServices= [...mergedServices, ...userServices];
     const seen = new Set();