MOBILE-4653 html: Adapt new control flow on core components

Some changes left untouched because in implies type checking
crazyserver · Feb 3, 2025 · 5dc6ae4 · 5dc6ae4
1 parent 66a281f
commit 5dc6ae4
Show file tree

Hide file tree

Showing 37 changed files with 765 additions and 497 deletions.
diff --git a/src/core/components/attachments/core-attachments.html b/src/core/components/attachments/core-attachments.html
@@ -3,15 +3,19 @@
         <ion-item class="ion-text-wrap">
             <ion-label>
                 <p class="item-heading">{{ title }} <span [core-mark-required]="required" class="core-mark-required"></span></p>
-                <span *ngIf="maxSubmissionsReadable">
-                    {{ 'core.maxsizeandattachments' | translate:{$a: {size: maxSizeReadable, attachments: maxSubmissionsReadable} } }}
+                <span>
+                    @if (maxSubmissionsReadable) {
+                        {{ 'core.maxsizeandattachments' | translate:{$a: {size: maxSizeReadable, attachments: maxSubmissionsReadable} } }}
+                    } @else {
+                        {{ 'core.maxfilesize' | translate:{$a: maxSizeReadable} }}
+                    }
                 </span>
-                <span *ngIf="!maxSubmissionsReadable">{{ 'core.maxfilesize' | translate:{$a: maxSizeReadable} }}</span>
             </ion-label>
-            <ion-button slot="end" (click)="add()" [ariaLabel]="'core.fileuploader.addfiletext' | translate"
-                *ngIf="unlimitedFiles || (maxSubmissions !== undefined && maxSubmissions >= 0 && files && files.length < maxSubmissions)">
-                <ion-icon name="fas-plus" slot="icon-only" aria-hidden="true" />
-            </ion-button>
+            @if (unlimitedFiles || (maxSubmissions !== undefined && maxSubmissions >= 0 && files && files.length < maxSubmissions)) {
+                <ion-button slot="end" (click)="add()" [ariaLabel]="'core.fileuploader.addfiletext' | translate">
+                    <ion-icon name="fas-plus" slot="icon-only" aria-hidden="true" />
+                </ion-button>
+            }
         </ion-item>
 
         @if (fileTypes && fileTypes.mimetypes && fileTypes.mimetypes.length) {
@@ -25,30 +29,36 @@
                     </ion-item>
 
                     <ul class="core-attachments" slot="content">
-                        <li *ngFor="let typeInfo of fileTypes.info">
-                            <strong *ngIf="typeInfo.name">{{typeInfo.name}} </strong>{{typeInfo.extlist}}
-                        </li>
+                        @for (typeInfo of fileTypes.info; track typeInfo.name) {
+                            <li>
+                                @if (typeInfo.name) {
+                                    <strong>{{typeInfo.name}} </strong>
+                                }
+                                {{typeInfo.extlist}}
+                            </li>
+                        }
                     </ul>
                 </ion-accordion>
             </ion-accordion-group>
         }
 
-
-
         <ng-container *ngFor="let file of files; let index=index">
-            <!-- Files already attached to the submission, either in online or in offline. -->
-            <core-file *ngIf="!file.name" [file]="file" [component]="component" [componentId]="componentId" [canDelete]="true"
-                (onDelete)="delete(index, true)" [canDownload]="!file.offline" />
-
-            <!-- Files added to draft but not attached to submission yet. -->
-            <core-local-file *ngIf="file.name" [file]="file" [manage]="true" (onDelete)="delete(index, false)"
-                (onRename)="renamed(index, $event)" />
+            @if (file.name) {
+                <!-- Files added to draft but not attached to submission yet. -->
+                <core-local-file [file]="file" [manage]="true" (onDelete)="delete(index, false)" (onRename)="renamed(index, $event)" />
+            } @else {
+                <!-- Files already attached to the submission, either in online or in offline. -->
+                <core-file [file]="file" [component]="component" [componentId]="componentId" [canDelete]="true"
+                    (onDelete)="delete(index, true)" [canDownload]="!file.offline" />
+            }
         </ng-container>
 
