uncefact · namhoang1604 · Oct 21, 2024 · Oct 22, 2024 · Oct 23, 2024 · Oct 24, 2024
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -4,6 +4,8 @@ on:
   pull_request:
     branches:
       - next
+      - fix/decode-jwt
+  workflow_dispatch:
 
 jobs:
   test_and_build:
@@ -31,17 +33,21 @@ jobs:
       - name: Check linting
         run: yarn lint
 
+      - name: Build
+        run: yarn build
+
       - name: Run tests
         run: |
-          yarn jest --changedSince=origin/next --ci --json --coverage --testLocationInResults --outputFile=report.json
-
-      - name: Coverage
-        uses: artiomtr/jest-coverage-report-action@v2
+          yarn test:coverage
+      - run: cat coverage/coverage-final.json
+      - name: Jest Coverage Comment
+        uses: MishaKav/jest-coverage-comment@main
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          coverage-file: report.json
-          base-coverage-file: report.json
-          threshold: 80
-
-      - name: Build
-        run: yarn build
+          title: Code Coverage Report
+          multiple-files: |
+            All packages, ./coverage/coverage-summary.json
+            Components, ./packages/components/coverage/coverage-summary.json
+            Mock app, ./packages/mock-app/coverage/coverage-summary.json
+            Services, ./packages/services/coverage/coverage-summary.json
+            UNTP test suite, ./packages/untp-test-suite/coverage/coverage-summary.json
+            VC test suite, ./packages/vc-test-suite/coverage/coverage-summary.json
diff --git a/.gitignore b/.gitignore
@@ -73,7 +73,6 @@ tmp/
 # logs
 /logs
 packages/services/tsconfig.tsbuildinfo
-packages/mock-app/src/constants/app-config.json
 packages/untp-test-suite/credentials.json
 packages/untp-test-suite/data
 # vc-test-suite

diff --git a/app-config.json b/app-config.json
@@ -760,7 +760,7 @@
               "parameters": [
                 {
                   "storageKey": "CherriesFarm_dpps",
-                  "objectKeyPath": "/vc/credentialSubject/productIdentifier/0/identifierValue"
+                  "objectKeyPath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue"
                 }
               ]
             }
