diff --git a/src/common/translations/localize.ts b/src/common/translations/localize.ts index 10080f0d1d..d8c9b832b8 100644 --- a/src/common/translations/localize.ts +++ b/src/common/translations/localize.ts @@ -22,9 +22,7 @@ export type LocalizeKeys = | `ui.components.selectors.file.${string}` | `ui.dialogs.entity_registry.editor.${string}` | `ui.dialogs.more_info_control.vacuum.${string}` - | `ui.dialogs.options_flow.loading.${string}` | `ui.dialogs.quick-bar.commands.${string}` - | `ui.dialogs.repair_flow.loading.${string}` | `ui.dialogs.unhealthy.reason.${string}` | `ui.dialogs.unsupported.reason.${string}` | `ui.panel.config.${string}.${"caption" | "description"}` @@ -34,7 +32,6 @@ export type LocalizeKeys = | `ui.panel.config.energy.${string}` | `ui.panel.config.helpers.${string}` | `ui.panel.config.info.${string}` - | `ui.panel.config.integrations.${string}` | `ui.panel.config.logs.${string}` | `ui.panel.config.lovelace.${string}` | `ui.panel.config.network.${string}` diff --git a/src/dialogs/config-flow/show-dialog-config-flow.ts b/src/dialogs/config-flow/show-dialog-config-flow.ts index 84d332492c..635756a851 100644 --- a/src/dialogs/config-flow/show-dialog-config-flow.ts +++ b/src/dialogs/config-flow/show-dialog-config-flow.ts @@ -204,7 +204,7 @@ export const showConfigFlowDialog = ( }, renderLoadingDescription(hass, reason, handler, step) { - if (!["loading_flow", "loading_step"].includes(reason)) { + if (reason !== "loading_flow" && reason !== "loading_step") { return ""; } const domain = step?.handler || handler; diff --git a/src/dialogs/config-flow/show-dialog-options-flow.ts b/src/dialogs/config-flow/show-dialog-options-flow.ts index b043f1390c..3fe29126bb 100644 --- a/src/dialogs/config-flow/show-dialog-options-flow.ts +++ b/src/dialogs/config-flow/show-dialog-options-flow.ts @@ -181,9 +181,11 @@ export const showOptionsFlowDialog = ( renderLoadingDescription(hass, reason) { return ( hass.localize(`component.${configEntry.domain}.options.loading`) || - hass.localize(`ui.dialogs.options_flow.loading.${reason}`, { - integration: domainToName(hass.localize, configEntry.domain), - }) + (reason === "loading_flow" || reason === "loading_step" + ? hass.localize(`ui.dialogs.options_flow.loading.${reason}`, { + integration: domainToName(hass.localize, configEntry.domain), + }) + : "") ); }, } diff --git a/src/panels/config/integrations/dialog-add-integration.ts b/src/panels/config/integrations/dialog-add-integration.ts index 865cabbd5d..b9bdd7107e 100644 --- a/src/panels/config/integrations/dialog-add-integration.ts +++ b/src/panels/config/integrations/dialog-add-integration.ts @@ -143,7 +143,9 @@ class AddIntegrationDialog extends LitElement { localize: LocalizeFunc, filter?: string ): IntegrationListItem[] => { - const addDeviceRows: IntegrationListItem[] = ["zha", "zwave_js"] + const addDeviceRows: IntegrationListItem[] = ( + ["zha", "zwave_js"] as const + ) .filter((domain) => components.includes(domain)) .map((domain) => ({ name: localize(`ui.panel.config.integrations.add_${domain}_device`), diff --git a/src/panels/config/integrations/ha-domain-integrations.ts b/src/panels/config/integrations/ha-domain-integrations.ts index 6b9a89e73d..41d458b185 100644 --- a/src/panels/config/integrations/ha-domain-integrations.ts +++ b/src/panels/config/integrations/ha-domain-integrations.ts @@ -74,35 +74,37 @@ class HaDomainIntegrations extends LitElement { : ""}` : ""} ${this.integration?.iot_standards - ? this.integration.iot_standards - .filter((standard) => standard in standardToDomain) - .map((standard) => { - const domain: string = standardToDomain[standard]; - return html` standard in standardToDomain + ) as (keyof typeof standardToDomain)[] + ).map((standard) => { + const domain = standardToDomain[standard]; + return html` + + ${this.hass.localize( + `ui.panel.config.integrations.add_${domain}_device` + )} - - ${this.hass.localize( - `ui.panel.config.integrations.add_${domain}_device` - )} - - `; - }) + + `; + }) : ""} ${this.integration?.integrations ? Object.entries(this.integration.integrations) @@ -135,7 +137,7 @@ class HaDomainIntegrations extends LitElement { ` ) : ""} - ${["zha", "zwave_js"].includes(this.domain) + ${this.domain === "zha" || this.domain === "zwave_js" ? html`