-        <ion-item class="ion-text-wrap" *ngIf="!files || !files.length">
-            <ion-label>
-                <p>{{ 'core.fileuploader.nofilesattached' | translate }}</p>
-            </ion-label>
-        </ion-item>
+        @if (!files || !files.length) {
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <p>{{ 'core.fileuploader.nofilesattached' | translate }}</p>
+                </ion-label>
+            </ion-item>
+        }
     </ion-card>
 </core-loading>
diff --git a/src/core/components/bs-tooltip/core-bs-tooltip.html b/src/core/components/bs-tooltip/core-bs-tooltip.html
@@ -1,6 +1,9 @@
 <ion-item class="ion-text-wrap">
     <ion-label>
-        <p *ngIf="html" [innerHTML]="content"></p>
-        <p *ngIf="!html">{{content}}</p>
+        @if (html) {
+            <p [innerHTML]="content"></p>
+        } @else {
+            <p>{{content}}</p>
+        }
     </ion-label>
 </ion-item>
diff --git a/src/core/components/button-with-spinner/core-button-with-spinner.html b/src/core/components/button-with-spinner/core-button-with-spinner.html
@@ -1,6 +1,7 @@
-<div *ngIf="!loading" @coreShowHideAnimation>
-    <ng-content />
-</div>
-
-<!-- Spinner. -->
-<ion-spinner *ngIf="loading" @coreShowHideAnimation [attr.aria-label]="loadingLabel | translate" />
+@if (loading) {
+    <ion-spinner @coreShowHideAnimation [attr.aria-label]="loadingLabel | translate" />
+} @else {
+    <div @coreShowHideAnimation>
+        <ng-content />
+    </div>
+}
diff --git a/src/core/components/chart/core-chart.html b/src/core/components/chart/core-chart.html
@@ -1,8 +1,12 @@
 <canvas #canvas [attr.height]="height"></canvas>
 
