jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-14 12:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Lovelace Empty Menu when not advanced or admin (#11660)

Browse Source
This commit is contained in:
Zack Barett 2022-02-11 10:31:45 -06:00 committed by GitHub
parent 099fa706a0
commit db7cac5782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 156 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,6 +276,8 @@ class HUIRoot extends LitElement {
></ha-icon-button> ></ha-icon-button>
` `
: ""} : ""}
${this._showButtonMenu
? html`
<ha-button-menu corner="BOTTOM_START"> <ha-button-menu corner="BOTTOM_START">
<ha-icon-button <ha-icon-button
slot="trigger" slot="trigger"
@ -292,7 +294,8 @@ class HUIRoot extends LitElement {
"ui.panel.lovelace.menu.start_conversation" "ui.panel.lovelace.menu.start_conversation"
)} )}
graphic="icon" graphic="icon"
@request-selected=${this._showVoiceCommandDialog} @request-selected=${this
._showVoiceCommandDialog}
> >
<span <span
>${this.hass!.localize( >${this.hass!.localize(
@ -316,7 +319,9 @@ class HUIRoot extends LitElement {
@request-selected=${this._handleRefresh} @request-selected=${this._handleRefresh}
> >
<span <span
>${this.hass!.localize("ui.common.refresh")}</span >${this.hass!.localize(
"ui.common.refresh"
)}</span
> >
<ha-svg-icon <ha-svg-icon
slot="graphic" slot="graphic"
@ -328,7 +333,8 @@ class HUIRoot extends LitElement {
"ui.panel.lovelace.unused_entities.title" "ui.panel.lovelace.unused_entities.title"
)} )}
graphic="icon" graphic="icon"
@request-selected=${this._handleUnusedEntities} @request-selected=${this
._handleUnusedEntities}
> >
<span <span
>${this.hass!.localize( >${this.hass!.localize(
@ -342,15 +348,18 @@ class HUIRoot extends LitElement {
</mwc-list-item> </mwc-list-item>
` `
: ""} : ""}
${(this.hass.panels.lovelace?.config as LovelacePanelConfig) ${(
?.mode === "yaml" this.hass.panels.lovelace
?.config as LovelacePanelConfig
)?.mode === "yaml"
? html` ? html`
<mwc-list-item <mwc-list-item
graphic="icon" graphic="icon"
aria-label=${this.hass!.localize( aria-label=${this.hass!.localize(
"ui.panel.lovelace.menu.reload_resources" "ui.panel.lovelace.menu.reload_resources"
)} )}
@request-selected=${this._handleReloadResources} @request-selected=${this
._handleReloadResources}
> >
${this.hass!.localize( ${this.hass!.localize(
"ui.panel.lovelace.menu.reload_resources" "ui.panel.lovelace.menu.reload_resources"
@ -362,14 +371,16 @@ class HUIRoot extends LitElement {
</mwc-list-item> </mwc-list-item>
` `
: ""} : ""}
${this.hass!.user?.is_admin && !this.hass!.config.safe_mode ${this.hass!.user?.is_admin &&
!this.hass!.config.safe_mode
? html` ? html`
<mwc-list-item <mwc-list-item
graphic="icon" graphic="icon"
aria-label=${this.hass!.localize( aria-label=${this.hass!.localize(
"ui.panel.lovelace.menu.configure_ui" "ui.panel.lovelace.menu.configure_ui"
)} )}
@request-selected=${this._handleEnableEditMode} @request-selected=${this
._handleEnableEditMode}
> >
${this.hass!.localize( ${this.hass!.localize(
"ui.panel.lovelace.menu.configure_ui" "ui.panel.lovelace.menu.configure_ui"
@ -384,7 +395,10 @@ class HUIRoot extends LitElement {
${this._editMode ${this._editMode
? html` ? html`
<a <a
href=${documentationUrl(this.hass, "/lovelace/")} href=${documentationUrl(
this.hass,
"/lovelace/"
)}
rel="noreferrer" rel="noreferrer"
class="menu-link" class="menu-link"
target="_blank" target="_blank"
@ -407,6 +421,8 @@ class HUIRoot extends LitElement {
` `
: ""} : ""}
</ha-button-menu> </ha-button-menu>
`
: ""}
</app-toolbar> </app-toolbar>
`} `}
${this._editMode ${this._editMode
@ -621,6 +637,17 @@ class HUIRoot extends LitElement {
return this.shadowRoot!.getElementById("view") as HTMLDivElement; return this.shadowRoot!.getElementById("view") as HTMLDivElement;
} }
private get _showButtonMenu(): boolean {
return (
(this.narrow && this._conversation(this.hass.config.components)) ||
this._editMode ||
(this.hass!.user?.is_admin && !this.hass!.config.safe_mode) ||
(this.hass.panels.lovelace?.config as LovelacePanelConfig)?.mode ===
"yaml" ||
this._yamlMode
);
}
private _handleRefresh(ev: CustomEvent<RequestSelectedDetail>): void { private _handleRefresh(ev: CustomEvent<RequestSelectedDetail>): void {
if (!shouldHandleRequestSelectedEvent(ev)) { if (!shouldHandleRequestSelectedEvent(ev)) {
return; return;