Merge branch 'dev' into map-card-editor

Author: ildar170975

demo/src/configs/sections/entities.ts

@@ -141,7 +141,7 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) =>
       },
     },
     "device_tracker.car": {
-      entity_id: "sensor.outdoor_humidity",
+      entity_id: "device_tracker.car",
       state: "not_home",
       attributes: {
         friendly_name: "Car",
@@ -199,7 +199,7 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) =>
       },
     },
     "binary_sensor.kitchen_motion": {
-      entity_id: "light.kitchen_motion",
+      entity_id: "binary_sensor.kitchen_motion",
       state: "on",
       attributes: {
         device_class: "motion",
@@ -335,7 +335,7 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) =>
       },
     },
     "sensor.rain": {
-      entity_id: "sensor.moon_phase",
+      entity_id: "sensor.rain",
       state: "7.2",
       attributes: {
         state_class: "total_increasing",
@@ -565,7 +565,7 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) =>
       },
     },
     "update.home_assistant_core_update": {
-      entity_id: "update.home_assistant_supervisor_update",
+      entity_id: "update.home_assistant_core_update",
       state: "off",
       attributes: {
         auto_update: false,

package.json

@@ -37,15 +37,15 @@
     "@codemirror/view": "6.39.16",
     "@date-fns/tz": "1.4.1",
     "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "7.2.4",
-    "@formatjs/intl-displaynames": "7.2.1",
+    "@formatjs/intl-datetimeformat": "7.2.5",
+    "@formatjs/intl-displaynames": "7.2.2",
     "@formatjs/intl-durationformat": "0.10.1",
     "@formatjs/intl-getcanonicallocales": "3.2.1",
-    "@formatjs/intl-listformat": "8.2.1",
+    "@formatjs/intl-listformat": "8.2.2",
     "@formatjs/intl-locale": "5.2.1",
-    "@formatjs/intl-numberformat": "9.2.2",
-    "@formatjs/intl-pluralrules": "6.2.2",
-    "@formatjs/intl-relativetimeformat": "12.2.2",
+    "@formatjs/intl-numberformat": "9.2.3",
+    "@formatjs/intl-pluralrules": "6.2.3",
+    "@formatjs/intl-relativetimeformat": "12.2.3",
     "@fullcalendar/core": "6.1.20",
     "@fullcalendar/daygrid": "6.1.20",
     "@fullcalendar/interaction": "6.1.20",
@@ -209,7 +209,7 @@
     "rspack-manifest-plugin": "5.2.1",
     "serve": "14.2.6",
     "sinon": "21.0.2",
-    "tar": "7.5.10",
+    "tar": "7.5.11",
     "terser-webpack-plugin": "5.3.17",
     "ts-lit-plugin": "2.0.2",
     "typescript": "5.9.3",

src/common/datetime/calc_date_range.ts

@@ -93,8 +93,13 @@ export const calcDateRange = (
       ];
     case "now-12m":
       return [
-        calcDate(today, subMonths, hass.locale, hass.config, 12),
-        calcDate(today, subMonths, hass.locale, hass.config, 0),
+        calcDate(
+          today,
+          (date) => subMonths(startOfMonth(date), 11),
+          hass.locale,
+          hass.config
+        ),
+        calcDate(today, endOfMonth, hass.locale, hass.config),
       ];
     case "now-1h":
       return [

src/common/datetime/format_date.ts

@@ -166,6 +166,21 @@ const formatDateMonthMem = memoizeOne(
     })
 );
 
+// Aug
+export const formatDateMonthShort = (
+  dateObj: Date,
+  locale: FrontendLocaleData,
+  config: HassConfig
+) => formatDateMonthShortMem(locale, config.time_zone).format(dateObj);
+
+const formatDateMonthShortMem = memoizeOne(
+  (locale: FrontendLocaleData, serverTimeZone: string) =>
+    new Intl.DateTimeFormat(locale.language, {
+      month: "short",
+      timeZone: resolveTimeZone(locale.time_zone, serverTimeZone),
+    })
+);
+
 // 2021
 export const formatDateYear = (
   dateObj: Date,

src/components/entity/state-badge.ts

@@ -15,7 +15,6 @@ import { iconColorCSS } from "../../common/style/icon_color_css";
 import { cameraUrlWithWidthHeight } from "../../data/camera";
 import { CLIMATE_HVAC_ACTION_TO_MODE } from "../../data/climate";
 import type { HomeAssistant } from "../../types";
-import { addBrandsAuth } from "../../util/brands-url";
 import "../ha-state-icon";
 
 @customElement("state-badge")
@@ -141,7 +140,6 @@ export class StateBadge extends LitElement {
           if (this.hass) {
             imageUrl = this.hass.hassUrl(imageUrl);
           }
-          imageUrl = addBrandsAuth(imageUrl, this.hass?.auth.data.hassUrl);
           if (domain === "camera") {
             imageUrl = cameraUrlWithWidthHeight(imageUrl, 80, 80);
           }

src/components/ha-slider.ts

@@ -61,6 +61,12 @@ export class HaSlider extends Slider {
           width: 200px;
         }
 
+        /* Expand slider touch target to 32px */
+        #slider {
+          padding-block: 14px;
+          margin-block: -14px;
+        }
+
         #thumb {
           border: none;
           background-color: var(--ha-slider-thumb-color, var(--primary-color));

src/data/backup_manager.ts

@@ -13,6 +13,7 @@ export type CreateBackupStage =
   | "app_repositories"
   | "apps"
   | "await_app_restarts"
+  | "cleaning_up"
   | "docker_config"
   | "finishing_file"
   | "folders"

src/data/energy.ts

@@ -40,7 +40,19 @@ import { calcDateRange } from "../common/datetime/calc_date_range";
 import type { DateRange } from "../common/datetime/calc_date_range";
 import { formatNumber } from "../common/number/format_number";
 
-const energyCollectionKeys: (string | undefined)[] = [];
+export const ENERGY_COLLECTION_KEY_PREFIX = "energy_";
+
+// All collection keys created this session
+const energyCollectionKeys = new Set<string | undefined>();
+
+// Validate that a string is a valid energy collection key.
+export function validateEnergyCollectionKey(key: string | undefined) {
+  if (!key?.startsWith(ENERGY_COLLECTION_KEY_PREFIX)) {
+    throw new Error(
+      `Collection keys must start with ${ENERGY_COLLECTION_KEY_PREFIX}.`
+    );
+  }
+}
 
 export const emptyGridSourceEnergyPreference =
   (): GridSourceTypeEnergyPreference => ({
@@ -693,17 +705,20 @@ export interface EnergyCollection extends Collection<EnergyData> {
   clearPrefs(): void;
   setPeriod(newStart: Date, newEnd?: Date): void;
   setCompare(compare: CompareMode): void;
+  isActive(): boolean;
   _refreshTimeout?: number;
   _updatePeriodTimeout?: number;
   _active: number;
 }
 
 const clearEnergyCollectionPreferences = (hass: HomeAssistant) => {
   energyCollectionKeys.forEach((key) => {
-    const energyCollection = getEnergyDataCollection(hass, { key });
-    energyCollection.clearPrefs();
-    if (energyCollection._active) {
-      energyCollection.refresh();
+    const energyCollection = findEnergyDataCollection(hass, key);
+    if (energyCollection) {
+      energyCollection.clearPrefs();
+      if (energyCollection.isActive()) {
+        energyCollection.refresh();
+      }
     }
   });
 };
@@ -730,23 +745,47 @@ const scheduleHourlyRefresh = (collection: EnergyCollection) => {
   }
 };
 
-export const getEnergyDataCollection = (
+const convertCollectionKeyToConnection = (
   hass: HomeAssistant,
-  options: { prefs?: EnergyPreferences; key?: string } = {}
-): EnergyCollection => {
+  collectionKey: string | undefined
+): [string, string | undefined] => {
   let key = "_energy";
-  if (options.key) {
-    if (!options.key.startsWith("energy_")) {
-      throw new Error("Key need to start with energy_");
-    }
-    key = `_${options.key}`;
+  if (collectionKey) {
+    validateEnergyCollectionKey(collectionKey);
+    key = `_${collectionKey}`;
+  } else if (hass.panelUrl) {
+    const defaultKey = ENERGY_COLLECTION_KEY_PREFIX + hass.panelUrl;
+    key = `_${defaultKey}`;
+    collectionKey = defaultKey;
   }
+  return [key, collectionKey];
+};
+
+const findEnergyDataCollection = (
+  hass: HomeAssistant,
+  collectionKey: string | undefined
+): EnergyCollection | undefined => {
+  // Lookup the connection key and default key name
+  const [key, _collectionKey] = convertCollectionKeyToConnection(
+    hass,
+    collectionKey
+  );
+  return (hass.connection as any)[key];
+};
 
+export const getEnergyDataCollection = (
+  hass: HomeAssistant,
+  options: { prefs?: EnergyPreferences; key?: string } = {}
+): EnergyCollection => {
+  const [key, collectionKey] = convertCollectionKeyToConnection(
+    hass,
+    options.key
+  );
   if ((hass.connection as any)[key]) {
     return (hass.connection as any)[key];
   }
 
-  energyCollectionKeys.push(options.key);
+  energyCollectionKeys.add(collectionKey);
 
   const collection = getCollection<EnergyData>(
     hass.connection,
@@ -832,6 +871,7 @@ export const getEnergyDataCollection = (
   };
   scheduleUpdatePeriod();
 
+  collection.isActive = () => !!collection._active;
   collection.clearPrefs = () => {
     collection.prefs = undefined;
   };

src/data/zwave_js.ts

@@ -1053,17 +1053,6 @@ export const setZWaveJSLogLevel = (
     config: { level },
   });
 
-export interface ZWaveJSIntegrationSettings {
-  installer_mode: boolean;
-}
-
-export const fetchZwaveIntegrationSettings = (
-  hass: HomeAssistant
-): Promise<ZWaveJSIntegrationSettings> =>
-  hass.callWS({
-    type: "zwave_js/get_integration_settings",
-  });
-
 export const cancelSecureBootstrapS2 = (
   hass: HomeAssistant,
   entry_id: string

src/dialogs/more-info/components/more-info-control-style.ts

@@ -12,6 +12,8 @@ export const moreInfoControlStyle = css`
     display: flex;
     flex-direction: column;
     align-items: center;
+    justify-content: center;
+    flex: 1;
   }
 
   .controls:not(:last-child) {