From c1ac66f6e5feeadfed9fb6f49ca827a253ebbc65 Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:54:05 -0700 Subject: [PATCH] closes #1900 (#1920) * closes #1900 * fix refresh bug Co-authored-by: Matt Hill --- .../projects/setup-wizard/src/app/pages/home/home.page.ts | 2 +- .../refresh-alert/refresh-alert.component.html | 8 ++++++-- .../refresh-alert/refresh-alert.service.ts | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/projects/setup-wizard/src/app/pages/home/home.page.ts b/frontend/projects/setup-wizard/src/app/pages/home/home.page.ts index 7df9d3423..bf25183a6 100644 --- a/frontend/projects/setup-wizard/src/app/pages/home/home.page.ts +++ b/frontend/projects/setup-wizard/src/app/pages/home/home.page.ts @@ -47,7 +47,7 @@ export class HomePage { } async ionViewDidEnter() { - this.loaded = true // needed to accomodate autoHight="true" on swiper. Otherwise Swiper height might be 0 when navigatging *to* this page from later page. Happens on refresh. + this.loaded = true // needed to accommodate autoHight="true" on swiper. Otherwise Swiper height might be 0 when navigating *to* this page from later page. Happens on refresh. if (this.swiper) { this.swiper.allowTouchMove = false } diff --git a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.html b/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.html index fe6dd640d..0c4ec3543 100644 --- a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.html +++ b/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.html @@ -1,5 +1,9 @@ - + Your user interface is cached and out of date. Hard refresh the page to get the latest UI. - Refresh Page +
    +
  • On Mac: cmd + shift + R
  • +
  • On Linux/Windows: ctrl + shift + R
  • +
+ Ok
diff --git a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts b/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts index 460c00ff6..43c7f82c4 100644 --- a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts +++ b/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts @@ -6,7 +6,6 @@ import { PatchDB } from 'patch-db-client' import { ConfigService } from '../../../services/config.service' import { DataModel } from 'src/app/services/patch-db/data-model' -// Watch for connection status @Injectable({ providedIn: 'root' }) export class RefreshAlertService extends Observable { private readonly stream$ = this.patch.watch$('server-info', 'version').pipe(