Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sort yaml reloads on translated domain #20857

Merged
merged 1 commit into from
May 23, 2024
Merged

Sort yaml reloads on translated domain #20857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 30 additions & 15 deletions src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import "../../../components/ha-card";
import "../../../components/ha-circular-progress";
import { CheckConfigResult, checkCoreConfig } from "../../../data/core";
import { domainToName } from "../../../data/integration";
import { stringCompare } from "../../../common/string/compare";
import { showRestartDialog } from "../../../dialogs/restart/show-dialog-restart";
import { haStyle } from "../../../resources/styles";
import type { HomeAssistant, Route, TranslationDict } from "../../../types";
Expand All @@ -24,6 +25,11 @@ type ReloadableDomain = Exclude<
"heading" | "introduction" | "reload"
>;

interface TranslatedReloadableDomain {
domain: ReloadableDomain;
name: string;
}

@customElement("developer-yaml-config")
export class DeveloperYamlConfig extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
Expand All @@ -38,7 +44,7 @@ export class DeveloperYamlConfig extends LitElement {

@state() private _validating = false;

@state() private _reloadableDomains: ReloadableDomain[] = [];
@state() private _reloadableDomains: TranslatedReloadableDomain[] = [];

@state() private _validateResult?: CheckConfigResult;

Expand All @@ -51,12 +57,27 @@ export class DeveloperYamlConfig extends LitElement {
const oldHass = changedProperties.get("hass");
if (
changedProperties.has("hass") &&
(!oldHass || oldHass.config.components !== this.hass.config.components)
(!oldHass ||
oldHass.config.components !== this.hass.config.components ||
oldHass.localize !== this.hass.localize)
) {
this._reloadableDomains = componentsWithService(
this.hass,
"reload"
).sort() as ReloadableDomain[];
this._reloadableDomains = (
componentsWithService(this.hass, "reload") as ReloadableDomain[]
)
.map((domain) => ({
domain,
name:
this.hass.localize(
`ui.panel.developer-tools.tabs.yaml.section.reloading.${domain}`
) ||
this.hass.localize(
"ui.panel.developer-tools.tabs.yaml.section.reloading.reload",
{ domain: domainToName(this.hass.localize, domain) }
),
}))
.sort((a, b) =>
stringCompare(a.name, b.name, this.hass.locale.language)
);
}
}

Expand Down Expand Up @@ -176,19 +197,13 @@ export class DeveloperYamlConfig extends LitElement {
</ha-call-service-button>
</div>
${this._reloadableDomains.map(
(domain) => html`
(reloadable) => html`
<div class="card-actions">
<ha-call-service-button
.hass=${this.hass}
.domain=${domain}
.domain=${reloadable.domain}
service="reload"
>${this.hass.localize(
`ui.panel.developer-tools.tabs.yaml.section.reloading.${domain}`
) ||
this.hass.localize(
"ui.panel.developer-tools.tabs.yaml.section.reloading.reload",
{ domain: domainToName(this.hass.localize, domain) }
)}
>${reloadable.name}
</ha-call-service-button>
</div>
`
Expand Down