Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

with

Browse Source
This commit is contained in:
Drew Ansbacher
2021-09-03 18:24:45 +03:00
committed by Aiden McClelland
parent 4dc59327fa
commit 040c407521
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ui/src/app/components/form-object/form-object.component.html
View File

@@ -65,9 +65,9 @@
<form-object <form-object
[objectSpec]=" [objectSpec]="
spec.type === 'union' ? spec.type === 'union' ?
spec.variants[entry.value.controls[spec.tag.id].value] : spec.variants[$any(entry.value).controls[spec.tag.id].value] :
spec.spec" spec.spec"
[formGroup]="entry.value" [formGroup]="$any(entry.value)"
[current]="current ? current[entry.key] : undefined" [current]="current ? current[entry.key] : undefined"
[unionSpec]="spec.type === 'union' ? spec : undefined" [unionSpec]="spec.type === 'union' ? spec : undefined"
></form-object> ></form-object>
@@ -91,7 +91,7 @@
<!-- body --> <!-- body -->
<div class="nested-wrapper"> <div class="nested-wrapper">
<div <div
*ngFor="let abstractControl of formArr.controls; let i = index;" *ngFor="let abstractControl of $any(formArr).controls; let i = index;"
class="ion-padding-top" class="ion-padding-top"
> >
<!-- nested --> <!-- nested -->
@@ -99,7 +99,7 @@
<!-- nested label --> <!-- nested label -->
<ion-item button (click)="toggleExpand(entry.key, i)"> <ion-item button (click)="toggleExpand(entry.key, i)">
<form-label [data]="{ <form-label [data]="{
spec: { name: objectListInfo[entry.key][i].displayAs || 'Entry ' + (i + 1) }, spec: $any({ name: objectListInfo[entry.key][i].displayAs || 'Entry ' + (i + 1) }),
isNew: false, isNew: false,
isEdited: abstractControl.dirty isEdited: abstractControl.dirty
}"></form-label> }"></form-label>
@@ -128,11 +128,11 @@
<form-object <form-object
[objectSpec]=" [objectSpec]="
spec.subtype === 'union' ? spec.subtype === 'union' ?
spec.spec.variants[abstractControl.controls[spec.spec.tag.id].value] : $any(spec.spec).variants[abstractControl.controls[$any(spec.spec).tag.id].value] :
spec.spec.spec" $any(spec.spec).spec"
[formGroup]="abstractControl" [formGroup]="abstractControl"
[current]="current && current[entry.key] ? current[entry.key][i] : undefined" [current]="current && current[entry.key] ? current[entry.key][i] : undefined"
[unionSpec]="spec.subtype === 'union' ? spec.spec : undefined" [unionSpec]="spec.subtype === 'union' ? $any(spec.spec) : undefined"
(onInputChange)="updateLabel(entry.key, i, spec.spec['display-as'])" (onInputChange)="updateLabel(entry.key, i, spec.spec['display-as'])"
></form-object> ></form-object>
<div style="text-align: right; padding-top: 12px;"> <div style="text-align: right; padding-top: 12px;">
@@ -154,7 +154,7 @@
<form-error <form-error
*ngIf="abstractControl.errors" *ngIf="abstractControl.errors"
[control]="abstractControl" [control]="abstractControl"
[spec]="spec.spec" [spec]="$any(spec.spec)"
> >
</form-error> </form-error>
</ion-item-group> </ion-item-group>
@@ -174,9 +174,9 @@
}"></form-label> }"></form-label>
</p> </p>
<!-- list --> <!-- list -->
<ion-item button detail="false" color="dark" (click)="presentModalEnumList(entry.key, spec, formArr.value)"> <ion-item button detail="false" color="dark" (click)="presentModalEnumList(entry.key, $any(spec), formArr.value)">
<ion-label> <ion-label>
<h2>{{ getEnumListDisplay(formArr.value, spec.spec) }}</h2> <h2>{{ getEnumListDisplay(formArr.value, $any(spec.spec)) }}</h2>
</ion-label> </ion-label>
<ion-button slot="end" fill="clear" color="light"> <ion-button slot="end" fill="clear" color="light">
<ion-icon slot="icon-only" name="chevron-down"></ion-icon> <ion-icon slot="icon-only" name="chevron-down"></ion-icon>
@@ -186,7 +186,7 @@
</ng-container> </ng-container>
<form-error <form-error
*ngIf="formGroup.get(entry.key).errors" *ngIf="formGroup.get(entry.key).errors"
[control]="formGroup.get(entry.key)" [control]="$any(formGroup.get(entry.key))"
[spec]="spec" [spec]="spec"
> >
</form-error> </form-error>

