Merge pull request #940 from kuzzleio/4.2.0-proposal

Release 4.2.0

.github/actions/deploy-to-s3/action.yml

@@ -18,9 +18,6 @@ inputs:
     description: AWS default region
     required: true
     default: 'us-west-2'
-  GA_ID:
-    description: Google Analytics ID
-    required: true
   TARGET_DIST:
     description: Build artifact folder to deploy
     required: true
@@ -41,7 +38,6 @@ runs:
         npm run build
       env:
         NODE_ENV: production
-        GA_ID: ${{ inputs.GA_ID }}
       shell: bash
     - name: Deploy
       run: |

.github/actions/e2e-tests/action.yml

@@ -6,7 +6,10 @@ inputs:
     description: Kuzzle setup configuration (1 or 2 or multi)
     required: true
   CYPRESS_RECORD_KEY:
-    description: Kuzzle setup configuration (1 or 2 or multi)
+    description: Cypress token to record the tests on cypress dashboard
+    required: true
+  branch_name:
+    description: Name of the branch to add a tag on cypress dashboard
     required: true
 
 runs:
@@ -16,7 +19,7 @@ runs:
       shell: bash
     - run: cd test/e2e/run-test && npm ci && cd -
       shell: bash
-    - run: npm run test:e2e -- --backend=${{ inputs.backend_config}}
+    - run: npm run test:e2e -- --backend=${{ inputs.backend_config}} --tag ${{ inputs.branch_name }}
       env:
         CYPRESS_RECORD_KEY: ${{ inputs.CYPRESS_RECORD_KEY }}
       shell: bash

.github/workflows/pull_request.workflow.yml

@@ -56,4 +56,4 @@ jobs:
         with:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           backend_config: ${{ matrix.backend_config }}
-
+          branch_name: ${{ github.head_ref }}

.github/workflows/push_dev.workflow.yml

@@ -58,6 +58,7 @@ jobs:
         with:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           backend_config: ${{ matrix.backend_config }}
+          branch_name: ${GITHUB_REF##*/}
 
   deploy-staging:
     name: Deploy Admin Console to staging - next-console.kuzzle.io
@@ -87,6 +88,5 @@ jobs:
           REGION: us-west-2
           S3_BUCKET: next.console.kuzzle.io
           CLOUDFRONT_ID: E35G0B414M3IWU
-          GA_ID: G-4EDTRNC8S9
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/push_master.workflow.yml

@@ -58,6 +58,7 @@ jobs:
         with:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           backend_config: ${{ matrix.backend_config }}
+          branch_name: ${GITHUB_REF##*/}
 
   deploy-production:
     name: Deploy Admin Console to production - console.kuzzle.io

package.json

@@ -1,13 +1,13 @@
 {
   "name": "kuzzle-admin-console",
-  "version": "4.0.0-beta",
+  "version": "4.2.0",
   "description": "A handy administrative console for Kuzzle",
   "author": "The Kuzzle team <[email protected]>",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build --dest dist$DEPLOY_PATH --modern",
     "test": "npm run test:e2e",
-    "test:lint": "vue-cli-service lint --no-fix",
+    "test:lint": "vue-cli-service lint --no-fix --max-warnings=0",
     "test:lint:fix": "vue-cli-service lint",
     "test:e2e": "./test/e2e/run-test/bin/run",
     "test:e2e:local": "npm run test:e2e -- --local"
@@ -43,7 +43,7 @@
     "execa": "^4.0.2",
     "json-formatter-js": "^1.3.0",
     "kuzzle-sdk-v6": "npm:kuzzle-sdk@^6.2.7",
-    "kuzzle-sdk-v7": "npm:kuzzle-sdk@^7.5.2",
+    "kuzzle-sdk-v7": "npm:kuzzle-sdk@^7.6.1",
     "leaflet": "^1.7.1",
     "lodash": "^4.17.11",
     "moment": "^2.29.1",
@@ -60,7 +60,6 @@
     "vue-color": "^2.7.0",
     "vue-form-generator": "^2.3.4",
     "vue-google-charts": "^0.3.2",
-    "vue-gtag": "^1.10.0",
     "vue-multipane": "^0.9.5",
     "vue-property-decorator": "^8.3.0",
     "vue-quill-editor": "^3.0.6",
@@ -91,7 +90,7 @@
   "devDependencies": {
     "axios": "^0.19.2",
     "babel-plugin-istanbul": "^5.2.0",
-    "cypress": "^6.2.1",
+    "cypress": "^6.5",
     "cypress-file-upload": "^5.0.0",
     "cypress-wait-until": "^1.7.1",
     "eslint-plugin-cypress": "^2.7.0",