Merge pull request #2226 from nocodb/develop

2 years ago · df6a3f3ce4
7 changed files with 71 additions and 39 deletions
--- a/packages/nc-gui/components/project/spreadsheet/RowsXcDataTable.vue
+++ b/packages/nc-gui/components/project/spreadsheet/RowsXcDataTable.vue
@ -91,7 +91,7 @@
            :field-list="[...realFieldList, ...formulaFieldList]"
            dense
            :view-id="selectedViewId"
-            @updated="loadTableData"
+            @updated="loadTableData(false)"
          />
          <sort-list
            v-if="!isForm"
@ -99,7 +99,7 @@
            :is-locked="isLocked"
            :meta="meta"
            :view-id="selectedViewId"
-            @updated="loadTableData"
+            @updated="loadTableData(false)"
          />
        </div>
        <share-view-menu
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@ -28,7 +28,7 @@
        "monaco-editor": "^0.19.3",
        "monaco-themes": "^0.2.5",
        "nano-assign": "^1.0.1",
-        "nocodb-sdk": "0.91.6",
+        "nocodb-sdk": "file:../nocodb-sdk",
        "nuxt": "^2.14.0",
        "odometer": "^0.4.8",
        "papaparse": "^5.3.1",
@ -74,7 +74,6 @@
    },
    "../nocodb-sdk": {
      "version": "0.91.3",
-      "extraneous": true,
      "license": "MIT",
      "dependencies": {
        "axios": "^0.21.1",
@ -10791,16 +10790,8 @@
      }
    },
    "node_modules/nocodb-sdk": {
-      "version": "0.91.6",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.91.6.tgz",
-      "integrity": "sha512-nwaBAzaMF7+ns5lqZN3sPdWN4EuisD+llOma/Uy5g8GLCHBgQqY9ug5ZvkulN5hhUli2KUb2584PUImE17WX6Q==",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+      "resolved": "../nocodb-sdk",
+      "link": true
    },
    "node_modules/node-fetch": {
      "version": "2.6.7",
@ -25435,12 +25426,33 @@
      }
    },
    "nocodb-sdk": {
-      "version": "0.91.6",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.91.6.tgz",
-      "integrity": "sha512-nwaBAzaMF7+ns5lqZN3sPdWN4EuisD+llOma/Uy5g8GLCHBgQqY9ug5ZvkulN5hhUli2KUb2584PUImE17WX6Q==",
+      "version": "file:../nocodb-sdk",
      "requires": {
+        "@ava/typescript": "^1.1.1",
+        "@istanbuljs/nyc-config-typescript": "^1.0.1",
+        "@typescript-eslint/eslint-plugin": "^4.0.1",
+        "@typescript-eslint/parser": "^4.0.1",
+        "ava": "^3.12.1",
        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
+        "codecov": "^3.5.0",
+        "cspell": "^4.1.0",
+        "cz-conventional-changelog": "^3.3.0",
+        "eslint": "^7.8.0",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-functional": "^3.0.2",
+        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "gh-pages": "^3.1.0",
+        "jsep": "^1.3.6",
+        "npm-run-all": "^4.1.5",
+        "nyc": "^15.1.0",
+        "open-cli": "^6.0.1",
+        "prettier": "^2.1.1",
+        "standard-version": "^9.0.0",
+        "ts-node": "^9.0.0",
+        "typedoc": "^0.19.0",
+        "typescript": "^4.0.2"
      }
    },
    "node-fetch": {
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@ -31,7 +31,7 @@
    "monaco-editor": "^0.19.3",
    "monaco-themes": "^0.2.5",
    "nano-assign": "^1.0.1",
-    "nocodb-sdk": "0.91.6",
+    "nocodb-sdk": "file:../nocodb-sdk",
    "nuxt": "^2.14.0",
    "odometer": "^0.4.8",
    "papaparse": "^5.3.1",
--- a/packages/nocodb-sdk/package-lock.json
+++ b/packages/nocodb-sdk/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "nocodb-sdk",
-  "version": "0.91.3",
+  "version": "0.91.6",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "nocodb-sdk",
-      "version": "0.91.3",
+      "version": "0.91.6",
      "license": "MIT",
      "dependencies": {
        "axios": "^0.21.1",
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@ -73,7 +73,7 @@
        "nc-lib-gui": "0.91.6",
        "nc-plugin": "0.1.2",
        "ncp": "^2.0.0",
-        "nocodb-sdk": "0.91.6",
+        "nocodb-sdk": "file:../nocodb-sdk",
        "nodemailer": "^6.4.10",
        "object-hash": "^3.0.0",
        "ora": "^4.0.4",
@ -156,7 +156,6 @@
    },
    "../nocodb-sdk": {
      "version": "0.91.3",
-      "extraneous": true,
      "license": "MIT",
      "dependencies": {
        "axios": "^0.21.1",
@ -16163,16 +16162,8 @@
      "dev": true
    },
    "node_modules/nocodb-sdk": {
-      "version": "0.91.6",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.91.6.tgz",
-      "integrity": "sha512-nwaBAzaMF7+ns5lqZN3sPdWN4EuisD+llOma/Uy5g8GLCHBgQqY9ug5ZvkulN5hhUli2KUb2584PUImE17WX6Q==",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+      "resolved": "../nocodb-sdk",
+      "link": true
    },
    "node_modules/node-addon-api": {
      "version": "2.0.0",
@ -37448,12 +37439,33 @@
      "dev": true
    },
    "nocodb-sdk": {
-      "version": "0.91.6",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.91.6.tgz",
-      "integrity": "sha512-nwaBAzaMF7+ns5lqZN3sPdWN4EuisD+llOma/Uy5g8GLCHBgQqY9ug5ZvkulN5hhUli2KUb2584PUImE17WX6Q==",
+      "version": "file:../nocodb-sdk",
      "requires": {
+        "@ava/typescript": "^1.1.1",
+        "@istanbuljs/nyc-config-typescript": "^1.0.1",
+        "@typescript-eslint/eslint-plugin": "^4.0.1",
+        "@typescript-eslint/parser": "^4.0.1",
+        "ava": "^3.12.1",
        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
+        "codecov": "^3.5.0",
+        "cspell": "^4.1.0",
+        "cz-conventional-changelog": "^3.3.0",
+        "eslint": "^7.8.0",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-functional": "^3.0.2",
+        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "gh-pages": "^3.1.0",
+        "jsep": "^1.3.6",
+        "npm-run-all": "^4.1.5",
+        "nyc": "^15.1.0",
+        "open-cli": "^6.0.1",
+        "prettier": "^2.1.1",
+        "standard-version": "^9.0.0",
+        "ts-node": "^9.0.0",
+        "typedoc": "^0.19.0",
+        "typescript": "^4.0.2"
      }
    },
    "node-addon-api": {
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@ -156,7 +156,7 @@
    "nc-lib-gui": "0.91.6",
    "nc-plugin": "0.1.2",
    "ncp": "^2.0.0",
-    "nocodb-sdk": "0.91.6",
+    "nocodb-sdk": "file:../nocodb-sdk",
    "nodemailer": "^6.4.10",
    "object-hash": "^3.0.0",
    "ora": "^4.0.4",
--- a/packages/nocodb/src/lib/noco/meta/helpers/NcPluginMgrv2.ts
+++ b/packages/nocodb/src/lib/noco/meta/helpers/NcPluginMgrv2.ts
@ -85,7 +85,15 @@ class NcPluginMgrv2 {
          null,
          null,
          MetaTable.PLUGIN,
-          plugin,
+          {
+            title: plugin.title,
+            version: plugin.version,
+            logo: plugin.logo,
+            description: plugin.description,
+            tags: plugin.tags,
+            category: plugin.category,
+            input_schema: JSON.stringify(plugin.inputs)
+          },
          pluginConfig.id
        );
      }