-
Notifications
You must be signed in to change notification settings - Fork 22.2k
feat(app): improve servers UI #30961
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.
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon" | ||
| import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2" | ||
| import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2" | ||
| import { type Component, Show } from "solid-js" | ||
| import { useServerManagementController } from "@/components/dialog-select-server" | ||
| import { useLanguage } from "@/context/language" | ||
| import { ServerConnection } from "@/context/server" | ||
|
|
||
| export const ServerRowMenu: Component<{ | ||
| server: ServerConnection.Any | ||
| controller: ReturnType<typeof useServerManagementController> | ||
| onEdit: (server: ServerConnection.Http) => void | ||
| open?: boolean | ||
| onOpenChange?: (open: boolean) => void | ||
| }> = (props) => { | ||
| const language = useLanguage() | ||
| const key = ServerConnection.key(props.server) | ||
| const builtin = ServerConnection.builtin(props.server) | ||
| const isDefault = () => props.controller.defaultKey() === key | ||
|
|
||
| return ( | ||
| <MenuV2 | ||
| gutter={4} | ||
| modal={false} | ||
| placement="bottom-end" | ||
| open={props.open} | ||
| onOpenChange={props.onOpenChange} | ||
| > | ||
| <MenuV2.Trigger | ||
| as={IconButtonV2} | ||
| variant="ghost-muted" | ||
| size="small" | ||
| icon={<IconV2 name="outline-dots" />} | ||
| aria-label={language.t("common.moreOptions")} | ||
| /> | ||
| <MenuV2.Portal> | ||
| <MenuV2.Content> | ||
| <MenuV2.Group> | ||
| <MenuV2.GroupLabel>{language.t("settings.section.server")}</MenuV2.GroupLabel> | ||
| <MenuV2.Item | ||
| disabled={builtin || props.server.type !== "http"} | ||
| onSelect={() => props.onEdit(props.server as ServerConnection.Http)} | ||
| > | ||
| {language.t("dialog.server.menu.edit")} | ||
| </MenuV2.Item> | ||
| <Show when={props.controller.canDefault() && !isDefault()}> | ||
| <MenuV2.Item onSelect={() => props.controller.setDefault(key)}> | ||
| {language.t("dialog.server.menu.default")} | ||
| </MenuV2.Item> | ||
| </Show> | ||
| <Show when={props.controller.canDefault() && isDefault()}> | ||
| <MenuV2.Item onSelect={() => props.controller.setDefault(null)}> | ||
| {language.t("dialog.server.menu.defaultRemove")} | ||
| </MenuV2.Item> | ||
| </Show> | ||
| <MenuV2.Separator /> | ||
| <MenuV2.Item disabled={builtin} onSelect={() => props.controller.handleRemove(key)}> | ||
| {language.t("dialog.server.menu.delete")} | ||
| </MenuV2.Item> | ||
| </MenuV2.Group> | ||
| </MenuV2.Content> | ||
| </MenuV2.Portal> | ||
| </MenuV2> | ||
| ) | ||
| } |
129 changes: 129 additions & 0 deletions
129
packages/app/src/components/settings-v2/dialog-server-v2.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2" | ||
| import { Dialog, DialogFooter } from "@opencode-ai/ui/v2/dialog-v2" | ||
| import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2" | ||
| import { useDialog } from "@opencode-ai/ui/context/dialog" | ||
| import { type Component, Show, createEffect, createSignal, onCleanup, onMount } from "solid-js" | ||
| import { useLanguage } from "@/context/language" | ||
| import { type ServerConnection } from "@/context/server" | ||
| import { useServerManagementController } from "../dialog-select-server" | ||
| import "./settings-v2.css" | ||
|
|
||
| export const DialogServerV2: Component<{ | ||
| mode: "add" | "edit" | ||
| server?: ServerConnection.Http | ||
| }> = (props) => { | ||
| const dialog = useDialog() | ||
| const language = useLanguage() | ||
| const controller = useServerManagementController({ | ||
| onSelect: () => dialog.close(), | ||
| navigateOnAdd: false, | ||
| }) | ||
| const [opened, setOpened] = createSignal(false) | ||
|
|
||
| onMount(() => { | ||
| if (props.mode === "add") controller.startAdd() | ||
| if (props.mode === "edit" && props.server) controller.startEdit(props.server) | ||
| setOpened(true) | ||
| }) | ||
|
|
||
| onCleanup(() => { | ||
| controller.resetForm() | ||
| }) | ||
|
|
||
| createEffect(() => { | ||
| if (!opened()) return | ||
| if (controller.isFormMode()) return | ||
| dialog.close() | ||
| }) | ||
|
|
||
| const keyDown = (event: KeyboardEvent) => { | ||
| if (event.key !== "Enter" || event.isComposing) return | ||
| event.preventDefault() | ||
| controller.submitForm() | ||
| } | ||
|
|
||
| const title = () => | ||
| props.mode === "add" ? language.t("dialog.server.add.title") : language.t("dialog.server.edit.title") | ||
|
|
||
| const submitLabel = () => { | ||
| if (controller.formBusy()) return language.t("dialog.server.add.checking") | ||
| if (props.mode === "add") return language.t("dialog.server.add.button") | ||
| return language.t("common.save") | ||
| } | ||
|
|
||
| return ( | ||
| <Dialog title={title()} fit class="settings-v2-server-dialog"> | ||
| <div class="flex w-full min-w-0 flex-1 flex-col px-4"> | ||
| <div class="flex w-full min-w-0 flex-col gap-6"> | ||
| <div class="flex w-full min-w-0 flex-col gap-2"> | ||
| <label class="settings-v2-server-dialog-label">{language.t("dialog.server.add.url")}</label> | ||
| <TextInputV2 | ||
| type="text" | ||
| appearance="large" | ||
| class="!w-full self-stretch" | ||
| value={controller.formValue()} | ||
| placeholder={language.t("dialog.server.add.placeholder")} | ||
| invalid={!!controller.formError()} | ||
| disabled={controller.formBusy()} | ||
| autofocus | ||
| onInput={(event) => controller.handleFormChange()(event.currentTarget.value)} | ||
| onKeyDown={keyDown} | ||
| /> | ||
| <Show when={controller.formError()}> | ||
| <span class="settings-v2-server-dialog-error">{controller.formError()}</span> | ||
| </Show> | ||
| </div> | ||
| <div class="flex w-full min-w-0 flex-col gap-2"> | ||
| <label class="settings-v2-server-dialog-label">{language.t("dialog.server.add.name")}</label> | ||
| <TextInputV2 | ||
| type="text" | ||
| appearance="large" | ||
| class="!w-full self-stretch" | ||
| value={controller.formName()} | ||
| placeholder={language.t("dialog.server.add.namePlaceholder")} | ||
| disabled={controller.formBusy()} | ||
| onInput={(event) => controller.handleFormNameChange()(event.currentTarget.value)} | ||
| onKeyDown={keyDown} | ||
| /> | ||
| </div> | ||
| <div class="grid w-full min-w-0 grid-cols-2 gap-4"> | ||
| <div class="flex min-w-0 flex-col gap-2"> | ||
| <label class="settings-v2-server-dialog-label">{language.t("dialog.server.add.username")}</label> | ||
| <TextInputV2 | ||
| type="text" | ||
| appearance="large" | ||
| class="!w-full self-stretch" | ||
| value={controller.formUsername()} | ||
| placeholder={language.t("dialog.server.add.usernamePlaceholder")} | ||
| disabled={controller.formBusy()} | ||
| onInput={(event) => controller.handleFormUsernameChange()(event.currentTarget.value)} | ||
| onKeyDown={keyDown} | ||
| /> | ||
| </div> | ||
| <div class="flex min-w-0 flex-col gap-2"> | ||
| <label class="settings-v2-server-dialog-label">{language.t("dialog.server.add.password")}</label> | ||
| <TextInputV2 | ||
| type="password" | ||
| appearance="large" | ||
| class="!w-full self-stretch" | ||
| value={controller.formPassword()} | ||
| placeholder={language.t("dialog.server.add.passwordPlaceholder")} | ||
| disabled={controller.formBusy()} | ||
| onInput={(event) => controller.handleFormPasswordChange()(event.currentTarget.value)} | ||
| onKeyDown={keyDown} | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <DialogFooter> | ||
| <ButtonV2 variant="neutral" disabled={controller.formBusy()} onClick={() => dialog.close()}> | ||
| {language.t("common.cancel")} | ||
| </ButtonV2> | ||
| <ButtonV2 variant="contrast" disabled={controller.formBusy()} onClick={controller.submitForm}> | ||
| {submitLabel()} | ||
| </ButtonV2> | ||
| </DialogFooter> | ||
| </Dialog> | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2" | ||
| import { Tag } from "@opencode-ai/ui/v2/badge-v2" | ||
| import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon" | ||
| import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2" | ||
| import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2" | ||
| import { useDialog } from "@opencode-ai/ui/context/dialog" | ||
| import fuzzysort from "fuzzysort" | ||
| import { type Component, For, Show, createMemo } from "solid-js" | ||
| import { createStore } from "solid-js/store" | ||
| import { ServerRowMenu } from "@/components/server/server-row-menu" | ||
| import { ServerHealthIndicator } from "@/components/server/server-row" | ||
| import { useLanguage } from "@/context/language" | ||
| import { ServerConnection, serverName } from "@/context/server" | ||
| import { useServerManagementController } from "../dialog-select-server" | ||
| import { DialogServerV2 } from "./dialog-server-v2" | ||
| import { SettingsListV2 } from "./parts/list" | ||
| import "./settings-v2.css" | ||
|
|
||
| export const SettingsServersV2: Component = () => { | ||
| const dialog = useDialog() | ||
| const language = useLanguage() | ||
| const controller = useServerManagementController() | ||
| const [store, setStore] = createStore({ filter: "" }) | ||
|
|
||
| const showSearch = createMemo(() => controller.sortedItems().length > 1) | ||
|
|
||
| const filtered = createMemo(() => { | ||
| const items = controller.sortedItems() | ||
| const query = store.filter.trim() | ||
| if (!query) return items | ||
| return fuzzysort | ||
| .go(query, items, { | ||
| keys: [(item) => serverName(item), (item) => item.http.url], | ||
| }) | ||
| .map((result) => result.obj) | ||
| }) | ||
|
|
||
| const openAdd = () => { | ||
| dialog.push(() => <DialogServerV2 mode="add" />) | ||
| } | ||
|
|
||
| const openEdit = (server: ServerConnection.Http) => { | ||
| dialog.push(() => <DialogServerV2 mode="edit" server={server} />) | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| <div | ||
| class="settings-v2-tab-header settings-v2-servers-header" | ||
| classList={{ "settings-v2-tab-header--stacked": showSearch() }} | ||
| > | ||
| <div class="settings-v2-tab-header-row"> | ||
| <h2 class="settings-v2-tab-title">{language.t("status.popover.tab.servers")}</h2> | ||
| <ButtonV2 variant="ghost-muted" icon="plus" onClick={openAdd}> | ||
| {language.t("dialog.server.add.button")} | ||
| </ButtonV2> | ||
| </div> | ||
| <Show when={showSearch()}> | ||
| <div class="settings-v2-tab-search"> | ||
| <TextInputV2 | ||
| type="search" | ||
| appearance="base" | ||
| value={store.filter} | ||
| onInput={(event) => setStore("filter", event.currentTarget.value)} | ||
| placeholder={language.t("dialog.server.search.placeholder")} | ||
| spellcheck={false} | ||
| autocorrect="off" | ||
| autocomplete="off" | ||
| autocapitalize="off" | ||
| aria-label={language.t("dialog.server.search.placeholder")} | ||
| /> | ||
| <Show when={store.filter}> | ||
| <IconButtonV2 | ||
| type="button" | ||
| variant="ghost-muted" | ||
| size="small" | ||
| class="settings-v2-tab-search-clear" | ||
| icon={<IconV2 name="close" size="large" class="text-v2-icon-icon-muted" />} | ||
| onClick={() => setStore("filter", "")} | ||
| /> | ||
| </Show> | ||
| </div> | ||
| </Show> | ||
| </div> | ||
|
|
||
| <div class="settings-v2-tab-body settings-v2-servers"> | ||
| <Show | ||
| when={filtered().length > 0} | ||
| fallback={ | ||
| <div class="settings-v2-servers-status"> | ||
| <span>{store.filter ? language.t("palette.empty") : language.t("dialog.server.empty")}</span> | ||
| <Show when={store.filter}> | ||
| <span class="settings-v2-servers-status-filter">"{store.filter}"</span> | ||
| </Show> | ||
| </div> | ||
| } | ||
| > | ||
| <SettingsListV2> | ||
| <For each={filtered()}> | ||
| {(item) => { | ||
| const key = ServerConnection.key(item) | ||
| const health = () => controller.status()[key] | ||
| const isDefault = () => controller.defaultKey() === key | ||
| return ( | ||
| <div class="settings-v2-servers-row"> | ||
| <div class="settings-v2-servers-lead"> | ||
| <ServerHealthIndicator health={health()} /> | ||
| <div class="settings-v2-servers-copy"> | ||
| <span class="settings-v2-servers-name">{serverName(item)}</span> | ||
| <span class="settings-v2-servers-meta"> | ||
| <Show when={health()?.version}>v{health()?.version}</Show> | ||
| <Show when={health()?.version && item.type === "http"}> • </Show> | ||
| <Show | ||
| when={item.type === "http" && item.http.username} | ||
| fallback={ | ||
| <Show when={item.type === "http"}>{language.t("server.row.noUsername")}</Show> | ||
| } | ||
| > | ||
| {item.http.username} | ||
| </Show> | ||
| </span> | ||
| </div> | ||
| </div> | ||
| <div class="settings-v2-servers-actions"> | ||
| <Show when={controller.canDefault() && isDefault()}> | ||
| <Tag>{language.t("dialog.server.status.default")}</Tag> | ||
| </Show> | ||
| <ServerRowMenu server={item} controller={controller} onEdit={openEdit} /> | ||
| </div> | ||
| </div> | ||
| ) | ||
| }} | ||
| </For> | ||
| </SettingsListV2> | ||
| </Show> | ||
| </div> | ||
| </> | ||
| ) | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Non-blocking follow-up: these four visible labels are not associated with their inputs.
TextInputV2renders a sibling<input>and does not create that association, so clicking a label will not focus the field and assistive technology will not announce the visible label. Could we add matchingfor/idattributes (or equivalent accessible labels) in a follow-up?