Skip to content

fix(ui): ensure query subs are reset in case of error #7921

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
merged 1 commit into from
Apr 17, 2025
Merged

fix(ui): ensure query subs are reset in case of error #7921

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
3 changes: 1 addition & 2 deletions .../frontend/web/src/app/store/middleware/listenerMiddleware/listeners/setDefaultSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ export const addSetDefaultSettingsListener = (startAppListening: AppStartListeni
return;
}

const request = dispatch(modelsApi.endpoints.getModelConfigs.initiate());
const request = dispatch(modelsApi.endpoints.getModelConfigs.initiate(undefined, { subscribe: false }));
const data = await request.unwrap();
request.unsubscribe();
const models = modelConfigsAdapterSelectors.selectAll(data);

const modelConfig = models.find((model) => model.key === currentModel.key);
Expand Down
9 changes: 3 additions & 6 deletions ...eai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketConnected.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@ export const addSocketConnectedEventListener = (startAppListening: AppStartListe

// Bail on the recovery logic if this is the first connection - we don't need to recover anything
if ($isFirstConnection.get()) {
// Populate the model configs on first connection. This query cache has a 24hr timeout, so we can immediately
// unsubscribe.
const request = dispatch(modelsApi.endpoints.getModelConfigs.initiate());
request.unsubscribe();

// Populate the model configs on first connection.
dispatch(modelsApi.endpoints.getModelConfigs.initiate(undefined, { subscribe: false }));
$isFirstConnection.set(false);
return;
}
Expand Down Expand Up @@ -61,10 +58,10 @@ export const addSocketConnectedEventListener = (startAppListening: AppStartListe
const queueStatusRequest = dispatch(
await queueApi.endpoints.getQueueStatus.initiate(undefined, {
forceRefetch: true,
subscribe: false,
})
);
const nextQueueStatusData = await queueStatusRequest.unwrap();
queueStatusRequest.unsubscribe();

// If the queue hasn't changed, we don't need to do anything.
if (isEqual(prevQueueStatusData?.queue, nextQueueStatusData.queue)) {
Expand Down