Better typings

home-assistant · May 21, 2024 · 3021768 · 3021768
1 parent de26e53
commit 3021768
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-create-card.ts
@@ -24,15 +24,15 @@ import {
   computeCards,
   computeSection,
 } from "../../common/generate-lovelace-config";
+import {
+  findLovelaceContainer,
+  parseLovelaceContainerPath,
+} from "../lovelace-path";
 import "./hui-card-picker";
 import "./hui-entity-picker-table";
 import { CreateCardDialogParams } from "./show-create-card-dialog";
 import { showEditCardDialog } from "./show-edit-card-dialog";
 import { showSuggestCardDialog } from "./show-suggest-card-dialog";
-import {
-  findLovelaceContainer,
-  parseLovelaceContainerPath,
-} from "../lovelace-path";
 
 declare global {
   interface HASSDomEvents {
@@ -274,15 +274,17 @@ export class HuiCreateDialogCard
 
     let sectionOptions: Partial<LovelaceSectionConfig> = {};
 
-    const { sectionIndex } = parseLovelaceContainerPath(this._params!.path);
+    const { viewIndex, sectionIndex } = parseLovelaceContainerPath(
+      this._params!.path
+    );
     const isSection = sectionIndex !== undefined;
 
     // If we are in a section, we want to keep the section options for the preview
     if (isSection) {
       const containerConfig = findLovelaceContainer(
         this._params!.lovelaceConfig!,
-        this._params!.path!
-      ) as LovelaceSectionConfig;
+        [viewIndex, sectionIndex]
+      );
       if (!isStrategySection(containerConfig)) {
         const { cards, title, ...rest } = containerConfig;
         sectionOptions = rest;

diff --git a/src/panels/lovelace/editor/config-util.ts b/src/panels/lovelace/editor/config-util.ts
@@ -226,7 +226,7 @@ export const addSection = (
   viewIndex: number,
   sectionConfig: LovelaceSectionRawConfig
 ): LovelaceConfig => {
-  const view = findLovelaceContainer(config, [viewIndex]) as LovelaceViewConfig;
+  const view = findLovelaceContainer(config, [viewIndex]);
   if (isStrategyView(view)) {
     throw new Error("Deleting sections in a strategy is not supported.");
   }
@@ -246,7 +246,7 @@ export const deleteSection = (
   viewIndex: number,
   sectionIndex: number
 ): LovelaceConfig => {
-  const view = findLovelaceContainer(config, [viewIndex]) as LovelaceViewConfig;
+  const view = findLovelaceContainer(config, [viewIndex]);
   if (isStrategyView(view)) {
     throw new Error("Deleting sections in a strategy is not supported.");
   }
@@ -267,7 +267,7 @@ export const insertSection = (
   sectionIndex: number,
   sectionConfig: LovelaceSectionRawConfig
 ): LovelaceConfig => {
-  const view = findLovelaceContainer(config, [viewIndex]) as LovelaceViewConfig;
+  const view = findLovelaceContainer(config, [viewIndex]);
   if (isStrategyView(view)) {
     throw new Error("Inserting sections in a strategy is not supported.");
   }
@@ -291,10 +291,7 @@ export const moveSection = (
   fromPath: [number, number],
   toPath: [number, number]
 ): LovelaceConfig => {
-  const section = findLovelaceContainer(
-    config,
-    fromPath
-  ) as LovelaceSectionRawConfig;
+  const section = findLovelaceContainer(config, fromPath);
 
   let newConfig = deleteSection(config, fromPath[0], fromPath[1]);
   newConfig = insertSection(newConfig, toPath[0], toPath[1], section);

diff --git a/src/panels/lovelace/editor/lovelace-path.ts b/src/panels/lovelace/editor/lovelace-path.ts
@@ -46,7 +46,15 @@ export const getLovelaceContainerPath = (
   path: LovelaceCardPath
 ): LovelaceContainerPath => path.slice(0, -1) as LovelaceContainerPath;
 
-export const findLovelaceContainer = (
+type FindLovelaceContainer = {
+  (config: LovelaceConfig, path: [number]): LovelaceViewRawConfig;
+  (config: LovelaceConfig, path: [number, number]): LovelaceSectionRawConfig;
+  (
+    config: LovelaceConfig,
+    path: LovelaceContainerPath
+  ): LovelaceViewRawConfig | LovelaceSectionRawConfig;
+};
+export const findLovelaceContainer: FindLovelaceContainer = (
   config: LovelaceConfig,
   path: LovelaceContainerPath
 ): LovelaceViewRawConfig | LovelaceSectionRawConfig => {

diff --git a/src/panels/lovelace/editor/section-editor/hui-dialog-edit-section.ts b/src/panels/lovelace/editor/section-editor/hui-dialog-edit-section.ts
@@ -70,7 +70,7 @@ export class HuiDialogEditSection
     this._config = findLovelaceContainer(this._params.lovelaceConfig, [
       this._params.viewIndex,
       this._params.sectionIndex,
-    ]) as LovelaceSectionRawConfig;
+    ]);
   }
 
   public closeDialog() {

diff --git a/src/panels/lovelace/views/hui-sections-view.ts b/src/panels/lovelace/views/hui-sections-view.ts
@@ -14,7 +14,6 @@ import "../../../components/ha-icon-button";
 import "../../../components/ha-sortable";
 import "../../../components/ha-svg-icon";
 import type { LovelaceViewElement } from "../../../data/lovelace";
-import { LovelaceSectionRawConfig } from "../../../data/lovelace/config/section";
 import type { LovelaceViewConfig } from "../../../data/lovelace/config/view";
 import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
 import type { HomeAssistant } from "../../../types";
@@ -193,10 +192,7 @@ export class SectionsView extends LitElement implements LovelaceViewElement {
 
     const path = [this.index!, index] as [number, number];
 
-    const section = findLovelaceContainer(
-      this.lovelace!.config,
-      path
-    ) as LovelaceSectionRawConfig;
+    const section = findLovelaceContainer(this.lovelace!.config, path);
 
     const title = section.title?.trim();
     const cardCount = "cards" in section && section.cards?.length;