Merge branch 'develop' into no-tar

.github/workflows/release-executables.yml

@@ -68,6 +68,10 @@ jobs:
       - name : Install nocodb, other dependencies and build executables
         run: |
           cd ./scripts/pkg-executable
+          
+          # downgrade sqlite3 to 5.1.6 until build related issues are resolved
+          # https://github.com/TryGhost/node-sqlite3/issues/1748        
+          node ../downgradeSqlite.js
 
           # Install nocodb version based on provided tag name
           npm i -E nocodb@${{ github.event.inputs.tag || inputs.tag }}

packages/nc-gui/components/account/UserList.vue

@@ -170,7 +170,12 @@ const openDeleteModal = (user: UserType) => {
     <div class="max-w-195 mx-auto h-full">
       <div class="text-2xl text-left font-weight-bold mb-4" data-rec="true">{{ $t('title.userMgmt') }}</div>
       <div class="py-2 flex gap-4 items-center justify-between">
-        <a-input v-model:value="searchText" class="!max-w-90 !rounded-md" placeholder="Search members" @change="loadUsers()">
+        <a-input
+          v-model:value="searchText"
+          class="!max-w-90 !rounded-md"
+          :placeholder="$t('title.searchMembers')"
+          @change="loadUsers()"
+        >
           <template #prefix>
             <PhMagnifyingGlassBold class="!h-3.5 text-gray-500" />
           </template>

packages/nc-gui/components/cell/Currency.vue

@@ -3,6 +3,8 @@ import type { VNodeRef } from '@vue/runtime-core'
 
 interface Props {
   modelValue: number | null | undefined
+  placeholder?: string
+  hidePrefix?: boolean
 }
 
 const props = defineProps<Props>()
@@ -92,7 +94,7 @@ onMounted(() => {
 
 <template>
   <div
-    v-if="isForm && !isEditColumn"
+    v-if="isForm && !isEditColumn && !hidePrefix"
     class="nc-currency-code h-full !bg-gray-100 border-r border-gray-200 px-3 mr-1 flex items-center"
   >
     <span>
@@ -106,7 +108,7 @@ onMounted(() => {
     type="number"
     class="nc-cell-field h-full border-none rounded-md py-1 outline-none focus:outline-none focus:ring-0"
     :class="isForm && !isEditColumn ? 'flex flex-1' : 'w-full'"
-    :placeholder="isEditColumn ? $t('labels.optional') : ''"
+    :placeholder="placeholder !== undefined ? placeholder : isEditColumn ? $t('labels.optional') : ''"
     :disabled="readOnly"
     @blur="onBlur"
     @keydown.enter="onKeydownEnter"

packages/nc-gui/components/cell/Decimal.vue

@@ -6,6 +6,7 @@ interface Props {
   // for sqlite, when we clear a cell or empty the cell, it returns ""
   // otherwise, it is null type
   modelValue?: number | null | string
+  placeholder?: string
 }
 
 interface Emits {
@@ -101,7 +102,7 @@ watch(isExpandedFormOpen, () => {
     class="nc-cell-field outline-none py-1 border-none rounded-md w-full h-full"
     type="number"
     :step="precision"
-    :placeholder="isEditColumn ? $t('labels.optional') : ''"
+    :placeholder="placeholder !== undefined ? placeholder : isEditColumn ? $t('labels.optional') : ''"
     style="letter-spacing: 0.06rem"
     @blur="editEnabled = false"
     @keydown.down.stop="onKeyDown"

packages/nc-gui/components/cell/Percent.vue

@@ -3,6 +3,7 @@ import type { VNodeRef } from '@vue/runtime-core'
 
 interface Props {
   modelValue?: number | string | null
+  placeholder?: string
 }
 
 const props = defineProps<Props>()
@@ -144,7 +145,7 @@ const onTabPress = (e: KeyboardEvent) => {
       v-model="vModel"
       class="nc-cell-field w-full !border-none !outline-none focus:ring-0 py-1"
       :type="inputType"
-      :placeholder="isEditColumn ? $t('labels.optional') : ''"
+      :placeholder="placeholder !== undefined ? placeholder : isEditColumn ? $t('labels.optional') : ''"
       @blur="onBlur"
       @focus="onFocus"
       @keydown.down.stop

packages/nc-gui/components/cell/PhoneNumber.vue

@@ -22,7 +22,7 @@ const isEditColumn = inject(EditColumnInj, ref(false))
 
 const column = inject(ColumnInj)!
 
-const isSurveyForm = inject(IsSurveyFormInj, ref(false))
+const isForm = inject(IsFormInj)!
 
 const readOnly = inject(ReadonlyInj, ref(false))
 
@@ -33,7 +33,7 @@ const vModel = computed({
   get: () => value,
   set: (val) => {
     localState.value = val
-    if (!parseProp(column.value.meta)?.validate || (val && isMobilePhone(val)) || !val || isSurveyForm.value) {
+    if (!parseProp(column.value.meta)?.validate || (val && isMobilePhone(val)) || !val || isForm.value) {
       emit('update:modelValue', val)
     }
   },
@@ -43,8 +43,6 @@ const validPhoneNumber = computed(() => vModel.value && isMobilePhone(vModel.val
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
-const isForm = inject(IsFormInj)!
-
 const focus: VNodeRef = (el) =>
   !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus()
 

packages/nc-gui/components/cell/RichText.vue

@@ -32,7 +32,7 @@ const props = withDefaults(
 
 const emits = defineEmits(['update:value', 'focus', 'blur'])
 
-const { isFormField, hiddenBubbleMenuOptions } = toRefs(props)
+const { fullMode, isFormField, hiddenBubbleMenuOptions } = toRefs(props)
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
@@ -219,16 +219,16 @@ if (isFormField.value) {
   })
 }
 
-watch(editorDom, () => {
-  if (!editorDom.value) return
+onMounted(() => {
+  if (fullMode.value) {
+    setEditorContent(vModel.value, true)
 
-  setEditorContent(vModel.value, true)
+    if ((isForm.value && !isSurveyForm.value) || isFormField.value) return
 
-  if ((isForm.value && !isSurveyForm.value) || isFormField.value) return
-  // Focus editor after editor is mounted
-  setTimeout(() => {
-    editor.value?.chain().focus().run()
-  }, 50)
+    nextTick(() => {
+      editor.value?.chain().focus().run()
+    })
+  }
 })
 
 useEventListener(

packages/nc-gui/components/cell/attachment/index.vue

@@ -333,7 +333,7 @@ const handleFileDelete = (i: number) => {
 
       <div
         v-if="active || (isForm && visibleItems.length)"
-        class="xs:hidden h-6 w-5 group cursor-pointer flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-none p-1 hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
+        class="xs:hidden h-6 w-5.5 group cursor-pointer flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-none p-1 hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
       >
         <component :is="iconMap.reload" v-if="isLoading" :class="{ 'animate-infinite animate-spin': isLoading }" />
 
@@ -342,7 +342,7 @@ const handleFileDelete = (i: number) => {
 
           <component
             :is="iconMap.expand"
-            class="flex-none transform dark:(!text-white) group-hover:(!text-grey-800 scale-120) text-gray-500 text-[2rem] h-3"
+            class="flex-none transform dark:(!text-white) group-hover:(!text-grey-800 scale-120) text-gray-500 text-sm"
             @click.stop="onExpand"
           />
         </NcTooltip>

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

@@ -27,7 +27,9 @@ const basesStore = useBases()
 
 const { isMobileMode } = useGlobal()
 
-const { createProject: _createProject, updateProject, getProjectMetaInfo } = basesStore
+const { api } = useApi()
+
+const { createProject: _createProject, updateProject, getProjectMetaInfo, loadProject } = basesStore
 
 const { bases } = storeToRefs(basesStore)
 
@@ -49,6 +51,16 @@ const editMode = ref(false)
 
 const tempTitle = ref('')
 
+const sourceRenameHelpers = ref<
+  Record<
+    string,
+    {
+      editMode: boolean
+      tempTitle: string
+    }
+  >
+>({})
+
 const activeBaseId = ref('')
 
 const isErdModalOpen = ref<Boolean>(false)
@@ -102,6 +114,52 @@ const enableEditMode = () => {
   })
 }
 
+const enableEditModeForSource = (sourceId: string) => {
+  const source = base.value.sources?.find((s) => s.id === sourceId)
+  if (!source?.id) return
+  sourceRenameHelpers.value[source.id] = {
+    editMode: true,
+    tempTitle: source.alias || '',
+  }
+  nextTick(() => {
+    const input: HTMLInputElement | null = document.querySelector(`[data-source-rename-input-id="${sourceId}"]`)
+    if (!input) return
+    input?.focus()
+    input?.select()
+    input?.scrollIntoView()
+  })
+}
+
+const updateSourceTitle = async (sourceId: string) => {
+  const source = base.value.sources?.find((s) => s.id === sourceId)
+
+  if (!source?.id || !sourceRenameHelpers.value[source.id]) return
+
+  if (sourceRenameHelpers.value[source.id].tempTitle) {
+    sourceRenameHelpers.value[source.id].tempTitle = sourceRenameHelpers.value[source.id].tempTitle.trim()
+  }
+
+  if (!sourceRenameHelpers.value[source.id].tempTitle) return
+
+  try {
+    await api.source.update(source.base_id, source.id, {
+      alias: sourceRenameHelpers.value[source.id].tempTitle,
+    })
+
+    await loadProject(source.base_id, true)
+
+    delete sourceRenameHelpers.value[source.id]
+
+    $e('a:source:rename')
+
+    refreshViewTabTitle?.()
+  } catch (e: any) {
+    message.error(await extractSdkResponseErrorMsg(e))
+  } finally {
+    refreshCommandPalette()
+  }
+}
+
 const updateProjectTitle = async () => {
   if (tempTitle.value) {
     tempTitle.value = tempTitle.value.trim()
@@ -672,7 +730,20 @@ const onTableIdCopy = async () => {
                             <GeneralBaseLogo
                               class="flex-none min-w-4 !xs:(min-w-4.25 w-4.25 text-sm) !text-gray-600 !group-hover:text-gray-800"
                             />
+                            <input
+                              v-if="source.id && sourceRenameHelpers[source.id]?.editMode"
+                              ref="input"
+                              v-model="sourceRenameHelpers[source.id].tempTitle"
+                              class="flex-grow leading-1 outline-0 ring-none capitalize !text-inherit !bg-transparent flex-1 mr-4"
+                              :data-source-rename-input-id="source.id"
+                              @click.stop
+                              @keydown.enter.stop.prevent
+                              @keyup.enter="updateSourceTitle(source.id!)"
+                              @keyup.esc="updateSourceTitle(source.id!)"
+                              @blur="updateSourceTitle(source.id!)"
+                            />
                             <NcTooltip
+                              v-else
                               class="nc-sidebar-node-title capitalize text-ellipsis overflow-hidden select-none"
                               :style="{ wordBreak: 'keep-all', whiteSpace: 'nowrap', display: 'inline' }"
                               :class="{
@@ -688,7 +759,13 @@ const onTableIdCopy = async () => {
                             <NcTooltip class="xs:(hidden) flex items-center mr-1">
                               <template #title>{{ $t('objects.externalDb') }}</template>
 
-                              <GeneralIcon icon="info" class="flex-none text-gray-400 hover:text-gray-700 mr-1" />
+                              <GeneralIcon
+                                icon="info"
+                                class="flex-none text-gray-400 hover:text-gray-700 nc-sidebar-node-btn"
+                                :class="{
+                                  '!hidden': !isBasesOptionsOpen[source!.id!],
+                                }"
+                              />
                             </NcTooltip>
                           </div>
                           <div class="flex flex-row items-center gap-x-0.25">
@@ -716,6 +793,17 @@ const onTableIdCopy = async () => {
                                   }"
                                   @click="isBasesOptionsOpen[source!.id!] = false"
                                 >
+                                  <NcMenuItem
+                                    v-if="isUIAllowed('baseRename')"
+                                    data-testid="nc-sidebar-source-rename"
+                                    @click="enableEditModeForSource(source.id!)"
+                                  >
+                                    <GeneralIcon icon="rename" class="group-hover:text-black" />
+                                    {{ $t('general.rename') }}
+                                  </NcMenuItem>
+
+                                  <NcDivider />
+
                                   <!-- ERD View -->
                                   <NcMenuItem key="erd" @click="openErdView(source)">
                                     <div v-e="['c:source:erd']" class="flex gap-2 items-center">