Merge pull request #4585 from humannocode/enable-decimals-and-numbers-for-qr-code

QrCode: also allow decimals and numbers as referenced values

packages/nc-gui/components/smartsheet/column/QrCodeOptions.vue

@@ -27,7 +27,6 @@ const columnsAllowedAsQrValue = computed<SelectProps['options']>(() => {
     ?.filter(
       (el) =>
         el.fk_column_id &&
-        // AllowedColumnTypesForQrCode.map((el) => el.toString()).includes(metaColumnById.value[el.fk_column_id].uidt),
         AllowedColumnTypesForQrCode.includes(metaColumnById.value[el.fk_column_id].uidt as UITypes),
     )
     .map((field) => {

packages/nc-gui/package-lock.json

@@ -90,28 +90,6 @@
         "windicss": "^3.5.6"
       }
     },
-    "../nocodb-sdk": {
-      "version": "0.100.2",
-      "license": "AGPL-3.0-or-later",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      },
-      "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^4.0.1",
-        "@typescript-eslint/parser": "^4.0.1",
-        "cspell": "^4.1.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",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^2.1.1",
-        "typescript": "^4.0.2"
-      }
-    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
@@ -8439,7 +8417,6 @@
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
       "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
-      "devOptional": true,
       "funding": [
         {
           "type": "individual",
@@ -11795,8 +11772,21 @@
       }
     },
     "node_modules/nocodb-sdk": {
-      "resolved": "../nocodb-sdk",
+      "version": "0.100.2",
-      "link": true
+      "resolved": "file:../nocodb-sdk",
+      "license": "AGPL-3.0-or-later",
+      "dependencies": {
+        "axios": "^0.21.1",
+        "jsep": "^1.3.6"
+      }
+    },
+    "node_modules/nocodb-sdk/node_modules/axios": {
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "dependencies": {
+        "follow-redirects": "^1.14.0"
+      }
     },
     "node_modules/node-abi": {
       "version": "3.23.0",
@@ -23642,8 +23632,7 @@
     "follow-redirects": {
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
-      "devOptional": true
     },
     "form-data": {
       "version": "4.0.0",
@@ -26111,22 +26100,20 @@
       }
     },
     "nocodb-sdk": {
-      "version": "file:../nocodb-sdk",
+      "version": "0.100.2",
       "requires": {
-        "@typescript-eslint/eslint-plugin": "^4.0.1",
-        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "cspell": "^4.1.0",
+        "jsep": "^1.3.6"
-        "eslint": "^7.8.0",
+      },
-        "eslint-config-prettier": "^6.11.0",
+      "dependencies": {
-        "eslint-plugin-eslint-comments": "^3.2.0",
+        "axios": {
-        "eslint-plugin-functional": "^3.0.2",
+          "version": "0.21.4",
-        "eslint-plugin-import": "^2.22.0",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-        "eslint-plugin-prettier": "^4.0.0",
+          "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-        "jsep": "^1.3.6",
+          "requires": {
-        "npm-run-all": "^4.1.5",
+            "follow-redirects": "^1.14.0"
-        "prettier": "^2.1.1",
+          }
-        "typescript": "^4.0.2"
+        }
       }
     },
     "node-abi": {

packages/nocodb-sdk/src/lib/columnRules/QrCodeRules.ts

@@ -7,4 +7,6 @@ export const AllowedColumnTypesForQrCode = [
   UITypes.PhoneNumber,
   UITypes.URL,
   UITypes.Email,
+  UITypes.Decimal,
+  UITypes.Number,
 ];

packages/nocodb/package-lock.json

@@ -151,28 +151,6 @@
         "vuedraggable": "^2.24.3"
       }
     },
-    "../nocodb-sdk": {
-      "version": "0.100.2",
-      "license": "AGPL-3.0-or-later",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      },
-      "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^4.0.1",
-        "@typescript-eslint/parser": "^4.0.1",
-        "cspell": "^4.1.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",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^2.1.1",
-        "typescript": "^4.0.2"
-      }
-    },
     "node_modules/@azure/abort-controller": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz",
@@ -10656,8 +10634,13 @@
       "dev": true
     },
     "node_modules/nocodb-sdk": {
-      "resolved": "../nocodb-sdk",
+      "version": "0.100.2",
-      "link": true
+      "resolved": "file:../nocodb-sdk",
+      "license": "AGPL-3.0-or-later",
+      "dependencies": {
+        "axios": "^0.21.1",
+        "jsep": "^1.3.6"
+      }
     },
     "node_modules/node-abort-controller": {
       "version": "3.0.1",
@@ -26059,22 +26042,10 @@
       "dev": true
     },
     "nocodb-sdk": {
-      "version": "file:../nocodb-sdk",
+      "version": "0.100.2",
       "requires": {
-        "@typescript-eslint/eslint-plugin": "^4.0.1",
-        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "cspell": "^4.1.0",
+        "jsep": "^1.3.6"
-        "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",
-        "jsep": "^1.3.6",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^2.1.1",
-        "typescript": "^4.0.2"
       }
     },
     "node-abort-controller": {

tests/playwright/package-lock.json

@@ -14,7 +14,7 @@
         "xlsx": "^0.18.5"
       },
       "devDependencies": {
-        "@playwright/test": "1.27.1",
+        "@playwright/test": "^1.27.1",
         "@typescript-eslint/eslint-plugin": "^4.0.1",
         "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.24.0",

tests/playwright/pages/Dashboard/Grid/Column/index.ts

@@ -95,7 +95,7 @@ export class ColumnPageObject extends BasePage {
         await this.get().locator('.ant-select-single').nth(1).click();
         await this.rootPage
           .locator(`.ant-select-item`, {
-            hasText: qrCodeValueColumnTitle,
+            hasText: new RegExp(`^${qrCodeValueColumnTitle}$`),
           })
           .click();
         break;