Card Editor: Special Row doesn't show warning by zsarnett · Pull Request #7093 · home-assistant/frontend

zsarnett · 2020-09-21T22:04:33Z

Proposed change

This makes it so that special Rows do not break the editor.

Type of change

Dependency upgrade
Bugfix (non-breaking change which fixes an issue)
New feature (thank you!)
Breaking change (fix/feature causing existing functionality to break)
Code quality improvements to existing code or addition of tests

Example configuration

type: entities
entities:
  - entity: vacuum.0_ground_floor
  - type: divider
  - entity: vacuum.1_first_floor
  - entity: vacuum.2_second_floor
  - entity: vacuum.3_third_floor
  - type: call-service
    icon: 'mdi:power'
    name: Bed light
    action_name: Toggle light
    service: light.toggle
    service_data:
      entity_id: light.bed_light
  - type: section
    label: Testing The New Editor
  - type: divider
  - type: attribute
    entity: vacuum.1_first_floor
    attribute: fan_speed
    name: Fan Speed
  - type: weblink
    name: Home Assistant
    url: 'https://www.home-assistant.io/'
    icon: 'mdi:home-assistant'
  - type: conditional
    conditions:
      - entity: light.bed_light
        state: 'on'
    row:
      entity: light.bed_light
  - type: buttons
    entities:
      - vacuum.3_third_floor
      - light.bed_light
  - type: button
    name: Button to Press
    tap_action:
      action: call-service
      service: light.toggle
      service_data:
        entity_id: light.bed_light
  - type: cast
    view: entities-card
    name: testing this cast
footer:
  type: graph
  entity: sensor.random_sensor
  hours_to_show: 24

Additional information

This PR fixes or closes issue: fixes divider and weblink causing warning on UI editor #3851
This PR is related to issue:
Link to documentation pull request:

Checklist

The code change is tested and works locally.
There is no commented out code in this PR.
Tests have been added to verify that the new code works.

zsarnett · 2020-09-21T22:07:18Z

src/panels/lovelace/components/hui-entity-editor.ts

-                  <div class="entity" data-entity-id=${entityConf.entity}>
+                  <div
+                    class="entity"
+                    data-entity-id=${entityConf.entity || entityConf.type}


I don't know why TS is complaining that the entity property doesn't exist here? I thought that having the OR here would make it go away...

Its because entity doesn't exist on all of the RowConfigs

Any suggestions?

Does it play better with a ternary expression? entityConf.entity ? entityConf.entity : entityConf.type

I tried that too. Same issue

"entity" in entityConf ? entityConf.entity : entityConf.type

iantrich · 2020-09-22T04:32:19Z

src/panels/lovelace/components/hui-entity-editor.ts

-                      @value-changed=${this._valueChanged}
-                      allow-custom-entity
-                    ></ha-entity-picker>
+                    ${entityConf.type


Thinking we might want to extend this instead, seems very strange to have something specific to only the entities card in this element.

Probably not a bad idea

We do that and then we can change how we add rows later as well, and give a new prompt instead allowing you choose special row or entity and expand on the entity options

Yea that was the plan for this. I have a branch ready to do that and have entity options. But this is the first step

bramkragten · 2020-09-22T14:19:42Z

src/panels/lovelace/components/hui-entity-editor.ts

  @property({ attribute: false }) protected hass?: HomeAssistant;

-  @property({ attribute: false }) protected entities?: EntityConfig[];
+  @property({ attribute: false }) protected entities?: LovelaceRowConfig[];


This should not be in the entity-editor, as we use that for different cards, we should make a specific entities-card-row-editor that accepts a LovelaceRowConfig[]

zsarnett · 2020-09-22T16:03:16Z

New element created. Entity editor is no longer touched and stay the same for other elements using it

src/panels/lovelace/editor/hui-entities-card-row-editor.ts

zsarnett · 2020-09-22T20:16:44Z

bramkragten · 2020-09-24T12:36:23Z

src/panels/lovelace/editor/hui-entities-card-row-editor.ts

+                                ${this.hass!.localize(
+                                  `ui.panel.lovelace.editor.card.entities.entity_row.${entityConf.type}`
+                                )}
+                                ${this.hass!.localize(
+                                  "ui.panel.lovelace.editor.card.entities.special_row"
+                                )}


We should combine this in 1 localize:

Suggested change

${this.hass!.localize(

`ui.panel.lovelace.editor.card.entities.entity_row.${entityConf.type}`

)}

${this.hass!.localize(

"ui.panel.lovelace.editor.card.entities.special_row"

)}

${this.hass!.localize(

"ui.panel.lovelace.editor.card.entities.special_row", "row_type", this.hass!.localize(

`ui.panel.lovelace.editor.card.entities.entity_row.${entityConf.type}`

)

)}

But maybe we should just drop the special_row? Just "Button row" would be enough?

homeassistant added the cla-signed label Sep 21, 2020

zsarnett commented Sep 21, 2020

View reviewed changes

zsarnett changed the title ~~Add the ability to have special rows with editor~~ Card Editor: Special Row doesn't show warning Sep 21, 2020

iantrich reviewed Sep 22, 2020

View reviewed changes

bramkragten reviewed Sep 22, 2020

View reviewed changes

New element for entities card editor

b4510d5

zsarnett force-pushed the add-special-rows branch from 785d24f to b4510d5 Compare September 22, 2020 16:02

bramkragten reviewed Sep 22, 2020

View reviewed changes

src/panels/lovelace/editor/hui-entities-card-row-editor.ts Outdated Show resolved Hide resolved

bramkragten reviewed Sep 22, 2020

View reviewed changes

src/panels/lovelace/editor/hui-entities-card-row-editor.ts Outdated Show resolved Hide resolved

bramkragten reviewed Sep 22, 2020

View reviewed changes

src/panels/lovelace/editor/hui-entities-card-row-editor.ts Show resolved Hide resolved

bramkragten approved these changes Sep 22, 2020

View reviewed changes

zsarnett added 3 commits September 22, 2020 15:17

Comments

4528684

localize

efad10e

remove unneeded

d87c5ab

zsarnett mentioned this pull request Sep 23, 2020

Show UI editors even when advanced options used #4993

Closed

bramkragten reviewed Sep 24, 2020

View reviewed changes

bramkragten approved these changes Sep 24, 2020

View reviewed changes

comments

3cd169e

zsarnett merged commit a349e34 into dev Sep 24, 2020

zsarnett deleted the add-special-rows branch September 24, 2020 16:36

bramkragten mentioned this pull request Sep 30, 2020

20200930.0 #7174

Merged

github-actions bot locked and limited conversation to collaborators Jul 5, 2022

Conversation

zsarnett commented Sep 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed change

Type of change

Example configuration

Additional information

Checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

iantrich Sep 22, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zsarnett commented Sep 22, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zsarnett commented Sep 22, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

zsarnett commented Sep 21, 2020 •

edited

Loading

iantrich Sep 22, 2020 •

edited

Loading