Merging develop into main for the 2.20 pre-release (#3042)

* fix notification Signed-off-by: Stepan Kiryakov <[email protected]> * fix geojson in tools Signed-off-by: Artem Buslaev <[email protected]> * fix nested tools Signed-off-by: Artem Buslaev <[email protected]> * change role input placeholder in wizard Signed-off-by: Artem Buslaev <[email protected]> * upd ghgp Signed-off-by: Artem Buslaev <[email protected]> * added vm0044 Signed-off-by: Artem Buslaev <[email protected]> * fix Signed-off-by: artembuslaev <[email protected]> * fix custom logic Signed-off-by: Artem Buslaev <[email protected]> * upd vm0044 Signed-off-by: Artem Buslaev <[email protected]> * GITBOOK-20: VM0044 Demo * Added Readme of VM0044 * Update readme.md * Update readme.md * GITBOOK-21: Added VM0044 timestamp * GITBOOK-22: Search Blocks Docs added * fix contracts swagger Signed-off-by: Artem Buslaev <[email protected]> * [skip ci] Add swagger.yaml * upd vm0044 [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * upd vm0044 [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * fix import policy\tool Signed-off-by: Stepan Kiryakov <[email protected]> * fix documentValidatorBlock Signed-off-by: Stepan Kiryakov <[email protected]> * GITBOOK-23: Verra VM0044 added * upd verra type policies Signed-off-by: Artem Buslaev <[email protected]> * GITBOOK-24: Updated VM0044 timestamp * Update readme.md of VM0044 * GITBOOK-25: Retirement contract UI * GITBOOK-26: ghgp screenshots added * Update GHGP readme * Update GHGP readme * Update ghgp readme * GITBOOK-27: Updated GHGP timestamp * bump version Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml * bump version Signed-off-by: simvalery <[email protected]> * fix policy Signed-off-by: simvalery <[email protected]> * fix policy Signed-off-by: simvalery <[email protected]> * Update error messages Signed-off-by: Stepan Kiryakov <[email protected]> * GITBOOK-28: AMS III BB screenshots added * update Signed-off-by: Stepan Kiryakov <[email protected]> * GITBOOK-29: Updated Roadmap * 2764 Can not edit policy field of an unpublished schema Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml * 2842 Dates are displayed differently in VCs viewed as form versus json Signed-off-by: simvalery <[email protected]> * 2566 Dialog option for createTokenBlock should be removed/changed Signed-off-by: simvalery <[email protected]> * fix descriptions Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml * fix date format Signed-off-by: simvalery <[email protected]> * fix refresh token issue Signed-off-by: simvalery <[email protected]> * fix tools inputs outputs variables Signed-off-by: artembuslaev <[email protected]> * update Signed-off-by: Stepan Kiryakov <[email protected]> * [skip ci] Add swagger.yaml * GITBOOK-31: GHGP V2 docs updated * update Signed-off-by: Stepan Kiryakov <[email protected]> * Update timestamp of VM0042 * Updated timestamp of VM0017 * Update timestamp for VM0044 * Update timestamp for VM0042 * Update timestamp of VerraARR * Update timestamp of Gold Standard AR * Update ACM0003 timestamp * Update timestamp of AMS-III.D * Update timestamp of AMS-III AR * Update timestamp of AMS-II.G * GITBOOK-34: Updated timestamps * Create readme.md of AMS-I.A * Add files via upload * Update readme.md of AMS-I.A * GITBOOK-35: Added ACM0003 policy demo * Create readme.md of AMS-III.F * Add files via upload * Create readme.md of AMS-III AV * Add files via upload * Create readme.md of AMS-I.F * Add files via upload * Update readme.md of AMS-I.F * Create readme.md of ACM0007 * Add files via upload * Add files via upload * Delete Methodology Library/CDM/CDM ACM0007/readme.md * Create readme.md of ACM0007 * Delete Methodology Library/CDM/CDM ACM0007/ACM0007-Readme.md * Create readme.md of ACM0018 * Add files via upload * Update readme.md of ACM0018 * Create Policyfile * Add files via upload * Delete Methodology Library/CDM/CDM AMS-III.H/Policyfile * Update readme.md of AMS-III.H * Create deletefile * Add files via upload * Delete Methodology Library/CDM/CDM ACM0006/deletefile * Update readme.md of ACM0006 * Create readme.md of AMS-II.J * Add files via upload * Update readme.md of AMS-II.J * Create readme.md of ACM0002 * Add files via upload * Update readme.md of ACM0002 * Create readme.md of ACM0001 * Add files via upload * Update readme.md of ACM0001 * Create readme.md of AMS-I.C * Add files via upload * Update readme.md of AMS-I.C * update Signed-off-by: Stepan Kiryakov <[email protected]> * GITBOOK-36: added CDM policies list * GITBOOK-37: CDM Policies Demo Added * update Signed-off-by: Stepan Kiryakov <[email protected]> * GITBOOK-40: ACM0003 step by step added * GITBOOK-41: AMS-III BB step by step added * GITBOOK-42: GHGP demo corrected * update cdm policies [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * 00891 detect-secrets * implement detect-secrets script * remove secrets Signed-off-by: simvalery <[email protected]> * test fix Signed-off-by: simvalery <[email protected]> * fix actions Signed-off-by: simvalery <[email protected]> * fix actions Signed-off-by: simvalery <[email protected]> * fix actions Signed-off-by: simvalery <[email protected]> * fix actions Signed-off-by: simvalery <[email protected]> * fix actions Signed-off-by: simvalery <[email protected]> * fix actions Signed-off-by: simvalery <[email protected]> * VP section header for report-block Signed-off-by: simvalery <[email protected]> * fix retirement Signed-off-by: Artem Buslaev <[email protected]> * added schema tree Signed-off-by: Artem Buslaev <[email protected]> * [skip ci] Add swagger.yaml * fix retirement Signed-off-by: Artem Buslaev <[email protected]> * fix cdm policies [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * GITBOOK-47: Added Description to Schema Glossary * GITBOOK-48: Added Tools Description * GITBOOK-49: Updated CDM policies * upd asm-ii.g Signed-off-by: Artem Buslaev <[email protected]> * GITBOOK-50: Verra PWRM0001 demo * add PWRM0001 policy Signed-off-by: simvalery <[email protected]> * bump version Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml * upd cdm asm iii d Signed-off-by: Artem Buslaev <[email protected]> * GITBOOK-52: Added Schema Tree UI and API * GITBOOK-53: Added confirm password in register API * Add files via upload * Add files via upload * remove console.logs Signed-off-by: simvalery <[email protected]> * update policy Signed-off-by: simvalery <[email protected]> * fix lint Signed-off-by: simvalery <[email protected]> * update cdm policies [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * Create readme.md of PWRM0001 * Update readme.md of PWRM0001 * bump version Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml * added remove button for blocks properties Signed-off-by: Artem Buslaev <[email protected]> * fix * [skip ci] Add swagger.yaml * prevent creation duplicate events Signed-off-by: Artem Buslaev <[email protected]> * fix delimiter for hidden fields Signed-off-by: Artem Buslaev <[email protected]> * fix Signed-off-by: Artem Buslaev <[email protected]> * GITBOOK-46: Property added * GITBOOK-45: Project Comparison UI and APIs * GITBOOK-32: AI Search documentation * GITBOOK-33: Guided search UI docs updated * fix Signed-off-by: Artem Buslaev <[email protected]> * update Signed-off-by: Stepan Kiryakov <[email protected]> * [skip ci] Add swagger.yaml * 2840 Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml * change task type Signed-off-by: simvalery <[email protected]> * fix hiding geojson Signed-off-by: Artem Buslaev <[email protected]> * module unique names Signed-off-by: Artem Buslaev <[email protected]> * update Signed-off-by: Stepan Kiryakov <[email protected]> * [skip ci] Add swagger.yaml * change unique module name error message, trim names Signed-off-by: Artem Buslaev <[email protected]> * show mint error Signed-off-by: simvalery <[email protected]> * update Signed-off-by: Stepan Kiryakov <[email protected]> * Fix internal dependencies (#3003) for main build * fix internal dependencies Signed-off-by: simvalery <[email protected]> * fix internal dependencies Signed-off-by: simvalery <[email protected]> * fix internal dependencies Signed-off-by: simvalery <[email protected]> --------- Signed-off-by: simvalery <[email protected]> * add minted tokens info Signed-off-by: simvalery <[email protected]> * update Signed-off-by: Stepan Kiryakov <[email protected]> * fix mint error message Signed-off-by: simvalery <[email protected]> * fix styling Signed-off-by: simvalery <[email protected]> * update Signed-off-by: Stepan Kiryakov <[email protected]> * fix lint Signed-off-by: Stepan Kiryakov <[email protected]> * fix Signed-off-by: Stepan Kiryakov <[email protected]> * fix styling Signed-off-by: simvalery <[email protected]> * update schemas Signed-off-by: Stepan Kiryakov <[email protected]> * fix bugs Signed-off-by: Stepan Kiryakov <[email protected]> * fix bugs Signed-off-by: Stepan Kiryakov <[email protected]> * fix bugs Signed-off-by: Stepan Kiryakov <[email protected]> * [skip ci] Add swagger.yaml * policy resizing sections Signed-off-by: Artem Buslaev <[email protected]> * up styles size budget Signed-off-by: Artem Buslaev <[email protected]> * added vm0041 [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * displaying tools while policy importing Signed-off-by: Artem Buslaev <[email protected]> * update Signed-off-by: Stepan Kiryakov <[email protected]> * [skip ci] Add swagger.yaml * update Signed-off-by: Stepan Kiryakov <[email protected]> * [skip ci] Add swagger.yaml * fix type Signed-off-by: Stepan Kiryakov <[email protected]> * [skip ci] Add swagger.yaml * fix Signed-off-by: Stepan Kiryakov <[email protected]> * 2997 Signed-off-by: simvalery <[email protected]> * update Signed-off-by: Stepan Kiryakov <[email protected]> * fix Signed-off-by: Stepan Kiryakov <[email protected]> * update Signed-off-by: Stepan Kiryakov <[email protected]> * add tooltip Signed-off-by: Stepan Kiryakov <[email protected]> * handle errors while map loading Signed-off-by: Artem Buslaev <[email protected]> * fix compare record Signed-off-by: Stepan Kiryakov <[email protected]> * fix error message Signed-off-by: Stepan Kiryakov <[email protected]> * fix create user Signed-off-by: Stepan Kiryakov <[email protected]> * GITBOOK-54: Record and replay UI added * GITBOOK-55: updated IPFS local node configuration * update schema validator Signed-off-by: Stepan Kiryakov <[email protected]> * update schema validator Signed-off-by: Stepan Kiryakov <[email protected]> * GITBOOK-56: Added Example data schema UI * bump version Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml --------- Signed-off-by: Stepan Kiryakov <[email protected]> Signed-off-by: Artem Buslaev <[email protected]> Signed-off-by: artembuslaev <[email protected]> Signed-off-by: simvalery <[email protected]> Co-authored-by: Stepan Kiryakov <[email protected]> Co-authored-by: Artem Buslaev <[email protected]> Co-authored-by: prernaa.agarwal <[email protected]> Co-authored-by: envision-ci-agent <[email protected]> Co-authored-by: krystal <[email protected]>
hashgraph · Dec 25, 2023 · ccf0d8b · ccf0d8b
1 parent 057f3fd
commit ccf0d8b
Show file tree

Hide file tree

Showing 313 changed files with 13,829 additions and 2,410 deletions.
diff --git a/Methodology Library/Verra/Verra Redd/VM0041/VM0041.policy b/Methodology Library/Verra/Verra Redd/VM0041/VM0041.policy
diff --git a/analytics-service/package.json b/analytics-service/package.json
@@ -12,8 +12,8 @@
     },
     "author": "Envision Blockchain Solutions <[email protected]>",
     "dependencies": {
-        "@guardian/common": "^2.19.1",
-        "@guardian/interfaces": "^2.19.1",
+        "@guardian/common": "^2.20.0-prerelease",
+        "@guardian/interfaces": "^2.20.0-prerelease",
         "@nestjs/common": "^9.4.1",
         "@nestjs/core": "^9.4.1",
         "@nestjs/jwt": "^10.0.3",
@@ -79,5 +79,6 @@
         "start": "node dist/index.js",
         "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
     },
-    "version": "2.19.1"
+    "version": "2.20.0-prerelease",
+    "stableVersion": "2.19.1"
 }
diff --git a/api-gateway/package.json b/api-gateway/package.json
@@ -11,8 +11,8 @@
   },
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.19.1",
-    "@guardian/interfaces": "^2.19.1",
+      "@guardian/common": "^2.20.0-prerelease",
+      "@guardian/interfaces": "^2.20.0-prerelease",
     "@nestjs/common": "^9.4.1",
     "@nestjs/core": "^9.4.1",
     "@nestjs/jwt": "^10.0.3",
@@ -80,5 +80,6 @@
     "start": "node dist/index.js",
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
   },
-  "version": "2.19.1"
+    "version": "2.20.0-prerelease",
+    "stableVersion": "2.19.1"
 }
diff --git a/api-gateway/src/api/service/analytics.ts b/api-gateway/src/api/service/analytics.ts
@@ -383,7 +383,8 @@ export class AnalyticsApi {
                 eventsLvl,
                 propLvl,
                 childrenLvl,
-                idLvl
+                idLvl,
+                0
             );
         } catch (error) {
             throw new HttpException(error.message, HttpStatus.INTERNAL_SERVER_ERROR);
@@ -764,7 +765,8 @@ export class AnalyticsApi {
                 eventsLvl,
                 propLvl,
                 childrenLvl,
-                idLvl
+                idLvl,
+                0
             );
         } catch (error) {
             throw new HttpException(error.message, HttpStatus.INTERNAL_SERVER_ERROR);

diff --git a/api-gateway/src/api/service/module.ts b/api-gateway/src/api/service/module.ts
@@ -39,7 +39,7 @@ export class ModulesApi {
             return res.status(201).json(item);
         } catch (error) {
             new Logger().error(error, ['API_GATEWAY']);
-            throw error
+            throw new HttpException(error.message, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 

diff --git a/api-gateway/src/api/service/policy.ts b/api-gateway/src/api/service/policy.ts
@@ -285,7 +285,7 @@ export class PolicyApi {
         const engineService = new PolicyEngine();
         let model: any;
         try {
-            model = await engineService.getPolicy({filters: req.params.policyId}) as any;
+            model = await engineService.getPolicy({ filters: req.params.policyId }) as any;
         } catch (error) {
             new Logger().error(error, ['API_GATEWAY']);
             throw new HttpException(error.message, HttpStatus.INTERNAL_SERVER_ERROR);
@@ -1073,6 +1073,9 @@ export class PolicyApi {
         if (policy.owner !== req.user.did) {
             throw new HttpException('Invalid owner.', HttpStatus.FORBIDDEN)
         }
+        if (policy.status !== PolicyType.DRY_RUN) {
+            throw new HttpException('Invalid status.', HttpStatus.FORBIDDEN)
+        }
         try {
             return res.send(await engineService.getVirtualUsers(req.params.policyId));
         } catch (error) {
@@ -1099,6 +1102,9 @@ export class PolicyApi {
         if (policy.owner !== req.user.did) {
             throw new HttpException('Invalid owner.', HttpStatus.FORBIDDEN)
         }
+        if (policy.status !== PolicyType.DRY_RUN) {
+            throw new HttpException('Invalid status.', HttpStatus.FORBIDDEN)
+        }
         try {
             return res.status(201).send(await engineService.createVirtualUser(req.params.policyId, req.user.did));
         } catch (error) {
@@ -1125,6 +1131,9 @@ export class PolicyApi {
         if (policy.owner !== req.user.did) {
             throw new HttpException('Invalid owner.', HttpStatus.FORBIDDEN)
         }
+        if (policy.status !== PolicyType.DRY_RUN) {
+            throw new HttpException('Invalid status.', HttpStatus.FORBIDDEN)
+        }
         try {
             return res.send(await engineService.loginVirtualUser(req.params.policyId, req.body.did));
         } catch (error) {
@@ -1151,6 +1160,9 @@ export class PolicyApi {
         if (policy.owner !== req.user.did) {
             throw new HttpException('Invalid owner.', HttpStatus.FORBIDDEN)
         }
+        if (policy.status !== PolicyType.DRY_RUN) {
+            throw new HttpException('Invalid status.', HttpStatus.FORBIDDEN)
+        }
         try {
             return res.json(await engineService.restartDryRun(req.body, req.user, req.params.policyId));
         } catch (error) {