Fixed migrated WISE scan_id image failed to load (#1244)

* WiseIbeDataSource was using fits image from filesystem.
- This is not reliable.  Remove logic so it will call irsa/ibe instead.
- fixed client table not showing filters when showFilters=true
- docker local dev environment so all logs is showing in console
- add ability to pass in 'env' in devMode

Author: loitly

docker-compose.yml

@@ -30,4 +30,6 @@ services:
     ports:
       - "8080:8080"
       - "5050:5050"
+    env_file:
+      - ./firefly-docker.env
     volumes: *volInfo

docker/Dockerfile

@@ -41,14 +41,12 @@ RUN apt-get update \
     && rm apache-tomcat-9*tar.gz \
     && rm -rf /var/lib/apt/lists/*;
 
-ENV JPDA_ADDRESS=*:5050 \
-    CATALINA_HOME=/opt/tomcat \
-    DEBUG=true \
-    START_MODE=start \
+ENV CATALINA_HOME=/opt/tomcat \
     USE_ADMIN_AUTH="false"
 
 ENV work_dir=firefly
 ENV project=firefly
+ENV env=local
 
 WORKDIR ${CATALINA_HOME}
 
@@ -60,7 +58,7 @@ COPY firefly/docker/tomcat-users.xml conf/
 RUN mkdir -p /firefly/workarea /firefly/logs/statistics /firefly/alerts \
     && chmod a+x *.sh
 
-CMD /opt/tomcat/launchTomcat.sh && cd /opt/work/${work_dir} && gradle ${project}:bAD -x buildClient && gradle ${project}:dev
+CMD ./devMode.sh
 
 
 FROM node_module AS builder
@@ -143,11 +141,6 @@ ENV JVM_CORES=0\
 
 ARG IMAGE_NAME=''
 
-ENV JPDA_ADDRESS=*:5050 \
-    VISUALIZE_FITS_SEARCH_PATH='' \
-    BUILD_TIME_NAME=${IMAGE_NAME} \
-    START_MODE=run
-
 WORKDIR ${CATALINA_HOME}
 
 # set up directory protections, copy stuff around, add tomcat user and group

docker/devMode.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+cd /opt/work/${work_dir}
+gradle -Penv=${env} ${project}:bAD
+gradle -Penv=${env} ${project}:dev &
+
+cd ${CATALINA_HOME}
+/opt/tomcat/launchTomcat.sh

docker/launchTomcat.sh

@@ -1,10 +1,17 @@
 #!/bin/bash
 
+JPDA_ADDRESS=${JPDA_ADDRESS:-*:5050}
+VISUALIZE_FITS_SEARCH_PATH=${VISUALIZE_FITS_SEARCH_PATH:-''}
+START_MODE=${START_MODE:-run}
 NAME=${BUILD_TIME_NAME:-"ipac/firefly"}
+
 ADMIN_USER=${ADMIN_USER:-admin}
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-`echo $RANDOM | base64 | head -c 8`}
 USE_ADMIN_AUTH=${USE_ADMIN_AUTH:-"true"}
 
+
+
+
 echo -e "\n!!============================================================"
 echo "!!============================================================"
 echo "!!==================== For Help =============================="

firefly-docker.env

@@ -10,3 +10,4 @@
 
 ##---- Empty declarations: environment will come from the shell
 ADMIN_PASSWORD
+env

src/firefly/java/edu/caltech/ipac/astro/ibe/datasource/WiseIbeDataSource.java

@@ -338,12 +338,12 @@ private void setupDS(String ibeHost, String baseFsPath, DataProduct ds) {
             setDataset(wds.getDataset());
             setTableName(wds.getImageTable());
 
-            File dir= (baseFsPath!=null) ? new File(baseFsPath) : null;
-
-            if (baseFsPath != null && dir.canRead()) {
-                setUseFileSystem(true);
-                setBaseFilesystemPath(baseFsPath + "/" + wds.getFilesysDatasetPath());
-            }
+//            File dir= (baseFsPath!=null) ? new File(baseFsPath) : null;
+//
+//            if (baseFsPath != null && dir.canRead()) {
+//                setUseFileSystem(true);
+//                setBaseFilesystemPath(baseFsPath + "/" + wds.getFilesysDatasetPath());
+//            }
         }
     }
 

src/firefly/js/tables/ui/BasicTableView.jsx

@@ -36,19 +36,13 @@ const BasicTableViewInternal = React.memo((props) => {
     const {tbl_id, columnWidths, scrollLeft=0, scrollTop=0, triggeredBy, showTypes, showFilters, showUnits, filterInfo,
             selectable, sortInfo, textView} = uiStates;
 
-    useEffect( () => {
-        dispatchTableUiUpdate({tbl_ui_id,
-            ...omitBy(pick(props, 'showTypes', 'showFilters', 'showUnits', 'filterInfo','selectable', 'sortInfo', 'textView'), isUndefined)
-        });
-    }, []);
-
     useEffect( () => {
         if (!isEmpty(columns)) {
-            const changes = {};
-            if (isUndefined(showUnits)) {
+            const changes = omitBy(pick(props, 'showTypes', 'showFilters', 'showUnits', 'filterInfo','selectable', 'sortInfo', 'textView'), isUndefined);
+            if (isUndefined(changes.showUnits)) {
                 changes.showUnits = !!columns.find?.((col) => col?.units);
             }
-            if (isUndefined(showFilters)) {
+            if (isUndefined(changes.showFilters)) {
                 changes.showFilters = !!tbl_id && !isClientTable(tbl_id);    // false if no tbl_id or is a client table
             }
             if (!isEmpty(changes)) {