Skip to content

Fix flash of LogBackIn modal on load and when logging out #7710

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
ryaplots merged 1 commit into from
Sep 5, 2025
Merged

Fix flash of LogBackIn modal on load and when logging out #7710

Show file tree
Hide file tree
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
36 changes: 18 additions & 18 deletions pkg/webui/console/views/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,21 +128,21 @@ const Layout = () => {
/>
<div id="modal-container" />
<div id="dropdown-container" className="pos-absolute-container" />
<div className="d-flex">
<Sidebar />
<div className="w-full h-vh d-flex direction-column">
<Header />
<main
className={classnames(style.main, 'd-flex', 'flex-column', 'h-full', 'flex-grow')}
ref={main}
>
<WithAuth
user={user}
fetching={fetching}
userError={error}
errorComponent={FullViewErrorInner}
rights={rights}
isAdmin={isAdmin}
<div className="d-flex h-vh">
<WithAuth
user={user}
fetching={fetching}
userError={error}
errorComponent={FullViewErrorInner}
rights={rights}
isAdmin={isAdmin}
>
<Sidebar />
<div className="w-full d-flex direction-column">
<Header />
<main
className={classnames(style.main, 'd-flex', 'flex-column', 'h-full', 'flex-grow')}
ref={main}
>
<div className={style.content}>
<div
Expand All @@ -156,9 +156,9 @@ const Layout = () => {
<Outlet />
</div>
</div>
</WithAuth>
</main>
</div>
</main>
</div>
</WithAuth>
</div>

<div id="split-frame" className={style.splitFrame} />
Expand Down
4 changes: 1 addition & 3 deletions pkg/webui/lib/store/actions/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ export const setStatusChecking = createAction(SET_CONNECTION_STATUS, () => ({

export const SET_LOGIN_STATUS = 'SET_LOGIN_STATUS'

export const setLoginStatus = createAction(SET_LOGIN_STATUS, () => ({
isLoginRequired: status.isLoginRequired,
}))
export const setLoginStatus = createAction(SET_LOGIN_STATUS)

export const ATTEMPT_RECONNECT = 'ATTEMPT_RECONNECT'
export const attemptReconnect = createAction(ATTEMPT_RECONNECT)
Expand Down
Loading