Skip to content

Commit 02e3589

Browse files
committed
Remove conditional markers
1 parent 7d42722 commit 02e3589

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

src/components/ha-service-control.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ export class HaServiceControl extends LitElement {
466466

467467
const descriptionPlaceholders =
468468
domain && serviceName
469-
? this.hass.services[domain]?.[serviceName]?.description_placeholders
469+
? this.hass.services[domain][serviceName].description_placeholders
470470
: undefined;
471471

472472
const description =
@@ -620,7 +620,7 @@ export class HaServiceControl extends LitElement {
620620
return this.hass!.localize(
621621
`component.${domain}.services.${serviceName}.sections.${dataField.key}.description`,
622622
domain && serviceName
623-
? this.hass.services[domain]?.[serviceName]?.description_placeholders
623+
? this.hass.services[domain][serviceName].description_placeholders
624624
: undefined
625625
);
626626
}
@@ -670,7 +670,7 @@ export class HaServiceControl extends LitElement {
670670
const showOptional = showOptionalToggle(dataField);
671671
const descriptionPlaceholders =
672672
domain && serviceName
673-
? this.hass.services[domain]?.[serviceName]?.description_placeholders
673+
? this.hass.services[domain][serviceName].description_placeholders
674674
: undefined;
675675

676676
return dataField.selector &&

src/components/ha-service-picker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class HaServicePicker extends LitElement {
9393
}
9494

9595
const descriptionPlaceholders =
96-
this.hass.services[domain]?.[service]?.description_placeholders;
96+
this.hass.services[domain][service].description_placeholders;
9797

9898
const serviceName =
9999
localize(
@@ -170,7 +170,7 @@ class HaServicePicker extends LitElement {
170170
const domainName = domainToName(localize, domain);
171171

172172
const descriptionPlaceholders =
173-
this.hass.services[domain]?.[service]?.description_placeholders;
173+
this.hass.services[domain][service].description_placeholders;
174174

175175
const name =
176176
this.hass.localize(

src/data/script_i18n.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ const tryDescribeAction = <T extends ActionType>(
220220
if (config.action) {
221221
const [domain, serviceName] = config.action.split(".", 2);
222222
const descriptionPlaceholders =
223-
hass.services[domain]?.[serviceName]?.description_placeholders;
223+
hass.services[domain][serviceName].description_placeholders;
224224
const service =
225225
hass.localize(
226226
`component.${domain}.services.${serviceName}.name`,

src/panels/config/automation/add-automation-element-dialog.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,15 +558,15 @@ class DialogAddAutomationElement
558558
name: `${domain ? "" : `${domainToName(localize, dmn)}: `}${
559559
this.hass.localize(
560560
`component.${dmn}.services.${service}.name`,
561-
this.hass.services[dmn]?.[service]?.description_placeholders
561+
this.hass.services[dmn][service].description_placeholders
562562
) ||
563563
services[dmn][service]?.name ||
564564
service
565565
}`,
566566
description:
567567
this.hass.localize(
568568
`component.${dmn}.services.${service}.description`,
569-
this.hass.services[dmn]?.[service]?.description_placeholders
569+
this.hass.services[dmn][service].description_placeholders
570570
) ||
571571
services[dmn][service]?.description ||
572572
"",

src/panels/developer-tools/action/developer-tools-action.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class HaPanelDevAction extends LitElement {
137137

138138
const descriptionPlaceholders =
139139
domain && serviceName
140-
? this.hass.services[domain]?.[serviceName]?.description_placeholders
140+
? this.hass.services[domain][serviceName].description_placeholders
141141
: undefined;
142142

143143
return html`
@@ -652,8 +652,8 @@ class HaPanelDevAction extends LitElement {
652652
this.hass.localize(
653653
`component.${domain}.services.${serviceName}.fields.${field.key}.example`,
654654
domain && serviceName
655-
? this.hass.services[domain]?.[serviceName]
656-
?.description_placeholders
655+
? this.hass.services[domain][serviceName]
656+
.description_placeholders
657657
: undefined
658658
) || field.example;
659659
}

src/panels/logbook/ha-logbook-renderer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ class HaLogbookRenderer extends LitElement {
401401
${
402402
this.hass.localize(
403403
`component.${item.context_domain}.services.${item.context_service}.name`,
404-
this.hass.services[item.context_domain]?.[item.context_service]
405-
?.description_placeholders
404+
this.hass.services[item.context_domain][item.context_service]
405+
.description_placeholders
406406
) ||
407407
this.hass.services[item.context_domain]?.[item.context_service]?.name ||
408408
item.context_service

0 commit comments

Comments
 (0)