Navigate cleanup

demo/src/ha-demo.ts

@@ -70,7 +70,7 @@ class HaDemo extends HomeAssistantAppEl {
         }
 
         e.preventDefault();
-        navigate(this, href);
+        navigate(href);
       },
       { capture: true }
     );

hassio/src/addon-store/hassio-addon-repository.ts

@@ -120,7 +120,7 @@ class HassioAddonRepositoryEl extends LitElement {
   }
 
   private _addonTapped(ev) {
-    navigate(this, `/hassio/addon/${ev.currentTarget.addon.slug}`);
+    navigate(`/hassio/addon/${ev.currentTarget.addon.slug}`);
   }
 
   static get styles(): CSSResultGroup {

hassio/src/addon-store/hassio-addon-store.ts

@@ -138,7 +138,7 @@ class HassioAddonStore extends LitElement {
   protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
     const repositoryUrl = extractSearchParam("repository_url");
-    navigate(this, "/hassio/store", true);
+    navigate("/hassio/store", { replace: true });
     if (repositoryUrl) {
       this._manageRepositories(repositoryUrl);
     }

hassio/src/addon-view/hassio-addon-dashboard.ts

@@ -175,7 +175,7 @@ class HassioAddonDashboard extends LitElement {
         if (!validAddon) {
           this._error = this.supervisor.localize("my.error_addon_not_found");
         } else {
-          navigate(this, `/hassio/addon/${requestedAddon}`, true);
+          navigate(`/hassio/addon/${requestedAddon}`, { replace: true });
         }
       }
     }

hassio/src/addon-view/info/hassio-addon-info.ts

@@ -761,7 +761,7 @@ class HassioAddonInfo extends LitElement {
   }
 
   private _openIngress(): void {
-    navigate(this, `/hassio/ingress/${this.addon.slug}`);
+    navigate(`/hassio/ingress/${this.addon.slug}`);
   }
 
   private get _computeShowIngressUI(): boolean {
@@ -1051,7 +1051,7 @@ class HassioAddonInfo extends LitElement {
   }
 
   private _openConfiguration(): void {
-    navigate(this, `/hassio/addon/${this.addon.slug}/config`);
+    navigate(`/hassio/addon/${this.addon.slug}/config`);
   }
 
   private async _uninstallClicked(ev: CustomEvent): Promise<void> {

hassio/src/dashboard/hassio-addons.ts

@@ -96,11 +96,11 @@ class HassioAddons extends LitElement {
   }
 
   private _addonTapped(ev: any): void {
-    navigate(this, `/hassio/addon/${ev.currentTarget.addon.slug}/info`);
+    navigate(`/hassio/addon/${ev.currentTarget.addon.slug}/info`);
   }
 
   private _openStore(): void {
-    navigate(this, "/hassio/store");
+    navigate("/hassio/store");
   }
 }
 

hassio/src/hassio-main.ts

@@ -63,7 +63,7 @@ export class HassioMain extends SupervisorBaseElement {
     document.body.addEventListener("click", (ev) => {
       const href = isNavigationClick(ev);
       if (href) {
-        navigate(document.body, href);
+        navigate(href);
       }
     });
 

hassio/src/hassio-my-redirect.ts

@@ -89,7 +89,7 @@ class HassioMyRedirect extends LitElement {
       return;
     }
 
-    navigate(this, url, true);
+    navigate(url, { replace: true });
   }
 
   protected render(): TemplateResult {

hassio/src/ingress-view/hassio-ingress-view.ts

@@ -105,7 +105,7 @@ class HassioIngressView extends LitElement {
           });
           history.back();
         } else {
-          navigate(this, `/hassio/ingress/${addonInfo.slug}`, true);
+          navigate(`/hassio/ingress/${addonInfo.slug}`, { replace: true });
         }
       }
     }
@@ -157,8 +157,8 @@ class HassioIngressView extends LitElement {
       await showAlertDialog(this, {
         text: "Add-on is not running. Please start it first",
         title: addon.name,
+        confirm: () => navigate(`/hassio/addon/${addon.slug}`),
       });
-      navigate(this, `/hassio/addon/${addon.slug}/info`, true);
       return;
     }
 

src/common/navigate.ts

@@ -4,13 +4,17 @@ import { mainWindow } from "./dom/get_main_window";
 declare global {
   // for fire event
   interface HASSDomEvents {
-    "location-changed": {
-      replace: boolean;
-    };
+    "location-changed": NavigateOptions;
   }
 }
 
