mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-11-19 15:08:23 +01:00
The comparison query kept its last answer as placeholder data across version changes, so switching to a response with no version, or to one whose comparison was still loading, could leave the Request Changed dropdown offering another response's diff and restore. Placeholder data now carries over only within the same version, and the hook returns a comparison only when it is for the version asked about. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
80 lines
2.4 KiB
TypeScript
80 lines
2.4 KiB
TypeScript
import type { HttpResponse, RequestVersionComparison } from "@yaakapp-internal/models";
|
|
import { Icon } from "@yaakapp-internal/ui";
|
|
import { stringify } from "yaml";
|
|
import { useRequestVersion } from "../hooks/useRequestVersion";
|
|
import { showDialog } from "../lib/dialog";
|
|
import { restoreRequestVersion } from "../lib/restoreRequestVersion";
|
|
import { Button } from "./core/Button";
|
|
import { DiffViewer } from "./core/Editor/DiffViewer";
|
|
import { Dropdown } from "./core/Dropdown";
|
|
|
|
interface Props {
|
|
response: Pick<HttpResponse, "requestId" | "versionId">;
|
|
}
|
|
|
|
/**
|
|
* Offers the request a response was sent from, when that is no longer the
|
|
* request you have.
|
|
*
|
|
* Hidden while the two agree, which is the overwhelmingly common case and the
|
|
* one where there is nothing to say. Responses recorded before versioning
|
|
* existed have no version and stay quiet forever.
|
|
*/
|
|
export function RequestVersionDropdown({ response }: Props) {
|
|
const comparison = useRequestVersion(response.versionId, response.requestId);
|
|
if (comparison == null || !comparison.differs) {
|
|
return null;
|
|
}
|
|
|
|
return (
|
|
<Dropdown
|
|
items={[
|
|
{
|
|
label: "View Diff",
|
|
leftSlot: <Icon icon="git_branch" />,
|
|
onSelect: () => showRequestVersionDiff(comparison),
|
|
},
|
|
{
|
|
label: "Restore This Version",
|
|
leftSlot: <Icon icon="history" />,
|
|
onSelect: () => restoreRequestVersion(comparison.version),
|
|
},
|
|
]}
|
|
>
|
|
<Button
|
|
size="2xs"
|
|
variant="border"
|
|
color="notice"
|
|
className="font-sans"
|
|
title="This request has changed since this response was sent"
|
|
forDropdown
|
|
>
|
|
Request Changed
|
|
</Button>
|
|
</Dropdown>
|
|
);
|
|
}
|
|
|
|
function showRequestVersionDiff(comparison: RequestVersionComparison) {
|
|
showDialog({
|
|
id: "request-version-diff",
|
|
title: "Request Changes Since This Response",
|
|
size: "full",
|
|
noPadding: true,
|
|
render: () => (
|
|
<div className="h-full flex flex-col px-4 pb-4">
|
|
<DiffViewer
|
|
original={toYaml(comparison.version.document)}
|
|
modified={toYaml(comparison.currentDocument)}
|
|
className="flex-1 min-h-0"
|
|
/>
|
|
</div>
|
|
),
|
|
});
|
|
}
|
|
|
|
/** Matches how the Git dialog renders a model for diffing. */
|
|
function toYaml(document: unknown): string {
|
|
return stringify(document, { indent: 2, lineWidth: 0 });
|
|
}
|