Merge pull request #4223 from nocodb/develop

.github/workflows/publish-dev-docs.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           source_file: 'packages/noco-docs/dist/'
           clear_folder: 'docs/dist'
-          destination_repo: 'nocodb/noco-docs'
+          destination_repo: 'nocodb/noco-docs-dev'
           destination_folder: 'docs'
           user_email: 'oof1lab@gmail.com'
           user_name: 'o1lab'

packages/nc-gui/components/smartsheet/Gallery.vue

@@ -21,7 +21,6 @@ import {
   onMounted,
   provide,
   ref,
-  useUIPermission,
   useViewData,
 } from '#imports'
 import type { Row as RowType } from '~/lib'

packages/nc-gui/composables/useViewData.ts

@@ -1,4 +1,4 @@
-import { ViewTypes, isVirtualCol } from 'nocodb-sdk'
+import { UITypes, ViewTypes } from 'nocodb-sdk'
 import type { Api, ColumnType, FormType, GalleryType, PaginatedType, TableType, ViewType } from 'nocodb-sdk'
 import type { ComputedRef, Ref } from 'vue'
 import {
@@ -273,12 +273,13 @@ export function useViewData(
       })
 
       /** update row data(to sync formula and other related columns)
-       * update only virtual columns data to avoid overwriting any changes made by user
+       * update only formula, rollup and auto updated datetime columns data to avoid overwriting any changes made by user
        */
       Object.assign(
         toUpdate.row,
         metaValue!.columns!.reduce<Record<string, any>>((acc: Record<string, any>, col: ColumnType) => {
-          if (isVirtualCol(col)) acc[col.title!] = updatedRowData[col.title!]
+          if (col.uidt === UITypes.Formula || col.uidt === UITypes.Rollup || col.au || col.cdf?.includes(' on update '))
+            acc[col.title!] = updatedRowData[col.title!]
           return acc
         }, {} as Record<string, any>),
       )

packages/nocodb-sdk/package.json

@@ -37,8 +37,8 @@
     "version": "standard-version",
     "reset-hard": "git clean -dfx && git reset --hard && npm i",
     "prepare-release": "run-s reset-hard test cov:check doc:html version doc:publish",
-    "generate:sdk": "npx --yes swagger-typescript-api -r -p ../../scripts/sdk/swagger.json -o ./src/lib/  --axios --unwrap-response-data  --module-name-first-tag --type-suffix=Type --templates ../../scripts/sdk/templates",
-    "generate:sdk:default": "npx --yes swagger-typescript-api -r -p ../../scripts/sdk/swagger.json -o ./src/lib/ --name Api2.ts --unwrap-response-data  --module-name-first-tag --type-suffix=Type --templates ../../scripts/sdk/templates"
+    "generate:sdk": "npx --yes swagger-typescript-api@10.0.3 -r -p ../../scripts/sdk/swagger.json -o ./src/lib/  --axios --unwrap-response-data  --module-name-first-tag --type-suffix=Type --templates ../../scripts/sdk/templates",
+    "generate:sdk:default": "npx --yes swagger-typescript-api@10.0.3 -r -p ../../scripts/sdk/swagger.json -o ./src/lib/ --name Api2.ts --unwrap-response-data  --module-name-first-tag --type-suffix=Type --templates ../../scripts/sdk/templates"
   },
   "engines": {
     "node": ">=10"
@@ -107,4 +107,4 @@
       "**/*.spec.js"
     ]
   }
-}
+}