Skip to content

Commit 4139d35

Browse files
[DURACOM-347] remove unnecessary check and fix circular dependency
1 parent ef8590f commit 4139d35

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
272272
});
273273

274274
fixture.detectChanges();
275+
renderer.setAttribute.calls.reset();
275276
testElement = debugElement.query(By.css(`input[id='${testModel.id}']`));
276277
}));
277278

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import {
4040
} from '@ng-bootstrap/ng-bootstrap';
4141
import {
4242
DYNAMIC_FORM_CONTROL_MAP_FN,
43-
DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX,
43+
DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX, DynamicFormArrayComponent,
4444
DynamicFormArrayGroupModel,
4545
DynamicFormArrayModel,
4646
DynamicFormComponentService,
@@ -126,10 +126,8 @@ import {
126126
ReorderableRelationship,
127127
} from './existing-metadata-list-element/existing-metadata-list-element.component';
128128
import { ExistingRelationListElementComponent } from './existing-relation-list-element/existing-relation-list-element.component';
129-
import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
130129
import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
131130
import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/date-picker.model';
132-
import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
133131
import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
134132

135133
@Component({
@@ -486,8 +484,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
486484
}
487485

488486
if ((this.componentRef.instance instanceof DynamicFormControlComponent) &&
489-
!(this.componentRef.instance instanceof DsDynamicFormArrayComponent) &&
490-
!(this.componentRef.instance instanceof DsDynamicFormGroupComponent) &&
487+
!(this.componentRef.instance instanceof DynamicFormArrayComponent) &&
491488
this.componentRef.location.nativeElement) {
492489
const inputEl: HTMLElement | null =
493490
this.componentRef.location.nativeElement.querySelector('input,textarea,select,[role="textbox"]');

0 commit comments

Comments
 (0)