diff options
author | 2020-01-16 09:16:01 +0000 | |
---|---|---|
committer | 2020-01-16 09:16:01 +0000 | |
commit | 874c62c8052147a3a3e0c3aed107f7128eefa351 (patch) | |
tree | 6c078bd529b9fa2720474a6ea86fb8338f306323 /vid-webpack-master/src/app | |
parent | adef7f90d338e0e93e3a3d0a6f714f0270a9b7f1 (diff) | |
parent | a57577991de1f6f30344ba55b2ee169d5483ebbf (diff) |
Merge "remove "Previous instantiotion" button from service popup."
Diffstat (limited to 'vid-webpack-master/src/app')
3 files changed, 1 insertions, 41 deletions
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts index 6d996930a..13b72f080 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts @@ -2142,33 +2142,6 @@ describe('Service popup service', () => { expect(service.closeDialogEvent.next).toHaveBeenCalledWith(that); }); - test('showPreviousInstantiations should trigger postMessage', () => { - let that = <any>{ - parentElementClassName: 'content', - _iframeService: iframeService, - resetPopupData : () =>{ }, - serviceModel:{ - uuid:'1111' - } - - }; - - let expectedMessage= { - eventId: 'showPreviousInstantiations', - data: { - serviceModelId: that.serviceModel.uuid - } - }; - - jest.spyOn(window.parent, 'postMessage'); - - service.showPreviousInstantiations(that, fb.group({})); - - expect( window.parent.postMessage).toHaveBeenCalledWith(expectedMessage,"*") - - }); - - test('getDynamicInputs should return list of controls' ,() => { const result: FormControlModel[] = service.getDynamicInputs('6b528779-44a3-4472-bdff-9cd15ec93450'); diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.ts index d25ab2c7f..588d2345b 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.ts @@ -61,9 +61,6 @@ export class ServicePopupService implements GenericPopupInterface { (that, form: FormGroup) => {that.onSubmit(that, form);}, (that: any, form: FormGroup) => { that.onCancel(that, form); - }, - (that: any, form: FormGroup) => { - that.showPreviousInstantiations(that, form); } ); } @@ -133,12 +130,6 @@ export class ServicePopupService implements GenericPopupInterface { this.onCancel(that, form); } - showPreviousInstantiations(that, form: FormGroup,): void { - const eventId = 'showPreviousInstantiations'; - this.postMessageToWindowParent(eventId, that.serviceModel.uuid); - this.onCancel(that, form); - } - private postMessageToWindowParent(eventId: string, serviceModelId:string) { window.parent.postMessage({ eventId: eventId, diff --git a/vid-webpack-master/src/app/shared/models/formControlModels/formPopupDetails.model.ts b/vid-webpack-master/src/app/shared/models/formControlModels/formPopupDetails.model.ts index 40d74d63f..36704e28e 100644 --- a/vid-webpack-master/src/app/shared/models/formControlModels/formPopupDetails.model.ts +++ b/vid-webpack-master/src/app/shared/models/formControlModels/formPopupDetails.model.ts @@ -14,8 +14,6 @@ export class FormPopupDetails { modelInformationItems: ModelInformationItem[]; onSubmit : (that : any, form: FormGroup , ...args) => void; onCancel : (that : any, form: FormGroup) => void; - onOtherAction: (that: any, form: FormGroup) => void; - constructor(that : any, popupTypeName : PopupType , @@ -27,8 +25,7 @@ export class FormPopupDetails { dynamicInputsControlList : FormControlModel[], modelInformationItems : ModelInformationItem[], onSubmit : (that : any, form : FormGroup, ...args) => void, - onCancel: (that: any, form: FormGroup) => void, - onOtherAction?: (that: any, form: FormGroup) => void) { + onCancel: (that: any, form: FormGroup) => void) { this.title = title; this.leftSubTitle = leftSubTitle; this.rightSubTitle = rightSubTitle; @@ -37,7 +34,6 @@ export class FormPopupDetails { this.modelInformationItems = modelInformationItems; this.onSubmit = onSubmit; this.onCancel = onCancel; - this.onOtherAction = onOtherAction; this.popupTypeName = popupTypeName; this.UUIDData = UUIDData; this.that = that; |