Merge branch 'develop' into fix/remove-dev-flag

Real-Dev-Squad · Oct 21, 2024 · 07ea3e1 · 07ea3e1
2 parents 1bbdb17 + ab3fe2e
commit 07ea3e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/components/taskDetails/Details.tsx b/src/components/taskDetails/Details.tsx
@@ -86,8 +86,6 @@ const Details: FC<TaskDetailsProps> = (props) => {
     const gitHubIssueLink = isGitHubLink ? value : undefined;
     const [newEndOnDate, setNewEndOnDate] = useState('');
     const { isUserAuthorized } = useUserData();
-    const router = useRouter();
-    const isDevFlagEnabled = router.query.dev === 'true';
 
     useEffect(() => {
         if (!isEditing) setNewEndOnDate('');
@@ -159,7 +157,6 @@ const Details: FC<TaskDetailsProps> = (props) => {
     const renderedValue = value ?? 'N/A';
     const dateValue =
         newEndOnDate || new Date(value as string).toLocaleDateString('en-CA');
-    const finalDateValue = isDevFlagEnabled ? dateValue : newEndOnDate;
 
     return (
         <div className={styles.detailsContainer}>
@@ -171,7 +168,7 @@ const Details: FC<TaskDetailsProps> = (props) => {
                     name="endsOn"
                     onChange={(e) => setNewEndOnDate(e.target.value)}
                     onBlur={handleEndsOnBlur}
-                    value={finalDateValue}
+                    value={dateValue}
                     className={styles.inputField}
                 />
             ) : (

diff --git a/src/components/taskDetails/index.tsx b/src/components/taskDetails/index.tsx
@@ -92,7 +92,6 @@ const TaskDetails: FC<Props> = ({ taskID }) => {
     );
     const inputRef = useRef<HTMLInputElement>(null);
     const [showSuggestion, setShowSuggestion] = useState<boolean>(false);
-    const isDevFlagEnabled = router.query.dev === 'true';
 
     const handleAssignment = (e: React.ChangeEvent<HTMLInputElement>) => {
         setAssigneeName(e.target.value);
@@ -141,7 +140,6 @@ const TaskDetails: FC<Props> = ({ taskID }) => {
         setEditedTaskDetails(taskDetailsData);
     }
     async function onSave() {
-        !isDevFlagEnabled && setIsEditing(false);
         const updatedFields: Partial<taskDetailsDataType['taskData']> = {};
         for (const key in editedTaskDetails) {
             if (
@@ -164,7 +162,7 @@ const TaskDetails: FC<Props> = ({ taskID }) => {
             return;
         }
 
-        isDevFlagEnabled && setLoading(true);
+        setLoading(true);
         await updateTaskDetails({
             editedDetails: updatedFields,
             taskID,
@@ -173,8 +171,8 @@ const TaskDetails: FC<Props> = ({ taskID }) => {
             .then(() => toast(SUCCESS, 'Successfully saved'))
             .catch((error) => toast(ERROR, error.data.message))
             .finally(() => {
-                isDevFlagEnabled && setIsEditing(false);
-                isDevFlagEnabled && setLoading(false);
+                setLoading(false);
+                setIsEditing(false);
             });
     }