diff --git a/packages/app/src/providers/models/manage.css b/packages/app/src/providers/models/manage.css index 3e2f97e3896..d9bc9b4f304 100644 --- a/packages/app/src/providers/models/manage.css +++ b/packages/app/src/providers/models/manage.css @@ -5,27 +5,28 @@ .settings-manage-models-dialog .settings-panel.settings-models { height: 100%; - gap: 0; + gap: 8px; padding: 0 8px 8px; } .settings-manage-models-dialog .settings-models .settings-section { - gap: 4px; - padding-block: 8px; + gap: 8px; + padding-block: 0 8px; } .settings-manage-models-dialog .settings-models .settings-section[data-expanded] { padding-bottom: 8px; } -.settings-manage-models-dialog .settings-models .settings-section + .settings-section { - border-top: 0.5px solid var(--v2-border-border-base); -} - .settings-manage-models-dialog .provider-model-groups { gap: 8px; } +.settings-manage-models-dialog .provider-model-group { + flex-shrink: 0; + margin: 0; +} + .settings-manage-models-dialog .provider-model-group-header { padding: 4px; border-radius: 0; @@ -76,33 +77,16 @@ .manage-models-rows { display: flex; flex-direction: column; - gap: 1px; } .manage-models-rows .search-list-row { - position: relative; height: 36px; padding-inline: 8px; border-radius: 6px; } -.manage-models-rows .search-list-row:not(:last-child)::after { - content: ""; - position: absolute; - inset-inline: 8px; - bottom: -0.75px; - height: 0.5px; - background: var(--v2-border-border-base); - pointer-events: none; -} - @media (hover: hover) { .manage-models-rows .search-list-row:hover { background: var(--v2-overlay-simple-overlay-hover); } - - .manage-models-rows .search-list-row:hover::after, - .manage-models-rows .search-list-row:has(+ .search-list-row:hover)::after { - opacity: 0; - } } diff --git a/packages/app/src/providers/models/manage.tsx b/packages/app/src/providers/models/manage.tsx index 90d3c4833d0..e6df6d9004d 100644 --- a/packages/app/src/providers/models/manage.tsx +++ b/packages/app/src/providers/models/manage.tsx @@ -32,9 +32,6 @@ export const DialogManageModels: Component = () => { const providerList = (providerID: string) => local.model.list().filter((x) => x.provider.id === providerID) - const providerVisible = (providerID: string) => - providerList(providerID).every((x) => local.model.visible({ modelID: x.id, providerID: x.provider.id })) - const setProviderVisibility = (providerID: string, checked: boolean) => { providerList(providerID).forEach((x) => { local.model.setVisibility({ modelID: x.id, providerID: x.provider.id }, checked) @@ -160,16 +157,7 @@ export const DialogManageModels: Component = () => { disabled={searching()} onExpandedChange={(key, value) => setStore("collapsed", key, !value)} onSetVisibility={setProviderVisibility} - action={(group) => ( - setProviderVisibility(group.category, checked)} - hideLabel - > - {group.items[0].provider.name} - - )} + cards rows={(items) => } /> diff --git a/packages/app/src/providers/models/provider-group.tsx b/packages/app/src/providers/models/provider-group.tsx index 3429e0bf7d2..de48556c733 100644 --- a/packages/app/src/providers/models/provider-group.tsx +++ b/packages/app/src/providers/models/provider-group.tsx @@ -25,6 +25,7 @@ function CustomManagedProviderIcon(props: { class?: string }) { } export function ProviderModelIcon(props: { provider: ModelProvider; class?: string }) { + // SAFETY: the cast only lets `includes` look up any string; the type guard narrows on the result. const icon = () => [ props.provider.canonical, @@ -62,6 +63,8 @@ export function ProviderModelSections(props: { rows: (items: T[]) => JSX.Element /** Trailing control in a direct provider's header. */ action?: (group: ModelGroup) => JSX.Element + /** Shows direct providers as cards like the Console's providers, instead of section headers. */ + cards?: boolean onSetVisibility?: (providerID: string, visible: boolean) => void ref?: (providerID: string, element: HTMLElement) => void }) { @@ -127,20 +130,41 @@ export function ProviderModelSections(props: { fallback={ {(group) => ( - props.ref?.(group().category, element)} - class="settings-section" - data-component="settings-models-provider" - data-expanded={props.expanded(group().category) ? "" : undefined} + props.ref?.(group().category, element)} + class="settings-section" + data-component="settings-models-provider" + data-expanded={props.expanded(group().category) ? "" : undefined} + > + } + title={name(group())} + action={props.action?.(group())} + /> + {props.rows(group().items)} + + } > - } - title={name(group())} - action={props.action?.(group())} - /> - {props.rows(group().items)} - + props.ref?.(group().category, element)} + provider={group().items[0].provider} + name={name(group())} + expanded={props.expanded(group().category)} + disabled={props.disabled} + onSetVisibility={ + props.onSetVisibility + ? (visible) => props.onSetVisibility?.(group().category, visible) + : undefined + } + onExpandedChange={(value) => props.onExpandedChange(group().category, value)} + > + {props.rows(group().items)} + + )} } @@ -159,6 +183,16 @@ export function ProviderModelSections(props: { /> + {/* The header button already collapses the Console for the keyboard and screen readers. */} + event.preventDefault()} + onClick={() => props.onExpandedChange(CONSOLE_GROUP_KEY, false)} + /> {(group) => (