Merge branch 'master' into RDM-654

* master: (30 commits) RDM-3023 Downgrade jasmine-core to 2.8 as >3.0 causing Exceptions in afterAll (karma-runner/karma-jasmine#161). No change commit to trigger Preview fix broken smoke tests RDM-3023 Fix tests. turn off 'browser.ignoreSynchronization = false' RDM-3023 Code cleanup plus up typescript version. timeout hotfix for tests RDM-3023 Fix linting error. RDM-3023 yarn lock changes. RDM-3023 Fix compilation error. RDM-3023 Up the ui toolkit version to latest. RDM-3023 Fix linting error. RDM-3023 Update imports. RDM-3203 Update ui toolkit to latest. RDM-3023 Update ui toolkit version. RDM-3023 Remove migrated order service and update ui toolkit. RDM-3023 Remove unused dependecies. RDM-3023 Doc mgmt service moved to ui toolkit now. RDM-3023 Code cleanup. RDM-3023 Update yarn.lock ... # Conflicts: # src/app/shared/palette/base-field/field-write.component.ts # src/app/shared/search/filters/search-filters.component.spec.ts # src/app/workbasket/filters/workbasket-filters.component.spec.ts # src/app/workbasket/workbasket-input-filter.service.spec.ts # yarn.lock
hmcts · Oct 12, 2018 · 88decea · 88decea
2 parents 0f4c821 + 9264016
commit 88decea
Show file tree

Hide file tree

Showing 336 changed files with 1,575 additions and 15,546 deletions.
diff --git a/package.json b/package.json
@@ -42,20 +42,20 @@
     "prepare": "yarn run snyk-protect"
   },
   "dependencies": {
-    "@angular/animations": "~6.0.6",
+    "@angular/animations": "~6.1.8",
     "@angular/cdk": "^6.3.0",
-    "@angular/common": "~6.0.6",
-    "@angular/compiler": "~6.0.6",
-    "@angular/core": "~6.0.6",
-    "@angular/forms": "~6.0.6",
-    "@angular/http": "~6.0.6",
+    "@angular/common": "~6.1.8",
+    "@angular/compiler": "~6.1.8",
+    "@angular/core": "~6.1.8",
+    "@angular/forms": "~6.1.8",
+    "@angular/http": "~6.1.8",
     "@angular/material": "^6.3.0",
-    "@angular/platform-browser": "~6.0.6",
-    "@angular/platform-browser-dynamic": "~6.0.6",
-    "@angular/platform-server": "~6.0.6",
-    "@angular/router": "~6.0.6",
-    "@angular/upgrade": "~6.0.6",
-    "@hmcts/ccd-case-ui-toolkit": "1.2.5",
+    "@angular/platform-browser": "~6.1.8",
+    "@angular/platform-browser-dynamic": "~6.1.8",
+    "@angular/platform-server": "~6.1.8",
+    "@angular/router": "~6.1.8",
+    "@angular/upgrade": "~6.1.8",
+    "@hmcts/ccd-case-ui-toolkit": "1.2.13",
     "@hmcts/ccpay-web-component": "~1.6.1",
     "@nguniversal/express-engine": "^6.0.0",
     "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
@@ -75,20 +75,22 @@
     "ngx-device-detector": "^1.3.0",
     "ngx-md": "~6.0.0",
     "ngx-pagination": "^3.0.3",
+    "node-sass": "^4.9.3",
     "reflect-metadata": "^0.1.12",
     "rx-polling": "~1.0.0",
     "rxjs": "^6.2.1",
     "rxjs-compat": "^6.0.0-rc.0",
+    "sass-loader": "^7.1.0",
     "snyk": "^1.94.0",
     "url": "^0.11.0",
     "webdriver-manager": "^12.1.0",
     "x-frame-options": "^1.0.0",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.6.8",
+    "@angular-devkit/build-angular": "^0.6.8",
     "@angular/cli": "^6.0.8",
-    "@angular/compiler-cli": "~6.0.6",
+    "@angular/compiler-cli": "~6.1.8",
     "@types/jasmine": "~2.8.0",
     "@types/jasminewd2": "^2.0.3",
     "@types/node": "^8.0.30",
@@ -106,6 +108,7 @@
     "karma-mocha-reporter": "^2.2.5",
     "karma-phantomjs-launcher": "^1.0.4",
     "karma-remap-istanbul": "0.2.1",
+    "karma-typescript": "^3.0.5",
     "lodash": "^4.16.2",
     "mocha": "^5.0.5",
     "ng2-mock-component": "^0.1.1",
@@ -122,7 +125,8 @@
     "ts-loader": "^4.2.0",
     "ts-node": "^3.3.0",
     "tslint": "^5.0.0",
-    "typescript": "2.7.2",
+    "typescript": "2.9.2",
+    "webdriver-manager": "^12.1.0",
     "webpack-cli": "^2.0.14"
   },
   "snyk": true

