Skip to content

Commit 72ab426

Browse files
committed
fix(desktop): don't persist fallback server urls
1 parent 9e9b4a0 commit 72ab426

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

packages/app/src/components/dialog-select-server.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,14 @@ export function DialogSelectServer() {
6363
onCleanup(() => clearInterval(interval))
6464
})
6565

66-
function select(value: string) {
67-
if (store.status[value]?.healthy === false) return
66+
function select(value: string, persist?: boolean) {
67+
if (!persist && store.status[value]?.healthy === false) return
6868
dialog.close()
69+
if (persist) {
70+
server.add(value)
71+
navigate("/")
72+
return
73+
}
6974
server.setActive(value)
7075
navigate("/")
7176
}
@@ -87,7 +92,7 @@ export function DialogSelectServer() {
8792
}
8893

8994
setStore("url", "")
90-
select(value)
95+
select(value, true)
9196
}
9297

9398
return (

packages/app/src/context/server.tsx

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,19 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
4848
function setActive(input: string) {
4949
const url = normalizeServerUrl(input)
5050
if (!url) return
51+
setActiveRaw(url)
52+
}
53+
54+
function add(input: string) {
55+
const url = normalizeServerUrl(input)
56+
if (!url) return
57+
58+
const fallback = normalizeServerUrl(props.defaultUrl)
59+
if (fallback && url === fallback) {
60+
setActiveRaw(url)
61+
return
62+
}
63+
5164
batch(() => {
5265
if (!store.list.includes(url)) {
5366
setStore("list", store.list.length, url)
@@ -71,15 +84,10 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
7184

7285
createEffect(() => {
7386
if (!ready()) return
87+
if (active()) return
7488
const url = normalizeServerUrl(props.defaultUrl)
7589
if (!url) return
76-
77-
batch(() => {
78-
if (!store.list.includes(url)) {
79-
setStore("list", store.list.length, url)
80-
}
81-
setActiveRaw(url)
82-
})
90+
setActiveRaw(url)
8391
})
8492

8593
const isReady = createMemo(() => ready() && !!active())
@@ -123,7 +131,7 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
123131
return store.list
124132
},
125133
setActive,
126-
add: setActive,
134+
add,
127135
remove,
128136
projects: {
129137
list: projectsList,

0 commit comments

Comments
 (0)