Skip to content

Restore missing ESPHome docs #38823

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

Merged
merged 1 commit into from
Apr 30, 2025
Merged

Restore missing ESPHome docs #38823

merged 1 commit into from
Apr 30, 2025

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Apr 30, 2025

Proposed change

This section was lost in a merge conflict resolution of current -> next

Type of change

  • Spelling, grammar or other readability improvements (current branch).
  • Adjusted missing or incorrect information in the current documentation (current branch).
  • Added documentation for a new integration I'm adding to Home Assistant (next branch).
  • Added documentation for a new feature I'm adding to Home Assistant (next branch).
  • Removed stale or deprecated documentation.

Additional information

  • Link to parent pull request in the codebase:
  • Link to parent pull request in the Brands repository:
  • This PR fixes or closes issue: fixes #

Checklist

  • This PR uses the correct branch, based on one of the following:
    • I made a change to the existing documentation and used the current branch.
    • I made a change that is related to an upcoming version of Home Assistant and used the next branch.
  • The documentation follows the Home Assistant documentation standards.

Summary by CodeRabbit

  • Documentation
    • Added a new section on "Reconfiguration and Device Replacement" for the ESPHome integration, including guidance on updating device settings and resolving device name conflicts.
    • Detailed the new "Name Conflict Resolution" feature, outlining the "Migrate" and "Overwrite" options and their effects.
    • Provided requirements and multiple methods for triggering name conflict resolution during device replacement.

This section was lost in a merge conflict resolution
of current -> next
@home-assistant
Copy link

It seems that this PR is targeted against an incorrect branch. Documentation updates which apply to our current stable release should target the current branch. Please change the target branch of this PR to current and rebase if needed. If this is documentation for a new feature, please add a link to that PR in your description.

@home-assistant home-assistant bot added in-progress This PR/Issue is currently being worked on needs-rebase The PR has been branched of the wrong base branch or targets an incorrect target branch next This PR goes into the next branch labels Apr 30, 2025
Copy link

netlify bot commented Apr 30, 2025

Deploy Preview for home-assistant-docs ready!

Name Link
🔨 Latest commit b77ed32
🔍 Latest deploy log https://app.netlify.com/sites/home-assistant-docs/deploys/68121bcd51859800092abd52
😎 Deploy Preview https://deploy-preview-38823--home-assistant-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

coderabbitai bot commented Apr 30, 2025

📝 Walkthrough

Walkthrough

The documentation for the ESPHome integration in Home Assistant has been updated to include a new section on "Reconfiguration and Device Replacement." This addition describes procedures for updating device settings post-setup, particularly when replacing devices or resolving name conflicts. It introduces a "Name Conflict Resolution" feature with two resolution options: "Migrate" and "Overwrite." The section outlines requirements for this process and lists scenarios in which name conflict resolution can be triggered. No changes were made to existing functionality or code; only documentation content was added.

Changes

File(s) Change Summary
source/_integrations/esphome.markdown Added a new section detailing reconfiguration, device replacement, and name conflict resolution options and process.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant HomeAssistant
    participant ESPHomeDevice

    User->>HomeAssistant: Initiate device replacement or reconfiguration
    HomeAssistant->>ESPHomeDevice: Detect new device with same name
    ESPHomeDevice-->>HomeAssistant: Respond with device information
    HomeAssistant->>User: Trigger Name Conflict Resolution dialog
    alt User selects "Migrate"
        HomeAssistant->>ESPHomeDevice: Transfer entity configuration and history
    else User selects "Overwrite"
        HomeAssistant->>ESPHomeDevice: Replace old configuration, erase history
    end
    HomeAssistant->>User: Confirm resolution complete
Loading

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai or @coderabbitai title anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (5)
source/_integrations/esphome.markdown (5)

218-223: Clarify “Name Conflict Resolution” introduction

The description correctly introduces the Name Conflict Resolution process. To improve clarity:

  • Consider linking “Name Conflict Resolution” to a unique anchor for easy referencing (e.g., {% anchor name="name-conflict-resolution" %}).
  • Move the sentence “This process gives you two options:” directly under the “### Name Conflict Resolution” header for tighter flow.

