Put options at the root level

home-assistant · Sep 20, 2023 · 584f083 · 584f083
1 parent ddb8971
commit 584f083
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/cast/src/receiver/layout/hc-main.ts b/cast/src/receiver/layout/hc-main.ts
@@ -260,7 +260,7 @@ export class HcMain extends HassElement {
           {
             strategy: {
               type: "energy",
-              options: { show_date_selection: true },
+              show_date_selection: true,
             },
           },
         ],

diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
@@ -17,9 +17,9 @@ export interface LovelacePanelConfig {
   mode: "yaml" | "storage";
 }
 
-export type LovelaceStrategyConfig<T = Record<string, any>> = {
+export type LovelaceStrategyConfig = {
   type: string;
-  options?: T;
+  [key: string]: any;
 };
 
 export interface LovelaceConfig {

diff --git a/src/panels/energy/strategies/energy-view-strategy.ts b/src/panels/energy/strategies/energy-view-strategy.ts
@@ -24,14 +24,14 @@ const setupWizard = async (): Promise<LovelaceViewConfig> => {
   };
 };
 
-export type EnergeryViewStrategyOptions = {
+export interface EnergeryViewStrategyConfig extends LovelaceStrategyConfig {
   show_date_selection?: boolean;
-};
+}
 
 @customElement("energy-view-strategy")
 export class EnergyViewStrategy extends ReactiveElement {
   static async generate(
-    config: LovelaceStrategyConfig<EnergeryViewStrategyOptions>,
+    config: EnergeryViewStrategyConfig,
     hass: HomeAssistant,
     params: LovelaceStrategyParams
   ): Promise<LovelaceViewConfig> {
@@ -67,7 +67,7 @@ export class EnergyViewStrategy extends ReactiveElement {
       (source) => source.type === "water"
     );
 
-    if (params.narrow || config.options?.show_date_selection) {
+    if (params.narrow || config.show_date_selection) {
       view.cards!.push({
         type: "energy-date-selection",
         collection_key: "energy_dashboard",

diff --git a/src/panels/lovelace/strategies/get-strategy.ts b/src/panels/lovelace/strategies/get-strategy.ts
@@ -108,7 +108,14 @@ const generateStrategy = async <T extends LovelaceStrategyConfigType>(
       }
     }
 
-    return await strategy.generate(strategyConfig, hass, params);
+    const config = {
+      ...strategyConfig,
+      ...strategyConfig.options,
+    };
+
+    delete config.options;
+
+    return await strategy.generate(config, hass, params);
   } catch (err: any) {
     if (err.message !== "timeout") {
       // eslint-disable-next-line