-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue
index 65ec91122e..d8831e794d 100644
--- a/packages/nc-gui/components/cell/Email.vue
+++ b/packages/nc-gui/components/cell/Email.vue
@@ -109,7 +109,7 @@ watch(
{
if (!n) searchVal.value = ''
if (editAllowed.value) {
- if (n) {
+ if (!n) {
+ aselect.value?.$el?.querySelector('input')?.blur()
+ } else {
aselect.value?.$el?.querySelector('input')?.focus()
}
}
diff --git a/packages/nc-gui/components/cell/Rating.vue b/packages/nc-gui/components/cell/Rating.vue
index c189173351..bcc8d5114f 100644
--- a/packages/nc-gui/components/cell/Rating.vue
+++ b/packages/nc-gui/components/cell/Rating.vue
@@ -22,6 +22,8 @@ const column = inject(ColumnInj)!
const readOnly = inject(ReadonlyInj, ref(false))
+const rowHeight = inject(RowHeightInj, ref(undefined))
+
const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
const ratingMeta = computed(() => {
@@ -78,7 +80,15 @@ watch(rateDomRef, () => {
:disabled="readOnly"
:count="ratingMeta.max"
:class="readOnly ? 'pointer-events-none' : ''"
- :style="`color: ${ratingMeta.color}; padding: ${isExpandedFormOpen ? '0px 8px' : '0px 2px'};`"
+ :style="{
+ 'color': ratingMeta.color,
+ 'padding': isExpandedFormOpen ? '0px 8px' : '0px 2px',
+ 'display': '-webkit-box',
+ 'max-width': '100%',
+ '-webkit-line-clamp': rowHeightTruncateLines(rowHeight),
+ '-webkit-box-orient': 'vertical',
+ 'overflow': 'hidden',
+ }"
@keydown="onKeyPress"
>
diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue
index 4f94f7924b..c4c73d3434 100644
--- a/packages/nc-gui/components/cell/Url.vue
+++ b/packages/nc-gui/components/cell/Url.vue
@@ -121,7 +121,7 @@ watch(
v-else-if="isValid && !cellUrlOptions?.overlay"
no-prefetch
no-rel
- class="py-1 z-3 underline hover:opacity-75 nc-cell-field-link"
+ class="py-1 z-3 underline hover:opacity-75 nc-cell-field-link max-w-full"
:to="url"
:target="cellUrlOptions?.behavior === 'replace' ? undefined : '_blank'"
:tabindex="readOnly ? -1 : 0"
@@ -133,7 +133,7 @@ watch(
v-else-if="isValid && !disableOverlay && cellUrlOptions?.overlay"
no-prefetch
no-rel
- class="py-1 z-3 w-full h-full text-center !no-underline hover:opacity-75 nc-cell-field-link"
+ class="py-1 z-3 w-full h-full text-center !no-underline hover:opacity-75 nc-cell-field-link max-w-full"
:to="url"
:target="cellUrlOptions?.behavior === 'replace' ? undefined : '_blank'"
:tabindex="readOnly ? -1 : 0"
diff --git a/packages/nc-gui/components/dashboard/Sidebar/EEMenuOption.vue b/packages/nc-gui/components/dashboard/Sidebar/EEMenuOption.vue
new file mode 100644
index 0000000000..b95f1483e9
--- /dev/null
+++ b/packages/nc-gui/components/dashboard/Sidebar/EEMenuOption.vue
@@ -0,0 +1,3 @@
+
+
+
diff --git a/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
index c3efd5f604..f340b5bab6 100644
--- a/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
+++ b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
@@ -20,12 +20,14 @@ const { isMobileMode } = useGlobal()
const logout = async () => {
isLoggingOut.value = true
try {
+ const isSsoUser = !!(user?.value as any)?.sso_client_id
+
await signOut(false)
// No need as all stores are cleared on signout
// await clearWorkspaces()
- await navigateTo('/signin')
+ await navigateTo(isSsoUser ? '/sso' : '/signin')
} catch (e) {
console.error(e)
} finally {
@@ -167,6 +169,8 @@ onMounted(() => {
diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index ad0789a010..768aaeef01 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -632,9 +632,9 @@ const onTableIdCopy = async () => {
@click="onProjectClick(base, true, true)"
>
diff --git a/packages/nc-gui/components/dashboard/settings/DataSources.vue b/packages/nc-gui/components/dashboard/settings/DataSources.vue
index 400d29a878..96ef06ed9a 100644
--- a/packages/nc-gui/components/dashboard/settings/DataSources.vue
+++ b/packages/nc-gui/components/dashboard/settings/DataSources.vue
@@ -290,11 +290,11 @@ const isEditBaseModalOpen = computed({
-
- {{ $t('objects.users') }}
-
-
-
-
- {{ $t('general.access') }}
-
-
+
{{ $t('labels.action') }}
diff --git a/packages/nc-gui/components/account/UserMenu.vue b/packages/nc-gui/components/account/UserMenu.vue
deleted file mode 100644
index 7fb5e180aa..0000000000
--- a/packages/nc-gui/components/account/UserMenu.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
+
diff --git a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
index 0fcd34ced2..316d1256f8 100644
--- a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
+++ b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
@@ -86,8 +86,7 @@ const customFormState = ref({
const clientTypes = computed(() => {
return _clientTypes.filter((type) => {
- // return appInfo.value?.ee || type.value !== ClientType.SNOWFLAKE
- return type.value !== ClientType.SNOWFLAKE
+ return ![ClientType.SNOWFLAKE, ClientType.DATABRICKS].includes(type.value)
})
})
diff --git a/packages/nc-gui/components/project/ShareBaseDlg.vue b/packages/nc-gui/components/dlg/InviteDlg.vue
similarity index 60%
rename from packages/nc-gui/components/project/ShareBaseDlg.vue
rename to packages/nc-gui/components/dlg/InviteDlg.vue
index e7a855060d..9af903454a 100644
--- a/packages/nc-gui/components/project/ShareBaseDlg.vue
+++ b/packages/nc-gui/components/dlg/InviteDlg.vue
@@ -1,30 +1,43 @@
-
- {{ $t('activity.addMember') }}
+ {{
+ type === 'organization'
+ ? $t('labels.addMembersToOrganization')
+ : type === 'base'
+ ? $t('activity.addMember')
+ : $t('activity.inviteToWorkspace')
+ }}
-
{{ $t('labels.cancel') }}
- {{ $t('activity.inviteToBase') }}
+ {{ type === 'base' ? $t('activity.inviteToBase') : $t('activity.inviteToWorkspace') }}
+
+
diff --git a/packages/nc-gui/components/dlg/TableDelete.vue b/packages/nc-gui/components/dlg/TableDelete.vue
index 59f5d41dc2..3180b60f7a 100644
--- a/packages/nc-gui/components/dlg/TableDelete.vue
+++ b/packages/nc-gui/components/dlg/TableDelete.vue
@@ -79,8 +79,9 @@ const onDelete = async () => {
$e('a:table:delete')
if (oldActiveTableId === toBeDeletedTable.id) {
+ const sourceTables = tables.value.filter((t) => t.source_id === toBeDeletedTable.source_id)
// Navigate to base if no tables left or open first table
- if (tables.value.length === 0) {
+ if (sourceTables.length === 0) {
await navigateTo(
baseUrl({
id: props.baseId,
@@ -88,7 +89,7 @@ const onDelete = async () => {
}),
)
} else {
- await openTable(tables.value[0])
+ await openTable(sourceTables[0])
}
}
diff --git a/packages/nc-gui/components/dlg/WorkspaceDelete.vue b/packages/nc-gui/components/dlg/WorkspaceDelete.vue
deleted file mode 100644
index 3d1e543ef1..0000000000
--- a/packages/nc-gui/components/dlg/WorkspaceDelete.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index d88ca36ebb..05d39a43b9 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -7,7 +7,7 @@ const props = withDefaults(
defineProps<{
type?: NcProjectType | string
modelValue?: string
- size?: 'small' | 'medium' | 'large' | 'xlarge'
+ size?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge'
readonly?: boolean
iconClass?: string
}>(),
@@ -62,6 +62,7 @@ watch(
:class="{
'hover:bg-gray-500 hover:bg-opacity-15 cursor-pointer': !readonly,
'bg-gray-500 bg-opacity-15': isOpen,
+ 'h-5 w-5 text-base': size === 'xsmall',
'h-6 w-6 text-lg': size === 'small',
'h-8 w-8 text-xl': size === 'medium',
'h-10 w-10 text-2xl': size === 'large',
diff --git a/packages/nc-gui/components/general/CopyButton.vue b/packages/nc-gui/components/general/CopyButton.vue
new file mode 100644
index 0000000000..cc2b1c6584
--- /dev/null
+++ b/packages/nc-gui/components/general/CopyButton.vue
@@ -0,0 +1,26 @@
+
+
+
+
+
+
diff --git a/packages/nc-gui/components/general/WorkspaceIcon.vue b/packages/nc-gui/components/general/WorkspaceIcon.vue
index e5d14087ce..963078eb3f 100644
--- a/packages/nc-gui/components/general/WorkspaceIcon.vue
+++ b/packages/nc-gui/components/general/WorkspaceIcon.vue
@@ -6,6 +6,7 @@ const props = defineProps<{
workspace: WorkspaceType | undefined
hideLabel?: boolean
size?: 'small' | 'medium' | 'large'
+ isRounded?: boolean
}>()
const workspaceColor = computed(() => {
@@ -24,6 +25,7 @@ const size = computed(() => props.size || 'medium')
'min-w-4 w-4 h-4 rounded': size === 'small',
'min-w-6 w-6 h-6 rounded-md': size === 'medium',
'min-w-10 w-10 h-10 rounded-lg !text-base': size === 'large',
+ '!rounded-[50%]': props.isRounded,
}"
:style="{ backgroundColor: workspaceColor }"
>
diff --git a/packages/nc-gui/components/nc/Badge.vue b/packages/nc-gui/components/nc/Badge.vue
index 4ba282e4a4..774b1eecbf 100644
--- a/packages/nc-gui/components/nc/Badge.vue
+++ b/packages/nc-gui/components/nc/Badge.vue
@@ -4,17 +4,18 @@ const props = withDefaults(
color?: string
border?: boolean
size?: 'sm' | 'md' | 'lg'
+ rounded?: 'sm' | 'md' | 'lg'
}>(),
{
border: true,
size: 'sm',
+ rounded: 'md',
},
)
-import {
- OrderedProjectRoles,
- OrgUserRoles,
- ProjectRoles,
- WorkspaceRolesToProjectRoles,
- extractRolesObj,
- parseStringDateTime,
- timeAgo,
-} from 'nocodb-sdk'
import type { Roles, WorkspaceUserRoles } from 'nocodb-sdk'
+import { OrderedProjectRoles, OrgUserRoles, ProjectRoles, WorkspaceRolesToProjectRoles } from 'nocodb-sdk'
import type { User } from '#imports'
import { isEeUI, storeToRefs, useUserSorts } from '#imports'
+const props = defineProps<{
+ baseId?: string
+}>()
+
const basesStore = useBases()
const { getBaseUsers, createProjectUser, updateProjectUser, removeProjectUser } = basesStore
-const { activeProjectId } = storeToRefs(basesStore)
+const { activeProjectId, bases } = storeToRefs(basesStore)
-const { orgRoles, baseRoles } = useRoles()
+const { orgRoles, baseRoles, loadRoles } = useRoles()
-const { sorts, sortDirection, loadSorts, saveOrUpdate, handleGetSortedData } = useUserSorts('Project')
+const { sorts, loadSorts, handleGetSortedData, toggleSort } = useUserSorts('Project')
const isSuper = computed(() => orgRoles.value?.[OrgUserRoles.SUPER_ADMIN])
+const orgStore = useOrg()
+const { orgId } = storeToRefs(orgStore)
+
+const isAdminPanel = inject(IsAdminPanelInj, ref(false))
+
+const { $api } = useNuxtApp()
+
+const currentBase = computedAsync(async () => {
+ let base
+ if (props.baseId) {
+ await loadRoles(props.baseId)
+ base = bases.value.get(props.baseId)
+ if (!base) {
+ base = await $api.base.read(props.baseId!)
+ }
+ } else {
+ base = bases.value.get(activeProjectId.value)
+ }
+ return base
+})
+
const isInviteModalVisible = ref(false)
interface Collaborators {
@@ -56,8 +73,9 @@ const sortedCollaborators = computed(() => {
const loadCollaborators = async () => {
try {
+ if (!currentBase.value) return
const { users, totalRows } = await getBaseUsers({
- baseId: activeProjectId.value!,
+ baseId: currentBase.value.id!,
...(!userSearchText.value ? {} : ({ searchText: userSearchText.value } as any)),
force: true,
})
@@ -69,12 +87,11 @@ const loadCollaborators = async () => {
.map((user: any) => ({
...user,
base_roles: user.roles,
- roles: extractRolesObj(user.main_roles)?.[OrgUserRoles.SUPER_ADMIN]
- ? OrgUserRoles.SUPER_ADMIN
- : user.roles ??
- (user.workspace_roles
- ? WorkspaceRolesToProjectRoles[user.workspace_roles as WorkspaceUserRoles] ?? ProjectRoles.NO_ACCESS
- : ProjectRoles.NO_ACCESS),
+ roles:
+ user.roles ??
+ (user.workspace_roles
+ ? WorkspaceRolesToProjectRoles[user.workspace_roles as WorkspaceUserRoles] ?? ProjectRoles.NO_ACCESS
+ : ProjectRoles.NO_ACCESS),
})),
]
} catch (e: any) {
@@ -93,7 +110,7 @@ const updateCollaborator = async (collab: any, roles: ProjectRoles) => {
WorkspaceRolesToProjectRoles[currentCollaborator.workspace_roles as WorkspaceUserRoles] === roles &&
isEeUI)
) {
- await removeProjectUser(activeProjectId.value!, currentCollaborator as unknown as User)
+ await removeProjectUser(currentBase.value.id!, currentCollaborator as unknown as User)
if (
currentCollaborator.workspace_roles &&
WorkspaceRolesToProjectRoles[currentCollaborator.workspace_roles as WorkspaceUserRoles] === roles &&
@@ -105,11 +122,11 @@ const updateCollaborator = async (collab: any, roles: ProjectRoles) => {
}
} else if (currentCollaborator.base_roles) {
currentCollaborator.roles = roles
- await updateProjectUser(activeProjectId.value!, currentCollaborator as unknown as User)
+ await updateProjectUser(currentBase.value.id!, currentCollaborator as unknown as User)
} else {
currentCollaborator.roles = roles
currentCollaborator.base_roles = roles
- await createProjectUser(activeProjectId.value!, currentCollaborator as unknown as User)
+ await createProjectUser(currentBase.value.id!, currentCollaborator as unknown as User)
}
} catch (e: any) {
message.error(await extractSdkResponseErrorMsg(e))
@@ -142,24 +159,50 @@ watch(isInviteModalVisible, () => {
loadCollaborators()
}
})
+
+watch(currentBase, () => {
+ loadCollaborators()
+})
-
+
+
+ {{ workspace.title }}
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{ workspace.title }}
-
-
-
+
+
+
+
+
+ {{ $t('objects.projects') }}
+
+
+ /
+
+
-
+
+
-
+
-
+
-
-
@@ -203,17 +249,16 @@ watch(isInviteModalVisible, () => {
>
-
- {{ $t('objects.users') }}
-
-
+
-
- {{ $t('general.access') }}
-
-
{{ $t('title.dateJoined') }}
+
+
+ {{ collab.display_name || collab.email.slice(0, collab.email.indexOf('@')) }}
+
+
+
{{ collab.email }}
-
-
- {{ collab.display_name }}
-
-
- {{ collab.email }}
-
+
@@ -230,7 +275,7 @@ watch(isInviteModalVisible, () => {
/>
-
@@ -252,6 +297,18 @@ watch(isInviteModalVisible, () => {
diff --git a/packages/nc-gui/components/virtual-cell/components/LinkedItems.vue b/packages/nc-gui/components/virtual-cell/components/LinkedItems.vue
index 5762c2c0d6..6be91be7a1 100644
--- a/packages/nc-gui/components/virtual-cell/components/LinkedItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/LinkedItems.vue
@@ -1,5 +1,6 @@
-
-
-
-
+
+
-
+
+
-
+
-
+ "
+ >
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
+
- {{ $t('msg.noLinkedRecords') }}
-
- {{ $t('msg.clickLinkRecordsToAddLinkFromTable', { tableName: relatedTableMeta?.title }) }}
+
+
+
+
+
-
+
+
+
+ {{ $t('msg.noLinkedRecords') }}
+
+ {{ $t('msg.clickLinkRecordsToAddLinkFromTable') }}
+
-
-
-
-
-
-
-
- {{ totalItemsToShow || 0 }} {{ !isMobileMode ? $t('objects.records') : '' }}
- {{ !isMobileMode && totalItemsToShow !== 0 ? $t('general.are') : '' }}
- {{ $t('general.linked') }}
-
-
-
- {{ state?.[colTitle]?.length || 0 }} {{ $t('objects.records') }}
- {{ state?.[colTitle]?.length !== 0 ? $t('general.are') : '' }}
- {{ $t('general.linked') }}
-
-
-
-
-
- {{ $t('general.finish') }}
-
-
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItem.vue b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
index c4b210e10a..26d1798ea4 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItem.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
@@ -16,19 +16,23 @@ import {
useVModel,
} from '#imports'
import MaximizeIcon from '~icons/nc-icons/maximize'
-import LinkIcon from '~icons/nc-icons/link'
-const props = defineProps<{
- row: any
- fields: any[]
- attachment: any
- relatedTableDisplayValueProp: string
- displayValueTypeAndFormatProp: { type: string; format: string }
- isLoading: boolean
- isLinked: boolean
-}>()
+const props = withDefaults(
+ defineProps<{
+ row: any
+ fields: any[]
+ attachment: any
+ relatedTableDisplayValueProp: string
+ displayValueTypeAndFormatProp: { type: string; format: string }
+ isLoading: boolean
+ isLinked: boolean
+ }>(),
+ {
+ isLoading: false,
+ },
+)
-defineEmits(['expand'])
+defineEmits(['expand', 'linkOrUnlink'])
provide(IsExpandedFormOpenInj, ref(true))
@@ -88,116 +92,198 @@ const displayValue = computed(() => {
-
-
@@ -394,7 +470,15 @@ const onFilterChange = () => {
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
- {{ displayValue }}
-
-
+ {{ isLinked ? 'Unlink' : 'Link' }}
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
+
+
+
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index 7362d977a4..581c0aa101 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -1,6 +1,10 @@
-
-
-
-
-
+
+
+
+ {{ displayValue }}
+
+
+
+
+
+
+
+
+
-
+
+ -
+ -
+
+
-
-
Invite Members By Email
+
+
+
+
-
+
+
-
-
-
+
-
- {{ $t('objects.users') }}
-
-
-
-
- {{ $t('general.access') }}
-
-
- {{ $t('title.dateJoined') }}
- Actions
-
+
+
{{ $t('title.dateJoined') }}
+ {{ $t('labels.actions') }}
+
-
-
-
+
+
+
+
+
-
+
+
+ {{ collab.display_name || collab.email.slice(0, collab.email.indexOf('@')) }}
+
+
+
{{ collab.email }}
-
-
- {{ collab.display_name }}
-
-
- {{ collab.email }}
-
+
-
-
@@ -170,6 +237,18 @@ onMounted(async () => {
diff --git a/packages/nc-gui/components/workspace/View.vue b/packages/nc-gui/components/workspace/View.vue
index 50750cf56a..8d26186741 100644
--- a/packages/nc-gui/components/workspace/View.vue
+++ b/packages/nc-gui/components/workspace/View.vue
@@ -1,5 +1,10 @@
-
+
-
+
+
-
-
-
+
{{ parseStringDateTime(collab.created_at) }}
@@ -138,14 +184,35 @@ onMounted(async () => {
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
@@ -154,15 +221,15 @@ onMounted(async () => {
- 
+
+
- {{ $t('placeholder.inviteYourTeam') }}
-
-
- {{ $t('placeholder.inviteYourTeamLabel') }}
-
-
+
+
+ {{ $t('placeholder.inviteYourTeam') }}
+
+ {{ $t('placeholder.inviteYourTeamLabel') }}
+
+
- [] = []
+ const removedRowsData: Record[] = []
let compositePrimaryKey = ''
while (row--) {
- const { row: rowObj, rowMeta } = formattedData.value[row] as Record
+ const { row: rowData, rowMeta } = formattedData.value[row] as Record
if (!rowMeta.selected) {
continue
}
if (!rowMeta.new) {
const extractedPk = extractPk(meta?.value?.columns as ColumnType[])
- const compositePkValue = extractPkFromRow(rowObj, meta?.value?.columns as ColumnType[])
+ const compositePkValue = extractPkFromRow(rowData, meta?.value?.columns as ColumnType[])
+ const pkData = rowPkData(rowData, meta?.value?.columns as ColumnType[])
if (extractedPk && compositePkValue) {
if (!compositePrimaryKey) compositePrimaryKey = extractedPk
removedRowsData.push({
[compositePrimaryKey]: compositePkValue as string,
+ pkData,
row: clone(formattedData.value[row]) as Row,
rowIndex: row as number,
})
@@ -656,6 +659,8 @@ export function useData(args: {
if (!removedRowsData.length) return
+ isPaginationLoading.value = true
+
const { list } = await $api.dbTableRow.list(NOCO, base?.value.id as string, meta.value?.id as string, {
pks: removedRowsData.map((row) => row[compositePrimaryKey]).join(','),
})
@@ -670,32 +675,22 @@ export function useData(args: {
rowObj.row = clone(fullRecord)
}
- const removedRowIds: Record[] = await bulkDeleteRows(
- removedRowsData.map((row) => ({ [compositePrimaryKey]: row[compositePrimaryKey] as string })),
- )
-
- if (Array.isArray(removedRowIds)) {
- const removedRowsDataSet = new Set(removedRowIds.map((row) => row[compositePrimaryKey]))
-
- removedRowsData = removedRowsData.filter((row) => removedRowsDataSet.has(row[compositePrimaryKey] as string))
-
- const rowIndexesSet = new Set(removedRowsData.map((row) => row.rowIndex))
- formattedData.value = formattedData.value.filter((_, index) => rowIndexesSet.has(index))
- } else {
- removedRowsData = []
- }
+ await bulkDeleteRows(removedRowsData.map((row) => row.pkData))
} catch (e: any) {
return message.error(`${t('msg.error.deleteRowFailed')}: ${await extractSdkResponseErrorMsg(e)}`)
}
- if (!removedRowsData.length) return
+ if (!removedRowsData.length) {
+ isPaginationLoading.value = false
+ return
+ }
addUndo({
redo: {
- fn: async function redo(this: UndoRedoAction, removedRowsData: Record[], compositePrimaryKey: string) {
- const removedRowIds = await bulkDeleteRows(
- removedRowsData.map((row) => ({ [compositePrimaryKey]: row[compositePrimaryKey] as string })),
- )
+ fn: async function redo(this: UndoRedoAction, removedRowsData: Record[]) {
+ isPaginationLoading.value = true
+
+ const removedRowIds = await bulkDeleteRows(removedRowsData.map((row) => row.pkData))
if (Array.isArray(removedRowIds)) {
for (const { row } of removedRowsData) {
@@ -706,9 +701,11 @@ export function useData(args: {
}
}
+ await callbacks?.syncCount?.()
await callbacks?.syncPagination?.()
+ await callbacks?.globalCallback?.()
},
- args: [removedRowsData, compositePrimaryKey],
+ args: [removedRowsData],
},
undo: {
fn: async function undo(
@@ -764,22 +761,24 @@ export function useData(args: {
// plus one because we want to include the end row
let row = start + 1
- let removedRowsData: Record[] = []
+ const removedRowsData: Record[] = []
let compositePrimaryKey = ''
while (row--) {
try {
- const { row: rowObj, rowMeta } = formattedData.value[row] as Record
+ const { row: rowData, rowMeta } = formattedData.value[row] as Record
if (!rowMeta.new) {
const extractedPk = extractPk(meta?.value?.columns as ColumnType[])
- const compositePkValue = extractPkFromRow(rowObj, meta?.value?.columns as ColumnType[])
+ const compositePkValue = extractPkFromRow(rowData, meta?.value?.columns as ColumnType[])
+ const pkData = rowPkData(rowData, meta?.value?.columns as ColumnType[])
if (extractedPk && compositePkValue) {
if (!compositePrimaryKey) compositePrimaryKey = extractedPk
removedRowsData.push({
[compositePrimaryKey]: compositePkValue as string,
+ pkData,
row: clone(formattedData.value[row]) as Row,
rowIndex: row as number,
})
@@ -794,6 +793,8 @@ export function useData(args: {
if (!removedRowsData.length) return
+ isPaginationLoading.value = true
+
const { list } = await $api.dbTableRow.list(NOCO, base?.value.id as string, meta.value?.id as string, {
pks: removedRowsData.map((row) => row[compositePrimaryKey]).join(','),
})
@@ -808,32 +809,22 @@ export function useData(args: {
rowObj.row = clone(fullRecord)
}
- const removedRowIds: Record[] = await bulkDeleteRows(
- removedRowsData.map((row) => ({ [compositePrimaryKey]: row[compositePrimaryKey] as string })),
- )
-
- if (Array.isArray(removedRowIds)) {
- const removedRowsDataSet = new Set(removedRowIds.map((row) => row[compositePrimaryKey]))
-
- removedRowsData = removedRowsData.filter((row) => removedRowsDataSet.has(row[compositePrimaryKey] as string))
-
- const rowIndexesSet = new Set(removedRowsData.map((row) => row.rowIndex))
- formattedData.value = formattedData.value.filter((_, index) => rowIndexesSet.has(index))
- } else {
- removedRowsData = []
- }
+ await bulkDeleteRows(removedRowsData.map((row) => row.pkData))
} catch (e: any) {
return message.error(`${t('msg.error.deleteRowFailed')}: ${await extractSdkResponseErrorMsg(e)}`)
}
- if (!removedRowsData.length) return
+ if (!removedRowsData.length) {
+ isPaginationLoading.value = false
+ return
+ }
addUndo({
redo: {
- fn: async function redo(this: UndoRedoAction, removedRowsData: Record[], compositePrimaryKey: string) {
- const removedRowIds = await bulkDeleteRows(
- removedRowsData.map((row) => ({ [compositePrimaryKey]: row[compositePrimaryKey] as string })),
- )
+ fn: async function redo(this: UndoRedoAction, removedRowsData: Record[]) {
+ isPaginationLoading.value = true
+
+ const removedRowIds = await bulkDeleteRows(removedRowsData.map((row) => row.pkData))
if (Array.isArray(removedRowIds)) {
for (const { row } of removedRowsData) {
@@ -844,9 +835,11 @@ export function useData(args: {
}
}
+ await callbacks?.syncCount?.()
await callbacks?.syncPagination?.()
+ await callbacks?.globalCallback?.()
},
- args: [removedRowsData, compositePrimaryKey],
+ args: [removedRowsData],
},
undo: {
fn: async function undo(
@@ -898,19 +891,14 @@ export function useData(args: {
rows: Record[],
{ metaValue = meta.value, viewMetaValue = viewMeta.value }: { metaValue?: TableType; viewMetaValue?: ViewType } = {},
) {
- isPaginationLoading.value = true
try {
const bulkDeletedRowsData = await $api.dbDataTableRow.delete(metaValue?.id as string, rows.length === 1 ? rows[0] : rows, {
viewId: viewMetaValue?.id as string,
})
- await callbacks?.syncCount?.()
return rows.length === 1 && bulkDeletedRowsData ? [bulkDeletedRowsData] : bulkDeletedRowsData
} catch (error: any) {
message.error(await extractSdkResponseErrorMsg(error))
- } finally {
- await callbacks?.globalCallback?.()
- isPaginationLoading.value = false
}
}
diff --git a/packages/nc-gui/composables/useExpandedFormDetached/index.ts b/packages/nc-gui/composables/useExpandedFormDetached/index.ts
index 6dfc6b6fa7..f7cfe33b10 100644
--- a/packages/nc-gui/composables/useExpandedFormDetached/index.ts
+++ b/packages/nc-gui/composables/useExpandedFormDetached/index.ts
@@ -19,6 +19,8 @@ const [setup, use] = useInjectionState(() => {
return ref([])
})
+export { setup as useExpandedFormDetachedProvider }
+
export function useExpandedFormDetached() {
let states = use()!
diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts
index 96cf8e78ff..963465f06e 100644
--- a/packages/nc-gui/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui/composables/useExpandedFormStore.ts
@@ -56,7 +56,9 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
: ({ row: {}, oldRow: {}, rowMeta: {} } as Row),
)
- const rowStore = useProvideSmartsheetRowStore(meta, row)
+ row.value.rowMeta.fromExpandedForm = true
+
+ const rowStore = useProvideSmartsheetRowStore(row)
const activeView = inject(ActiveViewInj, ref())
@@ -172,129 +174,125 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
} = {},
) => {
let data
- try {
- const isNewRow = row.value.rowMeta?.new ?? false
- if (isNewRow) {
- const { getMeta } = useMetas()
+ const isNewRow = row.value.rowMeta?.new ?? false
- const { missingRequiredColumns, insertObj } = await populateInsertObject({
- meta: meta.value,
- ltarState,
- getMeta,
- row: row.value.row,
- throwError: true,
- })
+ if (isNewRow) {
+ const { getMeta } = useMetas()
- if (missingRequiredColumns.size) return
+ const { missingRequiredColumns, insertObj } = await populateInsertObject({
+ meta: meta.value,
+ ltarState,
+ getMeta,
+ row: row.value.row,
+ throwError: true,
+ })
- data = await $api.dbTableRow.create('noco', base.value.id as string, meta.value.id, {
- ...insertObj,
- ...(ltarState || {}),
- })
+ if (missingRequiredColumns.size) return
+
+ data = await $api.dbTableRow.create('noco', base.value.id as string, meta.value.id, {
+ ...insertObj,
+ ...(ltarState || {}),
+ })
+
+ Object.assign(row.value, {
+ row: data,
+ rowMeta: {},
+ oldRow: { ...data },
+ })
- Object.assign(row.value, {
- row: data,
- rowMeta: {},
- oldRow: { ...data },
+ if (!undo) {
+ const id = extractPkFromRow(data, meta.value?.columns as ColumnType[])
+ const pkData = rowPkData(row.value.row, meta.value?.columns as ColumnType[])
+
+ // TODO remove linked record
+ addUndo({
+ redo: {
+ fn: async (rowData: any) => {
+ await $api.dbTableRow.create('noco', base.value.id as string, meta.value.id, { ...pkData, ...rowData })
+ await loadKanbanData()
+ reloadTrigger?.trigger()
+ },
+ args: [clone(insertObj)],
+ },
+ undo: {
+ fn: async (id: string) => {
+ const res: any = await $api.dbViewRow.delete(
+ 'noco',
+ base.value.id as string,
+ meta.value?.id as string,
+ activeView.value?.id as string,
+ encodeURIComponent(id),
+ )
+ if (res.message) {
+ throw new Error(res.message)
+ }
+
+ await loadKanbanData()
+ reloadTrigger?.trigger()
+ },
+ args: [id],
+ },
+ scope: defineViewScope({ view: activeView.value }),
})
+ }
+ } else {
+ const updateOrInsertObj = [...changedColumns.value].reduce((obj, col) => {
+ obj[col] = row.value.row[col]
+ return obj
+ }, {} as Record)
+ if (Object.keys(updateOrInsertObj).length) {
+ const id = extractPkFromRow(row.value.row, meta.value.columns as ColumnType[])
+
+ if (!id) {
+ return message.info("Update not allowed for table which doesn't have primary Key")
+ }
+
+ await $api.dbTableRow.update(NOCO, base.value.id as string, meta.value.id, encodeURIComponent(id), updateOrInsertObj)
if (!undo) {
- const id = extractPkFromRow(data, meta.value?.columns as ColumnType[])
- const pkData = rowPkData(row.value.row, meta.value?.columns as ColumnType[])
+ const undoObject = [...changedColumns.value].reduce((obj, col) => {
+ obj[col] = row.value.oldRow[col]
+ return obj
+ }, {} as Record)
- // TODO remove linked record
addUndo({
redo: {
- fn: async (rowData: any) => {
- await $api.dbTableRow.create('noco', base.value.id as string, meta.value.id, { ...pkData, ...rowData })
+ fn: async (id: string, data: Record) => {
+ await $api.dbTableRow.update(NOCO, base.value.id as string, meta.value.id, encodeURIComponent(id), data)
await loadKanbanData()
+
reloadTrigger?.trigger()
},
- args: [clone(insertObj)],
+ args: [id, clone(updateOrInsertObj)],
},
undo: {
- fn: async (id: string) => {
- const res: any = await $api.dbViewRow.delete(
- 'noco',
- base.value.id as string,
- meta.value?.id as string,
- activeView.value?.id as string,
- encodeURIComponent(id),
- )
- if (res.message) {
- throw new Error(res.message)
- }
-
+ fn: async (id: string, data: Record) => {
+ await $api.dbTableRow.update(NOCO, base.value.id as string, meta.value.id, encodeURIComponent(id), data)
await loadKanbanData()
reloadTrigger?.trigger()
},
- args: [id],
+ args: [id, clone(undoObject)],
},
scope: defineViewScope({ view: activeView.value }),
})
}
- } else {
- const updateOrInsertObj = [...changedColumns.value].reduce((obj, col) => {
- obj[col] = row.value.row[col]
- return obj
- }, {} as Record)
- if (Object.keys(updateOrInsertObj).length) {
- const id = extractPkFromRow(row.value.row, meta.value.columns as ColumnType[])
-
- if (!id) {
- return message.info("Update not allowed for table which doesn't have primary Key")
- }
- await $api.dbTableRow.update(NOCO, base.value.id as string, meta.value.id, encodeURIComponent(id), updateOrInsertObj)
-
- if (!undo) {
- const undoObject = [...changedColumns.value].reduce((obj, col) => {
- obj[col] = row.value.oldRow[col]
- return obj
- }, {} as Record)
-
- addUndo({
- redo: {
- fn: async (id: string, data: Record) => {
- await $api.dbTableRow.update(NOCO, base.value.id as string, meta.value.id, encodeURIComponent(id), data)
- await loadKanbanData()
-
- reloadTrigger?.trigger()
- },
- args: [id, clone(updateOrInsertObj)],
- },
- undo: {
- fn: async (id: string, data: Record) => {
- await $api.dbTableRow.update(NOCO, base.value.id as string, meta.value.id, encodeURIComponent(id), data)
- await loadKanbanData()
- reloadTrigger?.trigger()
- },
- args: [id, clone(undoObject)],
- },
- scope: defineViewScope({ view: activeView.value }),
- })
- }
-
- if (commentsDrawer.value) {
- await loadCommentsAndLogs()
- }
- } else {
- // No columns to update
- message.info(t('msg.info.noColumnsToUpdate'))
- return
+ if (commentsDrawer.value) {
+ await loadCommentsAndLogs()
}
+ } else {
+ // No columns to update
+ message.info(t('msg.info.noColumnsToUpdate'))
+ return
}
+ }
- if (activeView.value?.type === ViewTypes.KANBAN && kanbanClbk) {
- kanbanClbk(row.value, isNewRow)
- }
-
- changedColumns.value = new Set()
- } catch (e: any) {
- console.error(e)
- message.error(`${t('msg.error.rowUpdateFailed')}: ${await extractSdkResponseErrorMsg(e)}`)
+ if (activeView.value?.type === ViewTypes.KANBAN && kanbanClbk) {
+ kanbanClbk(row.value, isNewRow)
}
+
+ changedColumns.value = new Set()
$e('a:row-expand:add')
return data
}
@@ -304,6 +302,8 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
}
const loadRow = async (rowId?: string, onlyVirtual = false) => {
+ if (row.value.rowMeta.new) return
+
if (isPublic.value || !meta.value?.id) return
let record = await $api.dbTableRow.read(
NOCO,
diff --git a/packages/nc-gui/composables/useLTARStore.ts b/packages/nc-gui/composables/useLTARStore.ts
index 4ece4be094..747e0aaca2 100644
--- a/packages/nc-gui/composables/useLTARStore.ts
+++ b/packages/nc-gui/composables/useLTARStore.ts
@@ -12,9 +12,11 @@ import {
IsPublicInj,
Modal,
NOCO,
+ NcErrorType,
SharedViewPasswordInj,
computed,
extractSdkResponseErrorMsg,
+ extractSdkResponseErrorMsgv2,
inject,
message,
parseProp,
@@ -188,15 +190,16 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
return row.value.row[displayValueProp.value]
})
- const loadChildrenExcludedList = async (activeState?: any) => {
+ const loadChildrenExcludedList = async (activeState?: any, resetOffset: boolean = false) => {
if (activeState) newRowState.state = activeState
try {
let offset =
childrenExcludedListPagination.size * (childrenExcludedListPagination.page - 1) - childrenExcludedOffsetCount.value
- if (offset < 0) {
+ if (offset < 0 || resetOffset) {
offset = 0
childrenExcludedOffsetCount.value = 0
+ childrenExcludedListPagination.page = 1
}
isChildrenExcludedLoading.value = true
if (isPublic.value) {
@@ -266,7 +269,11 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
// Mark out exact same objects in activeState[column.value.title] as Linked
// compare all keys and values
childrenExcludedList.value.list.forEach((row: any, index: number) => {
- const found = activeState[column.value.title].find((a: any) => {
+ const found = (
+ [RelationTypes.BELONGS_TO, RelationTypes.ONE_TO_ONE].includes(colOptions.value.type)
+ ? [activeState[column.value.title]]
+ : activeState[column.value.title]
+ ).find((a: any) => {
let isSame = true
for (const key in a) {
@@ -284,27 +291,29 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
}
} catch (e: any) {
// temporary fix to handle when offset is beyond limit
- if ((await extractSdkResponseErrorMsg(e)) === 'Offset is beyond the total number of records') {
+ const error = await extractSdkResponseErrorMsgv2(e)
+
+ if (error.error === NcErrorType.INVALID_OFFSET_VALUE) {
childrenExcludedListPagination.page = 0
- return loadChildrenExcludedList(activeState)
+ return loadChildrenExcludedList(activeState, true)
}
- message.error(`${t('msg.error.failedToLoadList')}: ${await extractSdkResponseErrorMsg(e)}`)
+ message.error(`${t('msg.error.failedToLoadList')}: ${error.message}`)
} finally {
isChildrenExcludedLoading.value = false
}
}
- const loadChildrenList = async () => {
+ const loadChildrenList = async (resetOffset: boolean = false) => {
try {
isChildrenLoading.value = true
if ([RelationTypes.BELONGS_TO, RelationTypes.ONE_TO_ONE].includes(colOptions.value.type)) return
if (!rowId.value || !column.value) return
let offset = childrenListPagination.size * (childrenListPagination.page - 1) + childrenListOffsetCount.value
-
- if (offset < 0) {
+ if (offset < 0 || resetOffset) {
offset = 0
childrenListOffsetCount.value = 0
+ childrenListPagination.page = 1
} else if (offset >= childrenListCount.value) {
offset = 0
}
@@ -347,6 +356,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
isChildrenListLinked.value[index] = true
isChildrenListLoading.value[index] = false
})
+
if (!childrenListPagination.query) {
childrenListCount.value = childrenList.value?.pageInfo.totalRows ?? 0
}
diff --git a/packages/nc-gui/composables/useMetas.ts b/packages/nc-gui/composables/useMetas.ts
index 5992994ee5..1159de8444 100644
--- a/packages/nc-gui/composables/useMetas.ts
+++ b/packages/nc-gui/composables/useMetas.ts
@@ -3,7 +3,7 @@ import type { WatchStopHandle } from 'vue'
import type { TableType } from 'nocodb-sdk'
import { extractSdkResponseErrorMsg, storeToRefs, useBase, useNuxtApp, useState, watch } from '#imports'
-export function useMetas() {
+export const useMetas = createSharedComposable(() => {
const { $api } = useNuxtApp()
const { tables: _tables } = storeToRefs(useBase())
@@ -118,4 +118,4 @@ export function useMetas() {
}
return { getMeta, clearAllMeta, metas, metasWithIdAsKey, removeMeta, setMeta }
-}
+})
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 97e9d154eb..5a5dd4e3b1 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -300,7 +300,10 @@ export function useMultiSelect(
const blobHTML = new Blob([copyHTML], { type: 'text/html' })
const blobPlainText = new Blob([copyPlainText], { type: 'text/plain' })
- return navigator.clipboard.write([new ClipboardItem({ [blobHTML.type]: blobHTML, [blobPlainText.type]: blobPlainText })])
+ return (
+ navigator.clipboard?.write([new ClipboardItem({ [blobHTML.type]: blobHTML, [blobPlainText.type]: blobPlainText })]) ??
+ copy(copyPlainText)
+ )
}
async function copyValue(ctx?: Cell) {
@@ -332,25 +335,47 @@ export function useMultiSelect(
}
}
- function isCellSelected(row: number, col: number) {
- if (activeCell.col === col && activeCell.row === row) {
- return true
+ const fillRangeMap = computed(() => {
+ /*
+ `${rowIndex}-${colIndex}`: true | false
+ */
+ const map: Record = {}
+
+ if (fillRange._start === null || fillRange._end === null) {
+ return map
}
- return selectedRange.isCellInRange({ row, col })
- }
+ for (let row = fillRange.start.row; row <= fillRange.end.row; row++) {
+ for (let col = fillRange.start.col; col <= fillRange.end.col; col++) {
+ map[`${row}-${col}`] = true
+ }
+ }
- function isCellInFillRange(row: number, col: number) {
- if (fillRange._start === null || fillRange._end === null) {
- return false
+ return map
+ })
+
+ const selectRangeMap = computed(() => {
+ /*
+ `${rowIndex}-${colIndex}`: true | false
+ */
+ const map: Record = {}
+
+ if (activeCell.row !== null && activeCell.col !== null) {
+ map[`${activeCell.row}-${activeCell.col}`] = true
}
- if (selectedRange.isCellInRange({ row, col })) {
- return false
+ if (selectedRange._start === null || selectedRange._end === null) {
+ return map
}
- return fillRange.isCellInRange({ row, col })
- }
+ for (let row = selectedRange.start.row; row <= selectedRange.end.row; row++) {
+ for (let col = selectedRange.start.col; col <= selectedRange.end.col; col++) {
+ map[`${row}-${col}`] = true
+ }
+ }
+
+ return map
+ })
const isPasteable = (row?: Row, col?: ColumnType, showInfo = false) => {
if (!row || !col) {
@@ -417,7 +442,7 @@ export function useMultiSelect(
// if there was a right click on selected range, don't restart the selection
if (
(event?.button !== MAIN_MOUSE_PRESSED || (event?.button === MAIN_MOUSE_PRESSED && event.ctrlKey)) &&
- isCellSelected(row, col)
+ selectRangeMap.value[`${row}-${col}`]
) {
return
}
@@ -486,7 +511,7 @@ export function useMultiSelect(
fillDirection === 1 ? row <= fillRange._end.row : row >= fillRange._end.row;
row += fillDirection
) {
- if (isCellSelected(row, selectedRange.start.col)) {
+ if (selectRangeMap.value[`${row}-${selectedRange.start.col}`]) {
continue
}
@@ -1295,14 +1320,14 @@ export function useMultiSelect(
handleMouseOver,
clearSelectedRange,
copyValue,
- isCellSelected,
activeCell,
handleCellClick,
resetSelectedRange,
selectedRange,
makeActive,
- isCellInFillRange,
isMouseDown,
isFillMode,
+ selectRangeMap,
+ fillRangeMap,
}
}
diff --git a/packages/nc-gui/composables/useOrganization.ts b/packages/nc-gui/composables/useOrganization.ts
new file mode 100644
index 0000000000..3dea47c819
--- /dev/null
+++ b/packages/nc-gui/composables/useOrganization.ts
@@ -0,0 +1,23 @@
+export const useOrganization = () => {
+ const workspaces = ref([])
+ const members = ref([])
+ const bases = ref([])
+
+ const { orgId } = storeToRefs(useOrg())
+
+ const listWorkspaces = async (..._args: any) => {}
+
+ const fetchOrganizationMembers = async (..._args: any) => {}
+
+ const fetchOrganizationBases = async (..._args: any) => {}
+
+ return {
+ orgId,
+ workspaces,
+ listWorkspaces,
+ fetchOrganizationMembers,
+ fetchOrganizationBases,
+ bases,
+ members,
+ }
+}
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 1631c39fb7..1ffa5d1eac 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -1,7 +1,6 @@
import useVuelidate from '@vuelidate/core'
import { helpers, minLength, required, sameAs } from '@vuelidate/validators'
import dayjs from 'dayjs'
-import type { Ref } from 'vue'
import type {
BoolType,
ColumnType,
@@ -91,8 +90,9 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
const preFilledDefaultValueformState = ref>({})
+ useProvideSmartsheetLtarHelpers(meta)
+
const { state: additionalState } = useProvideSmartsheetRowStore(
- meta as Ref,
ref({
row: formState,
rowMeta: { new: true },
@@ -217,7 +217,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
((column.rqd && !column.cdf) || (column.pk && !(column.ai || column.cdf)) || column.required)
) {
obj.localState[column.title!] = {
- required: fieldRequired(undefined, column.uidt === UITypes.Checkbox && column.required ? true : false),
+ required: fieldRequired(undefined, !!(column.uidt === UITypes.Checkbox && column.required)),
}
} else if (
isLinksOrLTAR(column) &&
diff --git a/packages/nc-gui/composables/useSmartsheetLtarHelpers.ts b/packages/nc-gui/composables/useSmartsheetLtarHelpers.ts
new file mode 100644
index 0000000000..4e2ecc5367
--- /dev/null
+++ b/packages/nc-gui/composables/useSmartsheetLtarHelpers.ts
@@ -0,0 +1,249 @@
+import { RelationTypes, isLinksOrLTAR } from 'nocodb-sdk'
+import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
+import type { Ref } from 'vue'
+import {
+ NOCO,
+ deepCompare,
+ extractPkFromRow,
+ extractSdkResponseErrorMsg,
+ isBt,
+ isHm,
+ isMm,
+ isOo,
+ message,
+ storeToRefs,
+ unref,
+ useBase,
+ useI18n,
+ useInjectionState,
+ useMetas,
+ useNuxtApp,
+} from '#imports'
+import type { Row } from '#imports'
+
+const [useProvideSmartsheetLtarHelpers, useSmartsheetLtarHelpers] = useInjectionState(
+ (meta: Ref | ComputedRef) => {
+ const { $api } = useNuxtApp()
+
+ const { t } = useI18n()
+
+ const { base } = storeToRefs(useBase())
+
+ const { metas } = useMetas()
+
+ const getRowLtarHelpers = (row: Row) => {
+ if (!row.rowMeta) {
+ row.rowMeta = {}
+ }
+ if (!row.rowMeta.ltarState) {
+ row.rowMeta.ltarState = {}
+ }
+ return row.rowMeta.ltarState
+ }
+
+ // actions
+ const addLTARRef = async (row: Row, value: Record, column: ColumnType) => {
+ if (isHm(column) || isMm(column)) {
+ if (!getRowLtarHelpers(row)[column.title!]) getRowLtarHelpers(row)[column.title!] = []
+
+ if (getRowLtarHelpers(row)[column.title!]!.find((ln: Record) => deepCompare(ln, value))) {
+ // This value is already in the list
+ return message.info(t('msg.info.valueAlreadyInList'))
+ }
+
+ if (Array.isArray(value)) {
+ getRowLtarHelpers(row)[column.title!]!.push(...value)
+ } else {
+ getRowLtarHelpers(row)[column.title!]!.push(value)
+ }
+ } else if (isBt(column) || isOo(column)) {
+ getRowLtarHelpers(row)[column.title!] = value
+ }
+ }
+
+ // actions
+ const removeLTARRef = async (row: Row, value: Record, column: ColumnType) => {
+ if (isHm(column) || isMm(column)) {
+ getRowLtarHelpers(row)[column.title!]?.splice(getRowLtarHelpers(row)[column.title!]?.indexOf(value), 1)
+ } else if (isBt(column) || isOo(column)) {
+ getRowLtarHelpers(row)[column.title!] = null
+ }
+ }
+
+ const linkRecord = async (
+ rowId: string,
+ relatedRowId: string,
+ column: ColumnType,
+ type: RelationTypes,
+ { metaValue = meta.value }: { metaValue?: TableType } = {},
+ ) => {
+ try {
+ await $api.dbTableRow.nestedAdd(
+ NOCO,
+ base.value.id as string,
+ metaValue?.id as string,
+ encodeURIComponent(rowId),
+ type,
+ column.id as string,
+ encodeURIComponent(relatedRowId),
+ )
+ } catch (e: any) {
+ message.error(await extractSdkResponseErrorMsg(e))
+ }
+ }
+
+ /** sync LTAR relations kept in local state */
+ const syncLTARRefs = async (
+ row: Row,
+ rowData: Record,
+ { metaValue = meta.value }: { metaValue?: TableType } = {},
+ ) => {
+ const id = extractPkFromRow(rowData, metaValue?.columns as ColumnType[])
+ for (const column of metaValue?.columns ?? []) {
+ if (!isLinksOrLTAR(column)) continue
+
+ const colOptions = column.colOptions as LinkToAnotherRecordType
+
+ const relatedTableMeta = metas.value?.[colOptions?.fk_related_model_id as string]
+
+ if (isHm(column) || isMm(column)) {
+ const relatedRows = (getRowLtarHelpers(row)?.[column.title!] ?? []) as Record[]
+
+ for (const relatedRow of relatedRows) {
+ await linkRecord(
+ id,
+ extractPkFromRow(relatedRow, relatedTableMeta.columns as ColumnType[]),
+ column,
+ colOptions.type as RelationTypes,
+ { metaValue },
+ )
+ }
+ } else if ((isBt(column) || isOo(column)) && getRowLtarHelpers(row)?.[column.title!]) {
+ await linkRecord(
+ id,
+ extractPkFromRow(
+ getRowLtarHelpers(row)?.[column.title!] as Record,
+ relatedTableMeta.columns as ColumnType[],
+ ),
+ column,
+ colOptions.type as RelationTypes,
+ { metaValue },
+ )
+ }
+
+ // clear LTAR refs after sync
+ getRowLtarHelpers(row)[column.title!] = null
+ }
+ }
+
+ // clear LTAR cell
+ const clearLTARCell = async (row: Row, column: ColumnType) => {
+ try {
+ if (!column || !isLinksOrLTAR(column)) return
+
+ const relatedTableMeta = metas.value?.[(column?.colOptions)?.fk_related_model_id as string]
+
+ if (row.rowMeta.new) {
+ getRowLtarHelpers(row)[column.title!] = null
+ } else {
+ if ([RelationTypes.BELONGS_TO, RelationTypes.ONE_TO_ONE].includes((column.colOptions)?.type)) {
+ if (!row.row[column.title!]) return
+ await $api.dbTableRow.nestedRemove(
+ NOCO,
+ base.value.id as string,
+ meta.value?.id as string,
+ extractPkFromRow(row.row, meta.value?.columns as ColumnType[]),
+ (column.colOptions)?.type as any,
+ column.id as string,
+ extractPkFromRow(row.row[column.title!], relatedTableMeta?.columns as ColumnType[]),
+ )
+ row.row[column.title!] = null
+ } else {
+ for (const link of (row.row[column.title!] as Record[]) || []) {
+ await $api.dbTableRow.nestedRemove(
+ NOCO,
+ base.value.id as string,
+ meta.value?.id as string,
+ encodeURIComponent(extractPkFromRow(row.row, meta.value?.columns as ColumnType[])),
+ (column?.colOptions).type as 'hm' | 'mm',
+ column.id as string,
+ encodeURIComponent(extractPkFromRow(link, relatedTableMeta?.columns as ColumnType[])),
+ )
+ }
+ row.row[column.title!] = []
+ }
+ }
+ } catch (e: any) {
+ message.error(await extractSdkResponseErrorMsg(e))
+ }
+ }
+
+ const loadRow = async (row: Row) => {
+ const record = await $api.dbTableRow.read(
+ NOCO,
+ base.value?.id as string,
+ meta.value?.title as string,
+ encodeURIComponent(extractPkFromRow(row.row, meta.value?.columns as ColumnType[])),
+ )
+ Object.assign(unref(row), {
+ row: record,
+ oldRow: { ...record },
+ rowMeta: {},
+ })
+ }
+
+ // clear MM cell
+ const cleaMMCell = async (row: Row, column: ColumnType) => {
+ try {
+ if (!column || !isLinksOrLTAR(column)) return
+
+ if (row.rowMeta.new) {
+ getRowLtarHelpers(row)[column.title!] = null
+ } else {
+ if ((column.colOptions)?.type === RelationTypes.MANY_TO_MANY) {
+ if (!row.row[column.title!]) return
+
+ const result = await $api.dbDataTableRow.nestedListCopyPasteOrDeleteAll(
+ meta.value?.id as string,
+ column.id as string,
+ [
+ {
+ operation: 'deleteAll',
+ rowId: extractPkFromRow(row.row, meta.value?.columns as ColumnType[]) as string,
+ columnId: column.id as string,
+ fk_related_model_id: (column.colOptions as LinkToAnotherRecordType)?.fk_related_model_id as string,
+ },
+ ],
+ )
+
+ row.row[column.title!] = null
+
+ return Array.isArray(result.unlink) ? result.unlink : []
+ }
+ }
+ } catch (e: any) {
+ message.error(await extractSdkResponseErrorMsg(e))
+ }
+ }
+
+ return {
+ addLTARRef,
+ removeLTARRef,
+ syncLTARRefs,
+ loadRow,
+ clearLTARCell,
+ cleaMMCell,
+ }
+ },
+ 'smartsheet-ltar-helpers',
+)
+
+export { useProvideSmartsheetLtarHelpers }
+
+export function useSmartsheetLtarHelpersOrThrow() {
+ const smartsheetLtarHelpers = useSmartsheetLtarHelpers()
+
+ if (smartsheetLtarHelpers == null) throw new Error('Please call `useSmartsheetLtarHelpers` on the appropriate parent component')
+
+ return smartsheetLtarHelpers
+}
diff --git a/packages/nc-gui/composables/useSmartsheetRowStore.ts b/packages/nc-gui/composables/useSmartsheetRowStore.ts
index d41720f8c6..1ced131fe9 100644
--- a/packages/nc-gui/composables/useSmartsheetRowStore.ts
+++ b/packages/nc-gui/composables/useSmartsheetRowStore.ts
@@ -1,242 +1,42 @@
-import { RelationTypes, isLinksOrLTAR } from 'nocodb-sdk'
-import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import type { Ref } from 'vue'
import type { MaybeRef } from '@vueuse/core'
-import {
- NOCO,
- computed,
- deepCompare,
- extractPkFromRow,
- extractSdkResponseErrorMsg,
- isBt,
- isHm,
- isMm,
- isOo,
- message,
- ref,
- storeToRefs,
- unref,
- useBase,
- useI18n,
- useInjectionState,
- useMetas,
- useNuxtApp,
-} from '#imports'
+import { computed, ref, unref, useInjectionState } from '#imports'
import type { Row } from '#imports'
-const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
- (meta: Ref, row: MaybeRef) => {
- const { $api } = useNuxtApp()
+const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState((row: MaybeRef) => {
+ const currentRow = ref(row)
- const { t } = useI18n()
-
- const { base } = storeToRefs(useBase())
-
- const { metas } = useMetas()
-
- const currentRow = ref(row)
-
- // state
- const state = ref | Record[] | null>>({})
-
- // getters
- const isNew = computed(() => unref(row).rowMeta.new ?? false)
-
- // actions
- const addLTARRef = async (value: Record, column: ColumnType) => {
- if (isHm(column) || isMm(column)) {
- if (!state.value[column.title!]) state.value[column.title!] = []
-
- if (state.value[column.title!]!.find((ln: Record) => deepCompare(ln, value))) {
- // This value is already in the list
- return message.info(t('msg.info.valueAlreadyInList'))
- }
-
- if (Array.isArray(value)) {
- state.value[column.title!]!.push(...value)
- } else {
- state.value[column.title!]!.push(value)
+ // state
+ const state = computed({
+ get: () => currentRow.value?.rowMeta?.ltarState ?? {},
+ set: (value) => {
+ if (currentRow.value) {
+ if (!currentRow.value.rowMeta) {
+ currentRow.value.rowMeta = {}
}
- } else if (isBt(column) || isOo(column)) {
- state.value[column.title!] = value
+ currentRow.value.rowMeta.ltarState = value
}
- }
-
- // actions
- const removeLTARRef = async (value: Record, column: ColumnType) => {
- if (isHm(column) || isMm(column)) {
- state.value[column.title!]?.splice(state.value[column.title!]?.indexOf(value), 1)
- } else if (isBt(column) || isOo(column)) {
- state.value[column.title!] = null
- }
- }
-
- const linkRecord = async (
- rowId: string,
- relatedRowId: string,
- column: ColumnType,
- type: RelationTypes,
- { metaValue = meta.value }: { metaValue?: TableType } = {},
- ) => {
- try {
- await $api.dbTableRow.nestedAdd(
- NOCO,
- base.value.id as string,
- metaValue?.id as string,
- encodeURIComponent(rowId),
- type,
- column.id as string,
- encodeURIComponent(relatedRowId),
- )
- } catch (e: any) {
- message.error(await extractSdkResponseErrorMsg(e))
- }
- }
-
- /** sync LTAR relations kept in local state */
- const syncLTARRefs = async (row: Record, { metaValue = meta.value }: { metaValue?: TableType } = {}) => {
- const id = extractPkFromRow(row, metaValue?.columns as ColumnType[])
- for (const column of metaValue?.columns ?? []) {
- if (!isLinksOrLTAR(column)) continue
-
- const colOptions = column.colOptions as LinkToAnotherRecordType
-
- const relatedTableMeta = metas.value?.[colOptions?.fk_related_model_id as string]
-
- if (isHm(column) || isMm(column)) {
- const relatedRows = (state.value?.[column.title!] ?? []) as Record[]
-
- for (const relatedRow of relatedRows) {
- await linkRecord(
- id,
- extractPkFromRow(relatedRow, relatedTableMeta.columns as ColumnType[]),
- column,
- colOptions.type as RelationTypes,
- { metaValue },
- )
- }
- } else if ((isBt(column) || isOo(column)) && state.value?.[column.title!]) {
- await linkRecord(
- id,
- extractPkFromRow(state.value?.[column.title!] as Record, relatedTableMeta.columns as ColumnType[]),
- column,
- colOptions.type as RelationTypes,
- { metaValue },
- )
- }
-
- // clear LTAR refs after sync
- state.value[column.title!] = null
- }
- }
-
- // clear LTAR cell
- const clearLTARCell = async (column: ColumnType) => {
- try {
- if (!column || !isLinksOrLTAR(column)) return
-
- const relatedTableMeta = metas.value?.[(column?.colOptions)?.fk_related_model_id as string]
-
- if (isNew.value) {
- state.value[column.title!] = null
- } else if (currentRow.value) {
- if ([RelationTypes.BELONGS_TO, RelationTypes.ONE_TO_ONE].includes((column.colOptions)?.type)) {
- if (!currentRow.value.row[column.title!]) return
- await $api.dbTableRow.nestedRemove(
- NOCO,
- base.value.id as string,
- meta.value?.id as string,
- extractPkFromRow(currentRow.value.row, meta.value?.columns as ColumnType[]),
- (column.colOptions)?.type as any,
- column.id as string,
- extractPkFromRow(currentRow.value.row[column.title!], relatedTableMeta?.columns as ColumnType[]),
- )
- currentRow.value.row[column.title!] = null
- } else {
- for (const link of (currentRow.value.row[column.title!] as Record[]) || []) {
- await $api.dbTableRow.nestedRemove(
- NOCO,
- base.value.id as string,
- meta.value?.id as string,
- encodeURIComponent(extractPkFromRow(currentRow.value.row, meta.value?.columns as ColumnType[])),
- (column?.colOptions).type as 'hm' | 'mm',
- column.id as string,
- encodeURIComponent(extractPkFromRow(link, relatedTableMeta?.columns as ColumnType[])),
- )
- }
- currentRow.value.row[column.title!] = []
- }
- }
- } catch (e: any) {
- message.error(await extractSdkResponseErrorMsg(e))
- }
- }
-
- const loadRow = async () => {
- const record = await $api.dbTableRow.read(
- NOCO,
- base.value?.id as string,
- meta.value?.title as string,
- encodeURIComponent(extractPkFromRow(unref(row)?.row, meta.value?.columns as ColumnType[])),
- )
- Object.assign(unref(row), {
- row: record,
- oldRow: { ...record },
- rowMeta: {},
- })
- }
-
- // clear MM cell
- const cleaMMCell = async (column: ColumnType) => {
- try {
- if (!column || !isLinksOrLTAR(column)) return
-
- if (isNew.value) {
- state.value[column.title!] = null
- } else if (currentRow.value) {
- if ((column.colOptions)?.type === RelationTypes.MANY_TO_MANY) {
- if (!currentRow.value.row[column.title!]) return
-
- console.log('currentRow.value.row, meta.value?.columns', currentRow.value.row, meta.value?.columns)
- const result = await $api.dbDataTableRow.nestedListCopyPasteOrDeleteAll(
- meta.value?.id as string,
- column.id as string,
- [
- {
- operation: 'deleteAll',
- rowId: extractPkFromRow(currentRow.value.row, meta.value?.columns as ColumnType[]) as string,
- columnId: column.id as string,
- fk_related_model_id: (column.colOptions as LinkToAnotherRecordType)?.fk_related_model_id as string,
- },
- ],
- )
-
- currentRow.value.row[column.title!] = null
-
- return Array.isArray(result.unlink) ? result.unlink : []
- }
- }
- } catch (e: any) {
- message.error(await extractSdkResponseErrorMsg(e))
- }
- }
-
- return {
- row,
- state,
- isNew,
- // todo: use better name
- addLTARRef,
- removeLTARRef,
- syncLTARRefs,
- loadRow,
- currentRow,
- clearLTARCell,
- cleaMMCell,
- }
- },
- 'smartsheet-row-store',
-)
+ },
+ })
+
+ // getters
+ const isNew = computed(() => unref(row).rowMeta?.new ?? false)
+
+ const { addLTARRef, removeLTARRef, syncLTARRefs, loadRow, clearLTARCell, cleaMMCell } = useSmartsheetLtarHelpersOrThrow()
+
+ return {
+ row,
+ state,
+ isNew,
+ // todo: use better name
+ addLTARRef: (...args: any) => addLTARRef(currentRow.value, ...args),
+ removeLTARRef: (...args: any) => removeLTARRef(currentRow.value, ...args),
+ syncLTARRefs: (...args: any) => syncLTARRefs(currentRow.value, ...args),
+ loadRow: (...args: any) => loadRow(currentRow.value, ...args),
+ currentRow,
+ clearLTARCell: (...args: any) => clearLTARCell(currentRow.value, ...args),
+ cleaMMCell: (...args: any) => cleaMMCell(currentRow.value, ...args),
+ }
+}, 'smartsheet-row-store')
export { useProvideSmartsheetRowStore }
diff --git a/packages/nc-gui/composables/useSmartsheetStore.ts b/packages/nc-gui/composables/useSmartsheetStore.ts
index 48be07d8be..38f8a97e67 100644
--- a/packages/nc-gui/composables/useSmartsheetStore.ts
+++ b/packages/nc-gui/composables/useSmartsheetStore.ts
@@ -38,6 +38,7 @@ const [useProvideSmartsheetStore, useSmartsheetStore] = useInjectionState(
const isKanban = computed(() => view.value?.type === ViewTypes.KANBAN)
const isMap = computed(() => view.value?.type === ViewTypes.MAP)
const isSharedForm = computed(() => isForm.value && shared)
+ const isDefaultView = computed(() => view.value?.is_default)
const xWhere = computed(() => {
let where
const col =
@@ -100,6 +101,7 @@ const [useProvideSmartsheetStore, useSmartsheetStore] = useInjectionState(
eventBus,
sqlUi,
allFilters,
+ isDefaultView,
}
},
'smartsheet-store',
diff --git a/packages/nc-gui/composables/useUserSorts.ts b/packages/nc-gui/composables/useUserSorts.ts
index 9182a701e5..3e5122407b 100644
--- a/packages/nc-gui/composables/useUserSorts.ts
+++ b/packages/nc-gui/composables/useUserSorts.ts
@@ -9,7 +9,7 @@ import { useGlobal } from '#imports'
* @param {string} roleType - The type of role for which user sorts are managed ('Workspace', 'Org', or 'Project').
* @returns {object} An object containing reactive values and functions related to user sorts.
*/
-export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
+export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project' | 'Organization') {
const clone = rfdc()
const { user } = useGlobal()
@@ -110,6 +110,8 @@ export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
userRoleOrder = Object.values(OrderedOrgRoles)
} else if (roleType === 'Project') {
userRoleOrder = Object.values(OrderedProjectRoles)
+ } else if (roleType === 'Organization') {
+ userRoleOrder = Object.values(OrderedOrgRoles)
}
data = clone(data)
@@ -129,7 +131,8 @@ export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
return userRoleOrder.indexOf(roleB) - userRoleOrder.indexOf(roleA)
}
}
- case 'email': {
+ case 'email':
+ case 'title': {
if (sortsConfig.direction === 'asc') {
return a[sortsConfig.field]?.localeCompare(b[sortsConfig.field])
} else {
@@ -173,5 +176,19 @@ export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
return true
}
- return { sorts, sortDirection, loadSorts, saveOrUpdate, handleGetSortedData }
+ const toggleSort = (field: 'email' | 'roles' | 'title' | 'id') => {
+ if (sorts.value.field === field) {
+ saveOrUpdate({
+ field,
+ ...(sortDirection.value[field] === 'asc' ? { direction: 'desc' } : {}),
+ })
+ } else {
+ saveOrUpdate({
+ field,
+ direction: 'asc',
+ })
+ }
+ }
+
+ return { sorts, sortDirection, loadSorts, saveOrUpdate, handleGetSortedData, toggleSort }
}
diff --git a/packages/nc-gui/composables/useViewColumns.ts b/packages/nc-gui/composables/useViewColumns.ts
index edaf8adb19..e270f43e51 100644
--- a/packages/nc-gui/composables/useViewColumns.ts
+++ b/packages/nc-gui/composables/useViewColumns.ts
@@ -159,7 +159,12 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
$e('a:fields:show-all')
}
- const saveOrUpdate = async (field: any, index: number, disableDataReload: boolean = false) => {
+ const saveOrUpdate = async (
+ field: any,
+ index: number,
+ disableDataReload: boolean = false,
+ updateDefaultViewColumnOrder: boolean = false,
+ ) => {
if (isLocalMode.value && fields.value) {
fields.value[index] = field
meta.value!.columns = meta.value!.columns?.map((column: ColumnType) => {
@@ -168,6 +173,7 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
...column,
...field,
id: field.fk_column_id,
+ ...(updateDefaultViewColumnOrder ? { meta: { ...parseProp(column.meta), defaultViewColOrder: field.order } } : {}),
}
}
return column
@@ -280,7 +286,7 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
},
scope: defineViewScope({ view: view.value }),
})
- saveOrUpdate(field, fieldIndex)
+ saveOrUpdate(field, fieldIndex, !checked)
}
const toggleFieldStyles = (field: any, style: 'underline' | 'bold' | 'italic', status: boolean) => {
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index 42c23b7436..c077b2428c 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -177,7 +177,7 @@ export function useViewData(
const controller = ref()
- async function loadData(params: Parameters['dbViewRow']['list']>[4] = {}) {
+ async function loadData(params: Parameters['dbViewRow']['list']>[4] = {}, shouldShowLoading = true) {
if ((!base?.value?.id || !metaId.value || !viewMeta.value?.id) && !isPublic.value) return
if (controller.value) {
@@ -188,7 +188,7 @@ export function useViewData(
controller.value = CancelToken.source()
- isPaginationLoading.value = true
+ if (shouldShowLoading) isPaginationLoading.value = true
let response
try {
diff --git a/packages/nc-gui/composables/useViewFilters.ts b/packages/nc-gui/composables/useViewFilters.ts
index 310d8f6ae3..5f6562e77a 100644
--- a/packages/nc-gui/composables/useViewFilters.ts
+++ b/packages/nc-gui/composables/useViewFilters.ts
@@ -198,13 +198,15 @@ export function useViewFilters(
}
const placeholderFilter = (): Filter => {
+ const logicalOps = new Set(filters.value.slice(1).map((filter) => filter.logical_op))
+
return {
comparison_op: comparisonOpList(options.value?.[0].uidt as UITypes).filter((compOp) =>
isComparisonOpAllowed({ fk_column_id: options.value?.[0].id }, compOp),
)?.[0].value as FilterType['comparison_op'],
value: '',
status: 'create',
- logical_op: 'and',
+ logical_op: logicalOps.size === 1 ? logicalOps.values().next().value :'and' ,
}
}
@@ -307,7 +309,7 @@ export function useViewFilters(
}
}
- const saveOrUpdate = async (filter: Filter, i: number, force = false, undo = false) => {
+ const saveOrUpdate = async (filter: Filter, i: number, force = false, undo = false, skipDataReload = false) => {
if (!view.value) return
if (!undo) {
@@ -372,7 +374,7 @@ export function useViewFilters(
lastFilters.value = clone(filters.value)
- if (!isWebhook) reloadData?.()
+ if (!isWebhook && !skipDataReload) reloadData?.()
}
function deleteFilterGroupFromAllFilters(filter: Filter) {
diff --git a/packages/nc-gui/composables/useViewGroupBy.ts b/packages/nc-gui/composables/useViewGroupBy.ts
index d70e7d67d7..de77407440 100644
--- a/packages/nc-gui/composables/useViewGroupBy.ts
+++ b/packages/nc-gui/composables/useViewGroupBy.ts
@@ -1,5 +1,5 @@
import { UITypes } from 'nocodb-sdk'
-import type { ColumnType, LinkToAnotherRecordType, LookupType, SelectOptionsType, ViewType } from 'nocodb-sdk'
+import type { ColumnType, LinkToAnotherRecordType, LookupType, SelectOptionsType, TableType, ViewType } from 'nocodb-sdk'
import type { Ref } from 'vue'
import { message } from 'ant-design-vue'
import { extractSdkResponseErrorMsg } from '../utils'
@@ -17,548 +17,572 @@ import type { Group, GroupNestedIn, Row } from '#imports'
const excludedGroupingUidt = [UITypes.Attachment, UITypes.QrCode, UITypes.Barcode]
-export const useViewGroupBy = (view: Ref, where?: ComputedRef) => {
- const groupByLimit: number = 3
+const [useProvideViewGroupBy, useViewGroupBy] = useInjectionState(
+ (
+ view: Ref,
+ meta: Ref | ComputedRef,
+ where?: ComputedRef,
+ isPublic = false,
+ ) => {
+ const groupByLimit: number = 3
- const { api } = useApi()
+ const { api } = useApi()
- const { appInfo } = useGlobal()
+ const { appInfo } = useGlobal()
- const { base } = storeToRefs(useBase())
+ const { base } = storeToRefs(useBase())
- const { sharedView, fetchSharedViewData } = useSharedView()
+ const { sharedView, fetchSharedViewData } = useSharedView()
- const meta = inject(MetaInj)
+ const { gridViewCols } = useViewColumnsOrThrow()
- const { gridViewCols } = useViewColumnsOrThrow()
+ const { getMeta } = useMetas()
- const { getMeta } = useMetas()
+ const sharedViewPassword = inject(SharedViewPasswordInj, ref(null))
- const sharedViewPassword = inject(SharedViewPasswordInj, ref(null))
-
- const groupBy = computed<{ column: ColumnType; sort: string; order?: number }[]>(() => {
- const tempGroupBy: { column: ColumnType; sort: string; order?: number }[] = []
- Object.values(gridViewCols.value).forEach((col) => {
- if (col.group_by) {
- const column = meta?.value?.columns?.find((f) => f.id === col.fk_column_id)
- if (column) {
- tempGroupBy.push({
- column,
- sort: col.group_by_sort || 'asc',
- order: col.group_by_order || 1,
- })
+ const groupBy = computed<{ column: ColumnType; sort: string; order?: number }[]>(() => {
+ const tempGroupBy: { column: ColumnType; sort: string; order?: number }[] = []
+ Object.values(gridViewCols.value).forEach((col) => {
+ if (col.group_by) {
+ const column = meta?.value?.columns?.find((f) => f.id === col.fk_column_id)
+ if (column) {
+ tempGroupBy.push({
+ column,
+ sort: col.group_by_sort || 'asc',
+ order: col.group_by_order || 1,
+ })
+ }
}
- }
+ })
+ tempGroupBy.sort((a, b) => (a.order ?? Infinity) - (b.order ?? Infinity))
+ return tempGroupBy
})
- tempGroupBy.sort((a, b) => (a.order ?? Infinity) - (b.order ?? Infinity))
- return tempGroupBy
- })
- const isGroupBy = computed(() => !!groupBy.value.length)
+ const isGroupBy = computed(() => !!groupBy.value.length)
- const { isUIAllowed } = useRoles()
+ const { isUIAllowed } = useRoles()
- const { sorts, nestedFilters } = useSmartsheetStoreOrThrow()
+ const { sorts, nestedFilters } = useSmartsheetStoreOrThrow()
- const isPublic = inject(IsPublicInj, ref(false))
+ const reloadViewDataHook = inject(ReloadViewDataHookInj, createEventHook())
- const reloadViewDataHook = inject(ReloadViewDataHookInj, createEventHook())
-
- const groupByGroupLimit = computed(() => {
- return appInfo.value.defaultGroupByLimit?.limitGroup || 10
- })
+ const groupByGroupLimit = computed(() => {
+ return appInfo.value.defaultGroupByLimit?.limitGroup || 10
+ })
- const groupByRecordLimit = computed(() => {
- return appInfo.value.defaultGroupByLimit?.limitRecord || 10
- })
+ const groupByRecordLimit = computed(() => {
+ return appInfo.value.defaultGroupByLimit?.limitRecord || 10
+ })
- const supportedLookups = ref([])
+ const supportedLookups = ref([])
- const fieldsToGroupBy = computed(() =>
- (meta?.value?.columns || []).filter((field) => {
- if (excludedGroupingUidt.includes(field.uidt as UITypes)) return false
+ const fieldsToGroupBy = computed(() =>
+ (meta?.value?.columns || []).filter((field) => {
+ if (excludedGroupingUidt.includes(field.uidt as UITypes)) return false
- if (field.uidt === UITypes.Lookup) {
- return field.id && supportedLookups.value.includes(field.id)
- }
+ if (field.uidt === UITypes.Lookup) {
+ return field.id && supportedLookups.value.includes(field.id)
+ }
- return true
- }),
- )
-
- const rootGroup = ref({
- key: 'root',
- color: 'root',
- count: 0,
- column: {} as any,
- nestedIn: [],
- paginationData: { page: 1, pageSize: groupByGroupLimit.value },
- nested: true,
- children: [],
- root: true,
- })
-
- async function groupWrapperChangePage(page: number, groupWrapper?: Group) {
- groupWrapper = groupWrapper || rootGroup.value
-
- if (!groupWrapper) return
-
- groupWrapper.paginationData.page = page
- await loadGroups(
- {
- offset: (page - 1) * (groupWrapper.paginationData.pageSize || groupByGroupLimit.value),
- } as any,
- groupWrapper,
+ return true
+ }),
)
- }
-
- const formatData = (list: Record[]) =>
- list.map((row) => ({
- row: { ...row },
- oldRow: { ...row },
- rowMeta: {},
- }))
-
- const valueToTitle = (value: string, col: ColumnType) => {
- if (col.uidt === UITypes.Checkbox) {
- return value ? GROUP_BY_VARS.TRUE : GROUP_BY_VARS.FALSE
+
+ const rootGroup = ref({
+ key: 'root',
+ color: 'root',
+ count: 0,
+ column: {} as any,
+ nestedIn: [],
+ paginationData: { page: 1, pageSize: groupByGroupLimit.value },
+ nested: true,
+ children: [],
+ root: true,
+ })
+
+ async function groupWrapperChangePage(page: number, groupWrapper?: Group) {
+ groupWrapper = groupWrapper || rootGroup.value
+
+ if (!groupWrapper) return
+
+ groupWrapper.paginationData.page = page
+ await loadGroups(
+ {
+ offset: (page - 1) * (groupWrapper.paginationData.pageSize || groupByGroupLimit.value),
+ } as any,
+ groupWrapper,
+ )
}
- if ([UITypes.User, UITypes.CreatedBy, UITypes.LastModifiedBy].includes(col.uidt as UITypes)) {
- if (!value) {
- return GROUP_BY_VARS.NULL
+ const formatData = (list: Record[]) =>
+ list.map((row) => ({
+ row: { ...row },
+ oldRow: { ...row },
+ rowMeta: {},
+ }))
+
+ const valueToTitle = (value: string, col: ColumnType, displayValueProp?: string) => {
+ if (col.uidt === UITypes.Checkbox) {
+ return value ? GROUP_BY_VARS.TRUE : GROUP_BY_VARS.FALSE
}
- }
- // convert to JSON string if non-string value
- if (value && typeof value === 'object') {
- value = JSON.stringify(value)
- }
+ if ([UITypes.User, UITypes.CreatedBy, UITypes.LastModifiedBy].includes(col.uidt as UITypes)) {
+ if (!value) {
+ return GROUP_BY_VARS.NULL
+ }
+ }
+
+ if (col.uidt === UITypes.LinkToAnotherRecord && displayValueProp && value && typeof value === 'object') {
+ return value[displayValueProp] ?? GROUP_BY_VARS.NULL
+ }
+
+ // convert to JSON string if non-string value
+ if (value && typeof value === 'object') {
+ value = JSON.stringify(value)
+ }
- return value ?? GROUP_BY_VARS.NULL
- }
+ return value ?? GROUP_BY_VARS.NULL
+ }
- const colors = ref(enumColor.light)
+ const colors = ref(enumColor.light)
- const nextGroupColor = ref(colors.value[0])
+ const nextGroupColor = ref(colors.value[0])
- const getNextColor = () => {
- const tempColor = nextGroupColor.value
- const index = colors.value.indexOf(nextGroupColor.value)
- if (index === colors.value.length - 1) {
- nextGroupColor.value = colors.value[0]
- } else {
- nextGroupColor.value = colors.value[index + 1]
+ const getNextColor = () => {
+ const tempColor = nextGroupColor.value
+ const index = colors.value.indexOf(nextGroupColor.value)
+ if (index === colors.value.length - 1) {
+ nextGroupColor.value = colors.value[0]
+ } else {
+ nextGroupColor.value = colors.value[index + 1]
+ }
+ return tempColor
}
- return tempColor
- }
-
- const findKeyColor = (key?: string, col?: ColumnType): string => {
- if (col) {
- switch (col.uidt) {
- case UITypes.MultiSelect: {
- const keys = key?.split(',') || []
- const colors = []
- for (const k of keys) {
- const option = (col.colOptions as SelectOptionsType).options?.find((o) => o.title === k)
- if (option) {
- colors.push(option.color)
+
+ const findKeyColor = (key?: string, col?: ColumnType): string => {
+ if (col) {
+ switch (col.uidt) {
+ case UITypes.MultiSelect: {
+ const keys = key?.split(',') || []
+ const colors = []
+ for (const k of keys) {
+ const option = (col.colOptions as SelectOptionsType).options?.find((o) => o.title === k)
+ if (option) {
+ colors.push(option.color)
+ }
}
+ return colors.join(',')
}
- return colors.join(',')
- }
- case UITypes.SingleSelect: {
- const option = (col.colOptions as SelectOptionsType).options?.find((o) => o.title === key)
- if (option) {
- return option.color || getNextColor()
+ case UITypes.SingleSelect: {
+ const option = (col.colOptions as SelectOptionsType).options?.find((o) => o.title === key)
+ if (option) {
+ return option.color || getNextColor()
+ }
+ return 'gray'
}
- return 'gray'
- }
- case UITypes.Checkbox: {
- if (key) {
- return themeColors.success
+ case UITypes.Checkbox: {
+ if (key) {
+ return themeColors.success
+ }
+ return themeColors.error
}
- return themeColors.error
+ default:
+ return key ? getNextColor() : 'gray'
}
- default:
- return key ? getNextColor() : 'gray'
}
+ return key ? getNextColor() : 'gray'
}
- return key ? getNextColor() : 'gray'
- }
-
- const calculateNestedWhere = (nestedIn: GroupNestedIn[], existing = '') => {
- return nestedIn.reduce((acc, curr) => {
- if (curr.key === GROUP_BY_VARS.NULL) {
- acc += `${acc.length ? '~and' : ''}(${curr.title},gb_null)`
- } else if (curr.column_uidt === UITypes.Checkbox) {
- acc += `${acc.length ? '~and' : ''}(${curr.title},${curr.key === GROUP_BY_VARS.TRUE ? 'checked' : 'notchecked'})`
- } else if (
- [UITypes.Date, UITypes.DateTime, UITypes.CreatedTime, UITypes.LastModifiedTime].includes(curr.column_uidt as UITypes)
- ) {
- acc += `${acc.length ? '~and' : ''}(${curr.title},eq,exactDate,${curr.key})`
- } else if ([UITypes.User, UITypes.CreatedBy, UITypes.LastModifiedBy].includes(curr.column_uidt as UITypes)) {
- try {
- const value = JSON.parse(curr.key)
- acc += `${acc.length ? '~and' : ''}(${curr.title},gb_eq,${(Array.isArray(value) ? value : [value])
- .map((v: any) => v.id)
- .join(',')})`
- } catch (e) {
- console.error(e)
+
+ const calculateNestedWhere = (nestedIn: GroupNestedIn[], existing = '') => {
+ return nestedIn.reduce((acc, curr) => {
+ if (curr.key === GROUP_BY_VARS.NULL) {
+ acc += `${acc.length ? '~and' : ''}(${curr.title},gb_null)`
+ } else if (curr.column_uidt === UITypes.Checkbox) {
+ acc += `${acc.length ? '~and' : ''}(${curr.title},${curr.key === GROUP_BY_VARS.TRUE ? 'checked' : 'notchecked'})`
+ } else if (
+ [UITypes.Date, UITypes.DateTime, UITypes.CreatedTime, UITypes.LastModifiedTime].includes(curr.column_uidt as UITypes)
+ ) {
+ acc += `${acc.length ? '~and' : ''}(${curr.title},eq,exactDate,${curr.key})`
+ } else if ([UITypes.User, UITypes.CreatedBy, UITypes.LastModifiedBy].includes(curr.column_uidt as UITypes)) {
+ try {
+ const value = JSON.parse(curr.key)
+ acc += `${acc.length ? '~and' : ''}(${curr.title},gb_eq,${(Array.isArray(value) ? value : [value])
+ .map((v: any) => v.id)
+ .join(',')})`
+ } catch (e) {
+ console.error(e)
+ }
+ } else {
+ acc += `${acc.length ? '~and' : ''}(${curr.title},gb_eq,${curr.key})`
}
- } else {
- acc += `${acc.length ? '~and' : ''}(${curr.title},gb_eq,${curr.key})`
- }
- return acc
- }, existing)
- }
+ return acc
+ }, existing)
+ }
- async function loadGroups(params: any = {}, group?: Group) {
- try {
- group = group || rootGroup.value
+ async function loadGroups(params: any = {}, group?: Group) {
+ try {
+ group = group || rootGroup.value
- if (!base?.value?.id || !view.value?.id || !view.value?.fk_model_id || !group) return
+ if (!base?.value?.id || !view.value?.id || !view.value?.fk_model_id || !group) return
- if (groupBy.value.length === 0) {
- group.children = []
- return
- }
+ if (groupBy.value.length === 0) {
+ group.children = []
+ return
+ }
- if (group.nestedIn.length > groupBy.value.length) return
+ if (group.nestedIn.length > groupBy.value.length) return
- if (group.nestedIn.length === 0) nextGroupColor.value = colors.value[0]
- const groupby = groupBy.value[group.nestedIn.length]
+ if (group.nestedIn.length === 0) nextGroupColor.value = colors.value[0]
+ const groupby = groupBy.value[group.nestedIn.length]
- const nestedWhere = calculateNestedWhere(group.nestedIn, where?.value)
- if (!groupby || !groupby.column.title) return
+ const nestedWhere = calculateNestedWhere(group.nestedIn, where?.value)
+ if (!groupby || !groupby.column.title) return
- if (isPublic.value && !sharedView.value?.uuid) {
- return
- }
+ if (isPublic && !sharedView.value?.uuid) {
+ return
+ }
+
+ if (groupby.column.uidt === UITypes.LinkToAnotherRecord) {
+ const relatedTableMeta = await getMeta(
+ (groupby.column.colOptions as LinkToAnotherRecordType).fk_related_model_id as string,
+ )
+ if (!relatedTableMeta) return
+ group.displayValueProp = (relatedTableMeta.columns?.find((c) => c.pv) || relatedTableMeta.columns?.[0])?.title || ''
+ }
- const response = !isPublic.value
- ? await api.dbViewRow.groupBy('noco', base.value.id, view.value.fk_model_id, view.value.id, {
- offset: ((group.paginationData.page ?? 0) - 1) * (group.paginationData.pageSize ?? groupByGroupLimit.value),
- limit: group.paginationData.pageSize ?? groupByGroupLimit.value,
- ...params,
- ...(isUIAllowed('sortSync') ? {} : { sortArrJson: JSON.stringify(sorts.value) }),
- ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
- where: `${nestedWhere}`,
- sort: `${groupby.sort === 'desc' ? '-' : ''}${groupby.column.title}`,
- column_name: groupby.column.title,
- } as any)
- : await api.public.dataGroupBy(
- sharedView.value!.uuid!,
- {
+ const response = !isPublic
+ ? await api.dbViewRow.groupBy('noco', base.value.id, view.value.fk_model_id, view.value.id, {
offset: ((group.paginationData.page ?? 0) - 1) * (group.paginationData.pageSize ?? groupByGroupLimit.value),
limit: group.paginationData.pageSize ?? groupByGroupLimit.value,
...params,
- where: nestedWhere,
+ ...(isUIAllowed('sortSync') ? {} : { sortArrJson: JSON.stringify(sorts.value) }),
+ ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
+ where: `${nestedWhere}`,
sort: `${groupby.sort === 'desc' ? '-' : ''}${groupby.column.title}`,
column_name: groupby.column.title,
- sortsArr: sorts.value,
- filtersArr: nestedFilters.value,
- },
- {
- headers: {
- 'xc-password': sharedViewPassword.value,
+ } as any)
+ : await api.public.dataGroupBy(
+ sharedView.value!.uuid!,
+ {
+ offset: ((group.paginationData.page ?? 0) - 1) * (group.paginationData.pageSize ?? groupByGroupLimit.value),
+ limit: group.paginationData.pageSize ?? groupByGroupLimit.value,
+ ...params,
+ where: nestedWhere,
+ sort: `${groupby.sort === 'desc' ? '-' : ''}${groupby.column.title}`,
+ column_name: groupby.column.title,
+ sortsArr: sorts.value,
+ filtersArr: nestedFilters.value,
},
- },
- )
+ {
+ headers: {
+ 'xc-password': sharedViewPassword.value,
+ },
+ },
+ )
- const tempList: Group[] = response.list.reduce((acc: Group[], curr: Record) => {
- const keyExists = acc.find(
- (a) => a.key === valueToTitle(curr[groupby.column.column_name!] ?? curr[groupby.column.title!], groupby.column),
- )
- if (keyExists) {
- keyExists.count += +curr.count
- keyExists.paginationData = { page: 1, pageSize: groupByGroupLimit.value, totalRows: keyExists.count }
+ const tempList: Group[] = response.list.reduce((acc: Group[], curr: Record) => {
+ const keyExists = acc.find(
+ (a) => a.key === valueToTitle(curr[groupby.column.column_name!] ?? curr[groupby.column.title!], groupby.column),
+ )
+ if (keyExists) {
+ keyExists.count += +curr.count
+ keyExists.paginationData = { page: 1, pageSize: groupByGroupLimit.value, totalRows: keyExists.count }
+ return acc
+ }
+ if (groupby.column.title && groupby.column.uidt) {
+ acc.push({
+ key: valueToTitle(curr[groupby.column.title!], groupby.column),
+ column: groupby.column,
+ count: +curr.count,
+ color: findKeyColor(curr[groupby.column.title!], groupby.column),
+ nestedIn: [
+ ...group!.nestedIn,
+ {
+ title: groupby.column.title,
+ column_name: groupby.column.title!,
+ key: valueToTitle(curr[groupby.column.title!], groupby.column),
+ column_uidt: groupby.column.uidt,
+ },
+ ],
+ paginationData: {
+ page: 1,
+ pageSize: group!.nestedIn.length < groupBy.value.length - 1 ? groupByGroupLimit.value : groupByRecordLimit.value,
+ totalRows: +curr.count,
+ },
+ nested: group!.nestedIn.length < groupBy.value.length - 1,
+ })
+ }
return acc
+ }, [])
+
+ if (!group.children) group.children = []
+
+ for (const temp of tempList) {
+ const keyExists = group.children?.find((a) => a.key === temp.key)
+ if (keyExists) {
+ temp.paginationData = {
+ page: keyExists.paginationData.page || temp.paginationData.page,
+ pageSize: keyExists.paginationData.pageSize || temp.paginationData.pageSize,
+ totalRows: temp.count,
+ }
+ temp.color = keyExists.color
+ // update group
+ Object.assign(keyExists, temp)
+ continue
+ }
+ group.children.push(temp)
}
- if (groupby.column.title && groupby.column.uidt) {
- acc.push({
- key: valueToTitle(curr[groupby.column.title!], groupby.column),
- column: groupby.column,
- count: +curr.count,
- color: findKeyColor(curr[groupby.column.title!], groupby.column),
- nestedIn: [
- ...group!.nestedIn,
- {
- title: groupby.column.title,
- column_name: groupby.column.title!,
- key: valueToTitle(curr[groupby.column.title!], groupby.column),
- column_uidt: groupby.column.uidt,
- },
- ],
- paginationData: {
- page: 1,
- pageSize: group!.nestedIn.length < groupBy.value.length - 1 ? groupByGroupLimit.value : groupByRecordLimit.value,
- totalRows: +curr.count,
- },
- nested: group!.nestedIn.length < groupBy.value.length - 1,
+
+ // clear rest of the children
+ group.children = group.children.filter((c) => tempList.find((t) => t.key === c.key))
+
+ if (group.count <= (group.paginationData.pageSize ?? groupByGroupLimit.value)) {
+ group.children.sort((a, b) => {
+ const orderA = tempList.findIndex((t) => t.key === a.key)
+ const orderB = tempList.findIndex((t) => t.key === b.key)
+ return orderA - orderB
})
}
- return acc
- }, [])
- if (!group.children) group.children = []
+ group.paginationData = response.pageInfo
- for (const temp of tempList) {
- const keyExists = group.children?.find((a) => a.key === temp.key)
- if (keyExists) {
- temp.paginationData = {
- page: keyExists.paginationData.page || temp.paginationData.page,
- pageSize: keyExists.paginationData.pageSize || temp.paginationData.pageSize,
- totalRows: temp.count,
- }
- temp.color = keyExists.color
- // update group
- Object.assign(keyExists, temp)
- continue
+ // to cater the case like when querying with a non-zero offset
+ // the result page may point to the target page where the actual returned data don't display on
+ const expectedPage = Math.max(1, Math.ceil(group.paginationData.totalRows! / group.paginationData.pageSize!))
+ if (expectedPage < group.paginationData.page!) {
+ await groupWrapperChangePage(expectedPage, group)
}
- group.children.push(temp)
+ } catch (e) {
+ message.error(await extractSdkResponseErrorMsg(e))
}
+ }
- // clear rest of the children
- group.children = group.children.filter((c) => tempList.find((t) => t.key === c.key))
+ async function loadGroupData(group: Group, force = false, params: any = {}) {
+ try {
+ if (!base?.value?.id || !view.value?.id || !view.value?.fk_model_id) return
- if (group.count <= (group.paginationData.pageSize ?? groupByGroupLimit.value)) {
- group.children.sort((a, b) => {
- const orderA = tempList.findIndex((t) => t.key === a.key)
- const orderB = tempList.findIndex((t) => t.key === b.key)
- return orderA - orderB
- })
- }
+ if (group.children && !force) return
- group.paginationData = response.pageInfo
+ if (!group.paginationData) {
+ group.paginationData = { page: 1, pageSize: groupByRecordLimit.value }
+ }
- // to cater the case like when querying with a non-zero offset
- // the result page may point to the target page where the actual returned data don't display on
- const expectedPage = Math.max(1, Math.ceil(group.paginationData.totalRows! / group.paginationData.pageSize!))
- if (expectedPage < group.paginationData.page!) {
- await groupWrapperChangePage(expectedPage, group)
- }
- } catch (e) {
- message.error(await extractSdkResponseErrorMsg(e))
- }
- }
+ const nestedWhere = calculateNestedWhere(group.nestedIn, where?.value)
- async function loadGroupData(group: Group, force = false, params: any = {}) {
- try {
- if (!base?.value?.id || !view.value?.id || !view.value?.fk_model_id) return
+ const query = {
+ offset: ((group.paginationData.page ?? 0) - 1) * (group.paginationData.pageSize ?? groupByRecordLimit.value),
+ limit: group.paginationData.pageSize ?? groupByRecordLimit.value,
+ where: `${nestedWhere}`,
+ }
- if (group.children && !force) return
+ const response = !isPublic
+ ? await api.dbViewRow.list('noco', base.value.id, view.value.fk_model_id, view.value.id, {
+ ...query,
+ ...params,
+ ...(isUIAllowed('sortSync') ? {} : { sortArrJson: JSON.stringify(sorts.value) }),
+ ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
+ } as any)
+ : await fetchSharedViewData({ sortsArr: sorts.value, filtersArr: nestedFilters.value, ...query })
+
+ group.count = response.pageInfo.totalRows ?? 0
+ group.rows = formatData(response.list)
+ group.paginationData = response.pageInfo
+ } catch (e) {
+ message.error(await extractSdkResponseErrorMsg(e))
+ }
+ }
+ const loadGroupPage = async (group: Group, p: number) => {
if (!group.paginationData) {
group.paginationData = { page: 1, pageSize: groupByRecordLimit.value }
}
+ group.paginationData.page = p
+ await loadGroupData(group, true)
+ }
- const nestedWhere = calculateNestedWhere(group.nestedIn, where?.value)
+ const refreshNested = (group?: Group, nestLevel = 0) => {
+ group = group || rootGroup.value
+ if (!group) return
- const query = {
- offset: ((group.paginationData.page ?? 0) - 1) * (group.paginationData.pageSize ?? groupByRecordLimit.value),
- limit: group.paginationData.pageSize ?? groupByRecordLimit.value,
- where: `${nestedWhere}`,
+ if (nestLevel < groupBy.value.length) {
+ group.nested = true
+ } else {
+ group.nested = false
}
- const response = !isPublic.value
- ? await api.dbViewRow.list('noco', base.value.id, view.value.fk_model_id, view.value.id, {
- ...query,
- ...params,
- ...(isUIAllowed('sortSync') ? {} : { sortArrJson: JSON.stringify(sorts.value) }),
- ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
- } as any)
- : await fetchSharedViewData({ sortsArr: sorts.value, filtersArr: nestedFilters.value, ...query })
-
- group.count = response.pageInfo.totalRows ?? 0
- group.rows = formatData(response.list)
- group.paginationData = response.pageInfo
- } catch (e) {
- message.error(await extractSdkResponseErrorMsg(e))
- }
- }
+ if (group.nested) {
+ if (group?.rows) {
+ group.rows = []
+ }
+ } else {
+ if (group?.children) {
+ group.children = []
+ }
+ }
- const loadGroupPage = async (group: Group, p: number) => {
- if (!group.paginationData) {
- group.paginationData = { page: 1, pageSize: groupByRecordLimit.value }
- }
- group.paginationData.page = p
- await loadGroupData(group, true)
- }
-
- const refreshNested = (group?: Group, nestLevel = 0) => {
- group = group || rootGroup.value
- if (!group) return
-
- if (nestLevel < groupBy.value.length) {
- group.nested = true
- } else {
- group.nested = false
- }
+ if (nestLevel > groupBy.value.length) return
- if (group.nested) {
- if (group?.rows) {
- group.rows = []
- }
- } else {
- if (group?.children) {
- group.children = []
+ for (const child of group.children || []) {
+ refreshNested(child, nestLevel + 1)
}
}
- if (nestLevel > groupBy.value.length) return
+ watch(
+ () => groupBy.value.length,
+ async () => {
+ if (groupBy.value.length > 0) {
+ rootGroup.value.paginationData = { page: 1, pageSize: groupByGroupLimit.value }
+ rootGroup.value.column = {} as any
+ refreshNested()
+ nextTick(() => reloadViewDataHook?.trigger())
+ }
+ },
+ )
- for (const child of group.children || []) {
- refreshNested(child, nestLevel + 1)
- }
- }
-
- watch(
- () => groupBy.value.length,
- async () => {
- if (groupBy.value.length > 0) {
- rootGroup.value.paginationData = { page: 1, pageSize: groupByGroupLimit.value }
- rootGroup.value.column = {} as any
- await loadGroups()
- refreshNested()
- nextTick(() => reloadViewDataHook?.trigger())
- }
- },
- { immediate: true },
- )
-
- const findGroupByNestedIn = (nestedIn: GroupNestedIn[], group?: Group, nestLevel = 0): Group => {
- group = group || rootGroup.value
- if (nestLevel >= nestedIn.length) return group
- const child = group.children?.find((g) => g.key === nestedIn[nestLevel].key)
- if (child) {
- if (child.nested) {
- return findGroupByNestedIn(nestedIn, child, nestLevel + 1)
+ const findGroupByNestedIn = (nestedIn: GroupNestedIn[], group?: Group, nestLevel = 0): Group => {
+ group = group || rootGroup.value
+ if (nestLevel >= nestedIn.length) return group
+ const child = group.children?.find((g) => g.key === nestedIn[nestLevel].key)
+ if (child) {
+ if (child.nested) {
+ return findGroupByNestedIn(nestedIn, child, nestLevel + 1)
+ }
+ return child
}
- return child
+ return group
+ }
+
+ const parentGroup = (group: Group) => {
+ const parent = findGroupByNestedIn(group.nestedIn.slice(0, -1))
+ return parent
}
- return group
- }
-
- const parentGroup = (group: Group) => {
- const parent = findGroupByNestedIn(group.nestedIn.slice(0, -1))
- return parent
- }
-
- const modifyCount = (group: Group, countEffect: number) => {
- if (!group) return
- group.count += countEffect
- // remove group if count is 0
- if (group.count === 0) {
- const parent = parentGroup(group)
- if (parent) {
- parent.children = parent.children?.filter((c) => c.key !== group.key)
+
+ const modifyCount = (group: Group, countEffect: number) => {
+ if (!group) return
+ group.count += countEffect
+ // remove group if count is 0
+ if (group.count === 0) {
+ const parent = parentGroup(group)
+ if (parent) {
+ parent.children = parent.children?.filter((c) => c.key !== group.key)
+ }
}
+ if (group.root) return
+ modifyCount(parentGroup(group), countEffect)
}
- if (group.root) return
- modifyCount(parentGroup(group), countEffect)
- }
-
- const findGroupForRow = (row: Row, group?: Group, nestLevel = 0): { found: boolean; group: Group } => {
- group = group || rootGroup.value
- if (group.nested) {
- const child = group.children?.find((g) => {
- if (!groupBy.value[nestLevel].column.title) return undefined
- return g.key === valueToTitle(row.row[groupBy.value[nestLevel].column.title!], groupBy.value[nestLevel].column)
- })
- if (child) {
- return findGroupForRow(row, child, nestLevel + 1)
+
+ const findGroupForRow = (row: Row, group?: Group, nestLevel = 0): { found: boolean; group: Group } => {
+ group = group || rootGroup.value
+ if (group.nested) {
+ const child = group.children?.find((g) => {
+ if (!groupBy.value[nestLevel].column.title) return undefined
+ return (
+ g.key ===
+ valueToTitle(row.row[groupBy.value[nestLevel].column.title!], groupBy.value[nestLevel].column, group.displayValueProp)
+ )
+ })
+ if (child) {
+ return findGroupForRow(row, child, nestLevel + 1)
+ }
+ return { found: false, group }
}
- return { found: false, group }
+ return { found: true, group }
}
- return { found: true, group }
- }
-
- const redistributeRows = (group?: Group) => {
- group = group || rootGroup.value
- if (!group) return
- if (!group.nested && group.rows) {
- group.rows.forEach((row) => {
- const properGroup = findGroupForRow(row)
- if (properGroup.found) {
- if (properGroup.group !== group) {
- if (properGroup.group) {
- properGroup.group.rows?.push(row)
- modifyCount(properGroup.group, 1)
+
+ const redistributeRows = (group?: Group) => {
+ group = group || rootGroup.value
+ if (!group) return
+ if (!group.nested && group.rows) {
+ group.rows.forEach((row) => {
+ const properGroup = findGroupForRow(row)
+ if (properGroup.found) {
+ if (properGroup.group !== group) {
+ if (properGroup.group) {
+ properGroup.group.rows?.push(row)
+ modifyCount(properGroup.group, 1)
+ }
+ if (group) {
+ group.rows?.splice(group!.rows.indexOf(row), 1)
+ modifyCount(group, -1)
+ }
}
+ } else {
if (group) {
group.rows?.splice(group!.rows.indexOf(row), 1)
modifyCount(group, -1)
}
+ if (properGroup.group?.children) loadGroups({}, properGroup.group)
}
- } else {
- if (group) {
- group.rows?.splice(group!.rows.indexOf(row), 1)
- modifyCount(group, -1)
- }
- if (properGroup.group?.children) loadGroups({}, properGroup.group)
- }
- })
- } else {
- group.children?.forEach((g) => redistributeRows(g))
+ })
+ } else {
+ group.children?.forEach((g) => redistributeRows(g))
+ }
}
- }
-
- const loadAllowedLookups = async () => {
- const filteredLookupCols = []
- try {
- for (const col of meta?.value?.columns || []) {
- if (col.uidt !== UITypes.Lookup) continue
-
- let nextCol: ColumnType = col
- // check the lookup column is supported type or not
- while (nextCol && nextCol.uidt === UITypes.Lookup) {
- const lookupRelation = (await getMeta(nextCol.fk_model_id as string))?.columns?.find(
- (c) => c.id === (nextCol?.colOptions as LookupType).fk_relation_column_id,
- )
-
- const relatedTableMeta = await getMeta(
- (lookupRelation?.colOptions as LinkToAnotherRecordType).fk_related_model_id as string,
- )
-
- nextCol = relatedTableMeta?.columns?.find(
- (c) => c.id === ((nextCol?.colOptions as LookupType).fk_lookup_column_id as string),
- ) as ColumnType
- // if next column is same as root lookup column then break the loop
- // since it's going to be a circular loop, and ignore the column
- if (nextCol?.id === col.id) {
- break
+ const loadAllowedLookups = async () => {
+ const filteredLookupCols = []
+ try {
+ for (const col of meta?.value?.columns || []) {
+ if (col.uidt !== UITypes.Lookup) continue
+
+ let nextCol: ColumnType = col
+ // check the lookup column is supported type or not
+ while (nextCol && nextCol.uidt === UITypes.Lookup) {
+ const lookupRelation = (await getMeta(nextCol.fk_model_id as string))?.columns?.find(
+ (c) => c.id === (nextCol?.colOptions as LookupType).fk_relation_column_id,
+ )
+
+ const relatedTableMeta = await getMeta(
+ (lookupRelation?.colOptions as LinkToAnotherRecordType).fk_related_model_id as string,
+ )
+
+ nextCol = relatedTableMeta?.columns?.find(
+ (c) => c.id === ((nextCol?.colOptions as LookupType).fk_lookup_column_id as string),
+ ) as ColumnType
+
+ // if next column is same as root lookup column then break the loop
+ // since it's going to be a circular loop, and ignore the column
+ if (nextCol?.id === col.id) {
+ break
+ }
}
+
+ if (nextCol?.uidt !== UITypes.Attachment && col.id) filteredLookupCols.push(col.id)
}
- if (nextCol?.uidt !== UITypes.Attachment && col.id) filteredLookupCols.push(col.id)
+ supportedLookups.value = filteredLookupCols
+ } catch (e) {
+ console.error(e)
+ }
+ }
+
+ watch([() => view?.value?.id, () => meta.value?.columns], async ([newViewId]) => {
+ // reload only if view belongs to current table
+ if (newViewId && view.value?.fk_model_id === meta.value?.id) {
+ await loadAllowedLookups()
}
+ })
- supportedLookups.value = filteredLookupCols
- } catch (e) {
- console.error(e)
+ return {
+ rootGroup,
+ groupBy,
+ isGroupBy,
+ fieldsToGroupBy,
+ groupByLimit,
+ loadGroups,
+ loadGroupData,
+ loadGroupPage,
+ groupWrapperChangePage,
+ redistributeRows,
}
- }
-
- onMounted(async () => {
- await loadAllowedLookups()
- })
-
- watch(meta, async () => {
- await loadAllowedLookups()
- })
-
- return {
- rootGroup,
- groupBy,
- isGroupBy,
- fieldsToGroupBy,
- groupByLimit,
- loadGroups,
- loadGroupData,
- loadGroupPage,
- groupWrapperChangePage,
- redistributeRows,
- }
+ },
+ 'useViewGroupBy',
+)
+
+export { useProvideViewGroupBy }
+
+export function useViewGroupByOrThrow() {
+ const viewColumns = useViewGroupBy()
+ if (viewColumns == null) throw new Error('Please call `useProvideViewGroupBy` on the appropriate parent component')
+ return viewColumns
}
diff --git a/packages/nc-gui/context/index.ts b/packages/nc-gui/context/index.ts
index dd5d02c427..cfc411a49e 100644
--- a/packages/nc-gui/context/index.ts
+++ b/packages/nc-gui/context/index.ts
@@ -57,3 +57,5 @@ export const TreeViewInj: InjectionKey<{
export const CalendarViewTypeInj: InjectionKey> = Symbol('calendar-view-type-injection')
export const JsonExpandInj: InjectionKey> = Symbol('json-expand-injection')
export const AllFiltersInj: InjectionKey>> = Symbol('all-filters-injection')
+
+export const IsAdminPanelInj: InjectionKey> = Symbol('is-admin-panel-injection')
diff --git a/packages/nc-gui/lang/ar.json b/packages/nc-gui/lang/ar.json
index 7dcdd0690f..feb0e9facf 100644
--- a/packages/nc-gui/lang/ar.json
+++ b/packages/nc-gui/lang/ar.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "الرئيسية",
"load": "تحميل",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "مشاهد",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organization Level Creator",
"orgLevelViewer": "Organization Level Viewer"
},
@@ -313,6 +319,10 @@
"isNotNull": "ليس فارغاً"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "البحث عن {بحث} لم يتم العثور على نتائج",
diff --git a/packages/nc-gui/lang/bn_IN.json b/packages/nc-gui/lang/bn_IN.json
index 4d513ac76a..d76f3b0ad8 100644
--- a/packages/nc-gui/lang/bn_IN.json
+++ b/packages/nc-gui/lang/bn_IN.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "বাড়ি",
"load": "ভার",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "দর্শক",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organization Level Creator",
"orgLevelViewer": "Organization Level Viewer"
},
@@ -313,6 +319,10 @@
"isNotNull": "নাল নয়"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "আপনার অনুসন্ধান {search} এর জন্য কোনও ফলাফল পাওয়া যায় নি",
diff --git a/packages/nc-gui/lang/cs.json b/packages/nc-gui/lang/cs.json
index 9344d05f92..c402443237 100644
--- a/packages/nc-gui/lang/cs.json
+++ b/packages/nc-gui/lang/cs.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Domů",
"load": "Načíst",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Sledující",
"noaccess": "No Access",
"superAdmin": "Hlavní administrátor",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Tvůrce na úrovni organizace",
"orgLevelViewer": "Prohlížeč na úrovni organizace"
},
@@ -313,6 +319,10 @@
"isNotNull": "není null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Dokumentace",
"forum": "Fórum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Operace Vložit není v aktivní buňce podporována.",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Vaše hledání na {search} nenašlo žádné výsledky",
diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json
index 8e0eb3352f..0477b412d1 100644
--- a/packages/nc-gui/lang/da.json
+++ b/packages/nc-gui/lang/da.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Forside",
"load": "Indlæs",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Viewer.",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Skaberen på organisationsniveau",
"orgLevelViewer": "Visning på organisationsniveau"
},
@@ -313,6 +319,10 @@
"isNotNull": "er ikke null."
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Indsæt er ikke understøttet på den aktive celle",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Din søgning efter {Søg} viste ingen resultater",
diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json
index 54afd6df01..9e81c0931e 100644
--- a/packages/nc-gui/lang/de.json
+++ b/packages/nc-gui/lang/de.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Beenden",
"home": "Start",
"load": "Laden",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown-Liste",
"list": "Liste",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Tag",
"week": "Woche",
"month": "Monat",
@@ -247,6 +252,7 @@
"viewer": "Betrachter",
"noaccess": "Kein Zugriff",
"superAdmin": "Super-Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organisationsebenen-Ersteller",
"orgLevelViewer": "Organisationsebenen-Betrachter"
},
@@ -313,6 +319,10 @@
"isNotNull": "ist nicht Null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentifizierung (SSO)",
"docs": "Dokumentation",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Vorherige",
"nextMonth": "Folgender Monat",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Passwort eingeben",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Der Vorgang Einfügen wird auf der aktiven Zelle nicht unterstützt",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Ihre Suche nach {search} fand keine Ergebnisse",
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index b0164345ec..0fa54be92c 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Home",
"load": "Load",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Viewer",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organization Level Creator",
"orgLevelViewer": "Organization Level Viewer"
},
@@ -313,6 +319,10 @@
"isNotNull": "is not null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results"
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace":"-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "SAML",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -663,6 +714,7 @@
"hasMany": "has many",
"belongsTo": "belongs to",
"manyToMany": "have many to many relation",
+ "oneToOne": "have one to one relation",
"extraConnectionParameters": "Extra connection parameters",
"commentsOnly": "Comments only",
"documentation": "Documentation",
@@ -709,9 +761,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1095,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1182,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1226,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1406,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1420,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Your search for {search} found no results",
diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json
index 0402f47afd..568b9da3d6 100644
--- a/packages/nc-gui/lang/es.json
+++ b/packages/nc-gui/lang/es.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Salir",
"home": "Inicio",
"load": "Cargar",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Día",
"week": "Semana",
"month": "Mes",
@@ -247,6 +252,7 @@
"viewer": "Visor",
"noaccess": "Sin acceso",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Creador a nivel de organización",
"orgLevelViewer": "Visor de nivel de organización"
},
@@ -313,6 +319,10 @@
"isNotNull": "no es nulo"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Autenticación (SSO)",
"docs": "Documentos",
"forum": "Foro",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Seleccionar Año",
"save": "Guardar",
"cancel": "Cancelar",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "Nuevo proveedor",
"generalSettings": "Ajustes Generales",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "Ajustes SSO",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organizar por",
"previous": "Anterior",
"nextMonth": "Mes siguiente",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "La vista del calendario requiere un rango de fechas",
"goToToday": "Ir a Hoy",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Introducir la contraseña",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "Un único registro de la tabla ",
"tooltip_desc2": " puede vincularse con un único registro de la tabla "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No hay registros vinculados",
"noLinkedRecords": "No linked records",
"recordsLinked": "registros vinculados",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "No se admite la operación de pegado en la celda activa",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Tu búsqueda de {search} no encontró resultados",
diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json
index e092e06564..25c893f196 100644
--- a/packages/nc-gui/lang/eu.json
+++ b/packages/nc-gui/lang/eu.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Irten",
"home": "Hasiera",
"load": "Kargatu",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Ikuslea",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organization Level Creator",
"orgLevelViewer": "Organization Level Viewer"
},
@@ -313,6 +319,10 @@
"isNotNull": "is not null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Dokumentuak",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Your search for {search} found no results",
diff --git a/packages/nc-gui/lang/fa.json b/packages/nc-gui/lang/fa.json
index 4b6d152be4..e0ec0b64bd 100644
--- a/packages/nc-gui/lang/fa.json
+++ b/packages/nc-gui/lang/fa.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "خروج",
"home": "خانه",
"load": "لود کردن",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "بیننده",
"noaccess": "بدون دسترسی",
"superAdmin": "مدیر ارشد",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "تولید کننده سطح سازمانی",
"orgLevelViewer": "مشاهده کننده سطح سازمانی"
},
@@ -313,6 +319,10 @@
"isNotNull": "تهی نیست"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "مستندات",
"forum": "انجمن",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "عملیات جایگذاری در سلول فعال پشتیبانی نمیشود",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "جستوجوی شما برای {search} نتیجهای نداشت",
diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json
index 01b415f060..b8a27bb666 100644
--- a/packages/nc-gui/lang/fi.json
+++ b/packages/nc-gui/lang/fi.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Koti",
"load": "Ladata",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Katselija",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organisaatiotason luoja",
"orgLevelViewer": "Organisaatiotason katseluohjelma"
},
@@ -313,6 +319,10 @@
"isNotNull": "ei ole nolla"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Liitä-toimintoa ei tueta aktiivisessa solussa.",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Hakusi {haku} ei löytänyt tuloksia",
diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
index 0d48460c35..39f8a1bd96 100644
--- a/packages/nc-gui/lang/fr.json
+++ b/packages/nc-gui/lang/fr.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quitter",
"home": "Accueil",
"load": "Charger",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Liste déroulante",
"list": "Liste",
+ "verify": "Verify",
"apply": "Appliquer",
"text": "Texte",
"appearance": "Apparence"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Jour",
"week": "Semaine",
"month": "Mois",
@@ -247,6 +252,7 @@
"viewer": "Lecture seule",
"noaccess": "Accès interdit",
"superAdmin": "Super administrateur",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Créateur au niveau de l'organisation",
"orgLevelViewer": "Visualiseur de niveau d'organisation"
},
@@ -313,6 +319,10 @@
"isNotNull": "est non null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Documents",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Langage de balisage d'assertion de sécurité (SAML)",
"newProvider": "Nouveau fournisseur",
"generalSettings": "Paramètres généraux",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "Paramètres SSO",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Cliquer pour copier l'ID du champ",
"enterPassword": "Saisir le mot de passe",
"bySigningUp": "En vous inscrivant, vous acceptez les",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Désactivé car la vue est verrouillée",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "L'opération de collage n'est pas prise en charge sur la cellule active",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Le nom doit comporter au moins 2 caractères",
"nameMaxLength": "Le nom doit comporter au maximum 60 caractères",
"viewNameRequired": "Le nom de la vue est obligatoire",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Le nom doit comporter au maximum 256 caractères",
"viewNameUnique": "Le nom de la vue doit être unique",
"searchProject": "Votre recherche pour {search} n'a renvoyé aucun résultat",
diff --git a/packages/nc-gui/lang/he.json b/packages/nc-gui/lang/he.json
index eadd124818..51e6232a7a 100644
--- a/packages/nc-gui/lang/he.json
+++ b/packages/nc-gui/lang/he.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "יציאה",
"home": "בית",
"load": "טען",
@@ -198,11 +200,14 @@
"logo": "סמליל",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "צוֹפֶה",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organization Level Creator",
"orgLevelViewer": "Organization Level Viewer"
},
@@ -313,6 +319,10 @@
"isNotNull": "is not null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "לבחור שנה",
"save": "שמירה",
"cancel": "ביטול",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "ספק חדש",
"generalSettings": "הגדרות כלליות",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "הגדרות SSO",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "מאורגן על-ידי",
"previous": "הקודם",
"nextMonth": "החודש הבא",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "החיפוש שלך {חיפוש} לא נמצא תוצאות",
diff --git a/packages/nc-gui/lang/hi.json b/packages/nc-gui/lang/hi.json
index f60be60dc4..fe14ba303a 100644
--- a/packages/nc-gui/lang/hi.json
+++ b/packages/nc-gui/lang/hi.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "घर",
"load": "भार",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "दर्शक",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organization Level Creator",
"orgLevelViewer": "Organization Level Viewer"
},
@@ -313,6 +319,10 @@
"isNotNull": "निरर्थक नहीं है"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "{search} के लिए आपकी खोज कोई परिणाम नहीं मिला",
diff --git a/packages/nc-gui/lang/hr.json b/packages/nc-gui/lang/hr.json
index d43fd809f3..c071e7539b 100644
--- a/packages/nc-gui/lang/hr.json
+++ b/packages/nc-gui/lang/hr.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Dom",
"load": "Opterećenje",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Preglednika",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Stvaratelj na razini organizacije",
"orgLevelViewer": "Preglednik na razini organizacije"
},
@@ -313,6 +319,10 @@
"isNotNull": "nije ništavan"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Operacija \"lijepljenje\" nije podržana u aktivnoj ćeliji",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Vaša potraga za {Search} nije pronašla rezultate",
diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json
index 898105944c..d50d06baf7 100644
--- a/packages/nc-gui/lang/id.json
+++ b/packages/nc-gui/lang/id.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Keluar",
"home": "Rumah",
"load": "Memuat",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Penonton",
"noaccess": "Tidak ada akses",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Pembuat Tingkat Organisasi",
"orgLevelViewer": "Penampil Tingkat Organisasi"
},
@@ -313,6 +319,10 @@
"isNotNull": "bukan null."
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Operasi tempel tidak didukung pada sel aktif",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Pencarian Anda untuk {Search} tidak menemukan hasil",
diff --git a/packages/nc-gui/lang/it.json b/packages/nc-gui/lang/it.json
index 07232b5b8a..7fe6eb56b2 100644
--- a/packages/nc-gui/lang/it.json
+++ b/packages/nc-gui/lang/it.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Esci",
"home": "Pagina iniziale",
"load": "Carica",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Spettatore",
"noaccess": "Nessun Accesso",
"superAdmin": "Super admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Creatore a livello di organizzazione",
"orgLevelViewer": "Visualizzatore a livello di organizzazione"
},
@@ -313,6 +319,10 @@
"isNotNull": "non è nullo"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Documentazione",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Fare clic per copiare l'Id del campo",
"enterPassword": "Inserisci password",
"bySigningUp": "Registrandoti, accetti i",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "Una singola riga dalla tabella ",
"tooltip_desc2": " può essere collegato con una riga della tabella "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "Nessun record collegato",
"noLinkedRecords": "No linked records",
"recordsLinked": "record collegati",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabilitato perché la Vista è bloccata",
"basesMigrated": "Le Basi sono migrate. Per favore riprova.",
"pasteNotSupported": "L'operazione di incollamento non è supportata sulla cella attiva.",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Il nome deve essere lungo almeno 2 caratteri",
"nameMaxLength": "Il nome deve essere lungo al più 60 caratteri",
"viewNameRequired": "È necessario inserire il nome della vista",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Il nome deve essere lungo al più 256 caratteri",
"viewNameUnique": "Il nome della Visualizzazione deve essere unico",
"searchProject": "La tua ricerca di {search} non ha trovato risultati",
diff --git a/packages/nc-gui/lang/ja.json b/packages/nc-gui/lang/ja.json
index 79837beacb..bb7e981b69 100644
--- a/packages/nc-gui/lang/ja.json
+++ b/packages/nc-gui/lang/ja.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "終了",
"home": "ホーム",
"load": "読み込み",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "閲覧者",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "組織レベルのクリエイター",
"orgLevelViewer": "組織レベルビューワ"
},
@@ -313,6 +319,10 @@
"isNotNull": "がnullでない"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "現在アクティブなセルでは貼り付けはサポートされていません",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "{search} の検索結果が見つかりませんでした",
diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json
index 03e54dbe51..f5b64d46fd 100644
--- a/packages/nc-gui/lang/ko.json
+++ b/packages/nc-gui/lang/ko.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "나가기",
"home": "홈",
"load": "불러오기",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "뷰어",
"noaccess": "권한 없음",
"superAdmin": "최고 운영자",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "조직 수준 생성",
"orgLevelViewer": "조직 수준 뷰어"
},
@@ -313,6 +319,10 @@
"isNotNull": "null 값이 아님"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "문서",
"forum": "포럼",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "클릭하여 필드 ID 복사",
"enterPassword": "비밀번호를 입력하십시오",
"bySigningUp": "회원가입시 다음 약관에 동의한 것으로 간주합니다.",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "테이블의 단일 레코드 ",
"tooltip_desc2": " 테이블의 단일 레코드와 연결될 수 있습니다."
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "레코드가 연결되지 않았습니다.",
"noLinkedRecords": "No linked records",
"recordsLinked": "레코드가 연결되었습니다.",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "베이스가 마이그레이션되었습니다. 다시 시도하십시오.",
"pasteNotSupported": "활성 셀에서는 붙여넣기 작업이 지원되지 않습니다.",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "검색 결과가 없습니다",
diff --git a/packages/nc-gui/lang/lv.json b/packages/nc-gui/lang/lv.json
index 3a66ebea85..3781a4b81c 100644
--- a/packages/nc-gui/lang/lv.json
+++ b/packages/nc-gui/lang/lv.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Sākumlapa",
"load": "Ielādēt",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Skatītājs",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organizācijas līmeņa radītājs",
"orgLevelViewer": "Organizācijas līmeņa skatītājs"
},
@@ -313,6 +319,10 @@
"isNotNull": "nav null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Aktīvajā šūnā netiek atbalstīta operācija \"ielīmēt\".",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Nav atrasti rezultāti meklējot pēc atslēgvārda {search}",
diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json
index 1be40457d4..6e379b7cdb 100644
--- a/packages/nc-gui/lang/nl.json
+++ b/packages/nc-gui/lang/nl.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Dashboard",
"load": "Laden",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Kijker",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Schepper op organisatieniveau",
"orgLevelViewer": "Viewer op organisatieniveau"
},
@@ -313,6 +319,10 @@
"isNotNull": "is niet NULL"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Plakken wordt niet ondersteund op de actieve cel",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Uw zoekopdracht voor {search} heeft geen resultaten opgeleverd",
diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json
index aaaca480aa..9c1f07bf9c 100644
--- a/packages/nc-gui/lang/no.json
+++ b/packages/nc-gui/lang/no.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Hjem",
"load": "Laste",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Seer.",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organization Level Creator",
"orgLevelViewer": "Organization Level Viewer"
},
@@ -313,6 +319,10 @@
"isNotNull": "er ikke null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Søket ditt etter {søk} fant ingen resultater",
diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json
index 26a1490412..4f8f074ee3 100644
--- a/packages/nc-gui/lang/pl.json
+++ b/packages/nc-gui/lang/pl.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Wyjdź",
"home": "Start",
"load": "Załaduj",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Rozwijane menu",
"list": "Lista",
+ "verify": "Verify",
"apply": "Zastosuj",
"text": "Tekst",
"appearance": "Wygląd"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Dzień",
"week": "Tydzień",
"month": "Miesiąc",
@@ -247,6 +252,7 @@
"viewer": "Obserwator",
"noaccess": "Brak dostępu",
"superAdmin": "Superadministrator",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Twórca na poziomie organizacji",
"orgLevelViewer": "Obserwator na poziomie organizacji"
},
@@ -313,6 +319,10 @@
"isNotNull": "Nie jest null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Autoryzacja (SSO)",
"docs": "Dokumentacja",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Wybierz rok",
"save": "Zapisz",
"cancel": "Anuluj",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "Nowy dostawca",
"generalSettings": "Ustawienia ogólne",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "Ustawienia SSO",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organizuj według",
"previous": "Poprzedni",
"nextMonth": "Następny miesiąc",
@@ -709,9 +760,16 @@
"clearSelection": "Wyczyść wybór"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Dodaj Członków",
"enterEmail": "Wpisz adresy e-mail",
"inviteToBase": "Zaproś do bazy",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Dodaj członka do bazy",
"noRange": "Widok kalendarza wymaga zakresu dat",
"goToToday": "Przejdź do dzisiaj",
@@ -1036,6 +1094,11 @@
"searchOptions": "Opcje wyszukiwania"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Kliknij, aby skopiować Identyfikator Pola",
"enterPassword": "Wprowadź hasło",
"bySigningUp": "Rejestrując się, zgadzasz się na",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "Pojedynczy rekord z tabeli ",
"tooltip_desc2": " może być powiązany z pojedynczym rekordem z tabeli "
},
- "clickLinkRecordsToAddLinkFromTable": "Kliknij 'Połącz Rekordy', aby rozpocząć kojarzenie danych z '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "Żadne rekordy nie są powiązane",
"noLinkedRecords": "Brak powiązanych rekordów",
"recordsLinked": "rekordy powiązane",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Proszę wkleić ten adres URL w konsoli dostawcy tożsamości",
"noSaml": "Nie ma skonfigurowanych uwierzytelnień SAML.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Wyłączone, ponieważ widok jest zablokowany",
"basesMigrated": "Bazy zostały przeniesione. Proszę spróbować ponownie.",
"pasteNotSupported": "Operacja wklejania nie jest obsługiwana w aktywnej komórce",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Błąd podczas pobierania danych kalendarza",
"fetchingActiveDates": "Błąd podczas pobierania aktywnych dat",
"scopesRequired": "Wymagane zakresy",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Wymagany jest URL autoryzacji",
"userNameAttributeRequired": "Wymagany jest atrybut nazwy użytkownika",
"clientIdRequired": "Wymagane jest ID klienta",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Nazwa musi mieć co najmniej 2 znaki",
"nameMaxLength": "Nazwa musi mieć maksymalnie 60 znaków",
"viewNameRequired": "Wymagana nazwa widoku",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Nazwa musi mieć maksymalnie 256 znaków",
"viewNameUnique": "Nazwa widoku powinna być unikalna",
"searchProject": "Twoje wyszukiwanie dla {search}, nie znaleziono żadnych wyników",
diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json
index 06a81e8e4b..515a7e11be 100644
--- a/packages/nc-gui/lang/pt.json
+++ b/packages/nc-gui/lang/pt.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Sair",
"home": "Casa",
"load": "Carga",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Aplicar",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Dia",
"week": "Semana",
"month": "Mês",
@@ -247,6 +252,7 @@
"viewer": "Viewer.",
"noaccess": "Sem acesso",
"superAdmin": "Administrador Geral",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Nível de Organização Criador",
"orgLevelViewer": "Visor de Nível de Organização"
},
@@ -313,6 +319,10 @@
"isNotNull": "não é nulo"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Autenticação (SSO)",
"docs": "Documentação",
"forum": "Fórum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Selecionar ano",
"save": "Guardar",
"cancel": "Cancelar",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "Novo provedor",
"generalSettings": "Configurações gerais",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "Configurações SSO",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organizar por",
"previous": "Anterior",
"nextMonth": "Próximo mês",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "A operação de colar não é suportada na célula activa",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "A sua pesquisa por {search} não encontrou resultados",
diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json
index 4a4a286f0d..c45eb82e42 100644
--- a/packages/nc-gui/lang/pt_BR.json
+++ b/packages/nc-gui/lang/pt_BR.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Sair",
"home": "Início",
"load": "Carregar",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Dia",
"week": "Semana",
"month": "Mês",
@@ -247,6 +252,7 @@
"viewer": "Visualizador",
"noaccess": "No Access",
"superAdmin": "Super Administrador",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Criador de Nível da Organização",
"orgLevelViewer": "Visualizador de nível da organização"
},
@@ -313,6 +319,10 @@
"isNotNull": "não é nulo"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Autenticação (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "A operação de colar não é suportada na célula activa",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "A sua pesquisa por {search} não encontrou resultados",
diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json
index b2b3d7939f..579a6ec2f2 100644
--- a/packages/nc-gui/lang/ru.json
+++ b/packages/nc-gui/lang/ru.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Выйти",
"home": "На главную",
"load": "Загрузка",
@@ -198,11 +200,14 @@
"logo": "Логотип",
"dropdown": "Выпадающий список",
"list": "Список",
+ "verify": "Verify",
"apply": "Применить",
"text": "Текст",
"appearance": "Внешний вид"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "День",
"week": "Неделя",
"month": "Месяц",
@@ -247,6 +252,7 @@
"viewer": "Наблюдатель",
"noaccess": "Нет доступа",
"superAdmin": "Супер админ",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Уровень Создатель",
"orgLevelViewer": "Уровень Наблюдатель"
},
@@ -313,6 +319,10 @@
"isNotNull": "не равно Null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Аутентификация (SSO)",
"docs": "Документация",
"forum": "Форум",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Выберите год",
"save": "Сохранить",
"cancel": "Отмена",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "Настройки SSO",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Предыдущий",
"nextMonth": "Следующий месяц",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Введите пароль",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Операция Вставки не поддерживается в выделенной ячейке",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Ваш поиск {поиск} не дал результатов",
diff --git a/packages/nc-gui/lang/sk.json b/packages/nc-gui/lang/sk.json
index e5c18807c1..139ac4ce7b 100644
--- a/packages/nc-gui/lang/sk.json
+++ b/packages/nc-gui/lang/sk.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Domov",
"load": "Zaťaženie",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Prehliadač",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Tvorca na úrovni organizácie",
"orgLevelViewer": "Prehliadač na úrovni organizácie"
},
@@ -313,6 +319,10 @@
"isNotNull": "nie je null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Operácia Vložiť nie je podporovaná v aktívnej bunke",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Vaše vyhľadávanie na {search} nenašlo žiadne výsledky",
diff --git a/packages/nc-gui/lang/sl.json b/packages/nc-gui/lang/sl.json
index 02eefdcaff..7fecee801f 100644
--- a/packages/nc-gui/lang/sl.json
+++ b/packages/nc-gui/lang/sl.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Doma",
"load": "Load.",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "Gledalca.",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Ustvarjalec na ravni organizacije",
"orgLevelViewer": "Pregledovalnik na ravni organizacije"
},
@@ -313,6 +319,10 @@
"isNotNull": "ni null"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Operacija Vstavi ni podprta v aktivni celici",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Vaše iskanje {search} ni dalo rezultatov",
diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json
index 6ed541ecc1..ac9439b8b8 100644
--- a/packages/nc-gui/lang/sv.json
+++ b/packages/nc-gui/lang/sv.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "Hem",
"load": "Ladda",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Dag",
"week": "Vecka",
"month": "Månad",
@@ -247,6 +252,7 @@
"viewer": "Visare",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organisatorisk nivå Skapare",
"orgLevelViewer": "Visare för organisationsnivå"
},
@@ -313,6 +319,10 @@
"isNotNull": "är inte noll"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Autentisering (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Spara",
"cancel": "Avbryt",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Ange lösenord",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Klistra in stöds inte på den aktiva cellen.",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "Din sökning efter {Sök} har inga resultat",
diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json
index f7eae8f05c..10e074e829 100644
--- a/packages/nc-gui/lang/th.json
+++ b/packages/nc-gui/lang/th.json
@@ -39,6 +39,8 @@
}
},
"general": {
+ "role": "Role",
+ "general": "General",
"quit": "Quit",
"home": "บ้าน",
"load": "โหลด",
@@ -198,11 +200,14 @@
"logo": "Logo",
"dropdown": "Dropdown",
"list": "List",
+ "verify": "Verify",
"apply": "Apply",
"text": "Text",
"appearance": "Appearance"
},
"objects": {
+ "owner": "Owner",
+ "member": "Member",
"day": "Day",
"week": "Week",
"month": "Month",
@@ -247,6 +252,7 @@
"viewer": "ผู้ดู",
"noaccess": "No Access",
"superAdmin": "Super Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organization Level Creator",
"orgLevelViewer": "Organization Level Viewer"
},
@@ -313,6 +319,10 @@
"isNotNull": "ไม่เป็นโมฆะ"
},
"title": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
"sso": "Authentication (SSO)",
"docs": "Docs",
"forum": "Forum",
@@ -437,6 +447,39 @@
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
@@ -447,7 +490,15 @@
"saml": "Security Assertion Markup Language (SAML)",
"newProvider": "New Provider",
"generalSettings": "General Settings",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
"ssoSettings": "SSO Settings",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
"previous": "Previous",
"nextMonth": "Next Month",
@@ -709,9 +760,16 @@
"clearSelection": "Clear selection"
},
"activity": {
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
"addMembers": "Add Members",
"enterEmail": "Enter email addresses",
"inviteToBase": "Invite to Base",
+ "inviteToWorkspace": "Invite to Workspace",
"addMember": "Add Member to Base",
"noRange": "Calendar view requires a date range",
"goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
"searchOptions": "Search options"
},
"msg": {
+ "controlOrgAppearance": "Control your organisations name and appearance.",
+ "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+ "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+ "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+ "deleteOrganization": "Delete all users, bases and data related to this organization",
"clickToCopyFieldId": "Click to copy Field Id",
"enterPassword": "Enter password",
"bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
"tooltip_desc": "A single record from table ",
"tooltip_desc2": " can be linked with a single record from table "
},
- "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+ "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
"noRecordsLinked": "No records linked",
"noLinkedRecords": "No linked records",
"recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
}
},
"info": {
+ "enterWorkspaceName": "Enter workspace name",
+ "enterBaseName": "Enter base name",
"idpPaste": "Paste these URL in your Identity Providers console",
"noSaml": "There are no configured SAML authentications.",
+ "noOIDC": "There are no configured OpenID authentications.",
"disabledAsViewLocked": "Disabled as View is locked",
"basesMigrated": "Bases are migrated. Please try again.",
"pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
"fetchingCalendarData": "Error fetching calendar data",
"fetchingActiveDates": "Error fetching active dates",
"scopesRequired": "Scopes required",
+ "domainRequired": "Domain name is required",
"authUrlRequired": "Auth URL is required",
"userNameAttributeRequired": "Username attribute is required",
"clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
"nameMinLength": "Name must be at least 2 characters long",
"nameMaxLength": "Name must be at most 60 characters long",
"viewNameRequired": "View name is required",
+ "domainNameRequired": "Domain name is required",
"nameMaxLength256": "Name must be at most 256 characters long",
"viewNameUnique": "View name should be unique",
"searchProject": "การค้นหาของคุณสำหรับ {search} ไม่พบผลลัพธ์",
diff --git a/packages/nc-gui/lang/tr.json b/packages/nc-gui/lang/tr.json
index 7f51be5bc1..7a8fd40e2b 100644
--- a/packages/nc-gui/lang/tr.json
+++ b/packages/nc-gui/lang/tr.json
@@ -1,45 +1,47 @@
{
"dashboards": {
- "create_new_dashboard_project": "Create New Interface",
- "connect_data_sources": "Connect data sources",
- "alert": "Alert",
- "alert-message": "No databases have been connected. Connect database bases to build interfaces. Skip this step and add databases from the base home page later.",
- "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Select Database Bases that you want to link to this Interface.",
- "create_interface": "Create interface",
- "project_name": "Base Name",
- "connect": "Connect",
+ "create_new_dashboard_project": "Yeni Arayüz Oluştur",
+ "connect_data_sources": "Yeni kaynağa bağlan",
+ "alert": "Uyarı",
+ "alert-message": "Hiçbir veritabanına bağlanmadı. Arayüz oluşturmak için veritabanlarına bağlanın. Bu adımı atlayın ve veritabanlarını daha sonra proje ana sayfasından ekleyin.",
+ "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Bu arayüze bağlamak için bir veritabanı seçin.",
+ "create_interface": "Arayüz Oluştur",
+ "project_name": "Proje Adı",
+ "connect": "Bağlan",
"buttonActionTypes": {
- "open_external_url": "Open external link",
- "delete_record": "Delete record",
- "update_record": "Update record",
- "open_layout": "Open layout"
+ "open_external_url": "Dış bağlantıyı aç",
+ "delete_record": "Kaydı sil",
+ "update_record": "Kaydı güncelle",
+ "open_layout": "Düzeni aç"
},
"widgets": {
- "static_text": "Text",
- "chart": "Chart",
- "table": "Table",
- "image": "Image",
- "map": "Map",
- "button": "Button",
- "number": "Number",
- "bar_chart": "Bar Chart",
- "line_chart": "Line Chart",
- "area_chart": "Area Chart",
- "pie_chart": "Pie Chart",
- "donut_chart": "Donut Chart",
- "scatter_plot": "Scatter Plot",
- "bubble_chart": "Bubble Chart",
- "radar_chart": "Radar Chart",
- "polar_area_chart": "Polar Area Chart",
- "radial_bar_chart": "Radial Bar Chart",
- "heatmap_chart": "Heatmap Chart",
- "treemap_chart": "Treemap Chart",
- "box_plot_chart": "Box Plot Chart",
- "candlestick_chart": "Candlestick Chart"
+ "static_text": "Metin",
+ "chart": "Grafik",
+ "table": "Tablo",
+ "image": "Görüntü",
+ "map": "Harita",
+ "button": "Buton",
+ "number": "Sayı",
+ "bar_chart": "Çubuk Grafiği",
+ "line_chart": "Çizgi Grafiği",
+ "area_chart": "Alan Grafiği",
+ "pie_chart": "Pasta Grafiği",
+ "donut_chart": "Halka Grafiği",
+ "scatter_plot": "Dağılım Grafiği",
+ "bubble_chart": "Kabarcık Grafiği",
+ "radar_chart": "Radar Grafiği",
+ "polar_area_chart": "Polar Alan Grafiği",
+ "radial_bar_chart": "Radyal Çubuk Grafiği",
+ "heatmap_chart": "Isı Haritası Grafiği",
+ "treemap_chart": "Dizin Grafiği",
+ "box_plot_chart": "Kutu Matris Grifiği",
+ "candlestick_chart": "Şamdan Grafiği"
}
},
"general": {
- "quit": "Quit",
+ "role": "Role",
+ "general": "General",
+ "quit": "Çıkış",
"home": "Ana Sayfa",
"load": "Yükle",
"open": "Aç",
@@ -47,67 +49,67 @@
"yes": "Evet",
"no": "Hayır",
"ok": "Tamam",
- "back": "Back",
+ "back": "Geri",
"and": "Ve",
"or": "Veya",
"add": "Ekle",
"edit": "Düzenle",
- "link": "Link",
- "links": "Links",
+ "link": "Bağlantı",
+ "links": "Bağlantılar",
"remove": "Sil",
- "import": "Import",
- "logout": "Log Out",
- "empty": "Empty",
- "changeIcon": "Change Icon",
+ "import": "İçe aktar",
+ "logout": "Oturumu Kapat",
+ "empty": "Boş",
+ "changeIcon": "Simgeyi Değiştir",
"save": "Kaydet",
- "available": "Available",
- "abort": "Abort",
- "saving": "Saving",
+ "available": "Uygun",
+ "abort": "İptal",
+ "saving": "Kaydediliyor",
"cancel": "İptal",
"null": "Null",
- "escape": "Escape",
+ "escape": "Esc",
"hex": "Hex",
- "clear": "Clear",
+ "clear": "Temizle",
"slack": "Slack",
- "comment": "Comment",
+ "comment": "Yorum",
"microsoftTeams": "Microsoft Teams",
"discord": "Discord",
"matterMost": "Mattermost",
"twilio": "Twilio",
"whatsappTwilio": "WhatsApp Twilio",
- "quote": "Quote",
+ "quote": "Alıntı",
"submit": "Gönder",
"create": "Oluştur",
- "createEntity": "Create {entity}",
- "creating": "Creating",
- "creatingEntity": "Creating {entity}",
- "details": "Details",
- "skip": "Skip",
- "code": "Code",
+ "createEntity": "Oluştur {entity}",
+ "creating": "Oluşturuluyor",
+ "creatingEntity": "Oluşturuluyor {entity}",
+ "details": "Ayrıntılar",
+ "skip": "Atla",
+ "code": "Kod",
"duplicate": "Yinelenen",
- "duplicating": "Duplicating",
- "activate": "Activate",
- "action": "Action",
+ "duplicating": "Kopyalanıyor",
+ "activate": "Etkinleştir",
+ "action": "Eylem",
"insert": "Ekle",
"delete": "Sil",
- "deleteEntity": "Delete {entity}",
- "bulkInsert": "Bulk Insert",
- "bulkDelete": "Bulk Delete",
- "bulkUpdate": "Bulk Update",
- "deleting": "Deleting",
+ "deleteEntity": "Sil {entity}",
+ "bulkInsert": "Toplu Ekle",
+ "bulkDelete": "Toplu Sil",
+ "bulkUpdate": "Toplu Güncelle",
+ "deleting": "Siliniyor",
"update": "Güncelle",
"rename": "Yeniden Adlandır",
"reload": "Yenile",
"reset": "Sıfırla",
"install": "Yükle",
"show": "Göster",
- "access": "Access",
- "visibility": "Visibility",
+ "access": "Erişim",
+ "visibility": "Görünürlük",
"hide": "Gizle",
- "deprecated": "Deprecated",
+ "deprecated": "Kullanım dışı",
"showAll": "Hepsini Göster",
"hideAll": "Hepsini Gizle",
- "notFound": "Not found",
+ "notFound": "Bulunamadı",
"showMore": "Daha fazla göster",
"showOptions": "Seçenekleri göster",
"hideOptions": "Seçenekleri gizle",
@@ -127,8 +129,8 @@
"upload": "Yükle",
"download": "İndir",
"default": "Varsayılan",
- "base": "Source",
- "datasource": "Data Source",
+ "base": "Kaynak",
+ "datasource": "Veri Kaynağı",
"more": "Fazla",
"less": "Az",
"event": "Olay",
@@ -136,7 +138,7 @@
"after": "Sonra",
"before": "Önce",
"search": "Ara",
- "searchIn": "Search In",
+ "searchIn": "Ara",
"notification": "Bildirim",
"reference": "Referans",
"function": "Fonksiyon",
@@ -157,58 +159,61 @@
"groupingField": "Gruplama Alanı",
"insertAfter": "Sonra Ekle",
"insertBefore": "Önce Ekle",
- "insertAbove": "Insert above",
- "insertBelow": "Insert below",
+ "insertAbove": "Yukarıya ekle",
+ "insertBelow": "Aşağı ekle",
"hideField": "Alanı Gizle",
"sortAsc": "Artan Sırala",
"sortDesc": "Azalan Sıralama",
- "move": "Move",
+ "move": "Taşı",
"geoDataField": "GeoData Alanı",
- "type": "Type",
- "name": "Name",
- "changes": "Changes",
- "new": "New",
- "old": "Old",
- "data": "Data",
- "source": "Source",
- "destination": "Destination",
- "active": "Active",
- "inactive": "Inactive",
- "linked": "linked",
- "finish": "Finish",
+ "type": "Tür",
+ "name": "Ad",
+ "changes": "Değişiklikler",
+ "new": "Yeni",
+ "old": "Eski",
+ "data": "Veri",
+ "source": "Kaynak",
+ "destination": "Hedef",
+ "active": "Etkin",
+ "inactive": "İnaktif",
+ "linked": "bağlantılı",
+ "finish": "Bitir",
"min": "Min",
"max": "Max",
- "avg": "Avg",
- "sum": "Sum",
- "count": "Count",
- "countDistinct": "Count Distinct",
- "sumDistinct": "Sum Distinct",
- "avgDistinct": "Avg Distinct",
- "join": "Join",
- "options": "Options",
- "primaryValue": "Primary Value",
- "useSurveyMode": "Use Survey Mode",
+ "avg": "Ort",
+ "sum": "Top",
+ "count": "Say",
+ "countDistinct": "Tekrarsız Say",
+ "sumDistinct": "Tekrarsız Toplam",
+ "avgDistinct": "Farklı Değerlerin Ort",
+ "join": "Bağla",
+ "options": "Seçenekler",
+ "primaryValue": "Birincil Değer",
+ "useSurveyMode": "Anket Modunu Kullan",
"shift": "Shift",
"enter": "Enter",
- "seconds": "Seconds",
- "paste": "Paste",
- "restore": "Restore",
- "replace": "Replace",
- "banner": "Banner",
+ "seconds": "Saniye",
+ "paste": "Yapıştır",
+ "restore": "Geri Yükle",
+ "replace": "Değiştir",
+ "banner": "Afiş",
"logo": "Logo",
- "dropdown": "Dropdown",
- "list": "List",
- "apply": "Apply",
- "text": "Text",
- "appearance": "Appearance"
+ "dropdown": "Açılır menü",
+ "list": "Liste",
+ "verify": "Verify",
+ "apply": "Uygula",
+ "text": "Metin",
+ "appearance": "Görünüm"
},
"objects": {
- "day": "Day",
- "week": "Week",
- "month": "Month",
- "year": "Year",
- "workspace": "Workspace",
- "workspaces": "Workspaces",
+ "owner": "Owner",
+ "member": "Member",
+ "day": "Gün",
+ "week": "Hafta",
+ "month": "Ay",
+ "year": "Yıl",
+ "workspace": "Çalışma Alanı",
+ "workspaces": "Çalışma Alanları",
"project": "Proje",
"projects": "Projeler",
"table": "Tablo",
@@ -225,7 +230,7 @@
"webhooks": "Webhooklar",
"view": "Görünüm",
"views": "Görünümler",
- "sidebar": "Sidebar",
+ "sidebar": "Kenar Çubuğu",
"viewType": {
"grid": "Tablo",
"gallery": "Galeri",
@@ -238,27 +243,28 @@
"users": "Kullanıcılar",
"role": "Rol",
"roles": "Roller",
- "developer": "Developer",
+ "developer": "Geliştirici",
"roleType": {
"owner": "Sahip",
"creator": "Yaratıcı",
"editor": "Editör",
"commenter": "Yorumcu",
"viewer": "İzleyici",
- "noaccess": "No Access",
- "superAdmin": "Super Admin",
+ "noaccess": "Erişim Yok",
+ "superAdmin": "Süper Admin",
+ "orgLevelOwner": "Organization Level Owner",
"orgLevelCreator": "Organizasyon Seviyesi Oluşturucu",
"orgLevelViewer": "Organizasyon Seviyesi Görüntüleyici"
},
"sqlVIew": "SQL Görünümü",
- "rowHeight": "Record Height",
+ "rowHeight": "Sütun Yüksekliği",
"heightClass": {
- "short": "Short",
- "medium": "Medium",
- "tall": "Tall",
- "extra": "Extra"
+ "short": "Kısa",
+ "medium": "Orta",
+ "tall": "Uzun",
+ "extra": "Ekstra"
},
- "externalDb": "External Database"
+ "externalDb": "Harici Veritabanı"
},
"datatype": {
"ID": "KIMLIK",
@@ -313,66 +319,70 @@
"isNotNull": "null değil"
},
"title": {
- "sso": "Authentication (SSO)",
- "docs": "Docs",
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename Workspace",
+ "renamingWorkspace": "Renaming Workspace",
+ "renamingBase": "Renaming Base",
+ "sso": "Kimlik Doğrulama (SSO)",
+ "docs": "Dokümantasyon",
"forum": "Forum",
- "parameter": "Parameter",
- "headers": "Headers",
- "parameterName": "Parameter Name",
- "currencyLocale": "Currency Locale",
- "currencyCode": "Currency Code",
- "searchMembers": "Search Members",
- "noMembersFound": "No members found",
- "dateJoined": "Date Joined",
- "tokenName": "Token name",
- "inDesktop": "in Desktop",
- "rowData": "Record data",
- "creator": "Creator",
- "qrCode": "QR Code",
- "termsOfService": "Terms of Service",
- "updateSelectedRows": "Update Selected Records",
- "noFiltersAdded": "No filters added",
- "editCards": "Edit Cards",
- "noFieldsFound": "No fields found",
- "displayValue": "Display Value",
- "expand": "Expand",
- "hideAll": "Hide all",
- "hideSystemFields": "Hide system fields",
- "removeFile": "Remove File",
- "hasMany": "Has Many",
- "manyToMany": "Many to Many",
- "oneToOne": "One to One",
- "virtualRelation": "Virtual Relation",
- "linkMore": "Link More",
- "linkMoreRecords": "Link more records",
- "linkRecords": "Link Records",
- "downloadFile": "Download File",
- "renameTable": "Rename Table",
- "renamingTable": "Renaming Table",
- "renamingWs": "Renaming Workspace",
- "renameWs": "Rename Workspace",
- "deleteWs": "Delete Workspace",
- "deletingWs": "Deleting Workspace",
- "copyAuthToken": "Copy Auth Token",
- "copiedAuthToken": "Copied Auth Token",
- "copyInviteToken": "Copy Invite Token",
- "showSidebar": "Show Sidebar",
- "hideSidebar": "Hide Sidebar",
- "creatingTable": "Creating Table",
+ "parameter": "Parametre",
+ "headers": "Üstbilgi",
+ "parameterName": "Parametre Adı",
+ "currencyLocale": "Para Birimi Dili",
+ "currencyCode": "Para Birimi",
+ "searchMembers": "Üyeleri Bul",
+ "noMembersFound": "Üye bulunamadı",
+ "dateJoined": "Katılım Tarihi",
+ "tokenName": "Token adı",
+ "inDesktop": "Masaüstü",
+ "rowData": "Kayıt verisi",
+ "creator": "Yaratıcı",
+ "qrCode": "QR Kod",
+ "termsOfService": "Hizmet Koşulları",
+ "updateSelectedRows": "Seçili Kayıtları Güncelle",
+ "noFiltersAdded": "Filtre yok",
+ "editCards": "Kartları Düzenle",
+ "noFieldsFound": "Hiç sütun bulunamadı",
+ "displayValue": "Gösterge Değeri",
+ "expand": "Genişlet",
+ "hideAll": "Tümünü gizle",
+ "hideSystemFields": "Sistem alanlarını gizle",
+ "removeFile": "Dosyayı Kaldır",
+ "hasMany": "Birden Çoğa",
+ "manyToMany": "Çoktan Çoğa",
+ "oneToOne": "Bire Bir",
+ "virtualRelation": "Sanal İlişki",
+ "linkMore": "İlişkilendir",
+ "linkMoreRecords": "Daha fazla kayıt ilişkilendir",
+ "linkRecords": "Kayıt İlişkilendir",
+ "downloadFile": "Dosyayı İndir",
+ "renameTable": "Tabloyu Yeniden Adlandır",
+ "renamingTable": "Tablo Yeniden Adlandırılıyor",
+ "renamingWs": "Çalışma Alanı Yeniden Adlandırılıyor",
+ "renameWs": "Çalışma Alanını Yeniden Adlandır",
+ "deleteWs": "Çalışma Alanını Sil",
+ "deletingWs": "Çalışma Alanı Yeniden Adlandırılıyor",
+ "copyAuthToken": "Yetki Token'ını Kopyala",
+ "copiedAuthToken": "Yetki Token'ı Kopyalandı",
+ "copyInviteToken": "Davet Token'ını Kopyala",
+ "showSidebar": "Kenar Çubuğunu Göster",
+ "hideSidebar": "Kenar Çubuğunu Gizle",
+ "creatingTable": "Tablo Oluşturuluyor",
"erdView": "ERD Görünümü",
- "newBase": "New Data Source",
+ "newBase": "Yeni Veri Kaynağı",
"newProj": "Yeni proje",
- "createBase": "Create Base",
+ "createBase": "Proje Oluştur",
"myProject": "Benim projelerim",
"formTitle": "Form başlığı",
- "collaborative": "Collaborative",
- "locked": "Locked",
- "personal": "Personal",
+ "collaborative": "Paylaşılan",
+ "locked": "Kilitli",
+ "personal": "Kişisel",
"appStore": "Uygulama mağazası",
"teamAndAuth": "Takım & Yetki",
"rolesUserMgmt": "Rol & Kullanıcı Yönetimi",
"userMgmt": "Kullanıcı Yönetimi",
- "apiTokens": "API Tokens",
+ "apiTokens": "API Tokenları",
"apiTokenMgmt": "API Token Yönetimi",
"rolesMgmt": "Rol Yönetimi",
"projMeta": "Proje Metaveri",
@@ -395,150 +405,191 @@
"generateToken": "Belirteç Oluştur",
"APIsAndSupport": "API'ler & Destek",
"helpCenter": "Yardım merkezi",
- "noLabels": "No Labels",
+ "noLabels": "Etiket Yok",
"swaggerDocumentation": "Swagger Dokümantasyonu",
"quickImportFrom": "Hızlı İçe Aktarma",
"quickImport": "Hızlı İçe Aktarma",
- "quickImportAirtable": "Quick Import - Airtable",
- "quickImportCSV": "Quick Import - CSV",
- "quickImportExcel": "Quick Import - Excel",
- "quickImportJSON": "Quick Import - JSON",
- "jsonEditor": "JSON Editor",
- "comingSoon": "Coming Soon",
+ "quickImportAirtable": "Hızlı İçe Aktarma - Airtable",
+ "quickImportCSV": "Hızlı İçe Aktarma - CSV",
+ "quickImportExcel": "Hızlı İçe Aktarma - Excel",
+ "quickImportJSON": "Hızlı İçe Aktarma - JSON",
+ "jsonEditor": "JSON Düzenleyici",
+ "comingSoon": "Çok Yakında",
"advancedSettings": "Gelişmiş Ayarlar",
"codeSnippet": "Kod Parçacığı",
"keyboardShortcut": "Klavye Kısayolları",
"generateRandomName": "Rastgele Ad Oluştur",
"findRowByScanningCode": "QR veya Barkod okutarak satır bulun",
- "tokenManagement": "Token Management",
- "addNewToken": "Add new token",
- "createNewToken": "Create new token",
- "accountSettings": "Account Settings",
- "resetPasswordMenu": "Reset Password",
- "tokens": "Tokens",
- "userManagement": "User Management",
- "accountManagement": "Account management",
- "licence": "Licence",
- "allowAllMimeTypes": "Allow All Mime Types",
- "defaultView": "Default View",
- "relations": "Relations",
- "switchLanguage": "Switch Language",
- "renameFile": "Rename File",
+ "tokenManagement": "Token Yönetimi",
+ "addNewToken": "Yeni token ekle",
+ "createNewToken": "Yeni token oluştur",
+ "accountSettings": "Hesap Ayarları",
+ "resetPasswordMenu": "Parola Sıfırla",
+ "tokens": "Tokenler",
+ "userManagement": "Kullanıcı Yönetimi",
+ "accountManagement": "Hesap yönetimi",
+ "licence": "Lisans",
+ "allowAllMimeTypes": "Tüm Mime Türlerine İzin Ver",
+ "defaultView": "Varsayılan Görünüm",
+ "relations": "İlişkiler",
+ "switchLanguage": "Dil Değiştir",
+ "renameFile": "Dosyayı Yeniden Adlandır",
"links": {
- "noAction": "No Action",
- "cascade": "Cascade",
- "restrict": "Restrict",
- "setNull": "Set NULL",
- "setDefault": "Set Default"
+ "noAction": "Eylem Yok",
+ "cascade": "Kaskat",
+ "restrict": "Kısıtla",
+ "setNull": "NULL olarak ayarla",
+ "setDefault": "Varsayılan olarak ayarla"
},
- "selectFieldsFromRightPannelToAddHere": "Select fields from right panel to add here",
- "noOptionsFound": "No options found",
- "surveyFormSubmitConfirmMsg": "Are you sure you want to submit this form?",
+ "selectFieldsFromRightPannelToAddHere": "Buraya eklemek için sağ panelden alanları seçin",
+ "noOptionsFound": "Seçenek bulunamadı",
+ "surveyFormSubmitConfirmMsg": "Bu formu göndermek istediğinizden emin misiniz?",
"noResultsMatchedYourSearch": "Your search did not yield any matching results."
},
"labels": {
- "selectYear": "Select Year",
- "save": "Save",
- "cancel": "Cancel",
- "metadataUrl": "Metadata URL",
- "audience-entityId": "Audience/ Entity ID",
- "redirectUrl": "Redirect URL",
+ "txt": "TXT Record value",
+ "transferOwnership": "Transfer Ownership",
+ "recentActivity": "Recent Activity",
+ "goToMembers": "Go to Members",
+ "addMember": "Add Member",
+ "numberOfMembers": "No. Members",
+ "numberOfBases": "No. Bases",
+ "numberOfRecords": "No. Records",
+ "workspaceName": "Workspace Name",
+ "workspaceWithoutOwner": "Workspace without Owners",
+ "inviteUsersToWorkspace": "Invite Users to Workspace",
+ "selectWorkspace": "-select workspaces to invite to-",
+ "addMembersToOrganization": "Add Members to Organization",
+ "memberIn": "Member in:",
+ "assignAs": "Assign as",
+ "signOutUser": "Sign out user",
+ "signOutUsers": "Sign out users",
+ "deactivateUser": "Deactivate User",
+ "deactivateUsers": "Deactivate Users",
+ "lastActive": "Last Active",
+ "dateAdded": "Date Added",
+ "uploadImage": "Upload Image",
+ "organizationProfile": "Organisation Profile",
+ "organizationImage": "Organisation Image",
+ "organizationName": "Organisation Name",
+ "activeDomains": "Active Domains",
+ "domains": "Domains",
+ "disablePublicSharing": "Disable Public Sharing",
+ "shareSettings": "Share Settings",
+ "deleteUserAndData": "Delete User and their data",
+ "userOptions": "User Options",
+ "deleteThisOrganization": "Delete this Organisation",
+ "dangerZone": "Dangerzone",
+ "selectYear": "Yıl Seçin",
+ "save": "Kaydet",
+ "cancel": "İptal",
+ "metadataUrl": "Metaveri URL'si",
+ "audience-entityId": "Kitle/Kurum ID",
+ "redirectUrl": "Yönlendirme URL'si",
"oidc": "OpenID Connect (OIDC)",
"saml": "Security Assertion Markup Language (SAML)",
- "newProvider": "New Provider",
- "generalSettings": "General Settings",
- "ssoSettings": "SSO Settings",
+ "newProvider": "Yeni Sağlayıcı",
+ "generalSettings": "Genel Ayarlar",
+ "adminPanel": "Admin Panel",
+ "moveWorkspaceToOrg": "Move Workspace To Organisation",
+ "ssoSettings": "SSO Ayarları",
+ "addDomain": "Add Domain",
+ "domain": "Domain",
+ "settings": "Settings",
+ "workspaces": "Workspaces",
+ "back": "Back",
+ "dashboard": "Dashboard",
"organizeBy": "Organize by",
- "previous": "Previous",
- "nextMonth": "Next Month",
- "previousMonth": "Previous Month",
- "next": "Next",
+ "previous": "Önceki",
+ "nextMonth": "Sonraki Ay",
+ "previousMonth": "Önceki Ay",
+ "next": "Sonraki",
"organiseBy": "Organise by",
- "heading1": "Heading 1",
- "heading2": "Heading 2",
- "heading3": "Heading 3",
- "bold": "Bold",
- "italic": "Italic",
- "underline": "Underline",
- "strike": "Strike",
- "taskList": "Task List",
- "bulletList": "Bullet List",
- "numberedList": "Numbered List",
- "downloadData": "Download Data",
- "blockQuote": "Block Quote",
- "noToken": "No Token",
- "tokenLimit": "Only one token per user is allowed",
- "duplicateAttachment": "File with name {filename} already attached",
- "tableIdColon": "TABLE ID: {tableId}",
- "viewIdColon": "VIEW ID: {viewId}",
- "toAddress": "To Address",
- "subject": "Subject",
- "body": "Body",
- "commaSeparatedMobileNumber": "Comma separated Mobile #",
- "headerName": "Header Name",
- "icon": "Icon",
+ "heading1": "Başlık 1",
+ "heading2": "Başlık 2",
+ "heading3": "Başlık 3",
+ "bold": "Kalın",
+ "italic": "İtalik",
+ "underline": "Alt Çizgi",
+ "strike": "Üst Çizgi",
+ "taskList": "Görev Listesi",
+ "bulletList": "Noktalı Liste",
+ "numberedList": "Numaralı Liste",
+ "downloadData": "Verileri İndir",
+ "blockQuote": "Alıntı Bloğu",
+ "noToken": "Token Yok",
+ "tokenLimit": "Kullanıcı başına yalnızca bir token oluşturulabilir",
+ "duplicateAttachment": "{filename} adlı dosya zaten ekli",
+ "tableIdColon": "Tablo ID: {tableId}",
+ "viewIdColon": "Görünüm ID: {viewId}",
+ "toAddress": "Adres",
+ "subject": "Konu",
+ "body": "Sayfa Gövdesi",
+ "commaSeparatedMobileNumber": "Virgülle ayrılmış Cep #",
+ "headerName": "Başlık Adı",
+ "icon": "Simge",
"max": "Max",
- "enableRichText": "Enable Rich Text",
+ "enableRichText": "Zengin Metni Etkinleştir",
"idColon": "Id:",
- "copiedRecordURL": "Copied Record URL",
- "copyRecordURL": "Copy Record URL",
- "duplicateRecord": "Duplicate record",
- "binaryEncodingFormat": "Binary encoding format",
- "syntax": "Syntax",
- "examples": "Examples",
- "durationInfo": "A duration of time in minutes or seconds (e.g. 1:23).",
- "addHeader": "Add Header",
- "enterDefaultUrlOptional": "Enter default URL (Optional)",
- "negative": "Negative",
- "discard": "Discard",
- "default": "Default",
- "defaultNumberPercent": "Default Number (%)",
- "durationFormat": "Duration Format",
- "dateFormat": "Date Format",
- "timeFormat": "Time Format",
- "singularLabel": "Singular Label",
- "pluralLabel": "Plural Label",
- "selectDateField": "Select a date field",
- "endDateField": "End date field",
- "optional": "(Optional)",
- "clickToMake": "Click to make",
- "visibleForRole": "visible for role:",
+ "copiedRecordURL": "Kayıt URL'si Kopyalandı",
+ "copyRecordURL": "Kayıt URL'sini Kopyala",
+ "duplicateRecord": "Kaydı Çoğalt",
+ "binaryEncodingFormat": "Binary kodlama biçimi",
+ "syntax": "Sözdizimi",
+ "examples": "Örnekler",
+ "durationInfo": "Dakika ve saniye cinsinden bir zaman süresi (örn. 1:23).",
+ "addHeader": "Üst bilgi ekle",
+ "enterDefaultUrlOptional": "Varsayılan URL (İsteğe bağlı)",
+ "negative": "Negatif",
+ "discard": "Vazgeç",
+ "default": "Varsayılan",
+ "defaultNumberPercent": "Varsayılan Sayı (%)",
+ "durationFormat": "Süre Biçimi",
+ "dateFormat": "Tarih Biçimi",
+ "timeFormat": "Zaman Biçimi",
+ "singularLabel": "Tekil Etiket",
+ "pluralLabel": "Çoğul Etiket",
+ "selectDateField": "Bir tarih sütunu seçin",
+ "endDateField": "Bitiş tarihi sütunu",
+ "optional": "(Opsiyonel)",
+ "clickToMake": "Yapmak için tıklayın",
+ "visibleForRole": "rol için görünür:",
"inUI": "in UI Dashboard",
- "projectSettings": "Base Settings",
- "clickToHide": "Click to hide",
- "clickToDownload": "Click to download",
- "forRole": "for role",
- "clickToCopyTableID": "Click to copy Table ID",
- "clickToCopyViewID": "Click to copy View ID",
- "viewMode": "View Mode",
- "searchUsers": "Search Users",
- "superAdmin": "Super Admin",
- "allTables": "All Tables",
- "members": "Members",
- "dataSources": "Data Sources",
- "connectDataSource": "Connect a Data Source",
- "searchProjects": "Search Bases",
+ "projectSettings": "Proje Ayarları",
+ "clickToHide": "Gizlemek için tıklayın",
+ "clickToDownload": "İndirmek için tıklayın",
+ "forRole": "rol için",
+ "clickToCopyTableID": "Tablo ID'sini kopyalamak için tıklayın",
+ "clickToCopyViewID": "Görünüm ID'sini kopyalamak için tıklayın",
+ "viewMode": "Görünüm Modu",
+ "searchUsers": "Kullanıcıları Ara",
+ "superAdmin": "Süper Admin",
+ "allTables": "Tüm Tablolar",
+ "members": "Üyeler",
+ "dataSources": "Veri Kaynakları",
+ "connectDataSource": "Veri Kaynağına Bağlan",
+ "searchProjects": "Proje Ara",
"createdBy": "Tarafından Oluşturuldu",
- "viewingAttachmentsOf": "Viewing Attachments of",
- "readOnly": "Readonly",
- "dropHere": "Drop here",
- "createdOn": "Created On",
+ "viewingAttachmentsOf": "Ekleri Görüntüleniyor",
+ "readOnly": "Salt okunur",
+ "dropHere": "Buraya bırak",
+ "createdOn": "Oluşturuldu",
"notifyVia": "Aracılığıyla Bildir",
"projName": "Proje adı",
- "profile": "Profile",
- "accountDetails": "Account Details",
- "controlAppearance": "Control your Appearance.",
- "accountEmailID": "Account Email ID",
- "backToWorkspace": "Back to Workspace",
- "untitledToken": "Untitled token",
+ "profile": "Profil",
+ "accountDetails": "Hesap Ayrıntıları",
+ "controlAppearance": "Görünüşünüzü kontrol edin.",
+ "accountEmailID": "Hesap E-postası",
+ "backToWorkspace": "Çalışma Alanına Geri Dön",
+ "untitledToken": "İsimsiz token",
"tableName": "Tablo adı",
"dashboardName": "Dashboard name",
- "createView": "Create a View",
- "creatingView": "Creating View",
- "duplicateView": "Duplicate View",
- "duplicateGridView": "Duplicate Grid View",
- "createGridView": "Create Grid View",
- "duplicateGalleryView": "Duplicate Gallery View",
+ "createView": "Bir görünüm oluştur",
+ "creatingView": "Görünüm Oluşturuluyor",
+ "duplicateView": "Görünümü Kopyala",
+ "duplicateGridView": "Tablo Görünümü Kopyala",
+ "createGridView": "Tablo görünümü oluştur",
+ "duplicateGalleryView": "Galeri Görünümü Kopyala",
"createGalleryView": "Create Gallery View",
"duplicateFormView": "Duplicate Form View",
"createFormView": "Create Form View",
@@ -693,73 +744,80 @@
"multiField": {
"newField": "New field",
"saveChanges": "Save changes",
- "updatedField": "Updated field",
- "deletedField": "Deleted field",
- "incompleteConfiguration": "Incomplete configuration",
- "selectField": "Select a field",
+ "updatedField": "Güncellenen sütun",
+ "deletedField": "Silinen sütun",
+ "incompleteConfiguration": "Eksik yapılandırma",
+ "selectField": "Bir sütun seç",
"selectFieldLabel": "Begin by selecting a field to customise its properties and structure."
},
- "appearanceSettings": "Appearance Settings",
- "backgroundColor": "Background Color",
- "hideNocodbBranding": "Hide NocoDB Branding",
+ "appearanceSettings": "Görüntü Ayarları",
+ "backgroundColor": "Arkaplan Rengi",
+ "hideNocodbBranding": "NocoDB Markasını Gizle",
"showOnConditions": "Show on conditions",
- "showFieldOnConditionsMet": "Shows field only when conditions are met",
- "limitOptions": "Limit options",
- "limitOptionsSubtext": "Limit options visible to users by selecting available options",
- "clearSelection": "Clear selection"
+ "showFieldOnConditionsMet": "Sütunu yalnızca koşullar karşılandığında göster",
+ "limitOptions": "Seçenekleri sınırlayın",
+ "limitOptionsSubtext": "Kullanıcıya görüntülenen seçenekleri mevcut seçeneklerden seçerek sınırlayın",
+ "clearSelection": "Seçimi temizle"
},
"activity": {
- "addMembers": "Add Members",
- "enterEmail": "Enter email addresses",
- "inviteToBase": "Invite to Base",
- "addMember": "Add Member to Base",
- "noRange": "Calendar view requires a date range",
- "goToToday": "Go to Today",
- "toggleSidebar": "Toggle Sidebar",
- "addEndDate": "Add end date",
- "withEndDate": "with end date",
- "calendar": "Calendar",
- "viewSettings": "View settings",
+ "renameBase": "Rename Base",
+ "renameWorkspace": "Rename workspace",
+ "deactivate": "De-activate",
+ "manageUsers": "Manage Users",
+ "newWorkspace": "New Workspace",
+ "addDomain": "Add Domain",
+ "addMembers": "Üye Ekle",
+ "enterEmail": "E-posta adresi girin",
+ "inviteToBase": "Projeye Davet Et",
+ "inviteToWorkspace": "Invite to Workspace",
+ "addMember": "Projeye Üye Ekle",
+ "noRange": "Takvim görünümü bir tarih aralığı gerektirir",
+ "goToToday": "Bugün",
+ "toggleSidebar": "Kenar Çubuğunu Aç/Kapat",
+ "addEndDate": "Bitiş tarihi ekleyin",
+ "withEndDate": "bitiş tarihi ile",
+ "calendar": "Takvim",
+ "viewSettings": "Görünüm ayarları",
"googleOAuth": "Google OAuth",
- "registerOIDC": "Register OIDC Identity Provider",
- "registerSAML": "Register SAML Identity Provider",
- "openInANewTab": "Open in a new tab",
- "copyIFrameCode": "Copy IFrame code",
- "onCondition": "On Condition",
- "bulkDownload": "Bulk Download",
- "attachFile": "Attach File",
- "viewAttachment": "View Attachments",
- "attachmentDrop": "Click or drop a file into cell",
- "addFiles": "Add File(s)",
- "hideInUI": "Hide in UI",
- "addBase": "Add Base",
- "addParameter": "Add Parameter",
- "submitAnotherForm": "Submit Another Form",
- "dragAndDropFieldsHereToAdd": "Drag and drop fields here to add",
- "editSource": "Edit Data Source",
- "enterText": "Enter text",
- "okEditBase": "Ok & Edit Base",
- "showInUI": "Show in UI",
- "outOfSync": "Out of sync",
- "newSource": "New Data Source",
- "newWebhook": "New Webhook",
- "enablePublicAccess": "Enable Public Access",
- "doYouWantToSaveTheChanges": "Do you want to save the changes ?",
- "editingAccess": "Editing access",
- "enabledPublicViewing": "Enable Public Viewing",
- "restrictAccessWithPassword": "Restrict access with password",
- "manageProjectAccess": "Manage Base Access",
- "allowDownload": "Allow Download",
- "surveyMode": "Survey Mode",
- "rtlOrientation": "RTL Orientation",
- "useTheme": "Use Theme",
- "copyLink": "Copy Link",
- "copiedLink": "Link Copied",
- "copyInviteLink": "Copy invite link",
- "copiedInviteLink": "Copied invite link",
+ "registerOIDC": "OIDC Kimlik Sağlayıcısı Ekle",
+ "registerSAML": "SAML Kimlik Sağlayıcısı Ekle",
+ "openInANewTab": "Yeni sekmede aç",
+ "copyIFrameCode": "IFrame kodunu kopyala",
+ "onCondition": "Koşullu",
+ "bulkDownload": "Toplu İndirme",
+ "attachFile": "Dosya Ekle",
+ "viewAttachment": "Ekleri Görüntüle",
+ "attachmentDrop": "Tıklayın ya da hücreye bir dosya bırakın",
+ "addFiles": "Dosya(lar) Ekle",
+ "hideInUI": "Arayüzde Gizle",
+ "addBase": "Proje Ekle",
+ "addParameter": "Parametre Ekle",
+ "submitAnotherForm": "Başka Bir Form Gönder",
+ "dragAndDropFieldsHereToAdd": "Eklemek için sütunları buraya sürükleyip bırakın",
+ "editSource": "Veri Kaynağını Düzenle",
+ "enterText": "Metin girin",
+ "okEditBase": "Tamam & Projeyi Kaydet",
+ "showInUI": "Arayüzde Göster",
+ "outOfSync": "Senkronizasyon dışı",
+ "newSource": "Yeni Veri Kaynağı",
+ "newWebhook": "Yeni Webhook",
+ "enablePublicAccess": "Dışa Erişimi Etkinleştir",
+ "doYouWantToSaveTheChanges": "Değişiklikleri kaydetmek istiyor musunuz?",
+ "editingAccess": "Erişim düzenleniyor",
+ "enabledPublicViewing": "Dışa Görüntülemeyi Etkinleştir",
+ "restrictAccessWithPassword": "Erişimi parola ile sınırlandırın",
+ "manageProjectAccess": "Proje Erişimini Yönet",
+ "allowDownload": "İndirmeye İzin Verin",
+ "surveyMode": "Anket Modu",
+ "rtlOrientation": "RTL Oryantasyonu",
+ "useTheme": "Tema Kullanın",
+ "copyLink": "Bağlantıyı Kopyala",
+ "copiedLink": "Bağlantı Kopyalandı",
+ "copyInviteLink": "Davet bağlantısını kopyala",
+ "copiedInviteLink": "Davet bağlantısı kopyalandı",
"copyUrl": "Linki kopyala",
- "moreColors": "More Colors",
- "moveProject": "Move Base",
+ "moreColors": "Daha Fazla Renk",
+ "moveProject": "Projeyi Taşı",
"createProject": "Proje Oluştur",
"importProject": "Projeyi içe aktar",
"searchProject": "Proje ara",
@@ -770,7 +828,7 @@
"deleteProject": "Projeyi Sil",
"refreshProject": "Projeleri Yenile",
"saveProject": "Projeyi Kaydet",
- "saveAndQuit": "Save & Quit",
+ "saveAndQuit": "Kaydet ve Çık",
"deleteKanbanStack": "Yığını silelim mi?",
"createProjectExtended": {
"extDB": "Dışarıdan bir veritabanına
bağlanarak oluştur", @@ -786,7 +844,7 @@ "translate": "Çeviriye yardım edin", "account": { "authToken": "Yetki Token'ını Kopyala", - "authTokenCopied": "Copied Auth Token", + "authTokenCopied": "Yetki Token'ı Kopyalandı", "swagger": "Swagger: REST APIleri", "projInfo": "Proje Bilgisini Kopyala", "themes": "Temalar" @@ -796,10 +854,10 @@ "filter": "Filtrele", "addFilter": "Filtre Ekle", "share": "Paylaş", - "groupBy": "Group By", - "addSubGroup": "Add subgroup", + "groupBy": "Grupla", + "addSubGroup": "Alt grup ekle", "shareBase": { - "label": "Share Base", + "label": "Projeyi Paylaş", "disable": "Paylaşılan bağlantıyı devre dışı bırak", "enable": "Bağlantıya sahip olan herkes", "link": "Paylaşılan bağlantı" @@ -809,8 +867,8 @@ "inviteTeam": "Takıma davet et", "inviteUser": "Kullanıcı Davet Et", "inviteToken": "Davet kodu", - "linkedRecords": "Linked Records", - "addNewLink": "Add New Link", + "linkedRecords": "İlişkili Kayıtlar", + "addNewLink": "Yeni İlişki Ekle", "newUser": "Yeni kullanıcı", "editUser": "Kullanıcıyı düzenle", "deleteUser": "Kullanıcıyı projeden kaldır", @@ -826,10 +884,10 @@ "copyApiURL": "API linkini kopyala", "createTable": "Yeni tablo oluştur", "createDashboard": "Create Dashboard", - "createWorkspace": "Create Workspace", + "createWorkspace": "Çalışma Alanı Oluştur", "refreshTable": "Tabloları Yenile", "renameTable": "Tabloyu Yeniden Adlandır", - "renameLayout": "Layout Rename", + "renameLayout": "Düzeni Yeniden Adlandır", "deleteTable": "Tabloyu Sil", "addField": "Tabloya yeni alan ekle", "setDisplay": "Görünüm değeri olarak ayarla", @@ -840,9 +898,9 @@ "insertRow": "Yeni Satır Ekle", "duplicateRow": "Satırı Çoğalt", "deleteRow": "Satırı Sil", - "deleteRows": "Delete records", - "predictColumns": "Predict Fields", - "predictFormulas": "Predict Formulas", + "deleteRows": "Kayıtları sil", + "predictColumns": "Sütunları Tahmin Et", + "predictFormulas": "Formülleri Tahmin Et", "deleteSelectedRow": "Seçilen Satırları Sil", "importExcel": "Excel içe aktar", "importCSV": "CSV içe aktar", @@ -863,7 +921,7 @@ "ListView": "Görünüm Listesi", "copyView": "Görünümü kopyala", "renameView": "Görünümü yeniden adlandır", - "uploadData": "Upload Data", + "uploadData": "Veri Yükle", "deleteView": "Görünümü sil", "createGrid": "Tablo görünümü oluştur", "createGallery": "Galeri görünümü oluştur", @@ -896,23 +954,23 @@ "addFilterGroup": "Filtre Grubu Ekle", "linkRecord": "Bağlantı kaydı", "addNewRecord": "Yeni kayıt ekle", - "newRecord": "New record", - "tableNameCreateNewRecord": "{tableName}: Create new record", - "gotSavedLinkedSuccessfully": "{tableName} '{recordTitle}' got saved & linked successfully", - "recordCreatedLinked": "Record Created & Linked", + "newRecord": "Yeni kayıt", + "tableNameCreateNewRecord": "{tableName}: Yeni kayıt oluştur", + "gotSavedLinkedSuccessfully": "{tableName} '{recordTitle}' kaydedildi ve başarıyla ilişkilendirildi", + "recordCreatedLinked": "Kayıt Oluşturuldu ve İlişkilendirildi", "useConnectionUrl": "Bağlantı URL'sini Kullan", "toggleCommentsDraw": "Yorum çizimini değiştir", "expandRecord": "Kaydı Genişlet", "deleteRecord": "Kayıt Silme", - "fullWidth": "Full width", - "exitFullWidth": "Exit full width", - "markAllAsRead": "Mark all as read", + "fullWidth": "Tam genişlik", + "exitFullWidth": "Tam genişlikten çık", + "markAllAsRead": "Tümünü okundu olarak işaretle", "column": { - "delete": "Delete Field", - "addNumber": "Add Number Field", - "addSingleLineText": "Add SingleLineText Field", - "addLongText": "Add LongText Field", - "addOther": "Add Other Field" + "delete": "Sütunu Sil", + "addNumber": "Sayı Sütunu Ekle", + "addSingleLineText": "Yazı Sütunu Ekle", + "addLongText": "Metin Sütunu Ekle", + "addOther": "Diğer Sütun Ekle" }, "erd": { "showColumns": "Sütunları Göster", @@ -935,10 +993,10 @@ "openInOpenStreetMap": "OSM" }, "toggleMobileMode": "Mobil Modu Aç / Kapat", - "startCommenting": "Start commenting!", - "clearForm": "Clear Form", - "addFieldFromFormView": "Add Field", - "selectAllFields": "Select all fields", + "startCommenting": "Yorum yapmaya başlayın!", + "clearForm": "Formu Temizle", + "addFieldFromFormView": "Sütun Ekle", + "selectAllFields": "Tüm sütunları seç", "preFilledFields": { "title": "Enable Pre-fill", "default": "Default", @@ -984,19 +1042,19 @@ }, "placeholder": { "selectSlackChannels": "Select Slack channels", - "selectTeamsChannels": "Select Microsoft Teams channels", - "selectDiscordChannels": "Select Discord channels", - "selectMattermostChannels": "Select Mattermost channels", - "webhookTitle": "Webhook Title", - "barcodeColumn": "Select a field for the Barcode value", - "notFoundContent": "No valid field Type can be found.", - "selectBarcodeFormat": "Select a Barcode format", + "selectTeamsChannels": "Microsoft Teams kanallarını seçin", + "selectDiscordChannels": "Discord kanallarını seçin", + "selectMattermostChannels": "Mattermost kanallarını seçin", + "webhookTitle": "Webhook Başlığı", + "barcodeColumn": "Barkod değeri için bir sütun seçin", + "notFoundContent": "Geçerli sütun türü bulunamadı.", + "selectBarcodeFormat": "Bir Barkod biçimi seçin", "projName": "Proje Adını Girin", - "selectGroupField": "Select a Grouping Field", - "selectGroupFieldNotFound": "No Single Select Field can be found. Please create one first.", - "selectGeoField": "Select a GeoData Field", - "notSelected": "-not selected-", - "selectGeoFieldNotFound": "No GeoData Field can be found. Please create one first.", + "selectGroupField": "Gruplama Sütunu Seçin", + "selectGroupFieldNotFound": "Tekil seçim sütunu bulunamadı. Lütfen önce bir tane oluşturun.", + "selectGeoField": "GeoData Sütunu Seçin", + "notSelected": "-seçilmedi-", + "selectGeoFieldNotFound": "GeoData Sütunu bulunamadı. Lütfen önce bir tane oluşturun.", "password": { "enter": "Şifreyi Girin", "current": "Mevcut Şifre", @@ -1004,8 +1062,8 @@ "save": "Şifreyi Kaydet", "confirm": "Yeni şifreyi onayla" }, - "selectAColumnForTheQRCodeValue": "Select a field for the QR code value", - "allowNegativeNumbers": "Allow negative numbers", + "selectAColumnForTheQRCodeValue": "QR Kod değeri için bir sütun seçin", + "allowNegativeNumbers": "Negatif sayılara izin verin", "searchProjectTree": "Tabloları ara", "searchFields": "Sütunları ara", "searchColumn": "{search} sütununda ara", @@ -1036,6 +1094,11 @@ "searchOptions": "Search options" }, "msg": { + "controlOrgAppearance": "Control your organisations name and appearance.", + "addCompanyDomains": "Add company domains to restrict access to unwanted users.", + "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.", + "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.", + "deleteOrganization": "Delete all users, bases and data related to this organization", "clickToCopyFieldId": "Click to copy Field Id", "enterPassword": "Enter password", "bySigningUp": "By signing up, you agree to the", @@ -1118,7 +1181,7 @@ "tooltip_desc": "A single record from table ", "tooltip_desc2": " can be linked with a single record from table " }, - "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.", + "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.", "noRecordsLinked": "No records linked", "noLinkedRecords": "No linked records", "recordsLinked": "records linked", @@ -1162,8 +1225,11 @@ } }, "info": { + "enterWorkspaceName": "Enter workspace name", + "enterBaseName": "Enter base name", "idpPaste": "Paste these URL in your Identity Providers console", "noSaml": "There are no configured SAML authentications.", + "noOIDC": "There are no configured OpenID authentications.", "disabledAsViewLocked": "Disabled as View is locked", "basesMigrated": "Bases are migrated. Please try again.", "pasteNotSupported": "Etkin hücre üzerinde yapıştırma işlemi desteklenmiyor", @@ -1339,6 +1405,7 @@ "fetchingCalendarData": "Error fetching calendar data", "fetchingActiveDates": "Error fetching active dates", "scopesRequired": "Scopes required", + "domainRequired": "Domain name is required", "authUrlRequired": "Auth URL is required", "userNameAttributeRequired": "Username attribute is required", "clientIdRequired": "Client ID is required", @@ -1352,6 +1419,7 @@ "nameMinLength": "Name must be at least 2 characters long", "nameMaxLength": "Name must be at most 60 characters long", "viewNameRequired": "View name is required", + "domainNameRequired": "Domain name is required", "nameMaxLength256": "Name must be at most 256 characters long", "viewNameUnique": "View name should be unique", "searchProject": "{search} için aramanız hiç bir sonuç bulamadı", diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json index 060c2dc9e7..045452eb6d 100644 --- a/packages/nc-gui/lang/uk.json +++ b/packages/nc-gui/lang/uk.json @@ -39,6 +39,8 @@ } }, "general": { + "role": "Role", + "general": "General", "quit": "Вийти", "home": "Головна", "load": "Завантажити", @@ -198,11 +200,14 @@ "logo": "Logo", "dropdown": "Dropdown", "list": "List", + "verify": "Verify", "apply": "Apply", "text": "Text", "appearance": "Appearance" }, "objects": { + "owner": "Owner", + "member": "Member", "day": "Day", "week": "Week", "month": "Month", @@ -247,6 +252,7 @@ "viewer": "Глядач", "noaccess": "No Access", "superAdmin": "Super Admin", + "orgLevelOwner": "Organization Level Owner", "orgLevelCreator": "Творець рівня організації", "orgLevelViewer": "Глядач рівня організації" }, @@ -313,6 +319,10 @@ "isNotNull": "не рівне null" }, "title": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename Workspace", + "renamingWorkspace": "Renaming Workspace", + "renamingBase": "Renaming Base", "sso": "Authentication (SSO)", "docs": "Docs", "forum": "Forum", @@ -437,6 +447,39 @@ "noResultsMatchedYourSearch": "Your search did not yield any matching results." }, "labels": { + "txt": "TXT Record value", + "transferOwnership": "Transfer Ownership", + "recentActivity": "Recent Activity", + "goToMembers": "Go to Members", + "addMember": "Add Member", + "numberOfMembers": "No. Members", + "numberOfBases": "No. Bases", + "numberOfRecords": "No. Records", + "workspaceName": "Workspace Name", + "workspaceWithoutOwner": "Workspace without Owners", + "inviteUsersToWorkspace": "Invite Users to Workspace", + "selectWorkspace": "-select workspaces to invite to-", + "addMembersToOrganization": "Add Members to Organization", + "memberIn": "Member in:", + "assignAs": "Assign as", + "signOutUser": "Sign out user", + "signOutUsers": "Sign out users", + "deactivateUser": "Deactivate User", + "deactivateUsers": "Deactivate Users", + "lastActive": "Last Active", + "dateAdded": "Date Added", + "uploadImage": "Upload Image", + "organizationProfile": "Organisation Profile", + "organizationImage": "Organisation Image", + "organizationName": "Organisation Name", + "activeDomains": "Active Domains", + "domains": "Domains", + "disablePublicSharing": "Disable Public Sharing", + "shareSettings": "Share Settings", + "deleteUserAndData": "Delete User and their data", + "userOptions": "User Options", + "deleteThisOrganization": "Delete this Organisation", + "dangerZone": "Dangerzone", "selectYear": "Select Year", "save": "Save", "cancel": "Cancel", @@ -447,7 +490,15 @@ "saml": "Security Assertion Markup Language (SAML)", "newProvider": "New Provider", "generalSettings": "General Settings", + "adminPanel": "Admin Panel", + "moveWorkspaceToOrg": "Move Workspace To Organisation", "ssoSettings": "SSO Settings", + "addDomain": "Add Domain", + "domain": "Domain", + "settings": "Settings", + "workspaces": "Workspaces", + "back": "Back", + "dashboard": "Dashboard", "organizeBy": "Organize by", "previous": "Previous", "nextMonth": "Next Month", @@ -709,9 +760,16 @@ "clearSelection": "Clear selection" }, "activity": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename workspace", + "deactivate": "De-activate", + "manageUsers": "Manage Users", + "newWorkspace": "New Workspace", + "addDomain": "Add Domain", "addMembers": "Add Members", "enterEmail": "Enter email addresses", "inviteToBase": "Invite to Base", + "inviteToWorkspace": "Invite to Workspace", "addMember": "Add Member to Base", "noRange": "Calendar view requires a date range", "goToToday": "Go to Today", @@ -1036,6 +1094,11 @@ "searchOptions": "Search options" }, "msg": { + "controlOrgAppearance": "Control your organisations name and appearance.", + "addCompanyDomains": "Add company domains to restrict access to unwanted users.", + "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.", + "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.", + "deleteOrganization": "Delete all users, bases and data related to this organization", "clickToCopyFieldId": "Click to copy Field Id", "enterPassword": "Enter password", "bySigningUp": "By signing up, you agree to the", @@ -1118,7 +1181,7 @@ "tooltip_desc": "A single record from table ", "tooltip_desc2": " can be linked with a single record from table " }, - "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.", + "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.", "noRecordsLinked": "No records linked", "noLinkedRecords": "No linked records", "recordsLinked": "records linked", @@ -1162,8 +1225,11 @@ } }, "info": { + "enterWorkspaceName": "Enter workspace name", + "enterBaseName": "Enter base name", "idpPaste": "Paste these URL in your Identity Providers console", "noSaml": "There are no configured SAML authentications.", + "noOIDC": "There are no configured OpenID authentications.", "disabledAsViewLocked": "Disabled as View is locked", "basesMigrated": "Bases are migrated. Please try again.", "pasteNotSupported": "Операція вставки не підтримується в активній комірці", @@ -1339,6 +1405,7 @@ "fetchingCalendarData": "Error fetching calendar data", "fetchingActiveDates": "Error fetching active dates", "scopesRequired": "Scopes required", + "domainRequired": "Domain name is required", "authUrlRequired": "Auth URL is required", "userNameAttributeRequired": "Username attribute is required", "clientIdRequired": "Client ID is required", @@ -1352,6 +1419,7 @@ "nameMinLength": "Name must be at least 2 characters long", "nameMaxLength": "Name must be at most 60 characters long", "viewNameRequired": "View name is required", + "domainNameRequired": "Domain name is required", "nameMaxLength256": "Name must be at most 256 characters long", "viewNameUnique": "View name should be unique", "searchProject": "За вашим запитом {search} не знайдено жодного результату", diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json index c262955444..0fefc440af 100644 --- a/packages/nc-gui/lang/vi.json +++ b/packages/nc-gui/lang/vi.json @@ -1,37 +1,37 @@ { "dashboards": { "create_new_dashboard_project": "Tạo giao diện mới", - "connect_data_sources": "Connect data sources", - "alert": "Alert", - "alert-message": "No databases have been connected. Connect database bases to build interfaces. Skip this step and add databases from the base home page later.", - "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Select Database Bases that you want to link to this Interface.", - "create_interface": "Create interface", - "project_name": "Base Name", - "connect": "Connect", + "connect_data_sources": "Kết nối nguồn dữ liệu", + "alert": "Thông báo", + "alert-message": "Không có cơ sở dữ liệu được kết nối. Kết nối cơ sở dữ liệu để xây dựng giao diện. Bỏ qua bước này và thêm cơ sở dữ liệu từ trang chủ cơ sở sau.", + "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Chọn cơ sở dữ liệu mà bạn muốn liên kết với giao diện này.", + "create_interface": "Tạo giao diện mới", + "project_name": "Tên cơ sở", + "connect": "Kết nối", "buttonActionTypes": { - "open_external_url": "Open external link", - "delete_record": "Delete record", - "update_record": "Update record", - "open_layout": "Open layout" + "open_external_url": "Mở kết nối bên ngoài", + "delete_record": "Xóa bản ghi", + "update_record": "Cập nhật bản ghi", + "open_layout": "Mở bố trí" }, "widgets": { - "static_text": "Text", - "chart": "Chart", - "table": "Table", - "image": "Image", - "map": "Map", - "button": "Button", - "number": "Number", - "bar_chart": "Bar Chart", - "line_chart": "Line Chart", - "area_chart": "Area Chart", - "pie_chart": "Pie Chart", - "donut_chart": "Donut Chart", - "scatter_plot": "Scatter Plot", - "bubble_chart": "Bubble Chart", - "radar_chart": "Radar Chart", - "polar_area_chart": "Polar Area Chart", - "radial_bar_chart": "Radial Bar Chart", + "static_text": "Văn bản", + "chart": "Đồ thị", + "table": "Bảng", + "image": "Hình ảnh", + "map": "Bản đồ", + "button": "Nút", + "number": "Số", + "bar_chart": "Biểu đồ cột", + "line_chart": "Biểu đồ đường", + "area_chart": "Biểu đồ khu vực", + "pie_chart": "Biểu đồ tròn", + "donut_chart": "Biểu đồ Donut", + "scatter_plot": "Biểu đồ phân tán", + "bubble_chart": "Biểu đồ bong bóng", + "radar_chart": "Biểu đồ Radar", + "polar_area_chart": "Biểu đồ vùng cực", + "radial_bar_chart": "Biểu đồ thanh xuyên tâm", "heatmap_chart": "Heatmap Chart", "treemap_chart": "Treemap Chart", "box_plot_chart": "Box Plot Chart", @@ -39,6 +39,8 @@ } }, "general": { + "role": "Role", + "general": "General", "quit": "Quit", "home": "Trang chủ", "load": "Trọng tải", @@ -76,7 +78,7 @@ "twilio": "Twilio", "whatsappTwilio": "WhatsApp Twilio", "quote": "Quote", - "submit": "Nộp", + "submit": "Áp dụng", "create": "Tạo ra", "createEntity": "Create {entity}", "creating": "Creating", @@ -198,11 +200,14 @@ "logo": "Logo", "dropdown": "Dropdown", "list": "List", + "verify": "Verify", "apply": "Apply", "text": "Text", "appearance": "Appearance" }, "objects": { + "owner": "Owner", + "member": "Member", "day": "Day", "week": "Week", "month": "Month", @@ -247,6 +252,7 @@ "viewer": "Người xem", "noaccess": "No Access", "superAdmin": "Super Admin", + "orgLevelOwner": "Organization Level Owner", "orgLevelCreator": "Organization Level Creator", "orgLevelViewer": "Organization Level Viewer" }, @@ -313,6 +319,10 @@ "isNotNull": "không phải là null." }, "title": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename Workspace", + "renamingWorkspace": "Renaming Workspace", + "renamingBase": "Renaming Base", "sso": "Authentication (SSO)", "docs": "Docs", "forum": "Forum", @@ -437,6 +447,39 @@ "noResultsMatchedYourSearch": "Your search did not yield any matching results." }, "labels": { + "txt": "TXT Record value", + "transferOwnership": "Transfer Ownership", + "recentActivity": "Recent Activity", + "goToMembers": "Go to Members", + "addMember": "Add Member", + "numberOfMembers": "No. Members", + "numberOfBases": "No. Bases", + "numberOfRecords": "No. Records", + "workspaceName": "Workspace Name", + "workspaceWithoutOwner": "Workspace without Owners", + "inviteUsersToWorkspace": "Invite Users to Workspace", + "selectWorkspace": "-select workspaces to invite to-", + "addMembersToOrganization": "Add Members to Organization", + "memberIn": "Member in:", + "assignAs": "Assign as", + "signOutUser": "Sign out user", + "signOutUsers": "Sign out users", + "deactivateUser": "Deactivate User", + "deactivateUsers": "Deactivate Users", + "lastActive": "Last Active", + "dateAdded": "Date Added", + "uploadImage": "Upload Image", + "organizationProfile": "Organisation Profile", + "organizationImage": "Organisation Image", + "organizationName": "Organisation Name", + "activeDomains": "Active Domains", + "domains": "Domains", + "disablePublicSharing": "Disable Public Sharing", + "shareSettings": "Share Settings", + "deleteUserAndData": "Delete User and their data", + "userOptions": "User Options", + "deleteThisOrganization": "Delete this Organisation", + "dangerZone": "Dangerzone", "selectYear": "Select Year", "save": "Save", "cancel": "Cancel", @@ -447,7 +490,15 @@ "saml": "Security Assertion Markup Language (SAML)", "newProvider": "New Provider", "generalSettings": "General Settings", + "adminPanel": "Admin Panel", + "moveWorkspaceToOrg": "Move Workspace To Organisation", "ssoSettings": "SSO Settings", + "addDomain": "Add Domain", + "domain": "Domain", + "settings": "Settings", + "workspaces": "Workspaces", + "back": "Back", + "dashboard": "Dashboard", "organizeBy": "Organize by", "previous": "Previous", "nextMonth": "Next Month", @@ -635,7 +686,7 @@ "onUpdate": "Trên bản cập nhật", "onDelete": "Trên xóa", "account": "Tài khoản", - "language": "Language", + "language": "Ngôn ngữ", "primaryColor": "Màu chính", "accentColor": "Màu phụ", "customTheme": "Giao diện tùy chỉnh", @@ -709,9 +760,16 @@ "clearSelection": "Clear selection" }, "activity": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename workspace", + "deactivate": "De-activate", + "manageUsers": "Manage Users", + "newWorkspace": "New Workspace", + "addDomain": "Add Domain", "addMembers": "Add Members", "enterEmail": "Enter email addresses", "inviteToBase": "Invite to Base", + "inviteToWorkspace": "Invite to Workspace", "addMember": "Add Member to Base", "noRange": "Calendar view requires a date range", "goToToday": "Go to Today", @@ -1036,6 +1094,11 @@ "searchOptions": "Search options" }, "msg": { + "controlOrgAppearance": "Control your organisations name and appearance.", + "addCompanyDomains": "Add company domains to restrict access to unwanted users.", + "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.", + "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.", + "deleteOrganization": "Delete all users, bases and data related to this organization", "clickToCopyFieldId": "Click to copy Field Id", "enterPassword": "Enter password", "bySigningUp": "By signing up, you agree to the", @@ -1118,7 +1181,7 @@ "tooltip_desc": "A single record from table ", "tooltip_desc2": " can be linked with a single record from table " }, - "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.", + "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.", "noRecordsLinked": "No records linked", "noLinkedRecords": "No linked records", "recordsLinked": "records linked", @@ -1162,8 +1225,11 @@ } }, "info": { + "enterWorkspaceName": "Enter workspace name", + "enterBaseName": "Enter base name", "idpPaste": "Paste these URL in your Identity Providers console", "noSaml": "There are no configured SAML authentications.", + "noOIDC": "There are no configured OpenID authentications.", "disabledAsViewLocked": "Disabled as View is locked", "basesMigrated": "Bases are migrated. Please try again.", "pasteNotSupported": "Paste operation is not supported on the active cell", @@ -1339,6 +1405,7 @@ "fetchingCalendarData": "Error fetching calendar data", "fetchingActiveDates": "Error fetching active dates", "scopesRequired": "Scopes required", + "domainRequired": "Domain name is required", "authUrlRequired": "Auth URL is required", "userNameAttributeRequired": "Username attribute is required", "clientIdRequired": "Client ID is required", @@ -1352,6 +1419,7 @@ "nameMinLength": "Name must be at least 2 characters long", "nameMaxLength": "Name must be at most 60 characters long", "viewNameRequired": "View name is required", + "domainNameRequired": "Domain name is required", "nameMaxLength256": "Name must be at most 256 characters long", "viewNameUnique": "View name should be unique", "searchProject": "Tìm kiếm của bạn cho {search} tìm thấy không có kết quả", diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json index e37ca7ffef..4af00866d2 100644 --- a/packages/nc-gui/lang/zh-Hans.json +++ b/packages/nc-gui/lang/zh-Hans.json @@ -39,6 +39,8 @@ } }, "general": { + "role": "Role", + "general": "General", "quit": "退出", "home": "首页", "load": "加载", @@ -198,11 +200,14 @@ "logo": "Logo", "dropdown": "下拉", "list": "列表", + "verify": "Verify", "apply": "应用", "text": "文本", "appearance": "外观" }, "objects": { + "owner": "Owner", + "member": "Member", "day": "日", "week": "周", "month": "月", @@ -247,6 +252,7 @@ "viewer": "浏览者", "noaccess": "没有访问权限", "superAdmin": "超级管理员", + "orgLevelOwner": "Organization Level Owner", "orgLevelCreator": "创始人", "orgLevelViewer": "游客" }, @@ -313,6 +319,10 @@ "isNotNull": "不为空（Not Null）" }, "title": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename Workspace", + "renamingWorkspace": "Renaming Workspace", + "renamingBase": "Renaming Base", "sso": "身份验证 (SSO)", "docs": "文档", "forum": "论坛", @@ -437,6 +447,39 @@ "noResultsMatchedYourSearch": "Your search did not yield any matching results." }, "labels": { + "txt": "TXT Record value", + "transferOwnership": "Transfer Ownership", + "recentActivity": "Recent Activity", + "goToMembers": "Go to Members", + "addMember": "Add Member", + "numberOfMembers": "No. Members", + "numberOfBases": "No. Bases", + "numberOfRecords": "No. Records", + "workspaceName": "Workspace Name", + "workspaceWithoutOwner": "Workspace without Owners", + "inviteUsersToWorkspace": "Invite Users to Workspace", + "selectWorkspace": "-select workspaces to invite to-", + "addMembersToOrganization": "Add Members to Organization", + "memberIn": "Member in:", + "assignAs": "Assign as", + "signOutUser": "Sign out user", + "signOutUsers": "Sign out users", + "deactivateUser": "Deactivate User", + "deactivateUsers": "Deactivate Users", + "lastActive": "Last Active", + "dateAdded": "Date Added", + "uploadImage": "Upload Image", + "organizationProfile": "Organisation Profile", + "organizationImage": "Organisation Image", + "organizationName": "Organisation Name", + "activeDomains": "Active Domains", + "domains": "Domains", + "disablePublicSharing": "Disable Public Sharing", + "shareSettings": "Share Settings", + "deleteUserAndData": "Delete User and their data", + "userOptions": "User Options", + "deleteThisOrganization": "Delete this Organisation", + "dangerZone": "Dangerzone", "selectYear": "选择年份", "save": "保存", "cancel": "取消", @@ -447,7 +490,15 @@ "saml": "Security Assertion Markup Language (SAML)", "newProvider": "连接服务", "generalSettings": "通用设置", + "adminPanel": "Admin Panel", + "moveWorkspaceToOrg": "Move Workspace To Organisation", "ssoSettings": "SSO设置", + "addDomain": "Add Domain", + "domain": "Domain", + "settings": "Settings", + "workspaces": "Workspaces", + "back": "Back", + "dashboard": "Dashboard", "organizeBy": "组织方式", "previous": "返回", "nextMonth": "下个月", @@ -709,9 +760,16 @@ "clearSelection": "清除选择" }, "activity": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename workspace", + "deactivate": "De-activate", + "manageUsers": "Manage Users", + "newWorkspace": "New Workspace", + "addDomain": "Add Domain", "addMembers": "添加成员", "enterEmail": "输入邮箱地址", "inviteToBase": "邀请", + "inviteToWorkspace": "Invite to Workspace", "addMember": "添加用户到项目", "noRange": "日历视图需要日期范围", "goToToday": "转到今天", @@ -1036,6 +1094,11 @@ "searchOptions": "搜索选项" }, "msg": { + "controlOrgAppearance": "Control your organisations name and appearance.", + "addCompanyDomains": "Add company domains to restrict access to unwanted users.", + "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.", + "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.", + "deleteOrganization": "Delete all users, bases and data related to this organization", "clickToCopyFieldId": "点击复制字段ID", "enterPassword": "输入密码", "bySigningUp": "注册即表示您同意服务条款", @@ -1118,7 +1181,7 @@ "tooltip_desc": "表中的一条记录 ", "tooltip_desc2": " 可以从表中链接到单条记录 " }, - "clickLinkRecordsToAddLinkFromTable": "点击\"引用\"将数据关联到 \"{tableName}\"", + "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.", "noRecordsLinked": "没有链接记录", "noLinkedRecords": "暂无引用数据", "recordsLinked": "链接的记录", @@ -1162,8 +1225,11 @@ } }, "info": { + "enterWorkspaceName": "Enter workspace name", + "enterBaseName": "Enter base name", "idpPaste": "将此URL粘贴到您的身份提供商后台", "noSaml": "没有配置 SAML 身份验证", + "noOIDC": "There are no configured OpenID authentications.", "disabledAsViewLocked": "已禁用，因为视图已锁定", "basesMigrated": "项目已迁移。请重试。", "pasteNotSupported": "处于活动状态的单元格不能粘贴内容", @@ -1339,6 +1405,7 @@ "fetchingCalendarData": "获取日历数据时出错", "fetchingActiveDates": "获取活动日期时出错", "scopesRequired": "范围不能为空", + "domainRequired": "Domain name is required", "authUrlRequired": "鉴权链接不能为空", "userNameAttributeRequired": "用户名不能为空", "clientIdRequired": "Client ID 不能为空", @@ -1352,6 +1419,7 @@ "nameMinLength": "名称长度必须至少为 2 个字符", "nameMaxLength": "名称长度不得超过 60 个字符", "viewNameRequired": "视图名称为必填项", + "domainNameRequired": "Domain name is required", "nameMaxLength256": "名称长度不得超过 256 个字符", "viewNameUnique": "视图名称应该是唯一的", "searchProject": "搜索： {search} 没有发现匹配的结果", diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json index 3a78b66ed7..d06a67e99a 100644 --- a/packages/nc-gui/lang/zh-Hant.json +++ b/packages/nc-gui/lang/zh-Hant.json @@ -39,6 +39,8 @@ } }, "general": { + "role": "Role", + "general": "General", "quit": "Quit", "home": "首頁", "load": "載入", @@ -198,11 +200,14 @@ "logo": "Logo", "dropdown": "Dropdown", "list": "List", + "verify": "Verify", "apply": "Apply", "text": "Text", "appearance": "Appearance" }, "objects": { + "owner": "Owner", + "member": "Member", "day": "Day", "week": "Week", "month": "Month", @@ -247,6 +252,7 @@ "viewer": "檢視者", "noaccess": "No Access", "superAdmin": "Super Admin", + "orgLevelOwner": "Organization Level Owner", "orgLevelCreator": "組織層級建立者", "orgLevelViewer": "組織層級檢視者" }, @@ -313,6 +319,10 @@ "isNotNull": "內容不為 Null" }, "title": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename Workspace", + "renamingWorkspace": "Renaming Workspace", + "renamingBase": "Renaming Base", "sso": "Authentication (SSO)", "docs": "Docs", "forum": "Forum", @@ -437,6 +447,39 @@ "noResultsMatchedYourSearch": "Your search did not yield any matching results." }, "labels": { + "txt": "TXT Record value", + "transferOwnership": "Transfer Ownership", + "recentActivity": "Recent Activity", + "goToMembers": "Go to Members", + "addMember": "Add Member", + "numberOfMembers": "No. Members", + "numberOfBases": "No. Bases", + "numberOfRecords": "No. Records", + "workspaceName": "Workspace Name", + "workspaceWithoutOwner": "Workspace without Owners", + "inviteUsersToWorkspace": "Invite Users to Workspace", + "selectWorkspace": "-select workspaces to invite to-", + "addMembersToOrganization": "Add Members to Organization", + "memberIn": "Member in:", + "assignAs": "Assign as", + "signOutUser": "Sign out user", + "signOutUsers": "Sign out users", + "deactivateUser": "Deactivate User", + "deactivateUsers": "Deactivate Users", + "lastActive": "Last Active", + "dateAdded": "Date Added", + "uploadImage": "Upload Image", + "organizationProfile": "Organisation Profile", + "organizationImage": "Organisation Image", + "organizationName": "Organisation Name", + "activeDomains": "Active Domains", + "domains": "Domains", + "disablePublicSharing": "Disable Public Sharing", + "shareSettings": "Share Settings", + "deleteUserAndData": "Delete User and their data", + "userOptions": "User Options", + "deleteThisOrganization": "Delete this Organisation", + "dangerZone": "Dangerzone", "selectYear": "Select Year", "save": "Save", "cancel": "Cancel", @@ -447,7 +490,15 @@ "saml": "Security Assertion Markup Language (SAML)", "newProvider": "New Provider", "generalSettings": "General Settings", + "adminPanel": "Admin Panel", + "moveWorkspaceToOrg": "Move Workspace To Organisation", "ssoSettings": "SSO Settings", + "addDomain": "Add Domain", + "domain": "Domain", + "settings": "Settings", + "workspaces": "Workspaces", + "back": "Back", + "dashboard": "Dashboard", "organizeBy": "Organize by", "previous": "Previous", "nextMonth": "Next Month", @@ -709,9 +760,16 @@ "clearSelection": "Clear selection" }, "activity": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename workspace", + "deactivate": "De-activate", + "manageUsers": "Manage Users", + "newWorkspace": "New Workspace", + "addDomain": "Add Domain", "addMembers": "Add Members", "enterEmail": "Enter email addresses", "inviteToBase": "Invite to Base", + "inviteToWorkspace": "Invite to Workspace", "addMember": "Add Member to Base", "noRange": "Calendar view requires a date range", "goToToday": "Go to Today", @@ -1036,6 +1094,11 @@ "searchOptions": "Search options" }, "msg": { + "controlOrgAppearance": "Control your organisations name and appearance.", + "addCompanyDomains": "Add company domains to restrict access to unwanted users.", + "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.", + "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.", + "deleteOrganization": "Delete all users, bases and data related to this organization", "clickToCopyFieldId": "Click to copy Field Id", "enterPassword": "Enter password", "bySigningUp": "By signing up, you agree to the", @@ -1118,7 +1181,7 @@ "tooltip_desc": "A single record from table ", "tooltip_desc2": " can be linked with a single record from table " }, - "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.", + "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.", "noRecordsLinked": "No records linked", "noLinkedRecords": "No linked records", "recordsLinked": "records linked", @@ -1162,8 +1225,11 @@ } }, "info": { + "enterWorkspaceName": "Enter workspace name", + "enterBaseName": "Enter base name", "idpPaste": "Paste these URL in your Identity Providers console", "noSaml": "There are no configured SAML authentications.", + "noOIDC": "There are no configured OpenID authentications.", "disabledAsViewLocked": "Disabled as View is locked", "basesMigrated": "Bases are migrated. Please try again.", "pasteNotSupported": "不支援在啟用的儲存格中執行貼上", @@ -1339,6 +1405,7 @@ "fetchingCalendarData": "Error fetching calendar data", "fetchingActiveDates": "Error fetching active dates", "scopesRequired": "Scopes required", + "domainRequired": "Domain name is required", "authUrlRequired": "Auth URL is required", "userNameAttributeRequired": "Username attribute is required", "clientIdRequired": "Client ID is required", @@ -1352,6 +1419,7 @@ "nameMinLength": "Name must be at least 2 characters long", "nameMaxLength": "Name must be at most 60 characters long", "viewNameRequired": "View name is required", + "domainNameRequired": "Domain name is required", "nameMaxLength256": "Name must be at most 256 characters long", "viewNameUnique": "View name should be unique", "searchProject": "您的搜尋 {search} 找不到結果", diff --git a/packages/nc-gui/lib/acl.ts b/packages/nc-gui/lib/acl.ts index c38247b0ce..837f14ddb4 100644 --- a/packages/nc-gui/lib/acl.ts +++ b/packages/nc-gui/lib/acl.ts @@ -36,6 +36,7 @@ const rolePermissions = { newUser: true, viewCreateOrEdit: true, baseReorder: true, + orgAdminPanel: true, }, }, [OrgUserRoles.VIEWER]: { diff --git a/packages/nc-gui/lib/types.ts b/packages/nc-gui/lib/types.ts index 24c1d997f5..c32fdab28b 100644 --- a/packages/nc-gui/lib/types.ts +++ b/packages/nc-gui/lib/types.ts @@ -64,6 +64,8 @@ interface Row { commentCount?: number changed?: boolean saving?: boolean + ltarState?: Record | Record[] | null>
+ fromExpandedForm?: boolean
// use in datetime picker component
isUpdatedFromCopyNPaste?: Record
// Used in Calendar view
@@ -176,6 +178,7 @@ interface Group {
children?: Group[]
rows?: Row[]
root?: boolean
+ displayValueProp?: string
}
interface GroupNestedIn {
@@ -201,7 +204,7 @@ interface SidebarTableNode extends TableType {
}
interface UsersSortType {
- field?: 'email' | 'roles'
+ field?: 'email' | 'roles' | 'title' | 'id'
direction?: 'asc' | 'desc'
}
diff --git a/packages/nc-gui/middleware/02.auth.global.ts b/packages/nc-gui/middleware/02.auth.global.ts
index e4c8a4bf33..660ce7a2d3 100644
--- a/packages/nc-gui/middleware/02.auth.global.ts
+++ b/packages/nc-gui/middleware/02.auth.global.ts
@@ -37,6 +37,8 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
const { allRoles, loadRoles } = useRoles()
+ await checkForRedirect()
+
/** If baseHostname defined block home page access under subdomains, and redirect to workspace page */
if (
state.appInfo.value.baseHostName &&
@@ -196,3 +198,19 @@ async function tryShortTokenAuth(api: Api, signIn: Actions['signIn']) {
window.location.reload()
}
}
+
+/** Check if url contains redirect param and redirect to the url if found */
+async function checkForRedirect() {
+ if (window.location.search && /\bui-redirect=/.test(window.location.search)) {
+ let url
+ try {
+ url = decodeURIComponent(window.location.search.split('=')[1])
+ } catch (e: any) {
+ message.error(await extractSdkResponseErrorMsg(e))
+ }
+
+ const newURL = window.location.href.split('?')[0]
+ window.history.pushState('object', document.title, `${newURL}#${url}`)
+ window.location.reload()
+ }
+}
diff --git a/packages/nc-gui/store/base.ts b/packages/nc-gui/store/base.ts
index e2190709ec..80355c5a4e 100644
--- a/packages/nc-gui/store/base.ts
+++ b/packages/nc-gui/store/base.ts
@@ -108,6 +108,10 @@ export const useBase = defineStore('baseStore', () => {
return getBaseType(sourceId) === 'snowflake'
}
+ function isDatabricks(sourceId?: string) {
+ return getBaseType(sourceId) === 'databricks'
+ }
+
function isXcdbBase(sourceId?: string) {
const source = sources.value.find((source) => source.id === sourceId)
return (source?.is_meta as boolean) || (source?.is_local as boolean) || false
@@ -289,6 +293,7 @@ export const useBase = defineStore('baseStore', () => {
isPg,
isSqlite,
isSnowflake,
+ isDatabricks,
sqlUis,
isSharedBase,
isSharedErd,
diff --git a/packages/nc-gui/store/org.ts b/packages/nc-gui/store/org.ts
new file mode 100644
index 0000000000..b4a7b810ed
--- /dev/null
+++ b/packages/nc-gui/store/org.ts
@@ -0,0 +1,21 @@
+import { acceptHMRUpdate, defineStore } from 'pinia'
+
+// a placeholder for the org store which is used in cloud version
+export const useOrg = defineStore('orgStore', () => {
+ const org = ref()
+ const orgId = ref(null)
+
+ const loadOrg = async () => {}
+ const updateOrg = async (_updateObj: any) => {}
+
+ return {
+ org,
+ orgId,
+ updateOrg,
+ loadOrg,
+ }
+})
+
+if (import.meta.hot) {
+ import.meta.hot.accept(acceptHMRUpdate(useOrg as any, import.meta.hot))
+}
diff --git a/packages/nc-gui/store/workspace.ts b/packages/nc-gui/store/workspace.ts
index 8dc04f1efe..b989c9baa4 100644
--- a/packages/nc-gui/store/workspace.ts
+++ b/packages/nc-gui/store/workspace.ts
@@ -2,6 +2,7 @@ import type { BaseType } from 'nocodb-sdk'
import { acceptHMRUpdate, defineStore } from 'pinia'
import { message } from 'ant-design-vue'
import { isString } from '@vue/shared'
+import type { ThemeConfig } from '#imports'
import {
computed,
navigateTo,
@@ -13,7 +14,6 @@ import {
useRouter,
useTheme,
} from '#imports'
-import type { ThemeConfig } from '#imports'
export const useWorkspace = defineStore('workspaceStore', () => {
const basesStore = useBases()
@@ -92,6 +92,8 @@ export const useWorkspace = defineStore('workspaceStore', () => {
const loadWorkspace = async (..._args: any) => {}
+ const moveToOrg = async (..._args: any) => {}
+
async function populateWorkspace(..._args: any) {
isWorkspaceLoading.value = true
@@ -265,6 +267,7 @@ export const useWorkspace = defineStore('workspaceStore', () => {
workspaceUserCount,
getPlanLimit,
workspaceRole,
+ moveToOrg,
}
})
diff --git a/packages/nc-gui/utils/dataUtils.ts b/packages/nc-gui/utils/dataUtils.ts
index 3d783b95db..a7e0d9f500 100644
--- a/packages/nc-gui/utils/dataUtils.ts
+++ b/packages/nc-gui/utils/dataUtils.ts
@@ -5,10 +5,12 @@ import type { Row } from '~/lib'
export const extractPkFromRow = (row: Record, columns: ColumnType[]) => {
if (!row || !columns) return null
- return columns
- .filter((c) => c.pk)
- .map((c) => row?.[c.title as string])
- .join('___')
+
+ const pkColumns = columns.filter((c) => c.pk)
+
+ if (pkColumns.every((c) => row?.[c.title as string] === null || row?.[c.title as string] === undefined)) return null
+
+ return pkColumns.map((c) => row?.[c.title as string]).join('___')
}
export const rowPkData = (row: Record, columns: ColumnType[]) => {
diff --git a/packages/nc-gui/utils/datetimeUtils.ts b/packages/nc-gui/utils/datetimeUtils.ts
new file mode 100644
index 0000000000..7b0979ac66
--- /dev/null
+++ b/packages/nc-gui/utils/datetimeUtils.ts
@@ -0,0 +1,28 @@
+import dayjs from 'dayjs'
+import { dateFormats, timeFormats } from 'nocodb-sdk'
+
+export function parseStringDateTime(
+ v: string,
+ dateTimeFormat: string = `${dateFormats[0]} ${timeFormats[0]}`,
+ toLocal: boolean = true,
+) {
+ const dayjsObj = toLocal ? dayjs(v).local() : dayjs(v)
+
+ if (dayjsObj.isValid()) {
+ v = dayjsObj.format(dateTimeFormat)
+ } else {
+ v = toLocal ? dayjs(v, dateTimeFormat).local().format(dateTimeFormat) : dayjs(v, dateTimeFormat).format(dateTimeFormat)
+ }
+
+ return v
+}
+
+export const timeAgo = (date: any) => {
+ if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(date)) {
+ // if there is no timezone info, consider as UTC
+ // e.g. 2023-01-01 08:00:00 (MySQL)
+ date += '+00:00'
+ }
+ // show in local time
+ return dayjs(date).fromNow()
+}
diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts
index a286a5da2d..3f108a04bd 100644
--- a/packages/nc-gui/utils/iconUtils.ts
+++ b/packages/nc-gui/utils/iconUtils.ts
@@ -61,6 +61,8 @@ import Down from '~icons/material-symbols/keyboard-arrow-down-rounded'
import PhTriangleFill from '~icons/ph/triangle-fill'
import LcSend from '~icons/lucide/send'
import MdiPuzzle from '~icons/mdi/puzzle'
+import MaterialSymbolsArrowDropUp from '~icons/material-symbols/arrow-drop-up'
+import MaterialSymbolsArrowDropDown from '~icons/material-symbols/arrow-drop-down'
import HasManyIcon from '~icons/nc-icons/hasmany'
import ManytoManyIcon from '~icons/nc-icons/manytomany'
@@ -125,6 +127,9 @@ import NcArrowLeft from '~icons/nc-icons/arrow-left'
import NcArrowRight from '~icons/nc-icons/arrow-right'
import NcUpload from '~icons/nc-icons/upload'
import NcDownload from '~icons/nc-icons/download'
+import NcOffice from '~icons/nc-icons/office'
+import NcArrowUpRight from '~icons/nc-icons/arrow-up-right'
+import NcSlash from '~icons/nc-icons/slash'
// import NcProjectGray from '~icons/nc-icons/project-gray'
import NcPhoneCall from '~icons/nc-icons/phone-call'
import NcItalic from '~icons/nc-icons/italic'
@@ -132,6 +137,9 @@ import NcBold from '~icons/nc-icons/bold'
import NcUnderline from '~icons/nc-icons/underline'
import NcCrop from '~icons/nc-icons/crop'
import NcLink from '~icons/nc-icons/link'
+import NcControlPanel from '~icons/nc-icons/control-panel'
+import NcHome from '~icons/nc-icons/home'
+import NcWorkspace from '~icons/nc-icons/workspace'
import NcCellBarcode from '~icons/nc-icons/cell-barcode'
import NcCellCheckbox from '~icons/nc-icons/cell-checkbox'
@@ -325,6 +333,11 @@ import NcHelp from '~icons/nc-icons/help'
} as const */
export const iconMap = {
+ slash: NcSlash,
+ arrowUpRight: NcArrowUpRight,
+ ncWorkspace: NcWorkspace,
+ controlPanel: NcControlPanel,
+ home: NcHome,
cellBarcode: NcCellBarcode,
cellCheckbox: NcCellCheckbox,
cellDate: NcCellDate,
@@ -358,6 +371,7 @@ export const iconMap = {
cellSystemText: NcCellSystemText,
cellAttachment: NcCellAttachment,
+ office: NcOffice,
sort: Sort,
group: Group,
filter: Filter,
@@ -585,6 +599,8 @@ export const iconMap = {
ncSettings: NcSettings,
ncHelp: NcHelp,
puzzle: MdiPuzzle,
+ arrowDropUp: MaterialSymbolsArrowDropUp,
+ arrowDropDown: MaterialSymbolsArrowDropDown,
}
export const getMdiIcon = (type: string): any => {
diff --git a/packages/nc-gui/utils/index.ts b/packages/nc-gui/utils/index.ts
index afcd69c42a..0507da297b 100644
--- a/packages/nc-gui/utils/index.ts
+++ b/packages/nc-gui/utils/index.ts
@@ -24,5 +24,6 @@ export * from './parseUtils'
export * from './cell'
export * from './workerUtils'
export * from './parsersUtils'
+export * from './datetimeUtils'
export const isEeUI = false
diff --git a/packages/noco-docs/docs/070.fields/040.field-types/040.links-based/010.links.md b/packages/noco-docs/docs/070.fields/040.field-types/040.links-based/010.links.md
index 6d20b17b3f..17d272bc32 100644
--- a/packages/noco-docs/docs/070.fields/040.field-types/040.links-based/010.links.md
+++ b/packages/noco-docs/docs/070.fields/040.field-types/040.links-based/010.links.md
@@ -43,16 +43,15 @@ Clicking on the link-text will open a `Linked Records` modal with the list of li
-A brief note about the modal components:
-1. This modal is displaying linked records for `PENELOPE`
-2. Icon represents `Many-to-Many` relation
-3. Linked records belong to `Film` table
-4. Search bar, to narrow down the list of linked records displayed
-5. List (cards) of linked records
-6. To view additional information (expanded record), hover on the card & click on the `<>` icon
-7. Indicates total records linked
+List of linked records will appear as a dropdown containing linked records as cards. A brief note about the modal components:
+1. Search bar, to narrow down the list of linked records displayed
+2. Icon represents `Many-to-Many` relation. The count indicates the number of linked records
+3. List (cards) of linked records
+4. Click on the `-` icon to unlink the record
+5. To view additional information (expanded record), hover on the card & click on the `<>` icon
+6. Click on `+ New record` button to create and link a new record to the current one
+7. Click on `Link more records` to link an existing record [Read more](#link-new-records)
8. Pagination bar
-9. Click on `+ Link more Records` button to add new links : [Read more](#link-new-records)
### Link new records
@@ -63,21 +62,21 @@ Modal to add new links can be opened by
A brief note about the modal components:
-1. Links being created are for `PENELOPE`
-2. Icon represents `Many-to-Many` relation
-3. Linked records belong to `Film` table
-4. Search bar, to narrow down the list of records displayed
-5. Linked record card is displayed in blue color
-6. Records available for link are displayed in white color; use expand icon on the cord to view additional information
-7. Indicates total records linked (including the ones being linked)
-8. Pagination bar
+1. Search bar, to narrow down the list of records displayed
+2. Icon represents `Many-to-Many` relation. The count indicates the number of linked records
+3. List (cards) of records available for linking
+4. Click on the `+` icon to link the record
+5. To view additional information (expanded record) before linking, hover on the card & click on the `<>` icon
+6. Click on `+ New record` button to create and link a new record to the current one
+7. Pagination bar
:::info
Multiple records can be linked at once.
:::
### Unlink records
-To unlink a record, open the `Linked Records` modal & click on the card of the record to be unlinked.
+
+To unlink a record, open the `Linked Records` modal & click on the `-` icon on the card of the record to be unlinked.
:::info
Multiple records can be unlinked at once.
@@ -85,4 +84,4 @@ Multiple records can be unlinked at once.
### Related fields
- [Lookup](020.lookup.md)
-- [Rollup](030.rollup.md)
\ No newline at end of file
+- [Rollup](030.rollup.md)
diff --git a/packages/noco-docs/static/img/v2/fields/add-link-modal.png b/packages/noco-docs/static/img/v2/fields/add-link-modal.png
index eed317543b..eca5d7d57e 100644
Binary files a/packages/noco-docs/static/img/v2/fields/add-link-modal.png and b/packages/noco-docs/static/img/v2/fields/add-link-modal.png differ
diff --git a/packages/noco-docs/static/img/v2/fields/linked-record-modal.png b/packages/noco-docs/static/img/v2/fields/linked-record-modal.png
index 841c40dbd9..fc0964d567 100644
Binary files a/packages/noco-docs/static/img/v2/fields/linked-record-modal.png and b/packages/noco-docs/static/img/v2/fields/linked-record-modal.png differ
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 189ffded61..1587e0bbd8 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -296,7 +296,8 @@ export interface SourceType {
| 'oracledb'
| 'pg'
| 'snowflake'
- | 'sqlite3';
+ | 'sqlite3'
+ | 'databricks';
}
/**
@@ -342,7 +343,8 @@ export interface BaseReqType {
| 'oracledb'
| 'pg'
| 'snowflake'
- | 'sqlite3';
+ | 'sqlite3'
+ | 'databricks';
}
/**
@@ -2914,6 +2916,87 @@ export type NestedListCopyPasteOrDeleteAllReqType = {
fk_related_model_id: string;
}[];
+/**
+ * Model for Kanban Column Request
+ */
+export interface KanbanColumnReqType {
+ /** Title */
+ title?: string;
+ /** Is this column shown? */
+ show?: BoolType;
+ /**
+ * Column Order
+ * @example 1
+ */
+ order?: number;
+}
+
+/**
+ * Model for Gallery Column Request
+ */
+export interface GalleryColumnReqType {
+ /** Show */
+ show?: BoolType;
+ /**
+ * Order
+ * @example 1
+ */
+ order?: number;
+}
+
+/**
+ * Model for Calendar Column Request
+ */
+export interface CalendarColumnReqType {
+ /** Is this column shown? */
+ show?: BoolType;
+ /** Is this column shown as bold? */
+ bold?: BoolType;
+ /** Is this column shown as italic? */
+ italic?: BoolType;
+ /** Is this column shown underlines? */
+ underline?: BoolType;
+ /**
+ * Column Order
+ * @example 1
+ */
+ order?: number;
+}
+
+export interface ExtensionType {
+ /** Unique ID */
+ id?: IdType;
+ /** Unique Base ID */
+ base_id?: IdType;
+ /** Unique User ID */
+ fk_user_id?: IdType;
+ /** Extension ID */
+ extension_id?: string;
+ /** Extension Title */
+ title?: string;
+ /** Key Value Store for the extension */
+ kv_store?: MetaType;
+ /** Meta data for the extension */
+ meta?: MetaType;
+ /** Order of the extension */
+ order?: number;
+}
+
+export interface ExtensionReqType {
+ /** Unique Base ID */
+ base_id?: IdType;
+ /** Extension Title */
+ title?: string;
+ /** Extension ID */
+ extension_id?: string;
+ /** Key Value Store for the extension */
+ kv_store?: MetaType;
+ /** Meta data for the extension */
+ meta?: MetaType;
+ /** Order of the extension */
+ order?: number;
+}
+
import type {
AxiosInstance,
AxiosRequestConfig,
@@ -9819,7 +9902,8 @@ export class Api<
| 'oracledb'
| 'pg'
| 'snowflake'
- | 'sqlite3';
+ | 'sqlite3'
+ | 'databricks';
connection?: {
host?: string;
port?: string;
@@ -9880,7 +9964,7 @@ export class Api<
* DB Type
* @example mysql2
*\
- client?: "mssql" | "mysql" | "mysql2" | "oracledb" | "pg" | "snowflake" | "sqlite3",
+ client?: "mssql" | "mysql" | "mysql2" | "oracledb" | "pg" | "snowflake" | "sqlite3" | "databricks",
\** Connection Config *\
connection?: {
\** DB User *\
@@ -9926,7 +10010,8 @@ export class Api<
| 'oracledb'
| 'pg'
| 'snowflake'
- | 'sqlite3';
+ | 'sqlite3'
+ | 'databricks';
/** Connection Config */
connection?: {
/** DB User */
@@ -11454,6 +11539,104 @@ export class Api<
...params,
}),
};
+ extensions = {
+ /**
+ * @description Get all extensions for a given base
+ *
+ * @tags Extensions
+ * @name List
+ * @summary Get Extensions
+ * @request GET:/api/v2/extensions/{baseId}
+ * @response `200` `{
+ list?: (object)[],
+
+}` OK
+ */
+ list: (baseId: IdType, params: RequestParams = {}) =>
+ this.request<
+ {
+ list?: object[];
+ },
+ any
+ >({
+ path: `/api/v2/extensions/${baseId}`,
+ method: 'GET',
+ format: 'json',
+ ...params,
+ }),
+
+ /**
+ * @description Create a new extension for a given base
+ *
+ * @tags Extensions
+ * @name Create
+ * @summary Create Extension
+ * @request POST:/api/v2/extensions/{baseId}
+ * @response `200` `any` OK
+ */
+ create: (baseId: IdType, data: object, params: RequestParams = {}) =>
+ this.request({
+ path: `/api/v2/extensions/${baseId}`,
+ method: 'POST',
+ body: data,
+ type: ContentType.Json,
+ format: 'json',
+ ...params,
+ }),
+
+ /**
+ * @description Get extension details
+ *
+ * @tags Extensions
+ * @name Read
+ * @summary Get Extension
+ * @request GET:/api/v2/extensions/{extensionId}
+ * @response `200` `object` OK
+ */
+ read: (extensionId: IdType, params: RequestParams = {}) =>
+ this.request({
+ path: `/api/v2/extensions/${extensionId}`,
+ method: 'GET',
+ format: 'json',
+ ...params,
+ }),
+
+ /**
+ * @description Update extension details
+ *
+ * @tags Extensions
+ * @name Update
+ * @summary Update Extension
+ * @request PATCH:/api/v2/extensions/{extensionId}
+ * @response `200` `any` OK
+ */
+ update: (extensionId: IdType, data: object, params: RequestParams = {}) =>
+ this.request({
+ path: `/api/v2/extensions/${extensionId}`,
+ method: 'PATCH',
+ body: data,
+ type: ContentType.Json,
+ format: 'json',
+ ...params,
+ }),
+
+ /**
+ * @description Delete extension
+ *
+ * @tags Extensions
+ * @name Delete
+ * @summary Delete Extension
+ * @request DELETE:/api/v2/extensions/{extensionId}
+ * @response `200` `any` OK
+ */
+ delete: (extensionId: IdType, params: RequestParams = {}) =>
+ this.request({
+ path: `/api/v2/extensions/${extensionId}`,
+ method: 'DELETE',
+ format: 'json',
+ ...params,
+ }),
+ };
jobs = {
/**
* @description Listen for job events
diff --git a/packages/nocodb-sdk/src/lib/enums.ts b/packages/nocodb-sdk/src/lib/enums.ts
index 71e545d354..1321b1b460 100644
--- a/packages/nocodb-sdk/src/lib/enums.ts
+++ b/packages/nocodb-sdk/src/lib/enums.ts
@@ -4,6 +4,12 @@ export enum OrgUserRoles {
VIEWER = 'org-level-viewer',
}
+export enum CloudOrgUserRoles {
+ CREATOR = 'cloud-org-level-creator',
+ VIEWER = 'cloud-org-level-viewer',
+ OWNER = 'cloud-org-level-owner',
+}
+
export enum ProjectRoles {
OWNER = 'owner',
CREATOR = 'creator',
@@ -182,6 +188,9 @@ export const RoleLabels = {
[OrgUserRoles.SUPER_ADMIN]: 'superAdmin',
[OrgUserRoles.CREATOR]: 'creator',
[OrgUserRoles.VIEWER]: 'viewer',
+ [CloudOrgUserRoles.OWNER]: 'owner',
+ [CloudOrgUserRoles.CREATOR]: 'creator',
+ [CloudOrgUserRoles.VIEWER]: 'viewer',
};
export const RoleColors = {
@@ -200,6 +209,9 @@ export const RoleColors = {
[ProjectRoles.NO_ACCESS]: 'red',
[OrgUserRoles.CREATOR]: 'blue',
[OrgUserRoles.VIEWER]: 'yellow',
+ [CloudOrgUserRoles.OWNER]: 'purple',
+ [CloudOrgUserRoles.CREATOR]: 'blue',
+ [CloudOrgUserRoles.VIEWER]: 'yellow',
};
export const RoleDescriptions = {
@@ -240,6 +252,10 @@ export const RoleIcons = {
[OrgUserRoles.SUPER_ADMIN]: 'role_super',
[OrgUserRoles.CREATOR]: 'role_creator',
[OrgUserRoles.VIEWER]: 'role_viewer',
+
+ [CloudOrgUserRoles.OWNER]: 'role_owner',
+ [CloudOrgUserRoles.CREATOR]: 'role_creator',
+ [CloudOrgUserRoles.VIEWER]: 'role_viewer',
};
export const WorkspaceRolesToProjectRoles = {
diff --git a/packages/nocodb-sdk/src/lib/helperFunctions.ts b/packages/nocodb-sdk/src/lib/helperFunctions.ts
index a079d23edb..f2fccca71f 100644
--- a/packages/nocodb-sdk/src/lib/helperFunctions.ts
+++ b/packages/nocodb-sdk/src/lib/helperFunctions.ts
@@ -87,9 +87,13 @@ const getAvailableRollupForUiType = (type: string) => {
UITypes.Email,
UITypes.PhoneNumber,
UITypes.URL,
+ UITypes.Checkbox,
+ UITypes.JSON,
].includes(type as UITypes)
) {
return ['count'];
+ } else if ([UITypes.Attachment].includes(type as UITypes)) {
+ return [];
} else {
return [
'sum',
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/DatabricksUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/DatabricksUi.ts
index d14176f473..2ecccf0da0 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/DatabricksUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/DatabricksUi.ts
@@ -531,19 +531,15 @@ export class DatabricksUi {
}
}
- static getDataTypeForUiType(col: { uidt: UITypes; }, idType?: IDType) {
+ static getDataTypeForUiType(col: { uidt: UITypes; }) {
const colProp: any = {};
switch (col.uidt) {
case 'ID':
{
- const isAutoIncId = idType === 'AI';
- const isAutoGenId = idType === 'AG';
- colProp.dt = isAutoGenId ? 'varchar' : 'integer';
+ colProp.dt = 'string';
colProp.pk = true;
- colProp.un = isAutoIncId;
- colProp.ai = isAutoIncId;
colProp.rqd = true;
- colProp.meta = isAutoGenId ? { ag: 'nc' } : undefined;
+ colProp.meta = { ag: 'nc' };
}
break;
case 'ForeignKey':
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts
index 07006bd231..95abb59a61 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts
@@ -1435,13 +1435,12 @@ export class PgUi {
return 'date';
case 'daterange':
return 'string';
- case 'double precision':
- return 'string';
case 'event_trigger':
case 'fdw_handler':
return 'string';
+ case 'double precision':
case 'float4':
case 'float8':
return 'float';
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
index 348105b25c..533b7de7fc 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
@@ -643,6 +643,7 @@ export class SnowflakeUi {
case 'STRING':
return 'string';
case 'TEXT':
+ if (col.dtxp < 1024) return 'string';
return 'text';
case 'BINARY':
case 'VARBINARY':
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 2a6184c4ec..f9ddfce973 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -109,7 +109,7 @@
"html-to-json-parser": "^2.0.1",
"import-fresh": "^3.3.0",
"inflection": "^1.13.4",
- "ioredis": "^5.3.2",
+ "ioredis": "^5.4.1",
"ioredis-mock": "^8.9.0",
"is-docker": "^2.2.1",
"isomorphic-dompurify": "^1.13.0",
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index c1d63f0b7c..2babe1eab5 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -1897,7 +1897,7 @@ class BaseModelSqlv2 {
// .where(childTable.primaryKey.cn, cid)
.where(_wherePk(childTable.primaryKeys, cid))
.whereNotNull(cn),
- ).orWhereNull(rcn);
+ );
});
if (+rest?.shuffle) {
@@ -2107,7 +2107,7 @@ class BaseModelSqlv2 {
] = async function (args): Promise {
(listLoader as any).args = args;
return listLoader.load(
- getCompositePk(self.model.primaryKeys, this),
+ getCompositePkValue(self.model.primaryKeys, this),
);
};
} else if (colOptions.type === 'mm') {
@@ -2148,7 +2148,7 @@ class BaseModelSqlv2 {
] = async function (args): Promise {
(listLoader as any).args = args;
return await listLoader.load(
- getCompositePk(self.model.primaryKeys, this),
+ getCompositePkValue(self.model.primaryKeys, this),
);
};
} else if (colOptions.type === 'bt') {
@@ -2370,7 +2370,7 @@ class BaseModelSqlv2 {
] = async function (args): Promise {
(listLoader as any).args = args;
return listLoader.load(
- getCompositePk(self.model.primaryKeys, this),
+ getCompositePkValue(self.model.primaryKeys, this),
);
};
}
@@ -3124,7 +3124,7 @@ class BaseModelSqlv2 {
await this.prepareNocoData(insertObj, true, cookie);
- await Promise.all(preInsertOps.map((f) => f(this.dbDriver)));
+ await this.runOps(preInsertOps.map((f) => f()));
let response;
const query = this.dbDriver(this.tnPath).insert(insertObj);
@@ -3206,7 +3206,7 @@ class BaseModelSqlv2 {
}
rowId = this.extractCompositePK({ ai, ag, rowId, insertObj });
- await Promise.all(postInsertOps.map((f) => f(rowId)));
+ await this.runOps(postInsertOps.map((f) => f(rowId)));
if (rowId !== null && rowId !== undefined) {
response = await this.readRecord({
@@ -3254,7 +3254,20 @@ class BaseModelSqlv2 {
}
}
rowId = pkObj;
+ } else if (
+ !ai &&
+ !ag &&
+ (force || this.model.primaryKeys?.length > 1 || this.isSnowflake)
+ ) {
+ // handle if primary key is not ai or ag
+ const pkObj = {};
+ for (const pk of this.model.primaryKeys) {
+ const key = pk.title;
+ pkObj[key] = insertObj[pk.column_name] ?? null;
+ }
+ rowId = pkObj;
}
+
return rowId;
}
@@ -3267,8 +3280,8 @@ class BaseModelSqlv2 {
data: Record;
insertObj: Record;
}) {
- const postInsertOps: ((rowId: any, trx?: any) => Promise)[] = [];
- const preInsertOps: ((trx?: any) => Promise)[] = [];
+ const postInsertOps: ((rowId: any) => Promise)[] = [];
+ const preInsertOps: (() => Promise)[] = [];
for (const col of nestedCols) {
if (col.title in data) {
const colOptions = await col.getColOptions();
@@ -3301,16 +3314,18 @@ class BaseModelSqlv2 {
await childModel.getColumns();
if (isBt) {
+ // if array then extract value from first element
+ const colVal = Array.isArray(nestedData)
+ ? nestedData[0]?.[childModel.primaryKey.title]
+ : nestedData[childModel.primaryKey.title];
// todo: unlink the ref record
- preInsertOps.push(async (trx: any = this.dbDriver) => {
- await trx(this.getTnPath(childModel.table_name))
+ preInsertOps.push(async () => {
+ return this.dbDriver(this.getTnPath(childModel.table_name))
.update({
[childCol.column_name]: null,
})
- .where(
- childCol.column_name,
- nestedData[childModel.primaryKey.title],
- );
+ .where(childCol.column_name, colVal)
+ .toQuery();
});
if (typeof nestedData !== 'object') continue;
@@ -3318,15 +3333,16 @@ class BaseModelSqlv2 {
const parentCol = await colOptions.getParentColumn();
insertObj[childCol.column_name] = nestedData?.[parentCol.title];
} else {
- postInsertOps.push(async (rowId, trx: any = this.dbDriver) => {
- await trx(this.getTnPath(childModel.table_name))
+ postInsertOps.push(async (rowId) => {
+ return this.dbDriver(this.getTnPath(childModel.table_name))
.update({
[childCol.column_name]: rowId,
})
.where(
childModel.primaryKey.column_name,
nestedData[childModel.primaryKey.title],
- );
+ )
+ .toQuery();
});
}
}
@@ -3338,47 +3354,38 @@ class BaseModelSqlv2 {
const childModel = await childCol.getModel();
await childModel.getColumns();
- postInsertOps.push(
- async (
- rowId,
- // todo: use transaction type
- trx: any = this.dbDriver,
- ) => {
- await trx(this.getTnPath(childModel.table_name))
- .update({
- [childCol.column_name]: rowId,
- })
- .whereIn(
- childModel.primaryKey.column_name,
- nestedData?.map((r) => r[childModel.primaryKey.title]),
- );
- },
- );
+ postInsertOps.push(async (rowId) => {
+ return this.dbDriver(this.getTnPath(childModel.table_name))
+ .update({
+ [childCol.column_name]: rowId,
+ })
+ .whereIn(
+ childModel.primaryKey.column_name,
+ nestedData?.map((r) => r[childModel.primaryKey.title]),
+ )
+ .toQuery();
+ });
}
break;
case RelationTypes.MANY_TO_MANY: {
if (!Array.isArray(nestedData)) continue;
- postInsertOps.push(
- async (
- rowId,
- // todo: use transaction type
- trx: any = this.dbDriver,
- ) => {
- const parentModel = await colOptions
- .getParentColumn()
- .then((c) => c.getModel());
- await parentModel.getColumns();
- const parentMMCol = await colOptions.getMMParentColumn();
- const childMMCol = await colOptions.getMMChildColumn();
- const mmModel = await colOptions.getMMModel();
-
- const rows = nestedData.map((r) => ({
- [parentMMCol.column_name]: r[parentModel.primaryKey.title],
- [childMMCol.column_name]: rowId,
- }));
- await trx(this.getTnPath(mmModel.table_name)).insert(rows);
- },
- );
+ postInsertOps.push(async (rowId) => {
+ const parentModel = await colOptions
+ .getParentColumn()
+ .then((c) => c.getModel());
+ await parentModel.getColumns();
+ const parentMMCol = await colOptions.getMMParentColumn();
+ const childMMCol = await colOptions.getMMChildColumn();
+ const mmModel = await colOptions.getMMModel();
+
+ const rows = nestedData.map((r) => ({
+ [parentMMCol.column_name]: r[parentModel.primaryKey.title],
+ [childMMCol.column_name]: rowId,
+ }));
+ return this.dbDriver(this.getTnPath(mmModel.table_name))
+ .insert(rows)
+ .toQuery();
+ });
}
}
}
@@ -3410,8 +3417,8 @@ class BaseModelSqlv2 {
try {
// TODO: ag column handling for raw bulk insert
const insertDatas = raw ? datas : [];
- let postInsertOps: ((rowId: any, trx?: any) => Promise)[] = [];
- let preInsertOps: ((trx?: any) => Promise)[] = [];
+ let postInsertOps: ((rowId: any) => Promise)[] = [];
+ let preInsertOps: (() => Promise)[] = [];
let aiPkCol: Column;
let agPkCol: Column;
@@ -3596,7 +3603,10 @@ class BaseModelSqlv2 {
}
}
- await Promise.all(preInsertOps.map((f) => f(trx)));
+ await this.runOps(
+ preInsertOps.map((f) => f()),
+ trx,
+ );
let responses;
@@ -3661,7 +3671,10 @@ class BaseModelSqlv2 {
});
}
- await Promise.all(postInsertOps.map((f) => f(rowId, trx)));
+ await this.runOps(
+ postInsertOps.map((f) => f(rowId)),
+ trx,
+ );
}
await trx.commit();
@@ -3728,7 +3741,10 @@ class BaseModelSqlv2 {
const pkAndData: { pk: any; data: any }[] = [];
const readChunkSize = 100;
for (const [i, d] of updateDatas.entries()) {
- const pkValues = this._extractPksValues(d);
+ const pkValues = getCompositePkValue(
+ this.model.primaryKeys,
+ this._extractPksValues(d),
+ );
if (!pkValues) {
// throw or skip if no pk provided
if (throwExceptionIfNotExist) {
@@ -3954,7 +3970,10 @@ class BaseModelSqlv2 {
const pkAndData: { pk: any; data: any }[] = [];
const readChunkSize = 100;
for (const [i, d] of deleteIds.entries()) {
- const pkValues = this._extractPksValues(d);
+ const pkValues = getCompositePkValue(
+ this.model.primaryKeys,
+ this._extractPksValues(d),
+ );
if (!pkValues) {
// throw or skip if no pk provided
if (throwExceptionIfNotExist) {
@@ -5248,6 +5267,13 @@ class BaseModelSqlv2 {
return data;
}
+ async runOps(ops: Promise[], trx = this.dbDriver) {
+ const queries = await Promise.all(ops);
+ for (const query of queries) {
+ await trx.raw(query);
+ }
+ }
+
protected async substituteColumnIdsWithColumnTitles(
data: Record[],
dependencyColumns?: Column[],
@@ -6863,8 +6889,9 @@ export function _wherePk(primaryKeys: Column[], id: unknown | unknown[]) {
return where;
}
-function getCompositePk(primaryKeys: Column[], row) {
- return primaryKeys.map((c) => row[c.title]).join('___');
+export function getCompositePkValue(primaryKeys: Column[], row) {
+ if (typeof row !== 'object') return row;
+ return primaryKeys.map((c) => row[c.title] ?? row[c.column_name]).join('___');
}
export function haveFormulaColumn(columns: Column[]) {
diff --git a/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaPg.ts b/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaPg.ts
index 93efd3d4c3..1ddd306e20 100644
--- a/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaPg.ts
+++ b/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaPg.ts
@@ -430,13 +430,12 @@ class ModelXcMetaPg extends BaseModelXcMeta {
return 'date';
case 'daterange':
return 'string';
- case 'double precision':
- return 'string';
case 'event_trigger':
case 'fdw_handler':
return dt;
+ case 'double precision':
case 'float4':
case 'float8':
return 'float';
diff --git a/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaSnowflake.ts b/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaSnowflake.ts
index 9b25a0c352..99094d7a6a 100644
--- a/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaSnowflake.ts
+++ b/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaSnowflake.ts
@@ -500,6 +500,7 @@ class ModelXcMetaSnowflake extends BaseModelXcMeta {
case 'smgr':
return dt;
case 'text':
+ if (col.dtxp < 1024) return 'string';
return 'text';
case 'tid':
return dt;
diff --git a/packages/nocodb/src/filters/global-exception/global-exception.filter.ts b/packages/nocodb/src/filters/global-exception/global-exception.filter.ts
index b58adc793d..9f50b884a2 100644
--- a/packages/nocodb/src/filters/global-exception/global-exception.filter.ts
+++ b/packages/nocodb/src/filters/global-exception/global-exception.filter.ts
@@ -12,6 +12,7 @@ import {
Forbidden,
NcBaseErrorv2,
NotFound,
+ SsoError,
Unauthorized,
UnprocessableEntity,
} from '~/helpers/catchError';
@@ -38,16 +39,20 @@ export class GlobalExceptionFilter implements ExceptionFilter {
exception = new NcBaseErrorv2(NcErrorType.BAD_JSON);
}
+ const dbError = extractDBError(exception);
+
// skip unnecessary error logging
if (
process.env.NC_ENABLE_ALL_API_ERROR_LOGGING === 'true' ||
!(
+ dbError ||
exception instanceof BadRequest ||
exception instanceof AjvError ||
exception instanceof Unauthorized ||
exception instanceof Forbidden ||
exception instanceof NotFound ||
exception instanceof UnprocessableEntity ||
+ exception instanceof SsoError ||
exception instanceof NotFoundException ||
exception instanceof ThrottlerException ||
exception instanceof ExternalError ||
@@ -69,6 +74,25 @@ export class GlobalExceptionFilter implements ExceptionFilter {
);
}
+ // if sso error then redirect to ui with error in query parameter
+ if (
+ exception instanceof SsoError ||
+ request.route?.path === '/sso/:clientId/redirect'
+ ) {
+ if (!(exception instanceof SsoError)) {
+ this.logger.warn(exception.message, exception.stack);
+ }
+
+ // encode the query parameter
+ const redirectUrl = `${
+ request.dashboardUrl
+ }?ui-redirect=${encodeURIComponent(
+ `/sso?error=${encodeURIComponent(exception.message)}`,
+ )}`;
+
+ return response.redirect(redirectUrl);
+ }
+
// API not found
if (exception instanceof NotFoundException) {
this.logger.debug(exception.message, exception.stack);
@@ -76,8 +100,6 @@ export class GlobalExceptionFilter implements ExceptionFilter {
return response.status(404).json({ msg: exception.message });
}
- const dbError = extractDBError(exception);
-
if (dbError) {
return response.status(400).json(dbError);
}
diff --git a/packages/nocodb/src/helpers/catchError.ts b/packages/nocodb/src/helpers/catchError.ts
index 5e413d9e4b..93005a58fd 100644
--- a/packages/nocodb/src/helpers/catchError.ts
+++ b/packages/nocodb/src/helpers/catchError.ts
@@ -3,7 +3,7 @@ import { Logger } from '@nestjs/common';
import type { ErrorObject } from 'ajv';
import { defaultLimitConfig } from '~/helpers/extractLimitAndOffset';
-const dbErrorLogger = new Logger('DBError');
+const dbErrorLogger = new Logger('MissingDBError');
export enum DBError {
TABLE_EXIST = 'TABLE_EXIST',
@@ -413,6 +413,8 @@ export class Forbidden extends NcBaseError {}
export class NotFound extends NcBaseError {}
+export class SsoError extends NcBaseError {}
+
export class ExternalError extends NcBaseError {
constructor(error: Error) {
super(error.message);
@@ -578,6 +580,7 @@ export class NcBaseErrorv2 extends NcBaseError {
error: NcErrorType;
code: number;
details?: any;
+
constructor(error: NcErrorType, args?: NcErrorArgs) {
const errorHelper = generateError(error, args);
super(errorHelper.message);
@@ -726,4 +729,10 @@ export class NcError {
static notAllowed(message = 'Not allowed') {
throw new NotAllowed(message);
}
+
+ static emailDomainNotAllowed(domain: string) {
+ throw new SsoError(
+ `Email domain ${domain} is not allowed for this organization`,
+ );
+ }
}
diff --git a/packages/nocodb/src/helpers/getUniqueName.ts b/packages/nocodb/src/helpers/getUniqueName.ts
index e6f3c5228a..132cc37e72 100644
--- a/packages/nocodb/src/helpers/getUniqueName.ts
+++ b/packages/nocodb/src/helpers/getUniqueName.ts
@@ -1,6 +1,9 @@
import type Column from '~/models/Column';
-export function getUniqueColumnName(columns: Column[], initialName = 'field') {
+export function getUniqueColumnName(
+ columns: Partial[],
+ initialName = 'field',
+) {
let c = 0;
while (
@@ -13,7 +16,7 @@ export function getUniqueColumnName(columns: Column[], initialName = 'field') {
}
export function getUniqueColumnAliasName(
- columns: Column[],
+ columns: Partial[],
initialName = 'field',
) {
let c = 0;
diff --git a/packages/nocodb/src/helpers/populateMeta.ts b/packages/nocodb/src/helpers/populateMeta.ts
index 213fb5b2e2..397c3f0192 100644
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@@ -2,7 +2,7 @@ import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
import { isVirtualCol, RelationTypes } from 'nocodb-sdk';
import { pluralize, singularize } from 'inflection';
import { isLinksOrLTAR } from 'nocodb-sdk';
-import { getUniqueColumnAliasName } from './getUniqueName';
+import { getUniqueColumnAliasName, getUniqueColumnName } from './getUniqueName';
import type { RollupColumn } from '~/models';
import type LinkToAnotherRecordColumn from '~/models/LinkToAnotherRecordColumn';
import type Source from '~/models/Source';
@@ -93,7 +93,11 @@ export async function extractAndGenerateManyToManyRelations(
if (
belongsToCols?.length === 2 &&
normalColumns.length < 5 &&
- assocModel.primaryKeys.length === 2
+ assocModel.primaryKeys.length === 2 &&
+ // check if both belongsToCol target primary keys
+ assocModel.primaryKeys.every((pk) =>
+ belongsToCols.some((c) => c.colOptions?.fk_child_column_id === pk.id),
+ )
) {
const modelA = await belongsToCols[0].colOptions.getRelatedTable();
const modelB = await belongsToCols[1].colOptions.getRelatedTable();
@@ -383,8 +387,11 @@ export async function populateMeta(
base_id: base.id,
db_alias: source.id,
fk_model_id: models2[table.tn].id,
- cn: column.cn,
- title: column.title,
+ cn: getUniqueColumnName(models2[table.tn].columns, column.cn),
+ title: getUniqueColumnAliasName(
+ models2[table.tn].columns,
+ column.title,
+ ),
uidt: column.uidt,
type: column.hm ? 'hm' : column.mm ? 'mm' : 'bt',
// column_id,
diff --git a/packages/nocodb/src/helpers/webhookHelpers.ts b/packages/nocodb/src/helpers/webhookHelpers.ts
index 6faba5155b..59fa0d1fec 100644
--- a/packages/nocodb/src/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/helpers/webhookHelpers.ts
@@ -54,8 +54,15 @@ export async function validateCondition(
const column = await filter.getColumn();
const field = column.title;
let val = data[field];
-
- if (
+ if (filter.is_group) {
+ res = await validateCondition(
+ filter.children || (await filter.getChildren()),
+ data,
+ {
+ client,
+ },
+ );
+ } else if (
[
UITypes.Date,
UITypes.DateTime,
diff --git a/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts b/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
index 5207b12425..ff8c3bdc76 100644
--- a/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
+++ b/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
@@ -230,6 +230,7 @@ export class AclMiddleware implements NestInterceptor {
'blockApiTokenAccess',
context.getHandler(),
);
+
const scope = this.reflector.get('scope', context.getHandler());
const req = context.switchToHttp().getRequest();
@@ -237,7 +238,6 @@ export class AclMiddleware implements NestInterceptor {
if (!req.user?.isAuthorized) {
NcError.unauthorized('Invalid token');
}
-
const userScopeRole =
req.user.roles?.[OrgUserRoles.SUPER_ADMIN] === true
? OrgUserRoles.SUPER_ADMIN
diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index cb7911001b..1d22995207 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -486,8 +486,10 @@ export default class Column implements ColumnType {
public static async list(
{
fk_model_id,
+ fk_default_view_id,
}: {
fk_model_id: string;
+ fk_default_view_id?: string;
},
ncMeta = Noco.ncMeta,
): Promise {
@@ -505,9 +507,27 @@ export default class Column implements ColumnType {
order: 'asc',
},
});
+ const defaultViewColumns = fk_default_view_id
+ ? await View.getColumns(fk_default_view_id)
+ : [];
+
+ const defaultViewColumnOrderMap = defaultViewColumns.reduce(
+ (acc, col) => {
+ acc[col.fk_column_id] = col.order;
+ return acc;
+ },
+ {} as Record,
+ );
columnsList.forEach((column) => {
column.meta = parseMetaProp(column);
+
+ if (defaultViewColumns.length) {
+ column.meta = {
+ ...column.meta,
+ defaultViewColOrder: defaultViewColumnOrderMap[column.id],
+ };
+ }
});
await NocoCache.setList(CacheScope.COLUMN, [fk_model_id], columnsList);
diff --git a/packages/nocodb/src/models/Model.ts b/packages/nocodb/src/models/Model.ts
index 1148dbe6f5..8f62c1b173 100644
--- a/packages/nocodb/src/models/Model.ts
+++ b/packages/nocodb/src/models/Model.ts
@@ -65,10 +65,14 @@ export default class Model implements TableType {
Object.assign(this, data);
}
- public async getColumns(ncMeta = Noco.ncMeta): Promise {
+ public async getColumns(
+ ncMeta = Noco.ncMeta,
+ defaultViewId = undefined,
+ ): Promise {
this.columns = await Column.list(
{
fk_model_id: this.id,
+ fk_default_view_id: defaultViewId,
},
ncMeta,
);
@@ -391,8 +395,13 @@ export default class Model implements TableType {
}
if (modelData) {
const m = new Model(modelData);
- const columns = await m.getColumns(ncMeta);
+
await m.getViews(false, ncMeta);
+
+ const defaultViewId = m.views.find((view) => view.is_default).id;
+
+ const columns = await m.getColumns(ncMeta, defaultViewId);
+
m.columnsById = columns.reduce((agg, c) => ({ ...agg, [c.id]: c }), {});
return m;
}
diff --git a/packages/nocodb/src/models/UserRefreshToken.ts b/packages/nocodb/src/models/UserRefreshToken.ts
index ae4d805fd0..79c2602f78 100644
--- a/packages/nocodb/src/models/UserRefreshToken.ts
+++ b/packages/nocodb/src/models/UserRefreshToken.ts
@@ -1,4 +1,3 @@
-import process from 'process';
import dayjs from 'dayjs';
import Noco from '~/Noco';
import { extractProps } from '~/helpers/extractProps';
@@ -69,6 +68,7 @@ export default class UserRefreshToken {
return insertObj;
}
+ // todo: caching
static async updateOldToken(
oldToken: string,
newToken: string,
diff --git a/packages/nocodb/src/models/View.ts b/packages/nocodb/src/models/View.ts
index ab3453b1fe..97a12df9b1 100644
--- a/packages/nocodb/src/models/View.ts
+++ b/packages/nocodb/src/models/View.ts
@@ -545,6 +545,13 @@ export default class View implements ViewType {
};
const views = await this.list(param.fk_model_id, ncMeta);
+ const tableColumns = await Column.list(
+ { fk_model_id: param.fk_model_id },
+ ncMeta,
+ );
+ // keep a map of column id to column object for easy access
+ const colIdMap = new Map(tableColumns.map((c) => [c.id, c]));
+
for (const view of views) {
const modifiedInsertObj = {
...insertObj,
@@ -553,6 +560,26 @@ export default class View implements ViewType {
if (param.column_show?.view_id === view.id) {
modifiedInsertObj.show = true;
+ } else if (view.uuid) {
+ // if view is shared, then keep the show state as it is
+ }
+ // if gallery/kanban view, show only 3 columns(excluding system columns)
+ else if (view.type === ViewTypes.GALLERY) {
+ const visibleColumnsCount = (
+ await GalleryViewColumn.list(view.id, ncMeta)
+ )?.filter(
+ (c) => c.show && !isSystemColumn(colIdMap.get(c.fk_column_id)),
+ ).length;
+ modifiedInsertObj.show = visibleColumnsCount < 3;
+ } else if (view.type === ViewTypes.KANBAN) {
+ const visibleColumnsCount = (
+ await KanbanViewColumn.list(view.id, ncMeta)
+ )?.filter(
+ (c) => c.show && !isSystemColumn(colIdMap.get(c.fk_column_id)),
+ ).length;
+ modifiedInsertObj.show = visibleColumnsCount < 3;
+ } else if (view.type !== ViewTypes.FORM) {
+ modifiedInsertObj.show = true;
}
if (param.column_order?.view_id === view.id) {
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index dbd49a8aa5..a471021c9b 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -5,6 +5,7 @@ import {
isCreatedOrLastModifiedTimeCol,
isLinksOrLTAR,
isVirtualCol,
+ RelationTypes,
substituteColumnAliasWithIdInFormula,
substituteColumnIdWithAliasInFormula,
UITypes,
@@ -18,7 +19,6 @@ import type {
ColumnReqType,
LinkToAnotherColumnReqType,
LinkToAnotherRecordType,
- RelationTypes,
UserType,
} from 'nocodb-sdk';
import type CustomKnex from '~/db/CustomKnex';
@@ -2417,9 +2417,9 @@ export class ColumnsService {
};
await sqlMgr.sqlOpPlus(source, 'tableUpdate', tableUpdateBody);
+ // delete foreign key column
+ await Column.delete(childColumn.id, ncMeta);
}
- // delete foreign key column
- await Column.delete(childColumn.id, ncMeta);
};
deleteOoRelation = async (
@@ -2492,7 +2492,7 @@ export class ColumnsService {
const columnsInRelatedTable: Column[] = await relationColOpt
.getRelatedTable(ncMeta)
.then((m) => m.getColumns(ncMeta));
- const relType = relationColOpt.type === 'bt' ? 'hm' : 'bt';
+ const relType = RelationTypes.ONE_TO_ONE;
for (const c of columnsInRelatedTable) {
if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
const colOpt = await c.getColOptions(ncMeta);
@@ -2562,9 +2562,10 @@ export class ColumnsService {
};
await sqlMgr.sqlOpPlus(source, 'tableUpdate', tableUpdateBody);
+
+ // delete foreign key column
+ await Column.delete(childColumn.id, ncMeta);
}
- // delete foreign key column
- await Column.delete(childColumn.id, ncMeta);
};
async createLTARColumn(param: {
diff --git a/packages/nocodb/src/services/users/helpers.ts b/packages/nocodb/src/services/users/helpers.ts
index c7826207d5..2b2ba15c2a 100644
--- a/packages/nocodb/src/services/users/helpers.ts
+++ b/packages/nocodb/src/services/users/helpers.ts
@@ -4,9 +4,13 @@ import type User from '~/models/User';
import type { NcConfig } from '~/interface/config';
import type { Response } from 'express';
-export function genJwt(user: User, config: NcConfig) {
+export function genJwt(
+ user: User & { extra?: Record },
+ config: NcConfig,
+) {
return jwt.sign(
{
+ ...(user.extra || {}),
email: user.email,
id: user.id,
roles: user.roles,
diff --git a/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts b/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
index f666ac1b10..f01b5c42b4 100644
--- a/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
+++ b/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
@@ -48,6 +48,9 @@ export class AuthTokenStrategy extends PassportStrategy(Strategy, 'authtoken') {
...(dbUser.workspace_roles
? { workspace_roles: extractRolesObj(dbUser.workspace_roles) }
: {}),
+ ...(dbUser.org_roles
+ ? { org_roles: extractRolesObj(dbUser.org_roles) }
+ : {}),
});
}
return callback(null, sanitiseUserObj(user));
diff --git a/packages/nocodb/tests/unit/rest/index.test.ts b/packages/nocodb/tests/unit/rest/index.test.ts
index 48a0444d02..b2eb831049 100644
--- a/packages/nocodb/tests/unit/rest/index.test.ts
+++ b/packages/nocodb/tests/unit/rest/index.test.ts
@@ -14,9 +14,11 @@ import formulaTests from './tests/formula.test';
let workspaceTest = () => {};
let ssoTest = () => {};
+let cloudOrgTest = () => {};
if (process.env.EE === 'true') {
workspaceTest = require('./tests/ee/workspace.test').default;
ssoTest = require('./tests/ee/sso.test').default;
+ cloudOrgTest = require('./tests/ee/cloud-org.test').default;
}
// import layoutTests from './tests/layout.test';
// import widgetTest from './tests/widget.test';
@@ -36,6 +38,7 @@ function restTests() {
workspaceTest();
formulaTests();
ssoTest();
+ cloudOrgTest();
// Enable for dashboard feature
// widgetTest();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 56d8cdfdc0..9b2823a050 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -53,19 +53,19 @@ importers:
version: 0.5.1(vue@3.3.13)
'@tiptap/extension-link':
specifier: 2.2.6
- version: 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)
+ version: 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)
'@tiptap/extension-placeholder':
specifier: ^2.2.6
- version: 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)
+ version: 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)
'@tiptap/extension-task-list':
specifier: 2.2.6
- version: 2.2.6(@tiptap/core@2.2.5)
+ version: 2.2.6(@tiptap/core@2.3.1)
'@tiptap/extension-underline':
specifier: ^2.2.6
- version: 2.2.6(@tiptap/core@2.2.5)
+ version: 2.2.6(@tiptap/core@2.3.1)
'@tiptap/html':
specifier: 2.2.6
- version: 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)
+ version: 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)
'@tiptap/pm':
specifier: ^2.2.6
version: 2.2.6
@@ -74,7 +74,7 @@ importers:
version: 2.2.6(@tiptap/pm@2.2.6)
'@tiptap/vue-3':
specifier: 2.2.6
- version: 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)(vue@3.3.13)
+ version: 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)(vue@3.3.13)
'@vue-flow/additional-components':
specifier: ^1.3.3
version: 1.3.3(@vue-flow/core@1.31.0)(vue@3.3.13)
@@ -243,7 +243,7 @@ importers:
version: 0.26.3(eslint@8.56.0)
'@esbuild-plugins/node-modules-polyfill':
specifier: ^0.2.2
- version: 0.2.2(esbuild@0.20.1)
+ version: 0.2.2(esbuild@0.20.2)
'@iconify-json/ant-design':
specifier: ^1.1.15
version: 1.1.15
@@ -354,7 +354,7 @@ importers:
version: 0.0.3
'@unocss/nuxt':
specifier: ^0.58.9
- version: 0.58.9(postcss@8.4.35)(vite@4.5.3)(webpack@5.90.3)
+ version: 0.58.9(postcss@8.4.38)(vite@4.5.3)(webpack@5.91.0)
'@vitest/ui':
specifier: ^0.34.7
version: 0.34.7(vitest@1.2.2)
@@ -402,7 +402,7 @@ importers:
version: 1.71.1
ts-loader:
specifier: ^9.5.1
- version: 9.5.1(webpack@5.90.3)
+ version: 9.5.1(webpack@5.91.0)
unplugin-icons:
specifier: ^0.18.5
version: 0.18.5(@vue/compiler-sfc@3.4.21)
@@ -486,7 +486,7 @@ importers:
version: 10.3.7(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@nestjs/platform-socket.io@10.3.7)(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@ntegral/nestjs-sentry':
specifier: ^4.0.1
- version: 4.0.1(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@sentry/hub@7.103.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1)
+ version: 4.0.1(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@sentry/hub@7.113.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1)
'@sentry/node':
specifier: ^6.19.7
version: 6.19.7
@@ -576,7 +576,7 @@ importers:
version: 8.6.0
ejs:
specifier: ^3.1.9
- version: 3.1.9
+ version: 3.1.10
emittery:
specifier: ^0.13.1
version: 0.13.1
@@ -617,11 +617,11 @@ importers:
specifier: ^1.13.4
version: 1.13.4
ioredis:
- specifier: ^5.3.2
- version: 5.3.2
+ specifier: ^5.4.1
+ version: 5.4.1
ioredis-mock:
specifier: ^8.9.0
- version: 8.9.0(@types/ioredis-mock@8.2.5)(ioredis@5.3.2)
+ version: 8.9.0(@types/ioredis-mock@8.2.5)(ioredis@5.4.1)
is-docker:
specifier: ^2.2.1
version: 2.2.1
@@ -699,7 +699,7 @@ importers:
version: 1.0.6(debug@4.3.4)(kafkajs@2.2.4)(reflect-metadata@0.2.1)
nestjs-throttler-storage-redis:
specifier: ^0.4.4
- version: 0.4.4(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1)
+ version: 0.4.4(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@nestjs/throttler@5.1.2)(ioredis@5.4.1)(reflect-metadata@0.2.1)
nocodb-sdk:
specifier: workspace:^
version: link:../nocodb-sdk
@@ -859,7 +859,7 @@ importers:
version: 4.4.1
copy-webpack-plugin:
specifier: ^11.0.0
- version: 11.0.0(webpack@5.90.3)
+ version: 11.0.0(webpack@5.91.0)
cross-env:
specifier: ^7.0.3
version: 7.0.3
@@ -901,10 +901,10 @@ importers:
version: 6.3.4
ts-jest:
specifier: 29.1.2
- version: 29.1.2(@babel/core@7.24.3)(jest@29.7.0)(typescript@5.3.2)
+ version: 29.1.2(@babel/core@7.24.5)(jest@29.7.0)(typescript@5.3.2)
ts-loader:
specifier: ^9.5.1
- version: 9.5.1(typescript@5.3.2)(webpack@5.90.3)
+ version: 9.5.1(typescript@5.3.2)(webpack@5.91.0)
ts-node:
specifier: ^10.9.2
version: 10.9.2(@types/node@20.11.30)(typescript@5.3.2)
@@ -916,7 +916,7 @@ importers:
version: 5.3.2
webpack-cli:
specifier: ^5.1.4
- version: 5.1.4(webpack@5.90.3)
+ version: 5.1.4(webpack@5.91.0)
packages/nocodb-sdk:
dependencies:
@@ -971,7 +971,7 @@ importers:
version: 5.0.5
ts-jest:
specifier: ^29.1.2
- version: 29.1.2(@babel/core@7.24.3)(jest@29.7.0)(typescript@5.3.2)
+ version: 29.1.2(@babel/core@7.24.5)(jest@29.7.0)(typescript@5.3.2)
tsc-alias:
specifier: ^1.8.8
version: 1.8.8
@@ -1007,8 +1007,8 @@ importers:
version: 0.18.5
devDependencies:
'@playwright/test':
- specifier: 1.38.0
- version: 1.38.0
+ specifier: 1.43.1
+ version: 1.43.1
'@typescript-eslint/eslint-plugin':
specifier: ^6.1.0
version: 6.1.0(@typescript-eslint/parser@6.1.0)(eslint@8.33.0)
@@ -2688,6 +2688,29 @@ packages:
transitivePeerDependencies:
- supports-color
+ /@babel/core@7.24.5:
+ resolution: {integrity: sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==}
+ engines: {node: '>=6.9.0'}
+ dependencies:
+ '@ampproject/remapping': 2.3.0
+ '@babel/code-frame': 7.24.2
+ '@babel/generator': 7.24.5
+ '@babel/helper-compilation-targets': 7.23.6
+ '@babel/helper-module-transforms': 7.24.5(@babel/core@7.24.5)
+ '@babel/helpers': 7.24.5
+ '@babel/parser': 7.24.5
+ '@babel/template': 7.24.0
+ '@babel/traverse': 7.24.5
+ '@babel/types': 7.24.5
+ convert-source-map: 2.0.0
+ debug: 4.3.4(supports-color@5.5.0)
+ gensync: 1.0.0-beta.2
+ json5: 2.2.3
+ semver: 6.3.1
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
/@babel/generator@7.24.1:
resolution: {integrity: sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==}
engines: {node: '>=6.9.0'}
@@ -2697,6 +2720,16 @@ packages:
'@jridgewell/trace-mapping': 0.3.25
jsesc: 2.5.2
+ /@babel/generator@7.24.5:
+ resolution: {integrity: sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==}
+ engines: {node: '>=6.9.0'}
+ dependencies:
+ '@babel/types': 7.24.5
+ '@jridgewell/gen-mapping': 0.3.5
+ '@jridgewell/trace-mapping': 0.3.25
+ jsesc: 2.5.2
+ dev: true
+
/@babel/helper-annotate-as-pure@7.22.5:
resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
engines: {node: '>=6.9.0'}
@@ -2762,6 +2795,13 @@ packages:
dependencies:
'@babel/types': 7.24.0
+ /@babel/helper-module-imports@7.24.3:
+ resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==}
+ engines: {node: '>=6.9.0'}
+ dependencies:
+ '@babel/types': 7.24.5
+ dev: true
+
/@babel/helper-module-transforms@7.23.3(@babel/core@7.24.3):
resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
engines: {node: '>=6.9.0'}
@@ -2775,6 +2815,20 @@ packages:
'@babel/helper-split-export-declaration': 7.22.6
'@babel/helper-validator-identifier': 7.22.20
+ /@babel/helper-module-transforms@7.24.5(@babel/core@7.24.5):
+ resolution: {integrity: sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==}
+ engines: {node: '>=6.9.0'}
+ peerDependencies:
+ '@babel/core': ^7.0.0
+ dependencies:
+ '@babel/core': 7.24.5
+ '@babel/helper-environment-visitor': 7.22.20
+ '@babel/helper-module-imports': 7.24.3
+ '@babel/helper-simple-access': 7.24.5
+ '@babel/helper-split-export-declaration': 7.24.5
+ '@babel/helper-validator-identifier': 7.24.5
+ dev: true
+
/@babel/helper-optimise-call-expression@7.22.5:
resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
engines: {node: '>=6.9.0'}
@@ -2805,6 +2859,13 @@ packages:
dependencies:
'@babel/types': 7.24.0
+ /@babel/helper-simple-access@7.24.5:
+ resolution: {integrity: sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==}
+ engines: {node: '>=6.9.0'}
+ dependencies:
+ '@babel/types': 7.24.5
+ dev: true
+
/@babel/helper-skip-transparent-expression-wrappers@7.22.5:
resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
engines: {node: '>=6.9.0'}
@@ -2818,14 +2879,31 @@ packages:
dependencies:
'@babel/types': 7.24.0
+ /@babel/helper-split-export-declaration@7.24.5:
+ resolution: {integrity: sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==}
+ engines: {node: '>=6.9.0'}
+ dependencies:
+ '@babel/types': 7.24.5
+ dev: true
+
/@babel/helper-string-parser@7.23.4:
resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
engines: {node: '>=6.9.0'}
+ /@babel/helper-string-parser@7.24.1:
+ resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==}
+ engines: {node: '>=6.9.0'}
+ dev: true
+
/@babel/helper-validator-identifier@7.22.20:
resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
engines: {node: '>=6.9.0'}
+ /@babel/helper-validator-identifier@7.24.5:
+ resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==}
+ engines: {node: '>=6.9.0'}
+ dev: true
+
/@babel/helper-validator-option@7.23.5:
resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
engines: {node: '>=6.9.0'}
@@ -2840,6 +2918,17 @@ packages:
transitivePeerDependencies:
- supports-color
+ /@babel/helpers@7.24.5:
+ resolution: {integrity: sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==}
+ engines: {node: '>=6.9.0'}
+ dependencies:
+ '@babel/template': 7.24.0
+ '@babel/traverse': 7.24.5
+ '@babel/types': 7.24.5
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
/@babel/highlight@7.24.2:
resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==}
engines: {node: '>=6.9.0'}
@@ -2864,6 +2953,14 @@ packages:
dependencies:
'@babel/types': 7.24.0
+ /@babel/parser@7.24.5:
+ resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==}
+ engines: {node: '>=6.0.0'}
+ hasBin: true
+ dependencies:
+ '@babel/types': 7.24.5
+ dev: true
+
/@babel/plugin-proposal-decorators@7.23.2(@babel/core@7.24.3):
resolution: {integrity: sha512-eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg==}
engines: {node: '>=6.9.0'}
@@ -3106,6 +3203,24 @@ packages:
transitivePeerDependencies:
- supports-color
+ /@babel/traverse@7.24.5:
+ resolution: {integrity: sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==}
+ engines: {node: '>=6.9.0'}
+ dependencies:
+ '@babel/code-frame': 7.24.2
+ '@babel/generator': 7.24.5
+ '@babel/helper-environment-visitor': 7.22.20
+ '@babel/helper-function-name': 7.23.0
+ '@babel/helper-hoist-variables': 7.22.5
+ '@babel/helper-split-export-declaration': 7.24.5
+ '@babel/parser': 7.24.5
+ '@babel/types': 7.24.5
+ debug: 4.3.4(supports-color@5.5.0)
+ globals: 11.12.0
+ transitivePeerDependencies:
+ - supports-color
+ dev: true
+
/@babel/types@7.24.0:
resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
engines: {node: '>=6.9.0'}
@@ -3114,6 +3229,15 @@ packages:
'@babel/helper-validator-identifier': 7.22.20
to-fast-properties: 2.0.0
+ /@babel/types@7.24.5:
+ resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==}
+ engines: {node: '>=6.9.0'}
+ dependencies:
+ '@babel/helper-string-parser': 7.24.1
+ '@babel/helper-validator-identifier': 7.24.5
+ to-fast-properties: 2.0.0
+ dev: true
+
/@bcoe/v8-coverage@0.2.3:
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
dev: true
@@ -3342,12 +3466,12 @@ packages:
dev: false
optional: true
- /@esbuild-plugins/node-modules-polyfill@0.2.2(esbuild@0.20.1):
+ /@esbuild-plugins/node-modules-polyfill@0.2.2(esbuild@0.20.2):
resolution: {integrity: sha512-LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA==}
peerDependencies:
esbuild: '*'
dependencies:
- esbuild: 0.20.1
+ esbuild: 0.20.2
escape-string-regexp: 4.0.0
rollup-plugin-node-polyfills: 0.2.1
dev: true
@@ -3370,6 +3494,15 @@ packages:
dev: true
optional: true
+ /@esbuild/aix-ppc64@0.20.2:
+ resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
+ engines: {node: '>=12'}
+ cpu: [ppc64]
+ os: [aix]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/android-arm64@0.18.20:
resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
engines: {node: '>=12'}
@@ -3397,6 +3530,15 @@ packages:
dev: true
optional: true
+ /@esbuild/android-arm64@0.20.2:
+ resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [android]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/android-arm@0.18.20:
resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
engines: {node: '>=12'}
@@ -3424,6 +3566,15 @@ packages:
dev: true
optional: true
+ /@esbuild/android-arm@0.20.2:
+ resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==}
+ engines: {node: '>=12'}
+ cpu: [arm]
+ os: [android]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/android-x64@0.18.20:
resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
engines: {node: '>=12'}
@@ -3451,6 +3602,15 @@ packages:
dev: true
optional: true
+ /@esbuild/android-x64@0.20.2:
+ resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [android]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/darwin-arm64@0.18.20:
resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
engines: {node: '>=12'}
@@ -3478,6 +3638,15 @@ packages:
dev: true
optional: true
+ /@esbuild/darwin-arm64@0.20.2:
+ resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [darwin]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/darwin-x64@0.18.20:
resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
engines: {node: '>=12'}
@@ -3505,6 +3674,15 @@ packages:
dev: true
optional: true
+ /@esbuild/darwin-x64@0.20.2:
+ resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [darwin]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/freebsd-arm64@0.18.20:
resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
engines: {node: '>=12'}
@@ -3532,6 +3710,15 @@ packages:
dev: true
optional: true
+ /@esbuild/freebsd-arm64@0.20.2:
+ resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [freebsd]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/freebsd-x64@0.18.20:
resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
engines: {node: '>=12'}
@@ -3559,6 +3746,15 @@ packages:
dev: true
optional: true
+ /@esbuild/freebsd-x64@0.20.2:
+ resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [freebsd]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/linux-arm64@0.18.20:
resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
engines: {node: '>=12'}
@@ -3586,6 +3782,15 @@ packages:
dev: true
optional: true
+ /@esbuild/linux-arm64@0.20.2:
+ resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/linux-arm@0.18.20:
resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
engines: {node: '>=12'}
@@ -3613,6 +3818,15 @@ packages:
dev: true
optional: true
+ /@esbuild/linux-arm@0.20.2:
+ resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==}
+ engines: {node: '>=12'}
+ cpu: [arm]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/linux-ia32@0.18.20:
resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
engines: {node: '>=12'}
@@ -3640,6 +3854,15 @@ packages:
dev: true
optional: true
+ /@esbuild/linux-ia32@0.20.2:
+ resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==}
+ engines: {node: '>=12'}
+ cpu: [ia32]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/linux-loong64@0.18.20:
resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
engines: {node: '>=12'}
@@ -3667,6 +3890,15 @@ packages:
dev: true
optional: true
+ /@esbuild/linux-loong64@0.20.2:
+ resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==}
+ engines: {node: '>=12'}
+ cpu: [loong64]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/linux-mips64el@0.18.20:
resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
engines: {node: '>=12'}
@@ -3694,6 +3926,15 @@ packages:
dev: true
optional: true
+ /@esbuild/linux-mips64el@0.20.2:
+ resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==}
+ engines: {node: '>=12'}
+ cpu: [mips64el]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/linux-ppc64@0.18.20:
resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
engines: {node: '>=12'}
@@ -3721,6 +3962,15 @@ packages:
dev: true
optional: true
+ /@esbuild/linux-ppc64@0.20.2:
+ resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==}
+ engines: {node: '>=12'}
+ cpu: [ppc64]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/linux-riscv64@0.18.20:
resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
engines: {node: '>=12'}
@@ -3748,6 +3998,15 @@ packages:
dev: true
optional: true
+ /@esbuild/linux-riscv64@0.20.2:
+ resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==}
+ engines: {node: '>=12'}
+ cpu: [riscv64]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/linux-s390x@0.18.20:
resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
engines: {node: '>=12'}
@@ -3775,6 +4034,15 @@ packages:
dev: true
optional: true
+ /@esbuild/linux-s390x@0.20.2:
+ resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==}
+ engines: {node: '>=12'}
+ cpu: [s390x]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/linux-x64@0.18.20:
resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
engines: {node: '>=12'}
@@ -3802,6 +4070,15 @@ packages:
dev: true
optional: true
+ /@esbuild/linux-x64@0.20.2:
+ resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/netbsd-x64@0.18.20:
resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
engines: {node: '>=12'}
@@ -3829,6 +4106,15 @@ packages:
dev: true
optional: true
+ /@esbuild/netbsd-x64@0.20.2:
+ resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [netbsd]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/openbsd-x64@0.18.20:
resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
engines: {node: '>=12'}
@@ -3856,6 +4142,15 @@ packages:
dev: true
optional: true
+ /@esbuild/openbsd-x64@0.20.2:
+ resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [openbsd]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/sunos-x64@0.18.20:
resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
engines: {node: '>=12'}
@@ -3883,6 +4178,15 @@ packages:
dev: true
optional: true
+ /@esbuild/sunos-x64@0.20.2:
+ resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [sunos]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/win32-arm64@0.18.20:
resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
engines: {node: '>=12'}
@@ -3910,6 +4214,15 @@ packages:
dev: true
optional: true
+ /@esbuild/win32-arm64@0.20.2:
+ resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [win32]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/win32-ia32@0.18.20:
resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
engines: {node: '>=12'}
@@ -3937,6 +4250,15 @@ packages:
dev: true
optional: true
+ /@esbuild/win32-ia32@0.20.2:
+ resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==}
+ engines: {node: '>=12'}
+ cpu: [ia32]
+ os: [win32]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@esbuild/win32-x64@0.18.20:
resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
engines: {node: '>=12'}
@@ -3964,6 +4286,15 @@ packages:
dev: true
optional: true
+ /@esbuild/win32-x64@0.20.2:
+ resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [win32]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/@eslint-community/eslint-utils@4.4.0(eslint@8.33.0):
resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5127,7 +5458,7 @@ packages:
resolution: {integrity: sha512-je+kkrfcvPcwL5Tg8JRENRqlbzjdlZXyaR88UcnCdNW0AJ1jX9IfHRys1X7AwSroU2ug8ESNC+suoBw1vX833Q==}
engines: {node: '>=16.0.0'}
dependencies:
- chalk: 4.1.2
+ chalk: 4.1.0
execa: 5.1.1
strong-log-transformer: 2.1.0
dev: true
@@ -5885,7 +6216,7 @@ packages:
- debug
dev: true
- /@ntegral/nestjs-sentry@4.0.1(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@sentry/hub@7.103.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1):
+ /@ntegral/nestjs-sentry@4.0.1(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@sentry/hub@7.113.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1):
resolution: {integrity: sha512-GQUL0Bm0T+FhTNJXUbnF5mZc2u5YuvUV2H6naXxrnw8tY0b9eE/DGj+GUyHNL7V2DuHHFzsYP2c30O5FoGoYfQ==}
peerDependencies:
'@nestjs/common': '>=10.0.0'
@@ -5898,7 +6229,7 @@ packages:
dependencies:
'@nestjs/common': 10.3.7(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@nestjs/core': 10.3.7(@nestjs/common@10.3.7)(@nestjs/platform-express@10.3.7)(@nestjs/websockets@10.3.7)(reflect-metadata@0.2.1)(rxjs@7.8.1)
- '@sentry/hub': 7.103.0
+ '@sentry/hub': 7.113.0
'@sentry/node': 6.19.7
reflect-metadata: 0.2.1
rimraf: 3.0.2
@@ -6378,7 +6709,7 @@ packages:
nx: '>= 15 <= 17'
dependencies:
'@nrwl/devkit': 16.7.4(nx@16.7.4)
- ejs: 3.1.9
+ ejs: 3.1.10
enquirer: 2.3.6
ignore: 5.3.1
nx: 16.7.4
@@ -6917,12 +7248,12 @@ packages:
dev: true
optional: true
- /@playwright/test@1.38.0:
- resolution: {integrity: sha512-xis/RXXsLxwThKnlIXouxmIvvT3zvQj1JE39GsNieMUrMpb3/GySHDh2j8itCG22qKVD4MYLBp7xB73cUW/UUw==}
+ /@playwright/test@1.43.1:
+ resolution: {integrity: sha512-HgtQzFgNEEo4TE22K/X7sYTYNqEMMTZmFS8kTq6m8hXj+m1D8TgwgIbumHddJa9h4yl4GkKb8/bgAl2+g7eDgA==}
engines: {node: '>=16'}
hasBin: true
dependencies:
- playwright: 1.38.0
+ playwright: 1.43.1
dev: true
/@polka/url@1.0.0-next.21:
@@ -7227,12 +7558,12 @@ packages:
tslib: 1.14.1
dev: false
- /@sentry/core@7.103.0:
- resolution: {integrity: sha512-LCI+PIDoF/RLqN41fNXum3ilmS6ukni6L7t38vSdibbe2G0804EbPLtOIpv2PkS8E6CFuRW5zOb+8OwEAAtZWw==}
+ /@sentry/core@7.113.0:
+ resolution: {integrity: sha512-pg75y3C5PG2+ur27A0Re37YTCEnX0liiEU7EOxWDGutH17x3ySwlYqLQmZsFZTSnvzv7t3MGsNZ8nT5O0746YA==}
engines: {node: '>=8'}
dependencies:
- '@sentry/types': 7.103.0
- '@sentry/utils': 7.103.0
+ '@sentry/types': 7.113.0
+ '@sentry/utils': 7.113.0
dev: false
/@sentry/hub@6.19.7:
@@ -7244,13 +7575,13 @@ packages:
tslib: 1.14.1
dev: false
- /@sentry/hub@7.103.0:
- resolution: {integrity: sha512-61o906jj5i2T9iUeFy/UwisLaCYt5SMU6i64w3pbFM4CJJRsufc+zcrSDfngLJMYOawlXJPa85iekBEkfpOzzQ==}
+ /@sentry/hub@7.113.0:
+ resolution: {integrity: sha512-aoerhlAw3vnY9a27eKAoK862oMXFbyMFWbaZuCeR5gfg7sHsOkVQkCl3yiYfF5hfw9MbwbbY6GqWbCrA89Ci/A==}
engines: {node: '>=8'}
dependencies:
- '@sentry/core': 7.103.0
- '@sentry/types': 7.103.0
- '@sentry/utils': 7.103.0
+ '@sentry/core': 7.113.0
+ '@sentry/types': 7.113.0
+ '@sentry/utils': 7.113.0
dev: false
/@sentry/minimal@6.19.7:
@@ -7283,8 +7614,8 @@ packages:
engines: {node: '>=6'}
dev: false
- /@sentry/types@7.103.0:
- resolution: {integrity: sha512-NCvKyx8d2AGBQKPARrJemZmZ16DiMo688OEikZg4BbvFNDUzK5Egm2BH0vfLDhbNkU19o3maJowrYo42m8r9Zw==}
+ /@sentry/types@7.113.0:
+ resolution: {integrity: sha512-PJbTbvkcPu/LuRwwXB1He8m+GjDDLKBtu3lWg5xOZaF5IRdXQU2xwtdXXsjge4PZR00tF7MO7X8ZynTgWbYaew==}
engines: {node: '>=8'}
dev: false
@@ -7296,11 +7627,11 @@ packages:
tslib: 1.14.1
dev: false
- /@sentry/utils@7.103.0:
- resolution: {integrity: sha512-phkUJt3F0UOkVq+M4GfdAh2ewI3ASrNiJddx9aO7GnT0aDwwVBHZltnqt95qgAB8W+BipTSt1dAh8yUbbq1Ceg==}
+ /@sentry/utils@7.113.0:
+ resolution: {integrity: sha512-nzKsErwmze1mmEsbW2AwL2oB+I5v6cDEJY4sdfLekA4qZbYZ8pV5iWza6IRl4XfzGTE1qpkZmEjPU9eyo0yvYw==}
engines: {node: '>=8'}
dependencies:
- '@sentry/types': 7.103.0
+ '@sentry/types': 7.113.0
dev: false
/@sigstore/bundle@1.1.0:
@@ -8362,7 +8693,7 @@ packages:
asn1.js: 5.4.1
asn1.js-rfc2560: 5.0.1(asn1.js@5.4.1)
asn1.js-rfc5280: 3.0.0
- async: 3.2.4
+ async: 3.2.5
simple-lru-cache: 0.0.2
dev: false
@@ -8370,16 +8701,16 @@ packages:
resolution: {integrity: sha512-7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ==}
dev: false
- /@tiptap/core@2.2.5(@tiptap/pm@2.2.6):
- resolution: {integrity: sha512-BgF6tiXhwph0Ig16ZNppMmg30t22Z/yjZ+KnS8EALdJere3ACNw8THz9q/8iQqBWjjBOHUvhrQOgER4BJxfmGA==}
+ /@tiptap/core@2.2.6(@tiptap/pm@2.2.6):
+ resolution: {integrity: sha512-v7S7RhQhTXQo9KSk2jM/jJlTd3clU2FsJA3Omjz7GbgYtPSy67qSiaTbH/tWq12GzDHbKymx+oQnKmyx+yPucA==}
peerDependencies:
'@tiptap/pm': ^2.0.0
dependencies:
'@tiptap/pm': 2.2.6
dev: false
- /@tiptap/core@2.2.6(@tiptap/pm@2.2.6):
- resolution: {integrity: sha512-v7S7RhQhTXQo9KSk2jM/jJlTd3clU2FsJA3Omjz7GbgYtPSy67qSiaTbH/tWq12GzDHbKymx+oQnKmyx+yPucA==}
+ /@tiptap/core@2.3.1(@tiptap/pm@2.2.6):
+ resolution: {integrity: sha512-ycpQlmczAOc05TgB5sc3RUTEEBXAVmS8MR9PqQzg96qidaRfVkgE+2w4k7t83PMHl2duC0MGqOCy96pLYwSpeg==}
peerDependencies:
'@tiptap/pm': ^2.0.0
dependencies:
@@ -8402,13 +8733,13 @@ packages:
'@tiptap/core': 2.2.6(@tiptap/pm@2.2.6)
dev: false
- /@tiptap/extension-bubble-menu@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6):
+ /@tiptap/extension-bubble-menu@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6):
resolution: {integrity: sha512-nRWxbgkInhdGUL+e6iISgALcWh8A1PxeVB66w7yYZHS/WoZO0DXdXYT/BWb/XmEJ8r6B4c9SDZRklCiXT8dSXw==}
peerDependencies:
'@tiptap/core': ^2.0.0
'@tiptap/pm': ^2.0.0
dependencies:
- '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+ '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
'@tiptap/pm': 2.2.6
tippy.js: 6.3.7
dev: false
@@ -8457,13 +8788,13 @@ packages:
'@tiptap/pm': 2.2.6
dev: false
- /@tiptap/extension-floating-menu@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6):
+ /@tiptap/extension-floating-menu@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6):
resolution: {integrity: sha512-6ONKC6Dx8zCc5YffXpnQ9FxGRoUp5Jm9mOO3losgiDFhdJqaO7SCk1ziOiD7enoWqIc2shZh8ADnqttCfnFVFQ==}
peerDependencies:
'@tiptap/core': ^2.0.0
'@tiptap/pm': ^2.0.0
dependencies:
- '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+ '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
'@tiptap/pm': 2.2.6
tippy.js: 6.3.7
dev: false
@@ -8522,13 +8853,13 @@ packages:
'@tiptap/core': 2.2.6(@tiptap/pm@2.2.6)
dev: false
- /@tiptap/extension-link@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6):
+ /@tiptap/extension-link@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6):
resolution: {integrity: sha512-Jj0oXSfQ8gZlzzwd669B8sEKBkoK8xV31Lu55tRv9PKHSU6p9CUqBuxY8qR+cquCtO28f3u0cdl5o4HzeIUL5A==}
peerDependencies:
'@tiptap/core': ^2.0.0
'@tiptap/pm': ^2.0.0
dependencies:
- '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+ '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
'@tiptap/pm': 2.2.6
linkifyjs: 4.1.3
dev: false
@@ -8557,13 +8888,13 @@ packages:
'@tiptap/core': 2.2.6(@tiptap/pm@2.2.6)
dev: false
- /@tiptap/extension-placeholder@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6):
+ /@tiptap/extension-placeholder@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6):
resolution: {integrity: sha512-eHPadx48gneDD8bTZeRnG4hOvRvctBPY5JlA03QQIoarrbmqsyv3zZSW8smBsRai9kwbXLhytdEFGruTKV9PjQ==}
peerDependencies:
'@tiptap/core': ^2.0.0
'@tiptap/pm': ^2.0.0
dependencies:
- '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+ '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
'@tiptap/pm': 2.2.6
dev: false
@@ -8575,12 +8906,12 @@ packages:
'@tiptap/core': 2.2.6(@tiptap/pm@2.2.6)
dev: false
- /@tiptap/extension-task-list@2.2.6(@tiptap/core@2.2.5):
+ /@tiptap/extension-task-list@2.2.6(@tiptap/core@2.3.1):
resolution: {integrity: sha512-4ofrnm0jwk9OC5QH+b5wR4ck+J5wi+uOq7Qm2234GAqohjOzr4ndae68NSIv2XviDk04askCoZc+yZBxNwkhmQ==}
peerDependencies:
'@tiptap/core': ^2.0.0
dependencies:
- '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+ '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
dev: false
/@tiptap/extension-text@2.2.6(@tiptap/core@2.2.6):
@@ -8591,21 +8922,21 @@ packages:
'@tiptap/core': 2.2.6(@tiptap/pm@2.2.6)
dev: false
- /@tiptap/extension-underline@2.2.6(@tiptap/core@2.2.5):
+ /@tiptap/extension-underline@2.2.6(@tiptap/core@2.3.1):
resolution: {integrity: sha512-RaYEWuBHS6VQ2KXk+pP2b3xDN4vxmTb7+CF84mumR+CJUK4uAx01IDBUof+h/a4Sa58suNLQ6eHY33NmxPppnQ==}
peerDependencies:
'@tiptap/core': ^2.0.0
dependencies:
- '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+ '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
dev: false
- /@tiptap/html@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6):
+ /@tiptap/html@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6):
resolution: {integrity: sha512-RdZ5Zr2b+LShyKaQKlWB3eLSzznH54Er8/78wKLuudE2xiUS1t25O1YgIrGUA1AFC1woSPJsS1uEvxwvKqE6eg==}
peerDependencies:
'@tiptap/core': ^2.0.0
'@tiptap/pm': ^2.0.0
dependencies:
- '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+ '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
'@tiptap/pm': 2.2.6
zeed-dom: 0.10.11
dev: false
@@ -8659,16 +8990,16 @@ packages:
- '@tiptap/pm'
dev: false
- /@tiptap/vue-3@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)(vue@3.3.13):
+ /@tiptap/vue-3@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)(vue@3.3.13):
resolution: {integrity: sha512-F8hC133AF/48cvZReJun5TV35NtRcoH8LVEGsuHGNkH7BvJjXAciomvEO4HlSfqz1YT8M/hzRGNg1/R6ixv3bw==}
peerDependencies:
'@tiptap/core': ^2.0.0
'@tiptap/pm': ^2.0.0
vue: 3.3.13
dependencies:
- '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
- '@tiptap/extension-bubble-menu': 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)
- '@tiptap/extension-floating-menu': 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)
+ '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
+ '@tiptap/extension-bubble-menu': 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)
+ '@tiptap/extension-floating-menu': 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)
'@tiptap/pm': 2.2.6
vue: 3.3.13
dev: false
@@ -8719,7 +9050,7 @@ packages:
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
dependencies:
'@tufjs/canonical-json': 1.0.0
- minimatch: 9.0.3
+ minimatch: 9.0.4
dev: true
/@tufjs/models@2.0.0:
@@ -8727,7 +9058,7 @@ packages:
engines: {node: ^16.14.0 || >=18.0.0}
dependencies:
'@tufjs/canonical-json': 2.0.0
- minimatch: 9.0.3
+ minimatch: 9.0.4
dev: true
/@types/babel__core@7.20.1:
@@ -8832,7 +9163,7 @@ packages:
/@types/eslint-scope@3.7.7:
resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
dependencies:
- '@types/eslint': 8.56.5
+ '@types/eslint': 8.56.10
'@types/estree': 1.0.5
dev: true
@@ -8843,8 +9174,8 @@ packages:
'@types/json-schema': 7.0.12
dev: true
- /@types/eslint@8.56.5:
- resolution: {integrity: sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==}
+ /@types/eslint@8.56.10:
+ resolution: {integrity: sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==}
dependencies:
'@types/estree': 1.0.5
'@types/json-schema': 7.0.15
@@ -8912,7 +9243,7 @@ packages:
resolution: {integrity: sha512-cZyuwC9LGtg7s5G9/w6rpy3IOZ6F/hFR0pQlWYZESMo1xQUYbDpa6haqB4grTePjsGzcB/YLBFCjqRunK5wieg==}
dependencies:
'@types/node': 20.11.30
- ioredis: 5.3.2
+ ioredis: 5.4.1
transitivePeerDependencies:
- supports-color
dev: false
@@ -9788,7 +10119,7 @@ packages:
sirv: 2.0.4
dev: true
- /@unocss/nuxt@0.58.9(postcss@8.4.35)(vite@4.5.3)(webpack@5.90.3):
+ /@unocss/nuxt@0.58.9(postcss@8.4.38)(vite@4.5.3)(webpack@5.91.0):
resolution: {integrity: sha512-zrzbpNjjstiXsjfRCwBt0ZDMquTPqAWry6OT1Z8YUeRmQ2YuPNJDnvUSWZuA5zYbXjMjuCTtX+jkHctMIabOYA==}
dependencies:
'@nuxt/kit': 3.11.1
@@ -9803,8 +10134,8 @@ packages:
'@unocss/preset-wind': 0.58.9
'@unocss/reset': 0.58.9
'@unocss/vite': 0.58.9(vite@4.5.3)
- '@unocss/webpack': 0.58.9(webpack@5.90.3)
- unocss: 0.58.9(@unocss/webpack@0.58.9)(postcss@8.4.35)(vite@4.5.3)
+ '@unocss/webpack': 0.58.9(webpack@5.91.0)
+ unocss: 0.58.9(@unocss/webpack@0.58.9)(postcss@8.4.38)(vite@4.5.3)
transitivePeerDependencies:
- postcss
- rollup
@@ -9813,7 +10144,7 @@ packages:
- webpack
dev: true
- /@unocss/postcss@0.58.9(postcss@8.4.35):
+ /@unocss/postcss@0.58.9(postcss@8.4.38):
resolution: {integrity: sha512-PnKmH6Qhimw35yO6u6yx9SHaX2NmvbRNPDvMDHA/1xr3M8L0o8U88tgKbWfm65NEGF3R1zJ9A8rjtZn/LPkgPA==}
engines: {node: '>=14'}
peerDependencies:
@@ -9825,7 +10156,7 @@ packages:
css-tree: 2.3.1
fast-glob: 3.3.2
magic-string: 0.30.8
- postcss: 8.4.35
+ postcss: 8.4.38
dev: true
/@unocss/preset-attributify@0.58.9:
@@ -9962,7 +10293,7 @@ packages:
- rollup
dev: true
- /@unocss/webpack@0.58.9(webpack@5.90.3):
+ /@unocss/webpack@0.58.9(webpack@5.91.0):
resolution: {integrity: sha512-BCIocoGRRvrB3jqrUZwzBFA2pVgxQr2XzVFU6t8yZQqVVkaKxAjZQ5eLxj5OlZIiSPzfRc4OR73k2Pj6DC/3Og==}
peerDependencies:
webpack: ^4 || ^5
@@ -9975,7 +10306,7 @@ packages:
fast-glob: 3.3.2
magic-string: 0.30.8
unplugin: 1.10.1
- webpack: 5.90.3(esbuild@0.20.1)
+ webpack: 5.91.0(esbuild@0.20.2)
webpack-sources: 3.2.3
transitivePeerDependencies:
- rollup
@@ -10471,6 +10802,13 @@ packages:
'@webassemblyjs/helper-wasm-bytecode': 1.11.6
dev: true
+ /@webassemblyjs/ast@1.12.1:
+ resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==}
+ dependencies:
+ '@webassemblyjs/helper-numbers': 1.11.6
+ '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+ dev: true
+
/@webassemblyjs/floating-point-hex-parser@1.11.6:
resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==}
dev: true
@@ -10483,6 +10821,10 @@ packages:
resolution: {integrity: sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==}
dev: true
+ /@webassemblyjs/helper-buffer@1.12.1:
+ resolution: {integrity: sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==}
+ dev: true
+
/@webassemblyjs/helper-numbers@1.11.6:
resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==}
dependencies:
@@ -10504,6 +10846,15 @@ packages:
'@webassemblyjs/wasm-gen': 1.11.6
dev: true
+ /@webassemblyjs/helper-wasm-section@1.12.1:
+ resolution: {integrity: sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==}
+ dependencies:
+ '@webassemblyjs/ast': 1.12.1
+ '@webassemblyjs/helper-buffer': 1.12.1
+ '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+ '@webassemblyjs/wasm-gen': 1.12.1
+ dev: true
+
/@webassemblyjs/ieee754@1.11.6:
resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==}
dependencies:
@@ -10533,6 +10884,19 @@ packages:
'@webassemblyjs/wast-printer': 1.11.6
dev: true
+ /@webassemblyjs/wasm-edit@1.12.1:
+ resolution: {integrity: sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==}
+ dependencies:
+ '@webassemblyjs/ast': 1.12.1
+ '@webassemblyjs/helper-buffer': 1.12.1
+ '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+ '@webassemblyjs/helper-wasm-section': 1.12.1
+ '@webassemblyjs/wasm-gen': 1.12.1
+ '@webassemblyjs/wasm-opt': 1.12.1
+ '@webassemblyjs/wasm-parser': 1.12.1
+ '@webassemblyjs/wast-printer': 1.12.1
+ dev: true
+
/@webassemblyjs/wasm-gen@1.11.6:
resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==}
dependencies:
@@ -10543,6 +10907,16 @@ packages:
'@webassemblyjs/utf8': 1.11.6
dev: true
+ /@webassemblyjs/wasm-gen@1.12.1:
+ resolution: {integrity: sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==}
+ dependencies:
+ '@webassemblyjs/ast': 1.12.1
+ '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+ '@webassemblyjs/ieee754': 1.11.6
+ '@webassemblyjs/leb128': 1.11.6
+ '@webassemblyjs/utf8': 1.11.6
+ dev: true
+
/@webassemblyjs/wasm-opt@1.11.6:
resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==}
dependencies:
@@ -10552,6 +10926,15 @@ packages:
'@webassemblyjs/wasm-parser': 1.11.6
dev: true
+ /@webassemblyjs/wasm-opt@1.12.1:
+ resolution: {integrity: sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==}
+ dependencies:
+ '@webassemblyjs/ast': 1.12.1
+ '@webassemblyjs/helper-buffer': 1.12.1
+ '@webassemblyjs/wasm-gen': 1.12.1
+ '@webassemblyjs/wasm-parser': 1.12.1
+ dev: true
+
/@webassemblyjs/wasm-parser@1.11.6:
resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==}
dependencies:
@@ -10563,6 +10946,17 @@ packages:
'@webassemblyjs/utf8': 1.11.6
dev: true
+ /@webassemblyjs/wasm-parser@1.12.1:
+ resolution: {integrity: sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==}
+ dependencies:
+ '@webassemblyjs/ast': 1.12.1
+ '@webassemblyjs/helper-api-error': 1.11.6
+ '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+ '@webassemblyjs/ieee754': 1.11.6
+ '@webassemblyjs/leb128': 1.11.6
+ '@webassemblyjs/utf8': 1.11.6
+ dev: true
+
/@webassemblyjs/wast-printer@1.11.6:
resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==}
dependencies:
@@ -10570,29 +10964,36 @@ packages:
'@xtuc/long': 4.2.2
dev: true
- /@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.90.3):
+ /@webassemblyjs/wast-printer@1.12.1:
+ resolution: {integrity: sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==}
+ dependencies:
+ '@webassemblyjs/ast': 1.12.1
+ '@xtuc/long': 4.2.2
+ dev: true
+
+ /@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.91.0):
resolution: {integrity: sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==}
engines: {node: '>=14.15.0'}
peerDependencies:
webpack: 5.x.x
webpack-cli: 5.x.x
dependencies:
- webpack: 5.90.3(webpack-cli@5.1.4)
- webpack-cli: 5.1.4(webpack@5.90.3)
+ webpack: 5.91.0(webpack-cli@5.1.4)
+ webpack-cli: 5.1.4(webpack@5.91.0)
dev: true
- /@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.90.3):
+ /@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.91.0):
resolution: {integrity: sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==}
engines: {node: '>=14.15.0'}
peerDependencies:
webpack: 5.x.x
webpack-cli: 5.x.x
dependencies:
- webpack: 5.90.3(webpack-cli@5.1.4)
- webpack-cli: 5.1.4(webpack@5.90.3)
+ webpack: 5.91.0(webpack-cli@5.1.4)
+ webpack-cli: 5.1.4(webpack@5.91.0)
dev: true
- /@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack@5.90.3):
+ /@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack@5.91.0):
resolution: {integrity: sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==}
engines: {node: '>=14.15.0'}
peerDependencies:
@@ -10603,8 +11004,8 @@ packages:
webpack-dev-server:
optional: true
dependencies:
- webpack: 5.90.3(webpack-cli@5.1.4)
- webpack-cli: 5.1.4(webpack@5.90.3)
+ webpack: 5.91.0(webpack-cli@5.1.4)
+ webpack-cli: 5.1.4(webpack@5.91.0)
dev: true
/@windicss/config@1.9.1:
@@ -11040,7 +11441,7 @@ packages:
engines: {node: '>= 12.0.0'}
dependencies:
archiver-utils: 4.0.1
- async: 3.2.4
+ async: 3.2.5
buffer-crc32: 0.2.13
readable-stream: 3.6.2
readdir-glob: 1.1.3
@@ -11326,6 +11727,10 @@ packages:
/async@3.2.4:
resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==}
+ dev: false
+
+ /async@3.2.5:
+ resolution: {integrity: sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==}
/asynciterator.prototype@1.0.0:
resolution: {integrity: sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==}
@@ -11838,7 +12243,7 @@ packages:
dependencies:
cron-parser: 4.9.0
get-port: 5.1.1
- ioredis: 5.3.2
+ ioredis: 5.4.1
lodash: 4.17.21
msgpackr: 1.10.1
semver: 7.5.4
@@ -11853,7 +12258,7 @@ packages:
cron-parser: 4.9.0
get-port: 6.1.2
glob: 8.1.0
- ioredis: 5.3.2
+ ioredis: 5.4.1
lodash: 4.17.21
msgpackr: 1.9.7
semver: 7.5.4
@@ -12811,7 +13216,7 @@ packages:
resolution: {integrity: sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==}
dev: false
- /copy-webpack-plugin@11.0.0(webpack@5.90.3):
+ /copy-webpack-plugin@11.0.0(webpack@5.91.0):
resolution: {integrity: sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==}
engines: {node: '>= 14.15.0'}
peerDependencies:
@@ -12823,7 +13228,7 @@ packages:
normalize-path: 3.0.0
schema-utils: 4.2.0
serialize-javascript: 6.0.1
- webpack: 5.90.3(webpack-cli@5.1.4)
+ webpack: 5.91.0(webpack-cli@5.1.4)
dev: true
/core-js@3.32.1:
@@ -13811,8 +14216,8 @@ packages:
/ee-first@1.1.1:
resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
- /ejs@3.1.9:
- resolution: {integrity: sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==}
+ /ejs@3.1.10:
+ resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
engines: {node: '>=0.10.0'}
hasBin: true
dependencies:
@@ -13931,8 +14336,8 @@ packages:
tapable: 2.2.1
dev: true
- /enhanced-resolve@5.15.1:
- resolution: {integrity: sha512-3d3JRbwsCLJsYgvb6NuWEG44jjPSOMuS73L/6+7BZuoKm3W+qXnSoIYVHi8dG7Qcg4inAY4jbzkZ7MnskePeDg==}
+ /enhanced-resolve@5.16.0:
+ resolution: {integrity: sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==}
engines: {node: '>=10.13.0'}
dependencies:
graceful-fs: 4.2.11
@@ -14130,8 +14535,8 @@ packages:
resolution: {integrity: sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==}
dev: true
- /es-module-lexer@1.4.1:
- resolution: {integrity: sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==}
+ /es-module-lexer@1.5.2:
+ resolution: {integrity: sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==}
dev: true
/es-set-tostringtag@2.0.1:
@@ -14263,6 +14668,37 @@ packages:
'@esbuild/win32-x64': 0.20.1
dev: true
+ /esbuild@0.20.2:
+ resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==}
+ engines: {node: '>=12'}
+ hasBin: true
+ requiresBuild: true
+ optionalDependencies:
+ '@esbuild/aix-ppc64': 0.20.2
+ '@esbuild/android-arm': 0.20.2
+ '@esbuild/android-arm64': 0.20.2
+ '@esbuild/android-x64': 0.20.2
+ '@esbuild/darwin-arm64': 0.20.2
+ '@esbuild/darwin-x64': 0.20.2
+ '@esbuild/freebsd-arm64': 0.20.2
+ '@esbuild/freebsd-x64': 0.20.2
+ '@esbuild/linux-arm': 0.20.2
+ '@esbuild/linux-arm64': 0.20.2
+ '@esbuild/linux-ia32': 0.20.2
+ '@esbuild/linux-loong64': 0.20.2
+ '@esbuild/linux-mips64el': 0.20.2
+ '@esbuild/linux-ppc64': 0.20.2
+ '@esbuild/linux-riscv64': 0.20.2
+ '@esbuild/linux-s390x': 0.20.2
+ '@esbuild/linux-x64': 0.20.2
+ '@esbuild/netbsd-x64': 0.20.2
+ '@esbuild/openbsd-x64': 0.20.2
+ '@esbuild/sunos-x64': 0.20.2
+ '@esbuild/win32-arm64': 0.20.2
+ '@esbuild/win32-ia32': 0.20.2
+ '@esbuild/win32-x64': 0.20.2
+ dev: true
+
/escalade@3.1.1:
resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
engines: {node: '>=6'}
@@ -16189,7 +16625,7 @@ packages:
dependencies:
foreground-child: 3.1.1
jackspeak: 2.3.6
- minimatch: 9.0.3
+ minimatch: 9.0.4
minipass: 7.0.3
path-scurry: 1.10.1
dev: true
@@ -16200,7 +16636,7 @@ packages:
fs.realpath: 1.0.0
inflight: 1.0.6
inherits: 2.0.4
- minimatch: 3.1.2
+ minimatch: 3.0.5
once: 1.4.0
path-is-absolute: 1.0.1
dev: true
@@ -16222,7 +16658,7 @@ packages:
fs.realpath: 1.0.0
inflight: 1.0.6
inherits: 2.0.4
- minimatch: 5.1.6
+ minimatch: 5.0.1
once: 1.4.0
/glob@9.3.5:
@@ -16914,7 +17350,7 @@ packages:
resolution: {integrity: sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
dependencies:
- minimatch: 9.0.3
+ minimatch: 9.0.4
dev: true
/ignore@5.2.4:
@@ -17099,7 +17535,7 @@ packages:
engines: {node: '>=8'}
dev: false
- /ioredis-mock@8.9.0(@types/ioredis-mock@8.2.5)(ioredis@5.3.2):
+ /ioredis-mock@8.9.0(@types/ioredis-mock@8.2.5)(ioredis@5.4.1):
resolution: {integrity: sha512-yIglcCkI1lvhwJVoMsR51fotZVsPsSk07ecTCgRTRlicG0Vq3lke6aAaHklyjmRNRsdYAgswqC2A0bPtQK4LSw==}
engines: {node: '>=12.22'}
peerDependencies:
@@ -17111,12 +17547,12 @@ packages:
'@types/ioredis-mock': 8.2.5
fengari: 0.1.4
fengari-interop: 0.1.3(fengari@0.1.4)
- ioredis: 5.3.2
+ ioredis: 5.4.1
semver: 7.5.4
dev: false
- /ioredis@5.3.2:
- resolution: {integrity: sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==}
+ /ioredis@5.4.1:
+ resolution: {integrity: sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==}
engines: {node: '>=12.22.0'}
dependencies:
'@ioredis/commands': 1.2.0
@@ -17816,7 +18252,7 @@ packages:
engines: {node: '>=10'}
hasBin: true
dependencies:
- async: 3.2.4
+ async: 3.2.5
chalk: 4.1.2
filelist: 1.0.4
minimatch: 3.1.2
@@ -17932,7 +18368,7 @@ packages:
resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==}
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
dependencies:
- chalk: 4.1.2
+ chalk: 4.1.0
diff-sequences: 29.6.3
jest-get-type: 29.6.3
pretty-format: 29.7.0
@@ -19594,7 +20030,6 @@ packages:
engines: {node: '>=10'}
dependencies:
brace-expansion: 2.0.1
- dev: true
/minimatch@5.1.6:
resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
@@ -19623,6 +20058,13 @@ packages:
brace-expansion: 2.0.1
dev: true
+ /minimatch@9.0.4:
+ resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==}
+ engines: {node: '>=16 || 14 >=14.17'}
+ dependencies:
+ brace-expansion: 2.0.1
+ dev: true
+
/minimist-options@4.1.0:
resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
engines: {node: '>= 6'}
@@ -19971,7 +20413,7 @@ packages:
array-differ: 3.0.0
array-union: 2.1.0
arrify: 2.0.1
- minimatch: 3.1.2
+ minimatch: 3.0.5
dev: true
/mute-stream@0.0.8:
@@ -20136,7 +20578,7 @@ packages:
- reflect-metadata
dev: false
- /nestjs-throttler-storage-redis@0.4.4(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1):
+ /nestjs-throttler-storage-redis@0.4.4(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@nestjs/throttler@5.1.2)(ioredis@5.4.1)(reflect-metadata@0.2.1):
resolution: {integrity: sha512-QLYfsat/qutHQaTn3QAoa79WEHG4Uyk8rWRqNhVCVxzQ+qdzaNBUlBwxb8MYhfCmgoCA+eX3Paws8FZI/bYe7A==}
peerDependencies:
'@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0
@@ -20148,7 +20590,7 @@ packages:
'@nestjs/common': 10.3.7(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@nestjs/core': 10.3.7(@nestjs/common@10.3.7)(@nestjs/platform-express@10.3.7)(@nestjs/websockets@10.3.7)(reflect-metadata@0.2.1)(rxjs@7.8.1)
'@nestjs/throttler': 5.1.2(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(reflect-metadata@0.2.1)
- ioredis: 5.3.2
+ ioredis: 5.4.1
reflect-metadata: 0.2.1
dev: false
@@ -20849,7 +21291,7 @@ packages:
'@yarnpkg/parsers': 3.0.0-rc.46
'@zkochan/js-yaml': 0.0.6
axios: 1.6.8(debug@3.2.7)
- chalk: 4.1.2
+ chalk: 4.1.0
cli-cursor: 3.1.0
cli-spinners: 2.6.1
cliui: 7.0.4
@@ -21787,18 +22229,18 @@ packages:
mlly: 1.6.1
pathe: 1.1.2
- /playwright-core@1.38.0:
- resolution: {integrity: sha512-f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g==}
+ /playwright-core@1.43.1:
+ resolution: {integrity: sha512-EI36Mto2Vrx6VF7rm708qSnesVQKbxEWvPrfA1IPY6HgczBplDx7ENtx+K2n4kJ41sLLkuGfmb0ZLSSXlDhqPg==}
engines: {node: '>=16'}
hasBin: true
dev: true
- /playwright@1.38.0:
- resolution: {integrity: sha512-fJGw+HO0YY+fU/F1N57DMO+TmXHTrmr905J05zwAQE9xkuwP/QLDk63rVhmyxh03dYnEhnRbsdbH9B0UVVRB3A==}
+ /playwright@1.43.1:
+ resolution: {integrity: sha512-V7SoH0ai2kNt1Md9E3Gwas5B9m8KR2GVvwZnAI6Pg0m3sh7UvgiYhRrhsziCmqMJNouPckiOhk8T+9bSAK0VIA==}
engines: {node: '>=16'}
hasBin: true
dependencies:
- playwright-core: 1.38.0
+ playwright-core: 1.43.1
optionalDependencies:
fsevents: 2.3.2
dev: true
@@ -22132,6 +22574,15 @@ packages:
picocolors: 1.0.0
source-map-js: 1.0.2
+ /postcss@8.4.38:
+ resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
+ engines: {node: ^10 || ^12 || >=14}
+ dependencies:
+ nanoid: 3.3.7
+ picocolors: 1.0.0
+ source-map-js: 1.2.0
+ dev: true
+
/postgres-array@2.0.0:
resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
engines: {node: '>=4'}
@@ -23815,6 +24266,11 @@ packages:
resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
engines: {node: '>=0.10.0'}
+ /source-map-js@1.2.0:
+ resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
+ engines: {node: '>=0.10.0'}
+ dev: true
+
/source-map-support@0.5.13:
resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
dependencies:
@@ -23917,6 +24373,9 @@ packages:
/sqlite3@5.1.6:
resolution: {integrity: sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==}
requiresBuild: true
+ peerDependenciesMeta:
+ node-gyp:
+ optional: true
dependencies:
'@mapbox/node-pre-gyp': 1.0.11
node-addon-api: 4.3.0
@@ -23931,6 +24390,9 @@ packages:
/sqlite3@5.1.7:
resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==}
requiresBuild: true
+ peerDependenciesMeta:
+ node-gyp:
+ optional: true
dependencies:
bindings: 1.5.0
node-addon-api: 7.0.0
@@ -24566,7 +25028,7 @@ packages:
engines: {node: '>=4'}
dev: true
- /terser-webpack-plugin@5.3.10(esbuild@0.20.1)(webpack@5.90.3):
+ /terser-webpack-plugin@5.3.10(esbuild@0.20.2)(webpack@5.91.0):
resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
engines: {node: '>= 10.13.0'}
peerDependencies:
@@ -24583,12 +25045,12 @@ packages:
optional: true
dependencies:
'@jridgewell/trace-mapping': 0.3.25
- esbuild: 0.20.1
+ esbuild: 0.20.2
jest-worker: 27.5.1
schema-utils: 3.3.0
serialize-javascript: 6.0.1
terser: 5.27.0
- webpack: 5.90.3(esbuild@0.20.1)
+ webpack: 5.91.0(esbuild@0.20.2)
dev: true
/terser-webpack-plugin@5.3.10(webpack@5.90.1):
@@ -24615,7 +25077,7 @@ packages:
webpack: 5.90.1(webpack-cli@5.1.4)
dev: true
- /terser-webpack-plugin@5.3.10(webpack@5.90.3):
+ /terser-webpack-plugin@5.3.10(webpack@5.91.0):
resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
engines: {node: '>= 10.13.0'}
peerDependencies:
@@ -24636,7 +25098,7 @@ packages:
schema-utils: 3.3.0
serialize-javascript: 6.0.1
terser: 5.27.0
- webpack: 5.90.3(webpack-cli@5.1.4)
+ webpack: 5.91.0(webpack-cli@5.1.4)
dev: true
/terser@5.27.0:
@@ -24852,7 +25314,7 @@ packages:
engines: {node: '>=14.0.0'}
dev: false
- /ts-jest@29.1.2(@babel/core@7.24.3)(jest@29.7.0)(typescript@5.3.2):
+ /ts-jest@29.1.2(@babel/core@7.24.5)(jest@29.7.0)(typescript@5.3.2):
resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==}
engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0}
hasBin: true
@@ -24873,7 +25335,7 @@ packages:
esbuild:
optional: true
dependencies:
- '@babel/core': 7.24.3
+ '@babel/core': 7.24.5
bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0
jest: 29.7.0(@types/node@20.11.30)(ts-node@10.9.2)
@@ -24886,7 +25348,7 @@ packages:
yargs-parser: 21.1.1
dev: true
- /ts-loader@9.5.1(typescript@5.3.2)(webpack@5.90.3):
+ /ts-loader@9.5.1(typescript@5.3.2)(webpack@5.91.0):
resolution: {integrity: sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -24899,10 +25361,10 @@ packages:
semver: 7.5.4
source-map: 0.7.4
typescript: 5.3.2
- webpack: 5.90.3(webpack-cli@5.1.4)
+ webpack: 5.91.0(webpack-cli@5.1.4)
dev: true
- /ts-loader@9.5.1(webpack@5.90.3):
+ /ts-loader@9.5.1(webpack@5.91.0):
resolution: {integrity: sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -24914,7 +25376,7 @@ packages:
micromatch: 4.0.5
semver: 7.5.4
source-map: 0.7.4
- webpack: 5.90.3(esbuild@0.20.1)
+ webpack: 5.91.0(esbuild@0.20.2)
dev: true
/ts-morph@4.3.3:
@@ -25422,7 +25884,7 @@ packages:
resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
engines: {node: '>= 10.0.0'}
- /unocss@0.58.9(@unocss/webpack@0.58.9)(postcss@8.4.35)(vite@4.5.3):
+ /unocss@0.58.9(@unocss/webpack@0.58.9)(postcss@8.4.38)(vite@4.5.3):
resolution: {integrity: sha512-aqANXXP0RrtN4kSaTLn/7I6wh8o45LUdVgPzGu7Fan2DfH2+wpIs6frlnlHlOymnb+52dp6kXluQinddaUKW1A==}
engines: {node: '>=14'}
peerDependencies:
@@ -25438,7 +25900,7 @@ packages:
'@unocss/cli': 0.58.9
'@unocss/core': 0.58.9
'@unocss/extractor-arbitrary-variants': 0.58.9
- '@unocss/postcss': 0.58.9(postcss@8.4.35)
+ '@unocss/postcss': 0.58.9(postcss@8.4.38)
'@unocss/preset-attributify': 0.58.9
'@unocss/preset-icons': 0.58.9
'@unocss/preset-mini': 0.58.9
@@ -25454,7 +25916,7 @@ packages:
'@unocss/transformer-directives': 0.58.9
'@unocss/transformer-variant-group': 0.58.9
'@unocss/vite': 0.58.9(vite@4.5.3)
- '@unocss/webpack': 0.58.9(webpack@5.90.3)
+ '@unocss/webpack': 0.58.9(webpack@5.91.0)
vite: 4.5.3(sass@1.71.1)
transitivePeerDependencies:
- postcss
@@ -25636,7 +26098,7 @@ packages:
chokidar: 3.6.0
destr: 2.0.3
h3: 1.10.1
- ioredis: 5.3.2
+ ioredis: 5.4.1
listhen: 1.6.0
lru-cache: 10.0.3
mri: 1.2.0
@@ -26089,7 +26551,7 @@ packages:
optional: true
dependencies:
esbuild: 0.18.20
- postcss: 8.4.35
+ postcss: 8.4.38
rollup: 3.29.4
sass: 1.71.1
optionalDependencies:
@@ -26513,6 +26975,14 @@ packages:
graceful-fs: 4.2.11
dev: true
+ /watchpack@2.4.1:
+ resolution: {integrity: sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==}
+ engines: {node: '>=10.13.0'}
+ dependencies:
+ glob-to-regexp: 0.4.1
+ graceful-fs: 4.2.11
+ dev: true
+
/wcwidth@1.0.1:
resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
dependencies:
@@ -26542,7 +27012,7 @@ packages:
resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
engines: {node: '>=12'}
- /webpack-cli@5.1.4(webpack@5.90.3):
+ /webpack-cli@5.1.4(webpack@5.91.0):
resolution: {integrity: sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==}
engines: {node: '>=14.15.0'}
hasBin: true
@@ -26560,9 +27030,9 @@ packages:
optional: true
dependencies:
'@discoveryjs/json-ext': 0.5.7
- '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.90.3)
- '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.90.3)
- '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack@5.90.3)
+ '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.91.0)
+ '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.91.0)
+ '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack@5.91.0)
colorette: 2.0.20
commander: 10.0.1
cross-spawn: 7.0.3
@@ -26571,7 +27041,7 @@ packages:
import-local: 3.1.0
interpret: 3.1.1
rechoir: 0.8.0
- webpack: 5.90.3(webpack-cli@5.1.4)
+ webpack: 5.91.0(webpack-cli@5.1.4)
webpack-merge: 5.9.0
dev: true
@@ -26632,7 +27102,7 @@ packages:
tapable: 2.2.1
terser-webpack-plugin: 5.3.10(webpack@5.90.1)
watchpack: 2.4.0
- webpack-cli: 5.1.4(webpack@5.90.3)
+ webpack-cli: 5.1.4(webpack@5.91.0)
webpack-sources: 3.2.3
transitivePeerDependencies:
- '@swc/core'
@@ -26640,8 +27110,8 @@ packages:
- uglify-js
dev: true
- /webpack@5.90.3(esbuild@0.20.1):
- resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
+ /webpack@5.91.0(esbuild@0.20.2):
+ resolution: {integrity: sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==}
engines: {node: '>=10.13.0'}
hasBin: true
peerDependencies:
@@ -26652,15 +27122,15 @@ packages:
dependencies:
'@types/eslint-scope': 3.7.7
'@types/estree': 1.0.5
- '@webassemblyjs/ast': 1.11.6
- '@webassemblyjs/wasm-edit': 1.11.6
- '@webassemblyjs/wasm-parser': 1.11.6
+ '@webassemblyjs/ast': 1.12.1
+ '@webassemblyjs/wasm-edit': 1.12.1
+ '@webassemblyjs/wasm-parser': 1.12.1
acorn: 8.11.3
acorn-import-assertions: 1.9.0(acorn@8.11.3)
browserslist: 4.23.0
chrome-trace-event: 1.0.3
- enhanced-resolve: 5.15.1
- es-module-lexer: 1.4.1
+ enhanced-resolve: 5.16.0
+ es-module-lexer: 1.5.2
eslint-scope: 5.1.1
events: 3.3.0
glob-to-regexp: 0.4.1
@@ -26671,8 +27141,8 @@ packages:
neo-async: 2.6.2
schema-utils: 3.3.0
tapable: 2.2.1
- terser-webpack-plugin: 5.3.10(esbuild@0.20.1)(webpack@5.90.3)
- watchpack: 2.4.0
+ terser-webpack-plugin: 5.3.10(esbuild@0.20.2)(webpack@5.91.0)
+ watchpack: 2.4.1
webpack-sources: 3.2.3
transitivePeerDependencies:
- '@swc/core'
@@ -26680,8 +27150,8 @@ packages:
- uglify-js
dev: true
- /webpack@5.90.3(webpack-cli@5.1.4):
- resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
+ /webpack@5.91.0(webpack-cli@5.1.4):
+ resolution: {integrity: sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==}
engines: {node: '>=10.13.0'}
hasBin: true
peerDependencies:
@@ -26692,15 +27162,15 @@ packages:
dependencies:
'@types/eslint-scope': 3.7.7
'@types/estree': 1.0.5
- '@webassemblyjs/ast': 1.11.6
- '@webassemblyjs/wasm-edit': 1.11.6
- '@webassemblyjs/wasm-parser': 1.11.6
+ '@webassemblyjs/ast': 1.12.1
+ '@webassemblyjs/wasm-edit': 1.12.1
+ '@webassemblyjs/wasm-parser': 1.12.1
acorn: 8.11.3
acorn-import-assertions: 1.9.0(acorn@8.11.3)
browserslist: 4.23.0
chrome-trace-event: 1.0.3
- enhanced-resolve: 5.15.1
- es-module-lexer: 1.4.1
+ enhanced-resolve: 5.16.0
+ es-module-lexer: 1.5.2
eslint-scope: 5.1.1
events: 3.3.0
glob-to-regexp: 0.4.1
@@ -26711,9 +27181,9 @@ packages:
neo-async: 2.6.2
schema-utils: 3.3.0
tapable: 2.2.1
- terser-webpack-plugin: 5.3.10(webpack@5.90.3)
- watchpack: 2.4.0
- webpack-cli: 5.1.4(webpack@5.90.3)
+ terser-webpack-plugin: 5.3.10(webpack@5.91.0)
+ watchpack: 2.4.1
+ webpack-cli: 5.1.4(webpack@5.91.0)
webpack-sources: 3.2.3
transitivePeerDependencies:
- '@swc/core'
@@ -26946,7 +27416,7 @@ packages:
dependencies:
'@colors/colors': 1.5.0
'@dabh/diagnostics': 2.0.3
- async: 3.2.4
+ async: 3.2.5
is-stream: 2.0.1
logform: 2.5.1
one-time: 1.0.0
diff --git a/tests/playwright/package.json b/tests/playwright/package.json
index 0ba77b7f6c..8795142117 100644
--- a/tests/playwright/package.json
+++ b/tests/playwright/package.json
@@ -50,7 +50,7 @@
"xlsx": "^0.18.5"
},
"devDependencies": {
- "@playwright/test": "1.38.0",
+ "@playwright/test": "1.43.1",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"@typescript-eslint/parser": "^6.1.0",
"dotenv": "^16.0.3",
diff --git a/tests/playwright/pages/Account/Authentication.ts b/tests/playwright/pages/Account/Authentication.ts
index 498ffa1775..45b634e5b8 100644
--- a/tests/playwright/pages/Account/Authentication.ts
+++ b/tests/playwright/pages/Account/Authentication.ts
@@ -15,7 +15,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => this.rootPage.goto('/#/account/authentication', { waitUntil: 'networkidle' }),
httpMethodsToMatch: ['GET'],
- requestUrlPathToMatch: '/api/v2/sso-client',
+ requestUrlPathToMatch: /\/sso-client/,
});
}
@@ -42,7 +42,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => this.rootPage.locator(`[data-test-id="nc-${provider}-delete"]`).click(),
httpMethodsToMatch: ['DELETE'],
- requestUrlPathToMatch: `/api/v2/sso-client/`,
+ requestUrlPathToMatch: /\/sso-client/,
});
}
@@ -50,7 +50,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => this.get().locator(`.nc-${provider}-${title}-enable .nc-switch`).click(),
httpMethodsToMatch: ['PATCH'],
- requestUrlPathToMatch: `/api/v2/sso-client/`,
+ requestUrlPathToMatch: /\/\w+\/sso-client/,
});
}
@@ -97,7 +97,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => samlModal.locator('[data-test-id="nc-saml-submit"]').click(),
httpMethodsToMatch: ['GET'],
- requestUrlPathToMatch: '/api/v2/sso-client',
+ requestUrlPathToMatch: /\/sso-client/,
});
}
@@ -158,7 +158,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => oidcModal.locator('[data-test-id="nc-oidc-save-btn"]').click(),
httpMethodsToMatch: ['GET'],
- requestUrlPathToMatch: '/api/v2/sso-client',
+ requestUrlPathToMatch: /\/sso-client/,
});
}
@@ -177,7 +177,7 @@ export class AccountAuthenticationPage extends BasePage {
await this.waitForResponse({
uiAction: () => googleModal.locator('[data-test-id="nc-google-save-btn"]').click(),
httpMethodsToMatch: ['GET'],
- requestUrlPathToMatch: '/api/v2/sso-client',
+ requestUrlPathToMatch: /\/sso-client/,
});
}
diff --git a/tests/playwright/pages/Base.ts b/tests/playwright/pages/Base.ts
index a93a00cfa8..7773015669 100644
--- a/tests/playwright/pages/Base.ts
+++ b/tests/playwright/pages/Base.ts
@@ -31,7 +31,7 @@ export default abstract class BasePage {
responseStatusCodeToMatch = 200,
}: {
uiAction: () => Promise;
- requestUrlPathToMatch: string;
+ requestUrlPathToMatch: string | RegExp;
httpMethodsToMatch?: string[];
responseJsonMatcher?: ResponseSelector;
timeout?: number;
@@ -40,7 +40,9 @@ export default abstract class BasePage {
const [res] = await Promise.all([
this.rootPage.waitForResponse(
res =>
- res.url().includes(requestUrlPathToMatch) &&
+ (requestUrlPathToMatch instanceof RegExp
+ ? requestUrlPathToMatch.test(res.url())
+ : res.url().includes(requestUrlPathToMatch)) &&
res.status() === responseStatusCodeToMatch &&
httpMethodsToMatch.includes(res.request().method()),
timeout ? { timeout } : undefined
diff --git a/tests/playwright/pages/Dashboard/BulkUpdate/index.ts b/tests/playwright/pages/Dashboard/BulkUpdate/index.ts
index f48865a894..4eb7b3e48e 100644
--- a/tests/playwright/pages/Dashboard/BulkUpdate/index.ts
+++ b/tests/playwright/pages/Dashboard/BulkUpdate/index.ts
@@ -183,7 +183,7 @@ export class BulkUpdatePage extends BasePage {
uiAction: saveRowAction,
requestUrlPathToMatch: 'api/v1/db/data/noco/',
httpMethodsToMatch: ['GET'],
- responseJsonMatcher: json => json['pageInfo'],
+ // responseJsonMatcher: json => json['pageInfo'],
});
}
diff --git a/tests/playwright/pages/Dashboard/Calendar/CalendarSideMenu.ts b/tests/playwright/pages/Dashboard/Calendar/CalendarSideMenu.ts
index e11d08bd4e..c3202e5fae 100644
--- a/tests/playwright/pages/Dashboard/Calendar/CalendarSideMenu.ts
+++ b/tests/playwright/pages/Dashboard/Calendar/CalendarSideMenu.ts
@@ -30,10 +30,16 @@ export class CalendarSideMenuPage extends BasePage {
}
async verifySideBarRecords({ records }: { records: string[] }) {
- const sideBar = this.get().getByTestId('nc-calendar-side-menu-list');
-
- const sideBarRecords = await sideBar.getByTestId('nc-sidebar-record-card');
-
+ let attempts = 0;
+ let sideBarRecords: Locator;
+ while (attempts++ < 5) {
+ const sideBar = this.get().getByTestId('nc-calendar-side-menu-list');
+ sideBarRecords = sideBar.getByTestId('nc-sidebar-record-card');
+
+ if ((await sideBarRecords.count()) === records.length) break;
+ // wait for records to load
+ await this.rootPage.waitForTimeout(200 * attempts);
+ }
await expect(sideBarRecords).toHaveCount(records.length);
for (let i = 0; i < records.length; i++) {
diff --git a/tests/playwright/pages/Dashboard/Calendar/CalendarWeekDateTime.ts b/tests/playwright/pages/Dashboard/Calendar/CalendarWeekDateTime.ts
index ee146186e7..f8ec7cf31d 100644
--- a/tests/playwright/pages/Dashboard/Calendar/CalendarWeekDateTime.ts
+++ b/tests/playwright/pages/Dashboard/Calendar/CalendarWeekDateTime.ts
@@ -48,12 +48,18 @@ export class CalendarWeekDateTimePage extends BasePage {
const day = this.get().getByTestId('nc-calendar-week-day').nth(dayIndex);
const hour = day.getByTestId('nc-calendar-week-hour').nth(hourIndex);
- await hour.click({
- force: true,
- position: {
- x: -1,
- y: -1,
- },
+
+ await this.waitForResponse({
+ uiAction: () =>
+ hour.click({
+ force: true,
+ position: {
+ x: -1,
+ y: -1,
+ },
+ }),
+ requestUrlPathToMatch: '/api/v1/db/data/noco',
+ httpMethodsToMatch: ['GET'],
});
}
}
diff --git a/tests/playwright/pages/Dashboard/Details/FieldsPage.ts b/tests/playwright/pages/Dashboard/Details/FieldsPage.ts
index 7bb3163f33..0f3946afcb 100644
--- a/tests/playwright/pages/Dashboard/Details/FieldsPage.ts
+++ b/tests/playwright/pages/Dashboard/Details/FieldsPage.ts
@@ -186,7 +186,7 @@ export class FieldsPage extends BasePage {
case 'Links':
await this.addOrEditColumn
.locator('.nc-ltar-relation-type >> .ant-radio')
- .nth(relationType === 'Has Many' ? 0 : 1)
+ .nth(relationType === 'Has Many' ? 1 : 2)
.click();
await this.addOrEditColumn.locator('.ant-select-single').nth(1).click();
await this.rootPage.locator(`.nc-ltar-child-table >> input[type="search"]`).fill(childTable);
diff --git a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
index 1a76a78d59..5b3758b5fa 100644
--- a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
+++ b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
@@ -84,7 +84,7 @@ export class ExpandedFormPage extends BasePage {
case 'belongsTo':
await field.locator('.nc-virtual-cell').hover();
await field.locator('.nc-action-icon').click();
- await this.dashboard.linkRecord.select(value);
+ await this.dashboard.linkRecord.select(value, false);
break;
case 'hasMany':
case 'manyToMany':
@@ -127,9 +127,12 @@ export class ExpandedFormPage extends BasePage {
await this.verifyToast({ message: `updated successfully.` });
await this.rootPage.locator('[data-testid="grid-load-spinner"]').waitFor({ state: 'hidden' });
+
// removing focus from toast
+ await this.rootPage.waitForTimeout(1000);
await this.rootPage.locator('.nc-modal').click();
- await this.get().press('Escape');
+ await this.rootPage.waitForTimeout(1000);
+ await this.get().locator('.nc-expanded-form-header').locator('.nc-expand-form-close-btn').click();
await this.get().waitFor({ state: 'hidden' });
}
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/LTAR/ChildList.ts b/tests/playwright/pages/Dashboard/Grid/Column/LTAR/ChildList.ts
index 012de5a532..7de4f16eb7 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/LTAR/ChildList.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/LTAR/ChildList.ts
@@ -22,7 +22,7 @@ export class ChildList extends BasePage {
// child list body validation (card count, card title)
const cardCount = cardTitle.length;
- await this.get().locator('.ant-modal-content').waitFor();
+ await this.get().locator('.nc-dropdown-link-record-header').waitFor();
{
let isOk = false;
let count = 0;
@@ -54,7 +54,8 @@ export class ChildList extends BasePage {
}
async close() {
- await this.get().locator(`.nc-close-btn`).click();
+ // await this.get().locator(`.nc-close-btn`).click();
+ await this.rootPage.keyboard.press('Escape');
await this.get().waitFor({ state: 'hidden' });
}
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/LTAR/LinkRecord.ts b/tests/playwright/pages/Dashboard/Grid/Column/LTAR/LinkRecord.ts
index 352b786063..4c31ae4eab 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/LTAR/LinkRecord.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/LTAR/LinkRecord.ts
@@ -33,14 +33,22 @@ export class LinkRecord extends BasePage {
}
}
- async select(cardTitle: string) {
+ async select(cardTitle: string, close = true) {
await this.rootPage.waitForTimeout(100);
- await this.get().locator(`.ant-card:has-text("${cardTitle}"):visible`).click();
- await this.close();
+ await this.get()
+ .locator(`.ant-card:has-text("${cardTitle}"):visible`)
+ .locator('button.nc-list-item-link-unlink-btn')
+ .click();
+
+ // explicitly close dropdown (auto closes for belongs to)
+ if (close) {
+ await this.close();
+ }
}
async close() {
- await this.get().locator('.nc-close-btn').last().click();
+ await this.get().getByTestId('nc-link-count-info').click();
+ await this.rootPage.keyboard.press('Escape');
await this.get().last().waitFor({ state: 'hidden' });
}
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 98d28ebc27..e49b360a80 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -173,7 +173,7 @@ export class ColumnPageObject extends BasePage {
case 'Links':
await this.get()
.locator('.nc-ltar-relation-type >> .ant-radio')
- .nth(relationType === 'Has Many' ? 0 : 1)
+ .nth(relationType === 'Has Many' ? 1 : 2)
.click();
await this.get().locator('.ant-select-single').nth(1).click();
await this.rootPage.locator(`.nc-ltar-child-table >> input[type="search"]`).fill(childTable);
@@ -296,7 +296,8 @@ export class ColumnPageObject extends BasePage {
// when clicked on the dropdown cell header
await this.getColumnHeader(title).locator('.nc-ui-dt-dropdown').scrollIntoViewIfNeeded();
await this.getColumnHeader(title).locator('.nc-ui-dt-dropdown').click();
- await this.rootPage.locator('li[role="menuitem"]:has-text("Edit")').last().click();
+ await expect(await this.rootPage.locator('li[role="menuitem"]:has-text("Edit"):visible').last()).toBeVisible();
+ await this.rootPage.locator('li[role="menuitem"]:has-text("Edit"):visible').last().click();
await this.get().waitFor({ state: 'visible' });
@@ -320,14 +321,26 @@ export class ColumnPageObject extends BasePage {
// Date Format
await this.get().locator('.nc-date-select').click();
await this.rootPage.locator('.ant-select-item').locator(`text="${dateFormat}"`).click();
+
+ // allow UI to update
+ await this.rootPage.waitForTimeout(500);
+
// Time Format
await this.get().locator('.nc-time-select').click();
await this.rootPage.locator('.ant-select-item').locator(`text="${timeFormat}"`).click();
+
+ // allow UI to update
+ await this.rootPage.waitForTimeout(500);
+
break;
case 'Date':
await this.get().locator('.nc-date-select').click();
- await this.rootPage.locator('.nc-date-select').pressSequentially(dateFormat);
+ await this.rootPage.locator('.nc-date-select').pressSequentially(dateFormat, { delay: 100 });
await this.rootPage.locator('.ant-select-item').locator(`text="${dateFormat}"`).click();
+
+ // allow UI to update
+ await this.rootPage.waitForTimeout(500);
+
break;
default:
break;
diff --git a/tests/playwright/pages/Dashboard/Grid/index.ts b/tests/playwright/pages/Dashboard/Grid/index.ts
index c1998fdf3c..1e6758b25a 100644
--- a/tests/playwright/pages/Dashboard/Grid/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/index.ts
@@ -79,6 +79,43 @@ export class GridPage extends BasePage {
return this.get().locator(`tr[data-testid="grid-row-${index}"]`);
}
+ async renderColumn(columnHeader: string) {
+ // we have virtual grid, so we need to make sure the column is rendered
+ const headerRow = this.get().locator('.nc-grid-header').first();
+ let column = headerRow.locator(`[data-title="${columnHeader}"]`);
+ let lastScrolledColumn: Locator = null;
+ let direction = 'right';
+
+ while (headerRow) {
+ try {
+ await column.elementHandle({ timeout: 1000 });
+ break;
+ } catch {}
+
+ const lastColumn =
+ direction === 'right'
+ ? headerRow.locator('th.nc-grid-column-header').last()
+ : headerRow.locator('th.nc-grid-column-header').nth(1);
+
+ if (lastScrolledColumn) {
+ if ((await lastScrolledColumn.innerText()) === (await lastColumn.innerText())) {
+ if (direction === 'right') {
+ direction = 'left';
+ lastScrolledColumn = null;
+ } else {
+ throw new Error(`Column with header "${columnHeader}" not found`);
+ }
+ }
+ }
+
+ await lastColumn.scrollIntoViewIfNeeded();
+
+ lastScrolledColumn = lastColumn;
+
+ column = headerRow.locator(`[data-title="${columnHeader}"]`);
+ }
+ }
+
async rowCount() {
return await this.get().locator('.nc-grid-row').count();
}
@@ -89,7 +126,8 @@ export class GridPage extends BasePage {
private async _fillRow({ index, columnHeader, value }: { index: number; columnHeader: string; value: string }) {
const cell = this.cell.get({ index, columnHeader });
- await cell.waitFor({ state: 'visible' });
+ await expect(cell).toBeVisible();
+ await this.rootPage.waitForTimeout(500);
await this.cell.dblclick({
index,
columnHeader,
@@ -132,7 +170,9 @@ export class GridPage extends BasePage {
// fallback
await this.rootPage.waitForTimeout(400);
- await expect(this.get().locator('.nc-grid-row')).toHaveCount(rowCount);
+ await expect(this.get().locator(`[data-testid="grid-row-${rowCount - 1}"]`)).toHaveCount(1);
+
+ await this.rootPage.waitForLoadState('networkidle');
await this._fillRow({ index, columnHeader, value: rowValue });
@@ -441,6 +481,14 @@ export class GridPage extends BasePage {
return this.get().locator('.cell.active').count();
}
+ async getActiveCell() {
+ return this.get().locator('.cell.active');
+ }
+
+ async verifySelectedCellCount({ count }: { count: number }) {
+ await expect(this.get().locator('.cell.active')).toHaveCount(count);
+ }
+
async copyWithKeyboard() {
// retry to avoid flakiness, until text is copied to clipboard
//
diff --git a/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts b/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
index 1e0ae1f59b..7a0b29a203 100644
--- a/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
+++ b/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
@@ -19,7 +19,7 @@ export class AccessSettingsPage extends BasePage {
for (let i = 0; i < userCount; i++) {
const user = this.get().locator('.user-row').nth(i);
- const userEmail = (await user.locator('.users-email-grid').innerText()).split('\n')[1];
+ const userEmail = (await user.locator('.users-email-grid').innerText()).split('\n').pop();
if (userEmail === email) {
const roleDropdown = user.locator('.nc-roles-selector');
diff --git a/tests/playwright/pages/Dashboard/TreeView.ts b/tests/playwright/pages/Dashboard/TreeView.ts
index 4f87867e5e..cc226a0537 100644
--- a/tests/playwright/pages/Dashboard/TreeView.ts
+++ b/tests/playwright/pages/Dashboard/TreeView.ts
@@ -111,26 +111,24 @@ export class TreeViewPage extends BasePage {
}
await this.get().getByTestId(`nc-tbl-title-${title}`).waitFor({ state: 'visible' });
-
if (networkResponse === true) {
await this.waitForResponse({
- uiAction: () =>
- this.get()
- .getByTestId(`nc-tbl-title-${title}`)
- .click({
- position: {
- x: 10,
- y: 10,
- },
- }),
+ uiAction: () => this.get().getByTestId(`nc-tbl-title-${title}`).closest('.nc-base-tree-tbl').click(),
httpMethodsToMatch: ['GET'],
requestUrlPathToMatch: `/api/v1/db/data/noco`,
responseJsonMatcher: json => json.pageInfo,
});
await this.dashboard.waitForTabRender({ title, mode });
} else {
- await this.get().getByTestId(`nc-tbl-title-${title}`).click();
+ await this.get().locator(`[data-testid="nc-tbl-title-${title}"]`).click({
+ // x:10, y:10
+ });
+
+ // todo: remove this after fixing the issue
await this.rootPage.waitForTimeout(1000);
+ await this.get().locator(`[data-testid="nc-tbl-title-${title}"]`).click({
+ // x:10, y:10
+ });
}
}
diff --git a/tests/playwright/pages/Dashboard/WebhookForm/index.ts b/tests/playwright/pages/Dashboard/WebhookForm/index.ts
index d94a4b524d..4d4a530347 100644
--- a/tests/playwright/pages/Dashboard/WebhookForm/index.ts
+++ b/tests/playwright/pages/Dashboard/WebhookForm/index.ts
@@ -70,7 +70,7 @@ export class WebhookFormPage extends BasePage {
await this.get().locator(`.nc-check-box-hook-condition`).click();
const modal = this.get().locator(`.menu-filter-dropdown`).last();
- await modal.locator(`button:has-text("Add Filter")`).click();
+ await modal.locator(`button:has-text("Add Filter")`).first().click();
await modal.locator('.nc-filter-field-select').waitFor({ state: 'visible', timeout: 4000 });
await modal.locator('.nc-filter-field-select').click();
diff --git a/tests/playwright/pages/Dashboard/common/Cell/UserOptionCell.ts b/tests/playwright/pages/Dashboard/common/Cell/UserOptionCell.ts
index 885e67a971..22c48f9b03 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/UserOptionCell.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/UserOptionCell.ts
@@ -100,7 +100,7 @@ export class UserOptionCellPageObject extends BasePage {
}
const locator = this.cell.get({ index, columnHeader }).locator('.ant-tag');
- await locator.waitFor({ state: 'visible' });
+ await expect(locator).toBeVisible();
return expect(locator).toContainText(option);
}
diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index c1fdff7c1a..7244a28c65 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -347,7 +347,9 @@ export class CellPageObject extends BasePage {
await expect.poll(() => this.rootPage.locator('.ant-card:visible').count()).toBe(count);
// close child list
- await this.rootPage.locator('.nc-modal-child-list').locator('.nc-close-btn').last().click();
+ // await this.rootPage.locator('.nc-modal-child-list').locator('.nc-close-btn').last().click();
+ await this.rootPage.locator('.nc-modal-child-list').getByTestId('nc-link-count-info').click();
+ await this.rootPage.keyboard.press('Escape');
}
}
}
@@ -373,12 +375,17 @@ export class CellPageObject extends BasePage {
await this.waitForResponse({
uiAction: () =>
- this.rootPage.locator(`[data-testid="nc-child-list-item"]`).last().click({ force: true, timeout: 3000 }),
+ this.rootPage
+ .locator(`[data-testid="nc-child-list-item"]`)
+ .last()
+ .locator('button.nc-list-item-link-unlink-btn')
+ .click({ force: true, timeout: 3000 }),
requestUrlPathToMatch: '/api/v1/db/data/noco',
httpMethodsToMatch: ['GET'],
});
await this.rootPage.keyboard.press('Escape');
+ await this.rootPage.keyboard.press('Escape');
}
}
@@ -410,6 +417,7 @@ export class CellPageObject extends BasePage {
}
async copyCellToClipboard({ index, columnHeader }: CellProps, ...clickOptions: Parameters) {
+ if (this.parent instanceof GridPage) await this.parent.renderColumn(columnHeader);
await this.get({ index, columnHeader }).scrollIntoViewIfNeeded();
await this.get({ index, columnHeader }).click(...clickOptions);
await (await this.get({ index, columnHeader }).elementHandle()).waitForElementState('stable');
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Fields.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Fields.ts
index d038961be4..06356e965f 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Fields.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Fields.ts
@@ -31,22 +31,24 @@ export class ToolbarFieldsPage extends BasePage {
// hack
await this.rootPage.waitForTimeout(100);
+ // toggle only if input checked value is not equal to given checked value
+ await this.get().locator(`[data-testid="nc-fields-menu-${title}"]`).locator('.nc-switch').scrollIntoViewIfNeeded();
+ const isChecked = await this.get()
+ .locator(`[data-testid="nc-fields-menu-${title}"]`)
+ .locator('.nc-switch')
+ .isChecked();
if (checked !== undefined) {
- // toggle only if input checked value is not equal to given checked value
- await this.get()
- .locator(`[data-testid="nc-fields-menu-${title}"]`)
- .locator('.nc-switch')
- .scrollIntoViewIfNeeded();
- const isChecked = await this.get()
- .locator(`[data-testid="nc-fields-menu-${title}"]`)
- .locator('.nc-switch')
- .isChecked();
if ((checked && isChecked) || (!checked && !isChecked)) {
await this.toolbar.clickFields();
return;
}
}
+ if (isChecked === true) {
+ // disable response validation for hide field
+ validateResponse = false;
+ }
+
const toggleColumn = () =>
this.get().locator(`[data-testid="nc-fields-menu-${title}"]`).locator('.nc-switch').click();
@@ -75,11 +77,13 @@ export class ToolbarFieldsPage extends BasePage {
}
async click({ title, isLocallySaved }: { title: string; isLocallySaved?: boolean }) {
- await this.waitForResponse({
- uiAction: () => this.get().locator(`[data-testid="nc-fields-menu-${title}"]`).locator('.nc-switch').click(),
- requestUrlPathToMatch: isLocallySaved ? '/api/v1/db/public/' : '/api/v1/db/data/noco/',
- httpMethodsToMatch: ['GET'],
- });
+ // hide field doesn't trigger an un-solicited update from backend
+ // await this.waitForResponse({
+ // uiAction: () => this.get().locator(`[data-testid="nc-fields-menu-${title}"]`).locator('.nc-switch').click(),
+ // requestUrlPathToMatch: isLocallySaved ? '/api/v1/db/public/' : '/api/v1/db/data/noco/',
+ // httpMethodsToMatch: ['GET'],
+ // });
+ await this.get().locator(`[data-testid="nc-fields-menu-${title}"]`).locator('.nc-switch').click();
await this.toolbar.parent.waitLoading();
}
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
index 8670da0a08..a39431fa92 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
@@ -131,7 +131,7 @@ export class ToolbarFilterPage extends BasePage {
skipWaitingResponse = true;
const selectedField = await getTextExcludeIconText(
- this.rootPage.locator('.nc-filter-field-select .ant-select-selection-item')
+ this.rootPage.locator('.nc-filter-field-select .ant-select-selection-item').first()
);
if (selectedField !== title) {
await this.rootPage.locator('.nc-filter-field-select').last().click();
@@ -332,7 +332,7 @@ export class ToolbarFilterPage extends BasePage {
.locator(`.nc-dropdown-user-select-cell`)
.getByTestId('select-option-User-filter')
.getByText(v[i])
- .click();
+ .click({ force: true });
}
}
break;
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts
index e6e7f73e55..dc67552c54 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts
@@ -49,7 +49,12 @@ export class ToolbarGroupByPage extends BasePage {
.locator(`div[label="${title}"]`)
.last()
.click();
- await this.rootPage.locator('.nc-sort-dir-select').nth(index).click();
+
+ //kludge: wait for rendering to stabilize
+ await this.rootPage.waitForTimeout(1000);
+
+ await this.rootPage.locator('.nc-sort-dir-select').nth(index).waitFor({ state: 'visible' });
+ await this.rootPage.locator('.nc-sort-dir-select').nth(index).click({ force: true });
await this.rootPage
.locator('.nc-dropdown-sort-dir')
.last()
@@ -138,7 +143,12 @@ export class ToolbarGroupByPage extends BasePage {
async remove({ index }: { index: number }) {
// open group-by menu
await this.toolbar.clickGroupBy();
- await this.rootPage.locator('.nc-group-by-item-remove-btn').nth(index).click();
+
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator('.nc-group-by-item-remove-btn').nth(index).click(),
+ requestUrlPathToMatch: '/api/v1/db/data/noco',
+ httpMethodsToMatch: ['GET'],
+ });
// close group-by menu
await this.toolbar.clickGroupBy();
diff --git a/tests/playwright/pages/Dashboard/common/Topbar/index.ts b/tests/playwright/pages/Dashboard/common/Topbar/index.ts
index d02fd3bddb..6d24c4ad6d 100644
--- a/tests/playwright/pages/Dashboard/common/Topbar/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Topbar/index.ts
@@ -82,5 +82,6 @@ export class TopbarPage extends BasePage {
async clickRefresh() {
await this.get().locator(`.nc-icon-reload`).waitFor({ state: 'visible' });
await this.get().locator(`.nc-icon-reload`).click();
+ await this.rootPage.waitForLoadState('networkidle');
}
}
diff --git a/tests/playwright/pages/OrgAdmin/Bases.ts b/tests/playwright/pages/OrgAdmin/Bases.ts
new file mode 100644
index 0000000000..fbd4935629
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Bases.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Bases extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-admin-bases"]');
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Dashboard.ts b/tests/playwright/pages/OrgAdmin/Dashboard.ts
new file mode 100644
index 0000000000..aab3ba593b
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Dashboard.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Dashboard extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-admin-dashboard"]');
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Domain.ts b/tests/playwright/pages/OrgAdmin/Domain.ts
new file mode 100644
index 0000000000..eca01b0f51
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Domain.ts
@@ -0,0 +1,51 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Domain extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-org-domain"]');
+ }
+
+ async addDomain(domainName: string) {
+ await this.get().locator('[data-test-id="nc-org-domain-add"]').click();
+ await this.rootPage.locator('[data-test-id="nc-org-domain-name"]').fill(domainName);
+
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator('[data-test-id="nc-org-domain-submit"]').click(),
+ httpMethodsToMatch: ['PATCH', 'POST'],
+ requestUrlPathToMatch: /api\/v2\/domains\/\w+/,
+ });
+ }
+
+ async openOptionMenu(domainName: string) {
+ await this.rootPage
+ .locator(`[data-test-id="nc-domain-${domainName}"]`)
+ .locator('[data-test-id="nc-domain-more-option"]')
+ .click();
+ }
+
+ async verifyDomain(domainName: string) {
+ await this.openOptionMenu(domainName);
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator('[data-test-id="nc-domain-verify"]').click(),
+ httpMethodsToMatch: ['POST'],
+ requestUrlPathToMatch: `/api/v2/org-domain/${domainName}`,
+ });
+ }
+
+ async deleteDomain(domainName: string) {
+ await this.openOptionMenu(domainName);
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator('[data-test-id="nc-domain-delete"]').click(),
+ httpMethodsToMatch: ['DELETE'],
+ requestUrlPathToMatch: `/api/v2/org-domain/${domainName}`,
+ });
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Members.ts b/tests/playwright/pages/OrgAdmin/Members.ts
new file mode 100644
index 0000000000..ff922d782f
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Members.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Members extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-admin-members"]');
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/OpenIDLoginPage.ts b/tests/playwright/pages/OrgAdmin/OpenIDLoginPage.ts
new file mode 100644
index 0000000000..59e19bff2d
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/OpenIDLoginPage.ts
@@ -0,0 +1,46 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+import { CloudSSOLoginPage } from './SSOLoginPage';
+
+export class CloudOpenIDLoginPage extends BasePage {
+ readonly projectsPage: ProjectsPage;
+ readonly ssoLoginPage: CloudSSOLoginPage;
+
+ constructor(rootPage: Page) {
+ super(rootPage);
+ this.projectsPage = new ProjectsPage(rootPage);
+ this.ssoLoginPage = new CloudSSOLoginPage(rootPage);
+ }
+
+ async goto(_title = 'test', email: string) {
+ await this.ssoLoginPage.goto(email);
+ await this.ssoLoginPage.signIn({ email });
+ // // reload page to get latest app info
+ // await this.rootPage.reload({ waitUntil: 'networkidle' });
+ // // click sign in with SAML
+ // await this.rootPage.locator(`button:has-text("Sign in with ${title}")`).click();
+ }
+
+ get() {
+ return this.rootPage.locator('html');
+ }
+
+ async signIn({ email }: { email: string }) {
+ const signIn = this.get();
+ await signIn.locator('[name="login"]').waitFor();
+
+ await signIn.locator(`[name="login"]`).fill(email);
+ await signIn.locator(`[name="password"]`).fill('dummy-password');
+
+ await signIn.locator(`[type="submit"]`).click();
+ const authorize = this.get();
+
+ await Promise.all([
+ this.rootPage.waitForNavigation({ url: /localhost:3000/ }),
+ authorize.locator(`[type="submit"]`).click(),
+ ]);
+
+ await this.rootPage.locator(`[data-testid="nc-sidebar-userinfo"]:has-text("${email.split('@')[0]}")`);
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/SAMLLoginPage.ts b/tests/playwright/pages/OrgAdmin/SAMLLoginPage.ts
new file mode 100644
index 0000000000..562bb2ab54
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/SAMLLoginPage.ts
@@ -0,0 +1,42 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+import { CloudSSOLoginPage } from './SSOLoginPage';
+
+export class CloudSAMLLoginPage extends BasePage {
+ readonly projectsPage: ProjectsPage;
+ readonly ssoLoginPage: CloudSSOLoginPage;
+
+ constructor(rootPage: Page) {
+ super(rootPage);
+ this.projectsPage = new ProjectsPage(rootPage);
+ this.ssoLoginPage = new CloudSSOLoginPage(rootPage);
+ }
+
+ async goto(_title = 'test', email: string) {
+ await this.ssoLoginPage.goto(email);
+ await this.ssoLoginPage.signIn({ email });
+ // // reload page to get latest app info
+ // await this.rootPage.reload({ waitUntil: 'networkidle' });
+ // // click sign in with SAML
+ // await this.rootPage.locator(`button:has-text("Sign in with ${title}")`).click();
+ }
+
+ get() {
+ return this.rootPage.locator('html');
+ }
+
+ async signIn({ email }: { email: string }) {
+ const signIn = this.get();
+ await signIn.locator('#userName').waitFor();
+
+ await signIn.locator(`#userName`).fill(email);
+ await signIn.locator(`#email`).fill(email);
+ await Promise.all([
+ this.rootPage.waitForNavigation({ url: /localhost:3000/ }),
+ signIn.locator(`#btn-sign-in`).click(),
+ ]);
+
+ await this.rootPage.locator(`[data-testid="nc-sidebar-userinfo"]:has-text("${email.split('@')[0]}")`);
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/SSO.ts b/tests/playwright/pages/OrgAdmin/SSO.ts
new file mode 100644
index 0000000000..be2756b3dd
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/SSO.ts
@@ -0,0 +1,200 @@
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+import { expect } from '@playwright/test';
+import { Domain } from './Domain';
+import { OrgAdminPage } from './index';
+
+export class CloudSSO extends BasePage {
+ readonly projectsPage: ProjectsPage;
+ readonly domain: Domain;
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.domain = new Domain(orgAdminPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ async goto() {
+ // wait for 2 seconds to make sure the page is loaded
+ // await this.rootPage.waitForTimeout(2000);
+ // console.log(await this.rootPage.locator('[data-test-id="nc-org-sso-settings"]').count());
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator('[data-test-id="nc-org-sso-settings"]').click(),
+ httpMethodsToMatch: ['GET'],
+ requestUrlPathToMatch: '/api/v2/orgs/',
+ });
+ }
+
+ get() {
+ return this.rootPage.locator('html');
+ }
+
+ async verifySAMLProviderCount({ count }: { count: number }) {
+ await expect.poll(async () => await this.get().locator('.nc-saml-provider').count()).toBe(count);
+ }
+
+ async verifyOIDCProviderCount({ count }: { count: number }) {
+ await expect.poll(async () => await this.get().locator('.nc-oidc-provider').count()).toBe(count);
+ }
+ async deleteExistingClientIfAny(provider: 'saml' | 'oidc' | 'google', title: string) {
+ if (
+ !(await this.rootPage
+ .locator(provider === 'google' ? '.nc-google-more-option' : `.nc-${provider}-${title}-more-option`)
+ .count())
+ )
+ return;
+
+ await this.deleteProvider(provider, title);
+ }
+
+ async getProvider(provider: 'saml' | 'oidc', title: string) {
+ return this.rootPage.locator(`[data-test-id="nc-${provider}-provider-${title}"]`);
+ }
+
+ async deleteProvider(provider: 'saml' | 'oidc' | 'google', title: string) {
+ await this.rootPage
+ .locator(provider === 'google' ? '.nc-google-more-option' : `.nc-${provider}-${title}-more-option`)
+ .click();
+ await this.waitForResponse({
+ uiAction: () => this.rootPage.locator(`[data-test-id="nc-${provider}-delete"]`).click(),
+ httpMethodsToMatch: ['DELETE'],
+ requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-client/,
+ });
+ }
+
+ async toggleProvider(provider: 'saml' | 'oidc' | 'google', title: string) {
+ await this.waitForResponse({
+ uiAction: () => this.get().locator(`.nc-${provider}-${title}-enable .nc-switch`).click(),
+ httpMethodsToMatch: ['PATCH'],
+ requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-client/,
+ });
+ }
+
+ async selectScope({ type }: { type: string[] }) {
+ await this.rootPage.locator('.ant-select-selector').click();
+
+ await this.rootPage.locator('.ant-select-selection-search-input[aria-expanded="true"]').waitFor();
+ for (const t of type) {
+ await this.rootPage.locator('.rc-virtual-list-holder-inner > div').locator(`text="${t}"`).click();
+ }
+ }
+
+ async createSAMLProvider(
+ p: { title: string; url?: string; xml?: string },
+ setupRedirectUrlCbk?: (params: { redirectUrl: string; audience: string }) => Promise
+ ) {
+ const newSamlBtn = this.get().locator('[data-test-id="nc-new-saml-provider"]');
+
+ await newSamlBtn.click();
+
+ const samlModal = this.rootPage.locator('.nc-saml-modal');
+
+ // wait until redirect url is generated
+ await samlModal.locator('[data-test-id="nc-saml-redirect-url"]:has-text("http://")').waitFor();
+
+ if (setupRedirectUrlCbk) {
+ const redirectUrl = (
+ await samlModal.locator('[data-test-id="nc-saml-redirect-url"]:has-text("http://")').textContent()
+ ).trim();
+ const audience = (
+ await samlModal.locator('[data-test-id="nc-saml-issuer-url"]:has-text("http://")').textContent()
+ ).trim();
+ await setupRedirectUrlCbk({ redirectUrl, audience });
+ }
+
+ await samlModal.locator('[data-test-id="nc-saml-title"]').fill(p.title);
+ if (p.url) {
+ await samlModal.locator('[data-test-id="nc-saml-metadata-url"]').fill(p.url);
+ }
+ if (p.xml) {
+ await samlModal.locator('[data-test-id="nc-saml-xml"]').fill(p.xml);
+ }
+
+ await this.waitForResponse({
+ uiAction: () => samlModal.locator('[data-test-id="nc-saml-submit"]').click(),
+ httpMethodsToMatch: ['GET'],
+ requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-clients/,
+ });
+ }
+
+ async createOIDCProvider(
+ p: {
+ issuer: string;
+ title: string;
+ clientId: string;
+ clientSecret: string;
+ authUrl: string;
+ userInfoUrl: string;
+ tokenUrl: string;
+ jwkUrl: string;
+ scopes: Array;
+ userAttributes: string;
+ },
+ setupRedirectUrlCbk?: (params: { redirectUrl: string }) => Promise
+ ) {
+ const newOIDCBtn = this.get().locator('[data-test-id="nc-new-oidc-provider"]');
+
+ await newOIDCBtn.click();
+
+ const oidcModal = this.rootPage.locator('.nc-oidc-modal');
+
+ // wait until redirect url is generated
+ await oidcModal.locator('[data-test-id="nc-openid-redirect-url"]:has-text("http://")').waitFor();
+
+ if (setupRedirectUrlCbk) {
+ const redirectUrl = (
+ await oidcModal.locator('[data-test-id="nc-openid-redirect-url"]:has-text("http://")').textContent()
+ ).trim();
+ await setupRedirectUrlCbk({ redirectUrl });
+ }
+
+ await oidcModal.locator('[data-test-id="nc-oidc-title"]').fill(p.title);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-issuer"]').fill(p.issuer);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-client-id"]').fill(p.clientId);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-client-secret"]').fill(p.clientSecret);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-auth-url"]').fill(p.authUrl);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-token-url"]').fill(p.tokenUrl);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-user-info-url"]').fill(p.userInfoUrl);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-jwk-url"]').fill(p.jwkUrl);
+
+ await this.selectScope({
+ type: p.scopes,
+ locator: oidcModal.locator('[data-test-id="nc-oidc-scope"]'),
+ } as any);
+
+ await oidcModal.locator('[data-test-id="nc-oidc-user-attribute"]').fill(p.userAttributes);
+
+ await this.waitForResponse({
+ uiAction: () => oidcModal.locator('[data-test-id="nc-oidc-save-btn"]').click(),
+ httpMethodsToMatch: ['GET'],
+ requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-clients/,
+ });
+ }
+
+ async createGoogleProvider(p: { clientId: string; clientSecret: string }) {
+ await this.rootPage.locator(`.nc-google-more-option`).click();
+ await this.rootPage.locator(`[data-test-id="nc-google-edit"]`).click();
+
+ const googleModal = this.rootPage.locator('.nc-google-modal');
+ // wait until redirect url is generated
+ await googleModal.locator('[data-test-id="nc-google-redirect-url"]:has-text("http://")').waitFor();
+
+ await googleModal.locator('[data-test-id="nc-google-client-id"]').fill(p.clientId);
+
+ await googleModal.locator('[data-test-id="nc-google-client-secret"]').fill(p.clientSecret);
+
+ await this.waitForResponse({
+ uiAction: () => googleModal.locator('[data-test-id="nc-google-save-btn"]').click(),
+ httpMethodsToMatch: ['GET'],
+ requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-clients/,
+ });
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/SSOLoginPage.ts b/tests/playwright/pages/OrgAdmin/SSOLoginPage.ts
new file mode 100644
index 0000000000..299600be10
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/SSOLoginPage.ts
@@ -0,0 +1,37 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+
+export class CloudSSOLoginPage extends BasePage {
+ readonly projectsPage: ProjectsPage;
+
+ constructor(rootPage: Page) {
+ super(rootPage);
+ this.projectsPage = new ProjectsPage(rootPage);
+ }
+
+ async goto(_email: string) {
+ // reload page to get latest app info
+ await this.rootPage.goto('/#/sso');
+ // click sign in with SAML
+ // await this.rootPage.locator(`button:has-text("Sign in with ${title}")`).click();
+ }
+
+ get() {
+ return this.rootPage.locator('html');
+ }
+
+ async signIn({ email }: { email: string }) {
+ const signIn = this.get();
+ await signIn.locator('[data-testid="nc-form-org-sso-signin__email"]').waitFor();
+
+ await signIn.locator('[data-testid="nc-form-org-sso-signin__email"]').fill(email);
+
+ await Promise.all([
+ this.rootPage.waitForNavigation({ url: /localhost:3000/ }),
+ signIn.getByTestId('nc-form-signin__submit').click(),
+ ]);
+
+ await this.rootPage.locator(`[data-testid="nc-sidebar-userinfo"]:has-text("${email.split('@')[0]}")`);
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Settings.ts b/tests/playwright/pages/OrgAdmin/Settings.ts
new file mode 100644
index 0000000000..ef91daba92
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Settings.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Settings extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-admin-settings"]');
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Workspaces.ts b/tests/playwright/pages/OrgAdmin/Workspaces.ts
new file mode 100644
index 0000000000..eebf8f6500
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Workspaces.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Workspaces extends BasePage {
+ readonly orgAdminPage: OrgAdminPage;
+
+ constructor(orgAdminPage: OrgAdminPage) {
+ super(orgAdminPage.rootPage);
+ this.orgAdminPage = orgAdminPage;
+ }
+
+ get() {
+ return this.rootPage.locator('[data-test-id="nc-admin-workspaces"]');
+ }
+}
diff --git a/tests/playwright/pages/OrgAdmin/index.ts b/tests/playwright/pages/OrgAdmin/index.ts
new file mode 100644
index 0000000000..1a48398bd1
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/index.ts
@@ -0,0 +1,29 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { CloudSSO } from './SSO';
+
+export class OrgAdminPage extends BasePage {
+ readonly ssoPage: CloudSSO;
+
+ constructor(page: Page) {
+ super(page);
+ this.ssoPage = new CloudSSO(this);
+ }
+
+ get() {
+ return this.rootPage.locator('body');
+ }
+ async goto() {
+ await this.rootPage.goto('/');
+ await this.rootPage.getByTestId('nc-sidebar-userinfo').click();
+
+ await this.rootPage.waitForTimeout(1000);
+
+ if ((await this.rootPage.getByTestId('nc-sidebar-upgrade-workspace-to-org').count()) > 0) {
+ await this.rootPage.getByTestId('nc-sidebar-upgrade-workspace-to-org').first().click();
+ } else {
+ await this.rootPage.getByTestId('nc-sidebar-org-admin-panel').click();
+ }
+ await this.rootPage.waitForNavigation({ url: /\/#\/admin\/\w+/ });
+ }
+}
diff --git a/tests/playwright/pages/SharedForm/index.ts b/tests/playwright/pages/SharedForm/index.ts
index fe98197e5e..252beb1dc1 100644
--- a/tests/playwright/pages/SharedForm/index.ts
+++ b/tests/playwright/pages/SharedForm/index.ts
@@ -25,7 +25,7 @@ export class SharedFormPage extends BasePage {
}
async verifySuccessMessage() {
- await this.rootPage.locator('.nc-shared-form-success-msg').waitFor({ state: 'visible' });
+ await this.rootPage.locator('.nc-shared-form-success-msg').waitFor({ state: 'visible', timeout: 10000 });
await expect(
this.get().locator('.ant-alert-success', {
hasText: 'Successfully submitted form data',
@@ -40,7 +40,8 @@ export class SharedFormPage extends BasePage {
}
async closeLinkToChildList() {
- await this.get().locator('.nc-close-btn').click();
+ // await this.get().locator('.nc-close-btn').click();
+ await this.rootPage.keyboard.press('Escape');
}
async verifyChildList(cardTitle?: string[]) {
@@ -69,6 +70,9 @@ export class SharedFormPage extends BasePage {
}
async selectChildList(cardTitle: string) {
- await this.get().locator(`.ant-card:has-text("${cardTitle}"):visible`).click();
+ await this.get()
+ .locator(`.ant-card:has-text("${cardTitle}"):visible`)
+ .locator('.nc-list-item-link-unlink-btn')
+ .click();
}
}
diff --git a/tests/playwright/pages/WorkspacePage/CollaborationPage.ts b/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
index 49b90c03de..c7ece7c701 100644
--- a/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
+++ b/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
@@ -9,17 +9,11 @@ import { Locator } from '@playwright/test';
export class CollaborationPage extends BasePage {
readonly workspace: WorkspacePage;
- readonly button_addUser: Locator;
- readonly input_email: Locator;
- readonly selector_role: Locator;
readonly list_collaborators: Locator;
constructor(workspace: WorkspacePage) {
super(workspace.rootPage);
this.workspace = workspace;
- this.button_addUser = this.get().locator('button.ant-btn.ant-btn-primary');
- this.input_email = this.get().locator('input[id="email"]');
- this.selector_role = this.get().locator('.ant-select-selector');
this.list_collaborators = this.get().locator('.nc-collaborators-list-table');
}
@@ -34,21 +28,34 @@ export class CollaborationPage extends BasePage {
async addUsers(email: string, role: string) {
await this.waitFor({ state: 'visible' });
+ // click add user button to open modal
+ await this.get().getByTestId('nc-add-member-btn').click();
+
+ const inviteModal = this.rootPage.locator('.nc-invite-dlg');
+
+ await inviteModal.waitFor({ state: 'visible' });
+
+ const input_email = inviteModal.locator('input[id="email"]');
+ const selector_role = inviteModal.locator('.ant-select-selector');
+ const button_addUser = inviteModal.locator('.nc-invite-btn');
+
+ // flaky test: wait for the input to be ready
+ await this.rootPage.waitForTimeout(500);
+
// email
- await this.input_email.fill(email);
- await this.rootPage.keyboard.press('Enter');
+ await input_email.fill(email + ' ');
// role
- await this.selector_role.first().click();
- const menu = this.rootPage.locator('.nc-role-select-dropdown:visible');
+ await selector_role.first().click();
+ const menu = this.rootPage.locator('.nc-role-selector-dropdown:visible');
await menu.locator(`.nc-role-select-workspace-level-${role.toLowerCase()}:visible`).first().click();
// submit
// allow button to be enabled
await this.rootPage.waitForTimeout(500);
- await this.rootPage.keyboard.press('Enter');
- await this.button_addUser.click();
+
+ await button_addUser.click();
await this.verifyToast({ message: 'Invitation sent successfully' });
await this.rootPage.waitForTimeout(500);
}
diff --git a/tests/playwright/setup/index.ts b/tests/playwright/setup/index.ts
index f1dc5e7270..f67022df7b 100644
--- a/tests/playwright/setup/index.ts
+++ b/tests/playwright/setup/index.ts
@@ -155,6 +155,7 @@ export interface NcContext {
workspace: WorkspaceType;
defaultProjectTitle: string;
defaultTableTitle: string;
+ api: Api;
}
selectors.setTestIdAttribute('data-testid');
@@ -169,12 +170,14 @@ async function localInit({
baseType = ProjectTypes.DATABASE,
isSuperUser = false,
dbType,
+ resetSsoClients = false,
}: {
workerId: string;
isEmptyProject?: boolean;
baseType?: ProjectTypes;
isSuperUser?: boolean;
dbType?: string;
+ resetSsoClients?: boolean;
}) {
const parallelId = process.env.TEST_PARALLEL_INDEX;
@@ -210,7 +213,7 @@ async function localInit({
// console.log(process.env.TEST_WORKER_INDEX, process.env.TEST_PARALLEL_INDEX);
// delete sso-clients
- if (isEE() && api['ssoClient'] && isSuperUser) {
+ if (resetSsoClients && isEE() && api['ssoClient'] && isSuperUser) {
const clients = await api.ssoClient.list();
for (const client of clients.list) {
try {
@@ -342,7 +345,7 @@ async function localInit({
// get current user information
const user = await api.auth.me();
- return { data: { base, user, workspace, token }, status: 200 };
+ return { data: { base, user, workspace, token, api }, status: 200 };
} catch (e) {
console.error(`Error resetting base: ${process.env.TEST_PARALLEL_INDEX}`, e);
return { data: {}, status: 500 };
@@ -355,12 +358,14 @@ const setup = async ({
isEmptyProject = false,
isSuperUser = false,
url,
+ resetSsoClients = false,
}: {
baseType?: ProjectTypes;
page: Page;
isEmptyProject?: boolean;
isSuperUser?: boolean;
url?: string;
+ resetSsoClients?: boolean;
}): Promise => {
console.time('Setup');
@@ -384,6 +389,7 @@ const setup = async ({
baseType,
isSuperUser,
dbType,
+ resetSsoClients,
});
} catch (e) {
console.error(`Error resetting base: ${process.env.TEST_PARALLEL_INDEX}`, e);
@@ -472,6 +478,7 @@ const setup = async ({
workspace,
defaultProjectTitle: 'Getting Started',
defaultTableTitle: 'Features',
+ api: response?.data?.api,
} as NcContext;
};
diff --git a/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
index 9b932c6d26..69c867eed9 100644
--- a/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
@@ -59,8 +59,9 @@ test.describe('LTAR create & update', () => {
// Verify fields and toggle the visibility
await dashboard.grid.toolbar.clickFields();
for (const title of ['Sheet1', 'Sheet1s']) {
- await dashboard.grid.toolbar.fields.verify({ title, checked: false });
- await dashboard.grid.toolbar.fields.click({ title, isLocallySaved: false });
+ // verify that fields are enabled
+ await dashboard.grid.toolbar.fields.verify({ title, checked: true });
+ // await dashboard.grid.toolbar.fields.click({ title, isLocallySaved: false });
}
await dashboard.grid.toolbar.clickFields();
@@ -90,7 +91,7 @@ test.describe('LTAR create & update', () => {
// In cell insert
await dashboard.grid.addNewRow({ index: 1, value: '2b' });
await dashboard.grid.cell.inCellAdd({ index: 1, columnHeader: 'Sheet1' });
- await dashboard.linkRecord.select('1b');
+ await dashboard.linkRecord.select('1b', false);
await dashboard.grid.cell.inCellAdd({
index: 1,
columnHeader: 'Sheet1s',
@@ -157,8 +158,8 @@ test.describe('LTAR create & update', () => {
// Verify fields and toggle the visibility
await dashboard.grid.toolbar.clickFields();
- await dashboard.grid.toolbar.fields.verify({ title: 'Sheet2', checked: false });
- await dashboard.grid.toolbar.fields.click({ title: 'Sheet2', isLocallySaved: false });
+ await dashboard.grid.toolbar.fields.verify({ title: 'Sheet2', checked: true });
+ // await dashboard.grid.toolbar.fields.click({ title: 'Sheet2', isLocallySaved: false });
await dashboard.grid.toolbar.clickFields();
const expected2 = [
diff --git a/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts b/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
index 0e63cb3c6a..1b81f11289 100644
--- a/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
@@ -3,10 +3,20 @@ import { DashboardPage } from '../../../pages/Dashboard';
import { GridPage } from '../../../pages/Dashboard/Grid';
import setup, { unsetup } from '../../../setup';
import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { Api } from 'nocodb-sdk';
+let api: Api;
+const addRecordUsingAPI = async (context: any, tableId: string, rowAttributes: any) => {
+ try {
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, rowAttributes);
+ } catch (e) {
+ console.error(e);
+ }
+};
test.describe('Multi select', () => {
let dashboard: DashboardPage, grid: GridPage;
let context: any;
+ let tableId: string;
test.beforeEach(async ({ page }) => {
context = await setup({ page, isEmptyProject: true });
@@ -20,7 +30,13 @@ test.describe('Multi select', () => {
columnTitle: 'MultiSelect',
options: ['Option 1', 'Option 2'],
});
- await grid.addNewRow({ index: 0, value: 'Row 0' });
+
+ api = context.api;
+
+ const tables = await api.dbTable.list(context.base.id);
+ tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+ await addRecordUsingAPI(context, tableId, [{ Id: 1, Title: `Row 0` }]);
+ await page.reload();
});
test.afterEach(async () => {
@@ -54,7 +70,14 @@ test.describe('Multi select', () => {
multiSelect: true,
});
- await grid.addNewRow({ index: 1, value: 'Row 1' });
+ await addRecordUsingAPI(context, tableId, [
+ {
+ Id: 2,
+ Title: `Row 1`,
+ },
+ ]);
+ await grid.rootPage.reload();
+
await grid.cell.selectOption.select({
index: 1,
columnHeader: 'MultiSelect',
@@ -206,6 +229,13 @@ test.describe('Multi select - filters', () => {
toolbar = dashboard.grid.toolbar;
grid = dashboard.grid;
+ api = new Api({
+ baseURL: `http://localhost:8080/`,
+ headers: {
+ 'xc-auth': context.token,
+ },
+ });
+
await dashboard.treeView.createTable({ title: 'sheet1', baseTitle: context.base.title });
await grid.column.create({ title: 'MultiSelect', type: 'MultiSelect' });
@@ -213,12 +243,26 @@ test.describe('Multi select - filters', () => {
columnTitle: 'MultiSelect',
options: ['foo', 'bar', 'baz'],
});
- await grid.addNewRow({ index: 0, value: '1' });
- await grid.addNewRow({ index: 1, value: '2' });
- await grid.addNewRow({ index: 2, value: '3' });
- await grid.addNewRow({ index: 3, value: '4' });
- await grid.addNewRow({ index: 4, value: '5' });
- await grid.addNewRow({ index: 5, value: '6' });
+
+ try {
+ const tables = await api.dbTable.list(context.base.id);
+ const rowAttributes = [];
+ for (let i = 0; i < 6; i++) {
+ const row = {
+ Id: i + 1,
+ Title: `${i + 1}`,
+ };
+ rowAttributes.push(row);
+ }
+
+ const tableId = tables.list.find((table: any) => table.table_name === 'sheet1').id;
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, rowAttributes);
+ } catch (e) {
+ console.error(e);
+ }
+
+ // page reload
+ await page.reload();
await grid.cell.selectOption.select({ index: 1, columnHeader: 'MultiSelect', option: 'foo', multiSelect: true });
await grid.cell.selectOption.select({ index: 2, columnHeader: 'MultiSelect', option: 'bar', multiSelect: true });
diff --git a/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts b/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
index 74df46ddcc..97d098dcef 100644
--- a/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
@@ -3,15 +3,19 @@ import { DashboardPage } from '../../../pages/Dashboard';
import { GridPage } from '../../../pages/Dashboard/Grid';
import setup, { unsetup } from '../../../setup';
import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { Api } from 'nocodb-sdk';
test.describe('Single select', () => {
let dashboard: DashboardPage, grid: GridPage;
let context: any;
+ let api: Api;
+ let tableId: string;
test.beforeEach(async ({ page }) => {
context = await setup({ page, isEmptyProject: true });
dashboard = new DashboardPage(page, context.base);
grid = dashboard.grid;
+ api = context.api;
await dashboard.treeView.createTable({ title: 'sheet1', baseTitle: context.base.title });
@@ -20,7 +24,11 @@ test.describe('Single select', () => {
columnTitle: 'SingleSelect',
options: ['Option 1', 'Option 2'],
});
- await grid.addNewRow({ index: 0, value: 'Row 0' });
+
+ const tables = await api.dbTable.list(context.base.id);
+ tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [{ Id: 1, Title: `Row 0` }]);
+ await page.reload();
});
test.afterEach(async () => {
@@ -120,12 +128,15 @@ test.describe('Single select - filter & sort', () => {
let dashboard: DashboardPage, grid: GridPage, toolbar: ToolbarPage;
let context: any;
+ let api: Api;
+ let tableId: string;
test.beforeEach(async ({ page }) => {
context = await setup({ page });
dashboard = new DashboardPage(page, context.base);
toolbar = dashboard.grid.toolbar;
grid = dashboard.grid;
+ api = context.api;
await dashboard.treeView.createTable({ title: 'sheet1', baseTitle: context.base.title });
@@ -134,10 +145,16 @@ test.describe('Single select - filter & sort', () => {
columnTitle: 'SingleSelect',
options: ['foo', 'bar', 'baz'],
});
- await grid.addNewRow({ index: 0, value: '1' });
- await grid.addNewRow({ index: 1, value: '2' });
- await grid.addNewRow({ index: 2, value: '3' });
- await grid.addNewRow({ index: 3, value: '4' });
+
+ const tables = await api.dbTable.list(context.base.id);
+ tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+ { Id: 1, Title: '1' },
+ { Id: 2, Title: '2' },
+ { Id: 3, Title: '3' },
+ { Id: 4, Title: '4' },
+ ]);
+ await page.reload();
await grid.cell.selectOption.select({ index: 1, columnHeader: 'SingleSelect', option: 'foo', multiSelect: false });
await grid.cell.selectOption.select({ index: 2, columnHeader: 'SingleSelect', option: 'bar', multiSelect: false });
diff --git a/tests/playwright/tests/db/columns/columnUserSelect.spec.ts b/tests/playwright/tests/db/columns/columnUserSelect.spec.ts
index 6a0cc5ba84..3af44e91c3 100644
--- a/tests/playwright/tests/db/columns/columnUserSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnUserSelect.spec.ts
@@ -25,22 +25,15 @@ const roleDb = [
async function beforeEachInit({ page }: { page: any }) {
let workspacePage: WorkspacePage;
let collaborationPage: CollaborationPage;
- let api: Api;
const context: any = await setup({ page, isEmptyProject: true });
const dashboard: DashboardPage = new DashboardPage(page, context.base);
+ const api = context.api;
if (isEE()) {
workspacePage = new WorkspacePage(page);
collaborationPage = workspacePage.collaboration;
- api = new Api({
- baseURL: `http://localhost:8080/`,
- headers: {
- 'xc-auth': context.token,
- },
- });
-
for (let i = 0; i < roleDb.length; i++) {
try {
await api.auth.signup({
@@ -59,25 +52,36 @@ async function beforeEachInit({ page }: { page: any }) {
}
}
- return { dashboard, context };
+ return { dashboard, context, api };
}
test.describe('User single select', () => {
let dashboard: DashboardPage, grid: GridPage, topbar: TopbarPage;
let context: any;
+ let api: Api;
+ let tableId: string;
test.beforeEach(async ({ page }) => {
const initRsp = await beforeEachInit({ page: page });
context = initRsp.context;
dashboard = initRsp.dashboard;
+ api = initRsp.api;
grid = dashboard.grid;
topbar = dashboard.grid.topbar;
- await dashboard.treeView.createTable({ title: 'Sheet1', baseTitle: context.base.title });
+ await dashboard.treeView.createTable({ title: 'sheet1', baseTitle: context.base.title });
await grid.column.create({ title: 'User', type: 'User' });
- await grid.addNewRow({ index: 0, value: 'Row 0' });
+ const tables = await api.dbTable.list(context.base.id);
+ tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+ {
+ Id: 1,
+ Title: `Row 0`,
+ },
+ ]);
+ await page.reload();
});
test.afterEach(async () => {
@@ -102,7 +106,14 @@ test.describe('User single select', () => {
});
// Add new row and verify default value is added in new cell
- await grid.addNewRow({ index: 1, value: 'Row 1' });
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+ {
+ Id: 2,
+ Title: `Row 1`,
+ },
+ ]);
+ await grid.rootPage.reload();
+
await grid.cell.userOption.verify({
index: 1,
columnHeader: 'User',
@@ -130,9 +141,17 @@ test.describe('User single select', () => {
});
test('Field operations - duplicate column, convert to SingleLineText', async () => {
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+ { Id: 2, Title: `Row 1` },
+ { Id: 3, Title: `Row 2` },
+ { Id: 4, Title: `Row 3` },
+ { Id: 5, Title: `Row 4` },
+ { Id: 6, Title: `Row 5` },
+ ]);
+ await grid.rootPage.reload();
+
for (let i = 0; i <= 4; i++) {
await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: false });
- await grid.addNewRow({ index: i + 1, value: `Row ${i + 1}` });
}
await grid.column.duplicateColumn({
@@ -164,10 +183,19 @@ test.describe('User single select', () => {
multiSelect: false,
});
+ // add 5 rows
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+ { Id: 2, Title: `Row 1` },
+ { Id: 3, Title: `Row 2` },
+ { Id: 4, Title: `Row 3` },
+ { Id: 5, Title: `Row 4` },
+ { Id: 6, Title: `Row 5` },
+ ]);
+ await grid.rootPage.reload();
+
// Edit, refresh and verify
for (let i = 0; i <= 4; i++) {
await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: false });
- await grid.addNewRow({ index: i + 1, value: `Row ${i + 1}` });
}
// refresh page
@@ -214,9 +242,11 @@ test.describe('User single select', () => {
await grid.cell.click({ index: 3, columnHeader: 'User' });
await dashboard.rootPage.keyboard.press('Shift+ArrowDown');
- await dashboard.rootPage.keyboard.press((await grid.isMacOs()) ? 'Meta+c' : 'Control+c');
+ await dashboard.rootPage.keyboard.press((await grid.isMacOs()) ? 'Meta+C' : 'Control+C');
await grid.cell.click({ index: 0, columnHeader: 'User' });
- await dashboard.rootPage.keyboard.press((await grid.isMacOs()) ? 'Meta+v' : 'Control+v');
+ await dashboard.rootPage.keyboard.press((await grid.isMacOs()) ? 'Meta+V' : 'Control+V');
+
+ await dashboard.rootPage.waitForTimeout(500);
// refresh
await topbar.clickRefresh();
@@ -273,11 +303,14 @@ test.describe('User single select - filter, sort & GroupBy', () => {
let dashboard: DashboardPage, grid: GridPage, toolbar: ToolbarPage;
let context: any;
+ let api: Api;
+ let tableId: string;
test.beforeEach(async ({ page }) => {
const initRsp = await beforeEachInit({ page: page });
context = initRsp.context;
dashboard = initRsp.dashboard;
+ api = initRsp.api;
grid = dashboard.grid;
toolbar = dashboard.grid.toolbar;
@@ -285,8 +318,18 @@ test.describe('User single select - filter, sort & GroupBy', () => {
await grid.column.create({ title: 'User', type: 'User' });
+ const tables = await api.dbTable.list(context.base.id);
+ tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+ { Id: 1, Title: `0` },
+ { Id: 2, Title: `1` },
+ { Id: 3, Title: `2` },
+ { Id: 4, Title: `3` },
+ { Id: 5, Title: `4` },
+ ]);
+ await page.reload();
+
for (let i = 0; i <= 4; i++) {
- await grid.addNewRow({ index: i, value: `${i}` });
await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: false });
}
});
@@ -396,11 +439,14 @@ test.describe('User single select - filter, sort & GroupBy', () => {
test.describe('User multiple select', () => {
let dashboard: DashboardPage, grid: GridPage, topbar: TopbarPage;
let context: any;
+ let api: Api;
+ let tableId: string;
test.beforeEach(async ({ page }) => {
const initRsp = await beforeEachInit({ page: page });
context = initRsp.context;
dashboard = initRsp.dashboard;
+ api = initRsp.api;
grid = dashboard.grid;
topbar = dashboard.grid.topbar;
@@ -408,6 +454,9 @@ test.describe('User multiple select', () => {
await grid.column.create({ title: 'User', type: 'User' });
await grid.column.userOption.allowMultipleUser({ columnTitle: 'User', allowMultiple: true });
+
+ const tables = await api.dbTable.list(context.base.id);
+ tableId = tables.list.find((table: any) => table.title === 'Sheet1').id;
});
test.afterEach(async () => {
@@ -415,7 +464,8 @@ test.describe('User multiple select', () => {
});
test('Verify the default option count, select default value and verify', async () => {
- await grid.addNewRow({ index: 0, value: 'Row 0' });
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [{ Id: 1, Title: `Row 0` }]);
+ await grid.rootPage.reload();
if (!isEE()) {
await grid.column.userOption.verifyDefaultValueOptionCount({ columnTitle: 'User', totalCount: 5 });
@@ -434,7 +484,9 @@ test.describe('User multiple select', () => {
});
// Add new row and verify default value is added in new cell
- await grid.addNewRow({ index: 1, value: 'Row 1' });
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [{ Id: 2, Title: `Row 1` }]);
+ await grid.rootPage.reload();
+
await grid.cell.userOption.verify({
index: 1,
columnHeader: 'User',
@@ -450,10 +502,17 @@ test.describe('User multiple select', () => {
});
test('Field operations - duplicate column, convert to SingleLineText', async () => {
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+ { Id: 1, Title: `Row 0` },
+ { Id: 2, Title: `Row 1` },
+ { Id: 3, Title: `Row 2` },
+ { Id: 4, Title: `Row 3` },
+ { Id: 5, Title: `Row 4` },
+ ]);
+ await grid.rootPage.reload();
+
let counter = 1;
for (let i = 0; i <= 4; i++) {
- await grid.addNewRow({ index: i, value: `Row ${i}` });
-
await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: true });
await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[counter], multiSelect: true });
@@ -495,11 +554,18 @@ test.describe('User multiple select', () => {
});
test('Cell Operation - edit, copy-paste and delete', async () => {
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+ { Id: 1, Title: `Row 0` },
+ { Id: 2, Title: `Row 1` },
+ { Id: 3, Title: `Row 2` },
+ { Id: 4, Title: `Row 3` },
+ { Id: 5, Title: `Row 4` },
+ ]);
+ await grid.rootPage.reload();
+
// Edit, refresh and verify
let counter = 1;
for (let i = 0; i <= 4; i++) {
- await grid.addNewRow({ index: i, value: `Row ${i}` });
-
await grid.cell.userOption.select({
index: i,
columnHeader: 'User',
@@ -615,11 +681,14 @@ test.describe('User multiple select - filter, sort & GroupBy', () => {
let dashboard: DashboardPage, grid: GridPage, toolbar: ToolbarPage;
let context: any;
+ let api: Api;
+ let tableId: string;
test.beforeEach(async ({ page }) => {
const initRsp = await beforeEachInit({ page: page });
context = initRsp.context;
dashboard = initRsp.dashboard;
+ api = initRsp.api;
grid = dashboard.grid;
toolbar = dashboard.grid.toolbar;
@@ -628,9 +697,20 @@ test.describe('User multiple select - filter, sort & GroupBy', () => {
await grid.column.create({ title: 'User', type: 'User' });
await grid.column.userOption.allowMultipleUser({ columnTitle: 'User', allowMultiple: true });
+ const tables = await api.dbTable.list(context.base.id);
+ tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+
+ await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+ { Id: 1, Title: `0` },
+ { Id: 2, Title: `1` },
+ { Id: 3, Title: `2` },
+ { Id: 4, Title: `3` },
+ { Id: 5, Title: `4` },
+ ]);
+ await grid.rootPage.reload();
+
let counter = 2;
for (let i = 0; i <= 4; i++) {
- await grid.addNewRow({ index: i, value: `${i}` });
await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: true });
if (i !== 0) {
await grid.cell.userOption.select({
diff --git a/tests/playwright/tests/db/features/command.spec.ts b/tests/playwright/tests/db/features/command.spec.ts
index 6bbefb04e1..62adbd14b7 100644
--- a/tests/playwright/tests/db/features/command.spec.ts
+++ b/tests/playwright/tests/db/features/command.spec.ts
@@ -46,6 +46,8 @@ test.describe('Command Shortcuts', () => {
await dashboard.cmdK.searchText('CustomerList');
+ await page.waitForTimeout(1000);
+ await dashboard.get().locator('.nc-active-view-title').waitFor({ state: 'visible' });
await expect(dashboard.get().locator('.nc-active-view-title')).toContainText('Default View');
await dashboard.signOut();
diff --git a/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
index 7a3a72e012..c245decf82 100644
--- a/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
+++ b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
@@ -272,6 +272,8 @@ test.describe('Clipboard support', () => {
// ########################################
+ await dashboard.grid.renderColumn('Attachment');
+
await dashboard.grid.cell.attachment.addFile({
index: 0,
columnHeader: 'Attachment',
@@ -304,6 +306,7 @@ test.describe('Clipboard support', () => {
];
for (const { type, value } of responseTable) {
+ await dashboard.grid.renderColumn(type);
if (type === 'Rating') {
await dashboard.grid.cell.rating.verify({
index: rowIndex,
diff --git a/tests/playwright/tests/db/general/cellSelection.spec.ts b/tests/playwright/tests/db/general/cellSelection.spec.ts
index f16cac8144..aeebae1ac2 100644
--- a/tests/playwright/tests/db/general/cellSelection.spec.ts
+++ b/tests/playwright/tests/db/general/cellSelection.spec.ts
@@ -77,9 +77,9 @@ test.describe('Verify cell selection', () => {
start: { index: 0, columnHeader: 'Country' },
end: { index: 2, columnHeader: 'Cities' },
});
- expect(await grid.selectedCount()).toBe(9);
+ await grid.verifySelectedCellCount({ count: 9 });
await grid.cell.get({ index: 0, columnHeader: 'Country' }).click();
- expect(await grid.selectedCount()).toBe(1);
+ await grid.verifySelectedCellCount({ count: 1 });
expect(await grid.cell.verifyCellActiveSelected({ index: 0, columnHeader: 'Country' }));
await dashboard.closeAllTabs();
@@ -89,9 +89,9 @@ test.describe('Verify cell selection', () => {
start: { index: 0, columnHeader: 'Country' },
end: { index: 2, columnHeader: 'Cities' },
});
- expect(await grid.selectedCount()).toBe(9);
+ await grid.verifySelectedCellCount({ count: 9 });
await grid.cell.get({ index: 5, columnHeader: 'Country' }).click();
- expect(await grid.selectedCount()).toBe(1);
+ await grid.verifySelectedCellCount({ count: 1 });
expect(await grid.cell.verifyCellActiveSelected({ index: 5, columnHeader: 'Country' }));
await dashboard.closeAllTabs();
@@ -102,9 +102,9 @@ test.describe('Verify cell selection', () => {
start: { index: 2, columnHeader: 'Cities' },
end: { index: 0, columnHeader: 'Country' },
});
- expect(await grid.selectedCount()).toBe(12);
+ await grid.verifySelectedCellCount({ count: 12 });
await grid.cell.get({ index: 1, columnHeader: 'Country' }).click();
- expect(await grid.selectedCount()).toBe(1);
+ await grid.verifySelectedCellCount({ count: 1 });
expect(await grid.cell.verifyCellActiveSelected({ index: 1, columnHeader: 'Country' }));
await dashboard.grid.toolbar.fields.toggleShowSystemFields();
await dashboard.closeAllTabs();
@@ -115,8 +115,10 @@ test.describe('Verify cell selection', () => {
start: { index: 0, columnHeader: 'Country' },
end: { index: 2, columnHeader: 'Cities' },
});
+ await grid.verifySelectedCellCount({ count: 9 });
+ await grid.rootPage.waitForTimeout(100);
await page.keyboard.press('ArrowRight');
- expect(await grid.selectedCount()).toBe(1);
+ await grid.verifySelectedCellCount({ count: 1 });
expect(await grid.cell.verifyCellActiveSelected({ index: 0, columnHeader: 'LastUpdate' }));
await dashboard.closeAllTabs();
});
diff --git a/tests/playwright/tests/db/general/toolbarOperations.spec.ts b/tests/playwright/tests/db/general/toolbarOperations.spec.ts
index 6afa2b37ea..a7cb00afaf 100644
--- a/tests/playwright/tests/db/general/toolbarOperations.spec.ts
+++ b/tests/playwright/tests/db/general/toolbarOperations.spec.ts
@@ -230,7 +230,7 @@ test.describe('Toolbar operations (GRID)', () => {
});
await toolbar.clickFilter();
- await dashboard.grid.groupPage.openGroup({ indexMap: [1, 0] });
+ await dashboard.grid.groupPage.openGroup({ indexMap: [2, 0] });
await dashboard.grid.groupPage.verifyGroupHeader({
indexMap: [1, 0],
@@ -377,16 +377,14 @@ test.describe('Toolbar operations (GRID)', () => {
});
await toolbar.clickFilter();
- await dashboard.grid.groupPage.openGroup({ indexMap: [5, 0, 0] });
-
await dashboard.grid.groupPage.verifyGroupHeader({
- indexMap: [5, 0, 0],
+ indexMap: [4, 0, 0],
count: 2,
title: 'ReleaseYear',
});
await dashboard.grid.groupPage.verifyGroup({
- indexMap: [5, 0, 0],
+ indexMap: [4, 0, 0],
value: '2006',
});
-
- {{ activeWorkspace?.title }}
+
-
- {{ activeWorkspace?.title }}
+
+
+
+ {{ currentWorkspace?.title }}
+
+
+
+
+ {{ $t('labels.workspaces') }}
+
+
+ /
+
@@ -65,7 +101,7 @@ onMounted(() => {
Members
-
+
+ + {{ currentWorkspace?.title }}
+
+
+
+
+ {{ $t('labels.workspaces') }}
+
+
+ /
+
+ bağlanarak oluştur", @@ -786,7 +844,7 @@ "translate": "Çeviriye yardım edin", "account": { "authToken": "Yetki Token'ını Kopyala", - "authTokenCopied": "Copied Auth Token", + "authTokenCopied": "Yetki Token'ı Kopyalandı", "swagger": "Swagger: REST APIleri", "projInfo": "Proje Bilgisini Kopyala", "themes": "Temalar" @@ -796,10 +854,10 @@ "filter": "Filtrele", "addFilter": "Filtre Ekle", "share": "Paylaş", - "groupBy": "Group By", - "addSubGroup": "Add subgroup", + "groupBy": "Grupla", + "addSubGroup": "Alt grup ekle", "shareBase": { - "label": "Share Base", + "label": "Projeyi Paylaş", "disable": "Paylaşılan bağlantıyı devre dışı bırak", "enable": "Bağlantıya sahip olan herkes", "link": "Paylaşılan bağlantı" @@ -809,8 +867,8 @@ "inviteTeam": "Takıma davet et", "inviteUser": "Kullanıcı Davet Et", "inviteToken": "Davet kodu", - "linkedRecords": "Linked Records", - "addNewLink": "Add New Link", + "linkedRecords": "İlişkili Kayıtlar", + "addNewLink": "Yeni İlişki Ekle", "newUser": "Yeni kullanıcı", "editUser": "Kullanıcıyı düzenle", "deleteUser": "Kullanıcıyı projeden kaldır", @@ -826,10 +884,10 @@ "copyApiURL": "API linkini kopyala", "createTable": "Yeni tablo oluştur", "createDashboard": "Create Dashboard", - "createWorkspace": "Create Workspace", + "createWorkspace": "Çalışma Alanı Oluştur", "refreshTable": "Tabloları Yenile", "renameTable": "Tabloyu Yeniden Adlandır", - "renameLayout": "Layout Rename", + "renameLayout": "Düzeni Yeniden Adlandır", "deleteTable": "Tabloyu Sil", "addField": "Tabloya yeni alan ekle", "setDisplay": "Görünüm değeri olarak ayarla", @@ -840,9 +898,9 @@ "insertRow": "Yeni Satır Ekle", "duplicateRow": "Satırı Çoğalt", "deleteRow": "Satırı Sil", - "deleteRows": "Delete records", - "predictColumns": "Predict Fields", - "predictFormulas": "Predict Formulas", + "deleteRows": "Kayıtları sil", + "predictColumns": "Sütunları Tahmin Et", + "predictFormulas": "Formülleri Tahmin Et", "deleteSelectedRow": "Seçilen Satırları Sil", "importExcel": "Excel içe aktar", "importCSV": "CSV içe aktar", @@ -863,7 +921,7 @@ "ListView": "Görünüm Listesi", "copyView": "Görünümü kopyala", "renameView": "Görünümü yeniden adlandır", - "uploadData": "Upload Data", + "uploadData": "Veri Yükle", "deleteView": "Görünümü sil", "createGrid": "Tablo görünümü oluştur", "createGallery": "Galeri görünümü oluştur", @@ -896,23 +954,23 @@ "addFilterGroup": "Filtre Grubu Ekle", "linkRecord": "Bağlantı kaydı", "addNewRecord": "Yeni kayıt ekle", - "newRecord": "New record", - "tableNameCreateNewRecord": "{tableName}: Create new record", - "gotSavedLinkedSuccessfully": "{tableName} '{recordTitle}' got saved & linked successfully", - "recordCreatedLinked": "Record Created & Linked", + "newRecord": "Yeni kayıt", + "tableNameCreateNewRecord": "{tableName}: Yeni kayıt oluştur", + "gotSavedLinkedSuccessfully": "{tableName} '{recordTitle}' kaydedildi ve başarıyla ilişkilendirildi", + "recordCreatedLinked": "Kayıt Oluşturuldu ve İlişkilendirildi", "useConnectionUrl": "Bağlantı URL'sini Kullan", "toggleCommentsDraw": "Yorum çizimini değiştir", "expandRecord": "Kaydı Genişlet", "deleteRecord": "Kayıt Silme", - "fullWidth": "Full width", - "exitFullWidth": "Exit full width", - "markAllAsRead": "Mark all as read", + "fullWidth": "Tam genişlik", + "exitFullWidth": "Tam genişlikten çık", + "markAllAsRead": "Tümünü okundu olarak işaretle", "column": { - "delete": "Delete Field", - "addNumber": "Add Number Field", - "addSingleLineText": "Add SingleLineText Field", - "addLongText": "Add LongText Field", - "addOther": "Add Other Field" + "delete": "Sütunu Sil", + "addNumber": "Sayı Sütunu Ekle", + "addSingleLineText": "Yazı Sütunu Ekle", + "addLongText": "Metin Sütunu Ekle", + "addOther": "Diğer Sütun Ekle" }, "erd": { "showColumns": "Sütunları Göster", @@ -935,10 +993,10 @@ "openInOpenStreetMap": "OSM" }, "toggleMobileMode": "Mobil Modu Aç / Kapat", - "startCommenting": "Start commenting!", - "clearForm": "Clear Form", - "addFieldFromFormView": "Add Field", - "selectAllFields": "Select all fields", + "startCommenting": "Yorum yapmaya başlayın!", + "clearForm": "Formu Temizle", + "addFieldFromFormView": "Sütun Ekle", + "selectAllFields": "Tüm sütunları seç", "preFilledFields": { "title": "Enable Pre-fill", "default": "Default", @@ -984,19 +1042,19 @@ }, "placeholder": { "selectSlackChannels": "Select Slack channels", - "selectTeamsChannels": "Select Microsoft Teams channels", - "selectDiscordChannels": "Select Discord channels", - "selectMattermostChannels": "Select Mattermost channels", - "webhookTitle": "Webhook Title", - "barcodeColumn": "Select a field for the Barcode value", - "notFoundContent": "No valid field Type can be found.", - "selectBarcodeFormat": "Select a Barcode format", + "selectTeamsChannels": "Microsoft Teams kanallarını seçin", + "selectDiscordChannels": "Discord kanallarını seçin", + "selectMattermostChannels": "Mattermost kanallarını seçin", + "webhookTitle": "Webhook Başlığı", + "barcodeColumn": "Barkod değeri için bir sütun seçin", + "notFoundContent": "Geçerli sütun türü bulunamadı.", + "selectBarcodeFormat": "Bir Barkod biçimi seçin", "projName": "Proje Adını Girin", - "selectGroupField": "Select a Grouping Field", - "selectGroupFieldNotFound": "No Single Select Field can be found. Please create one first.", - "selectGeoField": "Select a GeoData Field", - "notSelected": "-not selected-", - "selectGeoFieldNotFound": "No GeoData Field can be found. Please create one first.", + "selectGroupField": "Gruplama Sütunu Seçin", + "selectGroupFieldNotFound": "Tekil seçim sütunu bulunamadı. Lütfen önce bir tane oluşturun.", + "selectGeoField": "GeoData Sütunu Seçin", + "notSelected": "-seçilmedi-", + "selectGeoFieldNotFound": "GeoData Sütunu bulunamadı. Lütfen önce bir tane oluşturun.", "password": { "enter": "Şifreyi Girin", "current": "Mevcut Şifre", @@ -1004,8 +1062,8 @@ "save": "Şifreyi Kaydet", "confirm": "Yeni şifreyi onayla" }, - "selectAColumnForTheQRCodeValue": "Select a field for the QR code value", - "allowNegativeNumbers": "Allow negative numbers", + "selectAColumnForTheQRCodeValue": "QR Kod değeri için bir sütun seçin", + "allowNegativeNumbers": "Negatif sayılara izin verin", "searchProjectTree": "Tabloları ara", "searchFields": "Sütunları ara", "searchColumn": "{search} sütununda ara", @@ -1036,6 +1094,11 @@ "searchOptions": "Search options" }, "msg": { + "controlOrgAppearance": "Control your organisations name and appearance.", + "addCompanyDomains": "Add company domains to restrict access to unwanted users.", + "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.", + "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.", + "deleteOrganization": "Delete all users, bases and data related to this organization", "clickToCopyFieldId": "Click to copy Field Id", "enterPassword": "Enter password", "bySigningUp": "By signing up, you agree to the", @@ -1118,7 +1181,7 @@ "tooltip_desc": "A single record from table ", "tooltip_desc2": " can be linked with a single record from table " }, - "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.", + "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.", "noRecordsLinked": "No records linked", "noLinkedRecords": "No linked records", "recordsLinked": "records linked", @@ -1162,8 +1225,11 @@ } }, "info": { + "enterWorkspaceName": "Enter workspace name", + "enterBaseName": "Enter base name", "idpPaste": "Paste these URL in your Identity Providers console", "noSaml": "There are no configured SAML authentications.", + "noOIDC": "There are no configured OpenID authentications.", "disabledAsViewLocked": "Disabled as View is locked", "basesMigrated": "Bases are migrated. Please try again.", "pasteNotSupported": "Etkin hücre üzerinde yapıştırma işlemi desteklenmiyor", @@ -1339,6 +1405,7 @@ "fetchingCalendarData": "Error fetching calendar data", "fetchingActiveDates": "Error fetching active dates", "scopesRequired": "Scopes required", + "domainRequired": "Domain name is required", "authUrlRequired": "Auth URL is required", "userNameAttributeRequired": "Username attribute is required", "clientIdRequired": "Client ID is required", @@ -1352,6 +1419,7 @@ "nameMinLength": "Name must be at least 2 characters long", "nameMaxLength": "Name must be at most 60 characters long", "viewNameRequired": "View name is required", + "domainNameRequired": "Domain name is required", "nameMaxLength256": "Name must be at most 256 characters long", "viewNameUnique": "View name should be unique", "searchProject": "{search} için aramanız hiç bir sonuç bulamadı", diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json index 060c2dc9e7..045452eb6d 100644 --- a/packages/nc-gui/lang/uk.json +++ b/packages/nc-gui/lang/uk.json @@ -39,6 +39,8 @@ } }, "general": { + "role": "Role", + "general": "General", "quit": "Вийти", "home": "Головна", "load": "Завантажити", @@ -198,11 +200,14 @@ "logo": "Logo", "dropdown": "Dropdown", "list": "List", + "verify": "Verify", "apply": "Apply", "text": "Text", "appearance": "Appearance" }, "objects": { + "owner": "Owner", + "member": "Member", "day": "Day", "week": "Week", "month": "Month", @@ -247,6 +252,7 @@ "viewer": "Глядач", "noaccess": "No Access", "superAdmin": "Super Admin", + "orgLevelOwner": "Organization Level Owner", "orgLevelCreator": "Творець рівня організації", "orgLevelViewer": "Глядач рівня організації" }, @@ -313,6 +319,10 @@ "isNotNull": "не рівне null" }, "title": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename Workspace", + "renamingWorkspace": "Renaming Workspace", + "renamingBase": "Renaming Base", "sso": "Authentication (SSO)", "docs": "Docs", "forum": "Forum", @@ -437,6 +447,39 @@ "noResultsMatchedYourSearch": "Your search did not yield any matching results." }, "labels": { + "txt": "TXT Record value", + "transferOwnership": "Transfer Ownership", + "recentActivity": "Recent Activity", + "goToMembers": "Go to Members", + "addMember": "Add Member", + "numberOfMembers": "No. Members", + "numberOfBases": "No. Bases", + "numberOfRecords": "No. Records", + "workspaceName": "Workspace Name", + "workspaceWithoutOwner": "Workspace without Owners", + "inviteUsersToWorkspace": "Invite Users to Workspace", + "selectWorkspace": "-select workspaces to invite to-", + "addMembersToOrganization": "Add Members to Organization", + "memberIn": "Member in:", + "assignAs": "Assign as", + "signOutUser": "Sign out user", + "signOutUsers": "Sign out users", + "deactivateUser": "Deactivate User", + "deactivateUsers": "Deactivate Users", + "lastActive": "Last Active", + "dateAdded": "Date Added", + "uploadImage": "Upload Image", + "organizationProfile": "Organisation Profile", + "organizationImage": "Organisation Image", + "organizationName": "Organisation Name", + "activeDomains": "Active Domains", + "domains": "Domains", + "disablePublicSharing": "Disable Public Sharing", + "shareSettings": "Share Settings", + "deleteUserAndData": "Delete User and their data", + "userOptions": "User Options", + "deleteThisOrganization": "Delete this Organisation", + "dangerZone": "Dangerzone", "selectYear": "Select Year", "save": "Save", "cancel": "Cancel", @@ -447,7 +490,15 @@ "saml": "Security Assertion Markup Language (SAML)", "newProvider": "New Provider", "generalSettings": "General Settings", + "adminPanel": "Admin Panel", + "moveWorkspaceToOrg": "Move Workspace To Organisation", "ssoSettings": "SSO Settings", + "addDomain": "Add Domain", + "domain": "Domain", + "settings": "Settings", + "workspaces": "Workspaces", + "back": "Back", + "dashboard": "Dashboard", "organizeBy": "Organize by", "previous": "Previous", "nextMonth": "Next Month", @@ -709,9 +760,16 @@ "clearSelection": "Clear selection" }, "activity": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename workspace", + "deactivate": "De-activate", + "manageUsers": "Manage Users", + "newWorkspace": "New Workspace", + "addDomain": "Add Domain", "addMembers": "Add Members", "enterEmail": "Enter email addresses", "inviteToBase": "Invite to Base", + "inviteToWorkspace": "Invite to Workspace", "addMember": "Add Member to Base", "noRange": "Calendar view requires a date range", "goToToday": "Go to Today", @@ -1036,6 +1094,11 @@ "searchOptions": "Search options" }, "msg": { + "controlOrgAppearance": "Control your organisations name and appearance.", + "addCompanyDomains": "Add company domains to restrict access to unwanted users.", + "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.", + "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.", + "deleteOrganization": "Delete all users, bases and data related to this organization", "clickToCopyFieldId": "Click to copy Field Id", "enterPassword": "Enter password", "bySigningUp": "By signing up, you agree to the", @@ -1118,7 +1181,7 @@ "tooltip_desc": "A single record from table ", "tooltip_desc2": " can be linked with a single record from table " }, - "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.", + "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.", "noRecordsLinked": "No records linked", "noLinkedRecords": "No linked records", "recordsLinked": "records linked", @@ -1162,8 +1225,11 @@ } }, "info": { + "enterWorkspaceName": "Enter workspace name", + "enterBaseName": "Enter base name", "idpPaste": "Paste these URL in your Identity Providers console", "noSaml": "There are no configured SAML authentications.", + "noOIDC": "There are no configured OpenID authentications.", "disabledAsViewLocked": "Disabled as View is locked", "basesMigrated": "Bases are migrated. Please try again.", "pasteNotSupported": "Операція вставки не підтримується в активній комірці", @@ -1339,6 +1405,7 @@ "fetchingCalendarData": "Error fetching calendar data", "fetchingActiveDates": "Error fetching active dates", "scopesRequired": "Scopes required", + "domainRequired": "Domain name is required", "authUrlRequired": "Auth URL is required", "userNameAttributeRequired": "Username attribute is required", "clientIdRequired": "Client ID is required", @@ -1352,6 +1419,7 @@ "nameMinLength": "Name must be at least 2 characters long", "nameMaxLength": "Name must be at most 60 characters long", "viewNameRequired": "View name is required", + "domainNameRequired": "Domain name is required", "nameMaxLength256": "Name must be at most 256 characters long", "viewNameUnique": "View name should be unique", "searchProject": "За вашим запитом {search} не знайдено жодного результату", diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json index c262955444..0fefc440af 100644 --- a/packages/nc-gui/lang/vi.json +++ b/packages/nc-gui/lang/vi.json @@ -1,37 +1,37 @@ { "dashboards": { "create_new_dashboard_project": "Tạo giao diện mới", - "connect_data_sources": "Connect data sources", - "alert": "Alert", - "alert-message": "No databases have been connected. Connect database bases to build interfaces. Skip this step and add databases from the base home page later.", - "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Select Database Bases that you want to link to this Interface.", - "create_interface": "Create interface", - "project_name": "Base Name", - "connect": "Connect", + "connect_data_sources": "Kết nối nguồn dữ liệu", + "alert": "Thông báo", + "alert-message": "Không có cơ sở dữ liệu được kết nối. Kết nối cơ sở dữ liệu để xây dựng giao diện. Bỏ qua bước này và thêm cơ sở dữ liệu từ trang chủ cơ sở sau.", + "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Chọn cơ sở dữ liệu mà bạn muốn liên kết với giao diện này.", + "create_interface": "Tạo giao diện mới", + "project_name": "Tên cơ sở", + "connect": "Kết nối", "buttonActionTypes": { - "open_external_url": "Open external link", - "delete_record": "Delete record", - "update_record": "Update record", - "open_layout": "Open layout" + "open_external_url": "Mở kết nối bên ngoài", + "delete_record": "Xóa bản ghi", + "update_record": "Cập nhật bản ghi", + "open_layout": "Mở bố trí" }, "widgets": { - "static_text": "Text", - "chart": "Chart", - "table": "Table", - "image": "Image", - "map": "Map", - "button": "Button", - "number": "Number", - "bar_chart": "Bar Chart", - "line_chart": "Line Chart", - "area_chart": "Area Chart", - "pie_chart": "Pie Chart", - "donut_chart": "Donut Chart", - "scatter_plot": "Scatter Plot", - "bubble_chart": "Bubble Chart", - "radar_chart": "Radar Chart", - "polar_area_chart": "Polar Area Chart", - "radial_bar_chart": "Radial Bar Chart", + "static_text": "Văn bản", + "chart": "Đồ thị", + "table": "Bảng", + "image": "Hình ảnh", + "map": "Bản đồ", + "button": "Nút", + "number": "Số", + "bar_chart": "Biểu đồ cột", + "line_chart": "Biểu đồ đường", + "area_chart": "Biểu đồ khu vực", + "pie_chart": "Biểu đồ tròn", + "donut_chart": "Biểu đồ Donut", + "scatter_plot": "Biểu đồ phân tán", + "bubble_chart": "Biểu đồ bong bóng", + "radar_chart": "Biểu đồ Radar", + "polar_area_chart": "Biểu đồ vùng cực", + "radial_bar_chart": "Biểu đồ thanh xuyên tâm", "heatmap_chart": "Heatmap Chart", "treemap_chart": "Treemap Chart", "box_plot_chart": "Box Plot Chart", @@ -39,6 +39,8 @@ } }, "general": { + "role": "Role", + "general": "General", "quit": "Quit", "home": "Trang chủ", "load": "Trọng tải", @@ -76,7 +78,7 @@ "twilio": "Twilio", "whatsappTwilio": "WhatsApp Twilio", "quote": "Quote", - "submit": "Nộp", + "submit": "Áp dụng", "create": "Tạo ra", "createEntity": "Create {entity}", "creating": "Creating", @@ -198,11 +200,14 @@ "logo": "Logo", "dropdown": "Dropdown", "list": "List", + "verify": "Verify", "apply": "Apply", "text": "Text", "appearance": "Appearance" }, "objects": { + "owner": "Owner", + "member": "Member", "day": "Day", "week": "Week", "month": "Month", @@ -247,6 +252,7 @@ "viewer": "Người xem", "noaccess": "No Access", "superAdmin": "Super Admin", + "orgLevelOwner": "Organization Level Owner", "orgLevelCreator": "Organization Level Creator", "orgLevelViewer": "Organization Level Viewer" }, @@ -313,6 +319,10 @@ "isNotNull": "không phải là null." }, "title": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename Workspace", + "renamingWorkspace": "Renaming Workspace", + "renamingBase": "Renaming Base", "sso": "Authentication (SSO)", "docs": "Docs", "forum": "Forum", @@ -437,6 +447,39 @@ "noResultsMatchedYourSearch": "Your search did not yield any matching results." }, "labels": { + "txt": "TXT Record value", + "transferOwnership": "Transfer Ownership", + "recentActivity": "Recent Activity", + "goToMembers": "Go to Members", + "addMember": "Add Member", + "numberOfMembers": "No. Members", + "numberOfBases": "No. Bases", + "numberOfRecords": "No. Records", + "workspaceName": "Workspace Name", + "workspaceWithoutOwner": "Workspace without Owners", + "inviteUsersToWorkspace": "Invite Users to Workspace", + "selectWorkspace": "-select workspaces to invite to-", + "addMembersToOrganization": "Add Members to Organization", + "memberIn": "Member in:", + "assignAs": "Assign as", + "signOutUser": "Sign out user", + "signOutUsers": "Sign out users", + "deactivateUser": "Deactivate User", + "deactivateUsers": "Deactivate Users", + "lastActive": "Last Active", + "dateAdded": "Date Added", + "uploadImage": "Upload Image", + "organizationProfile": "Organisation Profile", + "organizationImage": "Organisation Image", + "organizationName": "Organisation Name", + "activeDomains": "Active Domains", + "domains": "Domains", + "disablePublicSharing": "Disable Public Sharing", + "shareSettings": "Share Settings", + "deleteUserAndData": "Delete User and their data", + "userOptions": "User Options", + "deleteThisOrganization": "Delete this Organisation", + "dangerZone": "Dangerzone", "selectYear": "Select Year", "save": "Save", "cancel": "Cancel", @@ -447,7 +490,15 @@ "saml": "Security Assertion Markup Language (SAML)", "newProvider": "New Provider", "generalSettings": "General Settings", + "adminPanel": "Admin Panel", + "moveWorkspaceToOrg": "Move Workspace To Organisation", "ssoSettings": "SSO Settings", + "addDomain": "Add Domain", + "domain": "Domain", + "settings": "Settings", + "workspaces": "Workspaces", + "back": "Back", + "dashboard": "Dashboard", "organizeBy": "Organize by", "previous": "Previous", "nextMonth": "Next Month", @@ -635,7 +686,7 @@ "onUpdate": "Trên bản cập nhật", "onDelete": "Trên xóa", "account": "Tài khoản", - "language": "Language", + "language": "Ngôn ngữ", "primaryColor": "Màu chính", "accentColor": "Màu phụ", "customTheme": "Giao diện tùy chỉnh", @@ -709,9 +760,16 @@ "clearSelection": "Clear selection" }, "activity": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename workspace", + "deactivate": "De-activate", + "manageUsers": "Manage Users", + "newWorkspace": "New Workspace", + "addDomain": "Add Domain", "addMembers": "Add Members", "enterEmail": "Enter email addresses", "inviteToBase": "Invite to Base", + "inviteToWorkspace": "Invite to Workspace", "addMember": "Add Member to Base", "noRange": "Calendar view requires a date range", "goToToday": "Go to Today", @@ -1036,6 +1094,11 @@ "searchOptions": "Search options" }, "msg": { + "controlOrgAppearance": "Control your organisations name and appearance.", + "addCompanyDomains": "Add company domains to restrict access to unwanted users.", + "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.", + "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.", + "deleteOrganization": "Delete all users, bases and data related to this organization", "clickToCopyFieldId": "Click to copy Field Id", "enterPassword": "Enter password", "bySigningUp": "By signing up, you agree to the", @@ -1118,7 +1181,7 @@ "tooltip_desc": "A single record from table ", "tooltip_desc2": " can be linked with a single record from table " }, - "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.", + "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.", "noRecordsLinked": "No records linked", "noLinkedRecords": "No linked records", "recordsLinked": "records linked", @@ -1162,8 +1225,11 @@ } }, "info": { + "enterWorkspaceName": "Enter workspace name", + "enterBaseName": "Enter base name", "idpPaste": "Paste these URL in your Identity Providers console", "noSaml": "There are no configured SAML authentications.", + "noOIDC": "There are no configured OpenID authentications.", "disabledAsViewLocked": "Disabled as View is locked", "basesMigrated": "Bases are migrated. Please try again.", "pasteNotSupported": "Paste operation is not supported on the active cell", @@ -1339,6 +1405,7 @@ "fetchingCalendarData": "Error fetching calendar data", "fetchingActiveDates": "Error fetching active dates", "scopesRequired": "Scopes required", + "domainRequired": "Domain name is required", "authUrlRequired": "Auth URL is required", "userNameAttributeRequired": "Username attribute is required", "clientIdRequired": "Client ID is required", @@ -1352,6 +1419,7 @@ "nameMinLength": "Name must be at least 2 characters long", "nameMaxLength": "Name must be at most 60 characters long", "viewNameRequired": "View name is required", + "domainNameRequired": "Domain name is required", "nameMaxLength256": "Name must be at most 256 characters long", "viewNameUnique": "View name should be unique", "searchProject": "Tìm kiếm của bạn cho {search} tìm thấy không có kết quả", diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json index e37ca7ffef..4af00866d2 100644 --- a/packages/nc-gui/lang/zh-Hans.json +++ b/packages/nc-gui/lang/zh-Hans.json @@ -39,6 +39,8 @@ } }, "general": { + "role": "Role", + "general": "General", "quit": "退出", "home": "首页", "load": "加载", @@ -198,11 +200,14 @@ "logo": "Logo", "dropdown": "下拉", "list": "列表", + "verify": "Verify", "apply": "应用", "text": "文本", "appearance": "外观" }, "objects": { + "owner": "Owner", + "member": "Member", "day": "日", "week": "周", "month": "月", @@ -247,6 +252,7 @@ "viewer": "浏览者", "noaccess": "没有访问权限", "superAdmin": "超级管理员", + "orgLevelOwner": "Organization Level Owner", "orgLevelCreator": "创始人", "orgLevelViewer": "游客" }, @@ -313,6 +319,10 @@ "isNotNull": "不为空（Not Null）" }, "title": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename Workspace", + "renamingWorkspace": "Renaming Workspace", + "renamingBase": "Renaming Base", "sso": "身份验证 (SSO)", "docs": "文档", "forum": "论坛", @@ -437,6 +447,39 @@ "noResultsMatchedYourSearch": "Your search did not yield any matching results." }, "labels": { + "txt": "TXT Record value", + "transferOwnership": "Transfer Ownership", + "recentActivity": "Recent Activity", + "goToMembers": "Go to Members", + "addMember": "Add Member", + "numberOfMembers": "No. Members", + "numberOfBases": "No. Bases", + "numberOfRecords": "No. Records", + "workspaceName": "Workspace Name", + "workspaceWithoutOwner": "Workspace without Owners", + "inviteUsersToWorkspace": "Invite Users to Workspace", + "selectWorkspace": "-select workspaces to invite to-", + "addMembersToOrganization": "Add Members to Organization", + "memberIn": "Member in:", + "assignAs": "Assign as", + "signOutUser": "Sign out user", + "signOutUsers": "Sign out users", + "deactivateUser": "Deactivate User", + "deactivateUsers": "Deactivate Users", + "lastActive": "Last Active", + "dateAdded": "Date Added", + "uploadImage": "Upload Image", + "organizationProfile": "Organisation Profile", + "organizationImage": "Organisation Image", + "organizationName": "Organisation Name", + "activeDomains": "Active Domains", + "domains": "Domains", + "disablePublicSharing": "Disable Public Sharing", + "shareSettings": "Share Settings", + "deleteUserAndData": "Delete User and their data", + "userOptions": "User Options", + "deleteThisOrganization": "Delete this Organisation", + "dangerZone": "Dangerzone", "selectYear": "选择年份", "save": "保存", "cancel": "取消", @@ -447,7 +490,15 @@ "saml": "Security Assertion Markup Language (SAML)", "newProvider": "连接服务", "generalSettings": "通用设置", + "adminPanel": "Admin Panel", + "moveWorkspaceToOrg": "Move Workspace To Organisation", "ssoSettings": "SSO设置", + "addDomain": "Add Domain", + "domain": "Domain", + "settings": "Settings", + "workspaces": "Workspaces", + "back": "Back", + "dashboard": "Dashboard", "organizeBy": "组织方式", "previous": "返回", "nextMonth": "下个月", @@ -709,9 +760,16 @@ "clearSelection": "清除选择" }, "activity": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename workspace", + "deactivate": "De-activate", + "manageUsers": "Manage Users", + "newWorkspace": "New Workspace", + "addDomain": "Add Domain", "addMembers": "添加成员", "enterEmail": "输入邮箱地址", "inviteToBase": "邀请", + "inviteToWorkspace": "Invite to Workspace", "addMember": "添加用户到项目", "noRange": "日历视图需要日期范围", "goToToday": "转到今天", @@ -1036,6 +1094,11 @@ "searchOptions": "搜索选项" }, "msg": { + "controlOrgAppearance": "Control your organisations name and appearance.", + "addCompanyDomains": "Add company domains to restrict access to unwanted users.", + "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.", + "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.", + "deleteOrganization": "Delete all users, bases and data related to this organization", "clickToCopyFieldId": "点击复制字段ID", "enterPassword": "输入密码", "bySigningUp": "注册即表示您同意服务条款", @@ -1118,7 +1181,7 @@ "tooltip_desc": "表中的一条记录 ", "tooltip_desc2": " 可以从表中链接到单条记录 " }, - "clickLinkRecordsToAddLinkFromTable": "点击\"引用\"将数据关联到 \"{tableName}\"", + "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.", "noRecordsLinked": "没有链接记录", "noLinkedRecords": "暂无引用数据", "recordsLinked": "链接的记录", @@ -1162,8 +1225,11 @@ } }, "info": { + "enterWorkspaceName": "Enter workspace name", + "enterBaseName": "Enter base name", "idpPaste": "将此URL粘贴到您的身份提供商后台", "noSaml": "没有配置 SAML 身份验证", + "noOIDC": "There are no configured OpenID authentications.", "disabledAsViewLocked": "已禁用，因为视图已锁定", "basesMigrated": "项目已迁移。请重试。", "pasteNotSupported": "处于活动状态的单元格不能粘贴内容", @@ -1339,6 +1405,7 @@ "fetchingCalendarData": "获取日历数据时出错", "fetchingActiveDates": "获取活动日期时出错", "scopesRequired": "范围不能为空", + "domainRequired": "Domain name is required", "authUrlRequired": "鉴权链接不能为空", "userNameAttributeRequired": "用户名不能为空", "clientIdRequired": "Client ID 不能为空", @@ -1352,6 +1419,7 @@ "nameMinLength": "名称长度必须至少为 2 个字符", "nameMaxLength": "名称长度不得超过 60 个字符", "viewNameRequired": "视图名称为必填项", + "domainNameRequired": "Domain name is required", "nameMaxLength256": "名称长度不得超过 256 个字符", "viewNameUnique": "视图名称应该是唯一的", "searchProject": "搜索： {search} 没有发现匹配的结果", diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json index 3a78b66ed7..d06a67e99a 100644 --- a/packages/nc-gui/lang/zh-Hant.json +++ b/packages/nc-gui/lang/zh-Hant.json @@ -39,6 +39,8 @@ } }, "general": { + "role": "Role", + "general": "General", "quit": "Quit", "home": "首頁", "load": "載入", @@ -198,11 +200,14 @@ "logo": "Logo", "dropdown": "Dropdown", "list": "List", + "verify": "Verify", "apply": "Apply", "text": "Text", "appearance": "Appearance" }, "objects": { + "owner": "Owner", + "member": "Member", "day": "Day", "week": "Week", "month": "Month", @@ -247,6 +252,7 @@ "viewer": "檢視者", "noaccess": "No Access", "superAdmin": "Super Admin", + "orgLevelOwner": "Organization Level Owner", "orgLevelCreator": "組織層級建立者", "orgLevelViewer": "組織層級檢視者" }, @@ -313,6 +319,10 @@ "isNotNull": "內容不為 Null" }, "title": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename Workspace", + "renamingWorkspace": "Renaming Workspace", + "renamingBase": "Renaming Base", "sso": "Authentication (SSO)", "docs": "Docs", "forum": "Forum", @@ -437,6 +447,39 @@ "noResultsMatchedYourSearch": "Your search did not yield any matching results." }, "labels": { + "txt": "TXT Record value", + "transferOwnership": "Transfer Ownership", + "recentActivity": "Recent Activity", + "goToMembers": "Go to Members", + "addMember": "Add Member", + "numberOfMembers": "No. Members", + "numberOfBases": "No. Bases", + "numberOfRecords": "No. Records", + "workspaceName": "Workspace Name", + "workspaceWithoutOwner": "Workspace without Owners", + "inviteUsersToWorkspace": "Invite Users to Workspace", + "selectWorkspace": "-select workspaces to invite to-", + "addMembersToOrganization": "Add Members to Organization", + "memberIn": "Member in:", + "assignAs": "Assign as", + "signOutUser": "Sign out user", + "signOutUsers": "Sign out users", + "deactivateUser": "Deactivate User", + "deactivateUsers": "Deactivate Users", + "lastActive": "Last Active", + "dateAdded": "Date Added", + "uploadImage": "Upload Image", + "organizationProfile": "Organisation Profile", + "organizationImage": "Organisation Image", + "organizationName": "Organisation Name", + "activeDomains": "Active Domains", + "domains": "Domains", + "disablePublicSharing": "Disable Public Sharing", + "shareSettings": "Share Settings", + "deleteUserAndData": "Delete User and their data", + "userOptions": "User Options", + "deleteThisOrganization": "Delete this Organisation", + "dangerZone": "Dangerzone", "selectYear": "Select Year", "save": "Save", "cancel": "Cancel", @@ -447,7 +490,15 @@ "saml": "Security Assertion Markup Language (SAML)", "newProvider": "New Provider", "generalSettings": "General Settings", + "adminPanel": "Admin Panel", + "moveWorkspaceToOrg": "Move Workspace To Organisation", "ssoSettings": "SSO Settings", + "addDomain": "Add Domain", + "domain": "Domain", + "settings": "Settings", + "workspaces": "Workspaces", + "back": "Back", + "dashboard": "Dashboard", "organizeBy": "Organize by", "previous": "Previous", "nextMonth": "Next Month", @@ -709,9 +760,16 @@ "clearSelection": "Clear selection" }, "activity": { + "renameBase": "Rename Base", + "renameWorkspace": "Rename workspace", + "deactivate": "De-activate", + "manageUsers": "Manage Users", + "newWorkspace": "New Workspace", + "addDomain": "Add Domain", "addMembers": "Add Members", "enterEmail": "Enter email addresses", "inviteToBase": "Invite to Base", + "inviteToWorkspace": "Invite to Workspace", "addMember": "Add Member to Base", "noRange": "Calendar view requires a date range", "goToToday": "Go to Today", @@ -1036,6 +1094,11 @@ "searchOptions": "Search options" }, "msg": { + "controlOrgAppearance": "Control your organisations name and appearance.", + "addCompanyDomains": "Add company domains to restrict access to unwanted users.", + "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.", + "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.", + "deleteOrganization": "Delete all users, bases and data related to this organization", "clickToCopyFieldId": "Click to copy Field Id", "enterPassword": "Enter password", "bySigningUp": "By signing up, you agree to the", @@ -1118,7 +1181,7 @@ "tooltip_desc": "A single record from table ", "tooltip_desc2": " can be linked with a single record from table " }, - "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.", + "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.", "noRecordsLinked": "No records linked", "noLinkedRecords": "No linked records", "recordsLinked": "records linked", @@ -1162,8 +1225,11 @@ } }, "info": { + "enterWorkspaceName": "Enter workspace name", + "enterBaseName": "Enter base name", "idpPaste": "Paste these URL in your Identity Providers console", "noSaml": "There are no configured SAML authentications.", + "noOIDC": "There are no configured OpenID authentications.", "disabledAsViewLocked": "Disabled as View is locked", "basesMigrated": "Bases are migrated. Please try again.", "pasteNotSupported": "不支援在啟用的儲存格中執行貼上", @@ -1339,6 +1405,7 @@ "fetchingCalendarData": "Error fetching calendar data", "fetchingActiveDates": "Error fetching active dates", "scopesRequired": "Scopes required", + "domainRequired": "Domain name is required", "authUrlRequired": "Auth URL is required", "userNameAttributeRequired": "Username attribute is required", "clientIdRequired": "Client ID is required", @@ -1352,6 +1419,7 @@ "nameMinLength": "Name must be at least 2 characters long", "nameMaxLength": "Name must be at most 60 characters long", "viewNameRequired": "View name is required", + "domainNameRequired": "Domain name is required", "nameMaxLength256": "Name must be at most 256 characters long", "viewNameUnique": "View name should be unique", "searchProject": "您的搜尋 {search} 找不到結果", diff --git a/packages/nc-gui/lib/acl.ts b/packages/nc-gui/lib/acl.ts index c38247b0ce..837f14ddb4 100644 --- a/packages/nc-gui/lib/acl.ts +++ b/packages/nc-gui/lib/acl.ts @@ -36,6 +36,7 @@ const rolePermissions = { newUser: true, viewCreateOrEdit: true, baseReorder: true, + orgAdminPanel: true, }, }, [OrgUserRoles.VIEWER]: { diff --git a/packages/nc-gui/lib/types.ts b/packages/nc-gui/lib/types.ts index 24c1d997f5..c32fdab28b 100644 --- a/packages/nc-gui/lib/types.ts +++ b/packages/nc-gui/lib/types.ts @@ -64,6 +64,8 @@ interface Row { commentCount?: number changed?: boolean saving?: boolean + ltarState?: Record