Skip to content

fix: connection status map wrapped in atom #1783

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
oneirocosm merged 1 commit into from
Jan 21, 2025
Merged

fix: connection status map wrapped in atom #1783

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
12 changes: 8 additions & 4 deletions frontend/app/store/global.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let atoms: GlobalAtomsType;
let globalEnvironment: "electron" | "renderer";
const blockComponentModelMap = new Map<string, BlockComponentModel>();
const Counters = new Map<string, number>();
const ConnStatusMap = new Map<string, PrimitiveAtom<ConnStatus>>();
const ConnStatusMapAtom = atom(new Map<string, PrimitiveAtom<ConnStatus>>());

type GlobalInitOptions = {
tabId: string;
Expand Down Expand Up @@ -135,7 +135,8 @@ function initGlobalAtoms(initOpts: GlobalInitOptions) {
const typeAheadModalAtom = atom({});
const modalOpen = atom(false);
const allConnStatusAtom = atom<ConnStatus[]>((get) => {
const connStatuses = Array.from(ConnStatusMap.values()).map((atom) => get(atom));
const connStatusMap = get(ConnStatusMapAtom);
const connStatuses = Array.from(connStatusMap.values()).map((atom) => get(atom));
return connStatuses;
});
const flashErrorsAtom = atom<FlashErrorType[]>([]);
Expand Down Expand Up @@ -579,7 +580,8 @@ function subscribeToConnEvents() {
}

function getConnStatusAtom(conn: string): PrimitiveAtom<ConnStatus> {
let rtn = ConnStatusMap.get(conn);
const connStatusMap = globalStore.get(ConnStatusMapAtom);
let rtn = connStatusMap.get(conn);
if (rtn == null) {
if (isBlank(conn)) {
// create a fake "local" status atom that's always connected
Expand All @@ -605,7 +607,9 @@ function getConnStatusAtom(conn: string): PrimitiveAtom<ConnStatus> {
};
rtn = atom(connStatus);
}
ConnStatusMap.set(conn, rtn);
const newConnStatusMap = new Map(connStatusMap);
newConnStatusMap.set(conn, rtn);
globalStore.set(ConnStatusMapAtom, newConnStatusMap);
}
return rtn;
}
Expand Down
Loading