Merge pull request #7818 from nocodb/nc-feat/open-base-table-view-in-new-tab

Nc feat(nc-gui): open base/table/view in a new tab on pressing Ctrl & clicking on them

packages/nc-gui/components/dashboard/Sidebar/TopSection.vue

@@ -6,6 +6,8 @@ const { isUIAllowed } = useRoles()
 
 const { appInfo } = useGlobal()
 
+const { meta: metaKey, ctrlKey } = useMagicKeys()
+
 const { isWorkspaceLoading, isWorkspaceSettingsPageOpened } = storeToRefs(workspaceStore)
 
 const { navigateToWorkspaceSettings } = workspaceStore
@@ -15,8 +17,10 @@ const { isSharedBase } = storeToRefs(baseStore)
 const isCreateProjectOpen = ref(false)
 
 const navigateToSettings = () => {
+  const cmdOrCtrl = isMac() ? metaKey.value : ctrlKey.value
+
   // TODO: Handle cloud case properly
-  navigateToWorkspaceSettings()
+  navigateToWorkspaceSettings('', cmdOrCtrl)
 
   // if (appInfo.value.baseHostName) {
   //   window.location.href = `https://app.${appInfo.value.baseHostName}/dashboard`

packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue

@@ -16,6 +16,7 @@ import {
   h,
   inject,
   navigateTo,
+  navigateToBlankTargetOpenOption,
   openLink,
   ref,
   resolveComponent,
@@ -26,6 +27,7 @@ import {
   useDialog,
   useGlobal,
   useI18n,
+  useMagicKeys,
   useNuxtApp,
   useRoles,
   useRouter,
@@ -71,6 +73,8 @@ const { orgRoles, isUIAllowed } = useRoles()
 
 useTabs()
 
+const { meta: metaKey, ctrlKey } = useMagicKeys()
+
 const editMode = ref(false)
 
 const tempTitle = ref('')
@@ -253,12 +257,29 @@ const onProjectClick = async (base: NcProject, ignoreNavigation?: boolean, toggl
   if (!base) {
     return
   }
+  const cmdOrCtrl = isMac() ? metaKey.value : ctrlKey.value
 
-  if (!toggleIsExpanded) $e('c:base:open')
+  if (!toggleIsExpanded && !cmdOrCtrl) $e('c:base:open')
 
   ignoreNavigation = isMobileMode.value || ignoreNavigation
   toggleIsExpanded = isMobileMode.value || toggleIsExpanded
 
+  if (cmdOrCtrl && !ignoreNavigation) {
+    await navigateTo(
+      `${cmdOrCtrl ? '#' : ''}${baseUrl({
+        id: base.id!,
+        type: 'database',
+        isSharedBase: isSharedBase.value,
+      })}`,
+      cmdOrCtrl
+        ? {
+            open: navigateToBlankTargetOpenOption,
+          }
+        : undefined,
+    )
+    return
+  }
+
   if (toggleIsExpanded) {
     base.isExpanded = !base.isExpanded
   } else {

packages/nc-gui/components/dashboard/TreeView/TableNode.vue

@@ -4,7 +4,7 @@ import { toRef } from '@vue/reactivity'
 import { message } from 'ant-design-vue'
 import { storeToRefs } from 'pinia'
 
-import { ProjectRoleInj, TreeViewInj, useNuxtApp, useRoles, useTabs } from '#imports'
+import { ProjectRoleInj, TreeViewInj, useMagicKeys, useNuxtApp, useRoles, useTabs } from '#imports'
 import type { SidebarTableNode } from '~/lib'
 
 const props = withDefaults(
@@ -39,6 +39,8 @@ useTableNew({
   baseId: base.value.id!,
 })
 
+const { meta: metaKey, ctrlKey } = useMagicKeys()
+
 const baseRole = inject(ProjectRoleInj)
 provide(SidebarTableInj, table)
 
@@ -106,6 +108,11 @@ const onExpand = async () => {
 }
 
 const onOpenTable = async () => {
+  if (isMac() ? metaKey.value : ctrlKey.value) {
+    await _openTable(table.value, true)
+    return
+  }
+
   isLoading.value = true
   try {
     await _openTable(table.value)

packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue

@@ -9,6 +9,7 @@ import {
   message,
   onKeyStroke,
   useDebounceFn,
+  useMagicKeys,
   useNuxtApp,
   useRoles,
   useVModel,
@@ -52,6 +53,8 @@ const { activeView } = storeToRefs(useViewsStore())
 
 const { getMeta } = useMetas()
 
+const { meta: metaKey, ctrlKey } = useMagicKeys()
+
 const table = computed(() => props.table)
 const injectedTable = ref(table.value)
 
@@ -80,10 +83,20 @@ const _title = ref<string | undefined>()
 
 /** Debounce click handler, so we can potentially enable editing view name {@see onDblClick} */
 const onClick = useDebounceFn(() => {
+  emits('changeView', vModel.value)
+}, 250)
+
+const handleOnClick = () => {
   if (isEditing.value || isStopped.value) return
 
+  const cmdOrCtrl = isMac() ? metaKey.value : ctrlKey.value
+
+  if (cmdOrCtrl) {
     emits('changeView', vModel.value)
-}, 250)
+  } else {
+    onClick()
+  }
+}
 
 /** Enable editing view name on dbl click */
 function onDblClick() {
@@ -209,7 +222,7 @@ watch(isDropdownOpen, async () => {
     }"
     :data-testid="`view-sidebar-view-${vModel.alias || vModel.title}`"
     @dblclick.stop="onDblClick"
-    @click="onClick"
+    @click.prevent="handleOnClick"
   >
     <div v-e="['a:view:open', { view: vModel.type }]" class="text-sm flex items-center w-full gap-1" data-testid="view-item">
       <div

packages/nc-gui/composables/useTableNew.ts

@@ -10,6 +10,7 @@ import {
   extractSdkResponseErrorMsg,
   generateUniqueTitle as generateTitle,
   message,
+  navigateToBlankTargetOpenOption,
   reactive,
   storeToRefs,
   useBase,
@@ -60,7 +61,7 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
   const tables = computed(() => baseTables.value.get(param.baseId) || [])
   const base = computed(() => bases.value.get(param.baseId))
 
-  const openTable = async (table: SidebarTableNode) => {
+  const openTable = async (table: SidebarTableNode, cmdOrCtrl: boolean = false) => {
     if (!table.base_id) return
 
     let base = bases.value.get(table.base_id)
@@ -86,7 +87,14 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
 
     const navigateToTable = async () => {
       if (openedViewsTab.value === 'view') {
-        await navigateTo(`/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}`)
+        await navigateTo(
+          `${cmdOrCtrl ? '#' : ''}/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}`,
+          cmdOrCtrl
+            ? {
+                open: navigateToBlankTargetOpenOption,
+              }
+            : undefined,
+        )
       }
 
       table.isViewsLoading = true
@@ -99,7 +107,16 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
           // find the default view and navigate to it, if not found navigate to the first one
           const defaultView = views.find((v) => v.is_default) || views[0]
 
-          await navigateTo(`/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}/${defaultView.id}/${openedViewsTab.value}`)
+          await navigateTo(
+            `${cmdOrCtrl ? '#' : ''}/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}/${defaultView.id}/${
+              openedViewsTab.value
+            }`,
+            cmdOrCtrl
+              ? {
+                  open: navigateToBlankTargetOpenOption,
+                }
+              : undefined,
+          )
         }
       } catch (e) {
         console.error(e)
@@ -119,9 +136,12 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
         table.isMetaLoading = false
       }
     }
-
+    if (cmdOrCtrl) {
+      await navigateToTable()
+    } else {
       await Promise.all([navigateToTable(), loadTableMeta()])
     }
+  }
 
   const createTable = async () => {
     const { onTableCreate, baseId } = param

packages/nc-gui/store/views.ts

@@ -1,6 +1,7 @@
 import type { FilterType, SortType, ViewType, ViewTypes } from 'nocodb-sdk'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import type { ViewPageType } from '~/lib'
+import { navigateToBlankTargetOpenOption, useMagicKeys } from '#imports'
 
 export const useViewsStore = defineStore('viewsStore', () => {
   const { $api } = useNuxtApp()
@@ -27,6 +28,8 @@ export const useViewsStore = defineStore('viewsStore', () => {
 
   const { activeWorkspaceId } = storeToRefs(useWorkspace())
 
+  const { meta: metaKey, ctrlKey } = useMagicKeys()
+
   const recentViews = computed<RecentView[]>(() =>
     allRecentViews.value.filter((f) => f.workspaceId === activeWorkspaceId.value).splice(0, 10),
   )
@@ -216,6 +219,8 @@ export const useViewsStore = defineStore('viewsStore', () => {
     hardReload?: boolean
     doNotSwitchTab?: boolean
   }) => {
+    const cmdOrCtrl = isMac() ? metaKey.value : ctrlKey.value
+
     const routeName = 'index-typeOrId-baseId-index-index-viewId-viewTitle-slugs'
 
     let baseIdOrBaseId = baseId
@@ -231,6 +236,23 @@ export const useViewsStore = defineStore('viewsStore', () => {
       router.currentRoute.value.query.page &&
       router.currentRoute.value.query.page === 'fields'
     ) {
+      if (cmdOrCtrl) {
+        await navigateTo(
+          router.resolve({
+            name: routeName,
+            params: {
+              viewTitle: view.id || '',
+              viewId: tableId,
+              baseId: baseIdOrBaseId,
+              slugs,
+            },
+            query: router.currentRoute.value.query,
+          }).href,
+          {
+            open: navigateToBlankTargetOpenOption,
+          },
+        )
+      } else {
         await router.push({
           name: routeName,
           params: {
@@ -241,6 +263,23 @@ export const useViewsStore = defineStore('viewsStore', () => {
           },
           query: router.currentRoute.value.query,
         })
+      }
+    } else {
+      if (cmdOrCtrl) {
+        await navigateTo(
+          router.resolve({
+            name: routeName,
+            params: {
+              viewTitle: view.id || '',
+              viewId: tableId,
+              baseId: baseIdOrBaseId,
+              slugs,
+            },
+          }).href,
+          {
+            open: navigateToBlankTargetOpenOption,
+          },
+        )
       } else {
         await router.push({
           name: routeName,
@@ -252,8 +291,9 @@ export const useViewsStore = defineStore('viewsStore', () => {
           },
         })
       }
+    }
 
-    if (hardReload) {
+    if (!cmdOrCtrl && hardReload) {
       await router
         .replace({
           name: routeName,

packages/nc-gui/store/workspace.ts

@@ -199,8 +199,15 @@ export const useWorkspace = defineStore('workspaceStore', () => {
     })
   }
 
-  const navigateToWorkspaceSettings = async () => {
-    navigateTo('/account/users')
+  const navigateToWorkspaceSettings = async (_, cmdOrCtrl) => {
+    await navigateTo(
+      `${cmdOrCtrl ? '#' : ''}/account/users`,
+      cmdOrCtrl
+        ? {
+            open: navigateToBlankTargetOpenOption,
+          }
+        : undefined,
+    )
   }
 
   function setLoadingState(isLoading = false) {

packages/nc-gui/utils/urlUtils.ts

@@ -35,3 +35,11 @@ export const openLink = (path: string, baseURL?: string, target = '_blank') => {
   const url = new URL(path, baseURL)
   window.open(url.href, target, 'noopener,noreferrer')
 }
+
+export const navigateToBlankTargetOpenOption = {
+  target: '_blank',
+  windowFeatures: {
+    noopener: true,
+    noreferrer: true,
+  },
+}