Merge pull request #57 from 4dn-dcic/minor-ui-fix-ingestion-page

Minor UI fix ingestion page

CHANGELOG.rst

@@ -6,6 +6,12 @@ foursight-core
 Change Log
 ----------
 
+5.2.0
+=====
+* Minor UI fixes to the Ingestion page.
+* Changed to NOT get Auth0 info from Portal; see foursight_core/react/api/auth0_config.py/PULL_AUTH0_INFO_FROM_PORTAL.
+
+
 5.1.0
 =====
 * New tasks page (initially to kick off Portal reindex and redeploy).

foursight_core/react/api/auth.py

@@ -40,8 +40,7 @@ def get_redis_handler(self):
             # 2023-09-21: Moved this from __init__ to here;
             # it speeds up provision/deploy from 4dn-cloud-infra.
             try:
-                redis_url = os.environ['REDIS_HOST']
-                if redis_url and ("redis://" in redis_url or "rediss://" in redis_url):
+                if (redis_url := os.environ.get('REDIS_HOST')) and ("redis://" in redis_url or "rediss://" in redis_url):
                     self._redis = RedisBase(create_redis_client(url=redis_url))
             except (redis.exceptions.ConnectionError, redis.exceptions.TimeoutError):
                 PRINT('Cannot connect to Redis')

foursight_core/react/api/auth0_config.py

@@ -9,6 +9,7 @@
 logging.basicConfig()
 logger = logging.getLogger(__name__)
 
+PULL_AUTH0_INFO_FROM_PORTAL = False
 
 # Class to encapsulate the Auth0 configuration
 # parameters from the Portal /auth0_config endpoint,
@@ -60,16 +61,16 @@ class Auth0Config:
     }
 
     def __init__(self, portal_url: str) -> None:
-        if not portal_url:
+        if not portal_url and PULL_AUTH0_INFO_FROM_PORTAL:
             raise ValueError("Portal URL required for Auth0Config usage.")
         self._portal_url = portal_url
-        self._config_url = f"{portal_url}{'/' if not portal_url.endswith('/') else ''}auth0_config?format=json"
+        self._portal_config_url = f"{portal_url}{'/' if not portal_url.endswith('/') else ''}auth0_config?format=json"
 
     def get_portal_url(self) -> str:
         return self._portal_url
 
-    def get_config_url(self) -> str:
-        return self._config_url
+    def get_portal_config_url(self) -> str:
+        return self._portal_config_url
 
     @function_cache(nocache={})
     def get_config_data(self) -> dict:
@@ -114,8 +115,10 @@ def get_config_raw_data(self) -> dict:
         """
         Returns raw data (dictionary) from the Auth0 config URL.
         """
+        if not PULL_AUTH0_INFO_FROM_PORTAL:
+            return {}
         try:
-            auth0_config_response = requests.get(self.get_config_url()).json() or {}
+            auth0_config_response = requests.get(self.get_portal_config_url()).json() or {}
             allowed_connections = auth0_config_response.get("auth0Options", {}).get("allowedConnections")
             if isinstance(allowed_connections, str):
                 # Slight temporary hack to deal with fact that at some points in
@@ -124,7 +127,7 @@ def get_config_raw_data(self) -> dict:
                 auth0_config_response["auth0Options"]["allowedConnections"] = json.loads(allowed_connections)
             return auth0_config_response
         except Exception as e:
-            logger.error(f"Exception fetching Auth0 config ({self.get_config_url()}): {get_error_message(e)}")
+            logger.error(f"Exception fetching Auth0 config ({self.get_portal_config_url()}): {get_error_message(e)}")
             return {}
 
     def get_client(self) -> str:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "foursight-core"
-version = "5.1.0"
+version = "5.2.0"
 description = "Serverless Chalice Application for Monitoring"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"

react/src/pages/IngestionSubmissionsPage.js

@@ -88,8 +88,11 @@ const IngestionSubmissionPage = (props) => {
                 if      (columnData?.endsWith(".json"))   return "JSON";
                 else if (columnData?.endsWith(".txt"))    return "Text";
                 else if (columnData?.endsWith(".xlsx"))   return "Excel";
+                else if (columnData?.endsWith(".xls"))    return "Excel";
                 else if (columnData?.endsWith(".zip"))    return "ZIP";
                 else if (columnData?.endsWith(".tar.gz")) return "Tarball";
+                else if (columnData?.endsWith(".xlsx.gz")) return "Excel (GZIP)";
+                else if (columnData?.endsWith(".xlsx.gz")) return "Excel (GZIP)";
                 else                                      return columnData || "Unknown";
             }
         },
@@ -399,7 +402,7 @@ const SummaryRow = ({ summary, uuid, bucket, prestyle }) => {
             <ExternalLink href={awsDataLink(bucket, uuid, summary.data?.file)} tooltip="Click to view in AWS S3." />&nbsp;&nbsp;&ndash;&nbsp;&nbsp;<small><i>{summary.data?.file}</i></small><br />
             <pre style={prestyle}>
                 { showSummary ? <>
-                    { summary?.data?.summary?.map((item, index) => <React.Fragment key={index}>{index > 0 && <br />}{item.trim()}</React.Fragment>)}
+                    {Yaml.Format(summary?.data?.summary)}
                 </>:<>
                     <span onClick={toggleSummary} className="pointer">Click to show ...</span>
                 </>}