Skip to content

Commit 01628c5

Browse files
[DURACOM-347] fix template conflicts, lint and test issue
1 parent c7353a2 commit 01628c5

5 files changed

Lines changed: 8 additions & 8 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ import {
134134
ReorderableRelationship,
135135
} from './existing-metadata-list-element/existing-metadata-list-element.component';
136136
import { ExistingRelationListElementComponent } from './existing-relation-list-element/existing-relation-list-element.component';
137+
import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
137138
import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
138139
import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/date-picker.model';
139-
import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
140-
import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
141140
import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
141+
import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
142142

143143
@Component({
144144
selector: 'ds-dynamic-form-control-container',

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
class="form-control"
3333
[attr.aria-labelledby]="'label_' + model.id"
3434
[attr.autoComplete]="model.autoComplete"
35-
[attr.aria-label]="model.label | translate"
35+
[attr.aria-label]="(model.label || model?.additional?.ariaLabel) | translate"
3636
[class.is-invalid]="showErrorMessages"
3737
[id]="model.id"
3838
[inputFormatter]="formatter"
@@ -59,7 +59,7 @@
5959
<input class="form-control"
6060
[attr.aria-labelledby]="'label_' + model.id"
6161
[attr.autoComplete]="model.autoComplete"
62-
[attr.aria-label]="model.label | translate"
62+
[attr.aria-label]="(model.label || model?.additional?.ariaLabel) | translate"
6363
[class.is-invalid]="showErrorMessages"
6464
[class.tree-input]="!model.readOnly"
6565
[id]="id"

src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
aria-hidden="true"></i>
1212
<input class="form-control"
1313
[attr.aria-controls]="'combobox_' + id + '_listbox'"
14-
[attr.aria-label]="model.placeholder"
14+
[attr.aria-label]="model.label"
1515
[attr.autoComplete]="model.autoComplete"
1616
[class.is-invalid]="showErrorMessages"
1717
[class.scrollable-dropdown-input]="!model.readOnly"
@@ -29,11 +29,11 @@
2929

3030
<div #dropdownMenu ngbDropdownMenu
3131
class="dropdown-menu scrollable-dropdown-menu w-100"
32-
[attr.aria-label]="model.placeholder">
32+
[attr.aria-label]="model.label">
3333
<div class="scrollable-menu"
3434
role="listbox"
3535
[id]="'combobox_' + id + '_listbox'"
36-
[attr.aria-label]="model.placeholder"
36+
[attr.aria-label]="model.label"
3737
infiniteScroll
3838
[infiniteScrollDistance]="2"
3939
[infiniteScrollThrottle]="50"

src/app/shared/form/builder/parsers/field-parser.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
66
import { TranslateService } from '@ngx-translate/core';
77
import uniqueId from 'lodash/uniqueId';
88

9-
import { environment } from '../../../../../environments/environment';
109
import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
1110
import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
1211
import { isNgbDateStruct } from '../../../date.util';

0 commit comments

Comments
 (0)