Merge branch 'develop' into fix/gui-v2-export-csv

.github/workflows/ci-cd-v2.yml

@@ -635,4 +635,93 @@ jobs:
 #            name: cypress-pg-restMisc-run-cache-snapshots
 #            path: scripts/cypress-v2/screenshots
 #            retention-days: 2
-#
+#
+    cy-quick-sqlite:
+      runs-on: ubuntu-20.04
+      steps:
+        - name: Setup Node
+          uses: actions/setup-node@v1
+          with:
+            node-version: 16.15.0
+        - name: Checkout
+          uses: actions/checkout@v2
+          with:
+            fetch-depth: 0
+        - name: Cache node modules
+          uses: actions/cache@v2
+          env:
+            cache-name: cache-node-modules
+
+          with:
+            # npm cache files are stored in `~/.npm` on Linux/macOS
+            path: ~/.npm
+            key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+            restore-keys: |
+              ${{ runner.os }}-build-${{ env.cache-name }}-
+              ${{ runner.os }}-build-
+              ${{ runner.os }}-
+        - name: Set env
+          run: echo "NODE_ENV=test" >> $GITHUB_ENV
+        - name: Cypress run
+          uses: cypress-io/github-action@v2
+          with:
+            start: |
+              cp ./scripts/cypress-v2/fixtures/quickTest/noco_0_91_7.db ./packages/nocodb/noco.db
+              npm run start:api:cache
+              npm run start:web-v2
+              docker-compose -f ./scripts/docker-compose-cypress.yml up -d
+            spec: "./scripts/cypress-v2/integration/test/quickTest.js"
+            wait-on: "http://localhost:8080"
+            wait-on-timeout: 1200
+            config-file: scripts/cypress-v2/cypress.json
+        - name: Upload screenshots
+          if: always()
+          uses: actions/upload-artifact@v2
+          with:
+            name: cy-quick-sqlite-snapshots
+            path: scripts/cypress-v2/screenshots
+            retention-days: 2
+    cy-quick-pg:
+      runs-on: ubuntu-20.04
+      steps:
+        - name: Setup Node
+          uses: actions/setup-node@v1
+          with:
+            node-version: 16.15.0
+        - name: Checkout
+          uses: actions/checkout@v2
+          with:
+            fetch-depth: 0
+        - name: Cache node modules
+          uses: actions/cache@v2
+          env:
+            cache-name: cache-node-modules
+
+          with:
+            # npm cache files are stored in `~/.npm` on Linux/macOS
+            path: ~/.npm
+            key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+            restore-keys: |
+              ${{ runner.os }}-build-${{ env.cache-name }}-
+              ${{ runner.os }}-build-
+              ${{ runner.os }}-
+        - name: Set env
+          run: echo "NODE_ENV=test" >> $GITHUB_ENV
+        - name: Cypress run
+          uses: cypress-io/github-action@v2
+          with:
+            start: |
+              docker-compose -f ./scripts/cypress-v2/docker-compose-pg-cy-quick.yml up -d
+              npm run start:api:cache:pg:cyquick  
+              npm run start:web-v2
+            spec: "./scripts/cypress-v2/integration/test/quickTest.js"
+            wait-on: "http://localhost:8080"
+            wait-on-timeout: 1200
+            config-file: scripts/cypress-v2/cypress.json
+        - name: Upload screenshots
+          if: always()
+          uses: actions/upload-artifact@v2
+          with:
+            name: cy-quick-pg-snapshots
+            path: scripts/cypress-v2/screenshots
+            retention-days: 2

packages/nocodb-sdk/package.json

@@ -9,6 +9,7 @@
   "license": "MIT",
   "keywords": [],
   "scripts": {
+    "preinstall": "npx npm-force-resolutions",
     "build": "npm run generate:sdk && run-p build:*",
     "build:main": "tsc -p tsconfig.json",
     "build:module": "tsc -p tsconfig.module.json",
@@ -37,8 +38,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 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 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": "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": "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"
   },
   "engines": {
     "node": ">=10"
@@ -68,10 +69,14 @@
     "open-cli": "^6.0.1",
     "prettier": "^2.1.1",
     "standard-version": "^9.0.0",
+    "swagger-typescript-api": "^10.0.1",
     "ts-node": "^9.0.0",
     "typedoc": "^0.22.17",
     "typescript": "^4.0.2"
   },
+  "resolutions": {
+    "typescript": "4.7.4"
+  },
   "files": [
     "build/main",
     "build/module",
@@ -107,4 +112,4 @@
       "**/*.spec.js"
     ]
   }
-}
+}