* Group settings navigation menu Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Revert "Group settings navigation menu" This reverts commit 5983a4e82074b8dab1084af1cadd803ba28ea65d. * Standardize settings layout feedback Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Fix settings save status timer typing Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Retain settings save status Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Report color mode save state Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Match Appearance settings to two-column layout Rebuild Appearance into Color mode & Theme, Localization, and Density & type sections with responsive two-column grids, consistent section headers, page description, and green save status. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Migrate settings pages to SettingsPageLayout and SettingsSection Replace ScrollableOverlay/max-w-3xl shells with the shared settings layout primitives across entity and static settings pages, normalize section headers, and add settings.page.behavior.description locales. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Unify remaining settings pages on shared section chrome Wire Appearance, Projects, and Remote Instances through SettingsSection/SettingsPageLayout so every settings surface shares the same header, divider, and page shell treatment. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Align settings UI with OpenChamber design system kit Apply kit geometry and control specs: 840px content width, 32/48 padding, fixed 260/280 sidebars, radius/spacing tokens, settings select height, stepper dimensions, and shared field/link typography. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Migrate OpenChamberVisualSettings to shared settings primitives Replace ad-hoc radio/checkbox/chip/field layouts with SettingsSection shared chrome for Appearance, Density, Navigation, Chat/behavior, and Privacy while preserving handlers and data-settings-item anchors. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Migrate settings pages to shared field/checkbox/radio primitives Unify Defaults, Notifications, Behavior, Git, Session Retention, Passkeys, OpenCode CLI, Commands, About, Keyboard Shortcuts, and Desktop Network on SettingsFieldRow / SettingsCheckboxRow / SettingsRadioGroup / SettingsChipGroup for consistent grid, spacing, and DRY layout. Also remove the GitPage double SettingsSection wrap around GitHubSettings. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Unify remaining settings pages onto shared field primitives Migrate Agents, Snippets, Skills, Usage, MCP identity rows and selects to SettingsFieldRow/CheckboxRow/ChipGroup and SETTINGS_SELECT_*; align page titles; light-touch Voice/Tunnel/Providers/Plugins without rewriting complex OAuth, permissions, or tunnel flows. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Polish settings section dividers and transport helper text Slightly stronger section borders for clearer group separation, and keep message-stream transport description under the chip control. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Fix settings grid alignment, control heights, and Chat section titles Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Tighten settings grid: flat Chat 2x2 and full-width stacked selects Message options use a flat two-column grid so row headers share a baseline. Stacked selects fill their column; field-row selects keep a fixed sm:w-56 width. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Align mixed settings controls to shared FieldRow/CheckboxRow grid Separate FieldRows from CheckboxRows with SettingsInset, move enum radios into ControlGroups, and convert misplaced StackedFields to full-width FieldRows so left edges no longer clash. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Translate Behavior response-style preset labels for es and pl Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Group settings nav into categories and improve icons/order Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Fix settings layout: fewer hrs, shared control widths, chat transport section Remove SettingsInset top borders, align App install/Density controls to full cluster width, give Message Stream Transport its own Chat section, and fold Sessions Small Model into the first section to cut extra dividers. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Align Voice and MCP settings labels with shared heading classes Swap form field labels to SETTINGS_FIELD_LABEL_CLASS and use SettingsGroupTitle for MCP control-group headings (manual auth fallback, request headers). Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Differentiate settings heading levels by context Page titles are larger and quieter than section titles; group and field labels use dedicated shared classes so hierarchy is consistent across settings surfaces without ad-hoc typography mixes. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Use shared settings title classes in SettingsView home Wire home and unavailable headings through the shared L1/L2 class constants so they stay aligned with SettingsPageLayout. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Keep settings number steppers from stretching +/- buttons Density & type NumberInputs no longer flex-grow across the row, and NumberInput locks minus/plus to fixed width so the plus side cannot inflate when the control is placed in a full-width cluster. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Place spacing and input-bar offset on their own row Density & type now lays out as font families, then font sizes, then Spacing Density / Input Bar Offset on the row below. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Regroup settings nav and improve Voice layout Drop Advanced/Usage/Git nav categories: Voice and About under Interface, Usage under OpenCode, Git under Workspace. Voice provider chips and STT model cards use shared settings primitives with roomier spacing and a two-column model grid. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> * Space out chat feature groups in visual settings * Polish settings: save-state wiring, container-query layouts, unified dropdown triggers - Wire shared save indicator into Behavior page saves and git identity CRUD - Convert settings layout primitives and page rows from viewport to container queries so narrow panes stack instead of clipping - Unify custom dropdown triggers (model/agent/provider pickers) and remaining page selects on the settings control size - Bump global radius scale by 1px; align variant input with select size - Migrate stray raw controls (MCP OAuth checkbox, worktree remove button, git identity dialog rows, skills dialog labels) onto shared primitives - Make settings nav items span full sidebar width; trim nav to 240px * Add General settings page, regroup nav, cap control widths, promote chat feature headers * Mobile settings nav: plain background and touch-sized rows * Hide secondary settings descriptions behind clickable info hints * Move quota credentials to Usage, navigation settings to General, rename External Tunnel * Quiet settings save indicator: silent success, delayed spinner, visible errors * Rewrite settings-ui-patterns skill around shared primitives and refactored conventions * Remove settings starter page; open last visited page, defaulting to General * Settings polish: spacing, control sizes, trigger widths, readable model names, device dates * Centralize dropdown trigger chrome, settings nav polish, mobile-only input bar offset * Fix global line-height regression, auto-hide first-section divider, shortcut row spacing * Global line-height 1.45, align scheduled tasks header button with select * Hide editor toolbar and About in VS Code, animate chat render preview outside desktop dialog * Rebuild agent tool permissions on source-of-truth model Edit the agent's own permission map verbatim (inherit vs explicit actions, pattern rules only for pattern-capable keys), save permission-only, drop the server-side non-wildcard re-merge that resurrected deleted rules, and surface session-granted rules as read-only. * Agents model parameters polish: row spacing, variant dropdown, unified widths, dash for unset numbers --------- Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com> Co-authored-by: Bohdan Triapitsyn <artmore@protonmail.com>
258 lines
8.3 KiB
TypeScript
258 lines
8.3 KiB
TypeScript
import React from 'react';
|
|
import {
|
|
Collapsible,
|
|
CollapsibleContent,
|
|
CollapsibleTrigger,
|
|
} from '@/components/ui/collapsible';
|
|
import {
|
|
Select,
|
|
SelectContent,
|
|
SelectItem,
|
|
SelectTrigger,
|
|
SelectValue,
|
|
} from '@/components/ui/select';
|
|
import { Button } from '@/components/ui/button';
|
|
import { ScrollableOverlay } from '@/components/ui/ScrollableOverlay';
|
|
import { Icon } from "@/components/icon/Icon";
|
|
import { HistoryCommitRow } from './HistoryCommitRow';
|
|
import type { GitLogEntry, CommitFileEntry } from '@/lib/api/types';
|
|
import { useI18n } from '@/lib/i18n';
|
|
import { assignLanes } from './gitGraph';
|
|
import type { LanedCommit } from './gitGraph';
|
|
|
|
const LOG_SIZE_OPTIONS = [
|
|
{ labelKey: 'gitView.history.logSize25', value: 25 },
|
|
{ labelKey: 'gitView.history.logSize50', value: 50 },
|
|
{ labelKey: 'gitView.history.logSize100', value: 100 },
|
|
];
|
|
|
|
interface HistorySectionProps {
|
|
mode?: 'history' | 'graph';
|
|
log: { all: GitLogEntry[] } | null;
|
|
isLogLoading: boolean;
|
|
logMaxCount: number;
|
|
onLogMaxCountChange: (count: number) => void;
|
|
expandedCommitHashes: Set<string>;
|
|
onToggleCommit: (hash: string) => void;
|
|
commitFilesMap: Map<string, CommitFileEntry[]>;
|
|
loadingCommitHashes: Set<string>;
|
|
onCopyHash: (hash: string) => void;
|
|
directory: string | undefined;
|
|
showHeader?: boolean;
|
|
contentMaxHeightClassName?: string;
|
|
branchDivider?: {
|
|
insertBeforeIndex: number;
|
|
branchName: string;
|
|
direction: 'up' | 'down';
|
|
} | null;
|
|
onConflict?: (result: { conflict: boolean; conflictFiles?: string[]; operation: 'cherry-pick' | 'revert' | 'merge' | 'rebase' }) => void;
|
|
onActionSuccess?: () => void;
|
|
}
|
|
|
|
export const HistorySection: React.FC<HistorySectionProps> = ({
|
|
mode = 'history',
|
|
log,
|
|
isLogLoading,
|
|
logMaxCount,
|
|
onLogMaxCountChange,
|
|
expandedCommitHashes,
|
|
onToggleCommit,
|
|
commitFilesMap,
|
|
loadingCommitHashes,
|
|
onCopyHash,
|
|
directory,
|
|
showHeader = true,
|
|
contentMaxHeightClassName = 'max-h-[50vh]',
|
|
branchDivider = null,
|
|
onConflict,
|
|
onActionSuccess,
|
|
}) => {
|
|
const { t } = useI18n();
|
|
const [isOpen, setIsOpen] = React.useState(true);
|
|
const isGraphMode = mode === 'graph';
|
|
|
|
const laned: LanedCommit[] = React.useMemo(
|
|
() => (isGraphMode && log ? assignLanes(log.all) : []),
|
|
[isGraphMode, log]
|
|
);
|
|
|
|
const maxLanes = React.useMemo(
|
|
() => Math.max(1, ...laned.map((l) => l.lane + 1)),
|
|
[laned]
|
|
);
|
|
|
|
const lanedByHash = React.useMemo(
|
|
() => new Map(laned.map((l) => [l.commit.hash, l])),
|
|
[laned]
|
|
);
|
|
|
|
// Early return AFTER all hooks
|
|
if (!log) {
|
|
return null;
|
|
}
|
|
|
|
const hasDivider =
|
|
branchDivider !== null &&
|
|
branchDivider.insertBeforeIndex > 0 &&
|
|
branchDivider.insertBeforeIndex < log.all.length;
|
|
const hasDividerBelowLoaded = branchDivider !== null && branchDivider.insertBeforeIndex === log.all.length;
|
|
const hasSplitHistory = hasDivider || hasDividerBelowLoaded;
|
|
|
|
const topEntries = hasDivider
|
|
? log.all.slice(0, branchDivider.insertBeforeIndex)
|
|
: hasDividerBelowLoaded
|
|
? log.all
|
|
: [];
|
|
const bottomEntries = hasDivider ? log.all.slice(branchDivider.insertBeforeIndex) : [];
|
|
|
|
const dividerIcon = branchDivider?.direction === 'down'
|
|
? <Icon name="arrow-down-s" className="size-3.5" />
|
|
: <Icon name="arrow-up" className="size-3.5" />;
|
|
|
|
const renderCommitList = (entries: GitLogEntry[]) => (
|
|
<ul className="divide-y divide-border/60">
|
|
{entries.map((entry) => (
|
|
<HistoryCommitRow
|
|
key={entry.hash}
|
|
entry={entry}
|
|
mode={mode}
|
|
laned={isGraphMode ? lanedByHash.get(entry.hash) : undefined}
|
|
totalLanes={isGraphMode ? maxLanes : undefined}
|
|
isExpanded={expandedCommitHashes.has(entry.hash)}
|
|
onToggle={() => onToggleCommit(entry.hash)}
|
|
files={commitFilesMap.get(entry.hash) ?? []}
|
|
isLoadingFiles={loadingCommitHashes.has(entry.hash)}
|
|
onCopyHash={onCopyHash}
|
|
directory={directory}
|
|
onConflict={onConflict}
|
|
onActionSuccess={onActionSuccess}
|
|
/>
|
|
))}
|
|
</ul>
|
|
);
|
|
|
|
const loadMoreButton = log.all.length >= logMaxCount ? (
|
|
<div className="flex justify-center py-2 border-t border-border/40">
|
|
<Button
|
|
type="button"
|
|
variant="ghost"
|
|
size="xs"
|
|
onClick={() => onLogMaxCountChange(logMaxCount + 25)}
|
|
disabled={isLogLoading}
|
|
className="px-3 text-muted-foreground hover:text-foreground"
|
|
>
|
|
{isLogLoading ? (
|
|
<span className="flex items-center gap-1">
|
|
<Icon name="loader-4" className="size-3 animate-spin" />
|
|
{t('gitView.history.loadingMore')}
|
|
</span>
|
|
) : (
|
|
t('gitView.history.loadMore')
|
|
)}
|
|
</Button>
|
|
</div>
|
|
) : null;
|
|
|
|
const content = (
|
|
<ScrollableOverlay outerClassName={`min-h-0 ${contentMaxHeightClassName}`} className="h-full w-full">
|
|
{log.all.length === 0 ? (
|
|
<div className="flex h-full items-center justify-center p-4">
|
|
<p className="typography-ui-label text-muted-foreground">
|
|
{t('gitView.history.noCommits')}
|
|
</p>
|
|
</div>
|
|
) : hasSplitHistory && branchDivider ? (
|
|
<>
|
|
<div className="flex flex-col gap-0">
|
|
{topEntries.length > 0 ? (
|
|
<div className="rounded-xl border border-border/60 bg-background/70 overflow-hidden">
|
|
{renderCommitList(topEntries)}
|
|
</div>
|
|
) : null}
|
|
|
|
<div className="flex items-center gap-2 px-3 py-1.5" aria-hidden>
|
|
<span className="h-px flex-1 bg-border/60" />
|
|
<span className="inline-flex max-w-[80%] items-center gap-1 typography-micro text-muted-foreground">
|
|
<span className="truncate" title={branchDivider.branchName}>{branchDivider.branchName}</span>
|
|
{dividerIcon}
|
|
</span>
|
|
<span className="h-px flex-1 bg-border/60" />
|
|
</div>
|
|
|
|
{bottomEntries.length > 0 ? (
|
|
<div className="rounded-xl border border-border/60 bg-background/70 overflow-hidden">
|
|
{renderCommitList(bottomEntries)}
|
|
</div>
|
|
) : null}
|
|
</div>
|
|
{loadMoreButton}
|
|
</>
|
|
) : (
|
|
<>
|
|
{renderCommitList(log.all)}
|
|
{loadMoreButton}
|
|
</>
|
|
)}
|
|
</ScrollableOverlay>
|
|
);
|
|
|
|
if (!showHeader) {
|
|
if (hasSplitHistory) {
|
|
return <section className="h-full min-h-0">{content}</section>;
|
|
}
|
|
return (
|
|
<section className="h-full min-h-0 rounded-xl border border-border/60 bg-background/70 overflow-hidden">
|
|
{content}
|
|
</section>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<Collapsible
|
|
open={isOpen}
|
|
onOpenChange={setIsOpen}
|
|
className="rounded-xl border border-border/60 bg-background/70 overflow-hidden"
|
|
>
|
|
<CollapsibleTrigger className="flex w-full items-center justify-between px-3 h-10 hover:bg-transparent">
|
|
<h3 className="typography-ui-header font-semibold text-foreground">{t('gitView.history.title')}</h3>
|
|
<div className="flex items-center gap-2">
|
|
{isOpen && (
|
|
<div
|
|
onClick={(e) => e.stopPropagation()}
|
|
onPointerDown={(e) => e.stopPropagation()}
|
|
>
|
|
<Select
|
|
value={String(logMaxCount)}
|
|
onValueChange={(value) => onLogMaxCountChange(Number(value))}
|
|
disabled={isLogLoading}
|
|
>
|
|
<SelectTrigger
|
|
size="sm"
|
|
className="w-auto"
|
|
disabled={isLogLoading}
|
|
>
|
|
<SelectValue placeholder={t('gitView.history.commitsPlaceholder')} />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{LOG_SIZE_OPTIONS.map((option) => (
|
|
<SelectItem key={option.value} value={String(option.value)}>
|
|
{t(option.labelKey as never)}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</div>
|
|
)}
|
|
{isOpen ? (
|
|
<Icon name="arrow-up-s" className="size-4 text-muted-foreground" />
|
|
) : (
|
|
<Icon name="arrow-down-s" className="size-4 text-muted-foreground" />
|
|
)}
|
|
</div>
|
|
</CollapsibleTrigger>
|
|
|
|
<CollapsibleContent>{content}</CollapsibleContent>
|
|
</Collapsible>
|
|
);
|
|
};
|