Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions apps/web/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,11 @@ export function App() {
(readFailure !== null &&
!signedOutByHost &&
(readStatus === undefined || readStatus >= 500));
// A failed refresh keeps its last data, so only a read that never answered
// hides the shell.
const nothingToShow =
(providersRead.isError && providersRead.data === undefined) ||
(projectsRead.isError && projectsRead.data === undefined);
useEffect(() => {
if (signedOutByHost) setAuth("signed-out");
}, [signedOutByHost]);
Expand Down Expand Up @@ -774,16 +779,13 @@ export function App() {
// No model credential yet: ask on its own screen, before the project list.
// A refused read stays on the shell, which already says the hub is down.
const modelCatalogUnsettled =
!setupLater &&
view !== "invite" &&
!providersRead.isSuccess &&
(providersRead.isPending || providersRead.isFetching);
if (modelCatalogUnsettled || offline) {
!setupLater && view !== "invite" && providersRead.isPending;
if (modelCatalogUnsettled || (offline && nothingToShow)) {
Comment thread
TheGreatAxios marked this conversation as resolved.
Resolved
Comment thread
TheGreatAxios marked this conversation as resolved.
Resolved
return <Booting offline={offline} />;
}
if (
view !== "invite" &&
providersRead.isSuccess &&
providersRead.data !== undefined &&
needsModelSetup(providers) &&
!setupLater
) {
Expand Down Expand Up @@ -888,15 +890,15 @@ export function App() {
onOpen={openProject}
onChanged={refresh}
needsProvider={
providersRead.isSuccess && needsModelSetup(providers)
providersRead.data !== undefined && needsModelSetup(providers)
}
/>
) : null}

{view === "library" ? (
<ProjectLibrary
projects={projects}
loaded={projectsRead.isSuccess}
loaded={projectsRead.data !== undefined}
failed={projectsRead.isError}
onOpen={(projectId) => openProject(projectId)}
onNewProject={() => navigate("projects")}
Expand Down