Merge branch 'develop' into feature/prime-2735_ha_care_type_vendor_page

.github/workflows/test-pr.yml

@@ -12,7 +12,7 @@ jobs:
  defaults:
  run:
  working-directory: ./prime-angular-frontend
- 
+
  if: github.ref != 'develop' || (github.ref == 'develop' && github.event.pull_request.merged == true)
 
  runs-on: ubuntu-latest
@@ -59,15 +59,15 @@ jobs:
  - name: Collect Frontend Report
  run: |
  cc-test-reporter format-coverage -t lcov -o coverage/frontend.json coverage/lcov.info
- 
+
  - name: Create frontend coverage file artifact
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
  with:
  name: frontend
  path: ./prime-angular-frontend/coverage/frontend.json
  retention-days: 1
 
- 
+
  collect-backend-coverage:
  defaults:
  run:
@@ -101,7 +101,7 @@ jobs:
  run: |
  cd ../
  dotnet tool install -g dotnet-reportgenerator-globaltool --version 5.3.6
- 
+
  - uses: amancevice/setup-code-climate@v0
  with:
  cc_test_reporter_id: ${{ secrets.CC_TEST_REPORTER_ID }}
@@ -122,12 +122,12 @@ jobs:
  cd ../prime-dotnet-webapi
  cc-test-reporter format-coverage -t lcov -o ../prime-dotnet-webapi-tests/coverage/backend.json ../prime-dotnet-webapi-tests/coverage/lcov.info -p /home/runner/work/moh-prime/moh-prime/prime-dotnet-webapi
  - name: Create backend coverage file artifact
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
  with:
  name: backend
  path: ./prime-dotnet-webapi-tests/coverage/backend.json
  retention-days: 1
- 
+
 
  codeclimate-sum-coverage:
  needs: [ collect-frontend-coverage, collect-backend-coverage ]
@@ -146,25 +146,25 @@ jobs:
  cc_test_reporter_version: latest # optional
 
  - name: Download frontend artifact
- uses: actions/download-artifact@v2
+ uses: actions/download-artifact@v4
  with:
  name: frontend
  # path: frontend/
 
  - name: Download backend artifact
- uses: actions/download-artifact@v2
+ uses: actions/download-artifact@v4
  with:
  name: backend
  # path: backend/
 
  - name: Sum files
- run: | 
+ run: |
  cc-test-reporter sum-coverage -p 2 frontend.json backend.json
  cc-test-reporter upload-coverage -i ./coverage/codeclimate.json
- 
+
  - name: Create summed report
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
  with:
  name: summed
  path: ./coverage/codeclimate.json
- retention-days: 1
+ retention-days: 1

prime-angular-frontend/src/app/modules/enrolment/pages/next-steps/next-steps.component.ts

@@ -199,7 +199,7 @@ export class NextStepsComponent extends BaseEnrolmentProfilePage implements OnIn
 
  let emailPairs = this.careSettingConfigs.map((config) => {
  return {
- emails: config.formArray.value.map(email => email.email),
+ emails: config.formArray.value.map(email => email.email).filter(e => e),
  careSettingCode: config.settingCode,
  healthAuthorityCode: config.settingCode === CareSettingEnum.HEALTH_AUTHORITY ? config.healthAuthorityCode : null,
  }

prime-angular-frontend/src/app/modules/enrolment/pages/pharmanet-enrolment-summary/pharmanet-enrolment-summary.component.ts

@@ -213,7 +213,7 @@ export class PharmanetEnrolmentSummaryComponent extends BaseEnrolmentPage implem
  if (result) {
  let emailPairs = this.careSettingConfigs.map((config) => {
  return {
- emails: config.formArray.value.map(email => email.email),
+ emails: config.formArray.value.map(email => email.email).filter(e => e),
  careSettingCode: config.settingCode,
  healthAuthorityCode: config.healthAuthorityCode,
  }
@@ -227,8 +227,8 @@ export class PharmanetEnrolmentSummaryComponent extends BaseEnrolmentPage implem
  .subscribe(() => {
  let emails = new Array<string>();
  this.careSettingConfigs.forEach((config) => {
- if (config.formArray.value[0].email) {
- emails.push(config.formArray.value.map(email => email.email));
+ if (config.formArray.value.map(email => email.email).filter(e => e)[0]) {
+ emails.push(config.formArray.value.map(email => email.email).filter(e => e));
  }
  });
  this.toastService.openSuccessToast(`Email was successfully sent to ${emails.join(", ")}`);

prime-angular-frontend/src/app/modules/health-auth-site-reg/pages/overview-page/overview-page.component.html

@@ -6,7 +6,7 @@
  <!-- Work around for ngProjectAs not passing class reference to alert when applied to ng-content -->
  <ng-container #alertTitle
  class="alert-title">
- This site requires renewal.
+ This site requires update.
  </ng-container>
  <ng-container #alertContent
  class="alert-content">

prime-angular-frontend/src/app/modules/health-auth-site-reg/pages/site-management-page/site-management-page.component.ts

@@ -93,8 +93,8 @@ export class SiteManagementPageComponent implements OnInit {
  public getWithinRenewalPeriodSiteNotificationProperties(healthAuthoritySite: HealthAuthoritySite) {
  return {
  icon: 'notification_important',
- text: 'This site requires renewal.',
- label: 'Renew Site',
+ text: 'This site requires update.',
+ label: 'Update Site',
  route: () => this.viewSite(this.healthAuthorityId, healthAuthoritySite)
  };
  }

prime-angular-frontend/src/app/modules/site-registration/pages/overview-page/overview-page.component.html

@@ -7,7 +7,7 @@
  <!-- Work around for ngProjectAs not passing class reference to alert when applied to ng-content -->
  <ng-container #alertTitle
  class="alert-title">
- This site requires renewal.
+ This site requires update.
  </ng-container>
  <ng-container #alertContent
  class="alert-content">

prime-angular-frontend/src/app/modules/site-registration/pages/site-management-page/site-management-page.component.html

@@ -3,7 +3,7 @@
  <!-- Work around for ngProjectAs not passing class reference to alert when applied to ng-content -->
  <ng-container #alertTitle
  class="alert-title">
- One or more sites requires renewal.
+ One or more sites requires updating.
  </ng-container>
  <ng-container #alertContent
  class="alert-content">

prime-angular-frontend/src/app/modules/site-registration/pages/site-management-page/site-management-page.component.ts

@@ -150,8 +150,8 @@ export class SiteManagementPageComponent implements OnInit {
  public getRenewalRequiredSiteNotificationProperties(organizationId: number, site: SiteListViewModel) {
  return {
  icon: 'notification_important',
- text: 'This site requires renewal including this year\'s business licence.',
- label: 'Renew Site',
+ text: 'Please update your business licence.',
+ label: 'Update Site',
  route: () => this.viewSite(organizationId, site)
  };
  }