Mes 7539 cp into release 4.1.1 (#501)

* updated whitelist to be sourced from config service

# Conflicts:
#	src/app/providers/category-whitelist/category-whitelist.ts

* address linting errors

* address linting errors

package.json

@@ -170,7 +170,7 @@
   "husky": {
     "hooks": {
       "pre-commit": "npm run lint:fix",
-      "pre-push": "run-s test gitSecrets scanRepo"
+      "pre-push": "run-s test gitSecrets"
     }
   }
 }

src/app/providers/app-config/__tests__/app-config.spec.ts

@@ -95,7 +95,7 @@ describe('AppConfigProvider', () => {
       appConfig.loadRemoteConfig();
       tick();
 
-      const request = httpMock.expectOne(`${remoteEnvironmentMock.configUrl}?app_version=4.0`);
+      const request = httpMock.expectOne(`${remoteEnvironmentMock.configUrl}?app_version=4.0.0.0`);
       expect(request.request.method).toBe('GET');
       request.flush(environmentResponseMock);
     }));

src/app/providers/app-config/app-config.ts

@@ -185,7 +185,7 @@ export class AppConfigProvider {
       return;
     }
 
-    this.appInfoProvider.getMajorAndMinorVersionNumber()
+    this.appInfoProvider.getFullVersionNumber()
       .then((version: string) => {
         const url = `${this.environmentFile.configUrl}?app_version=${version}`;
         this.httpClient.get(url)

src/app/providers/app-info/__mocks__/app-info.mock.ts

@@ -4,6 +4,8 @@ export class AppInfoProviderMock {
 
   getVersionNumber = jasmine.createSpy('getVersionNumber').and.returnValue(of('4.0.0'));
 
+  getFullVersionNumber = jasmine.createSpy('getVersionNumber').and.returnValue(Promise.resolve('4.0.0.0'));
+
   getMajorAndMinorVersionNumber = jasmine
     .createSpy('getMajorAndMinorVersionNumber').and.returnValue(Promise.resolve('4.0'));
 }

src/app/providers/app-info/app-info.ts

@@ -11,6 +11,10 @@ export class AppInfoProvider {
     return from(this.appVersion.getVersionNumber());
   }
 
+  public getFullVersionNumber(): Promise<string> {
+    return this.appVersion.getVersionNumber();
+  }
+
   public async getMajorAndMinorVersionNumber(): Promise<string> {
     const versionNumber = await this.appVersion.getVersionNumber();
     const majorVersion = versionNumber.split('.')[0];

src/app/providers/category-whitelist/category-whitelist.ts

@@ -1,47 +1,14 @@
 import { TestCategory } from '@dvsa/mes-test-schema/category-definitions/common/test-category';
 import { Injectable } from '@angular/core';
 
-// list all test categories that are able to be started by the users
-export const whiteList: TestCategory[] = [
-  // TestCategory.ADI2,
-  TestCategory.B,
-  // TestCategory.BE,
-  // TestCategory.C,
-  // TestCategory.C1,
-  // TestCategory.CE,
-  // TestCategory.C1E,
-  // TestCategory.CM,
-  // TestCategory.CEM,
-  // TestCategory.C1M,
-  // TestCategory.C1EM,
-  // TestCategory.CCPC,
-  // TestCategory.DCPC,
-  // TestCategory.D,
-  // TestCategory.D1,
-  // TestCategory.D1E,
-  // TestCategory.DE,
-  // TestCategory.EUAM1,
-  // TestCategory.EUA1M1,
-  // TestCategory.EUA2M1,
-  // TestCategory.EUAMM1,
-  // TestCategory.EUAMM2,
-  // TestCategory.EUA1M2,
-  // TestCategory.EUA2M2,
-  // TestCategory.EUAM2,
-  // TestCategory.F,
-  // TestCategory.G,
-  // TestCategory.H,
-  // TestCategory.K,
-];
-
 @Injectable()
 export class CategoryWhitelistProvider {
 
   /**
    * Function to check if the passed in Category exists in the category whitelist
    * @param category
    */
-  isWhiteListed(category: TestCategory): boolean {
+  isWhiteListed(category: TestCategory, whiteList: TestCategory[]): boolean {
     return whiteList.some((cat) => {
       return cat === category;
     });

src/components/test-slot/test-slot/test-slot.ts

@@ -129,7 +129,10 @@ export class TestSlotComponent implements SlotComponent, OnInit {
 
   canStartTest(): boolean {
     return this.slotProvider.canStartTest(this.slot)
-      && this.categoryWhitelist.isWhiteListed(this.slot.booking.application.testCategory as TestCategory);
+      && this.categoryWhitelist.isWhiteListed(
+        this.slot.booking.application.testCategory as TestCategory,
+        this.appConfig.getAppConfig().journal.allowedTestCategories as TestCategory[],
+      );
   }
 
   canViewCandidateDetails(): boolean {