Add default query; various touch ups

AllenInstitute · May 17, 2024 · 7a7d43e · 7a7d43e
1 parent 94a5301
commit 7a7d43e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/packages/core/components/QuerySidebar/index.tsx b/packages/core/components/QuerySidebar/index.tsx
@@ -29,6 +29,13 @@ export default function QuerySidebar(props: QuerySidebarProps) {
     const dataSources = useSelector(interaction.selectors.getAllDataSources);
     const currentGlobalURL = useSelector(selection.selectors.getEncodedFileExplorerUrl);
 
+    // Select query by default if none is selected
+    React.useEffect(() => {
+        if (!selectedQuery && queries.length) {
+            dispatch(selection.actions.changeQuery(queries[0]));
+        }
+    }, [selectedQuery, queries, dispatch]);
+
     // Determine a default query to render or prompt the user for a data source
     // if no default is accessible
     React.useEffect(() => {

diff --git a/packages/core/entity/FileDetail/index.ts b/packages/core/entity/FileDetail/index.ts
@@ -132,7 +132,10 @@ export default class FileDetail {
 
     public get size(): number | undefined {
         const size = this.fileDetail.file_size || this.getFirstAnnotationValue("File Size");
-        if (size === undefined || typeof size === "number") {
+        if (size === undefined) {
+            return 0; // Default to 0 if size is not defined for now, need better system
+        }
+        if (typeof size === "number") {
             return size;
         }
         return parseInt(size as string, 10);

diff --git a/packages/core/services/FileService/DatabaseFileService/index.ts b/packages/core/services/FileService/DatabaseFileService/index.ts
@@ -157,11 +157,16 @@ export default class DatabaseFileService implements FileService {
         // If the file system is accessible we can just have DuckDB write the
         // output query directly to the system rather than to a buffer then the file
         if (this.downloadService.isFileSystemAccessible) {
-            const downloadDir = this.downloadService.getDefaultDownloadDirectory();
-            const destination = `${downloadDir}file-selection-${new Date()}`;
+            const downloadDir = await this.downloadService.getDefaultDownloadDirectory();
+            const lowerCaseUserAgent = navigator.userAgent.toLowerCase();
+            const separator = lowerCaseUserAgent.includes("Windows") ? "\\" : "/";
+            const destination = `${downloadDir}${separator}file-selection-${Date.now().toLocaleString(
+                "en-us"
+            )}`;
             await this.databaseService.saveQuery(destination, sqlBuilder.toSQL(), format);
             return {
                 downloadRequestId: uniqueId(),
+                msg: `File downloaded to ${destination}.${format}`,
                 resolution: DownloadResolution.SUCCESS,
             };
         }

diff --git a/packages/core/services/FileService/HttpFileService/index.ts b/packages/core/services/FileService/HttpFileService/index.ts
@@ -38,9 +38,10 @@ export default class HttpFileService extends HttpServiceBase implements FileServ
      */
     public async isNetworkAccessible(): Promise<boolean> {
         try {
-            await this.get(`${this.baseUrl}/`);
+            await this.get(`${this.baseUrl}/${HttpFileService.BASE_FILE_COUNT_URL}`);
             return true;
-        } catch {
+        } catch (error) {
+            console.error(`Unable to access AICS network ${error}`);
             return false;
         }
     }

diff --git a/packages/core/state/interaction/logics.ts b/packages/core/state/interaction/logics.ts
@@ -101,7 +101,7 @@ const downloadManifest = createLogic({
         dispatch(
             processStart(
                 manifestDownloadProcessId,
-                "Download of CSV manifest in progress.",
+                "Download of metadata manifest in progress.",
                 onManifestDownloadCancel
             )
         );
@@ -112,11 +112,13 @@ const downloadManifest = createLogic({
             if (result.resolution === DownloadResolution.CANCELLED) {
                 dispatch(removeStatus(manifestDownloadProcessId));
             } else {
-                const successMsg = `Download of CSV manifest finished.<br/>${result.msg}`;
+                const successMsg = `Download of metadata manifest finished.<br/>${
+                    result.msg || ""
+                }`;
                 dispatch(processSuccess(manifestDownloadProcessId, successMsg));
             }
         } catch (err) {
-            const errorMsg = `Download of CSV manifest failed. Details: ${
+            const errorMsg = `Download of metadata manifest failed. Details: ${
                 err instanceof Error ? err.message : err
             }`;
             dispatch(processFailure(manifestDownloadProcessId, errorMsg));

diff --git a/packages/web/src/services/NotificationServiceWeb.ts b/packages/web/src/services/NotificationServiceWeb.ts
@@ -8,4 +8,8 @@ export default class NotificationServiceWeb implements NotificationService {
     public async showError(): Promise<void> {
         throw new Error("NotificationServiceWeb::showError is not yet implemented");
     }
+
+    public async showQuestion(): Promise<boolean> {
+        throw new Error("NotificationServiceWeb::showQuestion is not yet implemented");
+    }
 }