clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-05-02 06:16:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: dropdown group order, duplicate reload, dynamic integrations on base page

Browse Source
This commit is contained in:
Ramesh Mane
2026-04-10 09:37:39 +00:00
parent a8d2efe9cb
commit 9fd0d02ee3
4 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/nc-gui/components/workspace/integrations/AddConnectionDropdown.vue
View File

@@ -12,7 +12,7 @@ const props = withDefaults(defineProps<Props>(), {
const { t } = useI18n()
const { addIntegration, integrations } = useIntegrationStore()
const { addIntegration, integrations, availableSyncAuthIntegrationSubtypes } = useIntegrationStore()
const { isFeatureEnabled } = useBetaFeatureToggle()
@@ -65,18 +65,25 @@ const isCategoryAllowed = (cat: (typeof integrationCategories)[number]) => {
}
// Integration filter — mirrors the main page logic for each mode
const isIntegrationAllowed = (i: (typeof allIntegrations)[number]) => {
const isIntegrationAllowed = (i: (typeof allIntegrations)[number], category: (typeof integrationCategories)[number]) => {
if (i.hidden) return false
if (!i.isAvailable) return false
if (i.sub_type === SyncDataType.NOCODB) return false
if (props.mode === 'base') {
// Base level: same as base/Integrations.vue — exclude ossOnly
return !i.isOssOnly
}
// Workspace level: same as IntegrationsTab
// Workspace level: same as IntegrationsTab's isIntegrationVisible
if (isEeUI && i.isOssOnly) return false
if (!easterEggToggle.value) {
// Auth category: only show integrations in availableSyncAuthIntegrationSubtypes
if (isSyncFeatureEnabled.value && category.value === IntegrationCategoryType.AUTH) {
return availableSyncAuthIntegrationSubtypes.value.includes(i.sub_type)
}
}
return true
}
@@ -88,7 +95,7 @@ const integrationListItems = computed(() => {
if (!isCategoryAllowed(cat)) continue
const categoryIntegrations = allIntegrations.filter(
(i) => i.type === cat.value && isIntegrationAllowed(i),
(i) => i.type === cat.value && isIntegrationAllowed(i, cat),
)
if (!categoryIntegrations.length) continue
@@ -107,6 +114,11 @@ const integrationListItems = computed(() => {
return items
})
// Group order matching integrationCategories array order
const categoryGroupOrder = computed(() => {
return integrationCategories.filter((c) => isCategoryAllowed(c)).map((c) => t(c.title))
})
const handleSelect = (option: NcListItemType) => {
if (option?.integration) {
addIntegration(option.integration)
@@ -125,6 +137,7 @@ const handleSelect = (option: NcListItemType) => {
<NcList
v-model:open="isOpen"
:list="integrationListItems"
:group-order="categoryGroupOrder"
:search-input-placeholder="`${t('general.search')} ${t('general.integrations').toLowerCase()}...`"
option-value-key="value"
option-label-key="label"