Skip to content

Commit

Permalink
Hotfix/2.23.1 (#3429)
Browse files Browse the repository at this point in the history
* remove terms and conditions

Signed-off-by: simvalery <[email protected]>

* bump version
Signed-off-by: simvalery <[email protected]>

Signed-off-by: simvalery <[email protected]>

* [skip ci] Add swagger.yaml

---------

Signed-off-by: simvalery <[email protected]>
Co-authored-by: envision-ci-agent <[email protected]>
  • Loading branch information
simvalery and envision-ci-agent authored Apr 3, 2024
1 parent df4a289 commit 5a4d809
Show file tree
Hide file tree
Showing 22 changed files with 64 additions and 92 deletions.
8 changes: 4 additions & 4 deletions ai-service/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "ai-service",
"version": "2.23.0",
"version": "2.23.1",
"main": "dist/app.js",
"license": "Apache-2.0",
"dependencies": {
"@guardian/common": "^2.23.0",
"@guardian/interfaces": "^2.23.0",
"@guardian/common": "^2.23.1",
"@guardian/interfaces": "^2.23.1",
"@mikro-orm/core": "5.7.12",
"@mikro-orm/mongodb": "5.7.12",
"@nestjs/common": "^9.4.1",
Expand Down Expand Up @@ -35,4 +35,4 @@
"resolutions": {
"@types/mime": "3.0.4"
}
}
}
6 changes: 3 additions & 3 deletions analytics-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
},
"author": "Envision Blockchain Solutions <[email protected]>",
"dependencies": {
"@guardian/common": "^2.23.0",
"@guardian/interfaces": "^2.23.0",
"@guardian/common": "^2.23.1",
"@guardian/interfaces": "^2.23.1",
"@nestjs/common": "^9.4.1",
"@nestjs/core": "^9.4.1",
"@nestjs/jwt": "^10.0.3",
Expand Down Expand Up @@ -82,5 +82,5 @@
"start": "node dist/index.js",
"test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
},
"version": "2.23.0"
"version": "2.23.1"
}
8 changes: 4 additions & 4 deletions api-gateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
},
"author": "Envision Blockchain Solutions <[email protected]>",
"dependencies": {
"@guardian/common": "^2.23.0",
"@guardian/interfaces": "^2.23.0",
"@guardian/common": "^2.23.1",
"@guardian/interfaces": "^2.23.1",
"@nestjs/common": "^9.4.1",
"@nestjs/core": "^9.4.1",
"@nestjs/jwt": "^10.0.3",
Expand Down Expand Up @@ -83,5 +83,5 @@
"start": "node dist/index.js",
"test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
},
"version": "2.23.0"
}
"version": "2.23.1"
}
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.23.0",
"version": "2.23.1",
"description": "API Tests",
"main": "index.js",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions auth-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"@types/mime": "3.0.4"
},
"dependencies": {
"@guardian/common": "^2.23.0",
"@guardian/interfaces": "^2.23.0",
"@guardian/common": "^2.23.1",
"@guardian/interfaces": "^2.23.1",
"@meeco/cryppo": "^2.0.2",
"@mikro-orm/core": "5.7.12",
"@mikro-orm/mongodb": "5.7.12",
Expand Down Expand Up @@ -75,5 +75,5 @@
"start": "node dist/index.js",
"test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
},
"version": "2.23.0"
}
"version": "2.23.1"
}
6 changes: 3 additions & 3 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.23.0",
"@guardian/interfaces": "^2.23.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:local": "mocha tests/**/*.test.js --exit",
"test:stability": "mocha tests/stability.test.js"
},
"version": "2.23.0"
}
"version": "2.23.1"
}
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@
"test": "ng test",
"watch": "ng build --watch --configuration development --output-path ../www-data"
},
"version": "2.23.0"
"version": "2.23.1"
}
15 changes: 0 additions & 15 deletions frontend/src/app/views/branding/branding.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@ <h4>Name and colors</h4>
<h4>Login Background</h4>
<ng-container [ngTemplateOutlet]="backgroundInfo"></ng-container>
</div>
<div class="card">
<h4>Terms and Conditions</h4>
<ng-container [ngTemplateOutlet]="termsAndConditionsTpl"></ng-container>
</div>
</div>
</div>

