Restore lovelace config name

cast/src/launcher/layout/hc-cast.ts

@@ -23,7 +23,7 @@ import {
   getLegacyLovelaceCollection,
   getLovelaceCollection,
 } from "../../../../src/data/lovelace";
-import { isStrategyDashboard } from "../../../../src/data/lovelace/config/dashboard";
+import { isStrategyDashboard } from "../../../../src/data/lovelace/config/types";
 import { LovelaceViewConfig } from "../../../../src/data/lovelace/config/view";
 import "../../../../src/layouts/hass-loading-screen";
 import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";

cast/src/receiver/demo/cast-demo-lovelace.ts

@@ -1,8 +1,8 @@
 import { LovelaceCardConfig } from "../../../../src/data/lovelace/config/card";
-import { LovelaceDashboardConfig } from "../../../../src/data/lovelace/config/dashboard";
+import { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
 import { castContext } from "../cast_context";
 
-export const castDemoLovelace: () => LovelaceDashboardConfig = () => {
+export const castDemoLovelace: () => LovelaceConfig = () => {
   const touchSupported =
     castContext.getDeviceCapabilities().touch_input_supported;
   return {

cast/src/receiver/layout/hc-demo.ts

@@ -1,7 +1,7 @@
 import { html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { mockHistory } from "../../../../demo/src/stubs/history";
-import { LovelaceDashboardConfig } from "../../../../src/data/lovelace/config/dashboard";
+import { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
 import {
   MockHomeAssistant,
   provideHass,
@@ -16,7 +16,7 @@ import "./hc-lovelace";
 class HcDemo extends HassElement {
   @property({ attribute: false }) public lovelacePath!: string;
 
-  @state() private _lovelaceConfig?: LovelaceDashboardConfig;
+  @state() private _lovelaceConfig?: LovelaceConfig;
 
   protected render() {
     if (!this._lovelaceConfig) {

cast/src/receiver/layout/hc-lovelace.ts

@@ -1,7 +1,7 @@
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import { LovelaceDashboardConfig } from "../../../../src/data/lovelace/config/dashboard";
+import { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
 import { Lovelace } from "../../../../src/panels/lovelace/types";
 import "../../../../src/panels/lovelace/views/hui-view";
 import { HomeAssistant } from "../../../../src/types";
@@ -15,7 +15,7 @@ class HcLovelace extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ attribute: false })
-  public lovelaceConfig!: LovelaceDashboardConfig;
+  public lovelaceConfig!: LovelaceConfig;
 
   @property() public viewPath?: string | number;
 

cast/src/receiver/layout/hc-main.ts

@@ -27,9 +27,9 @@ import {
 import {
   isStrategyDashboard,
   LegacyLovelaceConfig,
-  LovelaceDashboardConfig,
+  LovelaceConfig,
   LovelaceDashboardStrategyConfig,
-} from "../../../../src/data/lovelace/config/dashboard";
+} from "../../../../src/data/lovelace/config/types";
 import { fetchResources } from "../../../../src/data/lovelace/resource";
 import { loadLovelaceResources } from "../../../../src/panels/lovelace/common/load-resources";
 import { HassElement } from "../../../../src/state/hass-element";
@@ -47,7 +47,7 @@ let resourcesLoaded = false;
 export class HcMain extends HassElement {
   @state() private _showDemo = false;
 
-  @state() private _lovelaceConfig?: LovelaceDashboardConfig;
+  @state() private _lovelaceConfig?: LovelaceConfig;
 
   @state() private _lovelacePath: string | number | null = null;
 
@@ -347,7 +347,7 @@ export class HcMain extends HassElement {
     );
   }
 
-  private _handleNewLovelaceConfig(lovelaceConfig: LovelaceDashboardConfig) {
+  private _handleNewLovelaceConfig(lovelaceConfig: LovelaceConfig) {
     castContext.setApplicationState(lovelaceConfig.title || "");
     this._lovelaceConfig = lovelaceConfig;
   }

demo/src/configs/types.ts

@@ -1,13 +1,13 @@
 import { LocalizeFunc } from "../../../src/common/translations/localize";
-import { LovelaceDashboardConfig } from "../../../src/data/lovelace/config/dashboard";
+import { LovelaceConfig } from "../../../src/data/lovelace/config/types";
 import { Entity } from "../../../src/fake_data/entity";
 
 export interface DemoConfig {
   index?: number;
   name: string;
   authorName: string;
   authorUrl: string;
-  lovelace: (localize: LocalizeFunc) => LovelaceDashboardConfig;
+  lovelace: (localize: LocalizeFunc) => LovelaceConfig;
   entities: (localize: LocalizeFunc) => Entity[];
   theme: () => Record<string, string> | null;
 }

src/components/ha-navigation-picker.ts

@@ -3,7 +3,7 @@ import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { titleCase } from "../common/string/title-case";
-import { fetchConfig } from "../data/lovelace/config/dashboard";
+import { fetchConfig } from "../data/lovelace/config/types";
 import { LovelaceViewRawConfig } from "../data/lovelace/config/view";
 import { HomeAssistant, PanelInfo, ValueChangedEvent } from "../types";
 import "./ha-combo-box";

src/data/lovelace.ts

@@ -10,7 +10,7 @@ import {
   LovelaceCard,
 } from "../panels/lovelace/types";
 import { HomeAssistant } from "../types";
-import { fetchConfig, LegacyLovelaceConfig } from "./lovelace/config/dashboard";
+import { fetchConfig, LegacyLovelaceConfig } from "./lovelace/config/types";
 import { LovelaceViewConfig } from "./lovelace/config/view";
 
 export interface LovelacePanelConfig {

src/data/lovelace/config/dashboard.ts → src/data/lovelace/config/types.ts

@@ -6,7 +6,7 @@ import type { LovelaceViewRawConfig } from "./view";
 
 export interface LovelaceDashboardBaseConfig {}
 
-export interface LovelaceDashboardConfig extends LovelaceDashboardBaseConfig {
+export interface LovelaceConfig extends LovelaceDashboardBaseConfig {
   title?: string;
   background?: string;
   views: LovelaceViewRawConfig[];
@@ -17,16 +17,16 @@ export interface LovelaceDashboardStrategyConfig
   strategy: LovelaceStrategyConfig;
 }
 
-export interface LegacyLovelaceConfig extends LovelaceDashboardConfig {
+export interface LegacyLovelaceConfig extends LovelaceConfig {
   resources?: LovelaceResource[];
 }
 
-export type LovelaceDashboardRawConfig =
-  | LovelaceDashboardConfig
+export type LovelaceRawConfig =
+  | LovelaceConfig
   | LovelaceDashboardStrategyConfig;
 
 export function isStrategyDashboard(
-  view: LovelaceDashboardRawConfig
+  view: LovelaceRawConfig
 ): view is LovelaceDashboardStrategyConfig {
   return "strategy" in view;
 }
@@ -35,7 +35,7 @@ export const fetchConfig = (
   conn: Connection,
   urlPath: string | null,
   force: boolean
-): Promise<LovelaceDashboardRawConfig> =>
+): Promise<LovelaceRawConfig> =>
   conn.sendMessagePromise({
     type: "lovelace/config",
     url_path: urlPath,
@@ -45,7 +45,7 @@ export const fetchConfig = (
 export const saveConfig = (
   hass: HomeAssistant,
   urlPath: string | null,
-  config: LovelaceDashboardRawConfig
+  config: LovelaceRawConfig
 ): Promise<void> =>
   hass.callWS({
     type: "lovelace/config/save",

src/data/preloads.ts

@@ -1,9 +1,9 @@
-import { LovelaceDashboardRawConfig } from "./lovelace/config/dashboard";
+import { LovelaceRawConfig } from "./lovelace/config/types";
 import { LovelaceResource } from "./lovelace/resource";
 import { RecorderInfo } from "./recorder";
 
 export interface WindowWithPreloads extends Window {
-  llConfProm?: Promise<LovelaceDashboardRawConfig>;
+  llConfProm?: Promise<LovelaceRawConfig>;
   llResProm?: Promise<LovelaceResource[]>;
   recorderInfoProm?: Promise<RecorderInfo>;
 }

src/entrypoints/core.ts

@@ -15,7 +15,7 @@ import { hassUrl } from "../data/auth";
 import { isExternal } from "../data/external";
 import { getRecorderInfo } from "../data/recorder";
 import { subscribeFrontendUserData } from "../data/frontend";
-import { fetchConfig } from "../data/lovelace/config/dashboard";
+import { fetchConfig } from "../data/lovelace/config/types";
 import { fetchResources } from "../data/lovelace/resource";
 import { subscribePanels } from "../data/ws-panels";
 import { subscribeThemes } from "../data/ws-themes";

src/panels/energy/ha-panel-energy.ts

@@ -10,14 +10,14 @@ import {
 import { customElement, property, state } from "lit/decorators";
 import "../../components/ha-menu-button";
 import "../../components/ha-top-app-bar-fixed";
-import { LovelaceDashboardConfig } from "../../data/lovelace/config/dashboard";
+import { LovelaceConfig } from "../../data/lovelace/config/types";
 import { haStyle } from "../../resources/styles";
 import { HomeAssistant } from "../../types";
 import "../lovelace/components/hui-energy-period-selector";
 import { Lovelace } from "../lovelace/types";
 import "../lovelace/views/hui-view";
 
-const ENERGY_LOVELACE_CONFIG: LovelaceDashboardConfig = {
+const ENERGY_LOVELACE_CONFIG: LovelaceConfig = {
   views: [
     {
       strategy: {

src/panels/lovelace/common/compute-unused-entities.ts

@@ -1,5 +1,5 @@
 import { ActionConfig } from "../../../data/lovelace/config/action";
-import { LovelaceDashboardConfig } from "../../../data/lovelace/config/dashboard";
+import { LovelaceConfig } from "../../../data/lovelace/config/types";
 import { HomeAssistant } from "../../../types";
 
 export const EXCLUDED_DOMAINS = ["zone", "persistent_notification"];
@@ -66,9 +66,7 @@ const addEntities = (entities: Set<string>, obj) => {
   }
 };
 
-export const computeUsedEntities = (
-  config: LovelaceDashboardConfig
-): Set<string> => {
+export const computeUsedEntities = (config: LovelaceConfig): Set<string> => {
   const entities = new Set<string>();
   config.views.forEach((view) => addEntities(entities, view));
   return entities;
@@ -94,7 +92,7 @@ export const calcUnusedEntities = (
 
 export const computeUnusedEntities = (
   hass: HomeAssistant,
-  config: LovelaceDashboardConfig
+  config: LovelaceConfig
 ): Set<string> => {
   const usedEntities = computeUsedEntities(config);
   const unusedEntities = calcUnusedEntities(hass, usedEntities);

src/panels/lovelace/components/hui-card-options.ts

@@ -27,7 +27,7 @@ import "../../../components/ha-button-menu";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-list-item";
 import { LovelaceCardConfig } from "../../../data/lovelace/config/card";
-import { saveConfig } from "../../../data/lovelace/config/dashboard";
+import { saveConfig } from "../../../data/lovelace/config/types";
 import { LovelaceViewConfig } from "../../../data/lovelace/config/view";
 import {
   showAlertDialog,

src/panels/lovelace/editor/add-entities-to-view.ts

@@ -1,9 +1,9 @@
 import { LovelacePanelConfig } from "../../../data/lovelace";
 import {
-  LovelaceDashboardConfig,
+  LovelaceConfig,
   fetchConfig,
   saveConfig,
-} from "../../../data/lovelace/config/dashboard";
+} from "../../../data/lovelace/config/types";
 import { fetchDashboards } from "../../../data/lovelace/dashboard";
 import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
 import { HomeAssistant } from "../../../types";
@@ -93,7 +93,7 @@ export const addEntitiesToLovelaceView = async (
     showSuggestCardDialog(element, {
       cardTitle,
       lovelaceConfig: lovelaceConfig!,
-      saveConfig: async (newConfig: LovelaceDashboardConfig): Promise<void> => {
+      saveConfig: async (newConfig: LovelaceConfig): Promise<void> => {
         try {
           await saveConfig(hass!, null, newConfig);
         } catch (err: any) {
@@ -116,9 +116,7 @@ export const addEntitiesToLovelaceView = async (
       showSuggestCardDialog(element, {
         cardTitle,
         lovelaceConfig: selectedDashConfig,
-        saveConfig: async (
-          newConfig: LovelaceDashboardConfig
-        ): Promise<void> => {
+        saveConfig: async (newConfig: LovelaceConfig): Promise<void> => {
           try {
             await saveConfig(hass!, newUrlPath, newConfig);
           } catch {

src/panels/lovelace/editor/card-editor/hui-card-picker.ts

@@ -19,7 +19,7 @@ import "../../../../components/ha-circular-progress";
 import "../../../../components/search-input";
 import { isUnavailableState } from "../../../../data/entity";
 import type { LovelaceCardConfig } from "../../../../data/lovelace/config/card";
-import type { LovelaceDashboardConfig } from "../../../../data/lovelace/config/dashboard";
+import type { LovelaceConfig } from "../../../../data/lovelace/config/types";
 import {
   CUSTOM_TYPE_PREFIX,
   CustomCardEntry,
@@ -56,7 +56,7 @@ export class HuiCardPicker extends LitElement {
 
   @state() private _cards: CardElement[] = [];
 
-  public lovelace?: LovelaceDashboardConfig;
+  public lovelace?: LovelaceConfig;
 
   public cardPicked?: (cardConf: LovelaceCardConfig) => void;
 

src/panels/lovelace/editor/card-editor/show-create-card-dialog.ts

@@ -1,9 +1,9 @@
 import { fireEvent } from "../../../../common/dom/fire_event";
-import type { LovelaceDashboardConfig } from "../../../../data/lovelace/config/dashboard";
+import type { LovelaceConfig } from "../../../../data/lovelace/config/types";
 
 export interface CreateCardDialogParams {
-  lovelaceConfig: LovelaceDashboardConfig;
-  saveConfig: (config: LovelaceDashboardConfig) => void;
+  lovelaceConfig: LovelaceConfig;
+  saveConfig: (config: LovelaceConfig) => void;
   path: [number] | [number, number];
   entities?: string[]; // We can pass entity id's that will be added to the config when a card is picked
 }

src/panels/lovelace/editor/card-editor/show-edit-card-dialog.ts

@@ -1,10 +1,10 @@
 import { fireEvent } from "../../../../common/dom/fire_event";
 import type { LovelaceCardConfig } from "../../../../data/lovelace/config/card";
-import type { LovelaceDashboardConfig } from "../../../../data/lovelace/config/dashboard";
+import type { LovelaceConfig } from "../../../../data/lovelace/config/types";
 
 export interface EditCardDialogParams {
-  lovelaceConfig: LovelaceDashboardConfig;
-  saveConfig: (config: LovelaceDashboardConfig) => void;
+  lovelaceConfig: LovelaceConfig;
+  saveConfig: (config: LovelaceConfig) => void;
   path: [number] | [number, number];
   cardConfig?: LovelaceCardConfig;
 }

src/panels/lovelace/editor/card-editor/show-suggest-card-dialog.ts

@@ -1,12 +1,12 @@
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { LovelaceCardConfig } from "../../../../data/lovelace/config/card";
-import { LovelaceDashboardConfig } from "../../../../data/lovelace/config/dashboard";
+import { LovelaceConfig } from "../../../../data/lovelace/config/types";
 
 export interface SuggestCardDialogParams {
   cardTitle?: string;
-  lovelaceConfig?: LovelaceDashboardConfig;
+  lovelaceConfig?: LovelaceConfig;
   yaml?: boolean;
-  saveConfig?: (config: LovelaceDashboardConfig) => void;
+  saveConfig?: (config: LovelaceConfig) => void;
   path?: [number];
   entities: string[]; // We can pass entity id's that will be added to the config when a card is picked
   cardConfig?: LovelaceCardConfig[]; // We can pass a suggested config

src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts

@@ -12,7 +12,7 @@ import "../../../../components/ha-button";
 import "../../../../components/ha-list-item";
 import "../../../../components/ha-svg-icon";
 import { LovelaceCardConfig } from "../../../../data/lovelace/config/card";
-import { LovelaceDashboardConfig } from "../../../../data/lovelace/config/dashboard";
+import { LovelaceConfig } from "../../../../data/lovelace/config/types";
 import type { HomeAssistant } from "../../../../types";
 import type { ConditionalCardConfig } from "../../cards/types";
 import type { LovelaceCardEditor } from "../../types";
@@ -41,7 +41,7 @@ export class HuiConditionalCardEditor
 {
   @property({ attribute: false }) public hass?: HomeAssistant;
 
-  @property({ attribute: false }) public lovelace?: LovelaceDashboardConfig;
+  @property({ attribute: false }) public lovelace?: LovelaceConfig;
 
   @storage({
     key: "lovelaceClipboard",

src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts

@@ -26,7 +26,7 @@ import { storage } from "../../../../common/decorators/storage";
 import { HASSDomEvent, fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-icon-button";
 import type { LovelaceCardConfig } from "../../../../data/lovelace/config/card";
-import type { LovelaceDashboardConfig } from "../../../../data/lovelace/config/dashboard";
+import type { LovelaceConfig } from "../../../../data/lovelace/config/types";
 import { HomeAssistant } from "../../../../types";
 import { StackCardConfig } from "../../cards/types";
 import { LovelaceCardEditor } from "../../types";
@@ -53,7 +53,7 @@ export class HuiStackCardEditor
 {
   @property({ attribute: false }) public hass?: HomeAssistant;
 
-  @property({ attribute: false }) public lovelace?: LovelaceDashboardConfig;
+  @property({ attribute: false }) public lovelace?: LovelaceConfig;
 
   @storage({
     key: "lovelaceClipboard",