20230503.1 (#16399)

This commit is contained in:
Bram Kragten 2023-05-03 16:15:27 +02:00 committed by GitHub
commit a293e7b91c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 46 additions and 25 deletions

View File

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "home-assistant-frontend" name = "home-assistant-frontend"
version = "20230503.0" version = "20230503.1"
license = {text = "Apache-2.0"} license = {text = "Apache-2.0"}
description = "The Home Assistant frontend" description = "The Home Assistant frontend"
readme = "README.md" readme = "README.md"

View File

@ -4,6 +4,7 @@ export interface GoogleEntity {
entity_id: string; entity_id: string;
traits: string[]; traits: string[];
might_2fa: boolean; might_2fa: boolean;
disable_2fa?: boolean;
} }
export const fetchCloudGoogleEntities = (hass: HomeAssistant) => export const fetchCloudGoogleEntities = (hass: HomeAssistant) =>

View File

@ -207,9 +207,14 @@ export class AssistPref extends LitElement {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
:host([dir="rtl"]) .header-actions {
right: auto;
left: 0;
}
.header-actions .icon-link { .header-actions .icon-link {
margin-top: -16px; margin-top: -16px;
margin-inline-end: 8px; margin-inline-end: 8px;
margin-inline-start: 8px;
margin-right: 8px; margin-right: 8px;
direction: var(--direction); direction: var(--direction);
color: var(--secondary-text-color); color: var(--secondary-text-color);
@ -239,6 +244,8 @@ export class AssistPref extends LitElement {
img { img {
height: 28px; height: 28px;
margin-right: 16px; margin-right: 16px;
margin-inline-end: 16px;
margin-inline-start: initial;
} }
`; `;
} }

View File

@ -284,6 +284,8 @@ export class CloudAlexaPref extends LitElement {
img { img {
height: 28px; height: 28px;
margin-right: 16px; margin-right: 16px;
margin-inline-end: 16px;
margin-inline-start: initial;
} }
`; `;
} }

View File

@ -18,10 +18,33 @@ export class CloudDiscover extends LitElement {
<div class="card-content"> <div class="card-content">
<h1 class="header"> <h1 class="header">
${this.hass.localize( ${this.hass.localize(
"ui.panel.config.voice_assistants.assistants.cloud.header" "ui.panel.config.voice_assistants.assistants.cloud.title",
{
home_assistant_cloud: html`
<span class="no-wrap">Home Assistant Cloud</span>
`,
}
)} )}
</h1> </h1>
<div class="features"> <div class="features">
<div class="feature">
<div class="logos">
<div class="round-icon">
<ha-svg-icon .path=${mdiMicrophoneMessage}></ha-svg-icon>
</div>
</div>
<h2>
${this.hass.localize(
"ui.panel.config.voice_assistants.assistants.cloud.features.speech.title"
)}
<span class="no-wrap"></span>
</h2>
<p>
${this.hass.localize(
"ui.panel.config.voice_assistants.assistants.cloud.features.speech.text"
)}
</p>
</div>
<div class="feature"> <div class="feature">
<div class="logos"> <div class="logos">
<img <img
@ -54,23 +77,6 @@ export class CloudDiscover extends LitElement {
)} )}
</p> </p>
</div> </div>
<div class="feature">
<div class="logos">
<div class="round-icon">
<ha-svg-icon .path=${mdiMicrophoneMessage}></ha-svg-icon>
</div>
</div>
<h2>
${this.hass.localize(
"ui.panel.config.voice_assistants.assistants.cloud.features.speech.title"
)}
</h2>
<p>
${this.hass.localize(
"ui.panel.config.voice_assistants.assistants.cloud.features.speech.text"
)}
</p>
</div>
</div> </div>
<div class="more"> <div class="more">
<a href="https://www.nabucasa.com" target="_blank" rel="noreferrer"> <a href="https://www.nabucasa.com" target="_blank" rel="noreferrer">
@ -195,6 +201,9 @@ export class CloudDiscover extends LitElement {
.more a ha-svg-icon { .more a ha-svg-icon {
--mdc-icon-size: 16px; --mdc-icon-size: 16px;
} }
.no-wrap {
white-space: nowrap;
}
`; `;
} }
} }

