refactor: review comments

packages/nc-gui/components/account/Setup.vue

@@ -1,11 +1,9 @@
 <script setup lang="ts">
-import { useAccountSetupStoreOrThrow } from '../../composables/useAccountSetupStore'
-
 const { t } = useI18n()
 
 const { loadSetupApps, emailConfigured, storageConfigured, listModalDlg } = useAccountSetupStoreOrThrow()
 
-const { appInfo } = useGlobal()
+// const { appInfo } = useGlobal()
 
 const openedCategory = ref<string | null>(null)
 

packages/nc-gui/components/dashboard/settings/AppStore.vue

@@ -121,7 +121,8 @@ onMounted(async () => {
         </template>
         <template #description>
           <span class="text-gray-500 ml-9">
-            App store will soon be removed and all functionalities will be moved to integrations
+            App store will soon be removed. Email & Storage plugins are now available in Accounts/Setup page. Rest of the plugins
+            here will be moved to integrations.
           </span>
         </template>
       </a-alert>

packages/nc-gui/components/smartsheet/details/Api.vue

@@ -86,7 +86,7 @@ const snippet = computed(
       method: 'GET',
       headers: [
         {
-          name: '' + '' + '' + '' + '' + '' + '' + 'xc-token',
+          name: 'xc-token',
           value: `CREATE_YOUR_API_TOKEN_FROM ${location.origin + location.pathname}#/account/tokens`,
           comment: 'API token',
         },
@@ -109,7 +109,7 @@ const activeLang = computed(() => langs.find((lang) => lang.name === selectedLan
 const code = computed(() => {
   if (activeLang.value?.name === 'NocoDB-SDK') {
     return `${selectedClient.value === 'node' ? 'const { Api } = require("nocodb-sdk");' : 'import { Api } from "nocodb-sdk";'}
-  
+
 const api = new Api({
     baseURL: "${(appInfo.value && appInfo.value.ncSiteUrl) || '/'}",
     headers: {

packages/nc-gui/composables/useAccountSetupStore.ts

@@ -65,6 +65,7 @@ const [useProvideAccountSetupStore, useAccountSetupStore] = createInjectionState
       message.success(activePlugin.value?.formDetails.msgOnInstall || t('msg.success.pluginSettingsSaved'))
       // load all apps again to update the pending status
       loadSetupApps().catch(console.error)
+      navigateTo('/account/setup')
     } catch (e: any) {
       message.error(await extractSdkResponseErrorMsg(e))
     } finally {

packages/nc-gui/lang/en.json

@@ -1799,7 +1799,7 @@
       "columnDuplicated": "Field duplicated successfully",
       "rowDuplicatedWithoutSavedYet": "Record duplicated (not saved)",
       "updatedUIACL": "Updated UI ACL for tables successfully",
-      "pluginUninstalled": "Plugin uninstalled successfully",
+      "pluginUninstalled": "Configuration reset successfully",
       "pluginSettingsSaved": "Plugin settings saved successfully",
       "pluginTested": "Successfully tested plugin settings",
       "tableRenamed": "Table renamed successfully",

packages/nc-gui/pages/account/index.vue

@@ -155,15 +155,15 @@ const isPending = computed(() => !emailConfigured.value || !storageConfigured.va
 
                   <div class="select-none text-sm">{{ $t('title.appStore') }}</div>
                   <span class="flex-grow" />
-                  <NcTooltip v-if="isPending">
+                  <NcToolti>
                     <template #title>
                       <span>
-                        In upcoming releases, the App Store feature will be deprecated and transitioned to the Integrations
-                        section.
+                        App store will soon be removed. Email & Storage plugins are now available in Accounts/Setup page. Rest of
+                        the plugins here will be moved to integrations.
                       </span>
                     </template>
                     <GeneralIcon icon="ncAlertCircle" class="text-orange-500 w-4 h-4 nc-pending" />
-                  </NcTooltip>
+                  </NcToolti>
                 </div>
               </NcMenuItem>
               <a-sub-menu key="users" class="!bg-white !my-0">

packages/nocodb/src/plugins/backblaze/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: BackblazePlugin,
   title: 'Backblaze',
-  version: '0.0.4',
+  version: '0.0.5',
   logo: 'plugins/backblaze.jpeg',
   tags: 'Storage',
   description:
@@ -66,7 +66,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and attachment will be stored in Backblaze B2',
+      'Successfully configured! Attachments will now be stored in Backblaze B2.',
     msgOnUninstall: '',
   },
   category: 'Storage',

packages/nocodb/src/plugins/gcs/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: GcsPlugin,
   title: 'GCS',
-  version: '0.0.2',
+  version: '0.0.3',
   logo: 'plugins/gcs.png',
   description:
     'Google Cloud Storage is a RESTful online file storage web service for storing and accessing data on Google Cloud Platform infrastructure.',
@@ -61,7 +61,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and attachment will be stored in Google Cloud Storage',
+      'Successfully configured! Attachments will now be stored in Google Cloud Storage.',
     msgOnUninstall: '',
   },
 };

packages/nocodb/src/plugins/linode/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: LinodeObjectStoragePlugin,
   title: 'Linode',
-  version: '0.0.3',
+  version: '0.0.4',
   logo: 'plugins/linode.svg',
   tags: 'Storage',
   description:
@@ -66,7 +66,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and attachment will be stored in Linode Object Storage',
+      'Successfully configured! Attachments will now be stored in Linode Object Storage.',
     msgOnUninstall: '',
   },
   category: 'Storage',

packages/nocodb/src/plugins/mailerSend/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: MailerSendPlugin,
   title: 'MailerSend',
-  version: '0.0.1',
+  version: '0.0.2',
   logo: 'plugins/mailersend.svg',
   // icon: 'mdi-email-outline',
   description: 'MailerSend email client',
@@ -52,7 +52,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and email notification will use MailerSend configuration',
+      'Successfully configured! Email notifications are now set up using MailerSend.',
     msgOnUninstall: '',
   },
 };

packages/nocodb/src/plugins/mino/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: S3Plugin,
   title: 'Minio',
-  version: '0.0.3',
+  version: '0.0.4',
   logo: 'plugins/minio.png',
   description:
     'MinIO is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service.',
@@ -81,7 +81,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and attachment will be stored in Minio',
+      'Successfully configured! Attachments will now be stored in Minio.',
     msgOnUninstall: '',
   },
 };

packages/nocodb/src/plugins/ovhCloud/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: OvhCloud,
   title: 'Ovh',
-  version: '0.0.3',
+  version: '0.0.4',
   logo: 'plugins/ovhCloud.png',
   tags: 'Storage',
   description:
@@ -66,7 +66,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and attachment will be stored in OvhCloud Object Storage',
+      'Successfully configured! Attachments will now be stored in OvhCloud Object Storage.',
     msgOnUninstall: '',
   },
   category: 'Storage',

packages/nocodb/src/plugins/r2/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: R2Plugin,
   title: 'Cloudflare R2',
-  version: '0.0.2',
+  version: '0.0.3',
   logo: 'plugins/r2.png',
   description:
     'Cloudflare R2 is an S3-compatible, zero egress-fee, globally distributed object storage.',
@@ -59,7 +59,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and attachment will be stored in Cloudflare R2 Storage',
+      'Successfully configured! Attachments will now be stored in Cloudflare R2 Storage.',
     msgOnUninstall: '',
   },
   category: 'Storage',

packages/nocodb/src/plugins/s3/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: S3Plugin,
   title: 'S3',
-  version: '0.0.5',
+  version: '0.0.6',
   logo: 'plugins/s3.png',
   description:
     'Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.',
@@ -79,7 +79,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and attachment will be stored in AWS S3',
+      'Successfully configured! Attachments will now be stored in AWS S3.',
     msgOnUninstall: '',
   },
   category: PluginCategory.STORAGE,

packages/nocodb/src/plugins/scaleway/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: ScalewayObjectStoragePlugin,
   title: 'Scaleway',
-  version: '0.0.3',
+  version: '0.0.4',
   logo: 'plugins/scaleway.png',
   tags: 'Storage',
   description:
@@ -65,7 +65,8 @@ const config: XcPluginConfig = {
         type: XcType.Button,
       },
     ],
-    msgOnInstall: 'Successfully installed Scaleway Object Storage',
+    msgOnInstall:
+      'Successfully configured! Attachments will now be stored in Scaleway Object Storage.',
     msgOnUninstall: '',
   },
   category: 'Storage',

packages/nocodb/src/plugins/ses/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: SESPlugin,
   title: 'SES',
-  version: '0.0.1',
+  version: '0.0.2',
   logo: 'plugins/aws.png',
   description:
     'Amazon Simple Email Service (SES) is a cost-effective, flexible, and scalable email service that enables developers to send mail from within any application.',
@@ -61,7 +61,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and email notification will use Amazon SES',
+      'Successfully configured! Email notifications are now set up using Amazon SES.',
     msgOnUninstall: '',
   },
 };

packages/nocodb/src/plugins/smtp/index.ts

@@ -23,7 +23,7 @@ const config: XcPluginConfig = {
         type: XcType.SingleLineText,
         required: true,
         help_text:
-          'Enter the email address you want to appear as the sender of the emails sent through this SMTP configuration',
+          'Successfully configured! Email notifications are now set up using SMTP.',
       },
       {
         key: 'host',

packages/nocodb/src/plugins/spaces/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: SpacesPlugin,
   title: 'Spaces',
-  version: '0.0.1',
+  version: '0.0.2',
   logo: 'plugins/spaces.png',
   description:
     'Store & deliver vast amounts of content with a simple architecture.',
@@ -68,7 +68,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and attachment will be stored in DigitalOcean Spaces',
+      'Successfully configured! Attachments will now be stored in DigitalOcean Spaces.',
     msgOnUninstall: '',
   },
 };

packages/nocodb/src/plugins/upcloud/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from '~/types/nc-plugin';
 const config: XcPluginConfig = {
   builder: UpCloudPlugin,
   title: 'UpCloud',
-  version: '0.0.3',
+  version: '0.0.4',
   logo: 'plugins/upcloud.png',
   description:
     'The perfect home for your data. Thanks to the S3-compatible programmable interface,\n' +
@@ -67,7 +67,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and attachment will be stored in UpCloud Object Storage',
+      'Successfully configured! Attachments will now be stored in UpCloud Object Storage.',
     msgOnUninstall: '',
   },
   category: 'Storage',

packages/nocodb/src/plugins/vultr/index.ts

@@ -66,7 +66,7 @@ const config: XcPluginConfig = {
       },
     ],
     msgOnInstall:
-      'Successfully installed and attachment will be stored in Vultr Object Storage',
+      'Successfully configured! Attachments will now be stored in Vultr Object Storage.',
     msgOnUninstall: '',
   },
   category: 'Storage',