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

matt commets addressed

Browse Source
This commit is contained in:
Drew Ansbacher
2021-09-04 00:27:10 +03:00
committed by Matt Hill
parent c25857939d
commit 7afe2f03d4
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/app/components/skeleton-list/skeleton-list.component.ts
View File

@@ -6,8 +6,8 @@ import { Component, Input } from '@angular/core'
styleUrls: ['./skeleton-list.component.scss'],
})
export class SkeletonListComponent {
@Input() groups: number
@Input() rows: number = 3
@Input() groups: string
@Input() rows: string = '3'
groupsArr: number[] = []
rowsArr: number[] = []

2
ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.html
View File

@@ -9,7 +9,7 @@
<ion-content class="ion-padding">
<skeleton-list *ngIf="loading" [rows]="3"></skeleton-list>
<skeleton-list *ngIf="loading" rows="3"></skeleton-list>
<ion-item-group *ngIf="!loading">
<ion-item *ngFor="let metric of metrics | keyvalue : asIsOrder">
<ion-label>{{ metric.key }}</ion-label>

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

@@ -100,7 +100,7 @@
<p><ion-text [color]="pkg.installed.status['dependency-errors'][dep.key] ? 'warning' : 'success'">{{ pkg.installed.status['dependency-errors'][dep.key] ? pkg.installed.status['dependency-errors'][dep.key].type : 'satisfied' }}</ion-text></p>
</ion-label>
<ion-button *ngIf="!pkg.installed.status['dependency-errors'][dep.key] || (pkg.installed.status['dependency-errors'][dep.key] && [DependencyErrorType.InterfaceHealthChecksFailed, DependencyErrorType.HealthCheckFailed] | includes : pkg.installed.status['dependency-errors'][dep.key].type)" slot="end" size="small" [routerLink]="['/services', dep.key]">
<ion-button *ngIf="!pkg.installed.status['dependency-errors'][dep.key] || (pkg.installed.status['dependency-errors'][dep.key] && [DependencyErrorType.InterfaceHealthCheckFailed, DependencyErrorType.HealthCheckFailed] | includes : pkg.installed.status['dependency-errors'][dep.key].type)" slot="end" size="small" [routerLink]="['/services', dep.key]">
View
</ion-button>

2
ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
View File

@@ -38,7 +38,7 @@ export class MarketplaceShowPage {
private readonly navCtrl: NavController,
private readonly emver: Emver,
private readonly patch: PatchDbService,
readonly marketplaceService: MarketplaceService,
public readonly marketplaceService: MarketplaceService,
) { }
async ngOnInit () {

2
ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
View File

@@ -8,7 +8,7 @@
</ion-header>
<ion-content class="ion-padding">
<skeleton-list *ngIf="loading; else loaded" [groups]="2"></skeleton-list>
<skeleton-list *ngIf="loading; else loaded" groups="2"></skeleton-list>
<ng-template #loaded>
<ion-item-group *ngFor="let metricGroup of metrics | keyvalue : asIsOrder">

8
ui/src/app/services/patch-db/data-model.ts
View File

@@ -297,7 +297,7 @@ export interface HealthCheckResultFailure {
error: string
}
export type DependencyError = DependencyErrorNotInstalled | DependencyErrorNotRunning | DependencyErrorIncorrectVersion | DependencyErrorConfigUnsatisfied | DependencyErrorHealthCheckFailed | DependencyErrorInterfaceHealthChecksFailed
export type DependencyError = DependencyErrorNotInstalled | DependencyErrorNotRunning | DependencyErrorIncorrectVersion | DependencyErrorConfigUnsatisfied | DependencyErrorHealthCheckFailed | DependencyErrorInterfaceHealthCheckFailed
export enum DependencyErrorType {
NotInstalled = 'not-installed',
@@ -305,7 +305,7 @@ export enum DependencyErrorType {
IncorrectVersion = 'incorrect-version',
ConfigUnsatisfied = 'config-unsatisfied',
HealthCheckFailed = 'health-check-failed',
InterfaceHealthChecksFailed = 'interface-health-checks-failed',
InterfaceHealthCheckFailed = 'interface-health-checks-failed',
}
export interface DependencyErrorNotInstalled {
@@ -332,8 +332,8 @@ export interface DependencyErrorHealthCheckFailed {
check: HealthCheckResult
}
export interface DependencyErrorInterfaceHealthChecksFailed {
type: DependencyErrorType.InterfaceHealthChecksFailed
export interface DependencyErrorInterfaceHealthCheckFailed {
type: DependencyErrorType.InterfaceHealthCheckFailed
failures: { [id: string]: HealthCheckResult }
}