Skip to content

Add current step that is in progress #35272

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.

Sign up for GitHub

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
balloob merged 2 commits into from
May 6, 2020
Merged

Add current step that is in progress #35272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a025823
Add current step that is in progress
balloob May 5, 2020
15996c9
Name it step_id
balloob May 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion homeassistant/data_entry_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ async def async_post_init(
def async_progress(self) -> List[Dict]:
"""Return the flows in progress."""
return [
{"flow_id": flow.flow_id, "handler": flow.handler, "context": flow.context}
{
"flow_id": flow.flow_id,
"handler": flow.handler,
"context": flow.context,
"step_id": flow.cur_step["step_id"],
}
for flow in self._progress.values()
if flow.cur_step is not None
]
Expand Down
7 changes: 6 additions & 1 deletion tests/components/config/test_config_entries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,12 @@ async def async_step_account(self, user_input=None):

assert response["success"]
assert response["result"] == [
{"flow_id": form["flow_id"], "handler": "test", "context": {"source": "hassio"}}
{
"flow_id": form["flow_id"],
"handler": "test",
"step_id": "account",
"context": {"source": "hassio"},
}
]


Expand Down
9 changes: 8 additions & 1 deletion tests/test_data_entry_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,14 @@ async def async_step_init(self, user_input=None):
assert form["errors"]["base"] == "1"
form = await manager.async_configure(form["flow_id"])
assert form["errors"]["base"] == "2"
assert len(manager.async_progress()) == 1
assert manager.async_progress() == [
{
"flow_id": form["flow_id"],
"handler": "test",
"step_id": "init",
"context": {},
}
]
assert len(manager.mock_created_entries) == 0


Expand Down