Skip to content

Commit 2e5e6bc

Browse files
committed
refactor(import-rule): enhance step indicators and improve rule display logic
Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>
1 parent ac1ffc9 commit 2e5e6bc

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

frontend/src/app/rule-management/app-rule/components/import-rules/import-rule.component.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@
106106
</span>
107107

108108
<span class="ml-2">
109+
<i *ngIf="rule.status === 'error'" class="icon-warning2 font-size-sm mr-1"></i>
109110
<strong>{{ rule.rule.name }}</strong>
110111
<small>({{ rule.status }})</small>
111112
</span>
112113
</div>
113114

114115
<div *ngIf="!rule.isLoading" class="d-flex">
115116
<div (click)="deleteRule(i)" class="cursor-pointer opacity-75 ml-2">
116-
<i *ngIf="rule.status === 'valid'" class="icon-cross2 font-size-sm"></i>
117-
<i *ngIf="rule.status === 'error'" class="icon-warning2 font-size-sm"></i>
117+
<i *ngIf="rule.status === 'valid' || rule.status === 'error'" class="icon-cross2 font-size-sm"></i>
118118
<i *ngIf="rule.status === 'saved'" class="icon-check2 font-size-sm"></i>
119119
</div>
120120
</div>
@@ -176,15 +176,15 @@
176176
</span>
177177

178178
<span class="ml-2">
179+
<i *ngIf="rule.status === 'error'" class="icon-warning2 font-size-sm"></i>
179180
<strong>{{ rule.rule.name }}</strong>
180181
<small>({{ rule.status }})</small>
181182
</span>
182183
</div>
183184

184185
<div *ngIf="!rule.isLoading" class="d-flex">
185186
<div (click)="deleteRule(i)" class="cursor-pointer opacity-75 ml-2">
186-
<i *ngIf="rule.status === 'valid'" class="icon-cross2 font-size-sm"></i>
187-
<i *ngIf="rule.status === 'error'" class="icon-warning2 font-size-sm"></i>
187+
<i *ngIf="rule.status === 'valid' || rule.status === 'error'" class="icon-cross2 font-size-sm"></i>
188188
<i *ngIf="rule.status === 'saved'" class="icon-check2 font-size-sm"></i>
189189
</div>
190190
</div>
@@ -218,7 +218,7 @@
218218
<!-- NEXT -->
219219
<button *ngIf="currentStep !== RULE_FORM.STEP2"
220220
(click)="next()"
221-
[disabled]="loading"
221+
[disabled]="loading || (currentStep === RULE_FORM.STEP1 && validRulesCount() !== rules.length)"
222222
class="btn utm-button utm-button-primary">
223223
Next <i class="icon-arrow-right32"></i>
224224
</button>

0 commit comments

Comments
 (0)