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

update done fix

Browse Source
This commit is contained in:
Drew Ansbacher
2022-02-10 16:49:56 -07:00
committed by Aiden McClelland
parent e3fd98f8c9
commit 6fbe207a8c
4 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/projects/ui/src/app/app.component.ts
View File

@@ -298,6 +298,7 @@ export class AppComponent {
}
})
}
m
private watchUpdateProgress (): Subscription {
return this.patch

33
frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
View File

@@ -63,19 +63,30 @@
</p>
<!-- "Software Update" button only -->
<p *ngIf="button.title === 'Software Update'">
<ng-container
*ngIf="eosService.updateAvailable$ | async; else check"
>
<ion-text class="inline" color="success">
<ion-icon name="rocket-outline"></ion-icon>
Update Available
<ng-container *ngIf="button.disabled | async; else enabled">
<ion-text
*ngIf="patch.data['server-info']['status-info'].updated"
class="inline"
color="warning"
>
Update Complete, Restart to apply changes
</ion-text>
</ng-container>
<ng-template #check>
<ion-text class="inline" color="dark">
<ion-icon name="refresh"></ion-icon>
Check for updates
</ion-text>
<ng-template #enabled>
<ng-container
*ngIf="eosService.updateAvailable$ | async; else check"
>
<ion-text class="inline" color="success">
<ion-icon name="rocket-outline"></ion-icon>
Update Available
</ion-text>
</ng-container>
<ng-template #check>
<ion-text class="inline" color="dark">
<ion-icon name="refresh"></ion-icon>
Check for updates
</ion-text>
</ng-template>
</ng-template>
</p>
</ion-label>

17
frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
View File

@@ -236,7 +236,10 @@ export class ServerShowPage {
disabled: this.patch
.watch$('server-info', 'status-info')
.pipe(
map(status => status['backing-up'] || !!status['update-progress']),
map(
status =>
status && (status['backing-up'] || !!status['update-progress']),
),
),
},
],
@@ -250,7 +253,17 @@ export class ServerShowPage {
? this.updateEos()
: this.checkForEosUpdate(),
detail: false,
disabled: of(false),
disabled: this.patch
.watch$('server-info', 'status-info')
.pipe(
map(
status =>
status &&
(status['backing-up'] ||
!!status['update-progress'] ||
status.updated),
),
),
},
{
title: 'Preferences',