Merge pull request #7773 from nocodb/develop

packages/nc-gui/package.json

@@ -73,7 +73,7 @@
     "marked": "^4.3.0",
     "monaco-editor": "^0.45.0",
     "monaco-sql-languages": "^0.11.0",
-    "nocodb-sdk": "0.204.2",
+    "nocodb-sdk": "workspace:^",
     "papaparse": "^5.4.1",
     "parse-github-url": "^1.0.2",
     "pinia": "^2.1.7",

packages/nocodb/package.json

@@ -137,7 +137,7 @@
     "ncp": "^2.0.0",
     "nestjs-kafka": "^1.0.6",
     "nestjs-throttler-storage-redis": "^0.4.2",
-    "nocodb-sdk": "0.204.2",
+    "nocodb-sdk": "workspace:^",
     "nodemailer": "^6.9.11",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.4",

packages/nocodb/src/models/Model.ts

@@ -230,13 +230,16 @@ export default class Model implements TableType {
         model.meta = parseMetaProp(model);
       }
 
-      await NocoCache.setList(
-        CacheScope.MODEL,
-        [base_id, source_id],
-        modelList,
-      );
-
-      await NocoCache.setList(CacheScope.MODEL, [base_id], modelList);
+      // set cache based on source_id presence
+      if (source_id) {
+        await NocoCache.setList(
+          CacheScope.MODEL,
+          [base_id, source_id],
+          modelList,
+        );
+      } else {
+        await NocoCache.setList(CacheScope.MODEL, [base_id], modelList);
+      }
     }
     modelList.sort(
       (a, b) =>

pnpm-lock.yaml

@@ -139,7 +139,7 @@ importers:
         specifier: ^0.11.0
         version: 0.11.0
       nocodb-sdk:
-        specifier: 0.204.2
+        specifier: workspace:^
         version: link:../nocodb-sdk
       papaparse:
         specifier: ^5.4.1
@@ -689,7 +689,7 @@ importers:
         specifier: ^0.4.2
         version: 0.4.2(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1)
       nocodb-sdk:
-        specifier: 0.204.2
+        specifier: workspace:^
         version: link:../nocodb-sdk
       nodemailer:
         specifier: ^6.9.11
@@ -24253,6 +24253,9 @@ packages:
   /sqlite3@5.1.6:
     resolution: {integrity: sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==}
     requiresBuild: true
+    peerDependenciesMeta:
+      node-gyp:
+        optional: true
     dependencies:
       '@mapbox/node-pre-gyp': 1.0.11
       node-addon-api: 4.3.0
@@ -24267,6 +24270,9 @@ packages:
   /sqlite3@5.1.7:
     resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==}
     requiresBuild: true
+    peerDependenciesMeta:
+      node-gyp:
+        optional: true
     dependencies:
       bindings: 1.5.0
       node-addon-api: 7.0.0