Skip to content

Commit d657863

Browse files
ishOswishOsw
authored
Merge branch 'master' into EUI-2333 
2 parents 47ae1b8 + 498a75c commit d657863

21 files changed

+448
-128
lines changed

‎RELEASE-NOTES.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## RELEASE NOTES
2-
### Version 2.67.6-ie-textbox-expand-issue
2+
### Version 2.67.9-ie-textbox-expand-issue
33
**EUI-2333** IE textbox expand issue
44

55
### Version 2.67.5-dynamiclist-fix-in-complex

‎demo/src/app/app.config.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ export class AppConfig extends AbstractAppConfig {
2525
'remote_print_service_url': '/remote_print',
2626
'pagination_page_size': 25,
2727
'prd_url': 'api/caseshare/orgs',
28-
'cache_time_out': 45000
28+
'cache_time_out': 45000,
29+
'work_allocation_api_url': '/workallocation'
2930
};
3031

3132
constructor(private http: Http) {
@@ -134,4 +135,8 @@ export class AppConfig extends AbstractAppConfig {
134135
public getCacheTimeOut(): number {
135136
return this.config.cache_time_out;
136137
}
138+
139+
public getWorkAllocationApiUrl(): string {
140+
return this.config.work_allocation_api_url;
141+
}
137142
}

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@hmcts/ccd-case-ui-toolkit",
3-
"version": "2.67.6-ie-textbox-expand-issue",
3+
"version": "2.67.9-ie-textbox-expand-issue",
4+
45
"engines": {
56
"yarn": "^1.12.3",
67
"npm": "^5.6.0"

‎src/app.config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export abstract class AbstractAppConfig {
2424
abstract getBannersUrl(): string;
2525
abstract getPrdUrl(): string;
2626
abstract getCacheTimeOut(): number;
27+
abstract getWorkAllocationApiUrl(): string;
2728
}
2829

2930
export class CaseEditorConfig {
@@ -47,4 +48,5 @@ export class CaseEditorConfig {
4748
pagination_page_size: number;
4849
prd_url: string;
4950
cache_time_out: number;
51+
work_allocation_api_url: string;
5052
}

‎src/shared/components/case-editor/case-create/case-create.component.spec.ts‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
21
import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
3-
import { CasesService } from '../services/cases.service';
4-
import { CaseCreateComponent } from './case-create.component';
5-
import { CaseEventTrigger, CaseField, DRAFT_PREFIX } from '../../../domain';
6-
import { createCaseEventTrigger } from '../../../fixture/shared.test.fixture';
7-
import { DraftService } from '../../../services/draft';
8-
import { AlertService } from '../../../services/alert';
9-
import { Observable, of, throwError } from 'rxjs';
10-
import { HttpError } from '../../../domain/http';
2+
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
113
import { MockComponent } from 'ng2-mock-component';
12-
import { EventTriggerService } from '../services/event-trigger.service';
13-
import { CaseDetails } from '../../../domain/case-details.model';
14-
import { CaseEventData } from '../../../domain/case-event-data.model';
4+
import { Observable, of, throwError } from 'rxjs';
5+
6+
import { CaseDetails, CaseEventData, CaseEventTrigger, CaseField, DRAFT_PREFIX, HttpError } from '../../../domain';
7+
import { createCaseEventTrigger } from '../../../fixture/shared.test.fixture';
8+
import { AlertService, DraftService } from '../../../services';
9+
import { CasesService, EventTriggerService } from '../services';
10+
import { CaseCreateComponent } from './case-create.component';
11+
1512
import createSpyObj = jasmine.createSpyObj;
1613

1714
let CaseEditComponent: any = MockComponent({

‎src/shared/components/case-editor/case-create/case-create.component.ts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
22
import { Observable, throwError } from 'rxjs';
3-
import { CaseEventTrigger } from '../../../domain/case-view/case-event-trigger.model';
4-
import { Draft } from '../../../domain/draft.model';
5-
import { CasesService } from '../services/cases.service';
6-
import { HttpError } from '../../../domain/http';
7-
import { AlertService } from '../../../services/alert';
8-
import { CaseEventData } from '../../../domain';
9-
import { DraftService } from '../../../services/draft/draft.service';
10-
import { EventTriggerService } from '../services/event-trigger.service';
3+
4+
import { CaseEventData, CaseEventTrigger, Draft, HttpError } from '../../../domain';
5+
import { AlertService, DraftService } from '../../../services';
6+
import { CasesService, EventTriggerService } from '../services';
117

128
@Component({
139
selector: 'ccd-case-create',
@@ -27,7 +23,7 @@ export class CaseCreateComponent implements OnInit {
2723
@Output()
2824
submitted: EventEmitter<any> = new EventEmitter();
2925

30-
private eventTrigger: CaseEventTrigger;
26+
public eventTrigger: CaseEventTrigger;
3127

3228
constructor(
3329
private casesService: CasesService,

‎src/shared/components/case-editor/case-edit-submit/case-edit-submit.component.ts‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
import { Component, OnInit, OnDestroy } from '@angular/core';
1+
import { Component, OnDestroy, OnInit } from '@angular/core';
22
import { FormGroup } from '@angular/forms';
3-
import { CaseEditComponent } from '../case-edit/case-edit.component';
4-
import { Subject, Subscription } from 'rxjs';
5-
import { CallbackErrorsComponent } from '../../error/callback-errors.component';
6-
import { CallbackErrorsContext } from '../../error/domain/error-context';
73
import { ActivatedRoute } from '@angular/router';
8-
import { ProfileNotifier } from '../../../services/profile';
9-
import { HttpError } from '../../../domain/http';
4+
import { Subject, Subscription } from 'rxjs';
5+
6+
import { CaseEventData, CaseEventTrigger, CaseField, HttpError, Profile } from '../../../domain';
7+
import {
8+
CaseFieldService,
9+
FieldsUtils,
10+
FormErrorService,
11+
FormValueService,
12+
OrderService,
13+
ProfileNotifier,
14+
ProfileService,
15+
} from '../../../services';
16+
import { CallbackErrorsComponent, CallbackErrorsContext } from '../../error';
1017
import { PaletteContext } from '../../palette';
11-
import { FormValueService } from '../../../services/form/form-value.service';
12-
import { FormErrorService } from '../../../services/form/form-error.service';
13-
import { FieldsUtils } from '../../../services/fields/fields.utils';
14-
import { CaseEventTrigger } from '../../../domain/case-view/case-event-trigger.model';
15-
import { Wizard } from '../domain/wizard.model';
16-
import { CaseField } from '../../../domain/definition/case-field.model';
17-
import { CaseFieldService } from '../../../services/case-fields/case-field.service';
18-
import { OrderService } from '../../../services/order/order.service';
19-
import { CaseEventData } from '../../../domain/case-event-data.model';
20-
import { Confirmation } from '../domain/confirmation.model';
21-
import { WizardPage } from '../domain/wizard-page.model';
2218
import { CaseEditPageComponent } from '../case-edit-page/case-edit-page.component';
23-
import { ProfileService } from '../../../services/profile/profile.service';
24-
import { Profile } from '../../../domain';
19+
import { CaseEditComponent } from '../case-edit/case-edit.component';
20+
import { Confirmation, Wizard, WizardPage } from '../domain';
2521

2622
// @dynamic
2723
@Component({

‎src/shared/components/case-editor/case-edit/case-edit.component.ts‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
2-
import { Observable } from 'rxjs';
32
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
4-
import { ActivatedRoute, Router, Params } from '@angular/router';
5-
import { FieldsUtils, FieldsPurger } from '../../../services/fields';
3+
import { ActivatedRoute, Params, Router } from '@angular/router';
4+
import { Observable } from 'rxjs';
5+
66
import { ConditionalShowRegistrarService, GreyBarService } from '../../../directives';
7-
import { WizardFactoryService } from '../services/wizard-factory.service';
8-
import { CaseEventTrigger } from '../../../domain/case-view/case-event-trigger.model';
9-
import { Draft } from '../../../domain/draft.model';
10-
import { CaseView } from '../../../domain/case-view/case-view.model';
11-
import { Wizard } from '../domain/wizard.model';
12-
import { Confirmation } from '../domain/confirmation.model';
13-
import { WizardPage } from '../domain/wizard-page.model';
14-
import { ProfileService, ProfileNotifier } from '../../../services';
7+
import { CaseEventTrigger, CaseView, Draft, Profile } from '../../../domain';
8+
import { FieldsPurger, FieldsUtils, ProfileNotifier, ProfileService } from '../../../services';
9+
import { Confirmation, Wizard, WizardPage } from '../domain';
10+
import { WizardFactoryService } from '../services';
1511

1612
@Component({
1713
selector: 'ccd-case-edit',
@@ -26,7 +22,7 @@ export class CaseEditComponent implements OnInit {
2622
eventTrigger: CaseEventTrigger;
2723

2824
@Input()
29-
submit: (CaseEventData) => Observable<object>;
25+
submit: (CaseEventData, profile?: Profile) => Observable<object>;
3026

3127
@Input()
3228
validate: (CaseEventData, pageId: string) => Observable<object>;

‎src/shared/components/case-editor/case-editor.module.ts‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
1-
import { NgModule } from '@angular/core';
21
import { CommonModule } from '@angular/common';
2+
import { NgModule } from '@angular/core';
3+
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
34
import { RouterModule } from '@angular/router';
4-
import { CaseEditConfirmComponent } from './case-edit-confirm/case-edit-confirm.component';
5-
import { CaseEditComponent } from './case-edit/case-edit.component';
6-
import { CaseEditPageComponent } from './case-edit-page/case-edit-page.component';
7-
import { CaseEditFormComponent } from './case-edit-form/case-edit-form.component';
8-
import { CaseEditSubmitComponent } from './case-edit-submit/case-edit-submit.component';
9-
import { FieldsUtils } from '../../services/fields/fields.utils';
5+
6+
import { CallbackErrorsComponent } from '../../components/error';
7+
import { MarkdownModule } from '../../components/markdown/markdown.module';
8+
import { ConditionalShowModule } from '../../directives/conditional-show';
9+
import {
10+
ConditionalShowRegistrarService,
11+
} from '../../directives/conditional-show/services/conditional-show-registrar.service';
12+
import { LabelSubstitutorModule } from '../../directives/substitutor';
13+
import { PipesModule } from '../../pipes/pipes.module';
14+
import { AddressesService } from '../../services/addresses';
15+
import { CaseFieldService } from '../../services/case-fields/case-field.service';
16+
import { DocumentManagementService } from '../../services/document-management';
1017
import { FieldsPurger } from '../../services/fields/fields.purger';
11-
import { ConditionalShowRegistrarService } from '../../directives/conditional-show/services/conditional-show-registrar.service';
12-
import { WizardFactoryService } from './services/wizard-factory.service';
13-
import { FormValueService } from '../../services/form/form-value.service';
18+
import { FieldsUtils } from '../../services/fields/fields.utils';
19+
import { FieldTypeSanitiser } from '../../services/form';
1420
import { FormErrorService } from '../../services/form/form-error.service';
15-
import { PageValidationService } from './services/page-validation.service';
16-
import { CaseFieldService } from '../../services/case-fields/case-field.service';
21+
import { FormValueService } from '../../services/form/form-value.service';
1722
import { OrderService } from '../../services/order/order.service';
18-
import { PipesModule } from '../../pipes/pipes.module';
19-
import { MarkdownModule } from '../../components/markdown/markdown.module';
20-
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
21-
import { CallbackErrorsComponent } from '../../components/error';
23+
import { ProfileNotifier } from '../../services/profile';
24+
import { ProfileService } from '../../services/profile/profile.service';
25+
import { RouterHelperService } from '../../services/router';
26+
import { ErrorsModule } from '../error/errors.module';
2227
import { PaletteModule } from '../palette';
23-
import { LabelSubstitutorModule } from '../../directives/substitutor';
24-
import { ConditionalShowModule, GreyBarService } from '../../directives/conditional-show';
2528
import { CaseCreateComponent } from './case-create/case-create.component';
29+
import { CaseEditConfirmComponent } from './case-edit-confirm/case-edit-confirm.component';
30+
import { CaseEditFormComponent } from './case-edit-form/case-edit-form.component';
31+
import { CaseEditPageComponent } from './case-edit-page/case-edit-page.component';
32+
import { CaseEditSubmitComponent } from './case-edit-submit/case-edit-submit.component';
33+
import { CaseEditComponent } from './case-edit/case-edit.component';
2634
import { CaseProgressComponent } from './case-progress/case-progress.component';
27-
import { EventTriggerService } from './services/event-trigger.service';
28-
import { ProfileService } from '../../services/profile/profile.service';
29-
import { ProfileNotifier } from '../../services/profile';
30-
import { AddressesService } from '../../services/addresses';
31-
import { DocumentManagementService } from '../../services/document-management';
32-
import { RouterHelperService } from '../../services/router';
3335
import { CaseEditWizardGuard } from './services/case-edit-wizard.guard';
34-
import { ErrorsModule } from '../error/errors.module';
35-
import { FieldTypeSanitiser } from '../../services/form';
36+
import { EventTriggerService } from './services/event-trigger.service';
37+
import { PageValidationService } from './services/page-validation.service';
38+
import { WizardFactoryService } from './services/wizard-factory.service';
39+
import { WorkAllocationService } from './services/work-allocation.service';
3640

3741
@NgModule({
3842
imports: [
@@ -85,6 +89,7 @@ import { FieldTypeSanitiser } from '../../services/form';
8589
RouterHelperService,
8690
ProfileService,
8791
CaseEditWizardGuard,
92+
WorkAllocationService
8893
]
8994
})
9095
export class CaseEditorModule {}

‎src/shared/components/case-editor/case-progress/case-progress.component.spec.ts‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
21
import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
3-
import { CasesService } from '../services/cases.service';
4-
import { CaseProgressComponent } from './case-progress.component';
5-
import { CaseDetails, CaseEventData, CaseEventTrigger, CaseField, CaseView } from '../../../domain';
6-
import { createCaseEventTrigger } from '../../../fixture/shared.test.fixture';
7-
import { AlertService } from '../../../services/alert';
2+
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
3+
import { MockComponent } from 'ng2-mock-component';
84
import { Observable, of, throwError } from 'rxjs';
5+
6+
import { CaseDetails, CaseEventData, CaseEventTrigger, CaseField, CaseView } from '../../../domain';
97
import { HttpError } from '../../../domain/http';
10-
import { MockComponent } from 'ng2-mock-component';
11-
import { EventTriggerService } from '../services/event-trigger.service';
8+
import { createCaseEventTrigger } from '../../../fixture/shared.test.fixture';
9+
import { AlertService } from '../../../services';
10+
import { CasesService, EventTriggerService } from '../services';
11+
import { CaseProgressComponent } from './case-progress.component';
12+
1213
import createSpyObj = jasmine.createSpyObj;
1314

1415
let CaseEditComponent: any = MockComponent({

0 commit comments

Comments
 (0)