Merge pull request #7951 from nocodb/develop

nocodb · Mar 23, 2024 · 4839ff0 · 4839ff0
2 parents be2e335 + 1d54166
commit 4839ff0
Show file tree

Hide file tree

Showing 40 changed files with 193 additions and 160 deletions.
diff --git a/.github/workflows/sync-to-develop.yml b/.github/workflows/sync-to-develop.yml
@@ -9,15 +9,37 @@ jobs:
   sync-to-develop:
     runs-on: ubuntu-latest
     steps:
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.19.1
       - name: Checkout
-        uses: actions/checkout@v1
-
-      - name: Merge from master to develop
-        uses: wingkwong/gh-action-nightly-merge@master
+        uses: actions/checkout@v3
         with:
-          stable_branch: 'master'
-          development_branch: 'develop'
-          allow_ff: true
-          allow_forks: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+          path: nocodb
+      - name: Prepare GH Cli
+        id: gh
+        run: |
+          wget https://github.com/cli/cli/releases/download/v2.33.0/gh_2.33.0_linux_amd64.tar.gz
+          tar -xvf gh_2.33.0_linux_amd64.tar.gz
+          GH=gh_2.33.0_linux_amd64/bin/gh
+          echo "GH=${GH}" >> $GITHUB_OUTPUT
+      - name: Sync Master to Develop
+        id: sync
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          cd nocodb
+          git fetch --quiet --unshallow origin
+          git checkout master
+          : # Use the first 8 characters of the latest commit hash as the branch name
+          BRANCH_NAME=nc/$(git rev-list -n 1 HEAD | cut -c1-8)
+          git checkout -b $BRANCH_NAME
+          git config user.name 'github-actions[bot]'
+          git config user.email 'github-actions[bot]@users.noreply.github.com'
+          revertSDK=true node scripts/upgradeNocodbSdk.js
+          git add .
+          git diff-index --quiet HEAD || git commit -m "chore: update sdk path"
+          git push origin $BRANCH_NAME
+          ../${{ steps.gh.outputs.GH }} pr create --title "chore: post-release sync" --body "$(echo -e "This is an automated pull request to sync the master branch to develop.\nPlease review and merge this pull request if it looks good.")" --base develop --head $BRANCH_NAME
diff --git a/packages/nc-gui/lang/ar.json b/packages/nc-gui/lang/ar.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/bn_IN.json b/packages/nc-gui/lang/bn_IN.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/cs.json b/packages/nc-gui/lang/cs.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Name des Arbeitsbereichs ändern",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
@@ -699,7 +699,7 @@
     "hideNocodbBranding": "Hide NocoDB Branding",
     "showOnConditions": "Show on condtions",
     "showFieldOnConditionsMet": "Shows field only when conditions are met",
-    "limitOptions": "Limit options",
+    "limitOptions": "Limit ptions",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
     "clearSelection": "Clear selection"
   },

diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Se requiere el nombre de la fuente",
     "changeWsName": "Cambiar el nombre del espacio de trabajo",
     "pressEnter": "Pulsa Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "El nuevo formulario se cargará después de",
     "webhook": "Webhook",
     "multiField": {
       "newField": "Nuevo campo",

diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/fa.json b/packages/nc-gui/lang/fa.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Appuyez sur Entrée",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/he.json b/packages/nc-gui/lang/he.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/hi.json b/packages/nc-gui/lang/hi.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/hr.json b/packages/nc-gui/lang/hr.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/it.json b/packages/nc-gui/lang/it.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Nome sorgente obbligatorio",
     "changeWsName": "Cambia nome area di lavoro",
     "pressEnter": "Premi Invio",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "Il nuovo form verrà caricato dopo",
     "webhook": "Webhook",
     "multiField": {
       "newField": "Nuovo campo",

diff --git a/packages/nc-gui/lang/ja.json b/packages/nc-gui/lang/ja.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "소스 이름이 필요합니다",
     "changeWsName": "작업 공간 이름 변경",
     "pressEnter": "Enter를 누르세요",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "새로운 폼이 로드되었습니다.",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/lv.json b/packages/nc-gui/lang/lv.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "nazwa źródła jest wymagana",
     "changeWsName": "Zmień nazwę przestrzeni roboczej",
     "pressEnter": "Naciśnij Enter",
-    "newFormLoaded": "Ładowanie nowego formularza w",
+    "newFormLoaded": "Nowy formularz zostanie załadowany po",
     "webhook": "Webhook",
     "multiField": {
       "newField": "Nowe pole",

diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Имя источника обязательно",
     "changeWsName": "Изменить название рабочего пространства",
     "pressEnter": "Нажмите Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "Новая форма будет загружена после",
     "webhook": "Вебхук",
     "multiField": {
       "newField": "Новое поле",

diff --git a/packages/nc-gui/lang/sk.json b/packages/nc-gui/lang/sk.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/sl.json b/packages/nc-gui/lang/sl.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/tr.json b/packages/nc-gui/lang/tr.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "必须填写源名称",
     "changeWsName": "更改工作区名称",
     "pressEnter": "按回车键",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "新表格将在",
     "webhook": "网络钩子",
     "multiField": {
       "newField": "新建字段",

diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json
@@ -683,7 +683,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "Loading new form in",
+    "newFormLoaded": "New form will be loaded after",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",

diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
@@ -75,7 +75,7 @@
     "marked": "^4.3.0",
     "monaco-editor": "^0.45.0",
     "monaco-sql-languages": "^0.11.0",
-    "nocodb-sdk": "0.204.8",
+    "nocodb-sdk": "workspace:^",
     "papaparse": "^5.4.1",
     "parse-github-url": "^1.0.2",
     "pinia": "^2.1.7",
@@ -114,11 +114,11 @@
     "@iconify-json/clarity": "^1.1.12",
     "@iconify-json/eva": "^1.1.10",
     "@iconify-json/ic": "^1.1.17",
-    "@iconify-json/ion": "^1.1.15",
+    "@iconify-json/ion": "^1.1.16",
     "@iconify-json/la": "^1.1.8",
     "@iconify-json/logos": "^1.1.42",
-    "@iconify-json/lucide": "^1.1.176",
-    "@iconify-json/material-symbols": "^1.1.75",
+    "@iconify-json/lucide": "^1.1.177",
+    "@iconify-json/material-symbols": "^1.1.76",
     "@iconify-json/mdi": "^1.1.64",
     "@iconify-json/mi": "^1.1.8",
     "@iconify-json/ph": "^1.1.11",