@@ -4604,11 +4604,11 @@
                     "constructData": {
                       "mappingFields": [
                         {
-                          "sourcePath": "/vc/credentialSubject/productIdentifier/0/identifierValue",
+                          "sourcePath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue",
                           "destinationPath": "/eventID"
                         },
                         {
-                          "sourcePath": "/vc/credentialSubject/productIdentifier/0/identifierValue",
+                          "sourcePath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue",
                           "destinationPath": "/epcList/index/name"
                         },
                         {
@@ -4748,7 +4748,7 @@
               "parameters": [
                 {
                   "storageKey": "orchard_facility_transaction_event",
-                  "objectKeyPath": "/vc/credentialSubject/eventID"
+                  "objectKeyPath": "/decodedEnvelopedVC/credentialSubject/eventID"
                 }
               ]
             }
@@ -5502,7 +5502,7 @@
               "parameters": [
                 {
                   "storageKey": "CherriesFarm_dpps",
-                  "objectKeyPath": "/vc/credentialSubject/productIdentifier/0/identifierValue"
+                  "objectKeyPath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue"
                 }
               ]
             }
@@ -5845,11 +5845,11 @@
                     "constructData": {
                       "mappingFields": [
                         {
-                          "sourcePath": "/vc/credentialSubject/productIdentifier/0/identifierValue",
+                          "sourcePath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue",
                           "destinationPath": "/eventID"
                         },
                         {
-                          "sourcePath": "/vc/credentialSubject/productIdentifier/0/identifierValue",
+                          "sourcePath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue",
                           "destinationPath": "/epcList/index/name"
                         },
                         {
@@ -5989,7 +5989,7 @@
               "parameters": [
                 {
                   "storageKey": "packhouse_facility_transaction_event",
-                  "objectKeyPath": "/vc/credentialSubject/eventID"
+                  "objectKeyPath": "/decodedEnvelopedVC/credentialSubject/eventID"
                 }
               ]
             }
@@ -6743,7 +6743,7 @@
               "parameters": [
                 {
                   "storageKey": "CherriesFarm_dpps",
-                  "objectKeyPath": "/vc/credentialSubject/productIdentifier/0/identifierValue"
+                  "objectKeyPath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue"
                 }
               ]
             }
@@ -7086,11 +7086,11 @@
                     "constructData": {
                       "mappingFields": [
                         {
-                          "sourcePath": "/vc/credentialSubject/productIdentifier/0/identifierValue",
+                          "sourcePath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue",
                           "destinationPath": "/eventID"
                         },
                         {
-                          "sourcePath": "/vc/credentialSubject/productIdentifier/0/identifierValue",
+                          "sourcePath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue",
                           "destinationPath": "/epcList/index/name"
                         },
                         {
@@ -7230,7 +7230,7 @@
               "parameters": [
                 {
                   "storageKey": "fumigation_and_freight_forwarding_facility_transaction_event",
-                  "objectKeyPath": "/vc/credentialSubject/eventID"
+                  "objectKeyPath": "/decodedEnvelopedVC/credentialSubject/eventID"
                 }
               ]
             }
@@ -7984,7 +7984,7 @@
               "parameters": [
                 {
                   "storageKey": "CherriesFarm_dpps",
-                  "objectKeyPath": "/vc/credentialSubject/productIdentifier/0/identifierValue"
+                  "objectKeyPath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue"
                 }
               ]
             }
@@ -8327,11 +8327,11 @@
                     "constructData": {
                       "mappingFields": [
                         {
-                          "sourcePath": "/vc/credentialSubject/productIdentifier/0/identifierValue",
+                          "sourcePath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue",
                           "destinationPath": "/eventID"
                         },
                         {
-                          "sourcePath": "/vc/credentialSubject/productIdentifier/0/identifierValue",
+                          "sourcePath": "/decodedEnvelopedVC/credentialSubject/productIdentifier/0/identifierValue",
                           "destinationPath": "/epcList/index/name"
                         },
                         {

diff --git a/documentation/docs/mock-apps/components/import-button.md b/documentation/docs/mock-apps/components/import-button.md
@@ -33,7 +33,15 @@ The ImportButton component is responsible for rendering a button that allows the
 
 ### Props
 
-| Property | Required | Description                     | Type   |
-| -------- | -------- | ------------------------------- | ------ |
-| label    | Yes      | The label for the import button | String |
-| style    | No       | The style for the component     | Object |
+| Property  | Required | Description                                                                                           | Type   |
+| --------- | -------- | ----------------------------------------------------------------------------------------------------- | ------ |
+| label     | Yes      | The label for the import button                                                                       | String |
+| style     | No       | The style for the component                                                                           | Object |
+| type      | No       | The type of data (should be 'VerifiableCredential' and 'JSON'), the default is 'VerifiableCredential' | String |
+| vcOptions | No       | The options for the VC data processing                                                                | Object |
+
+#### vcOptions
+
+| Property       | Required | Description                      | Type   |
+| -------------- | -------- | -------------------------------- | ------ |
+| credentialPath | Yes      | The path for the credential data | String |
diff --git a/documentation/docs/mock-apps/components/qr-code-scanner-dialog-button.md b/documentation/docs/mock-apps/components/qr-code-scanner-dialog-button.md
@@ -32,6 +32,14 @@ The QRCodeScannerDialogButton component is responsible for rendering a button th
 
 ### Props
 
-| Property | Required | Description                 | Type   |
-| -------- | -------- | --------------------------- | ------ |
-| style    | No       | The style for the component | Object |
+| Property  | Required | Description                                                                                           | Type   |
+| --------- | -------- | ----------------------------------------------------------------------------------------------------- | ------ |
+| style     | No       | The style for the component                                                                           | Object |
+| type      | No       | The type of data (should be 'VerifiableCredential' and 'JSON'), the default is 'VerifiableCredential' | String |
+| vcOptions | No       | The options for the VC data processing                                                                | Object |
+
+#### vcOptions
+
+| Property       | Required | Description                                                           | Type   |
+| -------------- | -------- | --------------------------------------------------------------------- | ------ |
+| credentialPath | Yes      | The path for the credential data that is fetched from the QR code URL | String |
diff --git a/jest.config.base.js b/jest.config.base.js
@@ -0,0 +1,7 @@
+module.exports = {
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx}', '<rootDir>/src/**/*.{js,jsx}', '!**/*.d.ts'],
+  coverageDirectory: '<rootDir>/coverage',
+  coverageReporters: ['json', 'json-summary', 'text', 'lcov'],
+  verbose: true,
+};
diff --git a/jest.config.mjs b/jest.config.mjs
diff --git a/lerna.json b/lerna.json
@@ -9,6 +9,5 @@
       "gitRemote": "origin",
       "message": "chore(release): %s [skip ci]"
     }
-  },
-  "useWorkspaces": true
+  }
 }
diff --git a/package.json b/package.json
@@ -2,15 +2,18 @@
   "name": "mock-app",
   "version": "1.0.0",
   "private": true,
-  "workspaces": ["packages/*"],
+  "workspaces": [
+    "packages/*"
+  ],
   "scripts": {
     "start": "cp app-config.json packages/mock-app/src/constants/app-config.json && cd packages/mock-app && yarn start",
     "build": "yarn build:services && yarn build:components && yarn build:untp-test-suite",
     "build:services": "cd packages/services && yarn run build",
     "build:components": "cd packages/components && yarn run build",
     "build:untp-test-suite": "cd packages/untp-test-suite && yarn run build",
     "build-clean": "rimraf --glob ./yarn.lock ./node_modules ./packages/*/tsconfig.tsbuildinfo ./packages/*/build ./packages/*/node_modules",
-    "test": "yarn run test:services && yarn run test:components && yarn run test:mock-app",
+    "test": "lerna exec -- yarn jest",
+    "test:coverage": "lerna exec -- yarn jest --coverage && istanbul-merge --out coverage/coverage-final.json packages/*/coverage/coverage-final.json && nyc report --temp-dir=./coverage --reporter=html --reporter=json-summary",
     "test:components": "cd packages/components && yarn run test",
     "test:services": "cd packages/services && yarn run test",
     "test:mock-app": "cd packages/mock-app && yarn run test",
@@ -57,6 +60,8 @@
     "node": ">= 20.12.2"
   },
   "dependencies": {
-    "rimraf": "^5.0.5"
+    "rimraf": "^5.0.5",
+    "istanbul-merge": "2.0.0",
+    "nyc": "17.1.0"
   }
 }
diff --git a/packages/components/jest.config.js b/packages/components/jest.config.js
@@ -1,4 +1,6 @@
+import base from '../../jest.config.base.js';
 const jestConfig = {
+  ...base,
   preset: 'ts-jest',
   testEnvironment: 'jsdom',
   extensionsToTreatAsEsm: ['.ts'],