diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 345cfca0..7593bd28 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -21,6 +21,7 @@ on: - 1.* - MOSIP* - tf_nira_dev + - MAmatch jobs: build-admin-ui: diff --git a/README.md b/README.md index 78362833..344b9701 100644 --- a/README.md +++ b/README.md @@ -31,5 +31,6 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). + ## License This project is licensed under the terms of [Mozilla Public License 2.0](../LICENSE). diff --git a/admin-ui/src/app/core/services/data-storage.service.ts b/admin-ui/src/app/core/services/data-storage.service.ts index 8c94a7b0..2760c39c 100644 --- a/admin-ui/src/app/core/services/data-storage.service.ts +++ b/admin-ui/src/app/core/services/data-storage.service.ts @@ -356,6 +356,11 @@ export class DataStorageService { ); } + getMatchedPacketRid(registrationId: string, langCode: string) { + const params = new HttpParams().set('rid', registrationId).set('langCode', langCode); + return this.http.get(this.BASE_URL + 'admin/packetstatusupdate/manual-verification', {params}); + } + getCreateUpdateSteps(entity: string) { return this.http.get(`./assets/create-update-steps/${entity}-steps.json`); } diff --git a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html index dee76bf0..c4df1c80 100644 --- a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html +++ b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html @@ -10,6 +10,9 @@ + {{errorMessage | translate}} @@ -78,7 +81,7 @@

{{item.transactionTypeCode.replace("

{{ popupTitle }}

{{ popupTitle }}

-

{{ popupMessage }}

+

diff --git a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.scss b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.scss index 45a08b16..f5fce594 100644 --- a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.scss +++ b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.scss @@ -197,7 +197,8 @@ caption { .popup-box { background: #ffffff; width: 700px; - height: 180px; + min-height: 220px; + max-height: 500px; border-radius: 0; box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.3); display: flex; diff --git a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.ts b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.ts index 5d091725..2d602393 100644 --- a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.ts +++ b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.ts @@ -21,6 +21,7 @@ export class PacketStatusComponent implements OnInit { // status: 'Completed' // } ]; + showMatchedRid: boolean = false; roles: string[] = []; showDetails = false; showTimeline = false; @@ -96,7 +97,8 @@ export class PacketStatusComponent implements OnInit { console.log("status for ", this.data[i].transactionTypeCode, "is ", this.statusCheck); this.error = false; this.showDetails = true; - console.log("Final status is ", this.statusCheck) + + this.showMatchedRid = this.data.some(item =>item.transactionTypeCode === 'MANUAL_ADJUDICATION' ); } }); } @@ -131,6 +133,33 @@ export class PacketStatusComponent implements OnInit { }); } + getMatchedRid() { + if (!this.id) { + this.error = true; + this.errorMessage = 'Invalid packet id'; + return; + } + this.dataStorageService.getMatchedPacketRid(this.id, this.headerService.getUserPreferredLanguage()).subscribe({ + next: (response) => { + console.log('Get Matched RID API Response:', response); + this.error = false; + const res: any = response; + let message = res.response.message; + if (!message[0].startsWith('No')) { + let formattedMessage = ''; + if (message[0].startsWith('Biometric')) { + formattedMessage = message.join('
'); + } else { + formattedMessage = "Matched RID's:

" + message.map(rid => `'${rid}'`).join('
'); + } + this.showPopup('Success', formattedMessage , 'Close', 'success'); + } else { + this.showPopup('Error', message, 'Close', 'error'); + } + } + }); + } + showPopup(title: string, message: string, buttonText: string, type: 'success' | 'error') { this.popupTitle = title; this.popupMessage = message; diff --git a/admin-ui/src/assets/i18n/eng.json b/admin-ui/src/assets/i18n/eng.json index 87972ff1..b8333192 100644 --- a/admin-ui/src/assets/i18n/eng.json +++ b/admin-ui/src/assets/i18n/eng.json @@ -509,6 +509,7 @@ "viewMore": "View More", "viewLess": "View Less", "resume": "Resume", + "matchedRid":"MA Matches", "errorMessages": { "title": "Error", "message": "RID Not Found", @@ -1448,7 +1449,7 @@ "RPR-MVS-FAILED-002": "Manual verification from MVS failed", "RPR-DDP-FAILED-002": "Potential Demo Match was Found", "RPR-MNV-SUCCESS-001": "Match Not Found by Manual Verifier", - "RPR-MNV-FAILED-001": "Match Found by Manual Verifier", + "RPR-MNV-FAILED-002": "Match Found by Manual Verifier", "RPR-UIN-SUCCESS-001": "UIN Generated Successfully", "RPR-UIN-SUCCESS-002": "UIN Data is Updated Successfully", "RPR-UIN-FAILED-001": "UIN is already Activated",