show cloud content

packages/web/src/widgets/CloudItemsWidget.svelte

@@ -5,7 +5,8 @@
   import WidgetColumnBarItem from './WidgetColumnBarItem.svelte';
 
   import AppObjectList from '../appobj/AppObjectList.svelte';
-  import * as cloudFileAppObject from '../appobj/CloudFileAppObject.svelte';
+  import * as publicCloudFileAppObject from '../appobj/PublicCloudFileAppObject.svelte';
+  import * as cloudContentAppObject from '../appobj/CloudContentAppObject.svelte';
   import { useCloudContentList, usePublicCloudFiles } from '../utility/metadataLoaders';
   import { _t } from '../translations';
 
@@ -26,7 +27,7 @@
   $: cloudContentList = useCloudContentList();
 
   $: emptyCloudContent = ($cloudContentList || []).filter(x => !x.items?.length).map(x => x.folid);
-  $: cloudContentFlat = ($cloudContentList || []).flatMap(fld => fld.items ?? []).map(x => x.folid);
+  $: cloudContentFlat = ($cloudContentList || []).flatMap(fld => fld.items ?? []);
   $: contentGroupTitleMap = _.fromPairs(($cloudContentList || []).map(x => [x.folid, x.name]));
 
   async function handleRefreshPublic() {
@@ -61,7 +62,7 @@
 
       <AppObjectList
         list={cloudContentFlat || []}
-        module={cloudFileAppObject}
+        module={cloudContentAppObject}
         emptyGroupNames={emptyCloudContent}
         groupFunc={data => data.folid}
         mapGroupTitle={folid => contentGroupTitleMap[folid]}
@@ -86,7 +87,7 @@
 
       <AppObjectList
         list={$publicFiles || []}
-        module={cloudFileAppObject}
+        module={publicCloudFileAppObject}
         groupFunc={data => data.folder || undefined}
         filter={publicFilter}
       />

packages/web/src/widgets/ConnectionList.svelte

@@ -351,6 +351,7 @@
       isExpandable={data => $openedConnections.includes(data._id) && !data.singleDatabase}
       {filter}
       passProps={{
+        ...passProps,
         connectionColorFactory: $connectionColorFactory,
         showPinnedInsteadOfUnpin: true,
         searchSettings: $connectionAppObjectSearchSettings,

packages/web/src/widgets/DatabaseWidget.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { findEngineDriver } from 'dbgate-tools';
   import { currentDatabase, extensions, pinnedDatabases, pinnedTables } from '../stores';
-  import { useConfig, useConnectionInfo } from '../utility/metadataLoaders';
+  import { useCloudContentList, useConfig, useConnectionInfo } from '../utility/metadataLoaders';
 
   import ConnectionList from './ConnectionList.svelte';
   import PinnedObjectsList from './PinnedObjectsList.svelte';
@@ -26,6 +26,7 @@
   $: config = useConfig();
   $: singleDatabase = $currentDatabase?.connection?.singleDatabase;
   $: database = $currentDatabase?.name;
+  $: cloudContentList = useCloudContentList();
 </script>
 
 <WidgetColumnBar {hidden}>
@@ -45,7 +46,12 @@
       height="35%"
       storageName="connectionsWidget"
     >
-      <ConnectionList passProps={{ onFocusSqlObjectList: () => domSqlObjectList.focus() }} />
+      <ConnectionList
+        passProps={{
+          onFocusSqlObjectList: () => domSqlObjectList.focus(),
+          cloudContentList: $cloudContentList,
+        }}
+      />
     </WidgetColumnBarItem>
   {/if}
   <WidgetColumnBarItem