Bump min version to 2024.8

piitaya · Feb 28, 2025 · f888613 · f888613
1 parent fea08b4
commit f888613
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 94 deletions.
diff --git a/src/cards/alarm-control-panel-card/alarm-control-panel-card-editor.ts b/src/cards/alarm-control-panel-card/alarm-control-panel-card-editor.ts
@@ -2,12 +2,7 @@ import { html, nothing } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import memoizeOne from "memoize-one";
 import { assert } from "superstruct";
-import {
-  LocalizeFunc,
-  LovelaceCardEditor,
-  atLeastHaVersion,
-  fireEvent,
-} from "../../ha";
+import { LocalizeFunc, LovelaceCardEditor, fireEvent } from "../../ha";
 import setupCustomlocalize from "../../localize";
 import { computeActionsFormSchema } from "../../shared/config/actions-config";
 import { APPEARANCE_FORM_SCHEMA } from "../../shared/config/appearance-config";
@@ -42,32 +37,28 @@ const states = [
   "armed_custom_bypass",
 ];
 
-const computeSchema = memoizeOne(
-  (localize: LocalizeFunc, useCallService: boolean): HaFormSchema[] => [
-    {
-      name: "entity",
-      selector: { entity: { domain: ALARM_CONTROl_PANEL_ENTITY_DOMAINS } },
-    },
-    { name: "name", selector: { text: {} } },
-    {
-      name: "icon",
-      selector: { icon: {} },
-      context: { icon_entity: "entity" },
-    },
-    ...APPEARANCE_FORM_SCHEMA,
-    {
-      type: "multi_select",
-      name: "states",
-      options: states.map((state) => [
-        state,
-        localize(
-          `ui.card.alarm_control_panel.${state.replace("armed", "arm")}`
-        ),
-      ]) as [string, string][],
-    },
-    ...computeActionsFormSchema(actions, useCallService),
-  ]
-);
+const computeSchema = memoizeOne((localize: LocalizeFunc): HaFormSchema[] => [
+  {
+    name: "entity",
+    selector: { entity: { domain: ALARM_CONTROl_PANEL_ENTITY_DOMAINS } },
+  },
+  { name: "name", selector: { text: {} } },
+  {
+    name: "icon",
+    selector: { icon: {} },
+    context: { icon_entity: "entity" },
+  },
+  ...APPEARANCE_FORM_SCHEMA,
+  {
+    type: "multi_select",
+    name: "states",
+    options: states.map((state) => [
+      state,
+      localize(`ui.card.alarm_control_panel.${state.replace("armed", "arm")}`),
+    ]) as [string, string][],
+  },
+  ...computeActionsFormSchema(actions),
+]);
 
 @customElement(ALARM_CONTROl_PANEL_CARD_EDITOR_NAME)
 export class SwitchCardEditor
@@ -91,8 +82,7 @@ export class SwitchCardEditor
       return nothing;
     }
 
-    const useCallService = !atLeastHaVersion(this.hass.config.version, 2024, 8);
-    const schema = computeSchema(this.hass!.localize, useCallService);
+    const schema = computeSchema(this.hass!.localize);
 
     return html`
       <ha-form

diff --git a/src/cards/chips-card/chips/action-chip-editor.ts b/src/cards/chips-card/chips/action-chip-editor.ts
@@ -1,6 +1,7 @@
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { atLeastHaVersion, fireEvent, HomeAssistant } from "../../../ha";
+import memoizeOne from "memoize-one";
+import { fireEvent, HomeAssistant } from "../../../ha";
 import setupCustomlocalize from "../../../localize";
 import { computeActionsFormSchema } from "../../../shared/config/actions-config";
 import { GENERIC_LABELS } from "../../../utils/form/generic-fields";
@@ -10,7 +11,6 @@ import { computeChipEditorComponentName } from "../../../utils/lovelace/chip/chi
 import { ActionChipConfig } from "../../../utils/lovelace/chip/types";
 import { LovelaceChipEditor } from "../../../utils/lovelace/types";
 import { DEFAULT_ACTION_ICON } from "./action-chip";
-import memoizeOne from "memoize-one";
 
 const actions: UiAction[] = [
   "navigate",
@@ -20,7 +20,7 @@ const actions: UiAction[] = [
   "none",
 ];
 
-const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
+const computeSchema = memoizeOne((): HaFormSchema[] => [
   {
     type: "grid",
     name: "",
@@ -32,7 +32,7 @@ const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
       { name: "icon_color", selector: { mush_color: {} } },
     ],
   },
-  ...computeActionsFormSchema(actions, useCallService),
+  ...computeActionsFormSchema(actions),
 ]);
 
 @customElement(computeChipEditorComponentName("action"))
@@ -61,8 +61,7 @@ export class EntityChipEditor extends LitElement implements LovelaceChipEditor {
       return nothing;
     }
 
-    const useCallService = !atLeastHaVersion(this.hass.config.version, 2024, 8);
-    const schema = computeSchema(useCallService);
+    const schema = computeSchema();
 
     return html`
       <ha-form

