+
+
+
+
+
+
+
+ {{
+ $t('general.createEntity', {
+ entity: $t('objects.view'),
+ })
+ }}
+
+
-
diff --git a/packages/nc-gui/components/dashboard/settings/UIAcl.vue b/packages/nc-gui/components/dashboard/settings/UIAcl.vue
index 5321768132..a48c20372a 100644
--- a/packages/nc-gui/components/dashboard/settings/UIAcl.vue
+++ b/packages/nc-gui/components/dashboard/settings/UIAcl.vue
@@ -16,6 +16,8 @@ import {
useNuxtApp,
} from '#imports'
+type Role = 'editor' | 'commenter' | 'viewer'
+
const props = defineProps<{
sourceId: string
}>()
@@ -39,6 +41,12 @@ const tables = ref
+
+
+ {{ column.name }}
+
+ {{ column.name }}
+
+
+
+
({
title: '',
dataSource: { ...getDefaultConnectionConfig(ClientType.MYSQL) },
inflection: {
- inflectionColumn: 'camelize',
- inflectionTable: 'camelize',
+ inflectionColumn: 'none',
+ inflectionTable: 'none',
},
sslUse: SSLUsage.No,
extraParameters: [],
@@ -77,8 +77,8 @@ const customFormState = ref({
title: '',
dataSource: { ...getDefaultConnectionConfig(ClientType.MYSQL) },
inflection: {
- inflectionColumn: 'camelize',
- inflectionTable: 'camelize',
+ inflectionColumn: 'none',
+ inflectionTable: 'none',
},
sslUse: SSLUsage.No,
extraParameters: [],
@@ -126,7 +126,7 @@ const validators = computed(() => {
'title': [
{
required: true,
- message: 'Source name is required',
+ message: t('labels.sourceNameRequired'),
},
baseTitleValidator,
],
@@ -614,7 +614,6 @@ const toggleModal = (val: boolean) => {
({
title: '',
dataSource: { ...getDefaultConnectionConfig(ClientType.MYSQL) },
inflection: {
- inflectionColumn: 'camelize',
- inflectionTable: 'camelize',
+ inflectionColumn: 'none',
+ inflectionTable: 'none',
},
sslUse: SSLUsage.No,
extraParameters: [],
@@ -72,8 +72,8 @@ const customFormState = ref({
title: '',
dataSource: { ...getDefaultConnectionConfig(ClientType.MYSQL) },
inflection: {
- inflectionColumn: 'camelize',
- inflectionTable: 'camelize',
+ inflectionColumn: 'none',
+ inflectionTable: 'none',
},
sslUse: SSLUsage.No,
extraParameters: [],
diff --git a/packages/nc-gui/components/dlg/AirtableImport.vue b/packages/nc-gui/components/dlg/AirtableImport.vue
index 1358a7438c..9b8ec341eb 100644
--- a/packages/nc-gui/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui/components/dlg/AirtableImport.vue
@@ -90,8 +90,10 @@ const onStatus = async (status: JobStatus, data?: any) => {
refreshCommandPalette()
// TODO: add tab of the first table
} else if (status === JobStatus.FAILED) {
+ await loadTables()
goBack.value = true
pushProgress(data.error.message, status)
+ refreshCommandPalette()
}
}
@@ -115,7 +117,10 @@ const { validateInfos } = useForm(syncSource, validators)
const disableImportButton = computed(() => !syncSource.value.details.apiKey || !syncSource.value.details.syncSourceUrlOrId)
+const isLoading = ref(false)
+
async function saveAndSync() {
+ isLoading.value = true
await createOrUpdate()
await sync()
}
@@ -178,6 +183,7 @@ async function listenForUpdates(id?: string) {
}
} else {
listeningForUpdates.value = false
+ isLoading.value = false
}
},
)
@@ -309,6 +315,9 @@ onMounted(async () => {
{
{{ $t('general.credentials') }}
{{ $t('msg.info.airtable.credentials') }}
@@ -346,7 +356,7 @@ onMounted(async () => {
@@ -411,7 +421,7 @@ onMounted(async () => {
-
+
{{ $t('general.questions') }} / {{ $t('general.help') }} - {{ $t('general.reachOut') }}
@@ -419,7 +429,12 @@ onMounted(async () => {
{{ $t('general.betaNote') }}
-
+
{{ $t('general.moreInfo') }}
.
@@ -485,6 +500,7 @@ onMounted(async () => {
v-e="['c:sync-airtable:save-and-sync']"
type="primary"
class="nc-btn-airtable-import"
+ :loading="isLoading"
:disabled="disableImportButton"
@click="saveAndSync"
>
diff --git a/packages/nc-gui/components/dlg/ColumnDuplicate.vue b/packages/nc-gui/components/dlg/ColumnDuplicate.vue
new file mode 100644
index 0000000000..2c87a60ca0
--- /dev/null
+++ b/packages/nc-gui/components/dlg/ColumnDuplicate.vue
@@ -0,0 +1,136 @@
+
+
+
+
+
+
diff --git a/packages/nc-gui/components/dlg/KeyboardShortcuts.vue b/packages/nc-gui/components/dlg/KeyboardShortcuts.vue
index d3cf53b122..cc9ec08a89 100644
--- a/packages/nc-gui/components/dlg/KeyboardShortcuts.vue
+++ b/packages/nc-gui/components/dlg/KeyboardShortcuts.vue
@@ -52,6 +52,22 @@ const shortcutList = [
{
title: 'Grid View',
shortcuts: [
+ {
+ keys: [renderAltOrOptlKey(), '←'],
+ behaviour: 'Jump to previous page in this view',
+ },
+ {
+ keys: [renderAltOrOptlKey(), '→'],
+ behaviour: 'Jump to next page in this view',
+ },
+ {
+ keys: [renderAltOrOptlKey(), '↑'],
+ behaviour: 'Jump to last page in this view',
+ },
+ {
+ keys: [renderAltOrOptlKey(), '↓'],
+ behaviour: 'Jump to first page in this view',
+ },
{
keys: [renderCmdOrCtrlKey(), '←'],
behaviour: 'Jump to leftmost column in this row',
diff --git a/packages/nc-gui/components/dlg/ProjectErd.vue b/packages/nc-gui/components/dlg/ProjectErd.vue
index 5c18099f25..aeac8bc522 100644
--- a/packages/nc-gui/components/dlg/ProjectErd.vue
+++ b/packages/nc-gui/components/dlg/ProjectErd.vue
@@ -46,7 +46,7 @@ onMounted(async () => {
diff --git a/packages/nc-gui/components/dlg/QuickImport.vue b/packages/nc-gui/components/dlg/QuickImport.vue
index b60ddacd00..6d98a74341 100644
--- a/packages/nc-gui/components/dlg/QuickImport.vue
+++ b/packages/nc-gui/components/dlg/QuickImport.vue
@@ -31,12 +31,12 @@ import {
useBase,
useGlobal,
useI18n,
+ useNuxtApp,
useVModel,
} from '#imports'
// import worker script according to the doc of Vite
import importWorkerUrl from '~/workers/importWorker?worker&url'
-import { useNuxtApp } from '#app'
interface Props {
modelValue: boolean
@@ -172,7 +172,9 @@ const disablePreImportButton = computed(() => {
}
})
-const disableImportButton = computed(() => !templateEditorRef.value?.isValid)
+const isError = ref(false)
+
+const disableImportButton = computed(() => !templateEditorRef.value?.isValid || isError.value)
const disableFormatJsonButton = computed(() => !jsonEditorRef.value?.isValid)
@@ -530,6 +532,14 @@ async function parseAndExtractData(val: UploadFile[] | ArrayBuffer | string) {
preImportLoading.value = false
}
}
+
+const onError = () => {
+ isError.value = true
+}
+
+const onChange = () => {
+ isError.value = false
+}
@@ -558,6 +568,8 @@ async function parseAndExtractData(val: UploadFile[] | ArrayBuffer | string) {
:import-worker="importWorker"
class="nc-quick-import-template-editor"
@import="handleImport"
+ @error="onError"
+ @change="onChange"
/>
diff --git a/packages/nc-gui/components/dlg/ViewCreate.vue b/packages/nc-gui/components/dlg/ViewCreate.vue
index 2c8307bdd1..524c1d66f0 100644
--- a/packages/nc-gui/components/dlg/ViewCreate.vue
+++ b/packages/nc-gui/components/dlg/ViewCreate.vue
@@ -110,11 +110,11 @@ watch(
)
function init() {
- form.title = `Untitled ${capitalize(typeAlias.value)}`
+ form.title = `${capitalize(typeAlias.value)}`
const repeatCount = views.value.filter((v) => v.title.startsWith(form.title)).length
if (repeatCount) {
- form.title = `${form.title} ${repeatCount}`
+ form.title = `${form.title}-${repeatCount}`
}
if (selectedViewId.value) {
@@ -308,7 +308,7 @@ onMounted(async () => {
{
v-model:value="form.fk_geo_data_col_id"
class="w-full"
:options="viewSelectFieldOptions"
- :disabled="groupingFieldColumnId || isMetaLoading"
+ :disabled="isMetaLoading"
:loading="isMetaLoading"
:placeholder="$t('placeholder.selectGeoField')"
:not-found-content="$t('placeholder.selectGeoFieldNotFound')"
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue b/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue
index aa149774f2..863c8fabe4 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue
@@ -58,7 +58,7 @@ watch(
v-bind="validateInfos.emails"
validate-trigger="onBlur"
name="emails"
- :rules="[{ required: true, message: 'Please input email' }]"
+ :rules="[{ required: true, message: t('msg.plsInputEmail') }]"
>
+
+ {{ $t('general.duplicate') }} {{ $t('objects.column') }}
+
+ Are you sure you want to duplicate the field?
+
+ {{ $t('title.advancedSettings') }}
+
+
+ {{ $t('labels.includeData') }}
+
+
+ {{ $t('general.cancel') }}
+ {{ $t('general.confirm') }}
+
+
-
-
+
{
-
-
{{ $t('activity.surveyMode') }}
-
-
{{ $t('activity.rtlOrientation') }}
-
{
>
diff --git a/packages/nc-gui/components/erd/View.vue b/packages/nc-gui/components/erd/View.vue
index bb99dfcc4a..69bee40db7 100644
--- a/packages/nc-gui/components/erd/View.vue
+++ b/packages/nc-gui/components/erd/View.vue
@@ -59,11 +59,14 @@ const loadMetaOfTablesNotInMetas = async (localTables: TableType[]) => {
const populateTables = async () => {
let localTables: TableType[] = []
if (props.table) {
+ // use getMeta method to load meta since it will get meta if not loaded already
+ const tableMeta = await getMeta(props.table!.id!)
+
// if table is provided only get the table and its related tables
localTables = baseTables.value.filter(
(t) =>
t.id === props.table?.id ||
- metas.value[props.table!.id!].columns?.find((column) => {
+ tableMeta.columns?.find((column) => {
return isLinksOrLTAR(column.uidt) && (column.colOptions as LinkToAnotherRecordType)?.fk_related_model_id === t.id
}),
)
diff --git a/packages/nc-gui/components/general/CopyUrl.vue b/packages/nc-gui/components/general/CopyUrl.vue
index 43d516a4db..c51f6a037e 100644
--- a/packages/nc-gui/components/general/CopyUrl.vue
+++ b/packages/nc-gui/components/general/CopyUrl.vue
@@ -13,7 +13,7 @@ const isCopied = ref({
})
const openUrl = async () => {
- window.open(url.value, '_blank')
+ window.open(url.value, '_blank', 'noopener,noreferrer')
}
const embedHtml = async () => {
@@ -40,18 +40,29 @@ const copyUrl = async () => {
{{ $t('activity.useTheme') }}
{{ url }}
-
-
+
+
+ {{ $t('activity.openInANewTab') }}
+
+
+
+
+
+
+ {{ $t('activity.copyIFrameCode') }}
+
+
+
+ deleteLabel?: string | undefined
}>()
const emits = defineEmits(['update:visible'])
@@ -12,6 +13,10 @@ const visible = useVModel(props, 'visible', emits)
const isLoading = ref(false)
+const { t } = useI18n()
+
+const deleteLabel = computed(() => props.deleteLabel ?? t('general.delete'))
+
const onDelete = async () => {
isLoading.value = true
try {
@@ -43,11 +48,15 @@ onKeyStroke('Enter', () => {
-
- {{ isSidebarsOpen ? 'Full width' : 'Exit full width' }}
+ {{ isSidebarsOpen ? $t('activity.fullWidth') : $t('activity.exitFullWidth') }}
()
-const emit = defineEmits(['import'])
+const emit = defineEmits(['import', 'error', 'change'])
dayjs.extend(utc)
@@ -95,6 +96,8 @@ const importingTips = ref>({})
const checkAllRecord = ref([])
+const formError = ref()
+
const uiTypeOptions = ref(
(Object.keys(UITypes) as (keyof typeof UITypes)[])
.filter(
@@ -124,11 +127,14 @@ const data = reactive<{
const validators = computed(() =>
data.tables.reduce]>>((acc: Record, table, tableIdx) => {
- acc[`tables.${tableIdx}.table_name`] = [fieldRequiredValidator()]
+ acc[`tables.${tableIdx}.table_name`] = [validateTableName]
hasSelectColumn.value[tableIdx] = false
table.columns?.forEach((column, columnIdx) => {
- acc[`tables.${tableIdx}.columns.${columnIdx}.column_name`] = [fieldRequiredValidator(), fieldLengthValidator()]
+ acc[`tables.${tableIdx}.columns.${columnIdx}.column_name`] = [
+ fieldRequiredValidator(),
+ fieldLengthValidator(base.value?.sources?.[0].type || ClientType.MYSQL),
+ ]
acc[`tables.${tableIdx}.columns.${columnIdx}.uidt`] = [fieldRequiredValidator()]
if (isSelect(column)) {
hasSelectColumn.value[tableIdx] = true
@@ -139,10 +145,12 @@ const validators = computed(() =>
}, {}),
)
-const { validate, validateInfos } = useForm(data, validators)
+const { validate, validateInfos, modelRef } = useForm(data, validators)
const isValid = ref(!importDataOnly)
+const formRef = ref()
+
watch(
() => srcDestMapping.value,
() => {
@@ -674,6 +682,39 @@ function handleUIDTChange(column, table) {
])
}
}
+
+const setErrorState = (errorsFields: any[]) => {
+ const errorMap: any = {}
+ for (const error of errorsFields) {
+ errorMap[error.name] = error.errors
+ }
+
+ formError.value = errorMap
+}
+
+watch(formRef, () => {
+ setTimeout(async () => {
+ try {
+ await validate()
+ emit('change')
+ formError.value = null
+ } catch (e: any) {
+ emit('error', e)
+ setErrorState(e.errorFields)
+ }
+ }, 500)
+})
+
+watch(modelRef, async () => {
+ try {
+ await validate()
+ emit('change')
+ formError.value = null
+ } catch (e: any) {
+ emit('error', e)
+ setErrorState(e.errorFields)
+ }
+})
@@ -694,7 +735,7 @@ function handleUIDTChange(column, table) {
-
+
-
- Delete Table
+ {{ $t('activity.deleteTable') }}
-
+
@@ -869,7 +909,11 @@ function handleUIDTChange(column, table) {
- The field is too large to be converted to {{ option.label }}
+ {{
+ $t('msg.tooLargeFieldEntity', {
+ entity: option.label,
+ })
+ }}
{{ option.label }}
@@ -887,8 +931,7 @@ function handleUIDTChange(column, table) {
-
- Primary Value
+ {{ $t('general.primaryValue') }}
- {{ $t('general.delete') }} {{ props.entityName }}
+ {{ deleteLabel }} {{ props.entityName }}
- {{ $t('msg.areYouSureUWantTo') }}{{ props.entityName.toLowerCase() }}?
+ {{
+ $t('msg.areYouSureUWantToDeleteLabel', {
+ deleteLabel: deleteLabel.toLowerCase(),
+ })
+ }}{{ props.entityName.toLowerCase() }}?
Join
+ {{ $t('general.join') }}
NocoDB Cloud
-
-
-
-
-
+
+
+ {{ props.firstPageTooltip }}
+
+
+
+
+
+
+
+ {{ props.prevPageTooltip }}
+
+
+
+
+
-
-
-
-
+
+
+ {{ props.nextPageTooltip }}
+
+
+
+
+
+
+
+ {{ props.lastPageTooltip }}
+
+
+
+
diff --git a/packages/nc-gui/components/notification/Card.vue b/packages/nc-gui/components/notification/Card.vue
index f1c4ea3ea7..40d16d2734 100644
--- a/packages/nc-gui/components/notification/Card.vue
+++ b/packages/nc-gui/components/notification/Card.vue
@@ -25,8 +25,7 @@ const groupType = computed({
-
+
{{ p }}
{{ mode !== 'full' ? '/' : 'of' }}
@@ -83,28 +101,37 @@ const pagesList = computed(() => {
-
-
- Notification
+ {{ $t('general.notification') }}
- Mark all as read
+ {{ $t('activity.markAllAsRead') }}
-
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index d10a94676f..2bb41eda78 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -190,7 +190,7 @@ onMounted(async () => {
class="user-row flex flex-row border-b-1 py-1 min-h-14 items-center"
>
You have no new notifications
+ {{ $t('msg.noNewNotifications') }}
-
-
+
+
+
+
+
+
+
+ {{ $t('msg.clickToCopyFieldId') }}
+
+
+
+
+
+.nc-dropdown-table-explorer {
+ @apply !overflow-hidden;
+}
+.nc-dropdown-table-explorer > div > ul.ant-dropdown-menu.nc-menu {
+ @apply !pt-0;
+}
+
+.nc-dropdown-table-explorer-display-column {
+ @apply !overflow-hidden;
+}
+.nc-dropdown-table-explorer-display-column > div > ul.ant-dropdown-menu.nc-menu {
+ @apply !py-1.5;
+}
+
+
+
+
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue
index cba6d82fc4..7a9096fa8c 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue
@@ -1,13 +1,24 @@
@@ -21,36 +32,43 @@ const { isLeftSidebarOpen } = storeToRefs(useSidebarStore())
}"
>
-
-
- {{ base?.title }}
-
-
-
@@ -101,30 +130,7 @@ const { isLeftSidebarOpen } = storeToRefs(useSidebarStore())
-
-
- {{ activeView?.is_default ? $t('title.defaultView') : activeView?.title }}
-
-
- {{ activeView?.is_default ? $t('title.defaultView') : activeView?.title }}
-
-
+
diff --git a/packages/nc-gui/components/tabs/auth/user-management/UsersModal.vue b/packages/nc-gui/components/tabs/auth/user-management/UsersModal.vue
index 9b6c0f2f19..997472eec1 100644
--- a/packages/nc-gui/components/tabs/auth/user-management/UsersModal.vue
+++ b/packages/nc-gui/components/tabs/auth/user-management/UsersModal.vue
@@ -217,7 +217,7 @@ watch(
v-bind="validateInfos.emails"
validate-trigger="onBlur"
name="emails"
- :rules="[{ required: true, message: 'Please input email' }]"
+ :rules="[{ required: true, message: t('msg.plsInputEmail') }]"
>
- {{ openedProject?.title }}
+
+
+ {{ openedProject?.title }}
+
Change page:
diff --git a/packages/nc-gui/components/smartsheet/Row.vue b/packages/nc-gui/components/smartsheet/Row.vue
index 39f313c052..ae631042bc 100644
--- a/packages/nc-gui/components/smartsheet/Row.vue
+++ b/packages/nc-gui/components/smartsheet/Row.vue
@@ -11,7 +11,6 @@ import {
toRef,
useProvideSmartsheetRowStore,
useSmartsheetStoreOrThrow,
- watch,
} from '#imports'
const props = defineProps<{
@@ -24,16 +23,6 @@ const { meta } = useSmartsheetStoreOrThrow()
const { isNew, state, syncLTARRefs, clearLTARCell, addLTARRef } = useProvideSmartsheetRowStore(meta as Ref, currentRow)
-// on changing isNew(new record insert) status sync LTAR cell values
-watch(isNew, async (nextVal, prevVal) => {
- if (prevVal && !nextVal) {
- await syncLTARRefs(currentRow.value.row)
- // update row values without invoking api
- currentRow.value.row = { ...currentRow.value.row, ...state.value }
- currentRow.value.oldRow = { ...currentRow.value.row, ...state.value }
- }
-})
-
const reloadViewDataTrigger = inject(ReloadViewDataHookInj)!
// override reload trigger and use it to reload row
diff --git a/packages/nc-gui/components/smartsheet/Toolbar.vue b/packages/nc-gui/components/smartsheet/Toolbar.vue
index b116c186a0..7587db85f8 100644
--- a/packages/nc-gui/components/smartsheet/Toolbar.vue
+++ b/packages/nc-gui/components/smartsheet/Toolbar.vue
@@ -51,13 +51,6 @@ const { allowCSVDownload } = useSharedView()
'w-full': isMobileMode,
}"
/>
-
-
-
diff --git a/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue b/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue
index 3e7406fe42..224c5daacc 100644
--- a/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue
@@ -34,7 +34,11 @@ onMounted(() => {
diff --git a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
index 320d9dea0b..5fdf44c7eb 100644
--- a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
+++ b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
@@ -24,6 +24,8 @@ useProvideSmartsheetRowStore(meta, rowRef)
const cdfValue = ref(null)
+const editEnabled = ref(false)
+
const updateCdfValue = (cdf: string | null) => {
vModel.value.cdf = cdf
cdfValue.value = vModel.value.cdf
@@ -37,13 +39,20 @@ onMounted(() => {
-
-
+
{{ $t('placeholder.defaultValue') }}
-
+
{
+ if (!appInfo.value.ee) return true
+
return betaFeatureToggleState.show ? betaFeatureToggleState.show : !t.name.includes(UITypes.GeoData)
}
@@ -230,7 +232,7 @@ if (props.fromTableExplorer) {
diff --git a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
index c82bb5d4ba..8ee16f4731 100644
--- a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
@@ -747,7 +747,12 @@ onMounted(() => {
placeholder2: '{column_name}',
})
}}
-
+
{{ $t('msg.formula.hintEnd') }}
diff --git a/packages/nc-gui/components/smartsheet/column/SelectOptions.vue b/packages/nc-gui/components/smartsheet/column/SelectOptions.vue
index d834c586d0..ff8a32d367 100644
--- a/packages/nc-gui/components/smartsheet/column/SelectOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/SelectOptions.vue
@@ -120,12 +120,6 @@ onMounted(() => {
}
})
-const optionChanged = (changedId: string) => {
- if (changedId && changedId === defaultOption.value?.id) {
- vModel.value.cdf = defaultOption.value.title
- }
-}
-
const getNextColor = () => {
let tempColor = colors.value[0]
if (options.value.length && options.value[options.value.length - 1].color) {
@@ -174,11 +168,21 @@ const addNewOption = () => {
// }
const syncOptions = () => {
- vModel.value.colOptions.options = renderedOptions.value.filter((op) => op.status !== 'remove')
+ vModel.value.colOptions.options = options.value.filter((op) => op.status !== 'remove')
}
const removeRenderedOption = (index: number) => {
- renderedOptions.value[index].status = 'remove'
+ const renderedOption = renderedOptions.value[index]
+ const option = options.value[loadedOptionAnchor.value + index]
+
+ renderedOption.status = 'remove'
+ option.status = 'remove'
+
+ renderedOption.status = 'remove'
+ if (option) {
+ option.status = 'remove'
+ }
+
syncOptions()
const optionId = renderedOptions.value[index]?.id
@@ -191,8 +195,20 @@ const removeRenderedOption = (index: number) => {
}
}
+const optionChanged = (changedId: string) => {
+ if (changedId && changedId === defaultOption.value?.id) {
+ vModel.value.cdf = defaultOption.value.title
+ }
+ syncOptions()
+}
+
const undoRemoveRenderedOption = (index: number) => {
- renderedOptions.value[index].status = undefined
+ const renderedOption = renderedOptions.value[index]
+ const option = options.value[loadedOptionAnchor.value + index]
+
+ renderedOption.status = undefined
+ option.status = undefined
+
syncOptions()
const optionId = renderedOptions.value[index]?.id
diff --git a/packages/nc-gui/components/smartsheet/details/Erd.vue b/packages/nc-gui/components/smartsheet/details/Erd.vue
index 1942a4fd1e..2e182656cc 100644
--- a/packages/nc-gui/components/smartsheet/details/Erd.vue
+++ b/packages/nc-gui/components/smartsheet/details/Erd.vue
@@ -24,7 +24,7 @@ const indicator = h(LoadingOutlined, {
-
-
+
+ {{ `${renderAltOrOptlKey()} + C` }}
+
+
+
{
>
Reset
-
- Save changes
-
+
+ {{ `${renderCmdOrCtrlKey()} + S` }}
+
+
+ Save changes
+
+
-
-
+
+
@@ -647,14 +768,21 @@ onMounted(async () => {
visibilityOps.find((op) => op.column.fk_column_id === field.id)?.visible ?? viewFieldsMap[field.id].show
"
@change="
- (event) => {
+ (event: any) => {
toggleVisibility(event.target.checked, viewFieldsMap[field.id])
}
"
/>
-
+
+
-
+
+
+
+ {{ $t('msg.clickToCopyFieldId') }}
+
+
+
@@ -728,11 +895,11 @@ onMounted(async () => {
+
@@ -748,7 +915,12 @@ onMounted(async () => {
+
+
+
+
+
+ {{ $t('labels.idColon') }}
+
+ {{ field.id }}
+
+
-
{
Restore
+
+
+
+
+
+
+ {{ $t('labels.idColon') }}
+
+ {{ displayColumn.id }}
+
+
-
@@ -64,35 +82,46 @@ const { isLeftSidebarOpen } = storeToRefs(useSidebarStore())
/>
-
-
- {{ activeTable?.title }}
-
-
- {{ activeTable?.title }}
-
-
+
+
+ {{ activeTable?.title }}
+
+
+
+ {{ activeTable?.title }}
+
+
+ {{ activeTable?.title }}
+
+
+
+
-
+
+
+
{{ base?.title }}
+
+
-
-
+
-
+
+ {{ base?.title }}
+
+
/
+
+
+ /
/
+ /
{{ $t('datatype.Email') }}:
@@ -233,7 +233,7 @@ watch(
-
+
diff --git a/packages/nc-gui/components/template/Editor.vue b/packages/nc-gui/components/template/Editor.vue
index 603c3621c0..1c59e4218e 100644
--- a/packages/nc-gui/components/template/Editor.vue
+++ b/packages/nc-gui/components/template/Editor.vue
@@ -34,12 +34,13 @@ import {
useI18n,
useNuxtApp,
useTabs,
+ validateTableName,
} from '#imports'
const { quickImportType, baseTemplate, importData, importColumns, importDataOnly, maxRowsToParse, sourceId, importWorker } =
defineProps{{ $t('labels.selectUserRole') }}
- Cancel
+ {{ $t('general.cancel') }}
Manage base access
- Share
+ {{ $t('activity.share') }}
{{ data.tables.length }} sheet{{ data.tables.length > 1 ? 's' : '' }}
available for import
@@ -784,29 +824,30 @@ function handleUIDTChange(column, table) {
>
+
+ {{ formError?.[`tables.${tableIdx}.table_name`].join('\n') }}
+
+
@@ -898,8 +941,7 @@ function handleUIDTChange(column, table) {
-
- Delete Column
+ {{ $t('activity.column.delete') }}
@@ -915,8 +957,7 @@ function handleUIDTChange(column, table) {
-
- Add Number Column
+ {{ $t('activity.column.addNumber') }}
@@ -928,8 +969,7 @@ function handleUIDTChange(column, table) {
-
- Add SingleLineText Column
+ {{ $t('activity.column.addSingleLineText') }}
@@ -941,8 +981,7 @@ function handleUIDTChange(column, table) {
-
- Add LongText Column
+ {{ $t('activity.column.addLongText') }}
@@ -954,8 +993,7 @@ function handleUIDTChange(column, table) {
-
- Add Other Column
+ {{ $t('activity.column.addOther') }}
diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 51179a4cd1..78668353aa 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -47,7 +47,7 @@ const relatedTableDisplayColumn = computed(
loadRelatedTableMeta()
const textVal = computed(() => {
- if (isForm?.value) {
+ if (isForm?.value || isNew.value) {
return state.value?.[colTitle.value]?.length
? `${+state.value?.[colTitle.value]?.length} ${t('msg.recordsLinked')}`
: t('msg.noRecordsLinked')
diff --git a/packages/nc-gui/components/virtual-cell/Lookup.vue b/packages/nc-gui/components/virtual-cell/Lookup.vue
index 2003dc4ead..6a2728fbef 100644
--- a/packages/nc-gui/components/virtual-cell/Lookup.vue
+++ b/packages/nc-gui/components/virtual-cell/Lookup.vue
@@ -25,6 +25,14 @@ const meta = inject(MetaInj, ref())
const cellValue = inject(CellValueInj, ref())
+// Change the row height of the child cell under lookup
+// Other wise things like text will can take multi line tag
+const providedHeightRef = ref(1) as any
+
+const rowHeight = inject(RowHeightInj, ref(1) as any)
+
+provide(RowHeightInj, providedHeightRef)
+
const relationColumn = computed(
() =>
meta.value?.columns?.find((c: ColumnType) => c.id === (column.value?.colOptions as LookupType)?.fk_relation_column_id) as
@@ -56,6 +64,14 @@ const lookupColumn = computed(
| undefined,
)
+watch([lookupColumn, rowHeight], () => {
+ if (lookupColumn.value && !isAttachment(lookupColumn.value)) {
+ providedHeightRef.value = 1
+ } else {
+ providedHeightRef.value = rowHeight.value
+ }
+})
+
const arrValue = computed(() => {
if (!cellValue.value) return []
@@ -64,7 +80,8 @@ const arrValue = computed(() => {
if (lookupColumn.value?.uidt === UITypes.Attachment && relationColumn.value?.colOptions?.type === RelationTypes.BELONGS_TO)
return [cellValue.value]
- if (Array.isArray(cellValue.value)) return cellValue.value
+ // TODO: We are filtering null as cell value can be null. Find the root cause and fix it
+ if (Array.isArray(cellValue.value)) return cellValue.value.filter((v) => v !== null)
return [cellValue.value]
})
@@ -80,8 +97,17 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning, activ
-
-
+
+
@@ -114,17 +140,31 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning, activ
-
-
+
+
+
diff --git a/packages/nc-gui/components/virtual-cell/QrCode.vue b/packages/nc-gui/components/virtual-cell/QrCode.vue
index 9ce66087e3..9dba2538ff 100644
--- a/packages/nc-gui/components/virtual-cell/QrCode.vue
+++ b/packages/nc-gui/components/virtual-cell/QrCode.vue
@@ -59,8 +59,20 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning } = us
@ok="handleModalOkClick"
>
-
+
- {{ qrValue }}
+ ![]()
diff --git a/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue b/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue
index 502a8076d9..2c27509ecf 100644
--- a/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue
+++ b/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue
@@ -46,9 +46,15 @@ const rowHeight = inject(RowHeightInj, ref(undefined))
:footer="null"
@ok="handleModalOkClick"
>
-
+
+
+ {{ $t('labels.clickToDownload') }}
+
+
+
+
+
+ {{ qrValue }}
+
+
+
import JsBarcode from 'jsbarcode'
import { IsGalleryInj, onMounted } from '#imports'
+import { downloadSvg as _downloadSvg } from '~/utils/svgToPng'
const props = defineProps({
barcodeValue: { type: String, required: true },
barcodeFormat: { type: String, required: true },
customStyle: { type: Object, required: false },
+ showDownload: { type: Boolean, required: false, default: false },
})
const emit = defineEmits(['onClickBarcode'])
const isGallery = inject(IsGalleryInj, ref(false))
-const barcodeSvgRef = ref()
+const barcodeSvgRef = ref()
const errorForCurrentInput = ref(false)
const generate = () => {
@@ -34,6 +36,12 @@ const generate = () => {
}
}
+const downloadSvg = () => {
+ if (!barcodeSvgRef.value) return
+
+ _downloadSvg(barcodeSvgRef.value, `${props.barcodeValue}.png`)
+}
+
const onBarcodeClick = (ev: MouseEvent) => {
if (isGallery.value) return
ev.stopPropagation()
@@ -45,15 +53,25 @@ onMounted(generate)
-
- , id: string) => {
:relation="relation"
:linked-records="childrenListCount"
:table-title="meta?.title"
- :show-header="true"
+ :header="$t('activity.linkedRecords')"
:related-table-title="relatedTableMeta?.title"
:display-value="row.row[displayValueProp]"
/>
@@ -224,7 +222,7 @@ const linkOrUnLink = (rowRef: Record, id: string) => {
+
+
+
+ {{ $t('labels.clickToDownload') }}
+
+
+
+
+
diff --git a/packages/nc-gui/components/virtual-cell/components/Header.vue b/packages/nc-gui/components/virtual-cell/components/Header.vue
index 2e5a323ba8..282303eba1 100644
--- a/packages/nc-gui/components/virtual-cell/components/Header.vue
+++ b/packages/nc-gui/components/virtual-cell/components/Header.vue
@@ -5,9 +5,9 @@ import FileIcon from '~icons/nc-icons/file'
import { iconMap } from '#imports'
-const { relation, relatedTableTitle, displayValue, showHeader, tableTitle } = defineProps<{
+const { relation, relatedTableTitle, displayValue, header, tableTitle } = defineProps<{
relation: string
- showHeader?: boolean
+ header?: string | null
tableTitle: string
relatedTableTitle: string
displayValue?: string
@@ -54,12 +54,12 @@ const relationMeta = computed(() => {
- {{ showHeader ? 'Linked Records' : '' }}
+ {{ header ?? '' }}
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItem.vue b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
index 745d7efefe..d646399231 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItem.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
@@ -82,20 +82,24 @@ const attachments: ComputedRef = computed(() => {
:hoverable="false"
>
-
+
-
- 
+
+
+
+
@@ -167,3 +171,9 @@ const attachments: ComputedRef = computed(() => {
+
+
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index 33ba9ca447..73fd1bc59e 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -1,5 +1,5 @@
@@ -191,14 +236,14 @@ const onClick = (refRow: any, id: string) => {
:table-title="meta?.title"
:related-table-title="relatedTableMeta?.title"
:display-value="row.row[displayValueProp]"
+ :header="$t('activity.addNewLink')"
/>
-
- {
type="secondary"
:size="isMobileMode ? 'medium' : 'small'"
class="!text-brand-500"
- @click="
- () => {
- expandedFormRow = {}
- expandedFormDlg = true
- }
- "
+ @click="addNewRecord"
>
-
+
{{ $t('labels.docReference') }}
diff --git a/packages/nc-gui/components/workspace/CreateProjectDlg.vue b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
index 4cf684c58e..1f49e1b6c6 100644
--- a/packages/nc-gui/components/workspace/CreateProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
@@ -3,7 +3,7 @@ import type { RuleObject } from 'ant-design-vue/es/form'
import type { Form, Input } from 'ant-design-vue'
import type { VNodeRef } from '@vue/runtime-core'
import { computed } from '@vue/reactivity'
-import { NcProjectType, baseTitleValidator, extractSdkResponseErrorMsg, ref, useGlobal, useVModel } from '#imports'
+import { NcProjectType, baseTitleValidator, extractSdkResponseErrorMsg, ref, useGlobal, useI18n, useVModel } from '#imports'
const props = defineProps<{
modelValue: boolean
@@ -12,6 +12,8 @@ const props = defineProps<{
const emit = defineEmits(['update:modelValue'])
+const { t } = useI18n()
+
const dialogShow = useVModel(props, 'modelValue', emit)
const baseType = computed(() => props.type ?? NcProjectType.DB)
@@ -24,7 +26,7 @@ const { navigateToProject } = useGlobal()
const nameValidationRules = [
{
required: true,
- message: 'Database name is required',
+ message: t('msg.info.dbNameRequired'),
},
baseTitleValidator,
] as RuleObject[]
@@ -70,7 +72,7 @@ watch(dialogShow, async (n, o) => {
form.value?.resetFields()
formState.value = {
- title: 'Untitled Base',
+ title: 'Base',
}
await nextTick()
@@ -95,7 +97,11 @@ const typeLabel = computed(() => {
@@ -121,19 +127,27 @@ const typeLabel = computed(() => {
{{ $t('activity.inviteUser') }}
@@ -137,7 +141,7 @@ const emailInput = ref((el) => {
@@ -193,7 +197,7 @@ const emailInput = ref((el) => {
v-bind="validateInfos.emails"
validate-trigger="onBlur"
name="emails"
- :rules="[{ required: true, message: 'Please input email' }]"
+ :rules="[{ required: true, message: $t('msg.plsInputEmail') }]"
>
- Cancel
+ {{ $t('general.cancel') }}
- {{ `Create ${typeLabel}` }}
+ {{
+ $t('general.createEntity', {
+ entity: typeLabel,
+ })
+ }}
- {{ `Creating ${typeLabel}` }}
+ {{
+ $t('general.creatingEntity', {
+ entity: typeLabel,
+ })
+ }}
diff --git a/packages/nc-gui/components/workspace/InviteCollabDlg.vue b/packages/nc-gui/components/workspace/InviteCollabDlg.vue
index 5f3e3c966d..f186bd1fdc 100644
--- a/packages/nc-gui/components/workspace/InviteCollabDlg.vue
+++ b/packages/nc-gui/components/workspace/InviteCollabDlg.vue
@@ -42,12 +42,18 @@ const validators = computed(() => {
{
validator: (rule: any, value: string, callback: (errMsg?: string) => void) => {
if (!value || value.length === 0) {
- callback('Email is required')
+ callback(t('msg.error.signUpRules.emailRequired'))
return
}
const invalidEmails = (value || '').split(/\s*,\s*/).filter((e: string) => !validateEmail(e))
if (invalidEmails.length > 0) {
- callback(`${invalidEmails.length > 1 ? ' Invalid emails:' : 'Invalid email:'} ${invalidEmails.join(', ')} `)
+ callback(
+ `${
+ invalidEmails.length > 1
+ ? `${t('msg.error.signUpRules.invalidEmails')}: `
+ : `${t('msg.error.signUpRules.invalidEmail')}: `
+ } ${invalidEmails.join(', ')} `,
+ )
} else {
callback()
}
@@ -119,8 +125,6 @@ const emailInput = ref((el) => {
wrap-class-name="nc-modal-invite-user"
@cancel="emit('closed')"
>
-
-
Copy Invite Token
+ {{ $t('title.copyInviteToken') }}
{{ $t('datatype.Email') }}:
@@ -207,7 +211,7 @@ const emailInput = ref((el) => {
-
+
diff --git a/packages/nc-gui/components/workspace/Menu.vue b/packages/nc-gui/components/workspace/Menu.vue
index e0cb18bb26..0c8b9c2fc4 100644
--- a/packages/nc-gui/components/workspace/Menu.vue
+++ b/packages/nc-gui/components/workspace/Menu.vue
@@ -7,7 +7,12 @@
data-testid="nc-workspace-menu"
class="flex items-center nc-workspace-menu overflow-hidden py-1.25 pr-0.25 justify-center w-full ml-2"
>
-
+
diff --git a/packages/nc-gui/components/workspace/MoveProjectDlg.vue b/packages/nc-gui/components/workspace/MoveProjectDlg.vue
index c4d2eea619..050aec3ef5 100644
--- a/packages/nc-gui/components/workspace/MoveProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/MoveProjectDlg.vue
@@ -55,8 +55,7 @@ const ownedWorkspaces = computed(() => {
{{ workspace.title }}
diff --git a/packages/nc-gui/components/workspace/ProjectList.vue b/packages/nc-gui/components/workspace/ProjectList.vue
index 1eef444c20..7bb3c32f27 100644
--- a/packages/nc-gui/components/workspace/ProjectList.vue
+++ b/packages/nc-gui/components/workspace/ProjectList.vue
@@ -3,25 +3,41 @@ import { Empty } from 'ant-design-vue'
import type { BaseType } from 'nocodb-sdk'
import { ProjectRoles, ProjectStatus, WorkspaceUserRoles } from 'nocodb-sdk'
import { nextTick } from '@vue/runtime-core'
-import { NcProjectType, isEeUI, navigateTo, storeToRefs, timeAgo, useGlobal, useWorkspace } from '#imports'
-import { useNuxtApp } from '#app'
+import {
+ NcProjectType,
+ computed,
+ extractSdkResponseErrorMsg,
+ isEeUI,
+ message,
+ navigateTo,
+ ref,
+ storeToRefs,
+ timeAgo,
+ useBases,
+ useGlobal,
+ useNuxtApp,
+ useRoles,
+ useWorkspace,
+} from '#imports'
const workspaceStore = useWorkspace()
+
const { updateProjectTitle } = workspaceStore
+
const { activePage } = storeToRefs(workspaceStore)
const basesStore = useBases()
+
const { basesList, isProjectsLoading } = storeToRefs(basesStore)
const { navigateToProject } = useGlobal()
-// const filteredProjects = computed(() => bases.value?.filter((p) => !p.deleted) || [])
-
const { $e } = useNuxtApp()
const { isUIAllowed } = useRoles()
const showProjectDeleteModal = ref(false)
+
const toBeDeletedProjectId = ref()
const openProject = async (base: BaseType) => {
@@ -52,6 +68,7 @@ const deleteProject = (base: BaseType) => {
}
const renameInput = ref()
+
const enableEdit = (index: number) => {
basesList.value![index]!.temp_title = basesList.value![index].title
basesList.value![index]!.edit = true
@@ -137,6 +154,7 @@ const workspaceMoveProjectOnSuccess = async (workspaceId: string) => {
}
const isDuplicateDlgOpen = ref(false)
+
const selectedProjectToDuplicate = ref()
const duplicateProject = (base: BaseType) => {
@@ -145,7 +163,9 @@ const duplicateProject = (base: BaseType) => {
}
let clickCount = 0
+
let timer: any = null
+
const delay = 250
function onProjectTitleClick(index: number) {
@@ -379,7 +399,7 @@ const setIcon = async (icon: string, base: BaseType) => {
@apply !pl-6;
}
-:deep(.ant-table-cell:lst-child) {
+:deep(.ant-table-cell:last-child) {
@apply !plr6;
}
diff --git a/packages/nc-gui/components/workspace/Settings.vue b/packages/nc-gui/components/workspace/Settings.vue
index b86adbc5c0..da1f0f1661 100644
--- a/packages/nc-gui/components/workspace/Settings.vue
+++ b/packages/nc-gui/components/workspace/Settings.vue
@@ -1,14 +1,24 @@
{{ $t('labels.selectUserRole') }}
diff --git a/packages/nc-gui/components/workspace/MoveProjectDlg.vue b/packages/nc-gui/components/workspace/MoveProjectDlg.vue
index c4d2eea619..050aec3ef5 100644
--- a/packages/nc-gui/components/workspace/MoveProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/MoveProjectDlg.vue
@@ -55,8 +55,7 @@ const ownedWorkspaces = computed(() => {
{{ $t('activity.moveProject') }}
-
- Workspace
+ {{ $t('objects.workspace') }}