cf76a27488
* feat(web): normalize /gitlab page to match /github layout
Adds a presets sidebar (MR/Issue toggle, Inbox/Created groups, Saved
section), a top toolbar with project filter and custom-query input,
paginated MR/Issue lists, and a save-preset dialog backed by a
localStorage store at kandev:gitlab-presets:v1.
Replaces the bespoke tabbed layout and supersedes
hooks/domains/gitlab/use-user-search with the pagination-aware
useGitLabSearch under components/gitlab/my-gitlab/. Project filtering is
applied client-side since GitLab's global MR/issue endpoints have no
path_with_namespace qualifier. No backend changes — the controller
already accepts filter / custom_query / page / per_page.
* fix(web): address /gitlab review feedback
- Merge duplicate cn/formatRelativeTime imports in list-toolbar.
- Drop the generic T from useGitLabSearch — it always resolved to MR | Issue,
so the as-unknown-as double-cast was just hiding that. Now returns
Array<MR | Issue> directly and exposes rawTotal alongside total.
- When projectFilter is active, total reflects the client-side filtered
count instead of the server's unfiltered total so the toolbar badge and
pagination don't claim "47 results" while only 3 rows render.
- Save flow uses committedQuery, not the draft customQuery, so a preset
saved without pressing Enter matches what's actually displayed.
- Wrap mobile sidebar handlers in useCallback to keep props stable.
- Drop the unused refresh callback in useGitLabStatusFetch (no caller).
- Add hook-level tests for useSavedPresets save/remove/sync; use
resetKnownProjectsStore directly in the known-projects test.
* fix(web): address round-2 /gitlab review feedback
- useSavedPresets save/remove now read from localStorage on every call so a
concurrent write from another tab can't be silently overwritten by a stale
in-memory snapshot.
- Tighten persisted shape validation: customQuery, projectFilter, and
createdAt must all be strings (plus 3 regression tests).
- ResultsPagination clamps page to [1, totalPages] before deriving start/end
and prev/next state, so a stale out-of-range page doesn't render an
invalid range like "101–30 of 30" after a refresh that shrinks results.
- PresetsSidebar: ignore keydown bubbling from the nested delete button so
Enter/Space on delete doesn't also trigger row selection, and add an
aria-label to the icon-only delete control.
- Revert the hook's filtered-total policy: useGitLabSearch always returns
the raw server total now (so pagination can still navigate to later
pages). The page client owns the toolbar's displayedCount, computing
filtered.length only when a project filter is active.
* fix(web): drop dead gitlab preset re-exports, tighten save dialog deps
- Remove unused IconBug / IconPencil imports and the re-export from
presets.ts — no consumer imports them from this module.
- save-preset-dialog: inline the trimmed check inside handleSubmit so
canSubmit no longer needs to be in the deps array. ESLint exhaustive-
deps forced the previous duplication; inlining removes it cleanly.
* fix(web): null-safe response unwrap in useGitLabSearch
If the API returns null, the cast `(response as {mrs: ...}).mrs` would
crash before the `?? []` fallback could run. Optional-chain the cast so a
null payload yields an empty list, matching the existing total_count guard.
---------
Co-authored-by: Kandev Agent <agent@kandev.dev>
135 lines
3.6 KiB
TypeScript
135 lines
3.6 KiB
TypeScript
"use client";
|
|
|
|
import { useCallback, useState } from "react";
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogDescription,
|
|
DialogFooter,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from "@kandev/ui/dialog";
|
|
import { Input } from "@kandev/ui/input";
|
|
import { Button } from "@kandev/ui/button";
|
|
import { Label } from "@kandev/ui/label";
|
|
|
|
type SavePresetDialogProps = {
|
|
open: boolean;
|
|
onOpenChange: (open: boolean) => void;
|
|
kind: "mr" | "issue";
|
|
customQuery: string;
|
|
projectFilter: string;
|
|
suggestedLabel: string;
|
|
onSave: (label: string) => void;
|
|
};
|
|
|
|
function SavePresetForm({
|
|
kind,
|
|
customQuery,
|
|
projectFilter,
|
|
suggestedLabel,
|
|
onSave,
|
|
onClose,
|
|
}: {
|
|
kind: "mr" | "issue";
|
|
customQuery: string;
|
|
projectFilter: string;
|
|
suggestedLabel: string;
|
|
onSave: (label: string) => void;
|
|
onClose: () => void;
|
|
}) {
|
|
const [value, setValue] = useState(suggestedLabel);
|
|
const trimmed = value.trim();
|
|
const canSubmit = trimmed.length > 0;
|
|
|
|
const handleSubmit = useCallback(() => {
|
|
if (!trimmed) return;
|
|
onSave(trimmed);
|
|
onClose();
|
|
}, [trimmed, onSave, onClose]);
|
|
|
|
return (
|
|
<>
|
|
<DialogHeader>
|
|
<DialogTitle>Save GitLab query</DialogTitle>
|
|
<DialogDescription>
|
|
Save this {kind === "mr" ? "merge request" : "issue"} query to the sidebar for quick
|
|
access later.
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
<div className="flex flex-col gap-3">
|
|
<div className="flex flex-col gap-1.5">
|
|
<Label htmlFor="gitlab-preset-label" className="text-xs">
|
|
Name
|
|
</Label>
|
|
<Input
|
|
id="gitlab-preset-label"
|
|
autoFocus
|
|
value={value}
|
|
onChange={(e) => setValue(e.target.value)}
|
|
onKeyDown={(e) => {
|
|
if (e.key === "Enter") handleSubmit();
|
|
}}
|
|
onFocus={(e) => e.target.select()}
|
|
placeholder="e.g. Needs my review"
|
|
/>
|
|
</div>
|
|
<div className="flex flex-col gap-1.5 text-xs">
|
|
{customQuery && (
|
|
<div className="flex gap-2">
|
|
<span className="text-muted-foreground shrink-0 w-16">Query</span>
|
|
<code className="font-mono text-[11px] bg-muted rounded px-1.5 py-0.5 break-all">
|
|
{customQuery}
|
|
</code>
|
|
</div>
|
|
)}
|
|
{projectFilter && (
|
|
<div className="flex gap-2">
|
|
<span className="text-muted-foreground shrink-0 w-16">Project</span>
|
|
<code className="font-mono text-[11px] bg-muted rounded px-1.5 py-0.5 break-all">
|
|
{projectFilter}
|
|
</code>
|
|
</div>
|
|
)}
|
|
</div>
|
|
</div>
|
|
<DialogFooter>
|
|
<Button variant="outline" className="cursor-pointer" onClick={onClose}>
|
|
Cancel
|
|
</Button>
|
|
<Button className="cursor-pointer" disabled={!canSubmit} onClick={handleSubmit}>
|
|
Save
|
|
</Button>
|
|
</DialogFooter>
|
|
</>
|
|
);
|
|
}
|
|
|
|
export function SavePresetDialog({
|
|
open,
|
|
onOpenChange,
|
|
kind,
|
|
customQuery,
|
|
projectFilter,
|
|
suggestedLabel,
|
|
onSave,
|
|
}: SavePresetDialogProps) {
|
|
const handleClose = useCallback(() => onOpenChange(false), [onOpenChange]);
|
|
return (
|
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
|
<DialogContent className="sm:max-w-md">
|
|
{open && (
|
|
<SavePresetForm
|
|
kind={kind}
|
|
customQuery={customQuery}
|
|
projectFilter={projectFilter}
|
|
suggestedLabel={suggestedLabel}
|
|
onSave={onSave}
|
|
onClose={handleClose}
|
|
/>
|
|
)}
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
}
|