18
ui/src/app/pages/apps-routes/app-show/app-show.page.html
View File

@@ -51,10 +51,10 @@
<!-- ** !restoring/backing-up ** --> <!-- ** !restoring/backing-up ** -->
<ng-container *ngIf="!([PackageMainStatus.BackingUp, PackageMainStatus.Restoring] | includes : mainStatus.status); else maintenance"> <ng-container *ngIf="!([PackageMainStatus.BackingUp, PackageMainStatus.Restoring] | includes : mainStatus.status); else maintenance">
<!-- ** health checks ** --> <!-- ** health checks ** -->
<ng-container *ngIf="!(mainStatus.health | empty)"> <ng-container *ngIf="!($any(mainStatus).health | empty)">
<ion-item-divider>Health Checks</ion-item-divider> <ion-item-divider>Health Checks</ion-item-divider>
<ng-container *ngIf="connectionFailure"> <ng-container *ngIf="connectionFailure">
<ion-item *ngFor="let health of mainStatus.health | keyvalue"> <ion-item *ngFor="let health of $any(mainStatus).health | keyvalue">
<ion-avatar slot="start"> <ion-avatar slot="start">
<ion-skeleton-text style="width: 20px; height: 20px; border-radius: 0;"></ion-skeleton-text> <ion-skeleton-text style="width: 20px; height: 20px; border-radius: 0;"></ion-skeleton-text>
</ion-avatar> </ion-avatar>
@@ -65,15 +65,15 @@
</ion-item> </ion-item>
</ng-container> </ng-container>
<ng-container *ngIf="!connectionFailure"> <ng-container *ngIf="!connectionFailure">
<ion-item *ngFor="let health of mainStatus.health | keyvalue : asIsOrder"> <ion-item *ngFor="let health of $any(mainStatus).health | keyvalue : asIsOrder">
<ion-spinner class="icon-spinner" color="warning" slot="start" *ngIf="['starting', 'loading'] | includes : health.value.result"></ion-spinner> <ion-spinner class="icon-spinner" color="warning" slot="start" *ngIf="['starting', 'loading'] | includes : $any(health.value).result"></ion-spinner>
<ion-icon slot="start" *ngIf="health.value.result === 'success'" name="checkmark-outline" color="success"></ion-icon> <ion-icon slot="start" *ngIf="$any(health.value).result === 'success'" name="checkmark-outline" color="success"></ion-icon>
<ion-icon slot="start" *ngIf="health.value.result === 'failure'" name="close" color="danger"></ion-icon> <ion-icon slot="start" *ngIf="$any(health.value).result === 'failure'" name="close" color="danger"></ion-icon>
<ion-icon slot="start" *ngIf="health.value.result === 'disabled'" name="remove-outline" color="dark"></ion-icon> <ion-icon slot="start" *ngIf="$any(health.value).result === 'disabled'" name="remove-outline" color="dark"></ion-icon>
<ion-label> <ion-label>
<p>{{ health.key }}</p> <p>{{ health.key }}</p>
<h2>{{ health.value.result }}</h2> <h2>{{ $any(health.value).result }}</h2>
<p *ngIf="health.value.result === 'failure'"><ion-text color="danger">{{ health.value.error }}</ion-text></p> <p *ngIf="$any(health.value).result === 'failure'"><ion-text color="danger">{{ $any(health.value).error }}</ion-text></p>
</ion-label> </ion-label>
</ion-item> </ion-item>
</ng-container> </ng-container>