Use export name in export deletion dialog instead of file id (#11049)

* use export name in dialog instead of file id

* add type for deletion
This commit is contained in:
Josh Hawkins 2024-04-20 08:44:59 -05:00 committed by GitHub
parent 8092b28710
commit 57800d3843
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 30 additions and 9 deletions

View File

@ -6,10 +6,16 @@ import { isDesktop } from "react-device-detect";
import { FaDownload, FaPlay } from "react-icons/fa"; import { FaDownload, FaPlay } from "react-icons/fa";
import Chip from "../indicators/Chip"; import Chip from "../indicators/Chip";
import { Skeleton } from "../ui/skeleton"; import { Skeleton } from "../ui/skeleton";
import { Dialog, DialogContent, DialogFooter, DialogTitle } from "../ui/dialog"; import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogTitle,
} from "../ui/dialog";
import { Input } from "../ui/input"; import { Input } from "../ui/input";
import useKeyboardListener from "@/hooks/use-keyboard-listener"; import useKeyboardListener from "@/hooks/use-keyboard-listener";
import { Export } from "@/types/export"; import { DeleteClipType, Export } from "@/types/export";
import { MdEditSquare } from "react-icons/md"; import { MdEditSquare } from "react-icons/md";
import { baseUrl } from "@/api/baseUrl"; import { baseUrl } from "@/api/baseUrl";
@ -18,7 +24,7 @@ type ExportProps = {
exportedRecording: Export; exportedRecording: Export;
onSelect: (selected: Export) => void; onSelect: (selected: Export) => void;
onRename: (original: string, update: string) => void; onRename: (original: string, update: string) => void;
onDelete: (file: string) => void; onDelete: ({ file, exportName }: DeleteClipType) => void;
}; };
export default function ExportCard({ export default function ExportCard({
@ -62,6 +68,9 @@ export default function ExportCard({
> >
<DialogContent> <DialogContent>
<DialogTitle>Rename Export</DialogTitle> <DialogTitle>Rename Export</DialogTitle>
<DialogDescription>
Enter a new name for this export.
</DialogDescription>
{editName && ( {editName && (
<> <>
<Input <Input
@ -135,7 +144,12 @@ export default function ExportCard({
</Chip> </Chip>
<Chip <Chip
className="bg-gradient-to-br from-gray-400 to-gray-500 bg-gray-500 rounded-md cursor-pointer" className="bg-gradient-to-br from-gray-400 to-gray-500 bg-gray-500 rounded-md cursor-pointer"
onClick={() => onDelete(exportedRecording.id)} onClick={() =>
onDelete({
file: exportedRecording.id,
exportName: exportedRecording.name,
})
}
> >
<LuTrash className="size-4 text-destructive fill-destructive" /> <LuTrash className="size-4 text-destructive fill-destructive" />
</Chip> </Chip>

View File

@ -12,7 +12,7 @@ import {
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog"; import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { Export } from "@/types/export"; import { DeleteClipType, Export } from "@/types/export";
import axios from "axios"; import axios from "axios";
import { useCallback, useEffect, useMemo, useState } from "react"; import { useCallback, useEffect, useMemo, useState } from "react";
import useSWR from "swr"; import useSWR from "swr";
@ -43,14 +43,14 @@ function Exports() {
// Deleting // Deleting
const [deleteClip, setDeleteClip] = useState<string | undefined>(); const [deleteClip, setDeleteClip] = useState<DeleteClipType | undefined>();
const onHandleDelete = useCallback(() => { const onHandleDelete = useCallback(() => {
if (!deleteClip) { if (!deleteClip) {
return; return;
} }
axios.delete(`export/${deleteClip}`).then((response) => { axios.delete(`export/${deleteClip.file}`).then((response) => {
if (response.status == 200) { if (response.status == 200) {
setDeleteClip(undefined); setDeleteClip(undefined);
mutate(); mutate();
@ -86,7 +86,7 @@ function Exports() {
<AlertDialogHeader> <AlertDialogHeader>
<AlertDialogTitle>Delete Export</AlertDialogTitle> <AlertDialogTitle>Delete Export</AlertDialogTitle>
<AlertDialogDescription> <AlertDialogDescription>
Confirm deletion of {deleteClip}. Are you sure you want to delete {deleteClip?.exportName}?
</AlertDialogDescription> </AlertDialogDescription>
</AlertDialogHeader> </AlertDialogHeader>
<AlertDialogFooter> <AlertDialogFooter>
@ -149,7 +149,9 @@ function Exports() {
exportedRecording={item} exportedRecording={item}
onSelect={setSelected} onSelect={setSelected}
onRename={onHandleRename} onRename={onHandleRename}
onDelete={(id) => setDeleteClip(id)} onDelete={({ file, exportName }) =>
setDeleteClip({ file, exportName })
}
/> />
))} ))}
</div> </div>

View File

@ -7,3 +7,8 @@ export type Export = {
thumb_path: string; thumb_path: string;
in_progress: boolean; in_progress: boolean;
}; };
export type DeleteClipType = {
file: string;
exportName: string;
};