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.

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

Display services as services and not devices #6798

Merged
merged 6 commits into from
Sep 6, 2020
Merged

Conversation

ludeeus
Copy link
Member

@ludeeus ludeeus commented Sep 5, 2020

Proposed change

Display services as services and not devices

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

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

image

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.

If user exposed functionality or configuration variables are added/changed:

Comment on lines +199 to 201
${(devices.length || services.length) && entities.length
? this.hass.localize("ui.common.and")
: ""}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should also render an and when there is both a service and a device.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had that first, but if the integration has both you end up with:
"x services and x devices and x entities" which feels weird 🤷
Add a comma maybe?

Copy link
Member

@bramkragten bramkragten Sep 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah:

2 devices, 1 service and 5 entities

ludeeus and others added 2 commits September 5, 2020 21:21
Comment on lines 186 to 188
: ""}
${devices.length || services.length ? "," : ""}
${services.length
Copy link
Member

@bramkragten bramkragten Sep 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
: ""}
${devices.length || services.length ? "," : ""}
${services.length
: ""}${devices.length && services.length ? "," : ""}
${services.length

@home-assistant home-assistant deleted a comment from ludeeus Sep 5, 2020
@ludeeus ludeeus merged commit 3fd7899 into dev Sep 6, 2020
@delete-merged-branch delete-merged-branch bot deleted the integration-service branch September 6, 2020 00:16
@bramkragten bramkragten mentioned this pull request Sep 7, 2020
@github-actions github-actions bot locked and limited conversation to collaborators Jul 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants