Merge branch 'develop' into feature/PIDP-965-pas-updates

bcgov · Jun 28, 2024 · 97ffad5 · 97ffad5
2 parents 37ee9ac + 5f7861c
commit 97ffad5
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 77 deletions.
diff --git a/charts/webapi/values.yaml b/charts/webapi/values.yaml
@@ -79,10 +79,10 @@ ingress:
 resources:
   limits:
     cpu: 100m
-    memory: 128Mi
+    memory: 200Mi
   requests:
     cpu: 15m
-    memory: 50Mi
+    memory: 150Mi
 
 autoscaling:
   enabled: false

diff --git a/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.html b/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.html
@@ -2,8 +2,8 @@
   <nav class="breadcrumb">
     <ul>
       <li><a (click)="onBack()">Home</a></li>
-      <li> <fa-icon [icon]="faAngleRight" class="fa-duotone"></fa-icon> </li>
-      <li> <a class="active">Active Page</a></li>
+      <li><fa-icon class="fa-duotone" [icon]="faAngleRight"></fa-icon></li>
+      <li><a class="active">Active Page</a></li>
     </ul>
   </nav>
   <h1>Frequently asked questions</h1>
@@ -95,7 +95,7 @@ <h1>Frequently asked questions</h1>
           number of provincial health applications (backed by BC Services Card)
           and is aligned to policy.<br />
           The BCProvider credential is created during the enrolment process<br />
-          <a href="https://healthprovideridentityportal.gov.bc.ca/auth/login"
+          <a [href]="applicationUrl"
             >https://healthprovideridentityportal.gov.bc.ca/auth/login</a
           >
         </p>
@@ -141,11 +141,15 @@ <h1>Frequently asked questions</h1>
           For more information on the BC Services Card and Provider Location
           Registry, please refer to: <br />BCSC.
           <a
+            uiAnchor
+            scheme="url"
             href="https://www2.gov.bc.ca/gov/content/governments/government-id/bc-services-card"
             >https://www2.gov.bc.ca/gov/content/governments/government-id/bc-services-card</a
           ><br />
           PLR.
           <a
+            uiAnchor
+            scheme="url"
             href="https://www2.gov.bc.ca/gov/content/health/practitioner-professional-resources/system-access/provider-location-registry-plr"
             >https://www2.gov.bc.ca/gov/content/health/practitioner-professional-resources/system-access/provider-location-registry-plr</a
           >
@@ -179,13 +183,15 @@ <h1>Frequently asked questions</h1>
           <li>
             Microsoft.
             <a
+              uiAnchor
+              scheme="url"
               href="https://www.microsoft.com/en-ca/security/mobile-authenticator-app"
               >https://www.microsoft.com/en-ca/security/mobile-authenticator-app</a
             >
           </li>
           <li>
             OneHealthID Service. Enrolment process tool FAQ at<br />
-            <a href="https://healthprovideridentityportal.gov.bc.ca/auth/login"
+            <a [href]="applicationUrl"
               >https://healthprovideridentityportal.gov.bc.ca/auth/login</a
             >
           </li>
@@ -205,7 +211,7 @@ <h1>Frequently asked questions</h1>
         </mat-expansion-panel-header>
         <p>
           View instructions to setup Multi-factor authentication
-          <a (click)="navigateToMfaPage()">here</a>.
+          <a class="mfa-link" (click)="navigateToMfaPage()">here</a>.
         </p>
       </mat-expansion-panel>
     </div>
@@ -346,9 +352,12 @@ <h2>Still have questions?</h2>
   </section>
 
   <div class="back-to-top-container">
-    <button class="back-to-top" (click)="scrollToTop()" *ngIf="showBackToTopButton">
+    <button
+      *ngIf="showBackToTopButton"
+      class="back-to-top"
+      (click)="scrollToTop()">
       <fa-icon [icon]="faArrowUp"></fa-icon>
     </button>
-    <div class="back-to-top-text" *ngIf="showBackToTopButton">Back to top</div>
+    <div *ngIf="showBackToTopButton" class="back-to-top-text">Back to top</div>
   </div>
 </div>
