Merge branch 'main' into feature/hide-unique-id-for-data-sources

packages/core/services/DatabaseService/DatabaseServiceNoop.ts

@@ -1,6 +1,10 @@
 import DatabaseService from ".";
 
 export default class DatabaseServiceNoop extends DatabaseService {
+    public deleteSourceMetadata(): Promise<void> {
+        return Promise.reject("DatabaseServiceNoop:deleteSourceMetadata");
+    }
+
     public execute(): Promise<void> {
         return Promise.reject("DatabaseServiceNoop:execute");
     }

packages/core/services/DatabaseService/index.ts

@@ -33,6 +33,7 @@ export default abstract class DatabaseService {
         ...Object.values(AnnotationType),
         DatabaseService.OPEN_FILE_LINK_TYPE,
     ]);
+    private sourceMetadataName?: string;
     private currentAggregateSource?: string;
     // Initialize with AICS FMS data source name to pretend it always exists
     protected readonly existingDataSources = new Set([AICS_FMS_DATA_SOURCE_NAME]);
@@ -143,18 +144,25 @@ export default abstract class DatabaseService {
     }
 
     public async prepareSourceMetadata(sourceMetadata: Source): Promise<void> {
-        if (sourceMetadata.type && sourceMetadata.uri) {
-            this.deleteDataSource(this.SOURCE_METADATA_TABLE);
-            this.dataSourceToAnnotationsMap.clear();
+        const isPreviousSource = sourceMetadata.name === this.sourceMetadataName;
+        if (isPreviousSource) {
+            return;
         }
 
+        await this.deleteSourceMetadata();
         await this.prepareDataSource(
             {
                 ...sourceMetadata,
                 name: this.SOURCE_METADATA_TABLE,
             },
             true
         );
+        this.sourceMetadataName = sourceMetadata.name;
+    }
+
+    public async deleteSourceMetadata(): Promise<void> {
+        await this.deleteDataSource(this.SOURCE_METADATA_TABLE);
+        this.dataSourceToAnnotationsMap.clear();
     }
 
     private async deleteDataSource(dataSource: string): Promise<void> {
@@ -415,7 +423,12 @@ export default abstract class DatabaseService {
 
     public async fetchAnnotations(dataSourceNames: string[]): Promise<Annotation[]> {
         const aggregateDataSourceName = dataSourceNames.sort().join(", ");
-        if (!this.dataSourceToAnnotationsMap.has(aggregateDataSourceName)) {
+        const hasAnnotations = this.dataSourceToAnnotationsMap.has(aggregateDataSourceName);
+        const hasDescriptions = this.dataSourceToAnnotationsMap
+            .get(aggregateDataSourceName)
+            ?.some((annotation) => !!annotation.description);
+        const shouldHaveDescriptions = dataSourceNames.includes(this.SOURCE_METADATA_TABLE);
+        if (!hasAnnotations || (!hasDescriptions && shouldHaveDescriptions)) {
             const sql = new SQLBuilder()
                 .select("column_name, data_type")
                 .from('information_schema"."columns')

packages/core/state/selection/logics.ts

@@ -555,6 +555,8 @@ const changeSourceMetadataLogic = createLogic({
         );
         if (selectedSourceMetadata) {
             await databaseService.prepareSourceMetadata(selectedSourceMetadata);
+        } else {
+            await databaseService.deleteSourceMetadata();
         }
 
         dispatch(metadata.actions.requestAnnotations());
@@ -577,6 +579,8 @@ const addQueryLogic = createLogic({
             await databaseService.prepareDataSources(newQuery.parts.sources);
             if (newQuery.parts.sourceMetadata) {
                 await databaseService.prepareSourceMetadata(newQuery.parts.sourceMetadata);
+            } else {
+                await databaseService.deleteSourceMetadata();
             }
             // Hide warning pop-up if present and remove datasource error from state
             dispatch(removeDataSourceReloadError());

packages/core/state/selection/test/logics.test.ts

@@ -24,6 +24,7 @@ import {
     selectNearbyFile,
     SET_SORT_COLUMN,
     changeDataSources,
+    changeSourceMetadata,
 } from "../actions";
 import { initialState, interaction } from "../../";
 import Annotation from "../../../entity/Annotation";
@@ -40,6 +41,7 @@ import FileSort, { SortOrder } from "../../../entity/FileSort";
 import { DatasetService } from "../../../services";
 import { DataSource } from "../../../services/DataSourceService";
 import HttpFileService from "../../../services/FileService/HttpFileService";
+import DatabaseServiceNoop from "../../../services/DatabaseService/DatabaseServiceNoop";
 import FileDownloadServiceNoop from "../../../services/FileDownloadService/FileDownloadServiceNoop";
 
 describe("Selection logics", () => {
@@ -947,7 +949,17 @@ describe("Selection logics", () => {
         it("dispatches new hierarchy, filters, sort, source, & opened folders from given URL", async () => {
             // Arrange
             const annotations = annotationsJson.map((annotation) => new Annotation(annotation));
+            class MockDatabaseService extends DatabaseServiceNoop {
+                public deleteSourceMetadata(): Promise<void> {
+                    return Promise.resolve();
+                }
+            }
             const state = mergeState(initialState, {
+                interaction: {
+                    platformDependentServices: {
+                        databaseService: new MockDatabaseService(),
+                    },
+                },
                 metadata: {
                     annotations,
                     dataSources: mockDataSources,
@@ -998,6 +1010,7 @@ describe("Selection logics", () => {
                     payload: sortColumn,
                 })
             ).to.be.true;
+            expect(actions.includesMatch(changeSourceMetadata())).to.be.true;
             expect(actions.includesMatch(changeDataSources(mockDataSources))).to.be.true;
         });
     });