CB-4681 fix: review

dbeaver · Feb 27, 2024 · 4ad39e7 · 4ad39e7
1 parent 6b023a7
commit 4ad39e7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/...plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/IResultSetDataContentAction.ts b/...plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/IResultSetDataContentAction.ts
@@ -12,7 +12,6 @@ export interface IResultSetDataContentAction {
   isBlobTruncated: (element: IResultSetElementKey) => boolean;
   isTextTruncated: (element: IResultSetElementKey) => boolean;
   isDownloadable: (element: IResultSetElementKey) => boolean;
-  getFileDataUrl: (element: IResultSetElementKey) => Promise<string>;
   resolveFileDataUrl: (element: IResultSetElementKey) => Promise<Blob>;
   retrieveBlobFromCache: (element: IResultSetElementKey) => Blob | undefined;
   downloadFileData: (element: IResultSetElementKey) => Promise<void>;

diff --git a/.../plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataContentAction.ts b/.../plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataContentAction.ts
@@ -139,26 +139,6 @@ export class ResultSetDataContentAction extends DatabaseDataAction<any, IDatabas
     return fullText;
   }
 
-  async getFileDataUrl(element: IResultSetElementKey) {
-    const column = this.data.getColumn(element.column);
-    const row = this.data.getRowValue(element.row);
-
-    if (!row || !column) {
-      throw new Error('Failed to get value metadata information');
-    }
-
-    const url = await this.source.runTask(async () => {
-      try {
-        this.updateCache(element, { loading: true });
-        return await this.loadDataURL(this.result, column.position, row);
-      } finally {
-        this.updateCache(element, { loading: false });
-      }
-    });
-
-    return url;
-  }
-
   async resolveFileDataUrl(element: IResultSetElementKey) {
     const cachedUrl = this.retrieveBlobFromCache(element);
 
@@ -187,6 +167,26 @@ export class ResultSetDataContentAction extends DatabaseDataAction<any, IDatabas
     this.clearCache();
   }
 
+  private async getFileDataUrl(element: IResultSetElementKey) {
+    const column = this.data.getColumn(element.column);
+    const row = this.data.getRowValue(element.row);
+
+    if (!row || !column) {
+      throw new Error('Failed to get value metadata information');
+    }
+
+    const url = await this.source.runTask(async () => {
+      try {
+        this.updateCache(element, { loading: true });
+        return await this.loadDataURL(this.result, column.position, row);
+      } finally {
+        this.updateCache(element, { loading: false });
+      }
+    });
+
+    return url;
+  }
+
   private async loadFileFullText(result: IDatabaseResultSet, columnIndex: number, row: IResultSetValue[]) {
     if (!result.id) {
       throw new Error("Result's id must be provided");

diff --git a/...kages/plugin-data-viewer/src/ValuePanelPresentation/ImageValue/ImageValuePresentation.tsx b/...kages/plugin-data-viewer/src/ValuePanelPresentation/ImageValue/ImageValuePresentation.tsx
@@ -93,6 +93,9 @@ export const ImageValuePresentation: TabContainerPanelComponent<IDataValuePanelP
           }
 
           if (this.cacheBlob) {
+            // TODO: this object must be released with URL.revokeObjectURL()
+            // it also can be released by the browser after some time
+            // what leads to image not accessible
             return URL.createObjectURL(this.cacheBlob);
           }