diff --git a/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.scss b/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.scss
@@ -36,8 +36,12 @@
       font-weight: 700;
     }
 
+    .mfa-link {
+      cursor: pointer;
+    }
+
     .faq-item {
-      border-bottom: 1px solid #CCC;
+      border-bottom: 1px solid #ccc;
       margin-bottom: 10px;
 
       a {
@@ -58,21 +62,22 @@
           border-width: 0 3px 3px 0 !important;
 
           &::after {
-            color: #CCCCCC;
+            color: #cccccc;
           }
         }
 
         .mat-expansion-panel-body {
           padding: 0;
           line-height: 1.5;
         }
-
       }
     }
 
     .footer-cards {
       display: grid;
-      grid-template-columns: calc(49% - 15px) calc(17% - 15px) calc(17% - 15px) calc(17% - 15px);
+      grid-template-columns: calc(49% - 15px) calc(17% - 15px) calc(17% - 15px) calc(
+          17% - 15px
+        );
       gap: 20px;
       margin-top: 2rem;
 
@@ -95,9 +100,8 @@
           flex-direction: column;
           align-items: flex-start;
           gap: 5px;
-          border: 1px solid #CCC;
-          background: #F2F2F2;
-
+          border: 1px solid #ccc;
+          background: #f2f2f2;
 
           h2 {
             color: #036;
@@ -140,15 +144,15 @@
           display: flex;
           flex-direction: column;
           width: 100%;
-          justify-content: start;
+          justify-content: flex-start;
           align-items: center;
           text-align: center;
           height: 11rem;
           padding: 2rem 1rem;
           border-radius: 4px;
           transition: background-color 0.3s ease;
-          border: 1px solid #CCC;
-          background: #FFF;
+          border: 1px solid #ccc;
+          background: #fff;
           box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
           color: var(--BC-gov-blue, #036);
           font-size: 0.8rem;
@@ -174,25 +178,24 @@
   }
 
   .back-to-top {
-    background-color: #38598A;
-    color: #FFFFFF;
-    width: 40PX;
-    height: 40PX;
+    background-color: #38598a;
+    color: #ffffff;
+    width: 40px;
+    height: 40px;
     border-radius: 50%;
     text-align: center;
     cursor: pointer;
   }
 
   .back-to-top-text {
-    color: #38598A;
+    color: #38598a;
     font-size: 13px;
-    word-wrap: break-word
+    word-wrap: break-word;
   }
 
   .back-to-top:hover {
     background-color: #003366;
   }
-
 }
 
 .viewport-medium {
@@ -214,7 +217,6 @@
       margin-bottom: 20px;
 
       ::ng-deep .mat-expansion-panel {
-
         .mat-expansion-panel-header {
           font-size: 0.75rem;
           height: auto;
@@ -229,11 +231,9 @@
           border-width: 0 2px 2px 0 !important;
           padding: 3px !important;
           margin-bottom: 5px;
-
         }
 
         .mat-expansion-panel-body {
-
           p:first-of-type {
             padding-top: 5px;
           }
@@ -257,9 +257,8 @@
           flex-direction: column;
           align-items: flex-start;
           gap: 5px;
-          border: 1px solid #CCC;
-          background: #F2F2F2;
-
+          border: 1px solid #ccc;
+          background: #f2f2f2;
 
           h2 {
             font-size: 30px;
@@ -296,8 +295,8 @@
   }
 
   .back-to-top {
-    width: 30PX;
-    height: 30PX;
+    width: 30px;
+    height: 30px;
   }
 
   .back-to-top-text {
@@ -309,12 +308,10 @@
   }
 }
 
-
-
 .viewport-small {
   .back-to-top {
-    width: 30PX;
-    height: 30PX;
+    width: 30px;
+    height: 30px;
   }
 
   .back-to-top-text {

diff --git a/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.ts b/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.ts
@@ -1,9 +1,13 @@
+import { NgIf } from '@angular/common';
 import { Component, HostListener, Inject, OnInit, signal } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
+import { MatExpansionModule } from '@angular/material/expansion';
 import { ActivatedRoute, Router } from '@angular/router';
-import {MatExpansionModule} from '@angular/material/expansion';
-import { InjectViewportCssClassDirective } from '@bcgov/shared/ui';
 
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { faAngleRight, faArrowUp } from '@fortawesome/free-solid-svg-icons';
+
+import { InjectViewportCssClassDirective } from '@bcgov/shared/ui';
 import {
   AnchorDirective,
   PageComponent,
@@ -16,11 +20,9 @@ import {
 
 import { APP_CONFIG, AppConfig } from '@app/app.config';
 import { UtilsService } from '@app/core/services/utils.service';
-import { faAngleRight, faArrowUp } from '@fortawesome/free-solid-svg-icons';
-import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { FaqRoutes } from '../../faq.routes';
 import { Constants } from '@app/shared/constants';
-import { NgIf } from '@angular/common';
+
+import { FaqRoutes } from '../../faq.routes';
 
 @Component({
   selector: 'app-help',
@@ -48,6 +50,7 @@ export class HelpPage implements OnInit {
   public showBackToTopButton: boolean = false;
   public faArrowUp = faArrowUp;
   public faAngleRight = faAngleRight;
+  public applicationUrl: string;
 
   public constructor(
     @Inject(APP_CONFIG) private config: AppConfig,
@@ -56,17 +59,22 @@ export class HelpPage implements OnInit {
     private utilsService: UtilsService,
   ) {
     this.providerIdentitySupport = this.config.emails.providerIdentitySupport;
+    this.applicationUrl = this.config.applicationUrl;
   }
 
   @HostListener('window:scroll', [])
   public onWindowScroll(): void {
-     const scrollPosition = window.scrollY || document.documentElement.scrollTop || document.body.scrollTop || 0;
-     this.showBackToTopButton = scrollPosition > Constants.scrollThreshold;
-   }
+    const scrollPosition =
+      window.scrollY ||
+      document.documentElement.scrollTop ||
+      document.body.scrollTop ||
+      0;
+    this.showBackToTopButton = scrollPosition > Constants.scrollThreshold;
+  }
 
- public  scrollToTop(): void {
-  window.scrollTo({ top: 0, behavior: 'smooth' });
-}
+  public scrollToTop(): void {
+    window.scrollTo({ top: 0, behavior: 'smooth' });
+  }
 
   public onBack(): void {
     this.navigateToRoot();

diff --git a/workspace/apps/pidp/src/app/features/portal/portal.page.html b/workspace/apps/pidp/src/app/features/portal/portal.page.html
@@ -16,7 +16,8 @@ <h5>Welcome to the <span>OneHealthID</span> Service</h5>
         <div class="card-content">
           <p class="card-header">Linking Accounts</p>
           <p>Link different credentials together in OneHealthID</p>
-          <a (click)="navigateToAccountLinkingPage()">
+          <a
+            (click)="navigateTo(ProfileRoutes.routePath(ProfileRoutes.ACCOUNT_LINKING))">
             <fa-icon [icon]="faArrowRight"></fa-icon> READ MORE
           </a>
         </div>
@@ -30,7 +31,8 @@ <h5>Welcome to the <span>OneHealthID</span> Service</h5>
         <div class="card-content">
           <p class="card-header">Acquire Access</p>
           <p>Acquire healthcare system access for myself</p>
-          <a (click)="navigateToAccessPage()">
+          <a
+            (click)="navigateTo(AccessRoutes.routePath(AccessRoutes.ACCESS_REQUESTS))">
             <fa-icon [icon]="faArrowRight"></fa-icon> READ MORE
           </a>
         </div>
@@ -44,7 +46,8 @@ <h5>Welcome to the <span>OneHealthID</span> Service</h5>
         <div class="card-content">
           <p class="card-header">Grant Access</p>
           <p>Grant healthcare system access for others</p>
-          <a (click)="navigateToEndorsements()">
+          <a
+            (click)="navigateTo(OrganizationInfoRoutes.routePath(OrganizationInfoRoutes.ENDORSEMENTS))">
             <fa-icon [icon]="faArrowRight"></fa-icon> READ MORE
           </a>
         </div>