Merge branch 'dev' into eslint-check-type-import

home-assistant · Oct 23, 2024 · 5c43a74 · 5c43a74
2 parents d2570eb + e16e851
commit 5c43a74
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/cast/src/launcher/layout/hc-layout.ts b/cast/src/launcher/layout/hc-layout.ts
@@ -85,7 +85,7 @@ class HcLayout extends LitElement {
       }
 
       .card-header {
-        color: var(--ha-card-header-color, --primary-text-color);
+        color: var(--ha-card-header-color, var(--primary-text-color));
         font-family: var(--ha-card-header-font-family, inherit);
         font-size: var(--ha-card-header-font-size, 24px);
         letter-spacing: -0.012em;

diff --git a/hassio/src/addon-view/config/hassio-addon-config.ts b/hassio/src/addon-view/config/hassio-addon-config.ts
@@ -413,7 +413,7 @@ class HassioAddonConfig extends LitElement {
           justify-content: space-between;
         }
         .header h2 {
-          color: var(--ha-card-header-color, --primary-text-color);
+          color: var(--ha-card-header-color, var(--primary-text-color));
           font-family: var(--ha-card-header-font-family, inherit);
           font-size: var(--ha-card-header-font-size, 24px);
           letter-spacing: -0.012em;

diff --git a/hassio/src/addon-view/info/hassio-addon-info.ts b/hassio/src/addon-view/info/hassio-addon-info.ts
@@ -1212,7 +1212,7 @@ class HassioAddonInfo extends LitElement {
           padding-inline-start: 8px;
           padding-inline-end: initial;
           font-size: 24px;
-          color: var(--ha-card-header-color, --primary-text-color);
+          color: var(--ha-card-header-color, var(--primary-text-color));
         }
         .addon-version {
           float: var(--float-end);

diff --git a/src/components/ha-card.ts b/src/components/ha-card.ts
@@ -44,7 +44,7 @@ export class HaCard extends LitElement {
 
       .card-header,
       :host ::slotted(.card-header) {
-        color: var(--ha-card-header-color, --primary-text-color);
+        color: var(--ha-card-header-color, var(--primary-text-color));
         font-family: var(--ha-card-header-font-family, inherit);
         font-size: var(--ha-card-header-font-size, 24px);
         letter-spacing: -0.012em;

diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts
@@ -851,11 +851,14 @@ class HaSidebar extends SubscribeMixin(LitElement) {
           border-bottom: 1px solid transparent;
           white-space: nowrap;
           font-weight: 400;
-          color: var(--sidebar-menu-button-text-color, --primary-text-color);
+          color: var(
+            --sidebar-menu-button-text-color,
+            var(--primary-text-color)
+          );
           border-bottom: 1px solid var(--divider-color);
           background-color: var(
             --sidebar-menu-button-background-color,
-            --primary-background-color
+            var(--primary-background-color)
           );
           font-size: 20px;
           align-items: center;

diff --git a/src/panels/config/logs/error-log-card.ts b/src/panels/config/logs/error-log-card.ts
@@ -230,7 +230,7 @@ class ErrorLogCard extends LitElement {
     }
 
     .card-header {
-      color: var(--ha-card-header-color, --primary-text-color);
+      color: var(--ha-card-header-color, var(--primary-text-color));
       font-family: var(--ha-card-header-font-family, inherit);
       font-size: var(--ha-card-header-font-size, 24px);
       letter-spacing: -0.012em;

diff --git a/src/panels/config/logs/system-log-card.ts b/src/panels/config/logs/system-log-card.ts
@@ -213,7 +213,7 @@ export class SystemLogCard extends LitElement {
       }
 
       .card-header {
-        color: var(--ha-card-header-color, --primary-text-color);
+        color: var(--ha-card-header-color, var(--primary-text-color));
         font-family: var(--ha-card-header-font-family, inherit);
         font-size: var(--ha-card-header-font-size, 24px);
         letter-spacing: -0.012em;

diff --git a/src/panels/config/voice-assistants/assist-pref.ts b/src/panels/config/voice-assistants/assist-pref.ts
@@ -21,14 +21,10 @@ import "../../../components/ha-icon-button";
 import "../../../components/ha-list-item";
 import "../../../components/ha-svg-icon";
 import "../../../components/ha-switch";
-import type {
-  AssistDevice,
-  AssistPipeline,
-} from "../../../data/assist_pipeline";
+import type { AssistPipeline } from "../../../data/assist_pipeline";
 import {
   createAssistPipeline,
   deleteAssistPipeline,
-  listAssistDevices,
   listAssistPipelines,
   setAssistPipelinePreferred,
   updateAssistPipeline,
@@ -45,6 +41,7 @@ import { documentationUrl } from "../../../util/documentation-url";
 import { showVoiceAssistantPipelineDetailDialog } from "./show-dialog-voice-assistant-pipeline-detail";
 import { showVoiceCommandDialog } from "../../../dialogs/voice-command-dialog/show-ha-voice-command-dialog";
 import { stopPropagation } from "../../../common/dom/stop_propagation";
+import { computeDomain } from "../../../common/entity/compute_domain";
 
 @customElement("assist-pref")
 export class AssistPref extends LitElement {
@@ -61,7 +58,7 @@ export class AssistPref extends LitElement {
 
   @state() private _preferred: string | null = null;
 
-  @state() private _devices: AssistDevice[] = [];
+  @state() private _pipelineEntitiesCount = 0;
 
   protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
@@ -70,9 +67,9 @@ export class AssistPref extends LitElement {
       this._pipelines = pipelines.pipelines;
       this._preferred = pipelines.preferred_pipeline;
     });
-    listAssistDevices(this.hass).then((devices) => {
-      this._devices = devices;
-    });
+    this._pipelineEntitiesCount = Object.values(this.hass.entities).filter(
+      (entity) => computeDomain(entity.entity_id) === "assist_satellite"
+    ).length;
   }
 
   private _exposedEntitiesCount = memoizeOne(
@@ -208,13 +205,13 @@ export class AssistPref extends LitElement {
               )}
             </ha-button>
           </a>
-          ${this._devices?.length
+          ${this._pipelineEntitiesCount > 0
             ? html`
                 <a href="/config/voice-assistants/assist/devices">
                   <ha-button>
                     ${this.hass.localize(
                       "ui.panel.config.voice_assistants.assistants.pipeline.assist_devices",
-                      { number: this._devices.length }
+                      { number: this._pipelineEntitiesCount }
                     )}
                   </ha-button>
                 </a>

diff --git a/src/panels/lovelace/cards/hui-calendar-card.ts b/src/panels/lovelace/cards/hui-calendar-card.ts
@@ -222,7 +222,7 @@ export class HuiCalendarCard extends LitElement implements LovelaceCard {
       }
 
       .header {
-        color: var(--ha-card-header-color, --primary-text-color);
+        color: var(--ha-card-header-color, var(--primary-text-color));
         font-size: var(--ha-card-header-font-size, 24px);
         line-height: 1.2;
         padding-top: 16px;

diff --git a/src/panels/lovelace/editor/badge-editor/hui-badge-picker.ts b/src/panels/lovelace/editor/badge-editor/hui-badge-picker.ts
@@ -508,7 +508,7 @@ export class HuiBadgePicker extends LitElement {
         }
 
         .badge-header {
-          color: var(--ha-card-header-color, --primary-text-color);
+          color: var(--ha-card-header-color, var(--primary-text-color));
           font-family: var(--ha-card-header-font-family, inherit);
           font-size: 16px;
           font-weight: bold;

diff --git a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts
@@ -503,7 +503,7 @@ export class HuiCardPicker extends LitElement {
         }
 
         .card-header {
-          color: var(--ha-card-header-color, --primary-text-color);
+          color: var(--ha-card-header-color, var(--primary-text-color));
           font-family: var(--ha-card-header-font-family, inherit);
           font-size: 16px;
           font-weight: bold;