224-230: Refine option bullets and caution styling

The Migrate and Overwrite options are well-described. A few tweaks:

  • Add an Oxford comma in the caution text: “entity names, customizations, and history will be lost.”
  • Consider using a {% warning %} callout for the Overwrite caution to make it stand out visually.
🧰 Tools
🪛 LanguageTool

[style] ~226-~226: Consider using a different adverb to strengthen your wording.
Context: ...ost. Use this only if the new device is completely different and you don’t need anything f...

(COMPLETELY_ENTIRELY)


[uncategorized] ~226-~226: Use a comma before ‘and’ if it connects two independent clauses (unless they are closely connected and short).
Context: ...f the new device is completely different and you don’t need anything from the previo...

(COMMA_COMPOUND_SENTENCE)


234-240: Streamline requirement phrasing

The Requirements section is clear but can be more concise:

  • Change “To trigger Name Conflict Resolution, all of the following must be true:” to “To trigger Name Conflict Resolution, all the following must be true:”.
  • Optionally, wrap these bullets in an {% note %} admonition to highlight their importance.
🧰 Tools
🪛 LanguageTool

[style] ~236-~236: Consider removing “of” to be more concise
Context: ...n To trigger Name Conflict Resolution, all of the following must be true: - The new devi...

(ALL_OF_THE)


244-251: Unify UI terminology in trigger list

In the trigger list, item 248 mentions “repair flow” while item 249 refers to “Reconfigure” in the UI. For consistency, use the same term throughout (e.g., change “repair flow” → “Reconfigure flow” to match the UI label).


257-257: Ensure single trailing newline

The file should end with exactly one newline character to satisfy markdownlint (MD047). Please add or trim the final newline accordingly.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

257-257: Files should end with a single newline character
null

(MD047, single-trailing-newline)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8ce65ce and b77ed32.

📒 Files selected for processing (1)
  • source/_integrations/esphome.markdown (1 hunks)
🧰 Additional context used
🪛 LanguageTool
source/_integrations/esphome.markdown

[style] ~226-~226: Consider using a different adverb to strengthen your wording.
Context: ...ost. Use this only if the new device is completely different and you don’t need anything f...

(COMPLETELY_ENTIRELY)


[uncategorized] ~226-~226: Use a comma before ‘and’ if it connects two independent clauses (unless they are closely connected and short).
Context: ...f the new device is completely different and you don’t need anything from the previo...

(COMMA_COMPOUND_SENTENCE)


[style] ~236-~236: Consider removing “of” to be more concise
Context: ...n To trigger Name Conflict Resolution, all of the following must be true: - The new devi...

(ALL_OF_THE)

🪛 markdownlint-cli2 (0.17.2)
source/_integrations/esphome.markdown

257-257: Files should end with a single newline character
null

(MD047, single-trailing-newline)

⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: Redirect rules - home-assistant-docs
  • GitHub Check: Header rules - home-assistant-docs
  • GitHub Check: Pages changed - home-assistant-docs
🔇 Additional comments (1)
source/_integrations/esphome.markdown (1)

214-218: Verify new section placement and sidebar navigation

The new “Reconfiguration and Device Replacement” section is a valuable addition, but please ensure it’s included in the integration’s documentation sidebar or summary file so users can discover it easily. Also confirm that its heading level (##) aligns with the surrounding sections for consistency.

@balloob balloob merged commit 7ba30c9 into next Apr 30, 2025
9 checks passed
@balloob balloob deleted the esphome_restore branch April 30, 2025 12:52
@home-assistant home-assistant bot removed needs-rebase The PR has been branched of the wrong base branch or targets an incorrect target branch in-progress This PR/Issue is currently being worked on labels Apr 30, 2025
@bdraco
Copy link
Member Author

bdraco commented Apr 30, 2025

thanks

@github-actions github-actions bot locked and limited conversation to collaborators May 1, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
next This PR goes into the next branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants