Merge branch 'develop' into fix/ssl

README.md

@@ -89,7 +89,7 @@ Auto-upstall does the following : 🕊
 - 🚀 Automatically installs NocoDB with PostgreSQL, Redis, Minio, Traefik gateway using Docker Compose. 🐘 🗄️ 🌐
 - 🔄 Automatically upgrades NocoDB to the latest version when you run the command again.
 - 🔒 Automatically setups SSL and also renews it. Needs a domain or subdomain as input while installation.
-> install.nocodb.com/noco.sh script can be found [here in our github](https://raw.githubusercontent.com/nocodb/nocodb/develop/docker-compose/setup-script/noco.sh)
+> install.nocodb.com/noco.sh script can be found [here in our github](https://raw.githubusercontent.com/nocodb/nocodb/develop/docker-compose/1_Auto_Upstall/noco.sh)
 
 
 

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

@@ -242,31 +242,24 @@ useEventListener(document, 'keydown', (e: KeyboardEvent) => {
   // To prevent event listener on non active cell
   if (!active.value) return
 
-  if (
+  if (e.altKey || e.shiftKey || !isGrid.value || isExpandedForm.value || isEditColumn.value || isExpandedFormOpenExist()) {
-    e.altKey ||
-    e.ctrlKey ||
-    e.shiftKey ||
-    e.metaKey ||
-    !isGrid.value ||
-    isExpandedForm.value ||
-    isEditColumn.value ||
-    isExpandedFormOpenExist()
-  ) {
     return
   }
 
-  switch (e.key) {
+  if (e.metaKey || e.ctrlKey) {
-    case ';':
+    if (e.key === ';') {
-      localState.value = dayjs(new Date())
+      if (isGrid.value && !isExpandedForm.value && !isEditColumn.value) {
-      e.preventDefault()
+        localState.value = dayjs(new Date())
-      break
+        e.preventDefault()
-    default:
-      if (!isOpen.value && datePickerRef.value && /^[0-9a-z]$/i.test(e.key)) {
-        isClearedInputMode.value = true
-        datePickerRef.value.focus()
-        editable.value = true
-        open.value = true
       }
+    } else return
+  }
+
+  if (!isOpen.value && datePickerRef.value && /^[0-9a-z]$/i.test(e.key)) {
+    isClearedInputMode.value = true
+    datePickerRef.value.focus()
+    editable.value = true
+    open.value = true
   }
 })
 

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

@@ -296,31 +296,24 @@ useEventListener(document, 'keydown', (e: KeyboardEvent) => {
   // To prevent event listener on non active cell
   if (!active.value) return
 
-  if (
+  if (e.altKey || e.shiftKey || !isGrid.value || isExpandedForm.value || isEditColumn.value || isExpandedFormOpenExist()) {
-    e.altKey ||
-    e.ctrlKey ||
-    e.shiftKey ||
-    e.metaKey ||
-    !isGrid.value ||
-    isExpandedForm.value ||
-    isEditColumn.value ||
-    isExpandedFormOpenExist()
-  ) {
     return
   }
 
-  switch (e.key) {
+  if (e.metaKey || e.ctrlKey) {
-    case ';':
+    if (e.key === ';') {
-      localState.value = dayjs(new Date())
+      if (isGrid.value && !isExpandedForm.value && !isEditColumn.value) {
-      e.preventDefault()
+        localState.value = dayjs(new Date())
-      break
+        e.preventDefault()
-    default:
-      if (!isOpen.value && (datePickerRef.value || timePickerRef.value) && /^[0-9a-z]$/i.test(e.key)) {
-        isClearedInputMode.value = true
-        isDatePicker.value ? datePickerRef.value?.focus() : timePickerRef.value?.focus()
-        editable.value = true
-        open.value = true
       }
+    } else return
+  }
+
+  if (!isOpen.value && (datePickerRef.value || timePickerRef.value) && /^[0-9a-z]$/i.test(e.key)) {
+    isClearedInputMode.value = true
+    isDatePicker.value ? datePickerRef.value?.focus() : timePickerRef.value?.focus()
+    editable.value = true
+    open.value = true
   }
 })
 

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

@@ -225,31 +225,24 @@ useEventListener(document, 'keydown', (e: KeyboardEvent) => {
   // To prevent event listener on non active cell
   if (!active.value) return
 
-  if (
+  if (e.altKey || e.shiftKey || !isGrid.value || isExpandedForm.value || isEditColumn.value || isExpandedFormOpenExist()) {
-    e.altKey ||
-    e.ctrlKey ||
-    e.shiftKey ||
-    e.metaKey ||
-    !isGrid.value ||
-    isExpandedForm.value ||
-    isEditColumn.value ||
-    isExpandedFormOpenExist()
-  ) {
     return
   }
 
-  switch (e.key) {
+  if (e.metaKey || e.ctrlKey) {
-    case ';':
+    if (e.key === ';') {
-      localState.value = dayjs(new Date())
+      if (isGrid.value && !isExpandedForm.value && !isEditColumn.value) {
-      e.preventDefault()
+        localState.value = dayjs(new Date())
-      break
+        e.preventDefault()
-    default:
-      if (!isOpen.value && datePickerRef.value && /^[0-9a-z]$/i.test(e.key)) {
-        isClearedInputMode.value = true
-        datePickerRef.value.focus()
-        editable.value = true
-        open.value = true
       }
+    } else return
+  }
+
+  if (!isOpen.value && datePickerRef.value && /^[0-9a-z]$/i.test(e.key)) {
+    isClearedInputMode.value = true
+    datePickerRef.value.focus()
+    editable.value = true
+    open.value = true
   }
 })
 

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

@@ -206,31 +206,24 @@ useEventListener(document, 'keydown', (e: KeyboardEvent) => {
   // To prevent event listener on non active cell
   if (!active.value) return
 
-  if (
+  if (e.altKey || e.shiftKey || !isGrid.value || isExpandedForm.value || isEditColumn.value || isExpandedFormOpenExist()) {
-    e.altKey ||
-    e.ctrlKey ||
-    e.shiftKey ||
-    e.metaKey ||
-    !isGrid.value ||
-    isExpandedForm.value ||
-    isEditColumn.value ||
-    isExpandedFormOpenExist()
-  ) {
     return
   }
 
-  switch (e.key) {
+  if (e.metaKey || e.ctrlKey) {
-    case ';':
+    if (e.key === ';') {
-      localState.value = dayjs(new Date())
+      if (isGrid.value && !isExpandedForm.value && !isEditColumn.value) {
-      e.preventDefault()
+        localState.value = dayjs(new Date())
-      break
+        e.preventDefault()
-    default:
-      if (!isOpen.value && datePickerRef.value && /^[0-9a-z]$/i.test(e.key)) {
-        isClearedInputMode.value = true
-        datePickerRef.value.focus()
-        editable.value = true
-        open.value = true
       }
+    } else return
+  }
+
+  if (!isOpen.value && datePickerRef.value && /^[0-9a-z]$/i.test(e.key)) {
+    isClearedInputMode.value = true
+    datePickerRef.value.focus()
+    editable.value = true
+    open.value = true
   }
 })
 

packages/nc-gui/lang/ar.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/bn_IN.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/cs.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Kopírovat URL záznamu",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/da.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/de.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Rich-Text-Format aktivieren",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/es.json

@@ -761,7 +761,7 @@
     "icon": "Icono",
     "max": "Máximo",
     "enableRichText": "Activar Texto Enriquecido",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "URL del registro copiado",
     "copyRecordURL": "Copiar URL de registro",
     "duplicateRecord": "Duplicar registro",

packages/nc-gui/lang/eu.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/fa.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/fi.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/fr.json

@@ -761,7 +761,7 @@
     "icon": "Icône",
     "max": "Maximum",
     "enableRichText": "Activer le texte enrichi",
-    "idColon": "Identifiant:",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "URL de l'enregistrement copié",
     "copyRecordURL": "Copier l'URL de l'enregistrement",
     "duplicateRecord": "Dupliquer la ligne",

packages/nc-gui/lang/he.json

@@ -761,7 +761,7 @@
     "icon": "סמל",
     "max": "מקסימום",
     "enableRichText": "Enable rich text",
-    "idColon": "מזהה:",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "כתובת URL של הרשומה הועתקה",
     "copyRecordURL": "העתק כתובת URL של הרשומה",
     "duplicateRecord": "רשומה כפולה",

packages/nc-gui/lang/hi.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/hr.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/hu.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable Rich Text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Rekord URL másolva",
     "copyRecordURL": "Rekord URL másolása",
     "duplicateRecord": "Rekord duplikálása",

packages/nc-gui/lang/id.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/ja.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/ko.json

@@ -761,7 +761,7 @@
     "icon": "아이콘",
     "max": "최대",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "레코드 URL을 복사했습니다.",
     "copyRecordURL": "레코드 URL 복사",
     "duplicateRecord": "행 복제",

packages/nc-gui/lang/lv.json

@@ -761,7 +761,7 @@
     "icon": "Ikons",
     "max": "Maksimums",
     "enableRichText": "Ieslēgt bagātīgu tekstu",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Kopēts ieraksta URL",
     "copyRecordURL": "Kopēt ieraksta URL",
     "duplicateRecord": "Duplicēt ierakstu",

packages/nc-gui/lang/nl.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/no.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/pl.json

@@ -761,7 +761,7 @@
     "icon": "Ikona",
     "max": "Maks",
     "enableRichText": "Włącz Edytor Tekstu",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Skopiowano URL rekordu",
     "copyRecordURL": "Kopiuj URL rekordu",
     "duplicateRecord": "Zduplikowany rekord",

packages/nc-gui/lang/pt.json

@@ -761,7 +761,7 @@
     "icon": "Ícone",
     "max": "Max",
     "enableRichText": "Ativar texto rico",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicar registo",

packages/nc-gui/lang/pt_BR.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/ru.json

@@ -761,7 +761,7 @@
     "icon": "Иконка",
     "max": "Макс",
     "enableRichText": "Включить насыщенный текст",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "URL скопированной записи",
     "copyRecordURL": "Копировать URL записи",
     "duplicateRecord": "Дублировать запись",

packages/nc-gui/lang/sk.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/sl.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/sv.json

@@ -761,7 +761,7 @@
     "icon": "Ikon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/th.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/tr.json

@@ -761,7 +761,7 @@
     "icon": "Simge",
     "max": "Max",
     "enableRichText": "Zengin Metni Etkinleştir",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Kayıt URL'si Kopyalandı",
     "copyRecordURL": "Kayıt URL'sini Kopyala",
     "duplicateRecord": "Kaydı Çoğalt",

packages/nc-gui/lang/uk.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/vi.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/nc-gui/lang/zh-Hans.json

@@ -761,7 +761,7 @@
     "icon": "图标",
     "max": "最大",
     "enableRichText": "启用富文本",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "复制的记录 URL",
     "copyRecordURL": "复制该记录卡片的 URL",
     "duplicateRecord": "复制该行",

packages/nc-gui/lang/zh-Hant.json

@@ -761,7 +761,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id: {fieldId}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

packages/noco-docs/docs/020.getting-started/020.quick-start.md

@@ -16,7 +16,7 @@ When you opt for self-hosting, you gain the advantage of running an application
 
 Setting up NocoDB on your own server is a straightforward process & the articles below will guide you through the steps to get started.
 
-- [Installation](/getting-started/self-hosted/installation/auto-install)
+- [Installation](/getting-started/self-hosted/installation/auto-upstall)
 - [Environment Variables](/getting-started/self-hosted/environment-variables)
 - [Upgrading](/getting-started/self-hosted/upgrading)
 

packages/noco-docs/docs/020.getting-started/040.keyboard-shortcuts.md

@@ -91,18 +91,19 @@ To navigate within ⌘+J menu,
 
 
 ## Field type specific shortcuts
-|        Datatype        |         Key | Behaviour                          |
+|           Datatype            |         Key | Behaviour                          |
-|:----------------------:|------------:|:-----------------------------------|
+|:-----------------------------:|------------:|:-----------------------------------|
-| Text & Numerical cells |     `←` `→` | Move cursor to the left / right    |
+|    Text & Numerical cells     |     `←` `→` | Move cursor to the left / right    |
-|                        |     `↑` `↓` | Move cursor to the beginning / end |
+|                               |     `↑` `↓` | Move cursor to the beginning / end |
-|     Single Select      |     `↑` `↓` | Move between options               |
+|         Single Select         |     `↑` `↓` | Move between options               |
-|                        |     `Enter` | Select option                      |
+|                               |     `Enter` | Select option                      |
-|      Multi Select      |     `↑` `↓` | Move between options               |
+|         Multi Select          |     `↑` `↓` | Move between options               |
-|                        |     `Enter` | Select / deselect option           |
+|                               |     `Enter` | Select / deselect option           |
-|          Link          |     `↑` `↓` | Move between options               |
+|             Link              |     `↑` `↓` | Move between options               |
-|                        |     `Enter` | Link current selection             |
+|                               |     `Enter` | Link current selection             |
-|        Checkbox        |     `Enter` | Toggle                             |
+|           Checkbox            |     `Enter` | Toggle                             |
-|         Rating         | `<0 ~ Max>` | Enter number to toggle rating      |
+|            Rating             | `<0 ~ Max>` | Enter number to toggle rating      |
+| Date / Time / DateTime / Year |   `⌘` + `;` | Select today's date                |
 
 
 ## Expanded form shortcuts

packages/noco-docs/docs/020.getting-started/050.self-hosted/010.installation/010.auto-upstall.md

@@ -44,7 +44,7 @@ This is quick walkthrough of how to install NocoDB using auto-upstall script.
 - **Step 4** :  🐦 Don't keep the command a secret. Tweet how easy it is. This step is a must!
 
 
-> install.nocodb.com/noco.sh script can be found [here in our github](https://raw.githubusercontent.com/nocodb/nocodb/develop/docker-compose/setup-script/noco.sh)
+> install.nocodb.com/noco.sh script can be found [here in our github](https://raw.githubusercontent.com/nocodb/nocodb/develop/docker-compose/1_Auto_Upstall/noco.sh)
 
 
 ## Detailed installation guide

packages/noco-docs/docs/020.getting-started/050.self-hosted/030.upgrading.md

@@ -5,7 +5,7 @@ tags: ['Open Source']
 keywords: ['NocoDB upgrade', 'upgrade NocoDB', 'upgrade nocodb']
 ---
 
-By default, if `NC_DB` is not specified upon [installation](/getting-started/self-hosted/installation/auto-install), then SQLite will be used to store metadata. We suggest users to separate the metadata and user data in different databases as pictured in our [architecture](/engineering/architecture). 
+By default, if `NC_DB` is not specified upon [installation](/getting-started/self-hosted/installation/auto-upstall), then SQLite will be used to store metadata. We suggest users to separate the metadata and user data in different databases as pictured in our [architecture](/engineering/architecture). 
 
 ## Docker