From e0a3cfc2cb9ac7512a4342804b9554e13d9d4a52 Mon Sep 17 00:00:00 2001
From: Jonathan <contact@grafikart.fr>
Date: Wed, 11 Jun 2025 18:59:55 +0200
Subject: [PATCH] Fix remove uneditable fields on task edition

Signed-off-by: Bryan Frimin <bryan@getprobo.com>
Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
---
 .../src/components/tasks/TaskFormDialog.tsx   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/apps/console2/src/components/tasks/TaskFormDialog.tsx b/apps/console2/src/components/tasks/TaskFormDialog.tsx
index b2bcd5849..1e75acd50 100644
--- a/apps/console2/src/components/tasks/TaskFormDialog.tsx
+++ b/apps/console2/src/components/tasks/TaskFormDialog.tsx
@@ -147,7 +147,8 @@ export default function TaskFormDialog(props: Props) {
     dialogRef.current?.close();
   });
   const isUpdating = !!task;
-  const showMeasure = !props.measureId;
+  const showMeasure = !props.measureId && !isUpdating;
+  const isCreating = !isUpdating;
 
   return (
     <Dialog
@@ -180,24 +181,24 @@ export default function TaskFormDialog(props: Props) {
           {/* Properties form */}
           <div className="py-5 px-6 bg-subtle">
             <Label>{__("Properties")}</Label>
-            <PropertyRow
-              label={__("Assigned to")}
-              error={formState.errors.assignedToId?.message}
-            >
-              <PeopleSelectField
-                disabled={isUpdating}
-                name="assignedToId"
-                control={control}
-                organizationId={organizationId}
-              />
-            </PropertyRow>
+            {isCreating && (
+              <PropertyRow
+                label={__("Assigned to")}
+                error={formState.errors.assignedToId?.message}
+              >
+                <PeopleSelectField
+                  name="assignedToId"
+                  control={control}
+                  organizationId={organizationId}
+                />
+              </PropertyRow>
+            )}
             {showMeasure && (
               <PropertyRow
                 label={__("Measure")}
                 error={formState.errors.measureId?.message}
               >
                 <MeasureSelectField
-                  disabled={isUpdating}
                   name="measureId"
                   control={control}
                   organizationId={organizationId}