From 06b4a709d89938077eea312025d7ad91155c235d Mon Sep 17 00:00:00 2001 From: Rinat Arsaev <11846445+A77AY@users.noreply.github.com> Date: Tue, 16 Jul 2024 14:36:33 +0500 Subject: [PATCH] FIN-46: New party additional info modification (#374) --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- .../claim/utils/types/modifications-name-tree.ts | 1 + .../party-shops/party-shops.component.ts | 2 +- .../shops-table/shops-table.component.ts | 2 +- .../terminal-delegates-card.component.ts | 2 +- .../domain-metadata-view-extensions.service.ts | 2 +- .../shared/utils/table/create-party-column.ts | 4 ++-- .../shared/utils/table2/create-party-column.ts | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 56324eff..aa00d02c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,12 +21,12 @@ "@angular/router": "18.0.5", "@ngneat/input-mask": "6.0.0", "@vality/deanonimus-proto": "2.0.1-2a02d87.0", - "@vality/domain-proto": "2.0.1-b04aba8.0", + "@vality/domain-proto": "2.0.1-e5d3c83.0", "@vality/dominator-proto": "1.0.1-41bee97.0", "@vality/fistful-proto": "2.0.1-88e69a5.0", "@vality/machinegun-proto": "1.0.0", "@vality/magista-proto": "2.0.2-28d11b9.0", - "@vality/ng-core": "18.2.1-pr-66-23525f5.0", + "@vality/ng-core": "18.2.0", "@vality/ng-thrift": "18.0.1-pr-13-bdb6d51.0", "@vality/payout-manager-proto": "2.0.1-eb4091a.0", "@vality/repairer-proto": "2.0.2-07b73e9.0", @@ -6571,9 +6571,9 @@ "integrity": "sha512-mokuK6w+ExASdDE6+L9bM2SaS0yVPSyBvXavY8rRtNzZgVdmj7KSRiyGmXz41grhS6jcvD8aR85Nj4o7/iogmQ==" }, "node_modules/@vality/domain-proto": { - "version": "2.0.1-b04aba8.0", - "resolved": "https://registry.npmjs.org/@vality/domain-proto/-/domain-proto-2.0.1-b04aba8.0.tgz", - "integrity": "sha512-AKD5RkqiS+31hTUaLfh7I3vgYZ2yytwxp8J1jQZ7iPWURz/m5+6Yg4YKNj8Vyyxu3yzO13FxxPUnkTh/poCDWg==" + "version": "2.0.1-e5d3c83.0", + "resolved": "https://registry.npmjs.org/@vality/domain-proto/-/domain-proto-2.0.1-e5d3c83.0.tgz", + "integrity": "sha512-G6FpLCyx7kZZIox90PFUe0FsiAzUTtHZ42gqK7pTyHn2mOzampUuQyyn9MwPkQv6atGLXXiSzEY+qmZIWWkvHQ==" }, "node_modules/@vality/dominator-proto": { "version": "1.0.1-41bee97.0", @@ -6615,9 +6615,9 @@ "integrity": "sha512-BsDy5ejotfTtUlwuoX3kz+PYJ5NSTW6m5ZRGv+p5HaKXSjR7tserPdv0q133Wp4T+sg0ED0Qr9Peqsrn+9XlDQ==" }, "node_modules/@vality/ng-core": { - "version": "18.2.1-pr-66-23525f5.0", - "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-18.2.1-pr-66-23525f5.0.tgz", - "integrity": "sha512-Y4kMHbWgjMuDvk+ev7ZP7MY3QZFd1vaHy3ehGBAzNidzCQVC1eYkc3x6ta6VL8quRfrHzUGwphC50Pxgodxsaw==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/@vality/ng-core/-/ng-core-18.2.0.tgz", + "integrity": "sha512-9dtgXO9EpuTN8UYTlgy5DnCswYJ/iPmFWObSuV4kFecGLe56VPLrn5kfARzPkNKMPNBRRvznfmuwcI18Y8zxGQ==", "dependencies": { "@angular/material-date-fns-adapter": "^18.0.5", "@ng-matero/extensions": "^18.0.3", diff --git a/package.json b/package.json index f56b8211..4afff852 100644 --- a/package.json +++ b/package.json @@ -29,12 +29,12 @@ "@angular/router": "18.0.5", "@ngneat/input-mask": "6.0.0", "@vality/deanonimus-proto": "2.0.1-2a02d87.0", - "@vality/domain-proto": "2.0.1-b04aba8.0", + "@vality/domain-proto": "2.0.1-e5d3c83.0", "@vality/dominator-proto": "1.0.1-41bee97.0", "@vality/fistful-proto": "2.0.1-88e69a5.0", "@vality/machinegun-proto": "1.0.0", "@vality/magista-proto": "2.0.2-28d11b9.0", - "@vality/ng-core": "18.2.1-pr-66-23525f5.0", + "@vality/ng-core": "18.2.0", "@vality/ng-thrift": "18.0.1-pr-13-bdb6d51.0", "@vality/payout-manager-proto": "2.0.1-eb4091a.0", "@vality/repairer-proto": "2.0.2-07b73e9.0", diff --git a/src/app/sections/claim/utils/types/modifications-name-tree.ts b/src/app/sections/claim/utils/types/modifications-name-tree.ts index 9c1fd59c..b22b8c11 100644 --- a/src/app/sections/claim/utils/types/modifications-name-tree.ts +++ b/src/app/sections/claim/utils/types/modifications-name-tree.ts @@ -81,6 +81,7 @@ export const MODIFICATIONS_NAME_TREE: ModificationsNameTree = { account_creation: 'Old Wallet Account Creation', }, }, + additional_info_modification: 'Party Additional Info', }, identity_modification: { modification: { diff --git a/src/app/sections/party-shops/party-shops.component.ts b/src/app/sections/party-shops/party-shops.component.ts index b53112ef..dc9f69cb 100644 --- a/src/app/sections/party-shops/party-shops.component.ts +++ b/src/app/sections/party-shops/party-shops.component.ts @@ -17,7 +17,7 @@ export class PartyShopsComponent { map(([shops, party]) => shops.map((shop) => ({ shop, - party: { id: party.id, email: party.contact_info?.email }, + party: { id: party.id, email: party.contact_info?.registration_email }, })), ), shareReplay({ refCount: true, bufferSize: 1 }), diff --git a/src/app/shared/components/shops-table/shops-table.component.ts b/src/app/shared/components/shops-table/shops-table.component.ts index a89a19ec..013b03a2 100644 --- a/src/app/shared/components/shops-table/shops-table.component.ts +++ b/src/app/shared/components/shops-table/shops-table.component.ts @@ -38,7 +38,7 @@ export interface ShopParty { shop: Shop; party: { id: Party['id']; - email: Party['contact_info']['email']; + email: Party['contact_info']['registration_email']; }; } diff --git a/src/app/shared/components/terminal-delegates-card/terminal-delegates-card.component.ts b/src/app/shared/components/terminal-delegates-card/terminal-delegates-card.component.ts index e5e39c4c..07bf3d24 100644 --- a/src/app/shared/components/terminal-delegates-card/terminal-delegates-card.component.ts +++ b/src/app/shared/components/terminal-delegates-card/terminal-delegates-card.component.ts @@ -55,7 +55,7 @@ export class TerminalDelegatesCardComponent implements OnChanges { formatter: (d) => this.partiesStoreService .get(d.delegate.allowed.condition?.party?.id) - .pipe(map((p) => p.contact_info.email)), + .pipe(map((p) => p.contact_info.registration_email)), description: (d) => d.delegate.allowed.condition?.party?.id, link: (d) => `/party/${d.delegate.allowed.condition.party.id}`, }, diff --git a/src/app/shared/components/thrift-api-crud/domain/domain-thrift-viewer/services/domain-metadata-view-extensions/domain-metadata-view-extensions.service.ts b/src/app/shared/components/thrift-api-crud/domain/domain-thrift-viewer/services/domain-metadata-view-extensions/domain-metadata-view-extensions.service.ts index 115680b1..094564b1 100644 --- a/src/app/shared/components/thrift-api-crud/domain/domain-thrift-viewer/services/domain-metadata-view-extensions/domain-metadata-view-extensions.service.ts +++ b/src/app/shared/components/thrift-api-crud/domain/domain-thrift-viewer/services/domain-metadata-view-extensions/domain-metadata-view-extensions.service.ts @@ -33,7 +33,7 @@ export class DomainMetadataViewExtensionsService { extension: (_, partyId: PartyID) => this.partiesStoreService.get(partyId).pipe( map((p) => ({ - value: p.contact_info.email, + value: p.contact_info.registration_email, link: [[`/party/${p.id}`]], tooltip: p.id, })), diff --git a/src/app/shared/utils/table/create-party-column.ts b/src/app/shared/utils/table/create-party-column.ts index e87774d0..d585e1c9 100644 --- a/src/app/shared/utils/table/create-party-column.ts +++ b/src/app/shared/utils/table/create-party-column.ts @@ -24,9 +24,9 @@ export function createPartyColumn( switchMap((partyId) => partyId ? partiesStoreService.get(partyId) - : of({ contact_info: { email: '' } }), + : of({ contact_info: { registration_email: '' } }), ), - map((p) => p.contact_info.email), + map((p) => p.contact_info.registration_email), ); } return { diff --git a/src/app/shared/utils/table2/create-party-column.ts b/src/app/shared/utils/table2/create-party-column.ts index 6fddee26..9ada46fe 100644 --- a/src/app/shared/utils/table2/create-party-column.ts +++ b/src/app/shared/utils/table2/create-party-column.ts @@ -13,7 +13,7 @@ export const createPartyColumn = createColumn( ? of(params.partyName) : inject(PartiesStoreService) .get(id) - .pipe(map((party) => party.contact_info.email)); + .pipe(map((party) => party.contact_info.registration_email)); return partyName$.pipe( map((partyName) => ({ value: partyName,