View File

@ -364,6 +364,8 @@ export class CloudGooglePref extends LitElement {
img { img {
height: 28px; height: 28px;
margin-right: 16px; margin-right: 16px;
margin-inline-end: 16px;
margin-inline-start: initial;
} }
`; `;
} }

View File

@ -211,7 +211,6 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
(googleManual && key === "cloud.google_assistant"); (googleManual && key === "cloud.google_assistant");
const support2fa = const support2fa =
this.entry &&
key === "cloud.google_assistant" && key === "cloud.google_assistant" &&
!googleManual && !googleManual &&
supported && supported &&
@ -256,7 +255,7 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
)} )}
> >
<ha-checkbox <ha-checkbox
.checked=${!this.entry!.options?.[key]?.disable_2fa} .checked=${!this._googleEntity!.disable_2fa}
@change=${this._2faChanged} @change=${this._2faChanged}
></ha-checkbox> ></ha-checkbox>
</ha-formfield> </ha-formfield>

View File

@ -50,6 +50,7 @@ export class HaConfigVoiceAssistantsAssistants extends LitElement {
${isComponentLoaded(this.hass, "assist_pipeline") ${isComponentLoaded(this.hass, "assist_pipeline")
? html` ? html`
<assist-pref <assist-pref
.dir=${computeRTLDirection(this.hass)}
.hass=${this.hass} .hass=${this.hass}
.cloudStatus=${this.cloudStatus} .cloudStatus=${this.cloudStatus}
.exposedEntities=${this.exposedEntities} .exposedEntities=${this.exposedEntities}
@ -62,13 +63,13 @@ export class HaConfigVoiceAssistantsAssistants extends LitElement {
.hass=${this.hass} .hass=${this.hass}
.exposedEntities=${this.exposedEntities} .exposedEntities=${this.exposedEntities}
.cloudStatus=${this.cloudStatus} .cloudStatus=${this.cloudStatus}
dir=${computeRTLDirection(this.hass)} .dir=${computeRTLDirection(this.hass)}
></cloud-alexa-pref> ></cloud-alexa-pref>
<cloud-google-pref <cloud-google-pref
.hass=${this.hass} .hass=${this.hass}
.exposedEntities=${this.exposedEntities} .exposedEntities=${this.exposedEntities}
.cloudStatus=${this.cloudStatus} .cloudStatus=${this.cloudStatus}
dir=${computeRTLDirection(this.hass)} .dir=${computeRTLDirection(this.hass)}
></cloud-google-pref> ></cloud-google-pref>
` `
: html`<cloud-discover .hass=${this.hass}></cloud-discover>`} : html`<cloud-discover .hass=${this.hass}></cloud-discover>`}

View File

@ -2081,14 +2081,14 @@
} }
}, },
"cloud": { "cloud": {
"header": "Get the best assistant with Home Assistant Cloud", "title": "Get the best assistant with {home_assistant_cloud}",
"features": { "features": {
"assistants": { "assistants": {
"title": "Google Assistant and Amazon Alexa", "title": "Google Assistant and Amazon Alexa",
"text": "Control all your Home Assistant devices via any Google Assistant-enabled or Alexa-enabled device." "text": "Control all your Home Assistant devices via any Google Assistant-enabled or Alexa-enabled device."
}, },
"speech": { "speech": {
"title": "Better speech options", "title": "Amazing speech options for Assist",
"text": "Bring personality to your home by having it speak to you using our neural-network powered speech-to-text and text-to-speech services." "text": "Bring personality to your home by having it speak to you using our neural-network powered speech-to-text and text-to-speech services."
} }
}, },