Browse Source

Migrate to control flow

pull/4905/head
Thomas Kaul 3 weeks ago
parent
commit
b1f85e2272
  1. 57
      libs/ui/src/lib/assistant/assistant.html
  2. 35
      libs/ui/src/lib/value/value.component.html

57
libs/ui/src/lib/assistant/assistant.html

@ -40,23 +40,20 @@
*ngIf="searchFormControl.value" *ngIf="searchFormControl.value"
class="overflow-auto py-2 result-container" class="overflow-auto py-2 result-container"
> >
<div @if (searchResults?.quickLinks?.length !== 0 || isLoading.quickLinks) {
*ngIf="searchResults?.quickLinks?.length !== 0 || isLoading.quickLinks" <div class="mb-2">
class="mb-2" <div class="font-weight-bold px-3 text-muted title" i18n>
> Quick Links
<div class="font-weight-bold px-3 text-muted title" i18n> </div>
Quick Links @for (
</div> searchResultItem of searchResults?.quickLinks;
@for ( track searchResultItem
searchResultItem of searchResults?.quickLinks; ) {
track searchResultItem <gf-assistant-list-item
) { [item]="searchResultItem"
<gf-assistant-list-item (clicked)="onCloseAssistant()"
[item]="searchResultItem" />
(clicked)="onCloseAssistant()" }
/>
}
<ng-container>
@if (isLoading.quickLinks) { @if (isLoading.quickLinks) {
<ngx-skeleton-loader <ngx-skeleton-loader
animation="pulse" animation="pulse"
@ -67,8 +64,8 @@
}" }"
/> />
} }
</ng-container> </div>
</div> }
<div> <div>
<div class="font-weight-bold px-3 text-muted title" i18n>Holdings</div> <div class="font-weight-bold px-3 text-muted title" i18n>Holdings</div>
@for ( @for (
@ -80,7 +77,7 @@
(clicked)="onCloseAssistant()" (clicked)="onCloseAssistant()"
/> />
} }
<ng-container *ngIf="searchResults?.holdings?.length === 0"> @if (searchResults?.holdings?.length === 0) {
@if (isLoading.holdings) { @if (isLoading.holdings) {
<ngx-skeleton-loader <ngx-skeleton-loader
animation="pulse" animation="pulse"
@ -93,7 +90,7 @@
} @else { } @else {
<div class="px-3 py-1 text-muted" i18n>No entries...</div> <div class="px-3 py-1 text-muted" i18n>No entries...</div>
} }
</ng-container> }
</div> </div>
<div *ngIf="hasPermissionToAccessAdminControl" class="mt-2"> <div *ngIf="hasPermissionToAccessAdminControl" class="mt-2">
<div class="font-weight-bold px-3 text-muted title" i18n> <div class="font-weight-bold px-3 text-muted title" i18n>
@ -108,7 +105,7 @@
(clicked)="onCloseAssistant()" (clicked)="onCloseAssistant()"
/> />
} }
<ng-container *ngIf="searchResults?.assetProfiles?.length === 0"> @if (searchResults?.assetProfiles?.length === 0) {
@if (isLoading.assetProfiles) { @if (isLoading.assetProfiles) {
<ngx-skeleton-loader <ngx-skeleton-loader
animation="pulse" animation="pulse"
@ -121,7 +118,7 @@
} @else { } @else {
<div class="px-3 py-1 text-muted" i18n>No entries...</div> <div class="px-3 py-1 text-muted" i18n>No entries...</div>
} }
</ng-container> }
</div> </div>
</div> </div>
</div> </div>
@ -149,12 +146,14 @@
@for (account of accounts; track account.id) { @for (account of accounts; track account.id) {
<mat-option [value]="account.id"> <mat-option [value]="account.id">
<div class="d-flex"> <div class="d-flex">
<gf-entity-logo @if (account.Platform?.url) {
*ngIf="account.Platform?.url" <gf-entity-logo
class="mr-1" class="mr-1"
[tooltip]="account.Platform?.name" [tooltip]="account.Platform?.name"
[url]="account.Platform?.url" [url]="account.Platform?.url"
/><span>{{ account.name }}</span> />
}
<span>{{ account.name }}</span>
</div> </div>
</mat-option> </mat-option>
} }

35
libs/ui/src/lib/value/value.component.html

@ -1,6 +1,8 @@
<div *ngIf="icon" class="align-self-center mr-3"> @if (icon) {
<ion-icon class="h3 m-0" [name]="icon" /> <div class="align-self-center mr-3">
</div> <ion-icon class="h3 m-0" [name]="icon" />
</div>
}
<div class="d-flex flex-column w-100"> <div class="d-flex flex-column w-100">
<ng-template #label><ng-content></ng-content></ng-template> <ng-template #label><ng-content></ng-content></ng-template>
<ng-container *ngIf="value || value === 0 || value === null"> <ng-container *ngIf="value || value === 0 || value === null">
@ -10,8 +12,12 @@
> >
<ng-container *ngIf="isNumber || value === null"> <ng-container *ngIf="isNumber || value === null">
<ng-container *ngIf="colorizeSign && !useAbsoluteValue"> <ng-container *ngIf="colorizeSign && !useAbsoluteValue">
<div *ngIf="+value > 0" class="mr-1 text-success">+</div> @if (+value > 0) {
<div *ngIf="+value < 0" class="mr-1 text-danger">-</div> <div class="mr-1 text-success">+</div>
}
@if (+value < 0) {
<div class="mr-1 text-danger">-</div>
}
</ng-container> </ng-container>
@if (isPercent) { @if (isPercent) {
<div <div
@ -43,12 +49,15 @@
</div> </div>
} }
@if (unit) { @if (unit) {
<small *ngIf="size === 'medium'" class="ml-1"> @if (size === 'medium') {
{{ unit }} <small class="ml-1">
</small> {{ unit }}
<div *ngIf="size !== 'medium'" class="ml-1"> </small>
{{ unit }} } @else {
</div> <div class="ml-1">
{{ unit }}
</div>
}
} }
</ng-container> </ng-container>
@if (isString) { @if (isString) {
@ -81,7 +90,9 @@
<span class="h6" <span class="h6"
><ng-container *ngTemplateOutlet="label"></ng-container ><ng-container *ngTemplateOutlet="label"></ng-container
></span> ></span>
<span *ngIf="subLabel" class="text-muted"> {{ subLabel }}</span> @if (subLabel) {
<span class="text-muted"> {{ subLabel }}</span>
}
</div> </div>
<small *ngIf="size !== 'large'" class="d-block text-truncate"> <small *ngIf="size !== 'large'" class="d-block text-truncate">
<ng-container *ngTemplateOutlet="label"></ng-container> <ng-container *ngTemplateOutlet="label"></ng-container>

Loading…
Cancel
Save