From 9f0973214709a35e6f839c1020b44fac5f3a32a0 Mon Sep 17 00:00:00 2001 From: jukibaskar-bc <130968637+jukibaskar-bc@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:17:08 +0530 Subject: [PATCH 01/10] Fixed bug Bug 7227: PPG 982 - Registration Flow - Additional Registries Page - Back button is not required in this page [ Nothing happened when click the back button] (#2017) --- ...isation-registration-additional-identifiers.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/manage-organisation/manage-organisation-registration-additional-identifiers/manage-organisation-registration-additional-identifiers.component.html b/src/app/pages/manage-organisation/manage-organisation-registration-additional-identifiers/manage-organisation-registration-additional-identifiers.component.html index f73147c5e..824bdcbdb 100644 --- a/src/app/pages/manage-organisation/manage-organisation-registration-additional-identifiers/manage-organisation-registration-additional-identifiers.component.html +++ b/src/app/pages/manage-organisation/manage-organisation-registration-additional-identifiers/manage-organisation-registration-additional-identifiers.component.html @@ -61,8 +61,8 @@

We found matching records for your organisation fro
- +
From 593f477f9ba644261d7df6b89a374a4f663b2050 Mon Sep 17 00:00:00 2001 From: jukibaskar-bc <130968637+jukibaskar-bc@users.noreply.github.com> Date: Mon, 12 Feb 2024 17:26:21 +0530 Subject: [PATCH 02/10] Fixed Bug 7234: PPG-991 + is removed from email address when link 'I have forgotten my password' is clicked (#2022) * Fixed bug Bug 7227: PPG 982 - Registration Flow - Additional Registries Page - Back button is not required in this page [ Nothing happened when click the back button] * Fixed bug Bug 7234: PPG-991 + is removed from email address when link 'I have forgotten my password' is clicked --- Auth0Templates/LogIn.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Auth0Templates/LogIn.html b/Auth0Templates/LogIn.html index 02ef445df..6b5046b0c 100644 --- a/Auth0Templates/LogIn.html +++ b/Auth0Templates/LogIn.html @@ -963,7 +963,7 @@

Guides

function forgotPassword(){ let lastUserEmail = document.getElementById("email").value localStorage.setItem('lastUserEmail', lastUserEmail); - window.location.href = "https://dev.identify.crowncommercial.gov.uk/forgot-password?email="+lastUserEmail; + window.location.href = "https://dev.identify.crowncommercial.gov.uk/forgot-password?email="+encodeURIComponent(lastUserEmail); } let emailInput = document.getElementById("email"); @@ -972,7 +972,7 @@

Guides

email.addEventListener('input', function () { lastUserEmail = emailInput.value; - forgotPwdLink.href = "https://dev.identify.crowncommercial.gov.uk/forgot-password?email="+lastUserEmail; + forgotPwdLink.href = "https://dev.identify.crowncommercial.gov.uk/forgot-password?email="+encodeURIComponent(lastUserEmail); }); window.addEventListener('load', function () { From 07df79e525e18da1e699cb4e8b8eeb56ab4f323e Mon Sep 17 00:00:00 2001 From: brijrajsinh-bc <109584978+brijrajsinh-bc@users.noreply.github.com> Date: Mon, 12 Feb 2024 21:05:47 +0530 Subject: [PATCH 03/10] Task 7209: Dependabot: Outdated dependency - follow-redirects (#2023) --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6a5d0b8ae..c4e323346 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6425,9 +6425,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -17715,9 +17715,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true }, "forwarded": { From 268d102559075d673eec460a2a7713a9987d2df1 Mon Sep 17 00:00:00 2001 From: brijeshpatel-bc <108462846+brijeshpatel-bc@users.noreply.github.com> Date: Thu, 22 Feb 2024 20:19:22 +0530 Subject: [PATCH 04/10] Task 7249: PPG-992 Switch all Crown symbols and Cote of arms on PPG. (#2031) --- Auth0Templates/LogIn.html | 2 +- Auth0Templates/Mfa.html | 2 +- Auth0Templates/ResetPassword.html | 2 +- angular.json | 4 ++-- src/faviconnew.ico | Bin 0 -> 14254 bytes src/index.html | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 src/faviconnew.ico diff --git a/Auth0Templates/LogIn.html b/Auth0Templates/LogIn.html index 6b5046b0c..eabc4db96 100644 --- a/Auth0Templates/LogIn.html +++ b/Auth0Templates/LogIn.html @@ -4,7 +4,7 @@ - + Sign In - CCS diff --git a/Auth0Templates/Mfa.html b/Auth0Templates/Mfa.html index 3e4f22ab5..3c62d872f 100644 --- a/Auth0Templates/Mfa.html +++ b/Auth0Templates/Mfa.html @@ -6,7 +6,7 @@ + href="https://crown-commercial-service.github.io/conclave-ssso-ui/faviconnew.ico"> Sign In - CCS diff --git a/Auth0Templates/ResetPassword.html b/Auth0Templates/ResetPassword.html index b8663d3db..caefceb47 100644 --- a/Auth0Templates/ResetPassword.html +++ b/Auth0Templates/ResetPassword.html @@ -5,7 +5,7 @@ + href="https://crown-commercial-service.github.io/conclave-ssso-ui/faviconnew.ico"> Set Password - CCS diff --git a/angular.json b/angular.json index 85b5f35c0..a78f975ca 100644 --- a/angular.json +++ b/angular.json @@ -26,7 +26,7 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "assets": [ - "src/favicon.ico", + "src/faviconnew.ico", "src/assets", { "glob": "**/*", @@ -216,7 +216,7 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "assets": [ - "src/favicon.ico", + "src/faviconnew.ico", "src/assets" ], "styles": [ diff --git a/src/faviconnew.ico b/src/faviconnew.ico new file mode 100644 index 0000000000000000000000000000000000000000..20129a0bbab925707308d7681e4470f62a010b51 GIT binary patch literal 14254 zcmeI0ziVVw6vt0+6|-0b3+spqTLxFH18O0Q5Lg9KSR?ocq_7pHv6Q5+m8215n>6I5enMr2Eci_%_@7{C1=jT1|y@}Y07h-2;C+BE&lPW~T1ub)NSPXqq^H0jHT zcOHKG?BV;d{l)hmKl}Z+lUJTUdGyO4KmHo=`41ocl&p_W?w@VHd$#@c(-#k(K01l` z?B&UKAb#-LSKlzlho5v)yz%zUyd}GDZkPKdPP;kwa}dvt>I$a0H;yp|8&d;$E~j~3 zr+I$6kv(FtZOBL-EHGQ^JkNi&iaKTAm}U>D4)*#8%vSx`ulisXUI(*9KXJnkM)t`r z4^o{ddU|@=?Q0!g*4TqbMBKp;UP~SodvYgxiMQKNF0*e-O?U12g%=sgg9WwZ z0Q(vFEa-IN6ZSKs6HNBGMhAmy*4RUrWbhwbzyd=&va6isyW&YqOF~8j9z*1NS_6Xt zCNwJs;=%5G9(Ml72K;0l|KL-u(Jz15g9ly+S!@D}bqLwgZ{6$ME6%LTChCZLc&H=p zMO?F{8ql8W0uvj=Bc1bR>F~ILfsZ~MS9wHs9{#+2;)@?GXGd7@B7>~fT4v;^Rfw5; za_aeL!GQ-EWNVmx81OrB-^U9sab|Gc$2SBMo1JF)P3}cp_vs&k35L#!&L4F}-7?%y z>DDa$@Q7bENsO>jnBr}j-A|ooQjEbYCU~;#Fin_ zeINgAtm_$v4P4)bj#-%0x%!OP|16ntFYY`~4KYua^%4J5?BzJjv8Deh-preS(OGF9UkV=&ghSOaUT0lu?%-{zf!_YuDPW_`ac+Oxm}Tkk*UT!kKgpVND#&wOL? zZL`SmZ#Bo%^(x*U`JZcDCdVJje(iTfr0td6$oi))4p*x@+Iv z>=AG2WQI@o<#)W+org6rAnh}w8$QLLjF0p7T~jL%|Dm7*dx!}=O}3G5XmW*ohAC(Fs3F19gq1@A(*=x0}l@Cm?;YXMH zCb=1^&vUBWg4b%xvV7{b(#?!bt+?fx5>Bf;eCPv*F+?}AH3Fwqzus>ghZBA7aT6u|AN#(OZ{oMIVo?0A+oUvAWOTL=@Wq&5; zC6#qhv;Qu7bj>zB+uT>Lq1xG{zMThu%lBEwTje!A@IFgTcz>Y728br INb8EgUlZ|}Qvd(} literal 0 HcmV?d00001 diff --git a/src/index.html b/src/index.html index f08cf2369..72939eddb 100644 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@ Crown Commercial Service - CCS - + From f499db1190ad0d1f2305a2ac722e810c27446321 Mon Sep 17 00:00:00 2001 From: madhumathivenkatesan-bc <131144549+madhumathivenkatesan-bc@users.noreply.github.com> Date: Wed, 28 Feb 2024 15:50:24 +0530 Subject: [PATCH 05/10] Bug 7274: MBSR page - UI Issues fixed. (#2035) --- .../buyer-both-requests-success.component.ts | 2 +- .../buyer-both-requests/buyer-both-requests.component.ts | 8 ++++---- .../confirm-accept/confirm-accept.component.ts | 4 ++-- .../confirm-decline/confirm-decline.component.ts | 4 ++-- .../remove-right-to-buy/remove-right-to-buy.component.ts | 4 ++-- .../success-right-to-buy.component.ts | 2 +- .../view-pending-verification.component.ts | 6 +++--- .../view-verified-org/view-verified-org.component.ts | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/app/pages/manage-buyer-and-both-requests/buyer-both-requests-success/buyer-both-requests-success.component.ts b/src/app/pages/manage-buyer-and-both-requests/buyer-both-requests-success/buyer-both-requests-success.component.ts index c85581943..eeaf8e05e 100644 --- a/src/app/pages/manage-buyer-and-both-requests/buyer-both-requests-success/buyer-both-requests-success.component.ts +++ b/src/app/pages/manage-buyer-and-both-requests/buyer-both-requests-success/buyer-both-requests-success.component.ts @@ -19,7 +19,7 @@ export class BuyerBothRequestsSuccessComponent implements OnInit { private sessionService:SessionService ) { this.route.queryParams.subscribe((para: any) => { - this.routeDetails = JSON.parse(atob(para.data)); + this.routeDetails = JSON.parse(decodeURIComponent(atob(para.data))); switch (this.routeDetails.status) { case 'accept': { this.titleService.setTitle( 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 e1fd7bdba..aa08463d8 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 @@ -111,7 +111,7 @@ export class BuyerBothRequestsComponent implements OnInit { ); } else { this.router.navigateByUrl( - 'pending-verification?data=' + btoa(JSON.stringify(data)) + 'pending-verification?data=' + btoa(encodeURIComponent(JSON.stringify(data))) ); } } @@ -125,7 +125,7 @@ export class BuyerBothRequestsComponent implements OnInit { event: event, }; this.router.navigateByUrl( - 'verified-organisations?data=' + btoa(JSON.stringify(data)) + 'verified-organisations?data=' + btoa(encodeURIComponent(JSON.stringify(data))) ); } @@ -152,7 +152,7 @@ export class BuyerBothRequestsComponent implements OnInit { this.pendingVerificationBuyerAndBoth.pageCount = orgListResponse.pageCount; this.assignOrgTypeName(orgListResponse); Array.from(this.pendingVerificationBuyerAndBoth.organisationAuditList.organisationAuditList).forEach((f: any)=>{ - let queryParams = {data: btoa(JSON.stringify(f)),isNewTab: true} + let queryParams = {data: btoa(encodeURIComponent(JSON.stringify(f))),isNewTab: true} f.routeLink= `/pending-verification`, f.routeData = queryParams }) @@ -185,7 +185,7 @@ export class BuyerBothRequestsComponent implements OnInit { status: '003', event: f, }; - let queryParams = {data: btoa(JSON.stringify(data)),isNewTab: true} + let queryParams = {data: btoa(encodeURIComponent(JSON.stringify(data))),isNewTab: true} f.routeLink= `/verified-organisations`, f.routeData = queryParams }) diff --git a/src/app/pages/manage-buyer-and-both-requests/confirm-accept/confirm-accept.component.ts b/src/app/pages/manage-buyer-and-both-requests/confirm-accept/confirm-accept.component.ts index 63f9c7773..28f078be3 100644 --- a/src/app/pages/manage-buyer-and-both-requests/confirm-accept/confirm-accept.component.ts +++ b/src/app/pages/manage-buyer-and-both-requests/confirm-accept/confirm-accept.component.ts @@ -22,7 +22,7 @@ export class ConfirmAcceptComponent implements OnInit { ngOnInit(): void { this.route.queryParams.subscribe((para: any) => { - this.routeDetails = JSON.parse(atob(para.data)); + this.routeDetails = JSON.parse(decodeURIComponent(atob(para.data))); }); this.dataLayerService.pushPageViewEvent(); } @@ -42,7 +42,7 @@ export class ConfirmAcceptComponent implements OnInit { organisationName: this.routeDetails.organisationName }; this.router.navigateByUrl( - 'buyer-and-both-success?data=' + btoa(JSON.stringify(data)) + 'buyer-and-both-success?data=' + btoa(encodeURIComponent(JSON.stringify(data))) ); this.pushDataLayerEvent(buttonText); } diff --git a/src/app/pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component.ts b/src/app/pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component.ts index f9d924a5f..3d3437687 100644 --- a/src/app/pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component.ts +++ b/src/app/pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component.ts @@ -26,7 +26,7 @@ export class ConfirmDeclineComponent implements OnInit { ngOnInit(): void { this.route.queryParams.subscribe((para: any) => { - this.routeDetails = JSON.parse(atob(para.data)); + this.routeDetails = JSON.parse(decodeURIComponent(atob(para.data))); }); this.dataLayerService.pushPageViewEvent(); } @@ -46,7 +46,7 @@ export class ConfirmDeclineComponent implements OnInit { organisationName: this.routeDetails.organisationName }; this.router.navigateByUrl( - 'decline-success?data=' + btoa(JSON.stringify(data)) + 'decline-success?data=' + btoa(encodeURIComponent(JSON.stringify(data))) ); this.pushDataLayerEvent(buttonText); } diff --git a/src/app/pages/manage-buyer-and-both-requests/remove-right-to-buy/remove-right-to-buy.component.ts b/src/app/pages/manage-buyer-and-both-requests/remove-right-to-buy/remove-right-to-buy.component.ts index ec76b9960..273119a7a 100644 --- a/src/app/pages/manage-buyer-and-both-requests/remove-right-to-buy/remove-right-to-buy.component.ts +++ b/src/app/pages/manage-buyer-and-both-requests/remove-right-to-buy/remove-right-to-buy.component.ts @@ -17,7 +17,7 @@ export class RemoveRightToBuyComponent implements OnInit { ngOnInit(): void { this.route.queryParams.subscribe(async (para: any) => { - this.routeDetails = JSON.parse(atob(para.data)); + this.routeDetails = JSON.parse(decodeURIComponent(atob(para.data))); }) this.dataLayerService.pushPageViewEvent(); } @@ -35,7 +35,7 @@ export class RemoveRightToBuyComponent implements OnInit { this.wrapperBuyerAndBothService.manualValidation(this.routeDetails.id, ManualValidationStatus.remove).subscribe({ next: (response: any) => { this.router.navigateByUrl( - 'remove-right-to-buy-success?data=' + btoa(JSON.stringify(data)) + 'remove-right-to-buy-success?data=' + btoa(encodeURIComponent(JSON.stringify(data))) ); }, error: (error: any) => { diff --git a/src/app/pages/manage-buyer-and-both-requests/success-right-to-buy/success-right-to-buy.component.ts b/src/app/pages/manage-buyer-and-both-requests/success-right-to-buy/success-right-to-buy.component.ts index fc1126fe0..203cceba5 100644 --- a/src/app/pages/manage-buyer-and-both-requests/success-right-to-buy/success-right-to-buy.component.ts +++ b/src/app/pages/manage-buyer-and-both-requests/success-right-to-buy/success-right-to-buy.component.ts @@ -15,7 +15,7 @@ export class SuccessRightToBuyComponent implements OnInit { public routeDetails:any = {} ngOnInit(): void { this.route.queryParams.subscribe(async (para: any) => { - this.routeDetails = JSON.parse(atob(para.data)); + this.routeDetails = JSON.parse(decodeURIComponent(atob(para.data))); }) this.dataLayerService.pushPageViewEvent(); } diff --git a/src/app/pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component.ts b/src/app/pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component.ts index aa3a07457..6a5db2ff3 100644 --- a/src/app/pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component.ts +++ b/src/app/pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component.ts @@ -96,7 +96,7 @@ export class ViewPendingVerificationComponent implements OnInit { this.loadingIndicatorService.isCustomLoading.next(true); this.route.queryParams.subscribe(async (para: any) => { - this.routeDetails = JSON.parse(atob(para.data)); + this.routeDetails = JSON.parse(decodeURIComponent(atob(para.data))); this.lastRoute = this.routeDetails.lastRoute setTimeout(() => { this.getPendingVerificationOrg() @@ -256,7 +256,7 @@ export class ViewPendingVerificationComponent implements OnInit { organisationName: this.routeDetails.organisationName, }; this.router.navigateByUrl( - 'confirm-accept?data=' + btoa(JSON.stringify(data)) + 'confirm-accept?data=' + btoa(encodeURIComponent(JSON.stringify(data))) ); this.pushDataLayerEvent(buttonText); } @@ -266,7 +266,7 @@ export class ViewPendingVerificationComponent implements OnInit { organisationName: this.routeDetails.organisationName, }; this.router.navigateByUrl( - 'confirm-decline?data=' + btoa(JSON.stringify(data)) + 'confirm-decline?data=' + btoa(encodeURIComponent(JSON.stringify(data))) ); this.pushDataLayerEvent(buttonText); } diff --git a/src/app/pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component.ts b/src/app/pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component.ts index 2628bfd91..c37e1dbcc 100644 --- a/src/app/pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component.ts +++ b/src/app/pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component.ts @@ -99,7 +99,7 @@ export class ViewVerifiedOrgComponent implements OnInit { this.loadingIndicatorService.isCustomLoading.next(true); this.route.queryParams.subscribe(async (para: any) => { - this.routeDetails = JSON.parse(atob(para.data)); + this.routeDetails = JSON.parse(decodeURIComponent(atob(para.data))); setTimeout(() => { this.getPendingVerificationOrg() }, 500); @@ -265,7 +265,7 @@ export class ViewVerifiedOrgComponent implements OnInit { orgName: this.routeDetails.event.organisationName }; this.router.navigateByUrl( - 'remove-right-to-buy?data=' + btoa(JSON.stringify(data)) + 'remove-right-to-buy?data=' + btoa(encodeURIComponent(JSON.stringify(data))) ); this.pushDataLayerEvent(buttonText); } From 7e5aea68484b97e14683d778e3578ec218417f7d Mon Sep 17 00:00:00 2001 From: madhumathivenkatesan-bc <131144549+madhumathivenkatesan-bc@users.noreply.github.com> Date: Fri, 1 Mar 2024 20:52:44 +0530 Subject: [PATCH 06/10] Bug 7274: Delegation issues fixed (#2040) --- .../delegated-access-user.component.ts | 26 +++++++++---------- .../delegated-remove-confirm.component.ts | 12 ++++----- .../delegated-success.component.ts | 8 +++--- .../delegated-user-confirm.component.ts | 16 ++++++------ .../delegated-user-list.component.ts | 18 ++++++------- .../delegated-user-status.component.ts | 8 +++--- .../find-delegated-user.component.ts | 4 +-- 7 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/app/pages/manage-delegated/delegated-access-user/delegated-access-user.component.ts b/src/app/pages/manage-delegated/delegated-access-user/delegated-access-user.component.ts index fc0716e56..c000a5ec4 100644 --- a/src/app/pages/manage-delegated/delegated-access-user/delegated-access-user.component.ts +++ b/src/app/pages/manage-delegated/delegated-access-user/delegated-access-user.component.ts @@ -97,8 +97,8 @@ export class DelegatedAccessUserComponent implements OnInit { this.loadingIndicatorService.isLoading.next(true); this.loadingIndicatorService.isCustomLoading.next(true); - this.userDetails = JSON.parse(atob(para.data)); - this.userDetails.userName = decodeURIComponent(unescape(this.userDetails.userName)); + this.userDetails = JSON.parse(decodeURIComponent(atob(para.data))); + // this.userDetails.userName = decodeURIComponent(unescape(this.userDetails.userName)); this.userId = this.userDetails.id this.pageAccessMode = this.userDetails.pageaccessmode if (this.userSelectedFormData) { @@ -333,9 +333,9 @@ export class DelegatedAccessUserComponent implements OnInit { public RemoveAccess(buttonText:string): void { this.userDetails.pageaccessmode = 'remove' sessionStorage.removeItem('deleagted_user_details'); - this.userDetails.userName = escape(encodeURIComponent(this.userDetails.userName)); + //this.userDetails.userName = escape(encodeURIComponent(this.userDetails.userName)); this.route.navigateByUrl( - 'delegated-remove-confirm?data=' + btoa(JSON.stringify(this.userDetails)) + 'delegated-remove-confirm?data=' + btoa(encodeURIComponent(JSON.stringify(this.userDetails))) ); this.pushDataLayerEvent(buttonText); } @@ -346,16 +346,16 @@ export class DelegatedAccessUserComponent implements OnInit { public Resentactivation(): void { this.userDetails.pageaccessmode = 'resent' sessionStorage.removeItem('deleagted_user_details'); - this.userDetails.userName = escape(encodeURIComponent(this.userDetails.userName)); + //this.userDetails.userName = escape(encodeURIComponent(this.userDetails.userName)); this.route.navigateByUrl( - 'delegated-remove-confirm?data=' + btoa(JSON.stringify(this.userDetails)) + 'delegated-remove-confirm?data=' + btoa(encodeURIComponent(JSON.stringify(this.userDetails))) ); } getQueryData(): string { this.userDetails.pageaccessmode = 'resent' sessionStorage.removeItem('deleagted_user_details'); - return btoa(JSON.stringify(this.userDetails)); + return btoa(encodeURIComponent(JSON.stringify(this.userDetails))); } /** @@ -403,13 +403,13 @@ export class DelegatedAccessUserComponent implements OnInit { userDetails: this.userDetails, }; this.userDetails.pageaccessmode = this.pageAccessMode; - data.userName = escape(encodeURIComponent(data.userName)); - data.userDetails.userName = escape(encodeURIComponent(data.userDetails.userName)); + // data.userName = escape(encodeURIComponent(data.userName)); + // data.userDetails.userName = escape(encodeURIComponent(data.userDetails.userName)); let stringifyData = JSON.stringify(data); this.dataLayerService.pushFormSubmitEvent(this.formId); sessionStorage.setItem('deleagted_user_details', JSON.stringify(stringifyData)); this.route.navigateByUrl( - 'delegate-user-confirm?data=' + btoa(JSON.stringify(data)) + 'delegate-user-confirm?data=' + btoa(encodeURIComponent(JSON.stringify(data))) ); } else { this.scrollHelper.scrollToFirst('error-summary'); @@ -441,13 +441,13 @@ export class DelegatedAccessUserComponent implements OnInit { userDetails: this.userDetails, }; this.userDetails.pageaccessmode = this.pageAccessMode; - data.userDetails.userName = escape(encodeURIComponent(data.userDetails.userName)); - data.userName = escape(encodeURIComponent(data.userName)); + // data.userDetails.userName = escape(encodeURIComponent(data.userDetails.userName)); + // data.userName = escape(encodeURIComponent(data.userName)); let stringifyData = JSON.stringify(data); this.dataLayerService.pushFormSubmitEvent(this.formId); sessionStorage.setItem('deleagted_user_details', JSON.stringify(stringifyData)); this.route.navigateByUrl( - 'delegate-user-confirm?data=' + btoa(JSON.stringify(data)) + 'delegate-user-confirm?data=' + btoa(encodeURIComponent(JSON.stringify(data))) ); } else { diff --git a/src/app/pages/manage-delegated/delegated-remove-confirm/delegated-remove-confirm.component.ts b/src/app/pages/manage-delegated/delegated-remove-confirm/delegated-remove-confirm.component.ts index 3c95fad78..70687fb50 100644 --- a/src/app/pages/manage-delegated/delegated-remove-confirm/delegated-remove-confirm.component.ts +++ b/src/app/pages/manage-delegated/delegated-remove-confirm/delegated-remove-confirm.component.ts @@ -18,8 +18,8 @@ export class DelegatedRemoveConfirmComponent implements OnInit { ngOnInit(): void { this.route.queryParams.subscribe((para: any) => { - this.RouteData = JSON.parse(atob(para.data)); - this.RouteData.userName = decodeURIComponent(unescape(this.RouteData.userName)); + this.RouteData = JSON.parse(decodeURIComponent(atob(para.data))); + //this.RouteData.userName = decodeURIComponent(unescape(this.RouteData.userName)); }); this.dataLayerService.pushPageViewEvent(); this.route.queryParams.subscribe(params => { @@ -38,8 +38,8 @@ export class DelegatedRemoveConfirmComponent implements OnInit { } this.DelegatedService.deleteDelegatedUser(this.RouteData.userName,this.organisationId).subscribe({ next: (responce: any) => { - data.userName = escape(encodeURIComponent(data.userName)); - this.router.navigateByUrl('delegated-success?data=' +btoa(JSON.stringify(data))) + //data.userName = escape(encodeURIComponent(data.userName)); + this.router.navigateByUrl('delegated-success?data=' +btoa(encodeURIComponent(JSON.stringify(data)))) }, error: (error: any) => { this.router.navigateByUrl('delegated-error') @@ -56,8 +56,8 @@ export class DelegatedRemoveConfirmComponent implements OnInit { } this.DelegatedService.resentActivationLink(this.RouteData.userName,this.organisationId).subscribe({ next: (responce: any) => { - data.userName = escape(encodeURIComponent(data.userName)); - this.router.navigateByUrl('delegated-success?data=' +btoa(JSON.stringify(data))); + //data.userName = escape(encodeURIComponent(data.userName)); + this.router.navigateByUrl('delegated-success?data=' +btoa(encodeURIComponent(JSON.stringify(data)))); }, error: (error: any) => { this.router.navigateByUrl('delegated-error') diff --git a/src/app/pages/manage-delegated/delegated-success/delegated-success.component.ts b/src/app/pages/manage-delegated/delegated-success/delegated-success.component.ts index 4b4e80bb2..a85fceea7 100644 --- a/src/app/pages/manage-delegated/delegated-success/delegated-success.component.ts +++ b/src/app/pages/manage-delegated/delegated-success/delegated-success.component.ts @@ -23,10 +23,10 @@ export class DelegatedSuccessComponent implements OnInit { ngOnInit(): void { this.dataLayerService.pushPageViewEvent(); this.ActivatedRoute.queryParams.subscribe((para: any) => { - this.userInfo = JSON.parse(atob(para.data)); - this.userInfo.userName = decodeURIComponent( - unescape(this.userInfo.userName) - ); + this.userInfo = JSON.parse(decodeURIComponent(atob(para.data))); + // this.userInfo.userName = decodeURIComponent( + // unescape(this.userInfo.userName) + // ); switch (this.userInfo.status) { case 'create': { this.titleService.setTitle(`Delegated user successfully added - CCS`); diff --git a/src/app/pages/manage-delegated/delegated-user-confirm/delegated-user-confirm.component.ts b/src/app/pages/manage-delegated/delegated-user-confirm/delegated-user-confirm.component.ts index 16b2161f2..78017db7e 100644 --- a/src/app/pages/manage-delegated/delegated-user-confirm/delegated-user-confirm.component.ts +++ b/src/app/pages/manage-delegated/delegated-user-confirm/delegated-user-confirm.component.ts @@ -40,10 +40,10 @@ export class DelegatedUserConfirmComponent implements OnInit { ngOnInit(): void { this.dataLayerService.pushPageViewEvent(); this.ActivatedRoute.queryParams.subscribe((para: any) => { - this.userInfo = JSON.parse(atob(para.data)).userDetails; - this.userInfo.userName = decodeURIComponent(unescape(this.userInfo.userName)); - this.UserSelectedinfo = JSON.parse(atob(para.data)); - this.UserSelectedinfo.userName = decodeURIComponent(unescape(this.UserSelectedinfo.userName)); + this.userInfo = JSON.parse(decodeURIComponent(atob(para.data))).userDetails; + //this.userInfo.userName = decodeURIComponent(unescape(this.userInfo.userName)); + this.UserSelectedinfo = JSON.parse(decodeURIComponent(atob(para.data))); + //this.UserSelectedinfo.userName = decodeURIComponent(unescape(this.UserSelectedinfo.userName)); this.pageAccessMode = this.UserSelectedinfo.userDetails.pageaccessmode }); if (this.pageAccessMode === "edit") { @@ -116,8 +116,8 @@ export class DelegatedUserConfirmComponent implements OnInit { status: 'create', userName: this.UserSelectedinfo.userName } - data.userName = escape(encodeURIComponent(data.userName)); - this.route.navigateByUrl('delegated-success?data=' + btoa(JSON.stringify(data))) + //data.userName = escape(encodeURIComponent(data.userName)); + this.route.navigateByUrl('delegated-success?data=' + btoa(encodeURIComponent(JSON.stringify(data)))) }, error: (error: any) => { this.route.navigateByUrl('delegated-error') @@ -152,8 +152,8 @@ export class DelegatedUserConfirmComponent implements OnInit { status: 'update', userName: this.UserSelectedinfo.userName } - data.userName = escape(encodeURIComponent(data.userName)); - this.route.navigateByUrl('delegated-success?data=' + btoa(JSON.stringify(data))) + //data.userName = escape(encodeURIComponent(data.userName)); + this.route.navigateByUrl('delegated-success?data=' + btoa(encodeURIComponent(JSON.stringify(data)))) }, error: (error: any) => { this.route.navigateByUrl('delegated-error') diff --git a/src/app/pages/manage-delegated/delegated-user-list/delegated-user-list.component.ts b/src/app/pages/manage-delegated/delegated-user-list/delegated-user-list.component.ts index fdf13b994..12eb91d64 100644 --- a/src/app/pages/manage-delegated/delegated-user-list/delegated-user-list.component.ts +++ b/src/app/pages/manage-delegated/delegated-user-list/delegated-user-list.component.ts @@ -96,12 +96,12 @@ export class DelegatedUserListComponent implements OnInit ,OnDestroy { public onLinkClick(data: any): void { if (data.event.target.innerText === "Remove") { data.pageaccessmode = 'remove' - data.userName = escape(encodeURIComponent(data.userName)); - this.router.navigateByUrl('delegated-remove-confirm?data=' + btoa(JSON.stringify(data))); + //data.userName = escape(encodeURIComponent(data.userName)); + this.router.navigateByUrl('delegated-remove-confirm?data=' + btoa(encodeURIComponent(JSON.stringify(data)))); } else { data.pageaccessmode = 'edit' - data.userName = escape(encodeURIComponent(data.userName)); - this.router.navigateByUrl('delegate-access-user?data=' + btoa(JSON.stringify(data))); + //data.userName = escape(encodeURIComponent(data.userName)); + this.router.navigateByUrl('delegate-access-user?data=' + btoa(encodeURIComponent(JSON.stringify(data)))); } } @@ -113,8 +113,8 @@ export class DelegatedUserListComponent implements OnInit ,OnDestroy { status: '003', event: event } - data.event.userName = escape(encodeURIComponent(data.event.userName)); - this.router.navigateByUrl('delegated-user-status?data=' + btoa(JSON.stringify(data))) + //data.event.userName = escape(encodeURIComponent(data.event.userName)); + this.router.navigateByUrl('delegated-user-status?data=' + btoa(encodeURIComponent(JSON.stringify(data)))) } setPagecurrentUsers(pageNumber: any) { @@ -141,7 +141,7 @@ export class DelegatedUserListComponent implements OnInit ,OnDestroy { console.log(this.currentUserstableConfig); Array.from(this.currentUserstableConfig.userList.userList).forEach((f: any) => { f.pageaccessmode = 'edit'; - let queryParams = { data: btoa(JSON.stringify(f)),isNewTab:true }; + let queryParams = { data: btoa(encodeURIComponent(JSON.stringify(f))),isNewTab:true }; f.routeLink = `/delegate-access-user`; f.routeData = queryParams; @@ -165,7 +165,7 @@ export class DelegatedUserListComponent implements OnInit ,OnDestroy { "pageaccessmode":"remove" } - let queryDeclineParams = { data: btoa(JSON.stringify(datas)),isNewTab: true }; + let queryDeclineParams = { data: btoa(encodeURIComponent(JSON.stringify(datas))),isNewTab: true }; console.log("datas",datas); f.pageaccessmode = 'remove'; f.declineRouteLink = `/delegated-remove-confirm`; @@ -200,7 +200,7 @@ export class DelegatedUserListComponent implements OnInit ,OnDestroy { event: f } //data.event.userName = escape(encodeURIComponent(data.event.userName)); - let queryParams = {data: btoa(JSON.stringify(data)),isNewTab: true} + let queryParams = {data: btoa(encodeURIComponent(JSON.stringify(data))),isNewTab: true} f.routeLink= `/delegated-user-status`, f.routeData = queryParams }) 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 bafa7f270..cdfbec09b 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 @@ -68,12 +68,12 @@ export class DelegatedUserStatusComponent implements OnInit { ngOnInit(): void { this.dataLayerService.pushPageViewEvent(); this.route.queryParams.subscribe((para: any) => { - let RouteData: any = JSON.parse(atob(para.data)); + let RouteData: any = JSON.parse(decodeURIComponent(atob(para.data))); if (RouteData.event) { console.log('RouteData.event', RouteData.event); - RouteData.event.userName = decodeURIComponent( - unescape(RouteData.event.userName) - ); + // RouteData.event.userName = decodeURIComponent( + // unescape(RouteData.event.userName) + // ); } this.route.queryParams.subscribe(params => { if (params['isNewTab'] === 'true') { diff --git a/src/app/pages/manage-delegated/find-delegated-user/find-delegated-user.component.ts b/src/app/pages/manage-delegated/find-delegated-user/find-delegated-user.component.ts index ca5ad7262..843dffdb6 100644 --- a/src/app/pages/manage-delegated/find-delegated-user/find-delegated-user.component.ts +++ b/src/app/pages/manage-delegated/find-delegated-user/find-delegated-user.component.ts @@ -95,8 +95,8 @@ export class FindDelegatedUserComponent implements OnInit { } else { userResponse.pageaccessmode = "add"; - userResponse.userName = escape(encodeURIComponent(userResponse.userName)); - this.route.navigateByUrl('delegate-access-user?data=' + btoa(JSON.stringify(userResponse))) + // userResponse.userName = escape(encodeURIComponent(userResponse.userName)); + this.route.navigateByUrl('delegate-access-user?data=' + btoa(encodeURIComponent(JSON.stringify(userResponse)))) } }, error: (error: any) => { From 13b58384e6a2664f2da863d3f8ccab071a023895 Mon Sep 17 00:00:00 2001 From: madhumathivenkatesan-bc <131144549+madhumathivenkatesan-bc@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:20:20 +0530 Subject: [PATCH 07/10] Bug 7286: PPG-601 Registry code displayed on the UI instead of Registry Name - Remove Additional Registry fix done. (#2045) --- ...isation-profile-registry-delete.component.html | 2 +- ...anisation-profile-registry-delete.component.ts | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/app/pages/manage-organisation/manage-organisation-profile-registry-delete/manage-organisation-profile-registry-delete.component.html b/src/app/pages/manage-organisation/manage-organisation-profile-registry-delete/manage-organisation-profile-registry-delete.component.html index 1e37f8316..10f942ab2 100644 --- a/src/app/pages/manage-organisation/manage-organisation-profile-registry-delete/manage-organisation-profile-registry-delete.component.html +++ b/src/app/pages/manage-organisation/manage-organisation-profile-registry-delete/manage-organisation-profile-registry-delete.component.html @@ -15,7 +15,7 @@

Confirm you want to remove the below from your registries?

- {{ i?.identifier?.scheme }} + {{schemeDetail.schemeName}}
{{ i?.identifier?.id }} - {{ i?.identifier?.legalName }}

This cannot be undone

diff --git a/src/app/pages/manage-organisation/manage-organisation-profile-registry-delete/manage-organisation-profile-registry-delete.component.ts b/src/app/pages/manage-organisation/manage-organisation-profile-registry-delete/manage-organisation-profile-registry-delete.component.ts index 75a0de6c6..0ddad1b83 100644 --- a/src/app/pages/manage-organisation/manage-organisation-profile-registry-delete/manage-organisation-profile-registry-delete.component.ts +++ b/src/app/pages/manage-organisation/manage-organisation-profile-registry-delete/manage-organisation-profile-registry-delete.component.ts @@ -34,6 +34,8 @@ export class ManageOrganisationRegistryDeleteComponent extends BaseComponent imp public item$!: Observable; public organisationId: string; public routeParams!: any; + public schemeData:any[]=[]; + public schemeDetail:any; constructor(private ciiService: ciiService, private wrapperService: WrapperUserService, private router: Router,private sessionService:SessionService, private route: ActivatedRoute, protected uiStore: Store, private readonly tokenService: TokenService, @@ -43,10 +45,19 @@ export class ManageOrganisationRegistryDeleteComponent extends BaseComponent imp } ngOnInit() { - this.route.params.subscribe(params => { + this.route.params.subscribe(async(params) => { this.routeParams = params; if (params.id && params.scheme) { - this.item$ = this.ciiService.getOrganisationIdentifierDetails(this.tokenService.getCiiOrgId(), params.scheme, params.id).pipe(share()); + try { + this.item$ = this.ciiService.getOrganisationIdentifierDetails(this.tokenService.getCiiOrgId(), params.scheme, params.id).pipe(share()); + const result= await this.item$.toPromise(); + if (result) { + this.schemeData = await this.ciiService.getSchemes().toPromise(); + this.schemeDetail = this.schemeData.find(x => x.scheme === params.scheme); + } + } catch (error) { + throw error; + } } }); this.route.queryParams.subscribe(params => { From 35dbb4062144f3c94a8803f94beafd733686315e Mon Sep 17 00:00:00 2001 From: madhumathivenkatesan-bc <131144549+madhumathivenkatesan-bc@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:20:49 +0530 Subject: [PATCH 08/10] Bug 7285: PPG-962 Incorrect UI field validation fix done. (#2044) --- ...age-organisation-registration-step-3.component.html | 2 +- ...anage-organisation-registration-step-3.component.ts | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app/pages/manage-organisation/manage-organisation-registration-step-3/manage-organisation-registration-step-3.component.html b/src/app/pages/manage-organisation/manage-organisation-registration-step-3/manage-organisation-registration-step-3.component.html index ab54d4adf..421914581 100644 --- a/src/app/pages/manage-organisation/manage-organisation-registration-step-3/manage-organisation-registration-step-3.component.html +++ b/src/app/pages/manage-organisation/manage-organisation-registration-step-3/manage-organisation-registration-step-3.component.html @@ -120,7 +120,7 @@

There is a prob
-