-<ion-list *ngIf="chart">
-    <ion-item *ngFor="let data of legendItems">
-        <ion-icon name="fas-square" slot="start" [style.color]="data.fillStyle" aria-hidden="true" />
-        <ion-label>{{data.text}}</ion-label>
-    </ion-item>
-</ion-list>
+@if (chart) {
+    <ion-list>
+        @for (data of legendItems; track data.text) {
+            <ion-item>
+                <ion-icon name="fas-square" slot="start" [style.color]="data.fillStyle" aria-hidden="true" />
+                <ion-label>{{data.text}}</ion-label>
+            </ion-item>
+        }
+    </ion-list>
+}
diff --git a/src/core/components/combobox/core-combobox.html b/src/core/components/combobox/core-combobox.html
@@ -1,24 +1,34 @@
-<ion-select *ngIf="interface !== 'modal'" class="ion-text-start" [(ngModel)]="selection" (ngModelChange)="onValueChanged(selection)"
-    interface="popover" [disabled]="disabled" [class.combobox-icon-only]="icon"
-    [interfaceOptions]="{alignment: 'start', arrow: false, cssClass: 'core-combobox-select'}">
-    <div slot="label">
-        <span class="sr-only" *ngIf="label">{{ label }}</span>
-        <ion-icon *ngIf="icon" [name]="icon" aria-hidden="true" />
-    </div>
+@if (interface !== 'modal') {
+    <ion-select class="ion-text-start" [(ngModel)]="selection" (ngModelChange)="onValueChanged(selection)" interface="popover"
+        [disabled]="disabled" [class.combobox-icon-only]="icon"
+        [interfaceOptions]="{alignment: 'start', arrow: false, cssClass: 'core-combobox-select'}">
+        <div slot="label">
+            @if (label) {
+                <span class="sr-only">{{ label }}</span>
+            }
+            @if (icon) {
+                <ion-icon [name]="icon" aria-hidden="true" />
+            }
+        </div>
 
-    <ng-content />
-</ion-select>
+        <ng-content />
+    </ion-select>
+} @else {
+    <ion-button aria-haspopup="listbox" [attr.aria-controls]="listboxId" [attr.aria-owns]="listboxId" [attr.aria-expanded]="expanded"
+        (click)="openModal()" [disabled]="disabled" expand="block" role="combobox">
+        @if (icon) {
+            <ion-icon [name]="icon" slot="start" aria-hidden="true" />
+        }
 
-<ion-button *ngIf="interface === 'modal'" aria-haspopup="listbox" [attr.aria-controls]="listboxId" [attr.aria-owns]="listboxId"
-    [attr.aria-expanded]="expanded" (click)="openModal()" [disabled]="disabled" expand="block" role="combobox">
-    <ion-icon *ngIf="icon" [name]="icon" slot="start" aria-hidden="true" />
+        @if (label) {
+            <span class="sr-only">{{ label }},</span>
+        }
+        <div class="select-text">
+            <slot name="text"><core-format-text [text]="selection" /></slot>
+        </div>
 
-    <span class="sr-only" *ngIf="label">{{ label }},</span>
-    <div class="select-text">
-        <slot name="text"><core-format-text [text]="selection" /></slot>
-    </div>
-
-    <div class="select-icon" role="presentation" aria-hidden="true" slot="end">
-        <div class="select-icon-inner"></div>
-    </div>
-</ion-button>
+        <div class="select-icon" role="presentation" aria-hidden="true" slot="end">
+            <div class="select-icon-inner"></div>
+        </div>
+    </ion-button>
+}
diff --git a/src/core/components/context-menu/context-menu-item.ts b/src/core/components/context-menu/context-menu-item.ts
@@ -15,6 +15,7 @@
 import { Component, Input, Output, OnInit, OnDestroy, EventEmitter, OnChanges, SimpleChange } from '@angular/core';
 import { CoreContextMenuComponent } from '../context-menu/context-menu';
 import { toBoolean } from '@/core/transforms/boolean';
