mirror of
https://github.com/nocodb/nocodb.git
synced 2026-05-01 16:16:38 +00:00
* feat: Improved ui (#6156) * refactor: revert Signed-off-by: Pranav C <pranavxc@gmail.com> feat: shared base Signed-off-by: Pranav C <pranavxc@gmail.com> fix: remove duplicate import statement Signed-off-by: Pranav C <pranavxc@gmail.com> fix: disable starred & license menu Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix airtable wait issue Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable mysql in ci Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix checkbox order for sqlite Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: disable quick tests Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix dbType env variable for CI Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: workspace API access error fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable SQLite CI CD Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: use DB_TYPE env variable Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable SQLite UT Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: isHub cleanup Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: add check for EE Timezone spec Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: cleanup Signed-off-by: Pranav C <pranavxc@gmail.com> chore: cleanup Signed-off-by: Pranav C <pranavxc@gmail.com> test: EE check fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: test correction Signed-off-by: Pranav C <pranavxc@gmail.com> chore: sync latest changes Signed-off-by: Pranav C <pranavxc@gmail.com> test: set EE=false Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: set NC Edition to community in workflow file Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: update sdk build command Signed-off-by: Pranav C <pranavxc@gmail.com> refactor: i18n and other changes Signed-off-by: Pranav C <pranavxc@gmail.com> feat: new ui Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: sync tests Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: lint Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: shared view/base related bugs Signed-off-by: Pranav C <pranavxc@gmail.com> * test: checkbox verification sort order fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix sqlite reset Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable selfhosted runners Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: table ops (draft) Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * Docs: screenshots for table-operations.md * refactor: introduce missing buttons Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: get all fields Signed-off-by: Pranav C <pranavxc@gmail.com> * test: UT fix- new data API response Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: EE is false Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: webhook lookup as string in CE Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: include created_at and updated_at Signed-off-by: Pranav C <pranavxc@gmail.com> * test: fix UT newDataAPI response for PG Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: separate api for webhook related plugins Signed-off-by: Pranav C <pranavxc@gmail.com> * test: msyql filter corrections Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: mysql group by test corrections Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix datatype for rating field in groupby spec for pg Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: kanban datatype correction Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: column edit for mysql- rating field Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: misc fixes Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable 4 workers Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable 2 workers per shard only Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: table CRUD * Rename table-operations.md to table-crud.md * Create column-crud.md * docs: row CRUD * Rename row.md to row-crud.md * docs: project crud * docs: toolbar (skeleton) * refactor: single page UI and bug fixes Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: sync tests playwright Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: add missing dependency Signed-off-by: Pranav C <pranavxc@gmail.com> * feat: single page ui, test corrections Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: tests Signed-off-by: Pranav C <pranavxc@gmail.com> * test: project rename test correction Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: remove only Signed-off-by: Pranav C <pranavxc@gmail.com> * test: remove wrong import statement Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: delete option not visible in project context menu Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: move ws access within isEE() Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix groupby * test: groupby fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: signup & landing page * docs: project crud * docs: project-crud misc * docs: toolbar fields * docs: toolbar / filters * docs: toolbar / group by * docs: toolbar / sort * docs: toolbar / row height * docs: filters additional options * docs: file re-order Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: add links to column types * docs: code snippets * docs: links * docs: lookup * docs: rollup * docs: formula * docs: primary key * docs: display value * docs: development setup * docs: swagger * fix(nc-gui): encodeURIComponent for row id - closes: #6202 * docs: language * docs: expanded record * docs: import airtable * docs: airtable * docs: webhook * docs: revert file rename Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: account settings * docs: audit * docs: meta management * docs: project settings * docs: shared base * docs: shared view * docs: meta sync * docs: team-auth * docs: views * docs: fix URL * docs: URL corrections * fix: shared base, view related bugs Signed-off-by: Pranav C <pranavxc@gmail.com> * test: EE check for WSaccess Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: exclude EE tests Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: missing project delete closes #6215 Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: merge existing project meta if found closes #6216 Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: merge existing project meta if found closes #6216 Signed-off-by: Pranav C <pranavxc@gmail.com> --------- Signed-off-by: Pranav C <pranavxc@gmail.com> Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: DarkPhoenix2704 <anbarasun123@gmail.com> Co-authored-by: Wing-Kam Wong <wingkwong.code@gmail.com> * refactor: docs and other bug fixes Signed-off-by: Pranav C <pranavxc@gmail.com> * feat: populate default project on super admin signup Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: include created project details in signup response if avail, missing Dockerfile Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: use custom function for resolving ts path aliases Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: add missing generate script Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: webpack build correction - ts path resolve Signed-off-by: Pranav C <pranavxc@gmail.com> --------- Signed-off-by: Pranav C <pranavxc@gmail.com> Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: mertmit <mertmit99@gmail.com> Co-authored-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: DarkPhoenix2704 <anbarasun123@gmail.com> Co-authored-by: Wing-Kam Wong <wingkwong.code@gmail.com>
133 lines
3.5 KiB
Vue
133 lines
3.5 KiB
Vue
<script setup lang="ts">
|
|
import type { BaseType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
|
|
import { isLinksOrLTAR } from 'nocodb-sdk'
|
|
import type { ERDConfig } from './utils'
|
|
import { reactive, ref, storeToRefs, useMetas, useProject, watch } from '#imports'
|
|
|
|
const props = defineProps({
|
|
baseId: {
|
|
type: String,
|
|
default: '',
|
|
},
|
|
table: {
|
|
type: Object as PropType<TableType>,
|
|
default: null,
|
|
},
|
|
showAllColumns: {
|
|
type: Boolean,
|
|
default: true,
|
|
},
|
|
})
|
|
|
|
const { bases, tables: projectTables } = storeToRefs(useProject())
|
|
|
|
const { metas, getMeta } = useMetas()
|
|
|
|
const tables = ref<TableType[]>([])
|
|
|
|
const isLoading = ref(true)
|
|
|
|
const config = reactive<ERDConfig>({
|
|
showPkAndFk: true,
|
|
showViews: false,
|
|
showAllColumns: props.showAllColumns,
|
|
singleTableMode: !!props.table,
|
|
showMMTables: false,
|
|
showJunctionTableNames: false,
|
|
isFullScreen: false,
|
|
})
|
|
|
|
const loadMetaOfTablesNotInMetas = async (localTables: TableType[]) => {
|
|
await Promise.all(
|
|
localTables
|
|
.filter((table) => !metas.value[table.id!])
|
|
.map(async (table) => {
|
|
await getMeta(table.id!)
|
|
}),
|
|
)
|
|
}
|
|
|
|
const populateTables = async () => {
|
|
let localTables: TableType[] = []
|
|
if (props.table) {
|
|
// if table is provided only get the table and its related tables
|
|
localTables = projectTables.value.filter(
|
|
(t) =>
|
|
t.id === props.table?.id ||
|
|
metas.value[props.table!.id!].columns?.find((column) => {
|
|
return isLinksOrLTAR(column.uidt) && (column.colOptions as LinkToAnotherRecordType)?.fk_related_model_id === t.id
|
|
}),
|
|
)
|
|
} else {
|
|
localTables = projectTables.value
|
|
}
|
|
|
|
await loadMetaOfTablesNotInMetas(localTables)
|
|
|
|
tables.value = localTables
|
|
.filter(
|
|
(t) =>
|
|
config.showMMTables ||
|
|
(!config.showMMTables && !t.mm) ||
|
|
// Show mm table if it's the selected table
|
|
t.id === props.table?.id,
|
|
)
|
|
.filter((t) => config.singleTableMode || (!config.showViews && t.type !== 'view') || config.showViews)
|
|
|
|
isLoading.value = false
|
|
}
|
|
|
|
const toggleFullScreen = () => {
|
|
config.isFullScreen = !config.isFullScreen
|
|
}
|
|
|
|
watch([metas, projectTables], populateTables, {
|
|
flush: 'post',
|
|
immediate: true,
|
|
})
|
|
|
|
watch(config, populateTables, {
|
|
flush: 'post',
|
|
deep: true,
|
|
})
|
|
|
|
const filteredTables = computed(() =>
|
|
tables.value.filter((t) =>
|
|
props?.baseId ? t.base_id === props.baseId : t.base_id === bases.value?.filter((base: BaseType) => base.enabled)[0].id,
|
|
),
|
|
)
|
|
|
|
watch(
|
|
() => config.showAllColumns,
|
|
() => {
|
|
config.showPkAndFk = config.showAllColumns
|
|
},
|
|
)
|
|
</script>
|
|
|
|
<template>
|
|
<div
|
|
class="w-full bg-white border-1 border-gray-100 rounded-lg"
|
|
:class="{
|
|
'z-100 h-screen w-screen fixed top-0 left-0 right-0 bottom-0': config.isFullScreen,
|
|
'nc-erd-vue-flow-single-table': config.singleTableMode,
|
|
'nc-erd-vue-flow': !config.singleTableMode,
|
|
}"
|
|
:style="!config.isFullScreen ? 'height: inherit' : ''"
|
|
>
|
|
<div class="relative h-full">
|
|
<LazyErdFlow :tables="filteredTables" :config="config">
|
|
<GeneralOverlay v-model="isLoading" inline class="bg-gray-300/50">
|
|
<div class="h-full w-full flex flex-col justify-center items-center">
|
|
<a-spin size="large" />
|
|
</div>
|
|
</GeneralOverlay>
|
|
|
|
<ErdFullScreenToggle :config="config" @toggle-full-screen="toggleFullScreen" />
|
|
<ErdConfigPanel :config="config" />
|
|
<ErdHistogramPanel v-if="!config.singleTableMode" />
|
|
</LazyErdFlow>
|
|
</div>
|
|
</div>
|
|
</template>
|