fix: goal form update state problem

taskany-inc · May 30, 2024 · 7b89b94 · 7b89b94
1 parent 180dc40
commit 7b89b94
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/src/components/EstimateDropdown/EstimateDropdown.tsx b/src/components/EstimateDropdown/EstimateDropdown.tsx
@@ -1,5 +1,5 @@
 import { DatePicker, DatePickerYear, DatePickerQuarter, DatePickerStrict, Text } from '@taskany/bricks/harmony';
-import { ComponentProps, useCallback, useMemo, useState } from 'react';
+import { ComponentProps, useCallback, useEffect, useMemo, useState } from 'react';
 import { nullable } from '@taskany/bricks';
 
 import { formateEstimate, getDateString } from '../../utils/dateTime';
@@ -31,16 +31,18 @@ interface EstimateDropdownProps {
     onClose?: () => void;
 }
 
+const toEstimateState = (value: Estimate): EstimateState => ({
+    range: { end: new Date(value.date) },
+    type: value.type,
+});
+
 export const EstimateDropdown = ({ value, onChange, onClose, placement, ...props }: EstimateDropdownProps) => {
     const locale = useLocale();
-    const [estimate, setEstimate] = useState<EstimateState | undefined>(
-        value
-            ? {
-                  range: { end: new Date(value.date) },
-                  type: value.type,
-              }
-            : undefined,
-    );
+    const [estimate, setEstimate] = useState<EstimateState | undefined>(value ? toEstimateState(value) : undefined);
+
+    useEffect(() => {
+        setEstimate(value ? toEstimateState(value) : undefined);
+    }, [value]);
 
     const onChangeHandler = useCallback(
         (value?: EstimateState) => {

diff --git a/src/components/GoalForm/GoalForm.tsx b/src/components/GoalForm/GoalForm.tsx
@@ -123,6 +123,17 @@ export const GoalForm: React.FC<GoalFormProps> = ({
             tags,
             id,
         },
+        defaultValues: {
+            title: '',
+            description: '',
+            owner: null,
+            parent: null,
+            state: null,
+            priority: null,
+            estimate: null,
+            tags: [],
+            id: null,
+        },
     });
 
     const parentWatcher = watch('parent');

diff --git a/trpc/queries/projectV2.ts b/trpc/queries/projectV2.ts
@@ -21,6 +21,7 @@ export const getProjectList = ({ activityId, role, limit = 5 }: GetProjectListPa
             'Project.averageScore',
             'Project.updatedAt',
             'Project.activityId',
+            'Project.flowId',
             jsonBuildObject({
                 id: ref('activity.id'),
                 user: fn.toJson('user'),