π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-1640] fix: validating the error in estimate delete (#4853)
guru_sainathcc455b0e76d4
diff --git a/web/ce/components/estimates/index.ts b/web/ce/components/estimates/index.tsindex 2dc47bba63..918b72d8d7 100644--- a/web/ce/components/estimates/index.ts+++ b/web/ce/components/estimates/index.ts@@ -1,3 +1,3 @@export * from "./estimate-list-item-buttons";-export * from "./update";+export * from "./points";diff --git a/web/ce/components/estimates/points/delete.tsx b/web/ce/components/estimates/points/delete.tsxnew file mode 100644index 0000000000..08dd605e43--- /dev/null+++ b/web/ce/components/estimates/points/delete.tsx@@ -0,0 +1,17 @@+"use client";++import { FC } from "react";++import { TEstimateTypeErrorObject } from "@plane/types";++type TEstimatePointDelete = {+ workspaceSlug: string;+ projectId: string;+ estimateId: string;+ estimatePointId: string;+ callback: () => void;+ estimatePointError?: TEstimateTypeErrorObject | undefined;+ handleEstimatePointError?: (newValue: string, message: string | undefined, mode?: "add" | "delete") => void;+};++export const EstimatePointDelete: FC<TEstimatePointDelete> = () => <></>;diff --git a/web/ce/components/estimates/points/index.ts b/web/ce/components/estimates/points/index.tsnew file mode 100644index 0000000000..fe722bd231--- /dev/null+++ b/web/ce/components/estimates/points/index.ts@@ -0,0 +1 @@+export * from "./delete";diff --git a/web/core/components/estimates/points/delete.tsx b/web/core/components/estimates/points/delete.tsxdeleted file mode 100644index fd11c414e6..0000000000--- a/web/core/components/estimates/points/delete.tsx+++ /dev/null@@ -1,120 +0,0 @@-"use client";--import { FC, useState } from "react";-import { observer } from "mobx-react";-import { MoveRight, Trash2, X } from "lucide-react";-import { TEstimatePointsObject } from "@plane/types";-import { Spinner, TOAST_TYPE, setToast } from "@plane/ui";-// components-import { EstimatePointDropdown } from "@/components/estimates/points";-// hooks-import { useEstimate, useEstimatePoint } from "@/hooks/store";--type TEstimatePointDelete = {- workspaceSlug: string;- projectId: string;- estimateId: string;- estimatePointId: string;- callback: () => void;-};--export const EstimatePointDelete: FC<TEstimatePointDelete> = observer((props) => {- const { workspaceSlug, projectId, estimateId, estimatePointId, callback } = props;- // hooks- const { estimatePointIds, estimatePointById, deleteEstimatePoint } = useEstimate(estimateId);- const { asJson: estimatePoint } = useEstimatePoint(estimateId, estimatePointId);- // states- const [loader, setLoader] = useState(false);- const [estimateInputValue, setEstimateInputValue] = useState<string | undefined>(undefined);- const [error, setError] = useState<string | undefined>(undefined);-- const handleClose = () => {- setEstimateInputValue("");- callback();- };-- const handleDelete = async () => {- if (!workspaceSlug || !projectId || !projectId) return;-- setError(undefined);-- if (estimateInputValue)- try {- setLoader(true);-- await deleteEstimatePoint(- workspaceSlug,- projectId,- estimatePointId,- estimateInputValue === "none" ? undefined : estimateInputValue- );-- setLoader(false);- setError(undefined);- setToast({- type: TOAST_TYPE.SUCCESS,- title: "Estimate point updated",- message: "The estimate point has been updated successfully.",- });- handleClose();- } catch {- setLoader(false);- setError("something went wrong. please try again later");- setToast({- type: TOAST_TYPE.ERROR,- title: "Estimate point failed to updated",- message: "We are unable to process your request, please try again.",- });- }- else setError("please select option");- };-- // derived values- const selectDropdownOptionIds = estimatePointIds?.filter((pointId) => pointId != estimatePointId) as string[];- const selectDropdownOptions = (selectDropdownOptionIds || [])- ?.map((pointId) => {- const estimatePoint = estimatePointById(pointId);- if (estimatePoint && estimatePoint?.id)- return { id: estimatePoint.id, key: estimatePoint.key, value: estimatePoint.value };- })- .filter((estimatePoint) => estimatePoint != undefined) as TEstimatePointsObject[];-- return (- <div className="relative flex items-center gap-2 text-base">- <div className="flex-grow relative flex items-center gap-3">- <div className="w-full border border-custom-border-200 rounded p-2.5 bg-custom-background-90">- {estimatePoint?.value}- </div>- <div className="text-sm first-letter:relative flex justify-center items-center gap-2 whitespace-nowrap">- Mark as <MoveRight size={14} />- </div>- <EstimatePointDropdown- options={selectDropdownOptions}- error={error}- callback={(estimateId: string) => {- setEstimateInputValue(estimateId);- setError(undefined);- }}- />- </div>- {loader ? (- <div className="w-6 h-6 flex-shrink-0 relative flex justify-center items-center rota">- <Spinner className="w-4 h-4" />- </div>- ) : (- <div- className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer text-red-500"- onClick={handleDelete}- >- <Trash2 size={14} />- </div>- )}- <div- className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer"- onClick={handleClose}- >- <X size={14} className="text-custom-text-200" />- </div>- </div>- );-});diff --git a/web/core/components/estimates/points/index.ts b/web/core/components/estimates/points/index.tsindex d696a7f975..1a7c5501cd 100644--- a/web/core/components/estimates/points/index.ts+++ b/web/core/components/estimates/points/index.ts@@ -1,7 +1,6 @@export * from "./preview";export * from "./create";export * from "./update";-export * from "./delete";export * from "./select-dropdown";export * from "./create-root";diff --git a/web/core/components/estimates/points/preview.tsx b/web/core/components/estimates/points/preview.tsxindex a3e24ff042..7f8f410bb0 100644--- a/web/core/components/estimates/points/preview.tsx+++ b/web/core/components/estimates/points/preview.tsx@@ -3,7 +3,9 @@ import { observer } from "mobx-react";import { GripVertical, Pencil, Trash2 } from "lucide-react";import { TEstimatePointsObject, TEstimateSystemKeys, TEstimateTypeErrorObject } from "@plane/types";// components-import { EstimatePointUpdate, EstimatePointDelete } from "@/components/estimates/points";+import { EstimatePointUpdate } from "@/components/estimates/points";+// plane web components+import { EstimatePointDelete } from "@/plane-web/components/estimates";// plane web constantsimport { estimateCount } from "@/plane-web/constants/estimates";@@ -49,7 +51,7 @@ export const EstimatePointItemPreview: FC<TEstimatePointItemPreview> = observer(return (<div>{!estimatePointEditToggle && !estimatePointDeleteToggle && (- <div className="border border-custom-border-200 rounded relative flex items-center px-2.5 gap-2 text-base my-1">+ <div className="border border-custom-border-200 rounded relative flex items-center px-2.5 gap-2 text-base my-1"><div className="rounded-sm w-6 h-6 flex-shrink-0 relative flex justify-center items-center hover:bg-custom-background-80 transition-colors cursor-pointer"><GripVertical size={14} className="text-custom-text-200" /></div>@@ -106,6 +108,8 @@ export const EstimatePointItemPreview: FC<TEstimatePointItemPreview> = observer(estimateId={estimateId}estimatePointId={estimatePointId}callback={() => estimateId && setEstimatePointDeleteToggle(false)}+ estimatePointError={estimatePointError}+ handleEstimatePointError={handleEstimatePointError}/>)}</div>diff --git a/web/ee/components/estimates/index.ts b/web/ee/components/estimates/index.tsindex 4ad250c456..918b72d8d7 100644--- a/web/ee/components/estimates/index.ts+++ b/web/ee/components/estimates/index.ts@@ -1,2 +1,3 @@export * from "./estimate-list-item-buttons";export * from "./update";+export * from "./points";diff --git a/web/ee/components/estimates/points/delete.tsx b/web/ee/components/estimates/points/delete.tsxnew file mode 100644index 0000000000..6cebb5646f--- /dev/null+++ b/web/ee/components/estimates/points/delete.tsx@@ -0,0 +1 @@+export * from "ce/components/estimates/points/delete";diff --git a/web/ee/components/estimates/points/index.ts b/web/ee/components/estimates/points/index.tsnew file mode 100644index 0000000000..fe722bd231--- /dev/null+++ b/web/ee/components/estimates/points/index.ts@@ -0,0 +1 @@+export * from "./delete";