public cloud widget

packages/api/src/controllers/cloud.js

@@ -0,0 +1,15 @@
+const fs = require('fs-extra');
+const _ = require('lodash');
+const path = require('path');
+const { appdir } = require('../utility/directories');
+const socket = require('../utility/socket');
+const connections = require('./connections');
+const { getPublicCloudFiles } = require('../utility/cloudIntf');
+
+module.exports = {
+  publicFiles_meta: true,
+  async publicFiles() {
+    const res = await getPublicCloudFiles();
+    return res;
+  },
+};

packages/api/src/main.js

@@ -27,6 +27,7 @@ const plugins = require('./controllers/plugins');
 const files = require('./controllers/files');
 const scheduler = require('./controllers/scheduler');
 const queryHistory = require('./controllers/queryHistory');
+const cloud = require('./controllers/cloud');
 const onFinished = require('on-finished');
 const processArgs = require('./utility/processArgs');
 
@@ -223,6 +224,7 @@ function useAllControllers(app, electron) {
   useController(app, electron, '/query-history', queryHistory);
   useController(app, electron, '/apps', apps);
   useController(app, electron, '/auth', auth);
+  useController(app, electron, '/cloud', cloud);
 }
 
 function setElectronSender(electronSender) {

packages/api/src/utility/authProxy.js

@@ -36,11 +36,13 @@ async function callRefactorSqlQueryApi(query, task, structure, dialect) {
   return null;
 }
 
-function getExternalParamsWithLicense() {
+function getExternalParamsWithLicense(isPost = false) {
   return {
-    headers: {
+    headers: isPost
-      'Content-Type': 'application/json',
+      ? {
-    },
+          'Content-Type': 'application/json',
+        }
+      : {},
   };
 }
 

packages/api/src/utility/cloudIntf.js

@@ -8,8 +8,10 @@ const { datadir } = require('./directories');
 const platformInfo = require('./platformInfo');
 const connections = require('../controllers/connections');
 const { isProApp } = require('./checkLicense');
+const socket = require('./socket');
 
 const logger = getLogger('cloudIntf');
+
 let cloudFiles = null;
 
 const DBGATE_IDENTITY_URL = process.env.LOCAL_DBGATE_IDENTITY
@@ -30,7 +32,7 @@ async function createDbGateIdentitySession(client) {
     {
       client,
     },
-    getExternalParamsWithLicense()
+    getExternalParamsWithLicense(true)
   );
   return {
     sid: resp.data.sid,
@@ -49,7 +51,7 @@ function startCloudTokenChecking(sid, callback) {
     try {
       const resp = await axios.default.get(
         `${DBGATE_IDENTITY_URL}/api/get-token/${sid}`,
-        getExternalParamsWithLicense()
+        getExternalParamsWithLicense(false)
       );
 
       if (resp.data.status == 'ok') {
@@ -110,52 +112,58 @@ async function collectCloudFilesSearchTags() {
 async function updateCloudFiles() {
   let lastCloudFilesTags;
   try {
-    const fileContent = await fs.readFile(path.join(datadir(), 'cloud-files-tags.json'), 'utf-8');
+    lastCloudFilesTags = await fs.readFile(path.join(datadir(), 'cloud-files-tags.txt'), 'utf-8');
-    cloudFiles = JSON.parse(fileContent);
   } catch (err) {
-    lastCloudFilesTags = [];
+    lastCloudFilesTags = '';
   }
 
+  const tags = (await collectCloudFilesSearchTags()).join(',');
   let lastCheckedTm = 0;
-  if (_.isEqual(cloudFiles, lastCloudFilesTags) && cloudFiles.length > 0) {
+  if (tags == lastCloudFilesTags && cloudFiles.length > 0) {
-    lastCheckedTm = _.max(cloudFiles.map(x => x.modifiedTm));
+    lastCheckedTm = _.max(cloudFiles.map(x => parseInt(x.modifiedTm)));
   }
-  const tags = await collectCloudFilesSearchTags();
 
-  const resp = await axios.default.post(
+  logger.info({ tags, lastCheckedTm }, 'Downloading cloud files');
-    `${DBGATE_CLOUD_URL}/public-cloud-updates`,
+
-    {
+  const resp = await axios.default.get(
-      lastCheckedTm,
+    `${DBGATE_CLOUD_URL}/public-cloud-updates?lastCheckedTm=${lastCheckedTm}&tags=${tags}`,
-      tags,
+    getExternalParamsWithLicense(false)
-    },
-    getExternalParamsWithLicense()
   );
 
+  logger.info(`Downloaded ${resp.data.length} cloud files`);
+
   const filesByPath = _.keyBy(cloudFiles, 'path');
-  for(const file of resp.data) {
+  for (const file of resp.data) {
     filesByPath[file.path] = file;
   }
 
   cloudFiles = Object.values(filesByPath);
 
-  await fs.writeFile(
+  await fs.writeFile(path.join(datadir(), 'cloud-files.jsonl'), cloudFiles.map(x => JSON.stringify(x)).join('\n'));
-    path.join(datadir(), 'cloud-files.jsonl'),
+  await fs.writeFile(path.join(datadir(), 'cloud-files-tags.txt'), tags);
-    cloudFiles.map(x => JSON.stringify(x)).join('\n')
-  );
 
-  await fs.writeFile(
+  socket.emitChanged(`public-cloud-changed`);
-    path.join(datadir(), 'cloud-files-tags.json'),
-    JSON.stringify(tags)
-  );
 }
 
 async function startCloudFiles() {
   await loadCloudFiles();
-  await updateCloudFiles();
+  try {
+    await updateCloudFiles();
+  } catch (err) {
+    logger.error(extractErrorLogData(err), 'Error updating cloud files');
+  }
+}
+
+async function getPublicCloudFiles() {
+  if (!loadCloudFiles) {
+    await loadCloudFiles();
+  }
+  return cloudFiles;
 }
 
 module.exports = {
   createDbGateIdentitySession,
   startCloudTokenChecking,
   startCloudFiles,
+  getPublicCloudFiles,
 };

packages/web/src/appobj/CloudFileAppObject.svelte

@@ -0,0 +1,29 @@
+<script lang="ts" context="module">
+  import AppObjectCore from './AppObjectCore.svelte';
+
+  export const extractKey = data => data.path;
+</script>
+
+<script lang="ts">
+  import openNewTab from '../utility/openNewTab';
+  import { copyTextToClipboard } from '../utility/clipboard';
+  import { showModal } from '../modals/modalTools';
+  import ConfirmModal from '../modals/ConfirmModal.svelte';
+  import getElectron from '../utility/getElectron';
+  import FavoriteModal from '../modals/FavoriteModal.svelte';
+  import { apiCall } from '../utility/api';
+
+  export let data;
+
+  function createMenu() {
+    return [];
+    //   return [
+    //     { text: 'Delete', onClick: handleDelete },
+    //     { text: 'Edit', onClick: editFavorite },
+    //     { text: 'Edit JSON definition', onClick: editFavoriteJson },
+    //     !electron && data.urlPath && { text: 'Copy link', onClick: copyLink },
+    //   ];
+  }
+</script>
+
+<AppObjectCore {...$$restProps} {data} icon={'img sql-file'} title={data.title} menu={createMenu} />

packages/web/src/icons/FontIcon.svelte

@@ -40,6 +40,8 @@
     'icon invisible-box': 'mdi mdi-minus-box-outline icon-invisible',
     'icon cloud-upload': 'mdi mdi-cloud-upload',
     'icon cloud': 'mdi mdi-cloud',
+    'icon cloud-public': 'mdi mdi-cloud-search',
+    'icon cloud-logged': 'mdi mdi-cloud-key',
     'icon import': 'mdi mdi-application-import',
     'icon export': 'mdi mdi-application-export',
     'icon new-connection': 'mdi mdi-database-plus',

packages/web/src/utility/metadataLoaders.ts

@@ -166,6 +166,12 @@ const authTypesLoader = ({ engine }) => ({
   errorValue: null,
 });
 
+const publicCloudFilesLoader = () => ({
+  url: 'cloud/public-files',
+  params: {},
+  reloadTrigger: { key: `public-cloud-changed` },
+});
+
 async function getCore(loader, args) {
   const { url, params, reloadTrigger, transform, onLoaded, errorValue } = loader(args);
   const key = stableStringify({ url, ...params });
@@ -456,3 +462,10 @@ export function getSchemaList(args) {
 export function useSchemaList(args) {
   return useCore(schemaListLoader, args);
 }
+
+export function getPublicCloudFiles(args) {
+  return getCore(publicCloudFilesLoader, args);
+}
+export function usePublicCloudFiles(args = {}) {
+  return useCore(publicCloudFilesLoader, args);
+}

packages/web/src/widgets/CloudItemsWidget.svelte

@@ -0,0 +1,25 @@
+<script lang="ts">
+  import SavedFilesList from './SavedFilesList.svelte';
+
+  import WidgetColumnBar from './WidgetColumnBar.svelte';
+  import WidgetColumnBarItem from './WidgetColumnBarItem.svelte';
+
+  import AppObjectList from '../appobj/AppObjectList.svelte';
+  import * as cloudFileAppObject from '../appobj/CloudFileAppObject.svelte';
+  import { usePublicCloudFiles } from '../utility/metadataLoaders';
+  import { _t } from '../translations';
+
+  import WidgetsInnerContainer from './WidgetsInnerContainer.svelte';
+
+  $: publicFiles = usePublicCloudFiles();
+</script>
+
+<WidgetColumnBar>
+  <WidgetColumnBarItem title="Public cloud" name="cloud" height="70%" storageName="publicCloudItems">
+    <WidgetsInnerContainer>
+      <AppObjectList list={$publicFiles || []} module={cloudFileAppObject} groupFunc={data => data.folder} />
+    </WidgetsInnerContainer>
+  </WidgetColumnBarItem>
+
+  <WidgetColumnBarItem title="Favorites" name="favorites" storageName="favoritesWidget"></WidgetColumnBarItem>
+</WidgetColumnBar>

packages/web/src/widgets/WidgetContainer.svelte

@@ -9,6 +9,7 @@
   import AppWidget from './AppWidget.svelte';
   import AdminMenuWidget from './AdminMenuWidget.svelte';
   import AdminPremiumPromoWidget from './AdminPremiumPromoWidget.svelte';
+  import CloudItemsWidget from './CloudItemsWidget.svelte';
 </script>
 
 <DatabaseWidget hidden={$visibleSelectedWidget != 'database'} />
@@ -37,3 +38,6 @@
 {#if $visibleSelectedWidget == 'premium'}
   <AdminPremiumPromoWidget />
 {/if}
+{#if $visibleSelectedWidget == 'cloud'}
+  <CloudItemsWidget />
+{/if}

packages/web/src/widgets/WidgetIconPanel.svelte

@@ -67,6 +67,8 @@
       name: 'cloud',
       title: 'DbGate Cloud',
       isCloud: true,
+      iconSignedIn: 'icon cloud-logged',
+      iconPublic: 'icon cloud-public',
     },
     {
       icon: 'icon premium',
@@ -143,8 +145,8 @@
   {/if}
   {#each widgets
     .filter(x => x && hasPermission(`widgets/${x.name}`))
-    .filter(x => !x.isCloud || $cloudSigninToken)
+    .filter(x => !x.isPremiumPromo || !isProApp())
-    .filter(x => !x.isPremiumPromo || !isProApp()) as item}
+    .map(x => (x.isCloud ? { ...x, icon: $cloudSigninToken ? x.iconSignedIn : x.iconPublic } : x)) as item}
     <div
       class="wrapper"
       class:selected={item.name == $visibleSelectedWidget}