fix: estimate unexpected update

taskany-inc · Oct 6, 2023 · 83f5206 · 83f5206
1 parent 14d8c89
commit 83f5206
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/src/components/Estimate/Estimate.tsx b/src/components/Estimate/Estimate.tsx
@@ -75,7 +75,7 @@ export const Estimate = React.forwardRef<HTMLDivElement, EstimateProps>(({ value
             return year
                 ? {
                       range: createDateRange(year),
-                      type: DateType.Quarter,
+                      type: DateType.Year,
                   }
                 : undefined;
         }

diff --git a/src/components/EstimateDate/EstimateDate.tsx b/src/components/EstimateDate/EstimateDate.tsx
@@ -20,23 +20,23 @@ export const EstimateDate: React.FC = () => {
     const locale = useLocale();
     const currentDate = currentLocaleDate({ locale });
 
-    const { readOnly, setReadOnly, setDate } = useEstimateContext();
+    const { readOnly, setReadOnly, setDate, date } = useEstimateContext();
 
-    const [fullDate, setFullDate] = useState<string>(currentDate);
+    const valueString = date ? createLocaleDate(date, { locale }) : undefined;
+
+    const [fullDate, setFullDate] = useState<string>(valueString ?? currentDate);
 
     useEffect(() => {
         if (!readOnly.date) {
             setFullDate((oldDate) => (isDateFullyFilled(oldDate) ? oldDate : currentDate));
-        } else {
-            setFullDate(currentDate);
         }
     }, [readOnly.date, currentDate]);
 
     useEffect(() => {
-        if (isDateFullyFilled(fullDate)) {
+        if (isDateFullyFilled(fullDate) && valueString !== fullDate) {
             setDate(parseLocaleDate(fullDate, { locale }));
         }
-    }, [fullDate, setDate, locale]);
+    }, [fullDate, setDate, locale, valueString]);
 
     const onInputChange = useCallback(
         (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -69,8 +69,7 @@ export const EstimateDate: React.FC = () => {
             year: true,
             quarter: true,
         });
-        setFullDate(currentDate);
-    }, [currentDate, setReadOnly]);
+    }, [setReadOnly]);
 
     return (
         <EstimateOption

diff --git a/trpc/router/goal.ts b/trpc/router/goal.ts
@@ -327,7 +327,9 @@ export const goal = router({
         .use(goalAccessMiddleware)
         .mutation(async ({ ctx, input }) => {
             const { activityId, role } = ctx.session.user;
-            const [estimate, estimateType] = input.estimate ? [new Date(input.estimate.date), input.estimate.type] : [];
+            const [estimate, estimateType = null] = input.estimate
+                ? [new Date(input.estimate.date), input.estimate.type]
+                : [];
 
             const actualGoal = await prisma.goal.findUnique({
                 where: { id: input.id },
@@ -411,7 +413,10 @@ export const goal = router({
                 });
             }
 
-            if (Number(estimate) !== Number(actualGoal.estimate) || estimateType !== actualGoal.estimateType) {
+            const isDateChanged = (Number(estimate) || 0) !== (Number(actualGoal.estimate) || 0);
+            const isTypeChanged = estimateType !== actualGoal.estimateType;
+
+            if (isDateChanged || isTypeChanged) {
                 const prevHistoryEstimate = actualGoal.estimate
                     ? encodeHistoryEstimate(actualGoal.estimate, actualGoal.estimateType ?? 'Strict')
                     : null;