Parameter Name
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/nc-gui/pages/index/[typeOrId]/[projectId]/index/index/[type]/[viewId]/[[viewTitle]]/[...slugs].vue b/packages/nc-gui/components/dashboard/Sidebar/TopSection/Header.vue
similarity index 100%
rename from packages/nc-gui/pages/index/[typeOrId]/[projectId]/index/index/[type]/[viewId]/[[viewTitle]]/[...slugs].vue
rename to packages/nc-gui/components/dashboard/Sidebar/TopSection/Header.vue
diff --git a/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
new file mode 100644
index 0000000000..ae913e231e
--- /dev/null
+++ b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
@@ -0,0 +1,188 @@
+
+
+
+
+
+ Team & Settings
+
+
+ {{ $t('title.newProj') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/nc-gui/components/dashboard/TreeView.vue b/packages/nc-gui/components/dashboard/TreeView.vue
deleted file mode 100644
index 9e7151cba7..0000000000
--- a/packages/nc-gui/components/dashboard/TreeView.vue
+++ /dev/null
@@ -1,1475 +0,0 @@
-
-
-
-
+
+
+
+ {{ name ? name : user?.email }}
+
+ (Community Translated)
+
+
+ © 2023 NocoDB. Inc
+
+
+
+
+ Star
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/nc-gui/components/dashboard/TreeViewNew/AddNewTableNode.vue b/packages/nc-gui/components/dashboard/TreeView/AddNewTableNode.vue
similarity index 100%
rename from packages/nc-gui/components/dashboard/TreeViewNew/AddNewTableNode.vue
rename to packages/nc-gui/components/dashboard/TreeView/AddNewTableNode.vue
diff --git a/packages/nc-gui/components/dashboard/TreeViewNew/BaseOptions.vue b/packages/nc-gui/components/dashboard/TreeView/BaseOptions.vue
similarity index 100%
rename from packages/nc-gui/components/dashboard/TreeViewNew/BaseOptions.vue
rename to packages/nc-gui/components/dashboard/TreeView/BaseOptions.vue
diff --git a/packages/nc-gui/components/dashboard/TreeViewNew/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
similarity index 95%
rename from packages/nc-gui/components/dashboard/TreeViewNew/ProjectNode.vue
rename to packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 8168f11f00..91c699e9f9 100644
--- a/packages/nc-gui/components/dashboard/TreeViewNew/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -175,6 +175,8 @@ function openTableCreateDialog(baseIndex?: number | undefined) {
if (!table) return
+ project.value.isExpanded = true
+
if (!activeKey.value || !activeKey.value.includes(`collapse-${baseId}`)) {
activeKey.value.push(`collapse-${baseId}`)
}
@@ -200,10 +202,19 @@ const addNewProjectChildEntity = async () => {
if (isAddNewProjectChildEntityLoading.value) return
isAddNewProjectChildEntityLoading.value = true
+
+ const isProjectPopulated = projectsStore.isProjectPopulated(project.value.id!)
+ if (!isProjectPopulated && project.value.type === NcProjectType.DB) {
+ // We do not wait for tables api, so that add new table is seamless.
+ // Only con would be while saving table duplicate table name FE validation might not work
+ // If the table list api takes time to load before the table name validation
+ loadProjectTables(project.value.id!)
+ }
+
try {
openTableCreateDialog()
- if (!project.value.isExpanded) {
+ if (!project.value.isExpanded && project.value.type !== NcProjectType.DB) {
project.value.isExpanded = true
}
} finally {
@@ -246,7 +257,6 @@ const onProjectClick = async (project: NcProject, ignoreNavigation?: boolean, to
}
if (!isProjectPopulated) {
- await loadProject(project.id!)
await loadProjectTables(project.id!)
}
@@ -375,7 +385,7 @@ const DlgProjectDuplicateOnOk = async (jobData: { id: string; project_id: string
@click="onProjectClick(project, true, true)"
>
-
-
-
-
+
-
+
{{ 'Change icon' }}
diff --git a/packages/nc-gui/components/dashboard/TreeViewNew/index.vue b/packages/nc-gui/components/dashboard/TreeView/index.vue
similarity index 81%
rename from packages/nc-gui/components/dashboard/TreeViewNew/index.vue
rename to packages/nc-gui/components/dashboard/TreeView/index.vue
index 99453e31ad..c8f8b82922 100644
--- a/packages/nc-gui/components/dashboard/TreeViewNew/index.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/index.vue
@@ -2,7 +2,6 @@
import type { TableType } from 'nocodb-sdk'
import { message } from 'ant-design-vue'
-import GithubButton from 'vue-github-button'
import ProjectWrapper from './ProjectWrapper.vue'
import type { TabType } from '#imports'
@@ -28,10 +27,6 @@ import {
import { useRouter } from '#app'
-const emit = defineEmits<{
- (event: 'onScrollTop', type: boolean): void
-}>()
-
const { isUIAllowed } = useUIPermission()
const { addTab } = useTabs()
@@ -48,8 +43,12 @@ const { createProject: _createProject } = projectsStore
const { projects, projectsList, activeProjectId } = storeToRefs(projectsStore)
+const { isWorkspaceLoading } = storeToRefs(useWorkspace())
+
const { openTable } = useTablesStore()
+const projectCreateDlg = ref(false)
+
const projectStore = useProject()
const { loadTables } = projectStore
@@ -184,6 +183,12 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
}
break
}
+ // ALT + D
+ case 68: {
+ e.stopPropagation()
+ projectCreateDlg.value = true
+ break
+ }
}
}
})
@@ -203,19 +208,6 @@ provide(TreeViewInj, {
useEventListener(document, 'contextmenu', handleContext, true)
-const treeViewDom = ref()
-
-const checkScrollTopMoreThanZero = () => {
- if (treeViewDom.value) {
- if (treeViewDom.value.scrollTop > 0) {
- emit('onScrollTop', true)
- } else {
- emit('onScrollTop', false)
- }
- }
- return false
-}
-
const scrollTableNode = () => {
const activeTableDom = document.querySelector(`.nc-treeview [data-table-id="${_activeTable.value?.id}"]`)
if (!activeTableDom) return
@@ -256,56 +248,24 @@ watch(
immediate: true,
},
)
-
-onMounted(() => {
- treeViewDom.value?.addEventListener('scroll', checkScrollTopMoreThanZero)
-})
-
-onUnmounted(() => {
- treeViewDom.value?.removeEventListener('scroll', checkScrollTopMoreThanZero)
-})
New Base
+
diff --git a/packages/nc-gui/components/dlg/AirtableImport.vue b/packages/nc-gui/components/dlg/AirtableImport.vue
index d94329e29d..018afccaa5 100644
--- a/packages/nc-gui/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui/components/dlg/AirtableImport.vue
@@ -25,9 +25,9 @@ const { modelValue, baseId } = defineProps<{
const emit = defineEmits(['update:modelValue'])
-const { appInfo } = useGlobal()
+const { $api } = useNuxtApp()
-const baseURL = appInfo.value.ncSiteUrl
+const baseURL = $api.instance.defaults.baseURL;
const { $state, $jobs } = useNuxtApp()
diff --git a/packages/nc-gui/components/dlg/ProjectDuplicate.vue b/packages/nc-gui/components/dlg/ProjectDuplicate.vue
index 21fc1290db..3fba10c99a 100644
--- a/packages/nc-gui/components/dlg/ProjectDuplicate.vue
+++ b/packages/nc-gui/components/dlg/ProjectDuplicate.vue
@@ -33,8 +33,8 @@ const optionsToExclude = computed(() => {
const isLoading = ref(false)
const _duplicate = async () => {
- isLoading.value = true
try {
+ isLoading.value = true
// pick a random color from array and assign to project
const color = projectThemeColors[Math.floor(Math.random() * 1000) % projectThemeColors.length]
const tcolor = tinycolor(color)
@@ -58,18 +58,28 @@ const _duplicate = async () => {
props.onOk(jobData as any)
} catch (e: any) {
message.error(await extractSdkResponseErrorMsg(e))
+ } finally {
+ isLoading.value = false
+ dialogShow.value = false
}
- isLoading.value = false
- dialogShow.value = false
}
+onKeyStroke('Enter', () => {
+ // should only trigger this when our modal is open
+ if (dialogShow.value) {
+ _duplicate()
+ }
+})
+
const isEaster = ref(false)
{{ $t('general.cancel') }}
- {{ $t('general.confirm') }}
+ {{ $t('general.confirm') }}
-
-
diff --git a/packages/nc-gui/components/dlg/TableDuplicate.vue b/packages/nc-gui/components/dlg/TableDuplicate.vue
index c6293a51e0..f719589dd9 100644
--- a/packages/nc-gui/components/dlg/TableDuplicate.vue
+++ b/packages/nc-gui/components/dlg/TableDuplicate.vue
@@ -32,55 +32,59 @@ const optionsToExclude = computed(() => {
const isLoading = ref(false)
const _duplicate = async () => {
- isLoading.value = true
try {
+ isLoading.value = true
const jobData = await api.dbTable.duplicate(props.table.project_id!, props.table.id!, { options: optionsToExclude.value })
props.onOk(jobData as any)
} catch (e: any) {
message.error(await extractSdkResponseErrorMsg(e))
+ } finally {
+ isLoading.value = false
+ dialogShow.value = false
}
- isLoading.value = false
- dialogShow.value = false
}
+onKeyStroke('Enter', () => {
+ // should only trigger this when our modal is open
+ if (dialogShow.value) {
+ _duplicate()
+ }
+})
+
const isEaster = ref(false)
-
-
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 4ec3d9f95c..6bb55c0941 100644
--- a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
+++ b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
@@ -379,6 +379,7 @@ watch(
+
diff --git a/packages/nc-gui/components/dashboard/settings/app-store/AppInstall.vue b/packages/nc-gui/components/dashboard/settings/app-store/AppInstall.vue
index c345d8dca7..510c8f99e0 100644
--- a/packages/nc-gui/components/dashboard/settings/app-store/AppInstall.vue
+++ b/packages/nc-gui/components/dashboard/settings/app-store/AppInstall.vue
@@ -264,16 +264,17 @@ onMounted(async () => {
-
-
+
-
-
-
-
- Star
-
-
-
-
-
+
-
{{ action.label }}
-
+
New Base
+
diff --git a/packages/nc-gui/components/dlg/AirtableImport.vue b/packages/nc-gui/components/dlg/AirtableImport.vue
index d94329e29d..018afccaa5 100644
--- a/packages/nc-gui/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui/components/dlg/AirtableImport.vue
@@ -25,9 +25,9 @@ const { modelValue, baseId } = defineProps<{
const emit = defineEmits(['update:modelValue'])
-const { appInfo } = useGlobal()
+const { $api } = useNuxtApp()
-const baseURL = appInfo.value.ncSiteUrl
+const baseURL = $api.instance.defaults.baseURL;
const { $state, $jobs } = useNuxtApp()
diff --git a/packages/nc-gui/components/dlg/ProjectDuplicate.vue b/packages/nc-gui/components/dlg/ProjectDuplicate.vue
index 21fc1290db..3fba10c99a 100644
--- a/packages/nc-gui/components/dlg/ProjectDuplicate.vue
+++ b/packages/nc-gui/components/dlg/ProjectDuplicate.vue
@@ -33,8 +33,8 @@ const optionsToExclude = computed(() => {
const isLoading = ref(false)
const _duplicate = async () => {
- isLoading.value = true
try {
+ isLoading.value = true
// pick a random color from array and assign to project
const color = projectThemeColors[Math.floor(Math.random() * 1000) % projectThemeColors.length]
const tcolor = tinycolor(color)
@@ -58,18 +58,28 @@ const _duplicate = async () => {
props.onOk(jobData as any)
} catch (e: any) {
message.error(await extractSdkResponseErrorMsg(e))
+ } finally {
+ isLoading.value = false
+ dialogShow.value = false
}
- isLoading.value = false
- dialogShow.value = false
}
+onKeyStroke('Enter', () => {
+ // should only trigger this when our modal is open
+ if (dialogShow.value) {
+ _duplicate()
+ }
+})
+
const isEaster = ref(false)
-
{{ $t('general.duplicate') }}
+
+ {{ $t('general.duplicate') }} {{ $t('objects.project') }}
+
Are you sure you want to duplicate the `{{ project.title }}` project?
@@ -85,9 +95,7 @@ const isEaster = ref(false)
-
- {{ $t('general.duplicate') }} {{ table.title }}
+
+ {{ $t('general.duplicate') }} {{ $t('objects.table') }}
-
- Include hooks
+
-
-
-
-
- Are you sure you want to duplicate the `{{ table.title }}` table?
+
+ {{ $t('title.advancedSettings') }}
+
+
+ Include data
+ Include views
+ Include webhooks
- {{ $t('general.cancel') }}
-
- {{ $t('general.duplicate') }}
-
+
+ {{ $t('general.cancel') }}
+ {{ $t('general.confirm') }}
-
+
-
-
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
index 905560a185..ba5426fb79 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
@@ -155,11 +155,8 @@ watch(showShareModal, (val) => {
-
Share Base
{
+const { isLeftSidebarOpen: _isLeftSidebarOpen } = storeToRefs(useSidebarStore())
+const isLeftSidebarOpen = ref(_isLeftSidebarOpen.value)
+
+watch(_isLeftSidebarOpen, (val) => {
+ if (val) {
+ isLeftSidebarOpen.value = true
+ } else {
+ setTimeout(() => {
+ isLeftSidebarOpen.value = false
+ }, 300)
+ }
+})
+
+const onClick = () => {
+ if (_isLeftSidebarOpen.value) return
+
+ _isLeftSidebarOpen.value = !_isLeftSidebarOpen.value
+}
+
+
+
+
+
+ {{
+ isLeftSidebarOpen
+ ? `${$t('general.hide')} ${$t('objects.sidebar').toLowerCase()}`
+ : `${$t('general.show')} ${$t('objects.sidebar').toLowerCase()}`
+ }}
+
+
+
+
+
diff --git a/packages/nc-gui/components/general/ReleaseInfo.vue b/packages/nc-gui/components/general/ReleaseInfo.vue
index 058262417f..fb06d34aad 100644
--- a/packages/nc-gui/components/general/ReleaseInfo.vue
+++ b/packages/nc-gui/components/general/ReleaseInfo.vue
@@ -3,7 +3,7 @@ import { computed, extractSdkResponseErrorMsg, message, onMounted, useGlobal, us
const { $api } = useNuxtApp()
-const { currentVersion, latestRelease, hiddenRelease } = useGlobal()
+const { currentVersion, latestRelease, hiddenRelease, appInfo } = useGlobal()
const releaseAlert = computed({
get() {
@@ -41,14 +41,14 @@ onMounted(async () => await fetchReleaseInfo())
-
+
+
+
-
+
+
+
diff --git a/packages/nc-gui/components/nc/Badge.vue b/packages/nc-gui/components/nc/Badge.vue
index 5901d2a1cc..53d55c040e 100644
--- a/packages/nc-gui/components/nc/Badge.vue
+++ b/packages/nc-gui/components/nc/Badge.vue
@@ -1,5 +1,4 @@
@@ -39,7 +59,7 @@ const visible = useVModel(props, 'visible', emits)
diff --git a/packages/nc-gui/components/nc/Menu.vue b/packages/nc-gui/components/nc/Menu.vue
new file mode 100644
index 0000000000..3afd9e6565
--- /dev/null
+++ b/packages/nc-gui/components/nc/Menu.vue
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
diff --git a/packages/nc-gui/components/nc/MenuItem.vue b/packages/nc-gui/components/nc/MenuItem.vue
new file mode 100644
index 0000000000..08a42be6b4
--- /dev/null
+++ b/packages/nc-gui/components/nc/MenuItem.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
diff --git a/packages/nc-gui/components/nc/Modal.vue b/packages/nc-gui/components/nc/Modal.vue
index f40bc2160c..f50143b6d9 100644
--- a/packages/nc-gui/components/nc/Modal.vue
+++ b/packages/nc-gui/components/nc/Modal.vue
@@ -55,6 +55,8 @@ const height = computed(() => {
})
const visible = useVModel(props, 'visible', emits)
+
+const slots = useSlots()
@@ -76,7 +78,7 @@ const visible = useVModel(props, 'visible', emits)
maxHeight: height,
}"
>
-
-
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
index 85e117b19b..83046ec0c5 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
@@ -49,7 +49,7 @@ const { copy } = useCopy()
const copyRecordUrl = () => {
copy(
encodeURI(
- `${dashboardUrl?.value}#/${route.params.typeOrId}/${route.params.projectId}/${route.params.type}/${meta.value?.id}${
+ `${dashboardUrl?.value}#/${route.params.typeOrId}/${route.params.projectId}/${meta.value?.id}${
props.view ? `/${props.view.title}` : ''
}?rowId=${primaryKey.value}`,
),
diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index ef05be4d58..9346b2ee94 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -1124,7 +1124,7 @@ defineExpose({
})
// when expand is clicked the drawer should open
-// and cell should loose focus
+// and cell should loose focs
const expandAndLooseFocus = (row: Row, col: Record) => {
if (expandForm) {
expandForm(row, col)
@@ -1218,7 +1218,7 @@ const expandAndLooseFocus = (row: Row, col: Record) => {
>
) => {
>
) => {
:extra-style="paginationStyleRef?.extraStyle"
>
-
{{ $t('activity.upgrade.available') }}
-
diff --git a/packages/nc-gui/components/general/UserIcon.vue b/packages/nc-gui/components/general/UserIcon.vue
new file mode 100644
index 0000000000..e0428d02bf
--- /dev/null
+++ b/packages/nc-gui/components/general/UserIcon.vue
@@ -0,0 +1,51 @@
+
+
+
+
-
+
+ {{ usernameInitials }}
+
+
+
+
+
diff --git a/packages/nc-gui/components/general/ViewIcon.vue b/packages/nc-gui/components/general/ViewIcon.vue
index 0ced0f2f88..32356c84d6 100644
--- a/packages/nc-gui/components/general/ViewIcon.vue
+++ b/packages/nc-gui/components/general/ViewIcon.vue
@@ -23,11 +23,14 @@ const viewMeta = toRef(props, 'meta')
v-else-if="viewMeta?.type"
class="nc-view-icon group-hover"
:style="{
- 'color': !props.ignoreColor ? viewIcons[viewMeta.type]?.color : undefined,
- 'fontWeight': 500,
- '-webkit-text-stroke': !props.ignoreColor ? `0.5px ${viewIcons[viewMeta.type]?.color}` : '0.5px',
+ color: !props.ignoreColor ? viewIcons[viewMeta.type]?.color : undefined,
+ fontWeight: 500,
}"
/>
-
+
diff --git a/packages/nc-gui/components/general/WorkspaceIcon.vue b/packages/nc-gui/components/general/WorkspaceIcon.vue
new file mode 100644
index 0000000000..be32b5c108
--- /dev/null
+++ b/packages/nc-gui/components/general/WorkspaceIcon.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
+ {{ props.workspace?.title?.slice(0, 2) }}
+
+
+
+
+
diff --git a/packages/nc-gui/components/general/language/index.vue b/packages/nc-gui/components/general/language/index.vue
index 6b08c99492..4a3fa748de 100644
--- a/packages/nc-gui/components/general/language/index.vue
+++ b/packages/nc-gui/components/general/language/index.vue
@@ -9,7 +9,7 @@
+
()
+const props = defineProps()
+
+const modifierKey = computed(() => props.modifierKey)
+const tooltipStyle = computed(() => props.tooltipStyle)
+const disabled = computed(() => props.disabled)
+const hideOnClick = computed(() => props.hideOnClick)
+const placement = computed(() => props.placement ?? 'top')
const el = ref()
const showTooltip = controlledRef(false, {
onBeforeChange: (shouldShow) => {
- if (shouldShow && disabled) return false
+ if (shouldShow && disabled.value) return false
},
})
@@ -31,7 +37,7 @@ const attrs = useAttrs()
const isKeyPressed = ref(false)
onKeyStroke(
- (e) => e.key === modifierKey,
+ (e) => e.key === modifierKey.value,
(e) => {
e.preventDefault()
@@ -45,7 +51,7 @@ onKeyStroke(
)
onKeyStroke(
- (e) => e.key === modifierKey,
+ (e) => e.key === modifierKey.value,
(e) => {
e.preventDefault()
@@ -55,7 +61,7 @@ onKeyStroke(
{ eventName: 'keyup' },
)
-watch([isHovering, () => modifierKey, () => disabled], ([hovering, key, isDisabled]) => {
+watch([isHovering, () => modifierKey.value, () => disabled.value], ([hovering, key, isDisabled]) => {
if (!hovering || isDisabled) {
showTooltip.value = false
return
@@ -85,7 +91,7 @@ const divStyles = computed(() => ({
}))
const onClick = () => {
- if (hideOnClick && showTooltip.value) {
+ if (hideOnClick.value && showTooltip.value) {
showTooltip.value = false
}
}
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index 682f8ffb8e..c2b2624630 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -1,8 +1,8 @@
diff --git a/packages/nc-gui/components/smartsheet/Topbar.vue b/packages/nc-gui/components/smartsheet/Topbar.vue
index e6bb0d336a..cf502f9fb4 100644
--- a/packages/nc-gui/components/smartsheet/Topbar.vue
+++ b/packages/nc-gui/components/smartsheet/Topbar.vue
@@ -22,13 +22,17 @@ const isSharedBase = computed(() => route.value.params.typeOrId === 'base')
diff --git a/packages/nc-gui/components/smartsheet/column/AdvancedOptions.vue b/packages/nc-gui/components/smartsheet/column/AdvancedOptions.vue
index 05e9e7594b..417c05c11a 100644
--- a/packages/nc-gui/components/smartsheet/column/AdvancedOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/AdvancedOptions.vue
@@ -50,7 +50,7 @@ vModel.value.au = !!vModel.value.au */
-
+
-
+
@@ -95,13 +96,13 @@ vModel.value.au = !!vModel.value.au */
-
+
import type { ColumnReqType, ColumnType } from 'nocodb-sdk'
-import { ColumnInj, IsFormInj, IsKanbanInj, IsLockedInj, inject, provide, ref, toRef, useUIPermission } from '#imports'
+import { ColumnInj, IsFormInj, IsKanbanInj, inject, provide, ref, toRef, useUIPermission } from '#imports'
interface Props {
column: ColumnType
@@ -18,8 +18,6 @@ const isDropDownOpen = ref(false)
const isKanban = inject(IsKanbanInj, ref(false))
-const isLocked = inject(IsLockedInj, ref(false))
-
const column = toRef(props, 'column')
const { isUIAllowed } = useUIPermission()
@@ -41,7 +39,7 @@ const closeAddColumnDropdown = () => {
}
const openHeaderMenu = () => {
- if (!isLocked.value && !isForm.value && isUIAllowed('edit-column')) {
+ if (!isForm.value && isUIAllowed('edit-column')) {
editColumnDropdown.value = true
}
}
@@ -59,7 +57,7 @@ const openHeaderMenu = () => {
diff --git a/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue b/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue
index 30bd040c3f..451577c05f 100644
--- a/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue
+++ b/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue
@@ -303,7 +303,7 @@ const setIcon = async (icon: string, view: ViewType) => {
diff --git a/packages/nc-gui/components/smartsheet/sidebar/RenameableMenuItem.vue b/packages/nc-gui/components/smartsheet/sidebar/RenameableMenuItem.vue
index 630f626fe7..84c9a348b9 100644
--- a/packages/nc-gui/components/smartsheet/sidebar/RenameableMenuItem.vue
+++ b/packages/nc-gui/components/smartsheet/sidebar/RenameableMenuItem.vue
@@ -37,6 +37,8 @@ const activeView = inject(ActiveViewInj, ref())
const isLocked = inject(IsLockedInj, ref(false))
+const { rightSidebarState } = storeToRefs(useSidebarStore())
+
const isDropdownOpen = ref(false)
const isEditing = ref(false)
@@ -167,6 +169,12 @@ function onStopEdit() {
isStopped.value = false
}, 250)
}
+
+watch(rightSidebarState, () => {
+ if (rightSidebarState.value === 'peekCloseEnd') {
+ isDropdownOpen.value = false
+ }
+})
diff --git a/packages/nc-gui/components/smartsheet/sidebar/index.vue b/packages/nc-gui/components/smartsheet/sidebar/index.vue
index 3e516d4ece..4c01f34c45 100644
--- a/packages/nc-gui/components/smartsheet/sidebar/index.vue
+++ b/packages/nc-gui/components/smartsheet/sidebar/index.vue
@@ -16,9 +16,6 @@ import {
useViewsStore,
watch,
} from '#imports'
-import FieldIcon from '~icons/nc-icons/eye'
-
-const openedTab = ref<'views' | 'developer'>('views')
const { refreshCommandPalette } = useCommandPalette()
@@ -50,12 +47,10 @@ const route = useRoute()
const { $e } = useNuxtApp()
-const { rightSidebarSize } = storeToRefs(useSidebarStore())
+const { isRightSidebarOpen } = storeToRefs(useSidebarStore())
const tabBtnsContainerRef = ref(null)
-const minimalMode = ref(false)
-
/** Watch route param and change active view based on `viewTitle` */
watch(
[views, () => route.params.viewTitle],
@@ -142,40 +137,6 @@ function onOpenModal({
close(1000)
}
}
-const onTabChange = (tab: 'views' | 'developer') => {
- openedTab.value = tab
-}
-
-const onResize = () => {
- if (!tabBtnsContainerRef?.value) return
-
- const remToPx = parseFloat(getComputedStyle(document.documentElement).fontSize)
-
- if (!tabBtnsContainerRef?.value?.offsetWidth) return
-
- if (tabBtnsContainerRef?.value?.offsetWidth < 13 * remToPx) {
- minimalMode.value = true
- } else {
- minimalMode.value = false
- }
-}
-
-watch(
- () => rightSidebarSize.value?.current,
- () => {
- onResize()
- },
-)
-
-onMounted(() => {
- window.addEventListener('resize', onResize)
-
- onResize()
-})
-
-onUnmounted(() => {
- window.removeEventListener('resize', onResize)
-})
@@ -186,9 +147,41 @@ onUnmounted(() => {
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilterMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilterMenu.vue
index 20005fa33e..1117d3b3f9 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilterMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilterMenu.vue
@@ -60,7 +60,7 @@ useMenuCloseOnEsc(open)
-
+
diff --git a/packages/nc-gui/components/smartsheet/toolbar/Export.vue b/packages/nc-gui/components/smartsheet/toolbar/Export.vue
index 48d00d4be0..944581ea67 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/Export.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/Export.vue
@@ -6,8 +6,8 @@ import { iconMap } from '#imports'
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index 459705fdc8..2070a18119 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -278,7 +278,7 @@ useMenuCloseOnEsc(open)
-
+
-
diff --git a/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue
index 5efc46db2c..ca0cae4ba3 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue
@@ -142,7 +142,13 @@ watch(open, () => {
-
+
diff --git a/packages/nc-gui/components/smartsheet/toolbar/OpenViewSidebarBtn.vue b/packages/nc-gui/components/smartsheet/toolbar/OpenViewSidebarBtn.vue
new file mode 100644
index 0000000000..a6e5aaa146
--- /dev/null
+++ b/packages/nc-gui/components/smartsheet/toolbar/OpenViewSidebarBtn.vue
@@ -0,0 +1,53 @@
+
+
+
+
+
+ {{
+ isRightSidebarOpen
+ ? `${$t('general.hide')} ${$t('objects.sidebar').toLowerCase()}`
+ : `${$t('general.show')} ${$t('objects.sidebar').toLowerCase()}`
+ }}
+
+
+
+
+
diff --git a/packages/nc-gui/components/smartsheet/toolbar/SortListMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/SortListMenu.vue
index f574c6f152..4775ef572d 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/SortListMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/SortListMenu.vue
@@ -108,7 +108,7 @@ watch(open, () => {
-
+
+
+
()
const splitpaneWrapperRef = ref()
+const { rightSidebarState: sidebarState } = storeToRefs(useSidebarStore())
+
const contentSize = computed(() => 100 - sideBarSize.value.current)
-const isSidebarShort = ref(!isRightSidebarOpen.value)
-const animationDuration = 300
+const animationDuration = 250
const contentDomWidth = ref(window.innerWidth)
-const isMouseOverShowSidebarZone = ref(false)
-const isAnimationEndAfterSidebarHide = ref(!isRightSidebarOpen.value)
-const isStartHideSidebarAnimation = ref(false)
-const isLeftSidebarAnimating = ref(false)
const sidebarWidth = computed(() => (sideBarSize.value.old * contentDomWidth.value) / 100)
const currentSidebarSize = computed({
@@ -29,58 +26,44 @@ const currentSidebarSize = computed({
},
})
-const isSidebarHidden = ref(!isRightSidebarOpen.value)
-
watch(isRightSidebarOpen, () => {
sideBarSize.value.current = sideBarSize.value.old
if (isRightSidebarOpen.value) {
- setTimeout(() => {
- isSidebarShort.value = true
-
- isSidebarHidden.value = false
- }, 0)
+ setTimeout(() => (sidebarState.value = 'openStart'), 0)
- setTimeout(() => {
- isSidebarShort.value = false
- }, animationDuration / 2)
+ setTimeout(() => (sidebarState.value = 'openEnd'), animationDuration)
} else {
sideBarSize.value.old = sideBarSize.value.current
- isSidebarShort.value = true
- isAnimationEndAfterSidebarHide.value = false
+ sidebarState.value = 'hiddenStart'
setTimeout(() => {
sideBarSize.value.current = 0
- isSidebarHidden.value = true
- isAnimationEndAfterSidebarHide.value = true
- }, animationDuration * 1.75)
+
+ sidebarState.value = 'hiddenEnd'
+ }, animationDuration)
}
})
function handleMouseMove(e: MouseEvent) {
if (!wrapperRef.value) return
-
- if (isRightSidebarOpen.value && !isSidebarHidden.value && !isMouseOverShowSidebarZone.value) return
- if (isRightSidebarOpen.value) {
- isSidebarHidden.value = false
- isMouseOverShowSidebarZone.value = false
- return
- }
+ if (sidebarState.value === 'openEnd') return
const viewportWidth = window.innerWidth
- if (e.clientX > viewportWidth - 14) {
- isSidebarHidden.value = false
- isMouseOverShowSidebarZone.value = true
- } else if (e.clientX < viewportWidth - (sidebarWidth.value + 10) && !isSidebarHidden.value) {
- isSidebarHidden.value = true
- isMouseOverShowSidebarZone.value = false
- isAnimationEndAfterSidebarHide.value = false
+ if (e.clientX > viewportWidth - 14 && ['hiddenEnd', 'peekCloseEnd'].includes(sidebarState.value)) {
+ sidebarState.value = 'peekOpenStart'
+
+ setTimeout(() => {
+ sidebarState.value = 'peekOpenEnd'
+ }, animationDuration)
+ } else if (e.clientX < viewportWidth - (sidebarWidth.value + 10) && sidebarState.value === 'peekOpenEnd') {
+ sidebarState.value = 'peekCloseOpen'
setTimeout(() => {
- isAnimationEndAfterSidebarHide.value = true
- }, animationDuration * 1.75)
+ sidebarState.value = 'peekCloseEnd'
+ }, animationDuration)
}
}
@@ -89,7 +72,6 @@ function onWindowResize() {
}
onMounted(() => {
- contentDomWidth.value = ((100 - leftSidebarWidthPercent.value) / 100) * window.innerWidth
document.addEventListener('mousemove', handleMouseMove)
window.addEventListener('resize', onWindowResize)
@@ -100,76 +82,44 @@ onBeforeUnmount(() => {
window.removeEventListener('resize', onWindowResize)
})
-watch(leftSidebarWidthPercent, () => {
- contentDomWidth.value = ((100 - leftSidebarWidthPercent.value) / 100) * window.innerWidth
-})
-
-watch(isLeftSidebarOpen, () => {
- if (isLeftSidebarOpen.value) {
- contentDomWidth.value = ((100 - leftSidebarWidthPercent.value) / 100) * window.innerWidth
- } else {
- contentDomWidth.value = window.innerWidth
- }
-
- isLeftSidebarAnimating.value = true
- setTimeout(() => {
- isLeftSidebarAnimating.value = false
- }, 700)
-})
-
watch(
- () => !isRightSidebarOpen.value && isSidebarShort.value,
- (value) => {
- if (value) {
- setTimeout(() => {
- isStartHideSidebarAnimation.value = true
- }, animationDuration / 2)
+ [isLeftSidebarOpen, leftSidebarWidthPercent],
+ () => {
+ if (isLeftSidebarOpen.value) {
+ contentDomWidth.value = ((100 - leftSidebarWidthPercent.value) / 100) * window.innerWidth
} else {
- isStartHideSidebarAnimation.value = false
+ contentDomWidth.value = window.innerWidth
}
},
+ {
+ immediate: true,
+ },
)
-
+
(() => {
+
(() => {
-
+
@@ -232,4 +232,8 @@ tbody {
background: rgb(203, 203, 203);
}
}
+
+:deep(.ant-select-selection-item) {
+ @apply mt-0.75;
+}
diff --git a/packages/nc-gui/components/workspace/CreateProjectBtn.vue b/packages/nc-gui/components/workspace/CreateProjectBtn.vue
index 83ed8651d6..acb32926f2 100644
--- a/packages/nc-gui/components/workspace/CreateProjectBtn.vue
+++ b/packages/nc-gui/components/workspace/CreateProjectBtn.vue
@@ -1,61 +1,42 @@
-
+
diff --git a/packages/nc-gui/components/workspace/CreateProjectDlg.vue b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
index f7cacc9628..70ef37e4fd 100644
--- a/packages/nc-gui/components/workspace/CreateProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
@@ -64,22 +64,25 @@ watch(dialogShow, async (n, o) => {
if (n === o && !n) return
// Clear errors
- form.value?.resetFields()
+ setTimeout(async () => {
+ form.value?.resetFields()
- formState.value = {
- title: 'Untitled Database',
- }
- await nextTick()
- input.value?.$el?.focus()
- input.value?.$el?.select()
+ formState.value = {
+ title: 'Untitled Database',
+ }
+
+ await nextTick()
+
+ input.value?.$el?.focus()
+ input.value?.$el?.select()
+ }, 5)
})
const typeLabel = computed(() => {
switch (props.type) {
case NcProjectType.DB:
- return 'Database'
default:
- return ''
+ return 'Database'
}
})
diff --git a/packages/nc-gui/components/workspace/Delete.vue b/packages/nc-gui/components/workspace/Delete.vue
deleted file mode 100644
index 69abac0641..0000000000
--- a/packages/nc-gui/components/workspace/Delete.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
+
+
@@ -167,7 +167,12 @@ watch(open, () => {
-
-
+
+
+
+
-
+
{{ selectedView?.title }}
-
diff --git a/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue b/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue
index 9dd8be569f..11c1c1b4e1 100644
--- a/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue
+++ b/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue
@@ -1,9 +1,7 @@
@@ -17,7 +15,8 @@ const { onViewsTabChange } = useViewsStore()
}"
@click="onViewsTabChange('view')"
>
-
- {{ activeTable?.meta?.icon }}
-
- /
-
- {{ selectedView?.meta?.icon }}
-
- Data
Details
@@ -46,7 +45,8 @@ const { onViewsTabChange } = useViewsStore()
}
.tab-icon {
- font-size: 1.1rem;
+ font-size: 1.1rem !important;
+ @apply min-w-4.5;
}
.tab .tab-title {
@apply min-w-0;
diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index d0714f432e..07a4b8fbe9 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -163,7 +163,7 @@ const onDrop = async (event: DragEvent) => {
Collaborators
- {{ RoleLabels[role] }}
-
-
-
+
- {{ $t('title.newProj') }}
-
-
-
-
-
-
diff --git a/packages/nc-gui/components/workspace/EmptyPlaceholder.vue b/packages/nc-gui/components/workspace/EmptyPlaceholder.vue
index d832de840c..8a18fee42c 100644
--- a/packages/nc-gui/components/workspace/EmptyPlaceholder.vue
+++ b/packages/nc-gui/components/workspace/EmptyPlaceholder.vue
@@ -7,25 +7,6 @@ const props = defineProps<{
const projectCreateDlg = ref(false)
const projectType = ref()
-const { projects, projectsList } = storeToRefs(useProjects())
-
-const router = useRouter()
-
-const loading = ref(false)
-
-// if at least one project exists, redirect to first project
-watch(
- projects,
- (projects) => {
- if (projects.size) {
- return router.replace({
- path: `/${router.currentRoute.value.params.typeOrId}/${projectsList.value[0].id}`,
- })
- }
- loading.value = false
- },
- { immediate: true },
-)
const openCreateProjectDlg = (type: NcProjectType) => {
projectType.value = type
@@ -35,7 +16,7 @@ const openCreateProjectDlg = (type: NcProjectType) => {
-
- Delete Workspace
- Delete this workspace and all it’s contents.
-
-
-
-
-
-
- This action is irreversible.
-
- You have 31 days to undo this action by following the steps provided in recover workspace mail sent to your email.
-
-
-
-
- I understand that this action is irreversible
-
-
- Deleting Workspace
- Delete Workspace
-
-
-
-
+
(() => {
-
+
@@ -79,4 +79,8 @@ const allowedRoles = computed(() => {
.badge-text {
@apply text-[14px] pt-1 text-center;
}
+
+:deep(.ant-select-selection-item) {
+ @apply mt-0.75;
+}
diff --git a/packages/nc-gui/components/workspace/Menu.vue b/packages/nc-gui/components/workspace/Menu.vue
index 87a7255cea..98527c3985 100644
--- a/packages/nc-gui/components/workspace/Menu.vue
+++ b/packages/nc-gui/components/workspace/Menu.vue
@@ -1,371 +1,29 @@
-
+
-
No Projects
diff --git a/packages/nc-gui/components/workspace/InviteSection.vue b/packages/nc-gui/components/workspace/InviteSection.vue
index c8a97f2736..4121663bf4 100644
--- a/packages/nc-gui/components/workspace/InviteSection.vue
+++ b/packages/nc-gui/components/workspace/InviteSection.vue
@@ -46,7 +46,7 @@ const allowedRoles = computed{{ RoleLabels[role] }}
-
+
+
diff --git a/packages/nc-gui/components/workspace/Settings.vue b/packages/nc-gui/components/workspace/Settings.vue
new file mode 100644
index 0000000000..c62fa23bb6
--- /dev/null
+++ b/packages/nc-gui/components/workspace/Settings.vue
@@ -0,0 +1,164 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
- Account
- {{ email }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/packages/nc-gui/components/workspace/View.vue b/packages/nc-gui/components/workspace/View.vue
index d2d55c3186..930c133757 100644
--- a/packages/nc-gui/components/workspace/View.vue
+++ b/packages/nc-gui/components/workspace/View.vue
@@ -1,11 +1,14 @@
-
+
+
+
+
+
+ Change Workspace Name
+ Workspace name
+
+
+ Renaming Workspace
+ Cancel
+
+
+ Renaming Workspace
+ Rename Workspace
+
+
+
+
+ Delete Workspace
+ Delete this workspace and all it’s contents.
+
+
+
+ I understand that this action is irreversible
+
+
+ Deleting Workspace
+ Delete Workspace
+
+
+
+
- Switch language
-
-
+
-
{{ activeWorkspace?.title?.slice(0, 2) }}
-
+
@@ -59,7 +75,7 @@ watch(
-
+
+
{{ activeWorkspace?.title }}
@@ -70,15 +86,15 @@ watch(
-
-
+
| null = null
+
export function addAxiosInterceptors(api: Api) {
const state = useGlobal()
const router = useRouter()
@@ -51,6 +53,40 @@ export function addAxiosInterceptors(api: Api) {
return Promise.reject(error)
}
+ let refreshTokenPromiseRes: (token: string) => void
+ let refreshTokenPromiseRej: (e: Error) => void
+
+ // avoid multiple refresh token requests by multiple requests at the same time
+ // wait for the first request to finish and then retry the failed requests
+ if (refreshTokenPromise) {
+ // if previous refresh token request succeeds use the token and retry request
+ return refreshTokenPromise
+ .then((token) => {
+ // New request with new token
+ return new Promise((resolve, reject) => {
+ const config = error.config
+ config.headers['xc-auth'] = token
+ api.instance
+ .request(config)
+ .then((response) => {
+ resolve(response)
+ })
+ .catch((error) => {
+ reject(error)
+ })
+ })
+ })
+ .catch(() => {
+ // ignore since it could have already been handled and redirected to sign in
+ })
+ } else {
+ // if
+ refreshTokenPromise = new Promise((resolve, reject) => {
+ refreshTokenPromiseRes = resolve
+ refreshTokenPromiseRej = reject
+ })
+ }
+
// Try request again with new token
return api.instance
.post('/auth/token/refresh', null, {
@@ -62,6 +98,10 @@ export function addAxiosInterceptors(api: Api) {
config.headers['xc-auth'] = token.data.token
state.signIn(token.data.token)
+ // resolve the refresh token promise and reset
+ refreshTokenPromiseRes(token.data.token)
+ refreshTokenPromise = null
+
return new Promise((resolve, reject) => {
api.instance
.request(config)
@@ -73,11 +113,15 @@ export function addAxiosInterceptors(api: Api) {
})
})
})
- .catch(async (error) => {
+ .catch(async (refreshTokenError) => {
await state.signOut()
if (!route.value.meta.public) navigateTo('/signIn')
+ // reject the refresh token promise and reset
+ refreshTokenPromiseRej(refreshTokenError)
+ refreshTokenPromise = null
+
return Promise.reject(error)
})
},
diff --git a/packages/nc-gui/composables/useCommandPalette/index.ts b/packages/nc-gui/composables/useCommandPalette/index.ts
index 510dbeb1b3..bf5271af2e 100644
--- a/packages/nc-gui/composables/useCommandPalette/index.ts
+++ b/packages/nc-gui/composables/useCommandPalette/index.ts
@@ -7,16 +7,16 @@ export const useCommandPalette = createSharedComposable(() => {
const cmdData = computed(() => {})
- const activeScope = computed(() => {})
+ const activeScope = computed(() => ({} as any))
- async function loadScope(_scope = 'root', _data?: any) {}
+ const loadTemporaryScope = (..._args: any) => {}
return {
commandPalette,
cmdData,
activeScope,
- loadScope,
cmdPlaceholder,
refreshCommandPalette: refreshCommandPalette.trigger,
+ loadTemporaryScope,
}
})
diff --git a/packages/nc-gui/composables/useData.ts b/packages/nc-gui/composables/useData.ts
index ce10b7da39..0bb606fb5e 100644
--- a/packages/nc-gui/composables/useData.ts
+++ b/packages/nc-gui/composables/useData.ts
@@ -208,7 +208,6 @@ export function useData(args: {
},
undo: {
fn: async function undo(toUpdate: Row, property: string, pg: { page: number; pageSize: number }) {
- console.log('undo', toUpdate, property, pg)
const updatedData = await updateRowProperty(
{ row: toUpdate.oldRow, oldRow: toUpdate.row, rowMeta: toUpdate.rowMeta },
property,
@@ -218,12 +217,10 @@ export function useData(args: {
if (pg.page === paginationData.value.page && pg.pageSize === paginationData.value.pageSize) {
const rowIndex = findIndexByPk(rowPkData(toUpdate.row, meta?.value?.columns as ColumnType[]), formattedData.value)
if (rowIndex !== -1) {
- console.log('manual')
const row = formattedData.value[rowIndex]
Object.assign(row.row, updatedData)
Object.assign(row.oldRow, updatedData)
} else {
- console.log('fallback')
await callbacks?.loadData?.()
}
} else {
diff --git a/packages/nc-gui/composables/useGlobal/actions.ts b/packages/nc-gui/composables/useGlobal/actions.ts
index e581910d57..94534150a9 100644
--- a/packages/nc-gui/composables/useGlobal/actions.ts
+++ b/packages/nc-gui/composables/useGlobal/actions.ts
@@ -9,7 +9,7 @@ export function useGlobalActions(state: State): Actions {
}
/** Sign out by deleting the token from localStorage */
- const signOut: Actions['signOut'] = async () => {
+ const signOut: Actions['signOut'] = async (_skipRedirect = false) => {
try {
const nuxtApp = useNuxtApp()
await nuxtApp.$api.auth.signout()
@@ -80,24 +80,59 @@ export function useGlobalActions(state: State): Actions {
workspaceId: _workspaceId,
type: _type,
projectId,
+ query,
}: {
workspaceId?: string
projectId?: string
type?: NcProjectType
+ query?: any
}) => {
const workspaceId = _workspaceId || 'nc'
let path: string
+
+ const queryParams = query ? `?${new URLSearchParams(query).toString()}` : ''
+
if (projectId) {
- path = `/${workspaceId}/${projectId}`
+ path = `/${workspaceId}/${projectId}${queryParams}`
} else {
- path = `/${workspaceId}`
+ path = `/${workspaceId}${queryParams}`
}
- if (state.appInfo.value.baseHostName && location.hostname !== `${workspaceId}.${state.appInfo.value.baseHostName}`) {
- location.href = `https://${workspaceId}.${state.appInfo.value.baseHostName}/dashboard/#${path}`
+ navigateTo({
+ path,
+ })
+ }
+
+ const ncNavigateTo = ({
+ workspaceId: _workspaceId,
+ type: _type,
+ projectId,
+ query,
+ tableId,
+ viewId,
+ }: {
+ workspaceId?: string
+ projectId?: string
+ type?: NcProjectType
+ query?: any
+ tableId?: string
+ viewId?: string
+ }) => {
+ const tablePath = tableId ? `/${tableId}${viewId ? `/${viewId}` : ''}` : ''
+ const workspaceId = _workspaceId || 'nc'
+ let path: string
+
+ const queryParams = query ? `?${new URLSearchParams(query).toString()}` : ''
+
+ if (projectId) {
+ path = `/${workspaceId}/${projectId}${tablePath}${queryParams}`
} else {
- navigateTo(path)
+ path = `/${workspaceId}${queryParams}`
}
+
+ navigateTo({
+ path,
+ })
}
const getBaseUrl = (workspaceId: string) => {
@@ -107,5 +142,5 @@ export function useGlobalActions(state: State): Actions {
return undefined
}
- return { signIn, signOut, refreshToken, loadAppInfo, setIsMobileMode, navigateToProject, getBaseUrl }
+ return { signIn, signOut, refreshToken, loadAppInfo, setIsMobileMode, navigateToProject, getBaseUrl, ncNavigateTo }
}
diff --git a/packages/nc-gui/composables/useGlobal/state.ts b/packages/nc-gui/composables/useGlobal/state.ts
index 942ba9b43e..2cfc57b4b3 100644
--- a/packages/nc-gui/composables/useGlobal/state.ts
+++ b/packages/nc-gui/composables/useGlobal/state.ts
@@ -78,7 +78,9 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
/** current token ref, used by `useJwt` to reactively parse our token payload */
const token = computed({
get: () => storage.value.token || '',
- set: (val) => (storage.value.token = val),
+ set: (val) => {
+ storage.value.token = val
+ },
})
const config = useRuntimeConfig()
@@ -105,6 +107,7 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
isCloud: false,
automationLogLevel: 'OFF',
disableEmailAuth: false,
+ dashboardPath: '/dashboard',
})
/** reactive token payload */
diff --git a/packages/nc-gui/composables/useGlobal/types.ts b/packages/nc-gui/composables/useGlobal/types.ts
index bce7d69290..ee4c6ef755 100644
--- a/packages/nc-gui/composables/useGlobal/types.ts
+++ b/packages/nc-gui/composables/useGlobal/types.ts
@@ -28,6 +28,7 @@ export interface AppInfo {
baseHostName?: string
disableEmailAuth: boolean
mainSubDomain?: string
+ dashboardPath: string
}
export interface StoredState {
@@ -61,12 +62,20 @@ export interface Getters {
}
export interface Actions {
- signOut: () => void
+ signOut: (skipRedirect?: boolean) => void
signIn: (token: string) => void
refreshToken: () => void
loadAppInfo: () => void
setIsMobileMode: (isMobileMode: boolean) => void
- navigateToProject: (params: { workspaceId?: string; projectId?: string; type?: NcProjectType }) => void
+ navigateToProject: (params: { workspaceId?: string; projectId?: string; type?: NcProjectType; query?: any }) => void
+ ncNavigateTo: (params: {
+ workspaceId?: string
+ projectId?: string
+ type?: NcProjectType
+ query?: any
+ tableId?: string
+ viewId?: string
+ }) => void
getBaseUrl: (workspaceId: string) => string | undefined
}
diff --git a/packages/nc-gui/composables/useLTARStore.ts b/packages/nc-gui/composables/useLTARStore.ts
index 1948b16457..0703d06d58 100644
--- a/packages/nc-gui/composables/useLTARStore.ts
+++ b/packages/nc-gui/composables/useLTARStore.ts
@@ -66,7 +66,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
const { t } = useI18n()
- const isPublic: boolean = inject(IsPublicInj, ref(false))
+ const isPublic: Ref = inject(IsPublicInj, ref(false))
const colOptions = computed(() => column.value?.colOptions as LinkToAnotherRecordType)
@@ -190,6 +190,11 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
where:
childrenListPagination.query && `(${relatedTableDisplayValueProp.value},like,${childrenListPagination.query})`,
} as any,
+ {
+ headers: {
+ 'xc-password': sharedViewPassword.value,
+ },
+ },
)
} else {
childrenList.value = await $api.dbTableRow.nestedList(
diff --git a/packages/nc-gui/composables/useRoles/index.ts b/packages/nc-gui/composables/useRoles/index.ts
index 8fc5491ffe..e1cf0eb165 100644
--- a/packages/nc-gui/composables/useRoles/index.ts
+++ b/packages/nc-gui/composables/useRoles/index.ts
@@ -1,5 +1,5 @@
-import { isString } from '@vue/shared'
-import { computed, createSharedComposable, ref, useApi, useGlobal } from '#imports'
+import { extractRolesObj } from 'nocodb-sdk'
+import { computed, createSharedComposable, useApi, useGlobal } from '#imports'
import type { ProjectRole, Role, Roles } from '#imports'
/**
@@ -9,40 +9,58 @@ import type { ProjectRole, Role, Roles } from '#imports'
* * `projectRoles` - the roles a user has in the current project (if one was loaded)
* * `allRoles` - all roles a user has (userRoles + projectRoles)
* * `hasRole` - a function to check if a user has a specific role
- * * `loadProjectRoles` - a function to load the project roles for a specific project (by id)
+ * * `loadRoles` - a function to load reload user roles for scope
*/
export const useRoles = createSharedComposable(() => {
const { user, previewAs } = useGlobal()
const { api } = useApi()
- const projectRoles = ref>({})
+ const allRoles = computed(() => {
+ let orgRoles = user.value?.roles ?? {}
- const userRoles = computed>(() => {
- let roles = user.value?.roles ?? {}
+ orgRoles = extractRolesObj(orgRoles)
- // if string populate key-value paired object
- if (isString(roles)) {
- roles = roles.split(',').reduce((acc, role) => {
- acc[role] = true
- return acc
- }, {})
+ let projectRoles = user.value?.project_roles ?? {}
+
+ projectRoles = extractRolesObj(projectRoles)
+
+ return {
+ ...orgRoles,
+ ...projectRoles,
}
+ })
+
+ const orgRoles = computed(() => {
+ let orgRoles = user.value?.roles ?? {}
- return roles
+ orgRoles = extractRolesObj(orgRoles)
+
+ return orgRoles
})
- const allRoles = computed(() => ({
- ...userRoles.value,
- ...projectRoles.value,
- }))
+ const projectRoles = computed(() => {
+ let projectRoles = user.value?.project_roles ?? {}
+
+ if (Object.keys(projectRoles).length === 0) {
+ projectRoles = user.value?.roles ?? {}
+ }
- async function loadProjectRoles(
- projectId: string,
+ projectRoles = extractRolesObj(projectRoles)
+
+ return projectRoles
+ })
+
+ const workspaceRoles = computed(() => {
+ return null
+ })
+
+ async function loadRoles(
+ projectId?: string,
options: { isSharedBase?: boolean; sharedBaseId?: string; isSharedErd?: boolean; sharedErdId?: string } = {},
) {
if (options?.isSharedBase) {
- const user = await api.auth.me(
+ const res = await api.auth.me(
{
project_id: projectId,
},
@@ -53,9 +71,13 @@ export const useRoles = createSharedComposable(() => {
},
)
- projectRoles.value = user.roles
+ user.value = {
+ ...user.value,
+ roles: res.roles,
+ project_roles: res.project_roles,
+ }
} else if (options?.isSharedErd) {
- const user = await api.auth.me(
+ const res = await api.auth.me(
{
project_id: projectId,
},
@@ -66,12 +88,19 @@ export const useRoles = createSharedComposable(() => {
},
)
- projectRoles.value = user.roles
+ user.value = {
+ ...user.value,
+ roles: res.roles,
+ project_roles: res.project_roles,
+ }
} else if (projectId) {
- const user = await api.auth.me({ project_id: projectId })
- projectRoles.value = user.roles
- } else {
- projectRoles.value = {}
+ const res = await api.auth.me({ project_id: projectId })
+
+ user.value = {
+ ...user.value,
+ roles: res.roles,
+ project_roles: res.project_roles,
+ }
}
}
@@ -83,5 +112,5 @@ export const useRoles = createSharedComposable(() => {
return allRoles.value[role]
}
- return { allRoles, userRoles, projectRoles, loadProjectRoles, hasRole }
+ return { allRoles, orgRoles, workspaceRoles, projectRoles, loadRoles, hasRole }
})
diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts
index 06f5bf512e..cb5766f3b8 100644
--- a/packages/nc-gui/composables/useSharedView.ts
+++ b/packages/nc-gui/composables/useSharedView.ts
@@ -34,6 +34,8 @@ export function useSharedView() {
const password = useState('password', () => undefined)
+ provide(SharedViewPasswordInj, password)
+
const allowCSVDownload = useState('allowCSVDownload', () => false)
const meta = useState('meta', () => undefined)
diff --git a/packages/nc-gui/composables/useTableNew.ts b/packages/nc-gui/composables/useTableNew.ts
index 867c73527c..24306712b6 100644
--- a/packages/nc-gui/composables/useTableNew.ts
+++ b/packages/nc-gui/composables/useTableNew.ts
@@ -79,7 +79,7 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
}
await navigateTo({
- path: `/${workspaceIdOrType}/${projectIdOrBaseId}/table/${table?.id}`,
+ path: `/${workspaceIdOrType}/${projectIdOrBaseId}/${table?.id}`,
query: route.value.query,
})
diff --git a/packages/nc-gui/composables/useUndoRedo.ts b/packages/nc-gui/composables/useUndoRedo.ts
index 54ab33a314..563b9cb2a7 100644
--- a/packages/nc-gui/composables/useUndoRedo.ts
+++ b/packages/nc-gui/composables/useUndoRedo.ts
@@ -25,12 +25,22 @@ export const useUndoRedo = createSharedComposable(() => {
return tempScope
})
- const isSameScope = (sc: { key: string; param: string }[]) => {
+ const isSameScope = (sc: { key: string; param: string | string[] }[]) => {
return sc.every((s) => {
return scope.value.some(
// viewTitle is optional for default view
- (s2) =>
- (s.key === 'viewTitle' && s2.key === 'viewTitle' && s2.param === '') || (s.key === s2.key && s.param === s2.param),
+ (s2) => {
+ if (Array.isArray(s.param)) {
+ return (
+ (s.key === 'viewTitle' && s2.key === 'viewTitle' && s2.param === '') ||
+ (s.key === s2.key && s.param.includes(s2.param))
+ )
+ } else {
+ return (
+ (s.key === 'viewTitle' && s2.key === 'viewTitle' && s2.param === '') || (s.key === s2.key && s.param === s2.param)
+ )
+ }
+ },
)
})
}
@@ -130,18 +140,18 @@ export const useUndoRedo = createSharedComposable(() => {
}
}
- const defineViewScope = (param: { view?: ViewType; project_id?: string; model_id?: string; title?: string }) => {
+ const defineViewScope = (param: { view?: ViewType; project_id?: string; model_id?: string; title?: string; id?: string }) => {
if (param.view) {
return [
{ key: 'projectId', param: param.view.project_id! },
{ key: 'viewId', param: param.view.fk_model_id! },
- { key: 'viewTitle', param: param.view.title! },
+ { key: 'viewTitle', param: [param.view.title, param.view.id!] },
]
} else {
return [
{ key: 'projectId', param: param.project_id! },
{ key: 'viewId', param: param.model_id! },
- { key: 'viewTitle', param: param.title! },
+ { key: 'viewTitle', param: [param.title!, param.id!] },
]
}
}
diff --git a/packages/nc-gui/layouts/base.vue b/packages/nc-gui/layouts/base.vue
index bfaed6bb9f..8ee7a073a7 100644
--- a/packages/nc-gui/layouts/base.vue
+++ b/packages/nc-gui/layouts/base.vue
@@ -1,7 +1,7 @@
-
+
-
+
@@ -178,20 +132,34 @@ export default {
diff --git a/packages/nc-gui/layouts/empty.vue b/packages/nc-gui/layouts/empty.vue
index 1d343592b7..b734bb51f6 100644
--- a/packages/nc-gui/layouts/empty.vue
+++ b/packages/nc-gui/layouts/empty.vue
@@ -1,3 +1,11 @@
+
+
-
+
diff --git a/packages/nc-gui/layouts/new.vue b/packages/nc-gui/layouts/new.vue
index a6e5695786..8af4a80001 100644
--- a/packages/nc-gui/layouts/new.vue
+++ b/packages/nc-gui/layouts/new.vue
@@ -34,7 +34,7 @@ watch(hasSidebar, (val) => {
})
const logout = async () => {
- await signOut()
+ await signOut(false)
await navigateTo('/signin')
await clearWorkspaces()
}
diff --git a/packages/nc-gui/layouts/shared-view.vue b/packages/nc-gui/layouts/shared-view.vue
index d32731413b..a090e8574d 100644
--- a/packages/nc-gui/layouts/shared-view.vue
+++ b/packages/nc-gui/layouts/shared-view.vue
@@ -76,40 +76,12 @@ export default {
+
()
const projectsStore = useProjects()
+const { populateWorkspace } = useWorkspace()
+
+const { signedIn } = useGlobal()
+
const router = useRouter()
const route = router.currentRoute
@@ -35,12 +39,6 @@ const isSharedView = computed(() => {
// check route is not project page by route name
return !routeName.startsWith('index-typeOrId-projectId-') && !['index', 'index-typeOrId'].includes(routeName)
})
-const isSharedFormView = computed(() => {
- const routeName = (route.value.name as string) || ''
-
- // check route is shared form view route
- return routeName.startsWith('index-typeOrId-form-viewId')
-})
watch(
() => route.value.params.typeOrId,
@@ -50,7 +48,19 @@ watch(
return
}
- await projectsStore.loadProjects('recent')
+ // avoid loading projects for shared base
+ if (route.value.params.typeOrId === 'base') {
+ await populateWorkspace()
+ return
+ }
+
+ if (!signedIn.value) {
+ navigateTo('/signIn')
+ return
+ }
+
+ // Load projects
+ await populateWorkspace()
if (!route.value.params.projectId && projectsList.value.length > 0) {
await autoNavigateToProject()
@@ -73,10 +83,7 @@ provide(ToggleDialogInj, toggleDialog)
-
-
-
+
diff --git a/packages/nc-gui/pages/index/[typeOrId].vue b/packages/nc-gui/pages/index/[typeOrId].vue
index 60bd7eeeab..5800abe05f 100644
--- a/packages/nc-gui/pages/index/[typeOrId].vue
+++ b/packages/nc-gui/pages/index/[typeOrId].vue
@@ -5,7 +5,7 @@ const route = router.currentRoute
-
+
-
+
-
diff --git a/packages/nc-gui/pages/index/[typeOrId]/[projectId]/index/index/[viewId]/[[viewTitle]]/[...slugs].vue b/packages/nc-gui/pages/index/[typeOrId]/[projectId]/index/index/[viewId]/[[viewTitle]]/[...slugs].vue
new file mode 100644
index 0000000000..cc340bc4c9
--- /dev/null
+++ b/packages/nc-gui/pages/index/[typeOrId]/[projectId]/index/index/[viewId]/[[viewTitle]]/[...slugs].vue
@@ -0,0 +1 @@
+
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
index 35ea03dcba..7645e223f6 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
@@ -59,7 +59,7 @@ watch(
-
+
-