Expand Down Expand Up @@ -212,17 +208,6 @@ <h4>Company Logo</h4>
</div>
</ng-template>

<ng-template #termsAndConditionsTpl>
<div class="branding-container">
<div class="p-field">
<label class="p-field-label" for="companyName">Company Name</label>
<textarea [formControl]="termsAndConditions" class="p-field-input terms-input" placeholder="Enter text"
rows="30" type="text"></textarea>
<small *ngIf="primaryHexColorControl.invalid" class="p-error">Company name is invalid</small>
</div>
</div>
</ng-template>

<p-dialog [(visible)]="initResetDialog" [closable]="true" [draggable]="false" [modal]="true">
<ng-template pTemplate="header">
<span class="modal-header">Reset Branding Settings</span>
Expand Down
19 changes: 5 additions & 14 deletions frontend/src/app/views/login/login.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { environment } from 'src/environments/environment';
import { takeUntil } from 'rxjs/operators';
import { BrandingService } from '../../services/branding.service';
import { DialogService } from 'primeng/dynamicdialog';
import { TermsConditionsComponent } from './register-dialogs/terms-conditions-dialog/terms-conditions.component';
import { AccountTypeSelectorDialogComponent } from './register-dialogs/account-type-selector-dialog/account-type-selector-dialog.component';
import { ForgotPasswordDialogComponent } from './forgot-password-dialog/forgot-password-dialog.component';
import { RegisterDialogComponent } from './register-dialogs/register-dialog/register-dialog.component';
Expand Down Expand Up @@ -341,19 +340,11 @@ export class LoginComponent implements OnInit, OnDestroy {
})
}

this.dialogService.open(TermsConditionsComponent, {
header: 'Terms and Conditions',
width: '640px',
modal: true,
}).onClose.subscribe((submit) => {
if (submit) {
if (this.isMgsMode) {
part2();
} else {
part3(UserRole.USER)
}
}
});
if (this.isMgsMode) {
part2();
} else {
part3(UserRole.USER)
}
}

