[ACS-8956] Add new ESLint rule for self-closing tags (#4211)

2025-07-24 17:31:52 +00:00 · 2024-10-31 09:54:23 +01:00
parent d25c08a2c5
commit cacc4149fa
60 changed files with 200 additions and 256 deletions
--- a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html
+++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html
@@ -13,7 +13,7 @@
    <div class="aca-main-content">

      <ng-container *ngIf="((ruleSetsLoading$ | async) && (inheritedRuleSets$ | async).length === 0) || (actionsLoading$ | async); else onLoaded">
-        <mat-progress-bar color="primary" mode="indeterminate"></mat-progress-bar>
+        <mat-progress-bar color="primary" mode="indeterminate" />
      </ng-container>

      <ng-template #onLoaded>
@@ -35,7 +35,7 @@
              {{ 'ACA_FOLDER_RULES.MANAGE_RULES.TOOLBAR.ACTIONS.INHERIT_RULES' | translate }}
            </mat-slide-toggle>

-            <mat-divider vertical class="aca-manage-rules__actions-bar__vertical-divider"></mat-divider>
+            <mat-divider vertical class="aca-manage-rules__actions-bar__vertical-divider" />

            <div class="aca-manage-rules__actions-bar__buttons">
              <button
@@ -56,7 +56,7 @@
            </div>

          </adf-toolbar>
-          <mat-divider></mat-divider>
+          <mat-divider />

          <div class="aca-manage-rules__container" *ngIf="isMainRuleSetNotEmpty || isInheritedRuleSetsNotEmpty; else emptyContent">
            <aca-rule-list
@@ -71,8 +71,7 @@
              (selectRule)="onSelectRule($event)"
              (ruleEnabledChanged)="onRuleEnabledToggle($event[0], $event[1])"
              (ruleSetEditLinkClicked)="openLinkRulesDialog($event)"
-              (ruleSetUnlinkClicked)="onRuleSetUnlinkClicked($event)">
-            </aca-rule-list>
+              (ruleSetUnlinkClicked)="onRuleSetUnlinkClicked($event)" />

            <div class="aca-manage-rules__container__rule-details">

@@ -111,8 +110,7 @@
                  [readOnly]="true"
                  [preview]="true"
                  [value]="selectedRule"
-                  [nodeId]="nodeId">
-                </aca-rule-details>
+                  [nodeId]="nodeId" />
              </div>
            </div>
          </div>
@@ -122,14 +120,13 @@
              icon="library_books"
              [title]="'ACA_FOLDER_RULES.MANAGE_RULES.EMPTY_RULES_LIST.TITLE' | translate"
              [subtitle]="'ACA_FOLDER_RULES.MANAGE_RULES.EMPTY_RULES_LIST.SUBTITLE' | translate"
-            >
-            </adf-empty-content>
+            />
          </ng-template>
        </ng-container>

        <ng-template #genericError>
          <div class="aca-page-layout-error">
-            <aca-generic-error></aca-generic-error>
+            <aca-generic-error />
          </div>
        </ng-template>

--- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.html
@@ -4,8 +4,7 @@
    [parameterConstraints]="parameterConstraints"
    [readOnly]="readOnly"
    [formControl]="control"
-    [nodeId]="nodeId">
-  </aca-rule-action>
+    [nodeId]="nodeId" />

  <button
    mat-icon-button
--- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html
@@ -18,7 +18,6 @@
    data-automation-id="rule-action-card-view"
    [properties]="cardViewItems"
    class="aca-rule-action-full-width"
-    [editable]="!readOnly">
-  </adf-card-view>
+    [editable]="!readOnly" />

 </form>
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html
@@ -29,14 +29,12 @@
      [secondaryBackground]="!secondaryBackground"
      [childCondition]="true"
      [formControl]="control"
-      [readOnly]="readOnly">
-    </aca-rule-composite-condition>
+      [readOnly]="readOnly" />

    <aca-rule-simple-condition
      *ngIf="isFormControlSimpleCondition(control)"
      [formControl]="control"
-      [readOnly]="readOnly">
-    </aca-rule-simple-condition>
+      [readOnly]="readOnly" />

    <button mat-icon-button [matMenuTriggerFor]="menu" *ngIf="!readOnly" data-automation-id="condition-actions-button">
      <mat-icon>more_vert</mat-icon>
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html
@@ -50,8 +50,7 @@
                  color="primary"
                  mode="indeterminate"
                  data-automation-id="auto-complete-loading-spinner"
-                  [diameter]="25"
-                ></mat-progress-spinner>
+                  [diameter]="25" />
              </span>
            </mat-option>
          <ng-template #optionList>
--- a/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.html
@@ -14,8 +14,7 @@
    [value]="model"
    [nodeId]="nodeId"
    (formValueChanged)="formValue = $event"
-    (formValidationChanged)="onFormValidChange($event)">
-  </aca-rule-details>
+    (formValidationChanged)="onFormValidChange($event)" />
 </mat-dialog-content>

 <mat-dialog-actions align="end" class="aca-edit-rule-dialog__footer">
--- a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html
@@ -32,13 +32,13 @@
  <div class="aca-rule-details__form__row aca-rule-details__form__triggers">
    <div class="aca-label">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.WHEN' | translate }}</div>
    <div>
-      <aca-rule-triggers formControlName="triggers" data-automation-id="rule-details-triggers-component"></aca-rule-triggers>
+      <aca-rule-triggers formControlName="triggers" data-automation-id="rule-details-triggers-component" />
      <mat-error class="aca-rule-details-error" *ngIf="triggers.hasError('required')">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.INSUFFICIENT_TRIGGERS_SELECTED' | translate }}</mat-error>
    </div>
  </div>

  <div class="aca-rule-details__form__conditions">
-    <aca-rule-composite-condition [readOnly]="readOnly" formControlName="conditions"></aca-rule-composite-condition>
+    <aca-rule-composite-condition [readOnly]="readOnly" formControlName="conditions" />
    <mat-error class="aca-rule-details-error" *ngIf="conditions.hasError('ruleCompositeConditionInvalid')">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.RULE_COMPOSITE_CONDITION_INVALID' | translate }}</mat-error>
  </div>

@@ -49,8 +49,7 @@
      [actionDefinitions]="actionDefinitions"
      [parameterConstraints]="parameterConstraints"
      [readOnly]="readOnly"
-      [nodeId]="nodeId">
-    </aca-rule-action-list>
+      [nodeId]="nodeId" />
  </div>

  <div class="aca-rule-details__form__row aca-rule-details__form__others" *ngIf="showOptionsSection">
@@ -58,8 +57,7 @@
    <aca-rule-options
      formControlName="options"
      data-automation-id="rule-details-options-component"
-      [errorScriptConstraint]="errorScriptConstraint">
-    </aca-rule-options>
+      [errorScriptConstraint]="errorScriptConstraint" />
  </div>

 </form>
--- a/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html
@@ -8,8 +8,7 @@
    [isSelected]="item.rule.id === this.selectedRule?.id"
    [showEnabledToggle]="showEnabledToggles"
    (click)="onRuleClicked(item.rule)"
-    (enabledChanged)="onEnabledChanged(item.rule, $event)">
-  </aca-rule-list-item>
+    (enabledChanged)="onEnabledChanged(item.rule, $event)" />

  <ng-template #loadMoreRules>
    <div
@@ -40,7 +39,7 @@
      tabindex="0"
      class="aca-rule-list-grouping__non-rule-item"
      matRipple matRippleColor="hsla(0,0%,0%,0.05)">
-      <mat-spinner mode="indeterminate" [diameter]="16" class="aca-spinner"></mat-spinner>
+      <mat-spinner mode="indeterminate" [diameter]="16" class="aca-spinner" />
      {{ 'ACA_FOLDER_RULES.RULE_LIST.LOADING_RULES' | translate }}
    </div>
  </ng-template>
--- a/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.html
@@ -5,8 +5,7 @@
  <mat-slide-toggle
    *ngIf="showEnabledToggle"
    [checked]="rule.isEnabled"
-    (click)="onToggleClick(!rule.isEnabled, $event)">
-  </mat-slide-toggle>
+    (click)="onToggleClick(!rule.isEnabled, $event)" />

 </div>
 <div class="aca-rule-list-item__description">{{ rule.description }}</div>
--- a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html
@@ -29,9 +29,7 @@
    (selectRule)="onSelectRule($event)"
    (ruleEnabledChanged)="onRuleEnabledChanged($event)"
    (loadMoreRules)="onLoadMoreRules($event)"
-    (loadMoreRuleSets)="onLoadMoreRuleSets()">
-  </aca-rule-list-grouping>
-
+    (loadMoreRuleSets)="onLoadMoreRuleSets()" />
 </div>

 <div
@@ -74,8 +72,7 @@
      [showEnabledToggles]="isMainRuleSetOwned"
      (selectRule)="onSelectRule($event)"
      (ruleEnabledChanged)="onRuleEnabledChanged($event)"
-      (loadMoreRules)="onLoadMoreRules($event)">
-    </aca-rule-list-grouping>
+      (loadMoreRules)="onLoadMoreRules($event)" />

    <ng-template #emptyLinkedRuleSet>
      <div class="aca-rule-list__item__all-linked-rules-are-disabled">
--- a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html
+++ b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html
@@ -14,12 +14,11 @@
    (select)="onNodeSelect($event)"
    (folderLoaded)="setFolderLoading(false)"
    (navigationChange)="setFolderLoading(true)"
-    (siteChange)="setFolderLoading(true)">
-  </adf-content-node-selector-panel>
+    (siteChange)="setFolderLoading(true)" />

  <div class="aca-rule-set-picker__content__rule-list" [ngClass]="{ 'aca-justify': rulesLoading$ | async }">
    <ng-container *ngIf="rulesLoading$ | async; else rulesLoaded">
-      <mat-progress-spinner color="primary" mode="indeterminate"></mat-progress-spinner>
+      <mat-progress-spinner color="primary" mode="indeterminate" />
    </ng-container>

    <ng-template #rulesLoaded>
@@ -30,16 +29,14 @@

        <aca-rule-list-item
          *ngFor="let rule of (mainRuleSet$ | async).rules"
-          [rule]="rule">
-        </aca-rule-list-item>
+          [rule]="rule" />
      </ng-container>

      <ng-template #noOwnedRules>
        <adf-empty-content
          icon="library_books"
          [title]="'ACA_FOLDER_RULES.LINK_RULES_DIALOG.EMPTY_RULES_LIST.TITLE' | translate"
-          [subtitle]="'ACA_FOLDER_RULES.LINK_RULES_DIALOG.EMPTY_RULES_LIST.SUBTITLE' | translate">
-        </adf-empty-content>
+          [subtitle]="'ACA_FOLDER_RULES.LINK_RULES_DIALOG.EMPTY_RULES_LIST.SUBTITLE' | translate" />
      </ng-template>
    </ng-template>
  </div>