jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-28 11:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove app-route from hui-root (#5267)

Browse Source 
* Remove app-route from hui-root

* Update hui-root.ts
This commit is contained in:
Bram Kragten 2020-03-18 23:37:44 +01:00 committed by GitHub
parent fd62cf02d6
commit 3840671764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/panels/lovelace/hui-root.ts
View File

@ -12,7 +12,6 @@ import "@polymer/app-layout/app-header-layout/app-header-layout";
import "@polymer/app-layout/app-header/app-header"; import "@polymer/app-layout/app-header/app-header";
import "@polymer/app-layout/app-scroll-effects/effects/waterfall"; import "@polymer/app-layout/app-scroll-effects/effects/waterfall";
import "@polymer/app-layout/app-toolbar/app-toolbar"; import "@polymer/app-layout/app-toolbar/app-toolbar";
import "@polymer/app-route/app-route";
import "@polymer/paper-icon-button/paper-icon-button"; import "@polymer/paper-icon-button/paper-icon-button";
import "@material/mwc-button"; import "@material/mwc-button";
import "@polymer/paper-item/paper-item"; import "@polymer/paper-item/paper-item";
@ -61,7 +60,6 @@ class HUIRoot extends LitElement {
@property() public columns?: number; @property() public columns?: number;
@property() public narrow?: boolean; @property() public narrow?: boolean;
@property() public route?: { path: string; prefix: string }; @property() public route?: { path: string; prefix: string };
@property() private _routeData?: { view: string };
@property() private _curView?: number | "hass-unused-entities"; @property() private _curView?: number | "hass-unused-entities";
private _viewCache?: { [viewId: string]: HUIView }; private _viewCache?: { [viewId: string]: HUIView };
@ -84,9 +82,6 @@ class HUIRoot extends LitElement {
protected render(): TemplateResult { protected render(): TemplateResult {
return html` return html`
<app-route .route=${this.route} pattern="/:view" .data=${
this._routeData
} @data-changed=${this._routeDataChanged}></app-route>
<ha-app-layout id="layout"> <ha-app-layout id="layout">
<app-header slot="header" effects="waterfall" class=${classMap({ <app-header slot="header" effects="waterfall" class=${classMap({
"edit-mode": this._editMode, "edit-mode": this._editMode,
@ -485,15 +480,17 @@ class HUIRoot extends LitElement {
let newSelectView; let newSelectView;
let force = false; let force = false;
const viewPath = this.route!.path.split("/")[1];
if (changedProperties.has("route")) { if (changedProperties.has("route")) {
const views = this.config.views; const views = this.config.views;
if (this.route!.path === "" && views.length) { if (!viewPath && views.length) {
navigate(this, `${this.route!.prefix}/${views[0].path || 0}`, true); navigate(this, `${this.route!.prefix}/${views[0].path || 0}`, true);
newSelectView = 0; newSelectView = 0;
} else if (this._routeData!.view === "hass-unused-entities") { } else if (viewPath === "hass-unused-entities") {
newSelectView = "hass-unused-entities"; newSelectView = "hass-unused-entities";
} else if (this._routeData!.view) { } else if (viewPath) {
const selectedView = this._routeData!.view; const selectedView = viewPath;
const selectedViewInt = Number(selectedView); const selectedViewInt = Number(selectedView);
let index = 0; let index = 0;
for (let i = 0; i < views.length; i++) { for (let i = 0; i < views.length; i++) {
@ -520,7 +517,7 @@ class HUIRoot extends LitElement {
// Leave unused entities when leaving edit mode // Leave unused entities when leaving edit mode
if ( if (
this.lovelace!.mode === "storage" && this.lovelace!.mode === "storage" &&
this._routeData!.view === "hass-unused-entities" viewPath === "hass-unused-entities"
) { ) {
const views = this.config && this.config.views; const views = this.config && this.config.views;
navigate(this, `${this.route?.prefix}/${views[0]?.path || 0}`); navigate(this, `${this.route?.prefix}/${views[0]?.path || 0}`);
@ -560,10 +557,6 @@ class HUIRoot extends LitElement {
return this.shadowRoot!.getElementById("view") as HTMLDivElement; return this.shadowRoot!.getElementById("view") as HTMLDivElement;
} }
private _routeDataChanged(ev): void {
this._routeData = ev.detail.value;
}
private _handleRefresh(): void { private _handleRefresh(): void {
fireEvent(this, "config-refresh"); fireEvent(this, "config-refresh");
} }