forgotPasswordInit() {
Expand Down
8 changes: 4 additions & 4 deletions guardian-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"@types/mime": "3.0.4"
},
"dependencies": {
"@guardian/common": "^2.23.0",
"@guardian/interfaces": "^2.23.0",
"@guardian/common": "^2.23.1",
"@guardian/interfaces": "^2.23.1",
"@hashgraph/sdk": "2.34.1",
"@mattrglobal/jsonld-signatures-bbs": "^1.1.2",
"@meeco/cryppo": "^2.0.2",
Expand Down Expand Up @@ -99,5 +99,5 @@
"test:local": "mocha tests/**/*.test.js --exit",
"test:stability": "mocha tests/stability.test.js"
},
"version": "2.23.0"
}
"version": "2.23.1"
}
4 changes: 2 additions & 2 deletions interfaces/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"prepack": "npm run build",
"test": "echo \"Error: no test specified\" && exit 1"
},
"version": "2.23.0",
"version": "2.23.1",
"resolutions": {
"@types/mime": "3.0.4"
}
}
}
8 changes: 4 additions & 4 deletions logger-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@types/mime": "3.0.4"
},
"dependencies": {
"@guardian/common": "^2.23.0",
"@guardian/interfaces": "^2.23.0",
"@guardian/common": "^2.23.1",
"@guardian/interfaces": "^2.23.1",
"@mikro-orm/core": "5.7.12",
"@mikro-orm/mongodb": "5.7.12",
"@nestjs/common": "^9.4.1",
Expand Down Expand Up @@ -54,5 +54,5 @@
"start": "node dist/index.js",
"watch": "nodemon src/index.ts"
},
"version": "2.23.0"
}
"version": "2.23.1"
}
6 changes: 3 additions & 3 deletions mrv-sender/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@types/mime": "3.0.4"
},
"dependencies": {
"@guardian/common": "^2.23.0",
"@guardian/common": "^2.23.1",
"@transmute/credentials-context": "0.7.0-unstable.80",
"@transmute/did-context": "0.7.0-unstable.80",
"@transmute/ed25519-signature-2018": "0.7.0-unstable.80",
Expand Down Expand Up @@ -44,5 +44,5 @@
"dev:docker": "nodemon .",
"start": "node dist/index.js"
},
"version": "2.23.0"
}
"version": "2.23.1"
}
8 changes: 4 additions & 4 deletions notification-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@types/mime": "3.0.4"
},
"dependencies": {
"@guardian/common": "^2.23.0",
"@guardian/interfaces": "^2.23.0",
"@guardian/common": "^2.23.1",
"@guardian/interfaces": "^2.23.1",
"@mikro-orm/core": "5.7.12",
"@mikro-orm/mongodb": "5.7.12",
"@nestjs/common": "^9.4.1",
Expand Down Expand Up @@ -53,5 +53,5 @@
"start": "node dist/index.js",
"watch": "nodemon src/index.ts"
},
"version": "2.23.0"
}
"version": "2.23.1"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"ai-service",
"notification-service"
],
"version": "2.23.0",
"version": "2.23.1",
"devDependencies": {
"detect-secrets": "^1.0.6"
},
Expand Down
6 changes: 3 additions & 3 deletions policy-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"@types/mime": "3.0.4"
},
"dependencies": {
"@guardian/common": "2.23.0",
"@guardian/interfaces": "2.23.0",
"@guardian/common": "2.23.1",
"@guardian/interfaces": "2.23.1",
"@hashgraph/sdk": "2.34.1",
"@mattrglobal/jsonld-signatures-bbs": "^1.1.2",
"@meeco/cryppo": "2.0.2",
Expand Down Expand Up @@ -97,5 +97,5 @@
"test:local": "mocha tests/**/*.test.js",
"test:stability": "mocha tests/stability.test.js"
},
"version": "2.23.0"
"version": "2.23.1"
}
2 changes: 1 addition & 1 deletion swagger-analytics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ info:
the heart of the Guardian solution is a sophisticated Policy Workflow Engine
(PWE) that enables applications to offer a requirements-based tokenization
implementation.
version: 2.23.0
version: 2.23.1
contact:
name: API developer
url: https://envisionblockchain.com
Expand Down
2 changes: 1 addition & 1 deletion swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9962,7 +9962,7 @@ info:
the heart of the Guardian solution is a sophisticated Policy Workflow Engine
(PWE) that enables applications to offer a requirements-based tokenization
implementation.
version: 2.23.0
version: 2.23.1
contact:
name: API developer
url: https://envisionblockchain.com
Expand Down
2 changes: 1 addition & 1 deletion topic-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dev": "tsc -w",
"start": "node dist/index.js"
},
"version": "2.23.0",
"version": "2.23.1",
"resolutions": {
"@types/mime": "3.0.4"
}
Expand Down
2 changes: 1 addition & 1 deletion tree-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dev": "tsc -w",
"start": "node dist/index.js"
},
"version": "2.23.0",
"version": "2.23.1",
"resolutions": {
"@types/mime": "3.0.4"
}
Expand Down
6 changes: 3 additions & 3 deletions worker-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"author": "Envision Blockchain Solutions <[email protected]>",
"dependencies": {
"@filebase/client": "^0.0.5",
"@guardian/common": "^2.23.0",
"@guardian/interfaces": "^2.23.0",
"@guardian/common": "^2.23.1",
"@guardian/interfaces": "^2.23.1",
"@hashgraph/sdk": "2.34.1",
"@nestjs/common": "^9.4.1",
"@nestjs/core": "^9.4.1",
Expand Down Expand Up @@ -65,7 +65,7 @@
},
"type": "module",
"types": "dist/index.d.ts",
"version": "2.23.0",
"version": "2.23.1",
"resolutions": {
"@types/mime": "3.0.4"
}
Expand Down
Loading

0 comments on commit 5a4d809

Please sign in to comment.