Firefly-1252: column validator now accepts an error message parameter

- also set the error messages for spatial and temporal
Caltech-IPAC · Jun 7, 2023 · 5bbc10a · 5bbc10a
1 parent 907f99e
commit 5bbc10a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/firefly/js/charts/ui/ColumnOrExpression.jsx b/src/firefly/js/charts/ui/ColumnOrExpression.jsx
@@ -46,14 +46,14 @@ function parseSuggestboxContent(text) {
     return {token, priorContent};
 }
 
-export function getColValidator(cols, required=true, canBeExpression=true) {
+const DEFAULT_MSG= 'Can not be empty. Please provide value or expression';
+
+export function getColValidator(cols, required=true, canBeExpression=true, message=DEFAULT_MSG) {
     const colNames = cols.map((colVal) => {return colVal.name;});
     return (val) => {
         let retval = {valid: true, message: ''};
         if (!val) {
-            if (required) {
-                return {valid: false, message: 'Can not be empty. Please provide value or expression'};
-            }
+            if (required) return {valid: false, message};
         } else if (colNames.indexOf(val) < 0) {
             if (canBeExpression) {
                 const expr = new Expression(val, colNames);

diff --git a/src/firefly/js/ui/tap/SpatialSearch.jsx b/src/firefly/js/ui/tap/SpatialSearch.jsx
@@ -120,17 +120,19 @@ export function SpatialSearch({cols, serviceUrl, serviceLabel, columnsModel, tab
             const columns = searchParams.uploadInfo.columns;
             const centerCols = findTableCenterColumns({tableData:{columns}}) ?? {};
             const {lonCol='', latCol=''}= centerCols;
-            setVal(UploadCenterLonColumns, lonCol, {validator: getColValidator(searchParams.uploadInfo.columns, true, false), valid: true});
-            setVal(UploadCenterLatColumns, latCol, {validator: getColValidator(searchParams.uploadInfo.columns, true, false), valid: true});
+            const errMsg= 'Upload tables require identifying spatial columns containing equatorial coordinates.  Please provide column names.';
+            setVal(UploadCenterLonColumns, lonCol, {validator: getColValidator(searchParams.uploadInfo.columns, true, false,errMsg), valid: true});
+            setVal(UploadCenterLatColumns, latCol, {validator: getColValidator(searchParams.uploadInfo.columns, true, false,errMsg), valid: true});
             setUploadInfo(searchParams.uploadInfo);
             checkHeaderCtl.setPanelActive(true);
         }
     }, [searchParams.radiusInArcSec, searchParams.wp, searchParams.corners, searchParams.uploadInfo]);
 
     useEffect(() => {
         const {lon,lat} = formCenterColumns(columnsModel);
-        setVal(CenterLonColumns, lon, {validator: getColValidator(cols, true, false), valid: true});
-        setVal(CenterLatColumns, lat, {validator: getColValidator(cols, true, false), valid: true});
+        const errMsg= 'Spatial searches require identifying table columns containing equatorial coordinates.  Please provide column names.';
+        setVal(CenterLonColumns, lon, {validator: getColValidator(cols, true, false, errMsg), valid: true});
+        setVal(CenterLatColumns, lat, {validator: getColValidator(cols, true, false, errMsg), valid: true});
         const noDefaults= !lon || !lat;
         setVal(posOpenKey, (noDefaults) ? 'open' : 'closed');
         if (noDefaults) checkHeaderCtl.setPanelActive(false);

diff --git a/src/firefly/js/ui/tap/TemportalSearch.jsx b/src/firefly/js/ui/tap/TemportalSearch.jsx
@@ -128,9 +128,9 @@ export function TemporalSearch({cols, columnsModel}) {
 
     useEffect(() => {
         const timeCol= findTimeColumn(columnsModel) ?? '';
-        setVal(TemporalColumns, timeCol, {validator: getColValidator(cols, true, false), valid: true});
+        const errMsg= 'Temporal searches require identifying a table column containing a time in MJD.  Please provide a column name.';
+        setVal(TemporalColumns, timeCol, {validator: getColValidator(cols, true, false, errMsg), valid: true});
         checkHeaderCtl.setPanelOpen(Boolean(timeCol));
-        // checkHeaderCtl.setPanelActive(Boolean(timeCol));
     }, [columnsModel]);