+import { CoreUtils } from '@singletons/utils';
 
 /**
  * This directive adds a item to the Context Menu popover.
@@ -58,6 +59,8 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
     @Output() onClosed?: EventEmitter<() => void>; // Will emit an event when the popover is closed because the item was clicked.
     @Output() toggleChange = new EventEmitter<boolean>();// Will emit an event when toggle changes to enable 2-way data binding.
 
+    uniqueId = CoreUtils.getUniqueId('CoreContextMenuItem');
+
     protected hasAction = false;
     protected destroyed = false;
 

diff --git a/src/core/components/context-menu/core-context-menu-popover.html b/src/core/components/context-menu/core-context-menu-popover.html
@@ -1,28 +1,38 @@
 <ion-content>
     <ion-list [id]="uniqueId" role="menu">
-        <ion-item class="ion-text-wrap" lines="none" *ngFor="let item of items" core-link [capture]="item.captureLink"
-            [autoLogin]="item.autoLogin" [href]="item.href" (click)="itemClicked($event, item)" [attr.aria-label]="item.ariaAction"
-            [hidden]="item.hidden" [detail]="!!(item.href && !item.iconAction)" role="menuitem" [button]="!!(item.href && !item.iconAction)"
-            [showBrowserWarning]="item.showBrowserWarning">
-            <ion-toggle *ngIf="item.iconAction === 'toggle'" [(ngModel)]="item.toggle" (ionChange)="item.toggleChanged($event)">
-                <p class="item-heading">{{ item.content }}</p>
-            </ion-toggle>
-            <ng-container *ngIf="item.iconAction !== 'toggle'">
-                <ion-label>
-                    <p class="item-heading">{{ item.content }}</p>
-                </ion-label>
-                <ng-container *ngIf="(item.href || item.action) && item.iconAction">
-                    <ion-icon *ngIf="item.iconAction !== 'spinner'" [name]="item.iconAction" [class.icon-slash]="item.iconSlash" slot="end"
-                        aria-hidden="true" />
-                    <ion-spinner *ngIf="item.iconAction === 'spinner'" slot="end" [attr.aria-label]="'core.loading' | translate" />
-                </ng-container>
-            </ng-container>
-            <ion-badge class="{{item.badgeClass}}" slot="end" *ngIf="item.badge">
-                <span [attr.ara-hidden]="!!item.badgeA11yText">{{item.badge}}</span>
-                <span class="sr-only" *ngIf="item.badgeA11yText">
-                    {{ item.badgeA11yText | translate: {$a : item.badge } }}
-                </span>
-            </ion-badge>
-        </ion-item>
+        @for (item of items; track item.uniqueId) {
+            <ion-item class="ion-text-wrap" lines="none" core-link [capture]="item.captureLink" [autoLogin]="item.autoLogin"
+                [href]="item.href" (click)="itemClicked($event, item)" [attr.aria-label]="item.ariaAction" [hidden]="item.hidden"
+                [detail]="!!(item.href && !item.iconAction)" role="menuitem" [button]="!!(item.href && !item.iconAction)"
+                [showBrowserWarning]="item.showBrowserWarning">
+                @if (item.iconAction === 'toggle') {
+                    <ion-toggle [(ngModel)]="item.toggle" (ionChange)="item.toggleChanged($event)">
+                        <p class="item-heading">{{ item.content }}</p>
+                    </ion-toggle>
+                } @else {
+                    <ion-label>
+                        <p class="item-heading">{{ item.content }}</p>
+                    </ion-label>
+                    @if ((item.href || item.action) && item.iconAction) {
+                        @if (item.iconAction === 'spinner') {
+                            <ion-spinner slot="end" [attr.aria-label]="'core.loading' | translate" />
+                        } @else {
+                            <ion-icon [name]="item.iconAction" [class.icon-slash]="item.iconSlash" slot="end" aria-hidden="true" />
+                        }
+                    }
+                }
+
+                @if (item.badge) {
+                    <ion-badge class="{{item.badgeClass}}" slot="end">
+                        <span [attr.ara-hidden]="!!item.badgeA11yText">{{item.badge}}</span>
+                        @if (item.badgeA11yText) {
+                            <span class="sr-only">
+                                {{ item.badgeA11yText | translate: {$a : item.badge } }}
+                            </span>
+                        }
+                    </ion-badge>
+                }
+            </ion-item>
+        }
     </ion-list>
 </ion-content>
diff --git a/src/core/components/course-image/course-image.html b/src/core/components/course-image/course-image.html
@@ -1,4 +1,7 @@
-<ion-icon *ngIf="!course().courseimage" name="fas-graduation-cap" slot="start" aria-hidden="true" />
-<ion-avatar *ngIf="course().courseimage" slot="start">
-    <img [url]="course().courseimage" core-external-content alt="" (error)="loadFallbackCourseIcon()" />
-</ion-avatar>
+@if (course().courseimage) {
+    <ion-avatar slot="start">
+        <img [url]="course().courseimage" core-external-content alt="" (error)="loadFallbackCourseIcon()" />
+    </ion-avatar>
+} @else {
+    <ion-icon name="fas-graduation-cap" slot="start" aria-hidden="true" />
+}
diff --git a/src/core/components/download-refresh/core-download-refresh.html b/src/core/components/download-refresh/core-download-refresh.html
@@ -1,25 +1,33 @@
-<ng-container *ngIf="enabled && !loading">
+@if (enabled && !loading) {
+
     <!-- Download button. -->
-    <ion-button *ngIf="status === statusNotDownloaded" fill="clear" (click)="download($event, false)" @coreShowHideAnimation
-        [ariaLabel]="(statusTranslatable || translates.notdownloaded) | translate: { name : statusSubject }">
-        <ion-icon slot="icon-only" name="fas-cloud-arrow-down" aria-hidden="true" />
-    </ion-button>
+    @if (status === statusNotDownloaded) {
+        <ion-button fill="clear" (click)="download($event, false)" @coreShowHideAnimation
+            [ariaLabel]="(statusTranslatable || translates.notdownloaded) | translate: { name : statusSubject }">
+            <ion-icon slot="icon-only" name="fas-cloud-arrow-down" aria-hidden="true" />
+        </ion-button>
+    }
 
     <!-- Refresh button. -->
-    <ion-button *ngIf="status === statusOutdated || (status === statusDownloaded && !canTrustDownload)" fill="clear"
-        (click)="download($event, true)" @coreShowHideAnimation
-        [ariaLabel]="(statusTranslatable || translates.outdated) | translate: { name : statusSubject }">
-        <ion-icon slot="icon-only" name="fam-cloud-refresh" aria-hidden="true" />
-    </ion-button>
+    @if (status === statusOutdated || (status === statusDownloaded && !canTrustDownload)) {
+        <ion-button fill="clear" (click)="download($event, true)" @coreShowHideAnimation
+            [ariaLabel]="(statusTranslatable || translates.outdated) | translate: { name : statusSubject }">
+            <ion-icon slot="icon-only" name="fam-cloud-refresh" aria-hidden="true" />
+        </ion-button>
+    }
 
     <!-- Downloaded status icon. -->
-    <ion-icon *ngIf="status === statusDownloaded && canTrustDownload" class="core-icon-downloaded ion-padding-horizontal" color="success"
-        name="fam-cloud-done" [attr.aria-label]="(statusTranslatable || translates.downloaded) | translate: { name : statusSubject }"
-        role="status" />
+    @if (status === statusDownloaded && canTrustDownload) {
+        <ion-icon class="core-icon-downloaded ion-padding-horizontal" color="success" name="fam-cloud-done"
+            [attr.aria-label]="(statusTranslatable || translates.downloaded) | translate: { name : statusSubject }" role="status" />
+    } @else if (status === statusDownloading) {
+        <ion-spinner @coreShowHideAnimation
+            [attr.aria-label]="(statusTranslatable || translates.downloading) | translate: { name : statusSubject }" />
+    }
 
-    <ion-spinner *ngIf="status === statusDownloading" @coreShowHideAnimation
-        [attr.aria-label]="(statusTranslatable || translates.downloading) | translate: { name : statusSubject }" />
-</ng-container>
+}
 
 <!-- Spinner. -->
-<ion-spinner *ngIf="loading" @coreShowHideAnimation [attr.aria-label]="translates.loading | translate: { name : statusSubject }" />
+@if (loading) {
+    <ion-spinner @coreShowHideAnimation [attr.aria-label]="translates.loading | translate: { name : statusSubject }" />
+}
diff --git a/src/core/components/dynamic-component/core-dynamic-component.html b/src/core/components/dynamic-component/core-dynamic-component.html
@@ -1,5 +1,7 @@
 <!-- Content to display if no dynamic component. -->
-<ng-content *ngIf="!instance" />
+@if (!instance) {
+<ng-content />
+}
 
 <!-- Container of the dynamic component -->
 <ng-container #dynamicComponent />
diff --git a/src/core/components/empty-box/core-empty-box.html b/src/core/components/empty-box/core-empty-box.html
@@ -3,5 +3,7 @@
 } @else if (image) {
     <img [src]="image" role="presentation" alt="">
 }
-<p *ngIf="message">{{ message }}</p>
+@if (message) {
+    <p>{{ message }}</p>
+}
 <ng-content />