Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACS-8101] [ACA] manage rule popup visual changes #3891

Merged
merged 1 commit into from
Jun 14, 2024
Merged

[ACS-8101] [ACA] manage rule popup visual changes #3891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ntent/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="aca-rule-composite-condition__form__row"
*ngFor="let control of conditionFormControls; let i = index">

<mat-form-field *ngIf="i === 0" appearance="outline" subscriptSizing="dynamic">
<mat-form-field *ngIf="i === 0" subscriptSizing="dynamic">
<mat-select
[formControl]="invertedControl"
[disabled]="readOnly">
Expand All @@ -16,7 +16,7 @@
</mat-select>
</mat-form-field>

<mat-form-field *ngIf="i > 0" appearance="outline" subscriptSizing="dynamic">
<mat-form-field *ngIf="i > 0" subscriptSizing="dynamic">
<mat-select
[formControl]="booleanModeControl">
<mat-option value="and">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LOGIC_OPERATORS.AND' | translate }}</mat-option>
Expand Down
38 changes: 23 additions & 15 deletions ...ntent/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '@alfresco/adf-core/lib/styles/mat-selectors';

.aca-rule-composite-condition {
display: block;
border-radius: 8px;
Expand All @@ -16,6 +18,27 @@
flex-direction: column;
gap: 8px;

.aca-rule-composite-condition__form__row {
display: flex;
gap: 8px;

#{$mat-form-field} {
#{$mat-form-field-infix} {
padding-bottom: 4px;
}
}

& > :nth-child(1) {
width: 7em;
height: fit-content;
font-size: inherit;
}

& > :nth-child(2) {
flex: 1;
}
}

&__no-conditions {
color: var(--theme-disabled-text-color);
margin: 0.5em 0;
Expand All @@ -35,20 +58,5 @@
margin-right: 0;
}
}

&__row {
display: flex;
gap: 8px;

& > :nth-child(1) {
width: 7em;
height: fit-content;
font-size: inherit;
}

& > :nth-child(2) {
flex: 1;
}
}
}
}
6 changes: 3 additions & 3 deletions ...-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<form class="aca-rule-simple-condition__form" [formGroup]="form">
<mat-form-field class="aca-rule-simple-condition__form__field-input" appearance="outline" subscriptSizing="dynamic">
<mat-form-field class="aca-rule-simple-condition__form__field-input" subscriptSizing="dynamic">
<mat-select formControlName="field" data-automation-id="field-select"
(selectionChange)="onChangeField()">
<mat-option *ngIf="!isSelectedFieldKnown" [value]="selectedField.name" data-automation-id="unknown-field-option">
Expand All @@ -12,7 +12,7 @@
</mat-form-field>

<mat-form-field class="aca-rule-simple-condition__form__field-input aca-rule-simple-condition__form__comparator-input" subscriptSizing="dynamic"
[class]="{ 'aca-hidden': isComparatorHidden }" appearance="outline" data-automation-id="comparator-form-field">
[class]="{ 'aca-hidden': isComparatorHidden }" data-automation-id="comparator-form-field">
<mat-select formControlName="comparator" data-automation-id="comparator-select">
<mat-option
*ngFor="let comparator of selectedFieldComparators"
Expand All @@ -23,7 +23,7 @@
</mat-form-field>

<mat-form-field class="aca-rule-simple-condition__form__field-input aca-rule-simple-condition__form__parameter-input"
subscriptSizing="dynamic" appearance="outline" [ngSwitch]="selectedField.type">
subscriptSizing="dynamic" [ngSwitch]="selectedField.type">
<mat-select formControlName="parameter" data-automation-id="simple-condition-value-select" *ngSwitchCase="'mimeType'">
<mat-option *ngFor="let mimeType of mimeTypes"
[value]="mimeType.value">
Expand Down