diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index 524101f7c..dd83a9182 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -121,7 +121,10 @@ export class AppComponent { ) .subscribe(_ => { this.subscriptions = this.subscriptions.concat([ + // watch status to present toast for updated state this.watchStatus(), + // watch update-progress to present progress bar when server is updating + this.watchUpdateProgress(), // watch version to refresh browser window this.watchVersion(), // watch unread notification count to display toast @@ -235,9 +238,6 @@ export class AppComponent { private watchStatus (): Subscription { return this.patch.watch$('server-info', 'status') .subscribe(status => { - if (status === ServerStatus.Updating) { - this.watchUpdateProgress() - } if (status === ServerStatus.Updated && !this.updateToast) { this.presentToastUpdated() } diff --git a/ui/src/app/pages/apps-routes/app-show/app-show.module.ts b/ui/src/app/pages/apps-routes/app-show/app-show.module.ts index 29c14ce6e..79cb8f805 100644 --- a/ui/src/app/pages/apps-routes/app-show/app-show.module.ts +++ b/ui/src/app/pages/apps-routes/app-show/app-show.module.ts @@ -7,7 +7,6 @@ import { StatusComponentModule } from 'src/app/components/status/status.componen import { SharingModule } from 'src/app/modules/sharing.module' import { InstallWizardComponentModule } from 'src/app/components/install-wizard/install-wizard.component.module' import { AppConfigPageModule } from 'src/app/modals/app-config/app-config.module' -import { MarkdownPageModule } from 'src/app/modals/markdown/markdown.module' import { AppShowHeaderComponent } from './components/app-show-header/app-show-header.component' import { AppShowProgressComponent } from './components/app-show-progress/app-show-progress.component' import { AppShowStatusComponent } from './components/app-show-status/app-show-status.component' @@ -50,7 +49,6 @@ const routes: Routes = [ InstallWizardComponentModule, AppConfigPageModule, SharingModule, - MarkdownPageModule, ], }) export class AppShowPageModule {} diff --git a/ui/src/app/services/api/embassy-mock-api.service.ts b/ui/src/app/services/api/embassy-mock-api.service.ts index 7636f7008..d5a9c197b 100644 --- a/ui/src/app/services/api/embassy-mock-api.service.ts +++ b/ui/src/app/services/api/embassy-mock-api.service.ts @@ -135,11 +135,6 @@ export class MockApiService extends ApiService { }, 500) const patch = [ - { - op: PatchOp.REPLACE, - path: '/server-info/status', - value: ServerStatus.Updating, - }, { op: PatchOp.REPLACE, path: '/server-info/update-progress', diff --git a/ui/src/app/services/patch-db/data-model.ts b/ui/src/app/services/patch-db/data-model.ts index 02a454f6d..86503b7e0 100644 --- a/ui/src/app/services/patch-db/data-model.ts +++ b/ui/src/app/services/patch-db/data-model.ts @@ -36,7 +36,6 @@ export interface ServerInfo { export enum ServerStatus { Running = 'running', - Updating = 'updating', Updated = 'updated', BackingUp = 'backing-up', }