diff --git a/src/app/app.config.spec.ts b/src/app/app.config.spec.ts
@@ -1,8 +1,8 @@
-import { AppConfig, Config } from './app.config';
+import { AppConfig } from './app.config';
 import { async, inject, TestBed } from '@angular/core/testing';
 import { HttpModule, Response, ResponseOptions, XHRBackend } from '@angular/http';
 import { MockBackend } from '@angular/http/testing';
-import { CaseEventData } from './shared/domain/case-event-data';
+import { Config, CaseEventData } from '@hmcts/ccd-case-ui-toolkit';
 
 describe('AppConfig', () => {
 

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
@@ -3,15 +3,15 @@ import { Http } from '@angular/http';
 import { Observable } from 'rxjs';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/catch';
+import { CaseEventData, AbstractAppConfig, Config } from '@hmcts/ccd-case-ui-toolkit';
 import { environment } from '../environments/environment';
-import { CaseEventData } from './shared/domain/case-event-data';
 
 @Injectable()
-export class AppConfig {
+export class AppConfig extends AbstractAppConfig {
 
-  protected config: Config;
-
-  constructor(private http: Http) {}
+  constructor(private http: Http) {
+    super();
+  }
 
   public load(): Promise<void> {
     console.log('Loading app config...');
@@ -152,30 +152,3 @@ export class AppConfig {
     return this.getCaseDataUrl() + `/caseworkers/:uid/jurisdictions/${jid}/case-types/${ctid}/drafts/${did}`;
   }
 }
-
-export class Config {
-  activity_batch_collection_delay_ms: number;
-  activity_max_request_per_batch: number;
-  activity_next_poll_request_ms: number;
-  activity_retry: number;
-  activity_url: string;
-  api_url: string;
-  case_data_url: string;
-  document_management_url: string;
-  login_url: string;
-  logout_url: string;
-  oauth2_client_id: string;
-  oauth2_token_endpoint_url: string;
-  pagination_page_size: number;
-  postcode_lookup_url: string;
-  print_service_url: string;
-  remote_document_management_url: string;
-  remote_print_service_url: string;
-  smart_survey_url: string;
-  payments_url: string;
-  unsupported_browser_url: string;
-  chrome_min_required_version: number;
-  ie_min_required_version: number;
-  edge_min_required_version: number;
-  firefox_min_required_version: number;
-}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -17,6 +17,7 @@ import { SharedModule } from './shared/shared.module';
 import { isPlatformBrowser } from '@angular/common';
 import { OAuth2RedirectModule } from './oauth2/oauth2-redirect.module';
 import { AppConfigGuard } from './app.config.guard';
+import { AbstractAppConfig } from '@hmcts/ccd-case-ui-toolkit';
 
 @NgModule({
   imports: [
@@ -39,6 +40,10 @@ import { AppConfigGuard } from './app.config.guard';
   providers: [
     AppConfig,
     AppConfigGuard,
+    {
+      provide: AbstractAppConfig,
+      useExisting: AppConfig
+    }
   ],
   bootstrap: [AppComponent]
 })

diff --git a/src/app/app.server.config.ts b/src/app/app.server.config.ts
@@ -1,4 +1,5 @@
-import { AppConfig, Config } from './app.config';
+import { AppConfig } from './app.config';
+import { Config } from '@hmcts/ccd-case-ui-toolkit';
 
 export class AppServerConfig extends AppConfig {
   constructor(config: Config) {

diff --git a/src/app/cases/case.resolver.spec.ts b/src/app/cases/case.resolver.spec.ts
@@ -1,5 +1,5 @@
 import { CaseResolver } from './case.resolver';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { CaseView } from '../core/cases/case-view.model';
 import { AlertService } from '../core/alert/alert.service';
 import { DraftService } from '../core/draft/draft.service';

diff --git a/src/app/cases/case.resolver.ts b/src/app/cases/case.resolver.ts
@@ -1,13 +1,13 @@
 import { CaseView } from '../core/cases/case-view.model';
 import { ActivatedRouteSnapshot, ParamMap, Resolve, Router } from '@angular/router';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { CasesService } from '../core/cases/cases.service';
 import { Response } from '@angular/http';
 import { AlertService } from '../core/alert/alert.service';
 import 'rxjs/add/operator/catch';
 import { DraftService } from '../core/draft/draft.service';
-import { Draft } from '../shared/domain/draft';
+import { Draft } from '@hmcts/ccd-case-ui-toolkit';
 
 @Injectable()
 export class CaseResolver implements Resolve<CaseView> {

diff --git a/src/app/cases/cases.module.ts b/src/app/cases/cases.module.ts
@@ -2,15 +2,15 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import { SharedModule } from '../shared/shared.module';
-import { CaseReferencePipe } from '../shared/utils/case-reference.pipe';
 import { CaseResolver } from './case.resolver';
 import { CaseViewerComponent } from './viewer/case-viewer.component';
-import { PaletteModule } from '../shared/palette/palette.module';
+import { PaletteModule, PaletteUtilsModule, ConditionalShowModule, MarkdownModule,
+  LabelSubstitutionService, RemoveDialogComponent, CaseReferencePipe, LabelSubstitutorModule,
+  FieldsPurger } from '@hmcts/ccd-case-ui-toolkit';
 import { EventLogModule } from '../shared/event-log/event-log.module';
 import { EventTriggerResolver } from './event-trigger/event-trigger.resolver';
 import { CaseEventTriggerComponent } from './event-trigger/case-event-trigger.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { PaletteUtilsModule } from '../shared/palette/utils/utils.module';
 import { CaseCreatorComponent } from './creator/case-creator.component';
 import { CreateCaseFiltersComponent } from './creator/filters/create-case-filters.component';
 import { CasePrinterComponent } from './printer/case-printer.component';
@@ -22,17 +22,11 @@ import { CallbackErrorsComponent } from '../shared/error/callback-errors.compone
 import { CaseUIToolkitModule } from '@hmcts/ccd-case-ui-toolkit';
 import { CaseEditPageComponent } from '../shared/case-editor/case-edit-page.component';
 import { CaseEditSubmitComponent } from '../shared/case-editor/case-edit-submit.component';
-import { ConditionalShowModule } from '../shared/conditional-show/conditional-show.module';
 import { CaseEditFormComponent } from '../shared/case-editor/case-edit-form.component';
-import { MarkdownModule } from '../shared/markdown/markdown.module';
-import { LabelSubstitutionService } from '../shared/case-editor/label-substitution.service';
-import { LabelSubstitutorModule } from '../shared/substitutor/label-substitutor.module';
 import { CaseEditConfirmComponent } from '../shared/case-editor/case-edit-confirm.component';
 import { PrintUrlPipe } from './printer/print-url.pipe';
 import { MatDialogModule } from '@angular/material';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { RemoveDialogComponent } from '../shared/remove-dialog/remove-dialog.component';
-import { FieldsPurger } from '../shared/utils/fields.purger';
 import { PageValidationService } from '../shared/case-editor/page-validation.service';
 
 @NgModule({

diff --git a/src/app/cases/creator/case-creator-submit.component.spec.ts b/src/app/cases/creator/case-creator-submit.component.spec.ts
@@ -1,24 +1,17 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Component, DebugElement, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MockComponent } from 'ng2-mock-component';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { CasesService } from '../../core/cases/cases.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { AlertService } from '../../core/alert/alert.service';
-import { HttpError } from '../../core/http/http-error.model';
-import { FormValueService } from '../../core/form/form-value.service';
-import { CaseReferencePipe } from '../../shared/utils/case-reference.pipe';
-import { FormErrorService } from '../../core/form/form-error.service';
 import { CaseCreatorSubmitComponent } from './case-creator-submit.component';
-import { CaseEventTrigger } from '../../shared/domain/case-view/case-event-trigger.model';
 import { CaseView } from '../../core/cases/case-view.model';
-import { CaseDetails } from '../../shared/domain/case-details';
-import { CaseEventData } from '../../shared/domain/case-event-data';
-import { createCaseEventTrigger } from '../../fixture/shared.fixture'
-import { Draft } from '../../shared/domain/draft';
 import { DraftService } from '../../core/draft/draft.service';
 import createSpyObj = jasmine.createSpyObj;
+import { HttpError, Draft, DRAFT_PREFIX, createCaseEventTrigger, CaseEventData, CaseDetails, CaseEventTrigger,
+  FormErrorService, CaseReferencePipe, FormValueService } from '@hmcts/ccd-case-ui-toolkit';
 import { CaseEditPageComponent } from '../../shared/case-editor/case-edit-page.component';
 
 @Component({
@@ -128,14 +121,6 @@ describe('CaseCreatorSubmitComponent', () => {
     ignore_warning: false
   };
 
-  const DRAFT: Draft = {
-    'id': '1234',
-    'document': CREATED_CASE,
-    'type': 'dummy',
-    'created': 'sometime',
-    'updated': 'another time'
-  };
-
   let mockRoute: any = {
     snapshot: {
       data: {
@@ -160,7 +145,7 @@ describe('CaseCreatorSubmitComponent', () => {
     casesService = createSpyObj<CasesService>('casesService', ['createCase', 'validateCase']);
     casesService.createCase.and.returnValue(Observable.of(CASE_DETAILS));
     draftService = createSpyObj<DraftService>('draftService', ['createOrUpdateDraft']);
-    draftService.createOrUpdateDraft.and.returnValue(Observable.of(DRAFT));
+    draftService.createOrUpdateDraft.and.returnValue(Observable.of(DRAFT_PREFIX));
     casesReferencePipe = createSpyObj<CaseReferencePipe>('caseReference', ['transform']);
 
     alertService = createSpyObj<AlertService>('alertService', ['success', 'warning', 'setPreserveAlerts']);
@@ -229,10 +214,10 @@ describe('CaseCreatorSubmitComponent', () => {
 
   it('should update draft when saveDraft called with sanitised data for second time', () => {
     const DRAFT_ID = '12345';
-    component.eventTrigger.case_id = Draft.DRAFT_PREFIX + DRAFT_ID; // Set behaviour to draft has been saved before
+    component.eventTrigger.case_id = DRAFT_PREFIX + DRAFT_ID; // Set behaviour to draft has been saved before
     component.saveDraft()(SANITISED_EDIT_FORM);
 
-    expect(draftService.createOrUpdateDraft).toHaveBeenCalledWith(JID, CTID, Draft.DRAFT_PREFIX + DRAFT_ID, SANITISED_EDIT_FORM);
+    expect(draftService.createOrUpdateDraft).toHaveBeenCalledWith(JID, CTID, DRAFT_PREFIX + DRAFT_ID, SANITISED_EDIT_FORM);
   });
 
   it('should navigate to case view upon successful case creation', () => {

diff --git a/src/app/cases/creator/case-creator-submit.component.ts b/src/app/cases/creator/case-creator-submit.component.ts
@@ -1,14 +1,11 @@
 import { Component, OnInit } from '@angular/core';
-import { CaseReferencePipe } from '../../shared/utils/case-reference.pipe';
-import { ActivatedRoute, Params, Router, NavigationEnd, RouterEvent } from '@angular/router';
+import { ActivatedRoute, Params, Router } from '@angular/router';
 import { CasesService } from '../../core/cases/cases.service';
 import { AlertService } from '../../core/alert/alert.service';
-import { CaseEventTrigger } from '../../shared/domain/case-view/case-event-trigger.model';
-import { Observable } from 'rxjs/Observable';
-import { CaseEventData } from '../../shared/domain/case-event-data';
+import { CaseEventTrigger, CaseEventData, Draft, CaseReferencePipe } from '@hmcts/ccd-case-ui-toolkit';
+import { Observable } from 'rxjs';
 import { EventStatusService } from '../../core/cases/event-status.service';
 import { DraftService } from '../../core/draft/draft.service';
-import { Draft } from '../../shared/domain/draft';
 import { CaseEditPageComponent } from '../../shared/case-editor/case-edit-page.component';
 
 @Component({
@@ -17,7 +14,6 @@ import { CaseEditPageComponent } from '../../shared/case-editor/case-edit-page.c
 })
 export class CaseCreatorSubmitComponent implements OnInit {
 
-  public static readonly ORIGIN_QUERY_PARAM = 'origin';
   eventTrigger: CaseEventTrigger;
 
   jurisdictionId: string;

diff --git a/src/app/cases/creator/create-case-event-trigger.resolver.spec.ts b/src/app/cases/creator/create-case-event-trigger.resolver.spec.ts
@@ -1,10 +1,7 @@
-import { Observable } from 'rxjs/Observable';
-import { CaseEventTrigger } from '../../shared/domain/case-view/case-event-trigger.model';
-import { HttpError } from '../../core/http/http-error.model';
+import { Observable } from 'rxjs';
 import { CreateCaseEventTriggerResolver } from './create-case-event-trigger.resolver';
 import createSpyObj = jasmine.createSpyObj;
-import { createCaseEventTrigger } from '../../fixture/shared.fixture'
-import { Draft } from '../../shared/domain/draft';
+import { DRAFT_PREFIX, DRAFT_QUERY_PARAM, createCaseEventTrigger, HttpError, CaseEventTrigger } from '@hmcts/ccd-case-ui-toolkit';
 
 describe('CreateCaseFieldsResolver', () => {
 
@@ -18,7 +15,7 @@ describe('CreateCaseFieldsResolver', () => {
   const EVENT_TRIGGER_ID = 'enterCaseIntoLegacy';
   const EVENT_TRIGGER: CaseEventTrigger = createCaseEventTrigger(EVENT_TRIGGER_ID, 'Into legacy', 'caseId', true, []);
 
-  const DRAFT_ID = Draft.DRAFT_PREFIX + '12345';
+  const DRAFT_ID = DRAFT_PREFIX + '12345';
   const EVENT_TRIGGER_OBS: Observable<CaseEventTrigger> = Observable.of(EVENT_TRIGGER);
   const ERROR: HttpError = {
     timestamp: '',
@@ -81,7 +78,7 @@ describe('CreateCaseFieldsResolver', () => {
     expect(route.paramMap.get).toHaveBeenCalledWith(PARAM_CASE_TYPE_ID);
     expect(route.paramMap.get).toHaveBeenCalledWith(PARAM_EVENT_ID);
     expect(route.queryParamMap.get).toHaveBeenCalledWith(QUERY_PARAM_IGNORE_WARNINGS);
-    expect(route.queryParamMap.get).toHaveBeenCalledWith(Draft.DRAFT_QUERY_PARAM);
+    expect(route.queryParamMap.get).toHaveBeenCalledWith(DRAFT_QUERY_PARAM);
     expect(route.paramMap.get).toHaveBeenCalledTimes(3);
     expect(route.queryParamMap.get).toHaveBeenCalledTimes(2);
     expect(createCaseFieldsResolver['cachedEventTrigger']).toBe(EVENT_TRIGGER);
@@ -135,7 +132,7 @@ describe('CreateCaseFieldsResolver', () => {
       switch (key) {
         case QUERY_PARAM_IGNORE_WARNINGS:
           return IGNORE_WARNINGS;
-        case Draft.DRAFT_QUERY_PARAM:
+        case DRAFT_QUERY_PARAM:
           return DRAFT_ID;
       }
     });

diff --git a/src/app/cases/creator/create-case-event-trigger.resolver.ts b/src/app/cases/creator/create-case-event-trigger.resolver.ts
@@ -1,13 +1,12 @@
 import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { CaseEventTrigger } from '../../shared/domain/case-view/case-event-trigger.model';
+import { Observable } from 'rxjs';
+import { CaseEventTrigger, Draft, HttpError } from '@hmcts/ccd-case-ui-toolkit';
 import { AlertService } from '../../core/alert/alert.service';
-import { HttpError } from '../../core/http/http-error.model';
 import { CasesService } from '../../core/cases/cases.service';
 import 'rxjs/add/operator/do';
 import 'rxjs/add/operator/catch';
-import { Draft } from '../../shared/domain/draft';
+import { DRAFT_QUERY_PARAM } from '@hmcts/ccd-case-ui-toolkit/dist/shared/domain';
 
 @Injectable()
 export class CreateCaseEventTriggerResolver implements Resolve<CaseEventTrigger> {
@@ -36,7 +35,7 @@ export class CreateCaseEventTriggerResolver implements Resolve<CaseEventTrigger>
     let caseTypeId = route.paramMap.get(CreateCaseEventTriggerResolver.PARAM_CASE_TYPE_ID);
     let eventTriggerId = route.paramMap.get(CreateCaseEventTriggerResolver.PARAM_EVENT_ID);
     let ignoreWarning = route.queryParamMap.get(CreateCaseEventTriggerResolver.QUERY_PARAM_IGNORE_WARNING);
-    let draftId = route.queryParamMap.get(Draft.DRAFT_QUERY_PARAM);
+    let draftId = route.queryParamMap.get(DRAFT_QUERY_PARAM);
     let caseId = undefined;
 
     if (-1 === CreateCaseEventTriggerResolver.IGNORE_WARNING_VALUES.indexOf(ignoreWarning)) {