v2.3.7

nielsfaber · Sep 17, 2022 · 871e729 · 871e729
1 parent 5b7d19b
commit 871e729
Show file tree

Hide file tree

Showing 6 changed files with 150 additions and 141 deletions.
diff --git a/dist/scheduler-card.js b/dist/scheduler-card.js
diff --git a/src/const.ts b/src/const.ts
@@ -1,6 +1,6 @@
 import { CardConfig } from './types';
 
-export const CARD_VERSION = 'v2.3.6';
+export const CARD_VERSION = 'v2.3.7';
 
 export const DefaultTimeStep = 10;
 

diff --git a/src/data/actions/compute_action_display.ts b/src/data/actions/compute_action_display.ts
@@ -39,8 +39,8 @@ export function computeActionDisplay(action: Action) {
     const res = parameterPattern.exec(string);
     if (!res) return string;
 
-    const hasWildcard = res[1].match(wildcardPattern)?.map(e => Object.keys(action.service_data || {}).includes(e[1]));
-
+    const field = res[1].match(wildcardPattern)![1];
+    const hasWildcard = Object.keys(action.service_data || {}).includes(field);
     if (hasWildcard) string = string.replace(res[0], replaceWildcards(res[1]));
     else string = string.replace(res[0], '');
     if (recursionDepth >= MAX_RECURSION_DEPTH) return string;

diff --git a/src/scheduler-card.ts b/src/scheduler-card.ts
@@ -74,7 +74,8 @@ export class SchedulerCard extends LitElement {
 
   firstUpdated() {
     const hass = this._hass!;
-    if (hass.localize('ui.panel.config.automation.editor.actions.name')) this.translationsLoaded = true;
+    if (hass.localize('ui.panel.config.automation.editor.actions.type.device_id.action'))
+      this.translationsLoaded = true;
     else {
       const el = document.querySelector('home-assistant') as HTMLElement & { _loadFragmentTranslations: any };
       el._loadFragmentTranslations(hass.language, 'config').then(() => {
@@ -86,7 +87,7 @@ export class SchedulerCard extends LitElement {
   protected shouldUpdate(changedProps: PropertyValues): boolean {
     const oldHass = changedProps.get('_hass') as HomeAssistant | undefined;
     if (oldHass && changedProps.size == 1) {
-      if (!oldHass.localize('ui.panel.config.automation.editor.actions.name')) {
+      if (!oldHass.localize('ui.panel.config.automation.editor.actions.type.device_id.action')) {
         this.translationsLoaded = true;
         return true;
       } else if (this._view == EViews.Overview) return true;

diff --git a/src/views/scheduler-entitypicker-card.ts b/src/views/scheduler-entitypicker-card.ts
@@ -156,7 +156,9 @@ export class SchedulerEditorCard extends LitElement {
               : localize('ui.panel.entity_picker.no_entities_for_group', getLocale(this.hass))}
           </button-group>
 
-          <div class="header">${this.hass.localize('ui.panel.config.automation.editor.actions.name')}</div>
+          <div class="header">
+            ${this.hass.localize('ui.panel.config.automation.editor.actions.type.device_id.action')}
+          </div>
           <button-group
             .items=${actions}
             .value=${actions.findIndex(e => isEqual(e, this.selectedAction))}

diff --git a/src/views/scheduler-timepicker-card.ts b/src/views/scheduler-timepicker-card.ts
@@ -95,7 +95,9 @@ export class SchedulerTimepickerCard extends LitElement {
           <ha-icon-button .path=${mdiClose} @click=${this.cancelClick}> </ha-icon-button>
         </div>
         <div class="card-content">
-          <div class="header">${this.hass.localize('ui.panel.config.automation.editor.actions.name')}</div>
+          <div class="header">
+            ${this.hass.localize('ui.panel.config.automation.editor.actions.type.device_id.action')}
+          </div>
           ${this.renderSummary()}
           ${!this.timeslots
             ? html`
@@ -238,7 +240,7 @@ export class SchedulerTimepickerCard extends LitElement {
         : null;
 
     return html`
-      <div class="header">${this.hass.localize('ui.panel.config.automation.editor.actions.name')}</div>
+      <div class="header">${this.hass.localize('ui.panel.config.automation.editor.actions.type.device_id.action')}</div>
       <button-group
         .items=${this.activeEntry !== null ? this.actions : []}
         .value=${selectedAction !== null