From 9c0c0415857aeaeed99ea39eb0af62ed7dd5e7df Mon Sep 17 00:00:00 2001 From: ajithmuthukumar-bc <99731656+ajithmuthukumar-bc@users.noreply.github.com> Date: Thu, 2 Feb 2023 12:25:11 +0530 Subject: [PATCH 1/9] 3554 and 4543 issue is fixed (#1089) --- .../buyer-both-requests/buyer-both-requests.component.ts | 2 +- .../delegated-user-status.component.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/pages/manage-buyer-and-both-requests/buyer-both-requests/buyer-both-requests.component.ts b/src/app/pages/manage-buyer-and-both-requests/buyer-both-requests/buyer-both-requests.component.ts index 01e57282a..371969949 100644 --- a/src/app/pages/manage-buyer-and-both-requests/buyer-both-requests/buyer-both-requests.component.ts +++ b/src/app/pages/manage-buyer-and-both-requests/buyer-both-requests/buyer-both-requests.component.ts @@ -30,7 +30,7 @@ export class BuyerBothRequestsComponent implements OnInit { ], organisationAuditList: '', pageName: 'Contactadmin', - hyperTextrray: ['Decline', 'Accept', 'View'], + hyperTextrray: ['View'], }; public verifiedBuyerAndBoth: any = { diff --git a/src/app/pages/manage-delegated/delegated-user-status/delegated-user-status.component.ts b/src/app/pages/manage-delegated/delegated-user-status/delegated-user-status.component.ts index a98cbc76f..b7455f364 100644 --- a/src/app/pages/manage-delegated/delegated-user-status/delegated-user-status.component.ts +++ b/src/app/pages/manage-delegated/delegated-user-status/delegated-user-status.component.ts @@ -36,8 +36,10 @@ export class DelegatedUserStatusComponent implements OnInit { ngOnInit(): void { this.route.queryParams.subscribe((para: any) => { - let RouteData = JSON.parse(atob(para.data)); - RouteData.event.userName = decodeURIComponent(unescape(RouteData.event.userName)); + let RouteData:any = JSON.parse(atob(para.data)); + if(RouteData.event){ + RouteData.event.userName = decodeURIComponent(unescape(RouteData.event.userName)); + } switch (RouteData.status) { case '001': { this.UserStatus = RouteData; From d2bd9e9e2d75c2f423fd51dfc87140737e29475e Mon Sep 17 00:00:00 2001 From: brijeshpatel-bc <108462846+brijeshpatel-bc@users.noreply.github.com> Date: Thu, 2 Feb 2023 13:17:51 +0530 Subject: [PATCH 2/9] Bug 4400: Sprint 4-Response should be 400 bad request when send invalid status code in approve roles end point (#1088) Bug 4398: Sprint 4-:Issues in POST {{apigwurl}}/user-profiles/approve/roles API --- .../manage-user-add-single-user-detail.component.ts | 1 + src/app/pages/user-profile/user-profile-component.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/app/pages/manage-user/manage-user-add-single-user-detail/manage-user-add-single-user-detail.component.ts b/src/app/pages/manage-user/manage-user-add-single-user-detail/manage-user-add-single-user-detail.component.ts index 635cfd5c4..e1897b9a5 100644 --- a/src/app/pages/manage-user/manage-user-add-single-user-detail/manage-user-add-single-user-detail.component.ts +++ b/src/app/pages/manage-user/manage-user-add-single-user-detail/manage-user-add-single-user-detail.component.ts @@ -507,6 +507,7 @@ export class ManageUserAddSingleUserDetailComponent private submitPendingApproveRole(): void { let selectedRolesDetails = { userName: this.userProfileRequestInfo.userName, + organisationId: this.userProfileRequestInfo.organisationId, detail: { roleIds: this.selectedApproveRequiredRole } diff --git a/src/app/pages/user-profile/user-profile-component.ts b/src/app/pages/user-profile/user-profile-component.ts index 66af9f1b4..2cd8c18b1 100644 --- a/src/app/pages/user-profile/user-profile-component.ts +++ b/src/app/pages/user-profile/user-profile-component.ts @@ -499,6 +499,7 @@ export class UserProfileComponent extends FormBaseComponent implements OnInit { private submitPendingApproveRole(isValidDomain:boolean): void { let selectedRolesDetails = { userName: this.userName, + organisationId: this.organisationDetails.detail.organisationId, detail: { roleIds: this.selectedApproveRequiredRole } From 99d6e3867482381b0e81d535ced0b60004f8227a Mon Sep 17 00:00:00 2001 From: Sajeethhameed-bc <122615977+Sajeethhameed-bc@users.noreply.github.com> Date: Thu, 2 Feb 2023 17:06:15 +0530 Subject: [PATCH 3/9] 4462 content has been updated. (#1092) --- .../role-request-failed/role-request-failed.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html b/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html index 33880065e..ff7666849 100644 --- a/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html +++ b/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html @@ -18,8 +18,8 @@

Fleet Portal access verification

-

User {{userInfo.userName}} no longer requires access to Fleet Portal and the access - has been removed by the organisation admin.

+

The access request for Fleet Portal for user + {{userInfo.userName}} has expired or it was already actioned.

An unexpected error has occurred. Please try again in a few minutes

Return to dashboard
From 2f1132b6f19ca5c9901aa81b04dc17f39cb6cec2 Mon Sep 17 00:00:00 2001 From: Sajeethhameed-bc <122615977+Sajeethhameed-bc@users.noreply.github.com> Date: Thu, 2 Feb 2023 22:22:21 +0530 Subject: [PATCH 4/9] error code has been updated. (#1095) --- .../role-request-failed.component.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html b/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html index ff7666849..404d418f6 100644 --- a/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html +++ b/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html @@ -18,9 +18,11 @@

Fleet Portal access verification

-

The access request for Fleet Portal for user - {{userInfo.userName}} has expired or it was already actioned.

-

An unexpected error has occurred. Please try again in a few minutes

+

The access request for Fleet Portal for user + {{userInfo.userName}} has expired or it was already actioned.

+

User {{userDetails.userName}} no longer requires access to Fleet Portal and the access + has been removed by the organisation admin.

+

An unexpected error has occurred. Please try again in a few minutes

Return to dashboard
From c7b305d74b5ffe80cf02aa75d6d4541c5da20900 Mon Sep 17 00:00:00 2001 From: ajithmuthukumar-bc <99731656+ajithmuthukumar-bc@users.noreply.github.com> Date: Thu, 2 Feb 2023 22:48:16 +0530 Subject: [PATCH 5/9] binding name changes (#1098) --- .../role-request-failed/role-request-failed.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html b/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html index 404d418f6..771218b2b 100644 --- a/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html +++ b/src/app/pages/manage-role/role-request-failed/role-request-failed.component.html @@ -20,7 +20,7 @@

Fleet Portal access verification

The access request for Fleet Portal for user {{userInfo.userName}} has expired or it was already actioned.

-

User {{userDetails.userName}} no longer requires access to Fleet Portal and the access +

User {{userInfo.userName}} no longer requires access to Fleet Portal and the access has been removed by the organisation admin.

An unexpected error has occurred. Please try again in a few minutes

Return to dashboard From 90543caee85c38c6368aa072da78dae818e1a6ea Mon Sep 17 00:00:00 2001 From: ajithmuthukumar-bc <99731656+ajithmuthukumar-bc@users.noreply.github.com> Date: Fri, 3 Feb 2023 19:37:27 +0530 Subject: [PATCH 6/9] 4448-issues-fixed (#1100) --- Auth0Templates/ResetPassword.html | 8 +++++--- .../delegated-user-status.component.ts | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Auth0Templates/ResetPassword.html b/Auth0Templates/ResetPassword.html index 7664fc280..ec144f7e9 100644 --- a/Auth0Templates/ResetPassword.html +++ b/Auth0Templates/ResetPassword.html @@ -563,10 +563,11 @@

}); var handleSuccess = function (res) { - debugger; + if(res.success === false){ + window.location.replace(res.result_url); + } else { var field = "initial"; var _status = window.location.href.indexOf('&' + field); - if (_status != -1) { $('title').html("Success - Set Password - CCS"); document.getElementById("longin-success-message").innerHTML = "Your password has been setup"; @@ -577,9 +578,10 @@

} $("#success-view").show(); $("#reset-view").hide(); - // window.location.replace(result_url); + // window.location.replace(result_url); var errorSummary = document.getElementById('error-summary'); errorSummary.style.display = 'none'; + } }; var handleError = function (res) { diff --git a/src/app/pages/manage-delegated/delegated-user-status/delegated-user-status.component.ts b/src/app/pages/manage-delegated/delegated-user-status/delegated-user-status.component.ts index b7455f364..4b827269a 100644 --- a/src/app/pages/manage-delegated/delegated-user-status/delegated-user-status.component.ts +++ b/src/app/pages/manage-delegated/delegated-user-status/delegated-user-status.component.ts @@ -119,7 +119,7 @@ export class DelegatedUserStatusComponent implements OnInit { } public BackToDelegated():void { - this.router.navigateByUrl('find-delegated-user'); + window.history.back(); } public BackToDashboard():void { this.router.navigateByUrl('home'); From b85731b44ceec0bdc3b601dfb9cd7f8ccf400852 Mon Sep 17 00:00:00 2001 From: VijayHirudayasamy-bc <103512567+VijayHirudayasamy-bc@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:45:58 +0000 Subject: [PATCH 7/9] Frontend non functional issue fix for 3379 (#1105) --- .../confirm-decline.component.html | 29 ++-- .../view-pending-verification.component.html | 149 +++++++++-------- .../view-verified-org.component.html | 155 ++++++++++-------- 3 files changed, 180 insertions(+), 153 deletions(-) diff --git a/src/app/pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component.html b/src/app/pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component.html index abb2ac304..4be2b52ef 100644 --- a/src/app/pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component.html +++ b/src/app/pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component.html @@ -17,21 +17,22 @@ -

Confirm you want to decline right to buy status for organisation {{routeDetails.organisationName}}

+

Please confirm that you want to decline right to + buy status for the following organisation {{routeDetails.organisationName}}

-

- The organisation’s administrator(s) will be notified that the right to buy status was declined. +

+ The organisation’s administrator(s) will be notified that the right to buy status has been declined.

-
- - +
+ + +
- - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component.html b/src/app/pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component.html index b902f50d5..2683b9039 100644 --- a/src/app/pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component.html +++ b/src/app/pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component.html @@ -18,90 +18,103 @@

View organisations’ Buyer status request

-

- View the details of the organisation that is pending the manual verification process for buyer status. If you want to accept this organisation as a verified buyer, please use ‘Accept buyer status’ button on the bottom of this page. +

+ View the details of the organisation that is pending the manual verification process for buyer + status. If you want to accept this organisation as a verified buyer, please use ‘Accept right to buy + status’ button on the bottom of this page.

Organisation details

- Organisation name :{{routeDetails.organisationName}} + Organisation name :{{routeDetails.organisationName}}

- Organisation type   :{{routeDetails.organisationType == 0 ? 'Supplier' : (routeDetails.organisationType == 1 ? 'Buyer' : 'Both')}} + Organisation type   :{{routeDetails.organisationType == 0 ? 'Supplier' : + (routeDetails.organisationType == 1 ? 'Buyer' : 'Both')}}

- Date of registration:{{routeDetails.dateOfRegistration | date: 'dd/MM/yyyy'}}
{{routeDetails.dateOfRegistration | date: 'HH:mm'}} + Date of registration:{{routeDetails.dateOfRegistration + | date: 'dd/MM/yyyy'}}
{{routeDetails.dateOfRegistration | date: 'HH:mm'}}

-
-
-

Organisation Administrator(s)

-
-
-
- +
+
+

Organisation Administrator(s)

+
+
+
+ +
-
-
-

Organisation registries

-
-
-
- - - - - - - - - - - - - - - - - - - - -
RegistryID.
{{ getSchemaName(registries.identifier?.scheme||'') }}{{ registries.identifier?.id}}Primary
{{ getSchemaName(row.scheme) }}{{ row.id }}
+
+

Organisation registries

+
+
+
+ + + + + + + + + + + + + + + + + + + + +
RegistryID.
{{ + getSchemaName(registries.identifier?.scheme||'') }}{{ registries.identifier?.id}}Primary
{{ getSchemaName(row.scheme) }}{{ row.id }}
+
+

+ There are no matching results. +

-

- There are no matching results. -

-
-
-

Event log

-
-
-
- +
+

Event log

+
+
+
+ +
-
-
-
- - -
- -
-
\ No newline at end of file +
+
+ + +
+ +
+
\ No newline at end of file diff --git a/src/app/pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component.html b/src/app/pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component.html index d10e8a679..099c463de 100644 --- a/src/app/pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component.html +++ b/src/app/pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component.html @@ -23,93 +23,106 @@

View organisations’

-

Organisation details

+

Organisation details

- Organisation name :{{routeDetails.event.organisationName}} + Organisation name :{{routeDetails.event.organisationName}}

- Organisation type   :{{routeDetails.event.organisationType == 0 ? 'Supplier' : (routeDetails.event.organisationType == 1 ? 'Buyer' : 'Both')}} + Organisation type   :{{routeDetails.event.organisationType == 0 ? 'Supplier' : + (routeDetails.event.organisationType == 1 ? 'Buyer' : 'Both')}}

- Date of registration:{{routeDetails.event.dateOfRegistration | date: 'dd/MM/yyyy'}}
{{routeDetails.event.dateOfRegistration | date: 'HH:mm'}} + Date of registration:{{routeDetails.event.dateOfRegistration + | date: 'dd/MM/yyyy'}}
{{routeDetails.event.dateOfRegistration | date: 'HH:mm'}}

- Right to buy status :{{routeDetails.event.rightToBuy ? 'Approved' : 'Declined'}} + Right to buy status :{{routeDetails.event.auditStatus==5? + 'Not Applicable' : routeDetails.event.rightToBuy ? + 'Approved' : 'Declined'}}

-
-
-

Organisation Administrator(s)

-
-
-
- -
-
+
-

Organisation registries

-
+

Organisation Administrator(s)

+
- - - - - - - - - - - - - - - - - - - - -
RegistryID.
{{ - getSchemaName(registries.identifier?.scheme||'') }}{{ registries.identifier?.id}}Primary
{{ getSchemaName(row.scheme) }}{{ row.id }}
+
-

- There are no matching results. -

-
-
-

Event log

-
-
-
- +
+

Organisation registries

+
+
+
+ + + + + + + + + + + + + + + + + + + + +
RegistryID.
{{ + getSchemaName(registries.identifier?.scheme||'') }}{{ registries.identifier?.id}}Primary
{{ getSchemaName(row.scheme) }} + {{ row.id }}
+
+

+ There are no matching results. +

+
+
+

Event log

+
+
+
+ +
+
+
+
+
+
+ + +
+
-
-
- - -
- -
-
\ No newline at end of file +
\ No newline at end of file From 085436034627b12e5b7110e2273e2dfeb3fc05a5 Mon Sep 17 00:00:00 2001 From: Sajeethhameed-bc <122615977+Sajeethhameed-bc@users.noreply.github.com> Date: Mon, 6 Feb 2023 22:31:27 +0530 Subject: [PATCH 8/9] 4507-Unnecessary api call to org user has been restricted. (#1107) --- src/app/pages/user-profile/user-profile-component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/user-profile/user-profile-component.ts b/src/app/pages/user-profile/user-profile-component.ts index 2cd8c18b1..d285ba470 100644 --- a/src/app/pages/user-profile/user-profile-component.ts +++ b/src/app/pages/user-profile/user-profile-component.ts @@ -313,8 +313,9 @@ export class UserProfileComponent extends FormBaseComponent implements OnInit { } async getOrgDetails() { + if(this.isOrgAdmin){ this.organisationDetails = await this.organisationService.getOrganisation(this.organisationId).toPromise().catch(e => { - }); + });} } async getPendingApprovalUserRole() { From ec45db429c6b96824801fee82475cb52cc4a6fc9 Mon Sep 17 00:00:00 2001 From: ajithmuthukumar-bc <99731656+ajithmuthukumar-bc@users.noreply.github.com> Date: Wed, 8 Feb 2023 21:17:57 +0530 Subject: [PATCH 9/9] Con 3593 error text change UI (#1114) * error msg content changed * msg updated --- .../manage-organisation-profile-registry-search.component.html | 3 +-- .../manage-organisation-registration-step-2.component.html | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/pages/manage-organisation/manage-organisation-profile-registry-search/manage-organisation-profile-registry-search.component.html b/src/app/pages/manage-organisation/manage-organisation-profile-registry-search/manage-organisation-profile-registry-search.component.html index 0bbb83be3..ea36d2c68 100644 --- a/src/app/pages/manage-organisation/manage-organisation-profile-registry-search/manage-organisation-profile-registry-search.component.html +++ b/src/app/pages/manage-organisation/manage-organisation-profile-registry-search/manage-organisation-profile-registry-search.component.html @@ -102,8 +102,7 @@

- {{ 'ERROR_PREFIX' | translate }} 'Please enter Unique - Reference Number (URN)' + {{ 'ERROR_PREFIX' | translate }}Please enter a registry number Enter your {{ item.schemeName }} Unique Reference Number (URN)
diff --git a/src/app/pages/manage-organisation/manage-organisation-registration-step-2/manage-organisation-registration-step-2.component.html b/src/app/pages/manage-organisation/manage-organisation-registration-step-2/manage-organisation-registration-step-2.component.html index 049ee0cf2..2028a31e0 100644 --- a/src/app/pages/manage-organisation/manage-organisation-registration-step-2/manage-organisation-registration-step-2.component.html +++ b/src/app/pages/manage-organisation/manage-organisation-registration-step-2/manage-organisation-registration-step-2.component.html @@ -92,7 +92,7 @@

{{ 'ERROR_PREFIX' | translate }} - 'Please enter Unique Reference Number (URN)' + Please enter a registry number Enter your {{ item.schemeName }} Unique Reference Number (URN)