Merge pull request #2833 from nocodb/chore/integrated-app-store-with-settings-modal

chore/integrated-appstore-to-settings-modal

packages/nc-gui-v2/components.d.ts

@@ -39,16 +39,18 @@ declare module '@vue/runtime-core' {
     ASpace: typeof import('ant-design-vue/es')['Space']
     ASpin: typeof import('ant-design-vue/es')['Spin']
     ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
+    ASwitch: typeof import('ant-design-vue/es')['Switch']
     ATable: typeof import('ant-design-vue/es')['Table']
     ATableColumn: typeof import('ant-design-vue/es')['TableColumn']
     ATableColumnGroup: typeof import('ant-design-vue/es')['TableColumnGroup']
     ATabPane: typeof import('ant-design-vue/es')['TabPane']
     ATabs: typeof import('ant-design-vue/es')['Tabs']
     ATag: typeof import('ant-design-vue/es')['Tag']
+    ATextarea: typeof import('ant-design-vue/es')['Textarea']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
     ATypographyTitle: typeof import('ant-design-vue/es')['TypographyTitle']
     AUploadDragger: typeof import('ant-design-vue/es')['UploadDragger']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
-}
+}

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

@@ -91,7 +91,7 @@ onMounted(async () => {
     </div>
   </a-modal>
 
-  <div class="h-full overflow-y-scroll grid grid-cols-2 gap-x-2 gap-y-4">
+  <div class="grid grid-cols-2 gap-x-2 gap-y-4 mt-4">
     <a-card
       v-for="(app, i) in apps"
       :key="i"

packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { FunctionalComponent, SVGAttributes } from 'vue'
 import AuditTab from './AuditTab.vue'
+import AppStore from './AppStore.vue'
 import StoreFrontOutline from '~icons/mdi/storefront-outline'
 import TeamFillIcon from '~icons/ri/team-fill'
 import MultipleTableIcon from '~icons/mdi/table-multiple'
@@ -50,7 +51,7 @@ const tabsInfo: TabGroup = {
     subTabs: {
       new: {
         title: 'Apps',
-        body: () => AuditTab,
+        body: () => AppStore,
       },
     },
   },

packages/nc-gui-v2/components/dashboard/settings/appStore/AppInstall.vue

@@ -161,10 +161,10 @@ onMounted(async () => {
         <!-- Form with multiple entry -->
         <div v-if="plugin.formDetails.array" class="flex flex-row justify-center">
           <table>
-            <thead class="mb-2">
+            <thead>
               <tr>
                 <th v-for="(columnData, columnIndex) in plugin.formDetails.items" :key="columnIndex">
-                  <div class="text-center font-normal">
+                  <div class="text-center font-normal mb-2">
                     {{ columnData.label }} <span v-if="columnData.required" class="text-red-600">*</span>
                   </div>
                 </th>

packages/nc-gui-v2/package-lock.json

@@ -22,6 +22,7 @@
       "devDependencies": {
         "@antfu/eslint-config": "^0.25.2",
         "@iconify-json/clarity": "^1.1.4",
+        "@iconify-json/ic": "^1.1.7",
         "@iconify-json/material-symbols": "^1.1.8",
         "@iconify-json/mdi": "^1.1.25",
         "@iconify-json/ri": "^1.1.3",
@@ -969,6 +970,15 @@
         "@iconify/types": "*"
       }
     },
+    "node_modules/@iconify-json/ic": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@iconify-json/ic/-/ic-1.1.7.tgz",
+      "integrity": "sha512-CYwkhja02SZoevezNHSqM7d1lpsRJxKt9fzvn3MpRxI8s2v3LNmhGiD/bTq3uFgqQMRPp+OnD+OOjHrMo7ah1g==",
+      "dev": true,
+      "dependencies": {
+        "@iconify/types": "*"
+      }
+    },
     "node_modules/@iconify-json/material-symbols": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/@iconify-json/material-symbols/-/material-symbols-1.1.8.tgz",
@@ -14911,6 +14921,15 @@
         "@iconify/types": "*"
       }
     },
+    "@iconify-json/ic": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@iconify-json/ic/-/ic-1.1.7.tgz",
+      "integrity": "sha512-CYwkhja02SZoevezNHSqM7d1lpsRJxKt9fzvn3MpRxI8s2v3LNmhGiD/bTq3uFgqQMRPp+OnD+OOjHrMo7ah1g==",
+      "dev": true,
+      "requires": {
+        "@iconify/types": "*"
+      }
+    },
     "@iconify-json/material-symbols": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/@iconify-json/material-symbols/-/material-symbols-1.1.8.tgz",