Skip to content

Commit

Permalink
Merging Develop into Main for the 2.24.1 hotfix (#3636)
Browse files Browse the repository at this point in the history
* disable policy dropdown for editing schemas

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* fix image upload bug

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* fix image upload bug

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* load images into database in dryRun mode

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* [skip ci] Add swagger.yaml

* remove console.log

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* GITBOOK-134: Added PWRM0002 Demo guide

* GITBOOK-135: 3311 ticket changes updated

* Create Readme.md of PWRM0002

* Update timestamps of Tool 13, 14 16

* Create readme.md of Hackathon

* Add files via upload

* fix file upload issue
fix clear dry run files

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* apply only image upload

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* feat: contarization redis cache service

* fix draft schemas in wisard

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* fix amount

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* fix

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* use global common and interfaces modules

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* Add files via upload

* bump version

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* [skip ci] Add swagger.yaml

* increase timeout for import tool

* feat: add esm for api-tests

* feat: move to esm common service

* feat: move to esm worker-service

* feat: move to esm policy and guardian services

* feat: move dev.js to esm

* feat: move to esm modules in gulp files api auth worker guardian policy logger notification

* feat: esm in ecosystem config

* refactor code

* feat: add js extention for imports in ai analytics services

* feat: add extention in application events service

* feat: add extentions for auth service

* feat: add extention guardian

* fix: ai auth analytics application events services

* feat: add extentions for api gateway service

* fix: api-gateway

* :wqfeat: add extention in common service

* fix: common service

* feat: esm for logger service

* fix: configs for target es2022

* feat: esm to policy service

* feat: esm to notification service

* feat: esm for interfaces

* feat: esm for tree viever mrv sender topic viever

* refactor code

* fix: error with id by create update base entityes

* feat: increase vertions of mongodb and microorm for esm

* fix: policy and guardian services on dry run

* fix: lint error unused import in guardian service

* fix: unit tests pre build

* fix: bson vertion for current mongo

* fix: get user undefined for get blocks and post groups

* fix: dirname in mrv sender

* fix: remove inject decorator in all places

* feat: increase bson guardian and policy

* fix: imports inside services

* fix: merge conflicts

* Revert "fix: merge conflicts"

This reverts commit afc2f2f.

* fix: merge conflicts

* fix: extentions and ts config for microservises

* Update README.md

* fix: pass context across super and declare prop

* fix: revert inject decorators across declare

* [skip ci] Add swagger.yaml

* fix: merge develop ai service

* added change tools while importing policy

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* added token update endpoint

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* [skip ci] Add swagger.yaml

* fix

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* fix

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* fix

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* fix

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* update publishing policies script [skip ci]

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* fix auth for update token api

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* [skip ci] Add swagger.yaml

* refactoring

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* [skip ci] Add swagger.yaml

* update cdm policies [skip ci]

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* added some tests for contracts and flow for irec4

* update status code for tests

* fix bottom margin for tools changing [skip ci]

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* Dockerfiles revised

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* node image replaced with the slim version

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* node version moved to arg

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* Dockerfiles has been revamped to reduce the size of the final images

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* Added/Modified .dockerignore files

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* Optimize caching with "COPY --link"

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* Run applications as a non-root user and use init:true for containers

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* Yarn cache directory defined as an argument

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* Yarn cache fix

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* Permissions changes

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* Base node image is changed to alpine

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* GITBOOK-136: Added Filebase docs

* added bad_request const for status code

* added publishing contract file script

Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>

* fix: migrate to redict cache store

* Revert "Merge branch 'develop' into feat/move-to-es-modules-develop"

This reverts commit 6da2788, reversing
changes made to 0c8b832.

* Revert "fix: merge with develop"

This reverts commit 0c8b832, reversing
changes made to 0fec16a.

* Revert "Revert "fix: merge with develop""

This reverts commit 5610fa5.

* Revert "Revert "Merge branch 'develop' into feat/move-to-es-modules-develop""

This reverts commit c48aa0f.

* added nfts limit in contracts

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* upd contracts [skip ci]

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* fix script [skip ci]

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* GITBOOK-137: Updated Changing Tools in UI section

* Update readme.md of ML readme

* remove output [skip ci]

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* fix

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* GITBOOK-139: Added section on how to deploy contracts using your own account

* Update readme.md

* GITBOOK-140: Added Atma Scope 3 policy demo

* GITBOOK-142: Added Dovu MMCM

* update iii.f [skip ci]

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* feat: performance interceptor

* cache-endpoints
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* update policies [skip ci]

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* fix: extentions gulp files in description dockerfiles

* update policies [skip ci]

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* feat: wrap endpoinds in cache

* GITBOOK-143: added ExternalDataBlock details

* feat: use cache with apply decorators

* fix: file name import

* fix: get user only if auth token exist

* feat: add perf hooks in performance interceptor

* fix: add express flag for projects/properties route

* setup user profile
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* sign with fireblocks
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* user fireblocks config
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* fix serials column

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* remove res where it possible and add res.locals.data

* GITBOOK-144: Added Changing of Tools during Policy import APIs added

* fix fireblocks sign bug
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* add ui validators, add exception
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* temp fix validators
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* GITBOOK-145: Added youtube demo video for PWRM0002

* GITBOOK-146: Updated Guardian Introduction

* fix: remove cache from policies/:policyId/groups

* fix
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* fix
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* Policy Preview/Import performance optimisations

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* fixed fields parsing for compare

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* parseConditions function improvements

Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>

* fix generate xlsx

Signed-off-by: Stepan Kiryakov <stepan.kiryakov@envisionblockchain.com>

* GITBOOK-147: Made some minor corrections

* test
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* added policy data migration

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* [skip ci] Add swagger.yaml

* fix

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* fix

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* fix lint

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* remove types/mime resolution
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* fix
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* Add files via upload

* fix signing
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* fix linting
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* fix autocomplete
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* remove singleton from fireblocks-helper.ts
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* fix
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* docs: add instruction for launch cache container in readme file

* bump version
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* [skip ci] Add swagger.yaml

* GITBOOK-148: Added Live Project Data Migration UI

* GITBOOK-149: Fireblocks Docs added

* added migrating retire pools and dynamic tokens

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* [skip ci] Add swagger.yaml

* fix

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* GITBOOK-150: ACM0001 guide added

* fix lint

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* Update readme.md of ACM0001

* fix

Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>

* GITBOOK-151: Added migration policy data APIs

* hotfix: remove cache for contract routes

* GITBOOK-152: Added redict in Prerequisites

* GITBOOK-153: Added Prerequisites

* GITBOOK-154: Added Token template to migration

* GITBOOK-155: Added fireblocks note

* hotfix/remove-cache-from-tags-schemas

* GITBOOK-156: Updated roadmap

* GITBOOK-157: Updated roadmap

* fix: remove cache from navigation

* GITBOOK-158: Made some changes in SD

* fix cache document id

Signed-off-by: Stepan Kiryakov <stepan.kiryakov@envisionblockchain.com>

* fix cache document id

Signed-off-by: Stepan Kiryakov <stepan.kiryakov@envisionblockchain.com>

* fix cache document id

Signed-off-by: Stepan Kiryakov <stepan.kiryakov@envisionblockchain.com>

* GITBOOK-159: made some minor corrections

* GITBOOK-160: updated extractdatablock

* fix: error status if token is not correct

* bump version
Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>

* [skip ci] Add swagger.yaml

---------

Signed-off-by: simvalery <valeriy.simonov@envisionblockchain.com>
Signed-off-by: artembuslaev <artem.buslaev@envisionblockchain.com>
Signed-off-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>
Signed-off-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>
Signed-off-by: Stepan Kiryakov <stepan.kiryakov@envisionblockchain.com>
Co-authored-by: Artem Buslaev <artem.buslaev@envisionblockchain.com>
Co-authored-by: envision-ci-agent <envision-ci-agent@users.noreply.github.com>
Co-authored-by: prernaa.agarwal <prernaa.agarwal@envisionblockchain.com>
Co-authored-by: Celiant <nikita.nikishin@envisionblockchain.com>
Co-authored-by: Ihar <igor.tsykala@envisionblockchain.com>
Co-authored-by: Andrey (Envision Blockchain) <32775532+anvabr@users.noreply.github.com>
Co-authored-by: Alexander Pyatakov <alex.pyatakov@envisionblockchain.com>
Co-authored-by: Stepan Kiryakov <stepan.kiryakov@envisionblockchain.com>
  • Loading branch information
9 people committed May 6, 2024
1 parent a65b898 commit 616a957
Show file tree
Hide file tree
Showing 27 changed files with 236 additions and 143 deletions.
6 changes: 3 additions & 3 deletions ai-service/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "ai-service",
"version": "2.24.0",
"version": "2.24.1",
"main": "dist/app.js",
"license": "Apache-2.0",
"dependencies": {
"@guardian/common": "^2.24.0",
"@guardian/interfaces": "^2.24.0",
"@guardian/common": "^2.24.1",
"@guardian/interfaces": "^2.24.1",
"@mikro-orm/core": "^6.1.11",
"@mikro-orm/mongodb": "^6.1.11",
"@nestjs/common": "^9.4.1",
Expand Down
6 changes: 3 additions & 3 deletions analytics-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
},
"author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
"dependencies": {
"@guardian/common": "^2.24.0",
"@guardian/interfaces": "^2.24.0",
"@guardian/common": "^2.24.1",
"@guardian/interfaces": "^2.24.1",
"@nestjs/common": "^9.4.1",
"@nestjs/core": "^9.4.1",
"@nestjs/jwt": "^10.0.3",
Expand Down Expand Up @@ -82,5 +82,5 @@
"test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
6 changes: 3 additions & 3 deletions api-gateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
},
"author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
"dependencies": {
"@guardian/common": "^2.24.0",
"@guardian/interfaces": "^2.24.0",
"@guardian/common": "^2.24.1",
"@guardian/interfaces": "^2.24.1",
"@nestjs/common": "^9.4.1",
"@nestjs/core": "^9.4.1",
"@nestjs/jwt": "^10.0.3",
Expand Down Expand Up @@ -78,5 +78,5 @@
"test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
2 changes: 1 addition & 1 deletion api-gateway/src/api/service/policy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ export class PolicyApi {
@ApiSecurity('bearerAuth')
@Get('/:policyId/navigation')
@HttpCode(HttpStatus.OK)
@UseCache()
// @UseCache()
async getPolicyNavigation(@Req() req): Promise<any> {
await checkPermission(UserRole.STANDARD_REGISTRY, UserRole.USER)(req.user);
const engineService = new PolicyEngine();
Expand Down
3 changes: 1 addition & 2 deletions api-gateway/src/api/service/tags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { SchemaUtils } from '../../helpers/schema-utils.js';
import { Controller, Delete, Get, HttpCode, HttpException, HttpStatus, Post, Put, Req, Response } from '@nestjs/common';
import { checkPermission } from '../../auth/authorization-helper.js';
import { ApiTags } from '@nestjs/swagger';
import { UseCache } from '../../helpers/decorators/cache.js';

@Controller('tags')
@ApiTags('tags')
Expand Down Expand Up @@ -144,7 +143,7 @@ export class TagsApi {
*/
@Get('/schemas')
@HttpCode(HttpStatus.OK)
@UseCache({ isExpress: true })
// @UseCache({ isExpress: true })
async getSchemas(@Req() req, @Response() res): Promise<any> {
await checkPermission(UserRole.STANDARD_REGISTRY)(req.user);
try {
Expand Down
8 changes: 6 additions & 2 deletions api-gateway/src/helpers/interceptors/cache.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Injectable, NestInterceptor, ExecutionContext, CallHandler } from '@nestjs/common';
import { Injectable, NestInterceptor, ExecutionContext, CallHandler, HttpException, HttpStatus } from '@nestjs/common';

import crypto from 'crypto';

Expand Down Expand Up @@ -29,7 +29,11 @@ export class CacheInterceptor implements NestInterceptor {

if(token) {
const users: Users = new Users();
user = await users.getUserByToken(token);
try {
user = await users.getUserByToken(token);
} catch (error) {
throw new HttpException(error.message, HttpStatus.UNAUTHORIZED)
}
}

const hashUser: string = crypto.createHash('md5').update(JSON.stringify(user)).digest('hex');
Expand Down
2 changes: 1 addition & 1 deletion api-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "api-tests",
"version": "2.24.0",
"version": "2.24.1",
"description": "API Tests",
"main": "index.js",
"type": "module",
Expand Down
6 changes: 3 additions & 3 deletions auth-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"image-size": "1.0.2"
},
"dependencies": {
"@guardian/common": "^2.24.0",
"@guardian/interfaces": "^2.24.0",
"@guardian/common": "^2.24.1",
"@guardian/interfaces": "^2.24.1",
"@meeco/cryppo": "^2.0.2",
"@mikro-orm/core": "^6.1.11",
"@mikro-orm/mongodb": "^6.1.11",
Expand Down Expand Up @@ -75,5 +75,5 @@
"test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
4 changes: 2 additions & 2 deletions common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"@azure/identity": "^3.2.2",
"@azure/keyvault-secrets": "^4.7.0",
"@google-cloud/secret-manager": "^4.2.2",
"@guardian/interfaces": "^2.24.0",
"@guardian/interfaces": "^2.24.1",
"@hashgraph/sdk": "2.34.1",
"@mattrglobal/jsonld-signatures-bbs": "^1.1.2",
"@meeco/cryppo": "^2.0.2",
Expand Down Expand Up @@ -87,5 +87,5 @@
"test:stability": "mocha tests/stability.test.js"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
4 changes: 2 additions & 2 deletions docs/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
* [historyAddon](guardian/standard-registry/policies/policy-creation/introduction/historyaddon.md)
* [selectiveAttributes Block](guardian/standard-registry/policies/policy-creation/introduction/selectiveattributes-block.md)
* [tagsManagerBlock](guardian/standard-registry/policies/policy-creation/introduction/tagsmanagerblock.md)
* [externalDataBlock](guardian/standard-registry/policies/policy-creation/introduction/externaldatablock.md)
* [extractDataBlock](guardian/standard-registry/policies/policy-creation/introduction/externaldatablock.md)
* [externalTopicBlock](guardian/standard-registry/policies/policy-creation/introduction/externaltopicblock.md)
* [messagesReportBlock](guardian/standard-registry/policies/policy-creation/introduction/messagesreportblock.md)
* [notificationBlock](guardian/standard-registry/policies/policy-creation/introduction/notificationblock.md)
Expand Down Expand Up @@ -529,7 +529,7 @@
* [👾 Automation Testing](guardian/automation-testing/README.md)
* [💻 Performing API Automation Testing](guardian/automation-testing/how-to-perform-api-automation-testing.md)
* [💻 Performing UI Automation Testing](guardian/automation-testing/performing-ui-automation-testing.md)
* [📔 Guidance for Open Source Policy](guardian/guidance-for-open-source-policy.md)
* [📔 Guidance for Open Source Policy Submissions](guardian/guidance-for-open-source-policy.md)
* [📝 Demo Guide](guardian/demo-guide/README.md)
* [🔋 Renewable Energy Credits](guardian/demo-guide/renewable-energy-credits/README.md)
* [📖 Introduction to International Renewable Energy Credit Standard (iREC)](guardian/demo-guide/renewable-energy-credits/introduction-to-international-renewable-energy-credit-standard-irec.md)
Expand Down

0 comments on commit 616a957

Please sign in to comment.