Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

Optimistic project deletetion (#938)

Oleg Isonen3beb0d01e3c2
diff --git a/apps/designer/app/dashboard/projects/project-card.tsx b/apps/designer/app/dashboard/projects/project-card.tsx
index 85e7723c56..f44c18ed00 100644
--- a/apps/designer/app/dashboard/projects/project-card.tsx
+++ b/apps/designer/app/dashboard/projects/project-card.tsx
@@ -8,6 +8,7 @@ import {
Flex,
Text,
theme,
+ Box,
} from "@webstudio-is/design-system";
import { MenuIcon } from "@webstudio-is/icons";
import type { DashboardProject } from "@webstudio-is/prisma-client";
@@ -174,15 +175,15 @@ export const ProjectCard = ({
const [isRenameDialogOpen, setIsRenameDialogOpen] = useState(false);
const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
const [isShareDialogOpen, setIsShareDialogOpen] = useState(false);
+ const [isHidden, setIsHidden] = useState(false);
const { thumbnailRef, handleKeyDown } = useProjectCard();
const handleDuplicate = useDuplicate(id);
return (
- <>
+ <Box as="article" hidden={isHidden}>
<Flex
direction="column"
shrink={false}
- as="article"
className={containerStyle()}
tabIndex={0}
onKeyDown={handleKeyDown}
@@ -232,6 +233,7 @@ export const ProjectCard = ({
<DeleteProjectDialog
isOpen={isDeleteDialogOpen}
onOpenChange={setIsDeleteDialogOpen}
+ onHiddenChange={setIsHidden}
title={title}
projectId={id}
/>
@@ -240,6 +242,6 @@ export const ProjectCard = ({
onOpenChange={setIsShareDialogOpen}
projectId={id}
/>
- </>
+ </Box>
);
};
diff --git a/apps/designer/app/dashboard/projects/project-dialogs.tsx b/apps/designer/app/dashboard/projects/project-dialogs.tsx
index 0a3b2509d3..b5f72c802c 100644
--- a/apps/designer/app/dashboard/projects/project-dialogs.tsx
+++ b/apps/designer/app/dashboard/projects/project-dialogs.tsx
@@ -201,23 +201,28 @@ const useDeleteProject = ({
projectId,
title,
onOpenChange,
+ onHiddenChange,
}: {
projectId: DashboardProject["id"];
title: string;
- onOpenChange: (isOpen: false) => void;
+ onOpenChange: (isOpen: boolean) => void;
+ onHiddenChange: (isHidden: boolean) => void;
}) => {
const { send, data, state } = trpc.delete.useMutation();
const [isMatch, setIsMatch] = useState(false);
const errors = data && "errors" in data ? data.errors : undefined;
useEffect(() => {
- if (errors === undefined && state === "loading") {
- onOpenChange(false);
+ if (errors) {
+ onOpenChange(true);
+ onHiddenChange(false);
}
- }, [errors, state, onOpenChange]);
+ }, [errors, onOpenChange, onHiddenChange]);
const handleSubmit = () => {
send({ projectId });
+ onHiddenChange(true);
+ onOpenChange(false);
};
const handleChange = ({ title: currentTitle }: { title: string }) => {
@@ -238,17 +243,20 @@ export const DeleteProjectDialog = ({
title,
projectId,
onOpenChange,
+ onHiddenChange,
}: {
isOpen: boolean;
title: string;
projectId: DashboardProject["id"];
onOpenChange: (isOpen: boolean) => void;
+ onHiddenChange: (isHidden: boolean) => void;
}) => {
const { handleSubmit, handleChange, errors, isMatch, state } =
useDeleteProject({
projectId,
- onOpenChange,
title,
+ onOpenChange,
+ onHiddenChange,
});
return (
<Dialog