diff --git a/src/cards/chips-card/chips/alarm-control-panel-chip-editor.ts b/src/cards/chips-card/chips/alarm-control-panel-chip-editor.ts
@@ -1,6 +1,7 @@
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { atLeastHaVersion, fireEvent, HomeAssistant } from "../../../ha";
+import memoizeOne from "memoize-one";
+import { fireEvent, HomeAssistant } from "../../../ha";
 import setupCustomlocalize from "../../../localize";
 import { computeActionsFormSchema } from "../../../shared/config/actions-config";
 import { GENERIC_LABELS } from "../../../utils/form/generic-fields";
@@ -10,7 +11,6 @@ import { computeChipEditorComponentName } from "../../../utils/lovelace/chip/chi
 import { AlarmControlPanelChipConfig } from "../../../utils/lovelace/chip/types";
 import { LovelaceChipEditor } from "../../../utils/lovelace/types";
 import { ALARM_CONTROl_PANEL_ENTITY_DOMAINS } from "../../alarm-control-panel-card/const";
-import memoizeOne from "memoize-one";
 
 const actions: UiAction[] = [
   "more-info",
@@ -21,7 +21,7 @@ const actions: UiAction[] = [
   "none",
 ];
 
-const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
+const computeSchema = memoizeOne((): HaFormSchema[] => [
   {
     name: "entity",
     selector: { entity: { domain: ALARM_CONTROl_PANEL_ENTITY_DOMAINS } },
@@ -35,7 +35,7 @@ const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
     ],
   },
   { name: "icon", selector: { icon: {} }, context: { icon_entity: "entity" } },
-  ...computeActionsFormSchema(actions, useCallService),
+  ...computeActionsFormSchema(actions),
 ]);
 
 @customElement(computeChipEditorComponentName("alarm-control-panel"))
@@ -67,8 +67,7 @@ export class AlarmControlPanelChipEditor
       return nothing;
     }
 
-    const useCallService = !atLeastHaVersion(this.hass.config.version, 2024, 8);
-    const schema = computeSchema(useCallService);
+    const schema = computeSchema();
 
     return html`
       <ha-form

diff --git a/src/cards/chips-card/chips/weather-chip-editor.ts b/src/cards/chips-card/chips/weather-chip-editor.ts
@@ -1,6 +1,7 @@
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { atLeastHaVersion, fireEvent, HomeAssistant } from "../../../ha";
+import memoizeOne from "memoize-one";
+import { fireEvent, HomeAssistant } from "../../../ha";
 import setupCustomlocalize from "../../../localize";
 import { computeActionsFormSchema } from "../../../shared/config/actions-config";
 import { GENERIC_LABELS } from "../../../utils/form/generic-fields";
@@ -9,7 +10,6 @@ import { UiAction } from "../../../utils/form/ha-selector";
 import { computeChipEditorComponentName } from "../../../utils/lovelace/chip/chip-element";
 import { WeatherChipConfig } from "../../../utils/lovelace/chip/types";
 import { LovelaceChipEditor } from "../../../utils/lovelace/types";
-import memoizeOne from "memoize-one";
 
 const WEATHER_ENTITY_DOMAINS = ["weather"];
 const WEATHER_LABELS = ["show_conditions", "show_temperature"];
@@ -23,7 +23,7 @@ const actions: UiAction[] = [
   "none",
 ];
 
-const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
+const computeSchema = memoizeOne((): HaFormSchema[] => [
   { name: "entity", selector: { entity: { domain: WEATHER_ENTITY_DOMAINS } } },
   {
     type: "grid",
@@ -33,7 +33,7 @@ const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
       { name: "show_temperature", selector: { boolean: {} } },
     ],
   },
-  ...computeActionsFormSchema(actions, useCallService),
+  ...computeActionsFormSchema(actions),
 ]);
 
 @customElement(computeChipEditorComponentName("weather"))
@@ -68,8 +68,7 @@ export class WeatherChipEditor
       return nothing;
     }
 
-    const useCallService = !atLeastHaVersion(this.hass.config.version, 2024, 8);
-    const schema = computeSchema(useCallService);
+    const schema = computeSchema();
 
     return html`
       <ha-form

