Skip to content

Commit 90f01a0

Browse files
[DURACOM-347] remove unnecessary check and fix circular dependency
1 parent bdf5037 commit 90f01a0

2 files changed

Lines changed: 3 additions & 4 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
@@ -288,6 +288,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
288288
});
289289

290290
fixture.detectChanges();
291+
renderer.setAttribute.calls.reset();
291292
testElement = debugElement.query(By.css(`input[id='${testModel.id}']`));
292293
}));
293294

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {
4242
} from '@ng-bootstrap/ng-bootstrap';
4343
import {
4444
DYNAMIC_FORM_CONTROL_MAP_FN,
45-
DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX,
45+
DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX, DynamicFormArrayComponent,
4646
DynamicFormArrayGroupModel,
4747
DynamicFormArrayModel,
4848
DynamicFormComponentService,
@@ -133,7 +133,6 @@ import {
133133
ReorderableRelationship,
134134
} from './existing-metadata-list-element/existing-metadata-list-element.component';
135135
import { ExistingRelationListElementComponent } from './existing-relation-list-element/existing-relation-list-element.component';
136-
import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
137136
import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
138137
import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
139138
import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
@@ -536,8 +535,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
536535
}
537536

538537
if ((this.componentRef.instance instanceof DynamicFormControlComponent) &&
539-
!(this.componentRef.instance instanceof DsDynamicFormArrayComponent) &&
540-
!(this.componentRef.instance instanceof DsDynamicFormGroupComponent) &&
538+
!(this.componentRef.instance instanceof DynamicFormArrayComponent) &&
541539
this.componentRef.location.nativeElement) {
542540
const inputEl: HTMLElement | null =
543541
this.componentRef.location.nativeElement.querySelector('input,textarea,select,[role="textbox"]');

0 commit comments

Comments
 (0)