Merge pull request #1360 from Real-Dev-Squad/develop

Dev to Main Sync

Author: iamitprakash

__tests__/Unit/Components/Tasks/TaskStatusDropdown.test.tsx

@@ -109,7 +109,7 @@ describe('TaskStatusDropdown', () => {
 
     it('should show text Done as selected option when a task with completed status is passed down.', () => {
         const oldProgress = 100;
-        const oldStatus = BACKEND_TASK_STATUS.DONE;
+        const oldStatus = BACKEND_TASK_STATUS.COMPLETED;
 
         render(
             <TaskStatusDropdown
@@ -146,6 +146,20 @@ describe('TaskStatusDropdown', () => {
         const msgTag = screen.queryByTestId('msg');
         expect(msgTag).toBeNull();
     });
+    it('should show text Backlog when a task with Backlog status is passed down.', () => {
+        const oldProgress = 100;
+        const oldStatus = BACKEND_TASK_STATUS.BACKLOG;
+
+        render(
+            <TaskStatusDropdown
+                oldProgress={oldProgress}
+                oldStatus={oldStatus}
+                onChange={onChange}
+            />
+        );
+        const element = screen.getByTestId('task-status-backlog');
+        expect(element).toHaveTextContent('Backlog');
+    });
     describe('TaskDropDownModel', () => {
         const handleProceed = jest.fn();
         const resetProgressAndStatus = jest.fn();

src/components/tasks/TaskStatusDropdown.tsx

@@ -27,6 +27,10 @@ const TaskStatusSelect = ({
     taskStatus,
     testIdPrefix = 'task-status',
 }: TaskStatusSelectProps) => {
+    if (newStatus === BACKEND_TASK_STATUS.COMPLETED) {
+        newStatus = BACKEND_TASK_STATUS.DONE;
+    }
+
     return (
         <select
             className={styles.taskStatusUpdate}
@@ -67,10 +71,6 @@ export function TaskStatusDropdown({
     });
     const [message, setMessage] = useState('');
 
-    if (oldStatus === BACKEND_TASK_STATUS.COMPLETED) {
-        BACKEND_TASK_STATUS.DONE = BACKEND_TASK_STATUS.COMPLETED;
-    }
-
     const getAvailableTaskStatuses = () => {
         return Object.entries(BACKEND_TASK_STATUS).filter(
             ([_, value]) => !EXCLUDED_STATUSES.includes(value)
@@ -159,12 +159,18 @@ export function TaskStatusDropdown({
                 }
                 data-testid={isDevMode ? 'task-status-label' : undefined}
             >
-                Status:
-                <TaskStatusSelect
-                    newStatus={newStatus}
-                    handleChange={handleChange}
-                    taskStatus={taskStatus}
-                />
+                Status:{' '}
+                {newStatus === BACKEND_TASK_STATUS.BACKLOG ? (
+                    <span data-testid="task-status-backlog">
+                        {beautifyStatus(newStatus)}
+                    </span>
+                ) : (
+                    <TaskStatusSelect
+                        newStatus={newStatus}
+                        handleChange={handleChange}
+                        taskStatus={taskStatus}
+                    />
+                )}
             </label>
             <TaskDropDownModel
                 message={message}