starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-26 11:21:16 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Queries now use AppHandle instead of Window (#189)

Browse Source
This commit is contained in:
Gregory Schier
2025-03-20 09:43:14 -07:00
committed by GitHub
parent cf8f8743bb
commit 4c4eaba7d2
19 changed files with 1063 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src-web/hooks/useSyncModelStores.ts
View File

@@ -5,7 +5,7 @@ import type { AnyModel, KeyValue, ModelPayload } from '@yaakapp-internal/models'
import { jotaiStore } from '../lib/jotai';
import { buildKeyValueKey } from '../lib/keyValueStore';
import { modelsEq } from '../lib/model_util';
import { useActiveWorkspace } from './useActiveWorkspace';
import { getActiveWorkspaceId } from './useActiveWorkspace';
import { cookieJarsAtom } from './useCookieJars';
import { environmentsAtom } from './useEnvironments';
import { foldersAtom } from './useFolders';
@@ -26,7 +26,6 @@ import { workspaceMetaAtom } from './useWorkspaceMeta';
import { workspacesAtom } from './useWorkspaces';
export function useSyncModelStores() {
const activeWorkspace = useActiveWorkspace();
const queryClient = useQueryClient();
const { wasUpdatedExternally } = useRequestUpdateKey(null);
@@ -45,16 +44,13 @@ export function useSyncModelStores() {
(payload.model.model === 'http_request' ||
payload.model.model === 'grpc_request' ||
payload.model.model === 'websocket_request') &&
(payload.windowLabel !== getCurrentWebviewWindow().label || payload.updateSource !== 'window')
((payload.updateSource.type === 'window' &&
payload.updateSource.label !== getCurrentWebviewWindow().label) ||
payload.updateSource.type !== 'window')
) {
wasUpdatedExternally(payload.model.id);
}
// Only sync models that belong to this workspace, if a workspace ID is present
if ('workspaceId' in payload.model && payload.model.workspaceId !== activeWorkspace?.id) {
return;
}
if (shouldIgnoreModel(payload)) return;
if (payload.model.model === 'workspace') {
@@ -160,7 +156,7 @@ export function removeModelById<T extends { id: string }>(model: T) {
return (prevEntries: T[] | undefined) => {
const entries = prevEntries?.filter((e) => e.id !== model.id) ?? [];
// Don't trigger an update if we didn't actually remove anything
// Don't trigger an update if we didn't remove anything
if (entries.length === (prevEntries ?? []).length) {
return prevEntries ?? [];
}
@@ -181,17 +177,24 @@ export function removeModelByKv(model: KeyValue) {
) ?? [];
}
function shouldIgnoreModel({ model, windowLabel, updateSource }: ModelPayload) {
// Never ignore same-window updates
if (windowLabel === getCurrentWebviewWindow().label) {
function shouldIgnoreModel({ model, updateSource }: ModelPayload) {
console.log('HELLO', updateSource);
// Never ignore updates from non-user sources
if (updateSource.type !== 'window') {
return false;
}
// Never ignore updates from non-user sources
if (updateSource !== 'window') {
// Never ignore same-window updates
if (updateSource.label === getCurrentWebviewWindow().label) {
return false;
}
const activeWorkspaceId = getActiveWorkspaceId();
// Only sync models that belong to this workspace, if a workspace ID is present
if ('workspaceId' in model && model.workspaceId !== activeWorkspaceId) {
return;
}
if (model.model === 'key_value') {
return model.namespace === 'no_sync';
}