cloud content fixes

packages/api/src/controllers/cloud.js

@@ -5,6 +5,7 @@ const {
   callCloudApiGet,
   callCloudApiPost,
   getCloudFolderEncryptor,
+  getCloudContent,
 } = require('../utility/cloudIntf');
 const connections = require('./connections');
 const socket = require('../utility/socket');
@@ -48,8 +49,8 @@ module.exports = {
 
   getContent_meta: true,
   async getContent({ folid, cntid }) {
-    const { content, name, type } = await callCloudApiGet(`content/${folid}/${cntid}`);
+    const resp = await getCloudContent(folid, cntid);
-    return { content, name, type };
+    return resp;
   },
 
   putContent_meta: true,

packages/api/src/controllers/connections.js

@@ -425,12 +425,9 @@ module.exports = {
 
     const cloudMatch = conid.match(/^cloud\:\/\/(.+)\/(.+)$/);
     if (cloudMatch) {
-      const cloud = require('./cloud');
+      const { loadCachedCloudConnection } = require('../utility/cloudIntf');
-      const { content } = await cloud.getContent({ folid: cloudMatch[1], cntid: cloudMatch[2] });
+      const conn = await loadCachedCloudConnection(cloudMatch[1], cloudMatch[2]);
-      return {
+      return conn;
-        ...JSON.parse(content),
-        _id: conid,
-      };
     }
 
     const storage = require('./storage');

packages/api/src/utility/cloudIntf.js

@@ -248,6 +248,24 @@ async function getCloudFolderEncryptor(folid) {
   return simpleEncryptor.createEncryptor(encryptionKey);
 }
 
+async function getCloudContent(folid, cntid) {
+  const { content, name, type } = await callCloudApiGet(`content/${folid}/${cntid}`);
+  return { content, name, type };
+}
+
+const cloudConnectionCache = {};
+async function loadCachedCloudConnection(folid, cntid) {
+  const cacheKey = `${folid}|${cntid}`;
+  if (!cloudConnectionCache[cacheKey]) {
+    const { content } = await getCloudContent(folid, cntid);
+    cloudConnectionCache[cacheKey] = {
+      ...JSON.parse(content),
+      _id: `cloud://${folid}/${cntid}`,
+    };
+  }
+  return cloudConnectionCache[cacheKey];
+}
+
 module.exports = {
   createDbGateIdentitySession,
   startCloudTokenChecking,
@@ -258,4 +276,6 @@ module.exports = {
   callCloudApiGet,
   callCloudApiPost,
   getCloudFolderEncryptor,
+  getCloudContent,
+  loadCachedCloudConnection,
 };

packages/web/src/widgets/DatabaseWidgetDetailContent.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { findEngineDriver } from 'dbgate-tools';
   import { currentDatabase, extensions, pinnedDatabases, pinnedTables } from '../stores';
-  import { useCloudContentList, useConfig, useConnectionInfo } from '../utility/metadataLoaders';
+  import { useConnectionInfo } from '../utility/metadataLoaders';
 
   import PinnedObjectsList from './PinnedObjectsList.svelte';
   import ErrorInfo from '../elements/ErrorInfo.svelte';

packages/web/src/widgets/PrivateCloudWidget.svelte

@@ -47,7 +47,7 @@
     });
   $: contentGroupTitleMap = _.fromPairs(($cloudContentList || []).map(x => [x.folid, x.name]));
 
-  $: console.log('cloudContentFlat', cloudContentFlat);
+  // $: console.log('cloudContentFlat', cloudContentFlat);
 
   async function handleRefreshContent() {
     await apiCall('cloud/refresh-content');
@@ -64,7 +64,7 @@
   >
     <WidgetsInnerContainer>
       <SearchBoxWrapper>
-        <SearchInput placeholder="Search cloud items" bind:value={cloudFilter} />
+        <SearchInput placeholder="Search cloud connections and files" bind:value={cloudFilter} />
         <CloseSearchButton bind:filter={cloudFilter} />
         <InlineButton
           on:click={handleRefreshContent}

packages/web/src/widgets/SqlObjectList.svelte

@@ -163,6 +163,8 @@
     ($focusedConnectionOrDatabase.conid != conid ||
       ($focusedConnectionOrDatabase?.database &&
         $focusedConnectionOrDatabase?.database != extractDbNameFromComposite(database)));
+
+  // $: console.log('STATUS', $status);
 </script>
 
 {#if $status && $status.name == 'error'}