mirror of
https://github.com/nocodb/nocodb.git
synced 2026-05-05 09:07:05 +00:00
feat: Improved UI (#6222)
* 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>
This commit is contained in:
Pranav C
@@ -32,6 +32,8 @@ const hideMenu = toRef(props, 'hideMenu')
|
||||
|
||||
const editColumnDropdown = ref(false)
|
||||
|
||||
const isDropDownOpen = ref(false)
|
||||
|
||||
provide(ColumnInj, column)
|
||||
|
||||
const { metas } = useMetas()
|
||||
@@ -42,11 +44,11 @@ const meta = inject(MetaInj, ref())
|
||||
|
||||
const isForm = inject(IsFormInj, ref(false))
|
||||
|
||||
const colOptions = $computed(() => column.value?.colOptions)
|
||||
const colOptions = computed(() => column.value?.colOptions)
|
||||
|
||||
const tableTile = $computed(() => meta?.value?.title)
|
||||
const tableTile = computed(() => meta?.value?.title)
|
||||
|
||||
const relationColumnOptions = $computed<LinkToAnotherRecordType | null>(() => {
|
||||
const relationColumnOptions = computed<LinkToAnotherRecordType | null>(() => {
|
||||
if (isMm(column.value) || isHm(column.value) || isBt(column.value)) {
|
||||
return column.value?.colOptions as LinkToAnotherRecordType
|
||||
} else if ((column?.value?.colOptions as LookupType | RollupType)?.fk_relation_column_id) {
|
||||
@@ -57,19 +59,24 @@ const relationColumnOptions = $computed<LinkToAnotherRecordType | null>(() => {
|
||||
return null
|
||||
})
|
||||
|
||||
const relatedTableMeta = $computed(
|
||||
() => relationColumnOptions?.fk_related_model_id && metas.value?.[relationColumnOptions?.fk_related_model_id as string],
|
||||
const relatedTableMeta = computed(
|
||||
() =>
|
||||
relationColumnOptions.value?.fk_related_model_id && metas.value?.[relationColumnOptions.value?.fk_related_model_id as string],
|
||||
)
|
||||
|
||||
const relatedTableTitle = $computed(() => relatedTableMeta?.title)
|
||||
const relatedTableTitle = computed(() => relatedTableMeta.value?.title)
|
||||
|
||||
const childColumn = $computed(() => {
|
||||
if (relatedTableMeta?.columns) {
|
||||
const childColumn = computed(() => {
|
||||
if (relatedTableMeta.value?.columns) {
|
||||
if (isRollup(column.value)) {
|
||||
return relatedTableMeta?.columns.find((c: ColumnType) => c.id === (colOptions as RollupType).fk_rollup_column_id)
|
||||
return relatedTableMeta.value?.columns.find(
|
||||
(c: ColumnType) => c.id === (colOptions.value as RollupType).fk_rollup_column_id,
|
||||
)
|
||||
}
|
||||
if (isLookup(column.value)) {
|
||||
return relatedTableMeta?.columns.find((c: ColumnType) => c.id === (colOptions as LookupType).fk_lookup_column_id)
|
||||
return relatedTableMeta.value?.columns.find(
|
||||
(c: ColumnType) => c.id === (colOptions.value as LookupType).fk_lookup_column_id,
|
||||
)
|
||||
}
|
||||
}
|
||||
return ''
|
||||
@@ -80,13 +87,13 @@ const tooltipMsg = computed(() => {
|
||||
return ''
|
||||
}
|
||||
if (isHm(column.value)) {
|
||||
return `'${tableTile}' ${t('labels.hasMany')} '${relatedTableTitle}'`
|
||||
return `'${tableTile.value}' ${t('labels.hasMany')} '${relatedTableTitle.value}'`
|
||||
} else if (isMm(column.value)) {
|
||||
return `'${tableTile}' & '${relatedTableTitle}' ${t('labels.manyToMany')}`
|
||||
return `'${tableTile.value}' & '${relatedTableTitle.value}' ${t('labels.manyToMany')}`
|
||||
} else if (isBt(column.value)) {
|
||||
return `'${column?.value?.title}' ${t('labels.belongsTo')} '${relatedTableTitle}'`
|
||||
return `'${column?.value?.title}' ${t('labels.belongsTo')} '${relatedTableTitle.value}'`
|
||||
} else if (isLookup(column.value)) {
|
||||
return `'${childColumn.title}' from '${relatedTableTitle}' (${childColumn.uidt})`
|
||||
return `'${childColumn.value.title}' from '${relatedTableTitle.value}' (${childColumn.value.uidt})`
|
||||
} else if (isFormula(column.value)) {
|
||||
const formula = substituteColumnIdWithAliasInFormula(
|
||||
(column.value?.colOptions as FormulaType)?.formula,
|
||||
@@ -95,14 +102,14 @@ const tooltipMsg = computed(() => {
|
||||
)
|
||||
return `Formula - ${formula}`
|
||||
} else if (isRollup(column.value)) {
|
||||
return `'${childColumn.title}' of '${relatedTableTitle}' (${childColumn.uidt})`
|
||||
return `'${childColumn.value.title}' of '${relatedTableTitle.value}' (${childColumn.value.uidt})`
|
||||
}
|
||||
return ''
|
||||
})
|
||||
|
||||
const columnOrder = ref<Pick<ColumnReqType, 'column_order'> | null>(null)
|
||||
|
||||
const addField = async (payload) => {
|
||||
const addField = async (payload: any) => {
|
||||
columnOrder.value = payload
|
||||
editColumnDropdown.value = true
|
||||
}
|
||||
@@ -114,14 +121,20 @@ const closeAddColumnDropdown = () => {
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex items-center w-full text-xs text-gray-500 font-weight-medium" :class="{ 'h-full': column }">
|
||||
<div
|
||||
class="flex items-center w-full text-xs text-gray-500 font-weight-medium"
|
||||
:class="{ 'h-full': column }"
|
||||
@click.right="isDropDownOpen = !isDropDownOpen"
|
||||
>
|
||||
<LazySmartsheetHeaderVirtualCellIcon v-if="column" />
|
||||
|
||||
<a-tooltip placement="bottom">
|
||||
<template #title>
|
||||
{{ tooltipMsg }}
|
||||
</template>
|
||||
<span class="name" style="white-space: pre-line" :title="column.title"> {{ column.title }}</span>
|
||||
<span class="name pl-1" :class="{ 'truncate': !isForm, 'whitespace-pre-line': isForm }" :title="column.title">
|
||||
{{ column.title }}
|
||||
</span>
|
||||
</a-tooltip>
|
||||
|
||||
<span v-if="isVirtualColRequired(column, meta?.columns || []) || required" class="text-red-500"> *</span>
|
||||
@@ -131,6 +144,7 @@ const closeAddColumnDropdown = () => {
|
||||
|
||||
<LazySmartsheetHeaderMenu
|
||||
v-if="!isForm && isUIAllowed('edit-column')"
|
||||
v-model:is-open="isDropDownOpen"
|
||||
:virtual="true"
|
||||
@add-column="addField"
|
||||
@edit="editColumnDropdown = true"
|
||||
|
||||
Reference in New Issue
Block a user