diff --git a/src/cards/person-card/person-card-editor.ts b/src/cards/person-card/person-card-editor.ts
@@ -1,7 +1,8 @@
 import { html, nothing } from "lit";
 import { customElement, state } from "lit/decorators.js";
+import memoizeOne from "memoize-one";
 import { assert } from "superstruct";
-import { LovelaceCardEditor, atLeastHaVersion, fireEvent } from "../../ha";
+import { LovelaceCardEditor, fireEvent } from "../../ha";
 import setupCustomlocalize from "../../localize";
 import { computeActionsFormSchema } from "../../shared/config/actions-config";
 import { APPEARANCE_FORM_SCHEMA } from "../../shared/config/appearance-config";
@@ -12,7 +13,6 @@ import { UiAction } from "../../utils/form/ha-selector";
 import { loadHaComponents } from "../../utils/loader";
 import { PERSON_CARD_EDITOR_NAME, PERSON_ENTITY_DOMAINS } from "./const";
 import { PersonCardConfig, personCardConfigStruct } from "./person-card-config";
-import memoizeOne from "memoize-one";
 
 const actions: UiAction[] = [
   "more-info",
@@ -23,12 +23,12 @@ const actions: UiAction[] = [
   "none",
 ];
 
-const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
+const computeSchema = memoizeOne((): HaFormSchema[] => [
   { name: "entity", selector: { entity: { domain: PERSON_ENTITY_DOMAINS } } },
   { name: "name", selector: { text: {} } },
   { name: "icon", selector: { icon: {} }, context: { icon_entity: "entity" } },
   ...APPEARANCE_FORM_SCHEMA,
-  ...computeActionsFormSchema(actions, useCallService),
+  ...computeActionsFormSchema(actions),
 ]);
 
 @customElement(PERSON_CARD_EDITOR_NAME)
@@ -64,8 +64,7 @@ export class SwitchCardEditor
       return nothing;
     }
 
