From ecc6fcf862bad7780cebdca93b04bfdbedb75228 Mon Sep 17 00:00:00 2001 From: Robbie Trencheny Date: Thu, 13 Feb 2020 17:47:08 -0800 Subject: [PATCH] Hide HTML5 push notification toggle if inside external app (#4860) * Hide HTML5 push notification toggle if external bus is engaged * Use isExternal instead * Hide the whole row * Black * Fix import Co-authored-by: Paulus Schoutsen --- src/data/external.ts | 4 ++++ src/entrypoints/core.ts | 6 +----- src/panels/profile/ha-panel-profile.ts | 13 +++++++++---- 3 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 src/data/external.ts diff --git a/src/data/external.ts b/src/data/external.ts new file mode 100644 index 0000000000..3701f58e5e --- /dev/null +++ b/src/data/external.ts @@ -0,0 +1,4 @@ +export const isExternal = + window.externalApp || + window.webkit?.messageHandlers?.getExternalAuth || + location.search.includes("external_auth=1"); diff --git a/src/entrypoints/core.ts b/src/entrypoints/core.ts index c44f03d892..60688ee147 100644 --- a/src/entrypoints/core.ts +++ b/src/entrypoints/core.ts @@ -10,6 +10,7 @@ import { } from "home-assistant-js-websocket"; import { loadTokens, saveTokens } from "../common/auth/token_storage"; +import { isExternal } from "../data/external"; import { subscribePanels } from "../data/ws-panels"; import { subscribeThemes } from "../data/ws-themes"; import { subscribeUser } from "../data/ws-user"; @@ -23,11 +24,6 @@ declare global { } } -const isExternal = - window.externalApp || - window.webkit?.messageHandlers?.getExternalAuth || - location.search.includes("external_auth=1"); - const authProm = isExternal ? () => import( diff --git a/src/panels/profile/ha-panel-profile.ts b/src/panels/profile/ha-panel-profile.ts index b9ef34afcb..8f1443f898 100644 --- a/src/panels/profile/ha-panel-profile.ts +++ b/src/panels/profile/ha-panel-profile.ts @@ -31,6 +31,7 @@ import { getOptimisticFrontendUserDataCollection, CoreFrontendUserData, } from "../../data/frontend"; +import { isExternal } from "../../data/external"; import { haStyle } from "../../resources/styles"; import { HomeAssistant } from "../../types"; import { fireEvent } from "../../common/dom/fire_event"; @@ -113,10 +114,14 @@ class HaPanelProfile extends LitElement { > ` : ""} - + ${!isExternal + ? html` + + ` + : ""} ${this.hass.user!.is_admin ? html`