-export const navigate = (_node: any, path: string, replace = false) => {
+export interface NavigateOptions {
+  replace?: boolean;
+}
+
+export const navigate = (path: string, options?: NavigateOptions) => {
+  const replace = options?.replace || false;
+
   if (__DEMO__) {
     if (replace) {
       mainWindow.history.replaceState(

src/data/automation.ts

@@ -241,12 +241,9 @@ let inititialAutomationEditorData: Partial<AutomationConfig> | undefined;
 export const getAutomationConfig = (hass: HomeAssistant, id: string) =>
   hass.callApi<AutomationConfig>("GET", `config/automation/config/${id}`);
 
-export const showAutomationEditor = (
-  el: HTMLElement,
-  data?: Partial<AutomationConfig>
-) => {
+export const showAutomationEditor = (data?: Partial<AutomationConfig>) => {
   inititialAutomationEditorData = data;
-  navigate(el, "/config/automation/edit/new");
+  navigate("/config/automation/edit/new");
 };
 
 export const getAutomationEditorInitData = () => {

src/data/scene.ts

@@ -20,12 +20,9 @@ export const SCENE_IGNORED_DOMAINS = [
 
 let inititialSceneEditorData: Partial<SceneConfig> | undefined;
 
-export const showSceneEditor = (
-  el: HTMLElement,
-  data?: Partial<SceneConfig>
-) => {
+export const showSceneEditor = (data?: Partial<SceneConfig>) => {
   inititialSceneEditorData = data;
-  navigate(el, "/config/scene/edit/new");
+  navigate("/config/scene/edit/new");
 };
 
 export const getSceneEditorInitData = () => {

src/data/script.ts

@@ -182,12 +182,9 @@ export const deleteScript = (hass: HomeAssistant, objectId: string) =>
 
 let inititialScriptEditorData: Partial<ScriptConfig> | undefined;
 
-export const showScriptEditor = (
-  el: HTMLElement,
-  data?: Partial<ScriptConfig>
-) => {
+export const showScriptEditor = (data?: Partial<ScriptConfig>) => {
   inititialScriptEditorData = data;
-  navigate(el, "/config/script/edit/new");
+  navigate("/config/script/edit/new");
 };
 
 export const getScriptEditorInitData = () => {

src/data/zone.ts

@@ -56,12 +56,9 @@ export const deleteZone = (hass: HomeAssistant, zoneId: string) =>
 
 let inititialZoneEditorData: Partial<ZoneMutableParams> | undefined;
 
-export const showZoneEditor = (
-  el: HTMLElement,
-  data?: Partial<ZoneMutableParams>
-) => {
+export const showZoneEditor = (data?: Partial<ZoneMutableParams>) => {
   inititialZoneEditorData = data;
-  navigate(el, "/config/zone/new");
+  navigate("/config/zone/new");
 };
 
 export const getZoneEditorInitData = () => {

src/dialogs/more-info/controls/more-info-person.ts

@@ -54,7 +54,7 @@ class MoreInfoPerson extends LitElement {
   }
 
   private _handleAction() {
-    showZoneEditor(this, {
+    showZoneEditor({
       latitude: this.stateObj!.attributes.latitude,
       longitude: this.stateObj!.attributes.longitude,
     });

src/dialogs/more-info/ha-more-info-dialog.ts

@@ -306,7 +306,7 @@ export class MoreInfoDialog extends LitElement {
       idToPassThroughUrl = stateObj.attributes.id;
     }
 
-    navigate(this, `/config/${domain}/edit/${idToPassThroughUrl}`);
+    navigate(`/config/${domain}/edit/${idToPassThroughUrl}`);
     this.closeDialog();
   }
 

src/dialogs/quick-bar/ha-quick-bar.ts

@@ -557,7 +557,7 @@ export class QuickBar extends LitElement {
         categoryText: this.hass.localize(
           `ui.dialogs.quick-bar.commands.types.${categoryKey}`
         ),
-        action: () => navigate(this, item.path),
+        action: () => navigate(item.path),
       };
 
       return {

src/entrypoints/custom-panel.ts

@@ -88,7 +88,7 @@ function initialize(
           if (window.parent.customPanel) {
             window.parent.customPanel.navigate(
               window.location.pathname,
-              ev.detail ? ev.detail.replace : false
+              ev.detail
             );
           }
         });
@@ -122,7 +122,7 @@ function initialize(
   document.body.addEventListener("click", (ev) => {
     const href = isNavigationClick(ev);
     if (href) {
-      navigate(document.body, href);
+      navigate(href);
     }
   });
 }

src/layouts/hass-router-page.ts

@@ -99,7 +99,7 @@ export class HassRouterPage extends ReactiveElement {
     const defaultPage = routerOptions.defaultPage;
 
     if (route && route.path === "" && defaultPage !== undefined) {
-      navigate(this, `${route.prefix}/${defaultPage}`, true);
+      navigate(`${route.prefix}/${defaultPage}`, { replace: true });
     }
 
     let newPage = route
@@ -127,7 +127,7 @@ export class HassRouterPage extends ReactiveElement {
 
         // Update the url if we know where we're mounted.
         if (route) {
-          navigate(this, `${route.prefix}/${result}`, true);
+          navigate(`${route.prefix}/${result}`, { replace: true });
         }
       }
     }

src/layouts/home-assistant.ts

@@ -45,7 +45,7 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
     const path = curPath();
 
     if (["", "/"].includes(path)) {
-      navigate(this, `/${getStorageDefaultPanelUrlPath()}`, true);
+      navigate(`/${getStorageDefaultPanelUrlPath()}`, { replace: true });
     }
     this._route = {
       prefix: "",
@@ -106,7 +106,7 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
     window.addEventListener("click", (ev) => {
       const href = isNavigationClick(ev);
       if (href) {
-        navigate(this, href);
+        navigate(href);
       }
     });
   }

src/mixins/navigate-mixin.js

@@ -9,7 +9,7 @@ export default dedupingMixin(
   (superClass) =>
     class extends superClass {
       navigate(...args) {
-        navigate(this, ...args);
+        navigate(...args);
       }
     }
 );

src/onboarding/onboarding-restore-snapshot.ts

@@ -63,7 +63,7 @@ class OnboardingRestoreSnapshot extends ProvideHassLitMixin(LitElement) {
         });
         if (response.status === 401) {
           // If we get a unauthorized response, the restore is done
-          navigate(this, "/", true);
+          navigate("/", { replace: true });
           location.reload();
         }
       } catch (err) {

src/panels/config/areas/dialog-area-registry-detail.ts

@@ -149,7 +149,7 @@ class DialogAreaDetail extends LitElement {
       this._submitting = false;
     }
 
-    navigate(this, "/config/areas/dashboard");
+    navigate("/config/areas/dashboard");
   }
 
   static get styles(): CSSResultGroup {

src/panels/config/areas/ha-config-areas-dashboard.ts

@@ -192,7 +192,7 @@ export class HaConfigAreasDashboard extends LitElement {
 
   private _handleRowClicked(ev: HASSDomEvent<RowClickedEvent>) {
     const areaId = ev.detail.id;
-    navigate(this, `/config/areas/area/${areaId}`);
+    navigate(`/config/areas/area/${areaId}`);
   }
 
   private _openDialog(entry?: AreaRegistryEntry) {

src/panels/config/automation/dialog-new-automation.ts

@@ -108,7 +108,7 @@ class DialogNewAutomation extends LitElement implements HassDialog {
     replaceDialog();
     showThingtalkDialog(this, {
       callback: (config: Partial<AutomationConfig> | undefined) =>
-        showAutomationEditor(this, config),
+        showAutomationEditor(config),
       input: this.shadowRoot!.querySelector("paper-input")!.value as string,
     });
     this.closeDialog();
@@ -117,13 +117,13 @@ class DialogNewAutomation extends LitElement implements HassDialog {
   private async _blueprintPicked(ev: CustomEvent) {
     this.closeDialog();
     await nextRender();
-    showAutomationEditor(this, { use_blueprint: { path: ev.detail.value } });
+    showAutomationEditor({ use_blueprint: { path: ev.detail.value } });
   }
 
   private async _blank() {
     this.closeDialog();
     await nextRender();
-    showAutomationEditor(this);
+    showAutomationEditor();
   }
 
   static get styles(): CSSResultGroup {

src/panels/config/automation/ha-automation-editor.ts

@@ -450,7 +450,7 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
       // Wait for dialog to complate closing
       await new Promise((resolve) => setTimeout(resolve, 0));
     }
-    showAutomationEditor(this, {
+    showAutomationEditor({
       ...this._config,
       id: undefined,
       alias: `${this._config?.alias} (${this.hass.localize(
@@ -503,7 +503,7 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
         this._dirty = false;
 
         if (!this.automationId) {
-          navigate(this, `/config/automation/edit/${id}`, true);
+          navigate(`/config/automation/edit/${id}`, { replace: true });
         }
       },
       (errors) => {

src/panels/config/automation/ha-automation-picker.ts

@@ -324,7 +324,7 @@ class HaAutomationPicker extends LitElement {
     ) {
       showNewAutomationDialog(this);
     } else {
-      navigate(this, "/config/automation/edit/new");
+      navigate("/config/automation/edit/new");
     }
   }
 

src/panels/config/blueprint/ha-blueprint-overview.ts

@@ -46,11 +46,8 @@ interface BlueprintMetaDataPath extends BlueprintMetaData {
 }
 
 const createNewFunctions = {
-  automation: (
-    context: HaBlueprintOverview,
-    blueprintMeta: BlueprintMetaDataPath
-  ) => {
-    showAutomationEditor(context, {
+  automation: (blueprintMeta: BlueprintMetaDataPath) => {
+    showAutomationEditor({
       alias: blueprintMeta.name,
       use_blueprint: { path: blueprintMeta.path },
     });
@@ -183,7 +180,7 @@ class HaBlueprintOverview extends LitElement {
     super.firstUpdated(changedProps);
     if (this.route.path === "/import") {
       const url = extractSearchParam("blueprint_url");
-      navigate(this, "/config/blueprint/dashboard", true);
+      navigate("/config/blueprint/dashboard", { replace: true });
       if (url) {
         this._addBlueprint(url);
       }
@@ -280,7 +277,7 @@ class HaBlueprintOverview extends LitElement {
 
   private _createNew(ev) {
     const blueprint = ev.currentTarget.blueprint as BlueprintMetaDataPath;
-    createNewFunctions[blueprint.domain](this, blueprint);
+    createNewFunctions[blueprint.domain](blueprint);
   }
 
   private _share(ev) {