Browse Source

refactor: ui spacing corrections

nc-refactor/ds
Pranav C 2 months ago
parent
commit
3892505930
  1. 62
      packages/nc-gui/components/dashboard/settings/DataSources.vue
  2. 2
      packages/nc-gui/components/dashboard/settings/Modal.vue
  3. 1
      packages/nc-gui/lang/en.json

62
packages/nc-gui/components/dashboard/settings/DataSources.vue

@ -306,11 +306,64 @@ const isEditBaseModalOpen = computed({
} }
}, },
}) })
const activeSource = ref<SourceType>(null)
const openedTab = ref('erd')
</script> </script>
<template> <template>
<div class="flex flex-row w-full h-full nc-data-sources-view"> <div class="flex flex-col h-full">
<div class="flex flex-col w-full overflow-auto"> <div class="px-4 py-2">
<a-breadcrumb separator=">" class="w-full cursor-pointer font-weight-bold">
<a-breadcrumb-item @click="activeSource = null">
<a class="!no-underline">Data Sources</a>
</a-breadcrumb-item>
<a-breadcrumb-item v-if="activeSource">
<span class="capitalize">{{ activeSource.alias || 'Default Source' }}</span>
</a-breadcrumb-item>
</a-breadcrumb>
</div>
<div class="flex flex-row w-full h-full nc-data-sources-view flex-grow">
<template v-if="activeSource">
<NcTabs v-model:activeKey="openedTab" class="nc-source-tab w-full">
<a-tab-pane key="erd">
<template #tab>
<div class="tab" data-testid="nc-erd-tab">
<div>{{ $t('title.erdView') }}</div>
</div>
</template>
<div class="h-[80vh]">
<LazyDashboardSettingsErd class="mt-4 overflow-scroll" :source-id="activeSource.id" :show-all-columns="false" />
</div>
</a-tab-pane>
<a-tab-pane key="acl">
<template #tab>
<div class="tab" data-testid="nc-acl-tab">
<div>{{ $t('labels.uiAcl') }}</div>
</div>
</template>
<LazyDashboardSettingsUIAcl class="mt-4" :source-id="activeSource.id" />
</a-tab-pane>
<a-tab-pane v-if="activeSource.is_meta || activeSource.is_local" key="audit">
<template #tab>
<div class="tab" data-testid="nc-audit-tab">
<div>{{ $t('title.audit') }}</div>
</div>
</template>
<LazyDashboardSettingsBaseAudit class="mt-4" :source-id="activeSource.id" />
</a-tab-pane>
<a-tab-pane key="meta-sync">
<template #tab>
<div class="tab" data-testid="nc-meta-sync-tab">
<div>{{ $t('labels.metaSync') }}</div>
</div>
</template>
<LazyDashboardSettingsMetadata class="mt-4" :source-id="activeSource.id" @source-synced="loadBases(true)" />
</a-tab-pane>
</NcTabs>
</template>
<div v-else class="flex flex-col w-full overflow-auto">
<div class="flex flex-row w-full justify-end mt-6.5 mb-2"> <div class="flex flex-row w-full justify-end mt-6.5 mb-2">
<NcButton <NcButton
v-if="!isDataSourceLimitReached" v-if="!isDataSourceLimitReached"
@ -343,7 +396,7 @@ const isEditBaseModalOpen = computed({
<div class="ds-table-body"> <div class="ds-table-body">
<Draggable :list="sources" item-key="id" handle=".ds-table-handle" @end="moveBase"> <Draggable :list="sources" item-key="id" handle=".ds-table-handle" @end="moveBase">
<template #header> <template #header>
<div v-if="sources[0]" class="ds-table-row border-gray-200"> <div v-if="sources[0]" class="ds-table-row border-gray-200" @click="activeSource = sources[0]">
<div class="ds-table-col ds-table-enabled"> <div class="ds-table-col ds-table-enabled">
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<div v-if="sources.length > 2" class="ds-table-handle" /> <div v-if="sources.length > 2" class="ds-table-handle" />
@ -454,7 +507,7 @@ const isEditBaseModalOpen = computed({
</div> </div>
</template> </template>
<template #item="{ element: source, index }"> <template #item="{ element: source, index }">
<div v-if="index !== 0" class="ds-table-row border-gray-200"> <div v-if="index !== 0" class="ds-table-row border-gray-200" @click="activeSource = source">
<div class="ds-table-col ds-table-enabled"> <div class="ds-table-col ds-table-enabled">
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<GeneralIcon v-if="sources.length > 2" icon="dragVertical" small class="ds-table-handle" /> <GeneralIcon v-if="sources.length > 2" icon="dragVertical" small class="ds-table-handle" />
@ -644,6 +697,7 @@ const isEditBaseModalOpen = computed({
</GeneralDeleteModal> </GeneralDeleteModal>
</div> </div>
</div> </div>
</div>
</template> </template>
<style> <style>

2
packages/nc-gui/components/dashboard/settings/Modal.vue

@ -208,7 +208,7 @@ watch(
{{ tab.title }} {{ tab.title }}
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
<div v-else> <div v-else-if="false">
<div class="flex items-center"> <div class="flex items-center">
<a-breadcrumb class="w-full cursor-pointer"> <a-breadcrumb class="w-full cursor-pointer">
<a-breadcrumb-item v-if="vDataState !== ''" @click="vDataState = ''"> <a-breadcrumb-item v-if="vDataState !== ''" @click="vDataState = ''">

1
packages/nc-gui/lang/en.json

@ -448,6 +448,7 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results" "noResultsMatchedYourSearch": "Your search did not yield any matching results"
}, },
"labels": { "labels": {
"metaSync": "Meta Sync",
"today": "Today", "today": "Today",
"workspace": "Workspace", "workspace": "Workspace",
"txt": "TXT Record value", "txt": "TXT Record value",

Loading…
Cancel
Save