-
Version
{{ activeExtension.version }}
-
-
- Publisher
- {{ activeExtension.publisherName }}
-
-
Publisher Email
-
+
-
Publisher Website
-
@@ -138,7 +171,7 @@ const detailsBody = computed(() => {
diff --git a/packages/nc-gui/components/extensions/ExtensionMenu.vue b/packages/nc-gui/components/extensions/Extension/HeaderMenu.vue
similarity index 85%
rename from packages/nc-gui/components/extensions/ExtensionMenu.vue
rename to packages/nc-gui/components/extensions/Extension/HeaderMenu.vue
index 42cb671d66..da47a8557e 100644
--- a/packages/nc-gui/components/extensions/ExtensionMenu.vue
+++ b/packages/nc-gui/components/extensions/Extension/HeaderMenu.vue
@@ -1,17 +1,19 @@
-
+
-
+
diff --git a/packages/nc-gui/components/extensions/Extension/Wrapper.vue b/packages/nc-gui/components/extensions/Extension/Wrapper.vue
new file mode 100644
index 0000000000..f9eb3ed8af
--- /dev/null
+++ b/packages/nc-gui/components/extensions/Extension/Wrapper.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
diff --git a/packages/nc-gui/components/extensions/Market.vue b/packages/nc-gui/components/extensions/Market.vue
index 4a7751f84e..0e33ea2896 100644
--- a/packages/nc-gui/components/extensions/Market.vue
+++ b/packages/nc-gui/components/extensions/Market.vue
@@ -1,23 +1,60 @@
@@ -37,27 +81,56 @@ const onAddExtension = (ext: any) => {
v-model:visible="vModel"
:class="{ active: vModel }"
:footer="null"
- :width="1154"
- size="medium"
+ size="lg"
wrap-class-name="nc-modal-extension-market"
>
+
+
+
+
+
+
+
-
-
-
-
-
- Extensions Marketplace
-
-
-
+
+
+
+ Marketplace
+
+
+
+
+ {{ $t('msg.toast.futureRelease') }}
+
+
+
+
+
+
@@ -65,50 +138,69 @@ const onAddExtension = (ext: any) => {
-
+
+
+
+
+
diff --git a/packages/nc-gui/extensions/json-exporter/manifest.json b/packages/nc-gui/extensions/json-exporter/manifest.json
index 24ae238e65..0a9ea170fd 100644
--- a/packages/nc-gui/extensions/json-exporter/manifest.json
+++ b/packages/nc-gui/extensions/json-exporter/manifest.json
@@ -6,9 +6,17 @@
"entry": "json-exporter",
"version": "0.1",
"iconUrl": "json-exporter/assets/icon.png",
- "publisherName": "NocoDB",
- "publisherEmail": "contact@nocodb.com",
- "publisherUrl": "https://www.nocodb.com",
+ "publisher": {
+ "name": "NocoDB",
+ "email": "contact@nocodb.com",
+ "url": "https://www.nocodb.com",
+ "icon": {
+ "src": "json-exporter/assets/publisher-icon.svg",
+ "width": 24,
+ "height": 24
+ }
+ },
+ "links": [],
"disabled": true,
"config": {
"contentMinHeight": "190px"
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index c4b92f2114..d4d40e5a2e 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -287,7 +287,9 @@
"connections": "Connections",
"private": "Private",
"request": "Request",
- "languages": "Languages"
+ "languages": "Languages",
+ "extension": "Extension",
+ "extensions": "Extensions"
},
"objects": {
"files": "files",
diff --git a/packages/nc-gui/store/bases.ts b/packages/nc-gui/store/bases.ts
index ccf5b45155..491314c9a5 100644
--- a/packages/nc-gui/store/bases.ts
+++ b/packages/nc-gui/store/bases.ts
@@ -59,7 +59,7 @@ export const useBases = defineStore('basesStore', () => {
const isProjectsLoading = ref(false)
async function getBaseUsers({ baseId, searchText, force = false }: { baseId: string; searchText?: string; force?: boolean }) {
- if(!baseId) return { users: [], totalRows: 0 }
+ if (!baseId) return { users: [], totalRows: 0 }
if (!force && basesUser.value.has(baseId)) {
const users = basesUser.value.get(baseId)
diff --git a/packages/nc-gui/utils/commonUtils.ts b/packages/nc-gui/utils/commonUtils.ts
new file mode 100644
index 0000000000..3566202fa0
--- /dev/null
+++ b/packages/nc-gui/utils/commonUtils.ts
@@ -0,0 +1,18 @@
+export const modalSizes = {
+ xs: {
+ width: 'min(calc(100vw - 32px), 448px)',
+ height: 'min(90vh, 448px)',
+ },
+ sm: {
+ width: 'min(calc(100vw - 32px), 640px)',
+ height: 'min(90vh, 424px)',
+ },
+ md: {
+ width: 'min(80vw, 900px)',
+ height: 'min(90vh, 540px)',
+ },
+ lg: {
+ width: 'min(80vw, 1280px)',
+ height: 'min(90vh, 864px)',
+ },
+}
diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts
index 48ce141181..50e6dc328f 100644
--- a/packages/nc-gui/utils/iconUtils.ts
+++ b/packages/nc-gui/utils/iconUtils.ts
@@ -196,6 +196,7 @@ import NcReddit from '~icons/nc-icons/reddit'
import NcTwitter from '~icons/nc-icons/twitter'
import NcFile from '~icons/nc-icons/file'
+import NcFileBig from '~icons/nc-icons/file-big'
import NcSettings from '~icons/nc-icons/settings'
import NcHelp from '~icons/nc-icons/help'
import NcAlertTriangle from '~icons/nc-icons/alert-triangle'
@@ -556,6 +557,11 @@ import NcCalendarViewIcon from '~icons/nc-icons/calendar'
import NcPuzzleSolid from '~icons/nc-icons/puzzle-solid'
import NcPuzzleOutline from '~icons/nc-icons/puzzle-outline'
+import NcInfoSolid from '~icons/nc-icons/info-solid'
+import NcPlaceholderIcon from '~icons/nc-icons/placeholder-icon'
+import NcSpanner from '~icons/nc-icons/spanner'
+import NcScript from '~icons/nc-icons/script'
+
// keep it for reference
// todo: remove it after all icons are migrated
/* export const iconMapOld = {
@@ -983,6 +989,7 @@ export const iconMap = {
ncReddit: NcReddit,
ncTwitter: NcTwitter,
file: NcFile,
+ fileBig: NcFileBig,
ncSettings: NcSettings,
ncHelp: NcHelp,
puzzle: MdiPuzzle,
@@ -1327,6 +1334,10 @@ export const iconMap = {
langC: NcLangC,
ncPuzzleSolid: NcPuzzleSolid,
ncPuzzleOutline: NcPuzzleOutline,
+ ncInfoSolid: NcInfoSolid,
+ ncPlaceholderIcon: NcPlaceholderIcon,
+ ncSpanner: NcSpanner,
+ ncScript: NcScript,
}
export const getMdiIcon = (type: string): any => {
diff --git a/packages/nc-gui/windi.config.ts b/packages/nc-gui/windi.config.ts
index bf8e3b6692..341342b209 100644
--- a/packages/nc-gui/windi.config.ts
+++ b/packages/nc-gui/windi.config.ts
@@ -17,7 +17,10 @@ const isEE = process.env.EE
export default defineConfig({
extract: {
- include: [isEE ? '../**/*.{vue,html,jsx,tsx,css,scss}' : '**/*.{vue,html,jsx,tsx,css,scss}'],
+ include: [
+ isEE ? '../**/*.{vue,html,jsx,tsx,css,scss}' : '**/*.{vue,html,jsx,tsx,css,scss}',
+ isEE ? '../extensions/**/*.md' : 'extensions/**/*.md',
+ ],
exclude: ['node_modules', '.git'],
},
+
@@ -120,20 +212,64 @@ const onAddExtension = (ext: any) => {
box-shadow: 0px 4px 8px -2px rgba(0, 0, 0, 0.08), 0px 2px 4px -2px rgba(0, 0, 0, 0.04);
}
}
+
+.tab {
+ @apply flex flex-row items-center gap-x-2;
+}
+
+:deep(.ant-tabs-nav) {
+ @apply !pl-0;
+}
+:deep(.ant-tabs-tab) {
+ @apply pt-2 pb-3;
+}
+:deep(.ant-tabs-content) {
+ @apply nc-content-max-w;
+}
+:deep(.ant-tabs-content-top) {
+ @apply !h-full;
+}
+.tab-info {
+ @apply flex pl-1.25 px-1.5 py-0.75 rounded-md text-xs;
+}
+.tab-title {
+ @apply flex flex-row items-center gap-x-2 py-[1px];
+}
+
+
diff --git a/packages/nc-gui/extensions/data-exporter/manifest.json b/packages/nc-gui/extensions/data-exporter/manifest.json
index 54f7363fa2..2702d8b785 100644
--- a/packages/nc-gui/extensions/data-exporter/manifest.json
+++ b/packages/nc-gui/extensions/data-exporter/manifest.json
@@ -6,11 +6,19 @@
"entry": "data-exporter",
"version": "0.1",
"iconUrl": "data-exporter/assets/icon.svg",
- "publisherName": "NocoDB",
- "publisherEmail": "contact@nocodb.com",
- "publisherUrl": "https://www.nocodb.com",
+ "publisher": {
+ "name": "NocoDB",
+ "email": "contact@nocodb.com",
+ "url": "https://www.nocodb.com",
+ "icon": {
+ "src": "csv-import-ee/assets/publisher-icon.svg",
+ "width": 24,
+ "height": 24
+ }
+ },
+ "links": [],
"config": {
- "modalMaxWith": "sm",
+ "modalSize": "sm",
"contentMinHeight": "310px"
}
}
diff --git a/packages/nc-gui/extensions/json-exporter/assets/publisher-icon.svg b/packages/nc-gui/extensions/json-exporter/assets/publisher-icon.svg
new file mode 100644
index 0000000000..00ae8ada1b
--- /dev/null
+++ b/packages/nc-gui/extensions/json-exporter/assets/publisher-icon.svg
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/packages/nc-gui/extensions/json-exporter/description.md b/packages/nc-gui/extensions/json-exporter/description.md
index 79c598d0c8..31d9f8928d 100644
--- a/packages/nc-gui/extensions/json-exporter/description.md
+++ b/packages/nc-gui/extensions/json-exporter/description.md
@@ -1,5 +1,16 @@
-This is a sample NocoDB extension that exports data in JSON format.
+This is a sample NocoDB extension that exports data in JSON format.
It is used to demonstrate how to create a NocoDB extension.
-This extension is disabled by default. To access it you need to first change the `disabled` property in the manifest file to `false`.
\ No newline at end of file
+This extension is disabled by default. To access it you need to first change the `disabled` property in the manifest file to `false`.
+
+
+
+
+ Learn more
+
+
diff --git a/packages/nc-gui/extensions/json-exporter/index.vue b/packages/nc-gui/extensions/json-exporter/index.vue
index 7ab00861d9..f4e213cab2 100644
--- a/packages/nc-gui/extensions/json-exporter/index.vue
+++ b/packages/nc-gui/extensions/json-exporter/index.vue
@@ -92,11 +92,13 @@ onMounted(() => {
-
+
Search result for ‘{{ searchQuery }}’
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![icon]()
+
+
+
+
+ {{ ext.title }}
+
+
+ {{ ext.subTitle }}
+
+
+
-
- ![icon]()
-
-
-
-
-
-
-
-
- {{ ext.title }}
-
-
- {{ ext.subTitle }}
+
+ 
+
+ {{ $t('title.noResultsMatchedYourSearch') }}
+
+ {{ $t('title.noResultsMatchedYourSearch') }}
-
-
-
- {{ $t('title.noResultsMatchedYourSearch') }}
-
-
- {{ $t('title.noResultsMatchedYourSearch') }}
-
- Export
-
+
+ Export
+
+