-    const useCallService = !atLeastHaVersion(this.hass.config.version, 2024, 8);
-    const schema = computeSchema(useCallService);
+    const schema = computeSchema();
 
     return html`
       <ha-form

diff --git a/src/cards/select-card/select-card-editor.ts b/src/cards/select-card/select-card-editor.ts
@@ -1,7 +1,8 @@
 import { html, nothing } from "lit";
 import { customElement, state } from "lit/decorators.js";
+import memoizeOne from "memoize-one";
 import { assert } from "superstruct";
-import { LovelaceCardEditor, atLeastHaVersion, fireEvent } from "../../ha";
+import { LovelaceCardEditor, fireEvent } from "../../ha";
 import setupCustomlocalize from "../../localize";
 import { computeActionsFormSchema } from "../../shared/config/actions-config";
 import { APPEARANCE_FORM_SCHEMA } from "../../shared/config/appearance-config";
@@ -12,7 +13,6 @@ import { UiAction } from "../../utils/form/ha-selector";
 import { loadHaComponents } from "../../utils/loader";
 import { SELECT_CARD_EDITOR_NAME, SELECT_ENTITY_DOMAINS } from "./const";
 import { SelectCardConfig, selectCardConfigStruct } from "./select-card-config";
-import memoizeOne from "memoize-one";
 
 const actions: UiAction[] = [
   "more-info",
@@ -23,7 +23,7 @@ const actions: UiAction[] = [
   "none",
 ];
 
-const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
+const computeSchema = memoizeOne((): HaFormSchema[] => [
   { name: "entity", selector: { entity: { domain: SELECT_ENTITY_DOMAINS } } },
   { name: "name", selector: { text: {} } },
   {
@@ -39,7 +39,7 @@ const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
     ],
   },
   ...APPEARANCE_FORM_SCHEMA,
-  ...computeActionsFormSchema(actions, useCallService),
+  ...computeActionsFormSchema(actions),
 ]);
 
 @customElement(SELECT_CARD_EDITOR_NAME)
@@ -75,8 +75,7 @@ export class SelectCardEditor
       return nothing;
     }
 
-    const useCallService = !atLeastHaVersion(this.hass.config.version, 2024, 8);
-    const schema = computeSchema(useCallService);
+    const schema = computeSchema();
 
     return html`
       <ha-form

diff --git a/src/cards/update-card/update-card-editor.ts b/src/cards/update-card/update-card-editor.ts
@@ -1,7 +1,8 @@
 import { html, nothing } from "lit";
 import { customElement, state } from "lit/decorators.js";
+import memoizeOne from "memoize-one";
 import { assert } from "superstruct";
-import { LovelaceCardEditor, atLeastHaVersion, fireEvent } from "../../ha";
+import { LovelaceCardEditor, fireEvent } from "../../ha";
 import setupCustomlocalize from "../../localize";
 import { computeActionsFormSchema } from "../../shared/config/actions-config";
 import { APPEARANCE_FORM_SCHEMA } from "../../shared/config/appearance-config";
@@ -12,7 +13,6 @@ import { UiAction } from "../../utils/form/ha-selector";
 import { loadHaComponents } from "../../utils/loader";
 import { UPDATE_CARD_EDITOR_NAME, UPDATE_ENTITY_DOMAINS } from "./const";
 import { UpdateCardConfig, updateCardConfigStruct } from "./update-card-config";
-import memoizeOne from "memoize-one";
 
 const UPDATE_LABELS = ["show_buttons_control"];
 
@@ -25,7 +25,7 @@ const actions: UiAction[] = [
   "none",
 ];
 
-const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
+const computeSchema = memoizeOne((): HaFormSchema[] => [
   { name: "entity", selector: { entity: { domain: UPDATE_ENTITY_DOMAINS } } },
   { name: "name", selector: { text: {} } },
   { name: "icon", selector: { icon: {} }, context: { icon_entity: "entity" } },
@@ -38,7 +38,7 @@ const computeSchema = memoizeOne((useCallService: boolean): HaFormSchema[] => [
       { name: "collapsible_controls", selector: { boolean: {} } },
     ],
   },
-  ...computeActionsFormSchema(actions, useCallService),
+  ...computeActionsFormSchema(actions),
 ]);
 
 @customElement(UPDATE_CARD_EDITOR_NAME)
@@ -77,8 +77,7 @@ export class UpdateCardEditor
       return nothing;
     }
 
-    const useCallService = !atLeastHaVersion(this.hass.config.version, 2024, 8);
-    const schema = computeSchema(useCallService);
+    const schema = computeSchema();
 
     return html`
       <ha-form

diff --git a/src/shared/config/actions-config.ts b/src/shared/config/actions-config.ts
@@ -16,17 +16,8 @@ export type ActionsSharedConfig = {
 };
 
 export const computeActionsFormSchema = (
-  actions?: UiAction[],
-  useCallService?: boolean
+  actions?: UiAction[]
 ): HaFormSchema[] => {
-  if (useCallService && actions) {
-    actions = actions.map((action) => {
-      if (action === "perform-action") {
-        return "call-service";
-      }
-      return action;
-    });
-  }
   return [
     {
       name: "tap_action",