-
Notifications
You must be signed in to change notification settings - Fork 263
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Revert "AAE-23521 Fix improve dropdown reactive form (#10040)" This reverts commit f88ff10. * Revert "AAE-24371 Fix invalid endpoint is called when process with form is st… (#10052)" This reverts commit d38e782. * Revert "Revert "AAE-24371 Fix invalid endpoint is called when process with form is st… (#10052)"" This reverts commit 125ada7.
- Loading branch information
1 parent
7d741c2
commit 554218d
Showing
13 changed files
with
321 additions
and
456 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
lib/core/src/lib/form/components/widgets/error/error.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
.adf-error { | ||
display: flex; | ||
align-items: center; | ||
|
||
&-widget-container { | ||
height: auto; | ||
|
71 changes: 32 additions & 39 deletions
71
...rocess-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,50 +1,43 @@ | ||
<div | ||
class="adf-dropdown-widget {{field.className}}" | ||
[class.adf-invalid]="dropdownControl.invalid && dropdownControl.touched" | ||
[class.adf-readonly]="field.readOnly" | ||
[class.adf-left-label-input-container]="field.leftLabels" | ||
> | ||
<div *ngIf="field.leftLabels"> | ||
<label class="adf-label adf-left-label" [attr.for]="field.id"> | ||
{{ field.name | translate }}<span class="adf-asterisk" *ngIf="isRequired()">*</span> | ||
<div class="adf-dropdown-widget {{field.className}}" | ||
[class.adf-invalid]="(!field.isValid && isTouched()) || isRestApiFailed" [class.adf-readonly]="field.readOnly" [class.adf-left-label-input-container]="field.leftLabels"> | ||
<div class="adf-dropdown-widget-top-labels"> | ||
<label class="adf-label" [attr.for]="field.id" [class.adf-left-label]="field.leftLabels">{{field.name | translate }}<span class="adf-asterisk" | ||
*ngIf="isRequired()">*</span> | ||
</label> | ||
</div> | ||
<div> | ||
<mat-form-field> | ||
<label *ngIf="!field.leftLabels" class="adf-label" [attr.for]="field.id"> | ||
{{ field.name | translate }}<span class="adf-asterisk" *ngIf="isRequired()">*</span> | ||
</label> | ||
<mat-select | ||
class="adf-select" | ||
[formControl]="dropdownControl" | ||
[id]="field.id" | ||
[compareWith]="compareDropdownValues" | ||
[title]="field.tooltip" | ||
panelClass="adf-select-filter" | ||
[multiple]="field.hasMultipleValues" | ||
> | ||
<mat-label *ngIf="getDefaultOption(list$ | async) as defaultOption"> | ||
{{ defaultOption.name }} | ||
</mat-label> | ||
<mat-select class="adf-select" | ||
[id]="field.id" | ||
[(ngModel)]="field.value" | ||
[disabled]="field.readOnly" | ||
[compareWith]="compareDropdownValues" | ||
(ngModelChange)="selectionChangedForField(field)" | ||
[title]="field.tooltip" | ||
[required]="isRequired()" | ||
panelClass="adf-select-filter" | ||
(blur)="markAsTouched()" | ||
[multiple]="field.hasMultipleValues"> | ||
<adf-select-filter-input *ngIf="showInputFilter" (change)="filter$.next($event)"></adf-select-filter-input> | ||
|
||
<mat-option *ngFor="let opt of list$ | async" [value]="opt" [id]="opt.id">{{opt.name}}</mat-option> | ||
<mat-option id="readonlyOption" *ngIf="isReadOnlyType" [value]="field.value">{{field.value}}</mat-option> | ||
<mat-option *ngFor="let opt of list$ | async" | ||
[value]="getOptionValue(opt, field.value)" | ||
[id]="opt.id">{{opt.name}} | ||
</mat-option> | ||
<mat-option id="readonlyOption" *ngIf="isReadOnlyType()" [value]="field.value">{{field.value}}</mat-option> | ||
</mat-select> | ||
</mat-form-field> | ||
<div *ngIf="!previewState && !field.readOnly"> | ||
<error-widget | ||
class="adf-dropdown-required-message" | ||
*ngIf="showRequiredMessage" | ||
required="{{ 'FORM.FIELD.REQUIRED' | translate }}" | ||
></error-widget> | ||
<error-widget | ||
class="adf-dropdown-failed-message" | ||
*ngIf="isRestApiFailed" | ||
required="{{ 'FORM.FIELD.REST_API_FAILED' | translate: { hostname: restApiHostName } }}" | ||
></error-widget> | ||
<error-widget | ||
class="adf-dropdown-failed-message" | ||
*ngIf="variableOptionsFailed" | ||
required="{{ 'FORM.FIELD.VARIABLE_DROPDOWN_OPTIONS_FAILED' | translate }}" | ||
></error-widget> | ||
<div *ngIf="!previewState && !isReadOnlyField"> | ||
<error-widget [error]="field.validationSummary"></error-widget> | ||
<error-widget class="adf-dropdown-required-message" *ngIf="showRequiredMessage()" | ||
required="{{ 'FORM.FIELD.REQUIRED' | translate }}"></error-widget> | ||
<error-widget class="adf-dropdown-failed-message" *ngIf="isRestApiFailed" | ||
required="{{ 'FORM.FIELD.REST_API_FAILED' | translate: { hostname: restApiHostName } }}"></error-widget> | ||
<error-widget class="adf-dropdown-failed-message" *ngIf="variableOptionsFailed" | ||
required="{{ 'FORM.FIELD.VARIABLE_DROPDOWN_OPTIONS_FAILED' | translate }}"></error-widget> | ||
</div> | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.