Skip to content

Ingress: Wait for dialog to close before navigating #9250

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
ludeeus merged 1 commit into from
May 25, 2021
Merged

Ingress: Wait for dialog to close before navigating #9250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion hassio/src/ingress-view/hassio-ingress-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { customElement, property, state } from "lit/decorators";
import { fireEvent } from "../../../src/common/dom/fire_event";
import { navigate } from "../../../src/common/navigate";
import { extractSearchParam } from "../../../src/common/url/search-params";
import { nextRender } from "../../../src/common/util/render-status";
import {
fetchHassioAddonInfo,
HassioAddonDetails,
Expand Down Expand Up @@ -95,6 +96,7 @@ class HassioIngressView extends LitElement {
text: extractApiErrorMessage(err),
title: requestedAddon,
});
await nextRender();
history.back();
return;
}
Expand All @@ -103,6 +105,7 @@ class HassioIngressView extends LitElement {
text: this.supervisor.localize("my.error_addon_no_ingress"),
title: addonInfo.name,
});
await nextRender();
history.back();
} else {
navigate(`/hassio/ingress/${addonInfo.slug}`, { replace: true });
Expand Down Expand Up @@ -140,6 +143,7 @@ class HassioIngressView extends LitElement {
text: "Unable to fetch add-on info to start Ingress",
title: "Supervisor",
});
await nextRender();
history.back();
return;
}
Expand All @@ -149,6 +153,7 @@ class HassioIngressView extends LitElement {
text: "Add-on does not support Ingress",
title: addon.name,
});
await nextRender();
history.back();
return;
}
Expand All @@ -157,8 +162,9 @@ class HassioIngressView extends LitElement {
await showAlertDialog(this, {
text: "Add-on is not running. Please start it first",
title: addon.name,
confirm: () => navigate(`/hassio/addon/${addon.slug}`),
});
await nextRender();
navigate(`/hassio/addon/${addon.slug}/info`, { replace: true });
return;
}

Expand All @@ -171,6 +177,7 @@ class HassioIngressView extends LitElement {
text: "Unable to create an Ingress session",
title: addon.name,
});
await nextRender();
history.back();
return;
}
Expand Down