From 56bda08a4c853c98aa946b74e99101c85c122444 Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 11:06:10 +0530
Subject: [PATCH 01/18] Adding UNASSIGNED and DONE to task status options

---
 app/components/task/holder.hbs                |  25 ++-
 app/constants/tasks.js                        |  15 ++
 .../components/tasks/holder-test.js           | 142 +++++++++++++++++-
 3 files changed, 175 insertions(+), 7 deletions(-)

diff --git a/app/components/task/holder.hbs b/app/components/task/holder.hbs
index 3fd9d2f5..9677b690 100644
--- a/app/components/task/holder.hbs
+++ b/app/components/task/holder.hbs
@@ -32,12 +32,25 @@
         >
           {{#each this.availabletaskStatusList as |taskStatus|}}
             {{#if (not-eq taskStatus.key this.TASK_KEYS.ALL)}}
-              <option
-                value={{taskStatus.key}}
-                selected={{eq taskStatus.key this.status}}
-              >
-                {{taskStatus.displayLabel}}
-              </option>
+              {{#if @dev}}
+                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.AVAILABLE) (eq taskStatus.key this.TASK_KEYS.COMPLETED)))}}
+                    <option
+                      value={{taskStatus.key}}
+                      selected={{eq taskStatus.key this.status}}
+                    >
+                      {{taskStatus.displayLabel}}
+                    </option>
+                {{/if}}
+              {{else}}
+                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.UNASSIGNED) (eq taskStatus.key this.TASK_KEYS.DONE)))}}
+                    <option
+                      value={{taskStatus.key}}
+                      selected={{eq taskStatus.key this.status}}
+                    >
+                      {{taskStatus.displayLabel}}
+                    </option>
+                {{/if}}
+              {{/if}}
             {{/if}}
           {{/each}}
         </select>
diff --git a/app/constants/tasks.js b/app/constants/tasks.js
index 3947ee71..450c4dfe 100644
--- a/app/constants/tasks.js
+++ b/app/constants/tasks.js
@@ -2,6 +2,7 @@ const TASK_KEYS = {
   ALL: 'ALL',
   AVAILABLE: 'AVAILABLE',
   ASSIGNED: 'ASSIGNED',
+  UNASSIGNED: 'UNASSIGNED',
   IN_PROGRESS: 'IN_PROGRESS',
   BLOCKED: 'BLOCKED',
   SMOKE_TESTING: 'SMOKE_TESTING',
@@ -14,16 +15,19 @@ const TASK_KEYS = {
   REGRESSION_CHECK: 'REGRESSION_CHECK',
   RELEASED: 'RELEASED',
   VERIFIED: 'VERIFIED',
+  DONE: 'DONE',
 };
 
 const {
   ALL,
   AVAILABLE,
   ASSIGNED,
+  UNASSIGNED,
   IN_PROGRESS,
   BLOCKED,
   SMOKE_TESTING,
   COMPLETED,
+  DONE,
   NEEDS_REVIEW,
   IN_REVIEW,
   APPROVED,
@@ -47,6 +51,10 @@ const TASK_STATUS_LIST = [
     displayLabel: 'Assigned',
     key: ASSIGNED,
   },
+  {
+    displayLabel: 'Unassigned',
+    key: UNASSIGNED,
+  },
   {
     displayLabel: 'In Progress',
     key: IN_PROGRESS,
@@ -63,6 +71,10 @@ const TASK_STATUS_LIST = [
     displayLabel: 'Completed',
     key: COMPLETED,
   },
+  {
+    displayLabel: 'Done',
+    key: DONE,
+  },
   {
     displayLabel: 'Needs Review',
     key: NEEDS_REVIEW,
@@ -143,3 +155,6 @@ export const TASK_PERCENTAGE = {
 };
 
 export { TASK_KEYS, TASK_STATUS_LIST, TABS_TASK_STATUS_LIST };
+
+export const oldTaskStatus = { AVAILABLE: 'AVAILABLE', COMPLETED: 'COMPLETED' };
+export const newTaskStatus = { UNASSIGNED: 'UNASSIGNED', DONE: 'DONE' };
diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index 77ad27c0..5fa7b338 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -1,7 +1,12 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { tasks, overDueTask } from 'website-my/tests/fixtures/tasks';
-import { TASK_KEYS, TASK_STATUS_LIST } from 'website-my/constants/tasks';
+import {
+  TASK_KEYS,
+  TASK_STATUS_LIST,
+  oldTaskStatus,
+  newTaskStatus,
+} from 'website-my/constants/tasks';
 import { find, render, waitUntil, fillIn, select } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 
@@ -242,4 +247,139 @@ module('Integration | Component | Tasks Holder', function (hooks) {
 
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
+
+  test('Check if UNASSIGNED and DONE is not in task status options when dev is false', async function (assert) {
+    this.set('task', tasksData[3]);
+    this.set('mock', () => {});
+    this.set('isLoading', false);
+    this.set('disabled', false);
+    this.set('defaultType', DEFAULT_TASK_TYPE);
+
+    await render(hbs`<Task::Holder
+    @task={{this.task}} 
+    @onTaskChange={{this.mock}} 
+    @onStausChange={{this.mock}} 
+    @onTaskUpdate={{this.mock}} 
+    @isLoading={{this.isLoading}} 
+    @userSelectedTask={{this.defaultType}} 
+    @disabled={{this.disabled}}
+  />`);
+
+    await waitUntil(() => find('[data-test-task-status-select]'));
+
+    const taskStatusList = this.element.querySelector(
+      '[data-test-task-status-select]'
+    );
+
+    const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
+      (key) => !(key in newTaskStatus)
+    );
+
+    for (let i = 0; i < taskStatusList.options.length; i++) {
+      const optionValue = taskStatusList.options[i].value;
+      assert.ok(updatedTaskKeys.includes(optionValue));
+    }
+  });
+
+  test('Check if UNASSIGNED and DONE is in task status options when dev is true', async function (assert) {
+    this.set('task', tasksData[3]);
+    this.set('mock', () => {});
+    this.set('isLoading', false);
+    this.set('disabled', false);
+    this.set('defaultType', DEFAULT_TASK_TYPE);
+
+    await render(hbs`<Task::Holder
+    @task={{this.task}} 
+    @onTaskChange={{this.mock}} 
+    @onStausChange={{this.mock}} 
+    @onTaskUpdate={{this.mock}} 
+    @isLoading={{this.isLoading}} 
+    @userSelectedTask={{this.defaultType}} 
+    @disabled={{this.disabled}}
+    @dev={{true}}
+  />`);
+
+    await waitUntil(() => find('[data-test-task-status-select]'));
+
+    const taskStatusList = this.element.querySelector(
+      '[data-test-task-status-select]'
+    );
+
+    const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
+      (key) => !(key in oldTaskStatus)
+    );
+
+    for (let i = 0; i < taskStatusList.options.length; i++) {
+      const optionValue = taskStatusList.options[i].value;
+      assert.ok(updatedTaskKeys.includes(optionValue));
+    }
+  });
+
+  test('Verify task status update to UNASSIGNED when dev is true', async function (assert) {
+    const testTask = tasksData[3];
+
+    testTask.status = TASK_KEYS.IN_PROGRESS;
+
+    let onTaskUpdateCalled = 0;
+
+    this.set('task', testTask);
+    this.set('onTaskUpdate', () => {
+      onTaskUpdateCalled++;
+    });
+    this.set('mock', () => {});
+    this.set('isLoading', false);
+    this.set('disabled', false);
+    this.set('defaultType', DEFAULT_TASK_TYPE);
+
+    await render(hbs`<Task::Holder
+    @task={{this.task}}
+    @onTaskUpdate={{onTaskUpdate}}
+    @onTaskChange={{this.mock}}
+    @userSelectedTask={{this.defaultType}}
+    @disabled={{this.disabled}}
+    @dev={{true}}
+  />`);
+
+    assert
+      .dom('[data-test-task-status-select]')
+      .hasValue(TASK_KEYS.IN_PROGRESS);
+
+    await select('[data-test-task-status-select]', TASK_KEYS.UNASSIGNED);
+
+    assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
+  });
+
+  test('Verify task status update to DONE when dev is true', async function (assert) {
+    const testTask = tasksData[3];
+
+    testTask.status = TASK_KEYS.IN_PROGRESS;
+
+    let onTaskUpdateCalled = 0;
+
+    this.set('task', testTask);
+    this.set('onTaskUpdate', () => {
+      onTaskUpdateCalled++;
+    });
+    this.set('mock', () => {});
+    this.set('isLoading', false);
+    this.set('disabled', false);
+    this.set('defaultType', DEFAULT_TASK_TYPE);
+
+    await render(hbs`<Task::Holder
+    @task={{this.task}}
+    @onTaskUpdate={{onTaskUpdate}}
+    @onTaskChange={{this.mock}}
+    @userSelectedTask={{this.defaultType}}
+    @disabled={{this.disabled}}
+    @dev={{true}}
+  />`);
+
+    assert
+      .dom('[data-test-task-status-select]')
+      .hasValue(TASK_KEYS.IN_PROGRESS);
+
+    await select('[data-test-task-status-select]', TASK_KEYS.DONE);
+
+    assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
+  });
 });

From 70971c6720a6ed9211f4c42ea7cd46343be14fc9 Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 12:15:37 +0530
Subject: [PATCH 02/18] Updating test name

---
 tests/integration/components/tasks/holder-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index 5fa7b338..30aaa86e 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -248,7 +248,7 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
 
-  test('Check if UNASSIGNED and DONE is not in task status options when dev is false', async function (assert) {
+  test('Check if old task status options are displayed when dev is false', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);
@@ -281,7 +281,7 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     }
   });
 
-  test('Check if UNASSIGNED and DONE is in task status options when dev is true', async function (assert) {
+  test('Check if new task status options are displayed when dev is true', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);

From cad584e31cf885f87fce00a4b814e192c119042d Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 17:23:18 +0530
Subject: [PATCH 03/18] Removing UNASSIGNED status from task status options

---
 app/components/task/holder.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/task/holder.hbs b/app/components/task/holder.hbs
index 9677b690..bf43872c 100644
--- a/app/components/task/holder.hbs
+++ b/app/components/task/holder.hbs
@@ -33,7 +33,7 @@
           {{#each this.availabletaskStatusList as |taskStatus|}}
             {{#if (not-eq taskStatus.key this.TASK_KEYS.ALL)}}
               {{#if @dev}}
-                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.AVAILABLE) (eq taskStatus.key this.TASK_KEYS.COMPLETED)))}}
+                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.AVAILABLE) (eq taskStatus.key this.TASK_KEYS.COMPLETED) (eq taskStatus.key this.TASK_KEYS.UNASSIGNED)))}}
                     <option
                       value={{taskStatus.key}}
                       selected={{eq taskStatus.key this.status}}

From 53d935f956e3e68478f950631268cdbb6574dda7 Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 18:33:44 +0530
Subject: [PATCH 04/18] Updating tests in holder-test file

---
 app/components/task/holder.hbs                |  4 +-
 app/constants/tasks.js                        |  8 +--
 .../components/tasks/holder-test.js           | 59 ++++++++-----------
 3 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/app/components/task/holder.hbs b/app/components/task/holder.hbs
index bf43872c..c0cf9abc 100644
--- a/app/components/task/holder.hbs
+++ b/app/components/task/holder.hbs
@@ -33,7 +33,7 @@
           {{#each this.availabletaskStatusList as |taskStatus|}}
             {{#if (not-eq taskStatus.key this.TASK_KEYS.ALL)}}
               {{#if @dev}}
-                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.AVAILABLE) (eq taskStatus.key this.TASK_KEYS.COMPLETED) (eq taskStatus.key this.TASK_KEYS.UNASSIGNED)))}}
+                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.AVAILABLE) (eq taskStatus.key this.TASK_KEYS.COMPLETED)))}}
                     <option
                       value={{taskStatus.key}}
                       selected={{eq taskStatus.key this.status}}
@@ -42,7 +42,7 @@
                     </option>
                 {{/if}}
               {{else}}
-                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.UNASSIGNED) (eq taskStatus.key this.TASK_KEYS.DONE)))}}
+                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.DONE)))}}
                     <option
                       value={{taskStatus.key}}
                       selected={{eq taskStatus.key this.status}}
diff --git a/app/constants/tasks.js b/app/constants/tasks.js
index 450c4dfe..5fbb8aa3 100644
--- a/app/constants/tasks.js
+++ b/app/constants/tasks.js
@@ -2,7 +2,6 @@ const TASK_KEYS = {
   ALL: 'ALL',
   AVAILABLE: 'AVAILABLE',
   ASSIGNED: 'ASSIGNED',
-  UNASSIGNED: 'UNASSIGNED',
   IN_PROGRESS: 'IN_PROGRESS',
   BLOCKED: 'BLOCKED',
   SMOKE_TESTING: 'SMOKE_TESTING',
@@ -22,7 +21,6 @@ const {
   ALL,
   AVAILABLE,
   ASSIGNED,
-  UNASSIGNED,
   IN_PROGRESS,
   BLOCKED,
   SMOKE_TESTING,
@@ -51,10 +49,6 @@ const TASK_STATUS_LIST = [
     displayLabel: 'Assigned',
     key: ASSIGNED,
   },
-  {
-    displayLabel: 'Unassigned',
-    key: UNASSIGNED,
-  },
   {
     displayLabel: 'In Progress',
     key: IN_PROGRESS,
@@ -157,4 +151,4 @@ export const TASK_PERCENTAGE = {
 export { TASK_KEYS, TASK_STATUS_LIST, TABS_TASK_STATUS_LIST };
 
 export const oldTaskStatus = { AVAILABLE: 'AVAILABLE', COMPLETED: 'COMPLETED' };
-export const newTaskStatus = { UNASSIGNED: 'UNASSIGNED', DONE: 'DONE' };
+export const newTaskStatus = { DONE: 'DONE' };
diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index 30aaa86e..63f6614c 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -248,7 +248,7 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
 
-  test('Check if old task status options are displayed when dev is false', async function (assert) {
+  test('Check if UNASSIGNED is not displayed when dev is true', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);
@@ -263,25 +263,21 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     @isLoading={{this.isLoading}} 
     @userSelectedTask={{this.defaultType}} 
     @disabled={{this.disabled}}
+    @dev={{true}}
   />`);
 
-    await waitUntil(() => find('[data-test-task-status-select]'));
-
     const taskStatusList = this.element.querySelector(
       '[data-test-task-status-select]'
     );
 
-    const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
-      (key) => !(key in newTaskStatus)
-    );
-
+    const displayedTaskStatus = [];
     for (let i = 0; i < taskStatusList.options.length; i++) {
-      const optionValue = taskStatusList.options[i].value;
-      assert.ok(updatedTaskKeys.includes(optionValue));
+      displayedTaskStatus.push(taskStatusList.options[i].textContent);
     }
+    assert.ok(!displayedTaskStatus.includes('UNASSIGNED'));
   });
 
-  test('Check if new task status options are displayed when dev is true', async function (assert) {
+  test('Check if old task status options are displayed when dev is false', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);
@@ -296,17 +292,14 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     @isLoading={{this.isLoading}} 
     @userSelectedTask={{this.defaultType}} 
     @disabled={{this.disabled}}
-    @dev={{true}}
   />`);
 
-    await waitUntil(() => find('[data-test-task-status-select]'));
-
     const taskStatusList = this.element.querySelector(
       '[data-test-task-status-select]'
     );
 
     const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
-      (key) => !(key in oldTaskStatus)
+      (key) => !(key in newTaskStatus)
     );
 
     for (let i = 0; i < taskStatusList.options.length; i++) {
@@ -315,38 +308,36 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     }
   });
 
-  test('Verify task status update to UNASSIGNED when dev is true', async function (assert) {
-    const testTask = tasksData[3];
-
-    testTask.status = TASK_KEYS.IN_PROGRESS;
-
-    let onTaskUpdateCalled = 0;
-
-    this.set('task', testTask);
-    this.set('onTaskUpdate', () => {
-      onTaskUpdateCalled++;
-    });
+  test('Check if new task status options are displayed when dev is true', async function (assert) {
+    this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);
     this.set('disabled', false);
     this.set('defaultType', DEFAULT_TASK_TYPE);
 
     await render(hbs`<Task::Holder
-    @task={{this.task}}
-    @onTaskUpdate={{onTaskUpdate}}
-    @onTaskChange={{this.mock}}
-    @userSelectedTask={{this.defaultType}}
+    @task={{this.task}} 
+    @onTaskChange={{this.mock}} 
+    @onStausChange={{this.mock}} 
+    @onTaskUpdate={{this.mock}} 
+    @isLoading={{this.isLoading}} 
+    @userSelectedTask={{this.defaultType}} 
     @disabled={{this.disabled}}
     @dev={{true}}
   />`);
 
-    assert
-      .dom('[data-test-task-status-select]')
-      .hasValue(TASK_KEYS.IN_PROGRESS);
+    const taskStatusList = this.element.querySelector(
+      '[data-test-task-status-select]'
+    );
 
-    await select('[data-test-task-status-select]', TASK_KEYS.UNASSIGNED);
+    const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
+      (key) => !(key in oldTaskStatus)
+    );
 
-    assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
+    for (let i = 0; i < taskStatusList.options.length; i++) {
+      const optionValue = taskStatusList.options[i].value;
+      assert.ok(updatedTaskKeys.includes(optionValue));
+    }
   });
 
   test('Verify task status update to DONE when dev is true', async function (assert) {

From afd9f373f33a4495501b6fa79b698b8e7b0b6bea Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 18:35:09 +0530
Subject: [PATCH 05/18] Updating tests in holder-test file

---
 .../components/tasks/holder-test.js           | 29 -------------------
 1 file changed, 29 deletions(-)

diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index 63f6614c..b270c4e4 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -248,35 +248,6 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
 
-  test('Check if UNASSIGNED is not displayed when dev is true', async function (assert) {
-    this.set('task', tasksData[3]);
-    this.set('mock', () => {});
-    this.set('isLoading', false);
-    this.set('disabled', false);
-    this.set('defaultType', DEFAULT_TASK_TYPE);
-
-    await render(hbs`<Task::Holder
-    @task={{this.task}} 
-    @onTaskChange={{this.mock}} 
-    @onStausChange={{this.mock}} 
-    @onTaskUpdate={{this.mock}} 
-    @isLoading={{this.isLoading}} 
-    @userSelectedTask={{this.defaultType}} 
-    @disabled={{this.disabled}}
-    @dev={{true}}
-  />`);
-
-    const taskStatusList = this.element.querySelector(
-      '[data-test-task-status-select]'
-    );
-
-    const displayedTaskStatus = [];
-    for (let i = 0; i < taskStatusList.options.length; i++) {
-      displayedTaskStatus.push(taskStatusList.options[i].textContent);
-    }
-    assert.ok(!displayedTaskStatus.includes('UNASSIGNED'));
-  });
-
   test('Check if old task status options are displayed when dev is false', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});

From d25e635c75c3a5fe3dd32d5b60ef0651f844f48a Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 19:00:45 +0530
Subject: [PATCH 06/18] Adding test to check if AVAILABLE is not displayed when
 dev is true

---
 .../components/tasks/holder-test.js           | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index b270c4e4..2a71a9fd 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -248,6 +248,35 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
 
+  test('Check if AVAILABLE is not displayed when dev is true', async function (assert) {
+    this.set('task', tasksData[3]);
+    this.set('mock', () => {});
+    this.set('isLoading', false);
+    this.set('disabled', false);
+    this.set('defaultType', DEFAULT_TASK_TYPE);
+
+    await render(hbs`<Task::Holder
+    @task={{this.task}} 
+    @onTaskChange={{this.mock}} 
+    @onStausChange={{this.mock}} 
+    @onTaskUpdate={{this.mock}} 
+    @isLoading={{this.isLoading}} 
+    @userSelectedTask={{this.defaultType}} 
+    @disabled={{this.disabled}}
+    @dev={{true}}
+  />`);
+
+    const taskStatusList = this.element.querySelector(
+      '[data-test-task-status-select]'
+    );
+
+    const displayedTaskStatus = [];
+    for (let i = 0; i < taskStatusList.options.length; i++) {
+      displayedTaskStatus.push(taskStatusList.options[i].value);
+    }
+    assert.ok(!displayedTaskStatus.includes('AVAILABLE'));
+  });
+
   test('Check if old task status options are displayed when dev is false', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});

From 51d7cadc5daebaf54f6eab50d3c7d0831163f676 Mon Sep 17 00:00:00 2001
From: Prashant Peeyush <prashantpeeyush3003@gmail.com>
Date: Fri, 13 Oct 2023 22:25:16 +0530
Subject: [PATCH 07/18] cancel OOO button enabled (#500)

* feat: cancel OOO button enabled

* fix: styling issues

* feat: feature flag added

* fix: feature behind flag

* fix: test file

* fixed lint error

* removed redundancy
---
 app/components/user-status.hbs                | 60 ++++++++++++-------
 app/components/user-status.js                 |  6 ++
 app/controllers/index.js                      | 11 +++-
 app/styles/user-status.css                    | 13 ++++
 app/templates/index.hbs                       |  3 +-
 .../components/user-status-test.js            | 55 ++++++++++++++++-
 6 files changed, 120 insertions(+), 28 deletions(-)

diff --git a/app/components/user-status.hbs b/app/components/user-status.hbs
index 6dddb9db..0c998c10 100644
--- a/app/components/user-status.hbs
+++ b/app/components/user-status.hbs
@@ -4,34 +4,48 @@
   </div>
 {{else}}
 <div class="heading">
-  {{#each this.currentUserStatus as |currentStatus|}}
-  {{#if (eq @status currentStatus.status)}}
+    {{#each this.currentUserStatus as |currentStatus|}}
+      {{#if (eq @status currentStatus.status)}}
     {{#if (eq currentStatus.status "ONBOARDING")}}
       <div data-test-onboarding-details class="onboarding-details">
-        <h2 data-test-status>You are undergoing onboarding</h2>
-        <p data-test-details>
-          If you are a Developer, please complete your submission for 
+            <h2 data-test-status>You are undergoing onboarding</h2>
+            <p data-test-details>
+              If you are a Developer, please complete your submission for
           <a href="https://github.com/Real-Dev-Squad/lift-simulation">Lift Simulation</a>, 
           and ask for doubts in the team chat on Discord.
-        </p>
+            </p>
         <p data-test-details>If you are not a developer, please contact Ankush for next steps.</p>
-      </div>
-    {{else}}
-    <h2 data-test-status>{{currentStatus.message}}</h2>
-    {{/if}}
-  {{/if}}
-  {{/each}}
-</div>
+          </div>
+        {{else}}
+          <h2 data-test-status>{{currentStatus.message}}</h2>
+        {{/if}}
+      {{/if}}
+    {{/each}}
+  </div>
 
 <div class="buttons">
-  {{#each this.currentUserStatus as |currentStatus|}}
-    {{#if (eq @status currentStatus.status)}}
-      {{#each currentStatus.otherAvailableStatus as |otherPossibleStatus|}}
-        <button data-test-update-status-OOO class={{otherPossibleStatus.class}} type="button" disabled={{@isStatusUpdating}} {{on "click" (fn this.changeStatus otherPossibleStatus.status )}}>
-          <span>{{otherPossibleStatus.message}}</span>
-        </button>
-      {{/each}}
-    {{/if}}
-  {{/each}}
-</div>
+    {{#each this.currentUserStatus as |currentStatus|}}
+      {{#if (eq @status currentStatus.status)}}
+        {{#if (eq currentStatus.status "OOO")}}
+          {{#if @dev}}
+            <button
+              data-test-cancel-status-OOO
+              class='buttons__cancel--ooo'
+              type='button'
+              disabled={{@isStatusUpdating}}
+              {{on 'click' (fn this.cancelOOOStatus currentStatus.status)}}
+            >
+              <span>Cancel OOO</span>
+            </button>
+          {{/if}}
+          {{else}}
+            {{#each currentStatus.otherAvailableStatus as |otherPossibleStatus|}}
+          <button data-test-update-status-OOO class={{otherPossibleStatus.class}} type="button" disabled={{@isStatusUpdating}} {{on "click" (fn this.changeStatus otherPossibleStatus.status )}}>
+                <span>{{otherPossibleStatus.message}}</span>
+              </button>
+            {{/each}}
+        {{/if}}
+      {{/if}}
+    {{/each}}
+  </div>
 {{/if}}
diff --git a/app/components/user-status.js b/app/components/user-status.js
index b5efbcd6..f2d52421 100644
--- a/app/components/user-status.js
+++ b/app/components/user-status.js
@@ -64,4 +64,10 @@ export default class UserStatusComponent extends Component {
       this.args.changeStatus(status);
     }
   }
+
+  @action async cancelOOOStatus(status) {
+    if (status === USER_STATES.OOO) {
+      await this.args.updateStatus({ cancelOoo: true });
+    }
+  }
 }
diff --git a/app/controllers/index.js b/app/controllers/index.js
index 0cae6926..b0958a6b 100644
--- a/app/controllers/index.js
+++ b/app/controllers/index.js
@@ -10,19 +10,26 @@ const BASE_URL = ENV.BASE_API_URL;
 
 export default class IndexController extends Controller {
   @service toast;
+  @service featureFlag;
   @tracked status = this.model;
   @tracked isStatusUpdating = false;
   @tracked showUserStateModal = false;
   @tracked newStatus;
 
+  get isDevMode() {
+    return this.featureFlag.isDevMode;
+  }
+
   @action toggleUserStateModal() {
     this.showUserStateModal = !this.showUserStateModal;
   }
 
   @action async updateStatus(newStatus) {
     this.isStatusUpdating = true;
-    if (newStatus.currentStatus.state !== USER_STATES.ACTIVE) {
-      this.toggleUserStateModal();
+    if (!('cancelOoo' in newStatus)) {
+      if (newStatus.currentStatus.state !== USER_STATES.ACTIVE) {
+        this.toggleUserStateModal();
+      }
     }
     try {
       await fetch(`${BASE_URL}/users/status/self?userStatusFlag=true`, {
diff --git a/app/styles/user-status.css b/app/styles/user-status.css
index 9850e197..971c11ae 100644
--- a/app/styles/user-status.css
+++ b/app/styles/user-status.css
@@ -77,6 +77,19 @@
   width: 25rem;
 }
 
+.buttons__cancel--ooo {
+  font-size: 1.25rem;
+  color: var(--button--color--text);
+  font-weight: 700;
+  border: 3px solid var(--button--color--border);
+  padding: 20px;
+  margin-bottom: 40px;
+  border-radius: 10px;
+  background: var( --button--color--bg);
+  cursor: pointer;
+  width: 15rem;
+}
+
 .buttons__ooo:hover {
   color: var(--button--ooo--bg);
   background: var(--button--ooo--text);
diff --git a/app/templates/index.hbs b/app/templates/index.hbs
index 722678de..ee455791 100644
--- a/app/templates/index.hbs
+++ b/app/templates/index.hbs
@@ -3,7 +3,8 @@
 </div>
 <UserStatus 
   @status={{this.status}} 
-  @changeStatus={{this.changeStatus}} 
+  @changeStatus={{this.changeStatus}}
+  @dev={{this.isDevMode}} 
   @isStatusUpdating={{this.isStatusUpdating}}
   @updateStatus={{this.updateStatus}}
 />
diff --git a/tests/integration/components/user-status-test.js b/tests/integration/components/user-status-test.js
index dfa9d917..d924f2ee 100644
--- a/tests/integration/components/user-status-test.js
+++ b/tests/integration/components/user-status-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
+import { click, render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 
 module('Integration | Component | user-status', function (hooks) {
@@ -50,23 +50,74 @@ module('Integration | Component | user-status', function (hooks) {
       .hasText('Change your status to OOO');
   });
 
-  test('show relevant data when status is OOO', async function (assert) {
+  test('show relevant data when status is OOO and not have feature flag', async function (assert) {
     this.setProperties({
       status: 'OOO',
       isStatusUpdating: false,
       changeStatus: () => {},
       updateStatus: () => {},
+      dev: false,
+    });
+
+    await render(hbs`
+        <UserStatus 
+          @status={{this.status}} 
+          @changeStatus={{this.changeStatus}}
+          @dev={{this.dev}}  
+          @isStatusUpdating={{this.isStatusUpdating}}
+          @updateStatus={{this.updateStatus}}
+        />
+    `);
+
+    assert.dom('[data-test-status]').hasText(`You are OOO`);
+  });
+
+  test('show relevant data when status is OOO and have feature flag', async function (assert) {
+    this.setProperties({
+      status: 'OOO',
+      isStatusUpdating: false,
+      changeStatus: () => {},
+      updateStatus: () => {},
+      dev: true,
     });
 
     await render(hbs`
         <UserStatus 
           @status={{this.status}} 
           @changeStatus={{this.changeStatus}} 
+          @dev={{this.dev}} 
           @isStatusUpdating={{this.isStatusUpdating}}
           @updateStatus={{this.updateStatus}}
         />
     `);
 
     assert.dom('[data-test-status]').hasText(`You are OOO`);
+    assert.dom('[ data-test-cancel-status-OOO]').hasProperty('button');
+    assert.dom('[ data-test-cancel-status-OOO]').hasText('Cancel OOO');
+  });
+
+  test('payload contains relevant data when status is changed from OOO to IDLE or ACTIVE', async function (assert) {
+    this.setProperties({
+      status: 'OOO',
+      isStatusUpdating: false,
+      changeStatus: () => {},
+      updateStatus: (cancelOOOPayload) => {
+        const { cancelOoo } = cancelOOOPayload;
+        assert.equal(cancelOoo, true, 'cancel OOO status');
+      },
+      dev: true,
+    });
+
+    await render(hbs`
+        <UserStatus 
+          @status={{this.status}} 
+          @changeStatus={{this.changeStatus}} 
+          @isStatusUpdating={{this.isStatusUpdating}}
+          @dev={{this.dev}} 
+          @updateStatus={{this.updateStatus}}
+        />
+    `);
+
+    await click('.buttons__cancel--ooo');
   });
 });

From 9d2c98292ecd4d3c7ead9e7bed3506ecea78cb57 Mon Sep 17 00:00:00 2001
From: MayurLund <37043221+MayurLund@users.noreply.github.com>
Date: Sat, 14 Oct 2023 23:04:11 +0530
Subject: [PATCH 08/18] Feat/allow multiple extension requests (#496)

* create button to allow multiple extensions

* add test for multiple extension request form

* fix style

* fix style

* fix style and refactor component

* refactor form and details and fix styles

* fix test cases

* final fix
---
 app/components/task/holder.hbs                |  21 +-
 app/components/task/holder.js                 |   1 +
 app/components/task/latest-extension-info.hbs |  35 ++
 app/components/task/latest-extension-info.js  |  11 +
 .../task/multiple-extension-form.hbs          | 123 +++++++
 .../task/multiple-extension-form.js           | 181 ++++++++++
 app/constants/user-status.js                  |   2 +
 app/styles/tasks.css                          | 142 +++++++-
 .../tasks/multiple-extension-form-test.js     | 320 ++++++++++++++++++
 9 files changed, 825 insertions(+), 11 deletions(-)
 create mode 100644 app/components/task/latest-extension-info.hbs
 create mode 100644 app/components/task/latest-extension-info.js
 create mode 100644 app/components/task/multiple-extension-form.hbs
 create mode 100644 app/components/task/multiple-extension-form.js
 create mode 100644 tests/integration/components/tasks/multiple-extension-form-test.js

diff --git a/app/components/task/holder.hbs b/app/components/task/holder.hbs
index 3fd9d2f5..b6b38809 100644
--- a/app/components/task/holder.hbs
+++ b/app/components/task/holder.hbs
@@ -14,12 +14,21 @@
   <div class='task-card__status-update-container'>
 
     {{#if this.extensionFormOpened}}
-      <Task::ExtensionForm
-        @task={{@task}}
-        @closeForm={{this.closeExtensionForm}}
-        @title='Form for extension Request'
-        @closeModel={{this.closeExtensionModel}}
-      />
+      {{#if @dev}}
+        <Task::MultipleExtensionForm
+          @task={{@task}}
+          @closeForm={{this.closeExtensionForm}}
+          @title='Extension Details'
+          @closeModel={{this.closeExtensionModel}}
+        />
+      {{else}}
+        <Task::ExtensionForm
+          @task={{@task}}
+          @closeForm={{this.closeExtensionForm}}
+          @title='Form for extension Request'
+          @closeModel={{this.closeExtensionModel}}
+        />
+      {{/if}}
     {{/if}}
 
     {{#if (not-eq this.status this.TASK_KEYS.VERIFIED)}}
diff --git a/app/components/task/holder.js b/app/components/task/holder.js
index 0673890f..4e058848 100644
--- a/app/components/task/holder.js
+++ b/app/components/task/holder.js
@@ -9,6 +9,7 @@ export default class TasksHolderComponent extends Component {
   @tracked status = this.args.task.status;
   @tracked extensionFormOpened = false;
   @tracked isLoading = false;
+  queryParams = ['dev'];
 
   TASK_KEYS = TASK_KEYS;
   availabletaskStatusList = TASK_STATUS_LIST;
diff --git a/app/components/task/latest-extension-info.hbs b/app/components/task/latest-extension-info.hbs
new file mode 100644
index 00000000..456a0322
--- /dev/null
+++ b/app/components/task/latest-extension-info.hbs
@@ -0,0 +1,35 @@
+<div class='latest-extension-info__content' data-test-extension-info-content>
+  <table class="latest-table">
+    <tbody class="latest-table">
+      <tr>
+        <th>Request : </th>
+        <td>{{#if (eq this.extension.requestNumber undefined)}}
+           #1
+          {{else}}
+           #{{this.extension.requestNumber}}
+          {{/if}}
+        </td>
+      </tr>
+      <tr>
+        <th >Reason : </th>
+        <td>{{this.extension.reason}}</td>
+      </tr>
+      <tr>
+        <th>Title : </th>
+        <td>{{this.extension.title}}</td>
+      </tr>
+      <tr>
+        <th>Old Ends On : </th>
+        <td>{{this.oldEndsOn}}</td>
+      </tr>
+      <tr>
+        <th>New Ends On : </th>
+        <td>{{this.newEndsOn}}</td>
+      </tr>
+      <tr>
+        <th>Status : </th>
+        <td>{{this.extension.status}}</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file
diff --git a/app/components/task/latest-extension-info.js b/app/components/task/latest-extension-info.js
new file mode 100644
index 00000000..aeb1d4f3
--- /dev/null
+++ b/app/components/task/latest-extension-info.js
@@ -0,0 +1,11 @@
+import Component from '@glimmer/component';
+
+export default class LatestExtensionInfoComponent extends Component {
+  extension = this.args.extension;
+  newEndsOn = this.localTime(this.extension.newEndsOn);
+  oldEndsOn = this.localTime(this.extension.oldEndsOn);
+
+  localTime(time) {
+    return new Date(time * 1000).toLocaleString();
+  }
+}
diff --git a/app/components/task/multiple-extension-form.hbs b/app/components/task/multiple-extension-form.hbs
new file mode 100644
index 00000000..c13d76ec
--- /dev/null
+++ b/app/components/task/multiple-extension-form.hbs
@@ -0,0 +1,123 @@
+<div class='extension-form__container-parent'>
+  <div
+    role='button' id='create'
+    class='extension-form__container-back'
+    data-test-extension-form-container-back
+    {{on 'click' @closeModel}}
+  ></div>
+  <div class='extension-form__container-main'>
+    <h2 data-test-title>
+      {{#if this.createExtensionRequest}}
+        Extension Request Form
+      {{else}}
+        Extension Details
+      {{/if}}
+    </h2>
+    {{#if this.createExtensionRequest}}
+      <div class='extension-form__content' data-test-extension-from-content>
+        <form {{on 'submit' this.submitExtensionRequest}}>
+          <label for='reason'>Reason</label>
+          <textarea
+            required
+            type='text-box'
+            id='reason'
+            name='reason'
+            data-test-extension-form-reason-input
+          ></textarea>
+          <p>Old ETA - {{this.oldETA}}</p>
+          <label for='newEndsOn'>New ETA</label>
+          <input
+            required
+            type='datetime-local'
+            id='newEndsOn'
+            name='newEndsOn'
+            {{on 'change' this.changeExtensionRequestETA}}
+            data-test-extension-form-newEndsOn-input
+          />
+          <label for='title'>Title</label>
+          <textarea
+            required
+            type='text-box'
+            id='title'
+            name='title'
+            data-test-extension-form-title-input
+          ></textarea>
+          <div class="error-container" id='error'>
+          <span class='error-placeholder' data-test-extension-from-error></span>
+          </div>
+          <div class='buttons' id='form'>
+          <button
+            class='multiple-extension-form__container-close'
+            data-test-extension-form-container-close
+            type='button'
+            {{on 'click' @closeForm}}
+          >
+            Cancel
+          </button>
+
+          <button
+            class='multiple-extension-form__create-button primary-button-style'
+            disabled={{this.isSubmitButtonDisabled}}
+            type='submit'
+          >Submit</button>
+          </div>
+        </form>
+      </div>
+    {{else}}
+      <div class='extension-form__content' data-test-extension-from-content>
+        {{#if this.extensionData.value}}
+          <div class='extension-form__content-wrapper'>
+            {{#each this.extensionData.value as |extension|}}
+              <Task::LatestExtensionInfo @extension={{extension}} />
+            {{/each}}
+          </div>
+          <div class='buttons' id='detail'>
+          <button
+            class='multiple-extension-form__container-close'
+            data-test-extension-form-container-close
+            type='button'
+            {{on 'click' @closeForm}}
+          >
+            Close
+          </button>
+          
+          {{#if (or (eq this.previousExtensionStatus 'APPROVED') (eq this.previousExtensionStatus 'DENIED'))}}
+            <button
+              class='multiple-extension-form__open-button primary-button-style'
+              data-test-create-another-extension
+              type='button'
+              {{on 'click' this.createNewExtensionRequest}}
+            >
+              Request Extension
+            </button>
+          {{/if}}
+          </div>
+        {{else if this.extensionData.isLoading}}
+          <div class='task-card__loader-container'>
+            <Spinner />
+          </div>
+        {{else if this.extensionData.error}}
+          <h4>{{this.extensionData.error}}</h4>
+          <div class='buttons' id='create'>
+          <button
+            class='multiple-extension-form__container-close'
+            data-test-extension-form-container-close
+            type='button'
+            {{on 'click' @closeForm}}
+          >
+            Close
+          </button>
+          <button
+            class='multiple-extension-form__open-button primary-button-style'
+            data-test-create-extension-button
+            type='button'
+            {{on 'click' this.createNewExtensionRequest}}
+          >
+            Request Extension
+          </button>
+          </div>
+        {{/if}}
+      </div>
+    {{/if}}
+  </div>
+</div>
diff --git a/app/components/task/multiple-extension-form.js b/app/components/task/multiple-extension-form.js
new file mode 100644
index 00000000..ffdaeb0f
--- /dev/null
+++ b/app/components/task/multiple-extension-form.js
@@ -0,0 +1,181 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { resource, use } from 'ember-resources';
+import { TrackedMap } from 'tracked-maps-and-sets';
+import ENV from 'website-my/config/environment';
+import { action } from '@ember/object';
+import { WARNING_INVALID_NEW_ETA } from '../../constants/user-status';
+import { toastNotificationTimeoutOptions } from '../../constants/toast-notification';
+import { inject as service } from '@ember/service';
+
+export default class ExtensionFormComponent extends Component {
+  @tracked createExtensionRequest = false;
+  @tracked createExtensionRequestError = null;
+  @tracked disableExtensionRequestClose = false;
+  @tracked previousExtensionStatus = null;
+  @tracked isSubmitButtonDisabled = false;
+
+  @service toast;
+  @service userState;
+
+  oldETA = new Date(this.args.task.endsOn * 1000).toLocaleString();
+
+  @use load = resource(({ on }) => {
+    const state = new TrackedMap();
+    const controller = new AbortController();
+
+    on.cleanup(() => controller.abort());
+    (async () => {
+      if (this.args.task) {
+        state.set('isLoading', true);
+        try {
+          const response = await fetch(
+            `${ENV.BASE_API_URL}/extension-requests/self/?taskId=${this.args.task.id}&dev=true`,
+            {
+              credentials: 'include',
+              signal: controller.signal,
+            }
+          );
+          if (response.status === 200) {
+            const data = await response.json();
+            if (!data.allExtensionRequests.length) {
+              throw Error(
+                'No extension request found for this task, want to create one?'
+              );
+            }
+            state.set('value', data.allExtensionRequests);
+            // Set the status of the previous extension request
+            this.previousExtensionStatus = data.allExtensionRequests[0].status;
+            state.set('isLoading', false);
+            return;
+          }
+          this.toast.error('Something went wrong!', '', {
+            ...toastNotificationTimeoutOptions,
+            timeOut: '3000',
+          });
+        } catch (error) {
+          state.set('error', error.message);
+          state.set('isLoading', false);
+          console.error(error);
+          this.toast.error(error.message, '', {
+            ...toastNotificationTimeoutOptions,
+            timeOut: '3000',
+          });
+        }
+      }
+    })();
+
+    return state;
+  });
+
+  get extensionData() {
+    const result = {};
+    result['isLoading'] = this.load.get('isLoading');
+    result['value'] = this.load.get('value');
+    result['error'] = this.load.get('error');
+    return result;
+  }
+
+  @action
+  createNewExtensionRequest() {
+    this.createExtensionRequest = true;
+  }
+
+  @action
+  closeForm() {
+    this.createExtensionRequest = false;
+  }
+
+  @action
+  async submitExtensionRequest(e) {
+    e.preventDefault();
+    this.disableExtensionRequestClose = true;
+    this.createExtensionRequestError = null;
+    this.isSubmitButtonDisabled = true;
+    const formData = new FormData(e.target);
+    const extensionTime = new Date(formData.get('newEndsOn')).getTime() / 1000;
+    const json = {};
+    formData.forEach(function (value, key) {
+      json[key] = value;
+    });
+
+    if (extensionTime < this.args.task.endsOn) {
+      this.toast.error(WARNING_INVALID_NEW_ETA, '', {
+        ...toastNotificationTimeoutOptions,
+        timeOut: '3000',
+      });
+      this.disableExtensionRequestClose = false;
+      this.createExtensionRequestError = 'New ETA must be greater than Old ETA';
+      return;
+    }
+
+    json['newEndsOn'] = extensionTime;
+    //setting default values
+    json['taskId'] = this.args.task.id;
+    json['assignee'] = this.userState.get('id');
+    json['oldEndsOn'] = this.args.task.endsOn;
+    json['status'] = 'PENDING';
+
+    try {
+      const response = await fetch(
+        `${ENV.BASE_API_URL}/extension-requests?dev=true`,
+        {
+          credentials: 'include',
+          method: 'POST',
+          body: JSON.stringify(json),
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        }
+      );
+      const data = await response.json();
+      if (data.message === 'Extension Request created successfully!') {
+        this.disableExtensionRequestClose = false;
+        this.toast.success(data.message, '', {
+          ...toastNotificationTimeoutOptions,
+          timeOut: '3000',
+        });
+        setTimeout(
+          (this.isSubmitButtonDisabled = true),
+          this.args.closeModel(),
+          2000
+        );
+        return;
+      }
+      this.toast.error('Something went wrong!', '', {
+        ...toastNotificationTimeoutOptions,
+        timeOut: '3000',
+      });
+    } catch (error) {
+      this.toast.error(error.message, '', {
+        ...toastNotificationTimeoutOptions,
+        timeOut: '3000',
+      });
+    } finally {
+      this.isSubmitButtonDisabled = false;
+    }
+  }
+
+  @action
+  changeExtensionRequestETA(e) {
+    const errorPlaceholder = document.querySelector('.error-placeholder');
+    const extensionTime = new Date(e.target.value).getTime() / 1000;
+    if (extensionTime < this.args.task.endsOn) {
+      this.toast.error(WARNING_INVALID_NEW_ETA, '', {
+        ...toastNotificationTimeoutOptions,
+        timeOut: '3000',
+      });
+      this.isSubmitButtonDisabled = true;
+      this.createExtensionRequestError = 'New ETA must be greater than Old ETA';
+      errorPlaceholder.textContent = this.createExtensionRequestError;
+      errorPlaceholder.style.visibility = 'visible';
+      return;
+    } else {
+      this.createExtensionRequestError = null;
+      this.isSubmitButtonDisabled = false;
+      errorPlaceholder.textContent = this.createExtensionRequestError;
+      errorPlaceholder.style.visibility = 'hidden';
+      return;
+    }
+  }
+}
diff --git a/app/constants/user-status.js b/app/constants/user-status.js
index 915b78a3..e3686682 100644
--- a/app/constants/user-status.js
+++ b/app/constants/user-status.js
@@ -11,6 +11,8 @@ export const USER_STATES = {
   ONBOARDING: 'ONBOARDING',
   DNE: 'DNE',
 };
+export const WARNING_INVALID_NEW_ETA =
+  'The newEndsOn value cannot be smaller than the oldEndsOn value';
 export const WARNING_FROM_DATE_EXCEEDS_UNTIL_DATE =
   'Until date cant lie before the From date. Please recheck the dates again.';
 export const THREE_DAYS_TIME_DIFFERENCE_MS = 172800000;
diff --git a/app/styles/tasks.css b/app/styles/tasks.css
index 7fa599d1..1d859611 100644
--- a/app/styles/tasks.css
+++ b/app/styles/tasks.css
@@ -420,7 +420,7 @@
   padding: 18px;
   border-radius: 10px;
   background-color: var(--white);
-  overflow-y: scroll;
+  /* overflow-y: scroll; */
   position: absolute;
   left: 30%;
   right: 30%;
@@ -452,6 +452,7 @@
   justify-content: center;
   align-items: center;
   height: 100%;
+  width: 100%;
   flex-direction: column;
   margin: 10px 0px;
 }
@@ -467,7 +468,7 @@
 
 .extension-form__content-wrapper {
   width: 100%;
-  display: flex;
+  /* display: flex; */
   flex-direction: column;
   align-items: center;
   justify-content: center;
@@ -479,7 +480,7 @@
   flex-direction: column;
   justify-content: center;
   align-items: flex-start;
-  width: 80%;
+  width: 100%;
 }
 .extension-form__content form > label {
   font-weight: bold;
@@ -494,10 +495,26 @@
   color: var(--button-proceed--text);
   font-size: 1.2rem;
   border: none;
+  width: 100%;
   border-radius: 8px;
+  margin-top: 1rem;
   padding: 5px 9px;
 }
 
+.multiple-extension-form__content form > button,
+.multiple-extension-form__container-close {
+  background-color: var(--button-proceed--bg);
+  color: var(--button-proceed--text);
+  font-size: 1.2rem;
+  border: none;
+  width: 40%;
+  border-radius: 8px;
+  margin-top: 1rem;
+  padding: 5px 9px;
+  display: flex;
+  align-items: center;
+}
+
 .extension-form__container-close:disabled {
   opacity: 0.7;
   background-color: #888;
@@ -511,8 +528,8 @@
   margin: 5px 0px 15px 0px;
   padding: 5px;
   width: 100%;
-  border: none;
-  border-bottom: 1px solid var(--input-field-border);
+  border: 1px solid var(--input-field-border);
+  /* border-bottom: 1px solid var(--input-field-border); */
 }
 
 .extension-info__content > table,
@@ -582,3 +599,118 @@
     align-items: center;
   }
 }
+
+.extension-info__content {
+  border-bottom: 1px solid var(--light-black);
+  margin: 10px;
+}
+.latest-extension-info__content table td {
+  white-space: normal;
+}
+
+  .multiple-extension-form__container-close {
+    background-color:#a70606;
+    color: var(--button-proceed--text);
+    font-size: 1.2rem;
+    border: none;
+    border-radius: 8px;
+    padding: 5px 9px;
+    width: 40%;
+    display: flex;
+    justify-content: center;
+    margin:0 auto;
+  }
+
+.error-message {
+  color: red;
+}
+.error-container {
+  align-items: center;
+  height: 25px;
+  width: 100%;
+}
+
+
+.error-placeholder {
+  color: red;
+  text-align: center;
+  visibility: hidden;
+}
+
+.multiple-extension-form__create-button[disabled] {
+  cursor: not-allowed;
+
+  background-color: #888;
+}
+
+.multiple-extension-form__create-button[disabled]:hover {
+  background-color: #888;
+}
+
+
+.multiple-extension-form__open-button:hover ,
+.multiple-extension-form__create-button:hover {
+  background-color: #01ad01;
+  color: #fff;
+}
+
+.multiple-extension-form__container-close:hover{
+  background-color: #d50707;
+  color:#fff
+}
+
+.multiple-extension-form__create-button {
+  width: 60%;
+}
+
+.primary-button-style {
+  background-color: #008000;
+  color: var(--button-proceed--text);
+  font-size: 1.2rem;
+  width: 40%;
+  display: flex;
+  justify-content: center;
+  margin:0 auto;
+  border: none;
+  border-radius: 8px;
+  padding: 5px 9px;
+  transition: background-color 0.3s ease;
+}
+
+  .latest-extension-info__content th {
+    text-align: right;
+    width: 50%;
+  }
+
+.latest-extension-info__content th, td {
+  padding: 8px 2px;
+  vertical-align: top;
+  min-width: 50%;
+}
+.latest-table{
+  width: 100%;
+}
+.latest-extension-info__content th {
+  text-align: right;
+}
+.latest-extension-info__content td {
+  text-align: left;
+  word-wrap: normal;
+}
+tr>th,tr>td{
+  vertical-align: top;
+}
+
+textarea {
+  width: 100%;
+  height: 50%;
+  overflow-y: auto;
+}
+
+div.buttons{
+  display: flex;
+  flex-direction:row;
+  min-width: 100%;
+  align-content: center;
+  justify-content: center;
+}
diff --git a/tests/integration/components/tasks/multiple-extension-form-test.js b/tests/integration/components/tasks/multiple-extension-form-test.js
new file mode 100644
index 00000000..64e6e08d
--- /dev/null
+++ b/tests/integration/components/tasks/multiple-extension-form-test.js
@@ -0,0 +1,320 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { tasks } from 'website-my/tests/fixtures/tasks';
+import { extensionRequests } from 'website-my/tests/fixtures/extension-requests';
+import { render, click, fillIn, waitFor, settled } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import makeServer from 'website-my/mirage/config';
+
+module('Integration | Component | Multiple Extension Form', function (hooks) {
+  setupRenderingTest(hooks);
+  let tasksData, extensionFormOpened, server;
+
+  hooks.after(function () {
+    server.shutdown();
+  });
+
+  hooks.before(function () {
+    tasksData = tasks;
+    extensionFormOpened = true;
+    server = makeServer({ environment: 'test' });
+    extensionRequests.forEach((obj) => {
+      server.create('extensionRequest', obj);
+    });
+  });
+
+  const toggleExtensionForm = (setter, name) => {
+    extensionFormOpened = !extensionFormOpened;
+    if (setter) {
+      setter(name, extensionFormOpened);
+    }
+  };
+
+  const closeExtensionForm = (setter, name) => () => {
+    extensionFormOpened = false;
+    if (setter) {
+      setter(name, false);
+    }
+  };
+
+  const closeExtensionModel = (setter, name) => (e) => {
+    if (!e) {
+      toggleExtensionForm(setter, name);
+      return;
+    }
+    e.stopPropagation();
+    if (e.target.classList.contains('extension-form__container-back')) {
+      toggleExtensionForm(setter, name);
+    }
+  };
+
+  test('When Clicked /"Close Form/" button or background task extension form should unmount', async function (assert) {
+    this.set('task', tasksData[3]);
+    this.set(
+      'closeExtensionModel',
+      closeExtensionModel(this.set, 'extensionFormOpened')
+    );
+    this.set(
+      'closeExtensionForm',
+      closeExtensionForm(this.set, 'extensionFormOpened')
+    );
+    this.set('extensionFormOpened', extensionFormOpened);
+    await render(
+      hbs`
+      {{#if this.extensionFormOpened}}
+      <Task::MultipleExtensionForm
+      @task={{this.task}}
+      @closeForm={{this.closeExtensionForm}}
+      @title='Form for extension Request'
+      @closeModel={{this.closeExtensionModel}}
+      />
+      {{/if}}`
+    );
+    await waitFor('[data-test-create-extension-button]');
+    assert
+      .dom(this.element.querySelector('[data-test-create-extension-button]'))
+      .hasText('Request Extension');
+
+    await click(
+      this.element.querySelector('[data-test-create-extension-button]')
+    );
+    assert.dom('[data-test-extension-form-container-close]').exists();
+    const closeButton = this.element.querySelector(
+      '[data-test-extension-form-container-close]'
+    );
+    assert.ok(closeButton, 'Close button should exist');
+    await click(closeButton);
+    assert.dom(this.element.querySelector('[data-test-title]')).doesNotExist();
+  });
+
+  test('When no extension requests found, the option to create extension request should show and then later open form', async function (assert) {
+    this.set('task', tasksData[3]);
+    this.set(
+      'closeExtensionModel',
+      closeExtensionModel(this.set, 'extensionFormOpened')
+    );
+    this.set(
+      'closeExtensionForm',
+      closeExtensionForm(this.set, 'extensionFormOpened')
+    );
+
+    await render(
+      hbs`<Task::MultipleExtensionForm 
+      @task={{this.task}} 
+      @closeForm={{this.closeExtensionForm}} 
+      @title='Form for extension Request' 
+      @closeModel={{this.closeExtensionModel}}/>`
+    );
+    await waitFor('[data-test-create-extension-button]');
+    assert
+      .dom(this.element.querySelector('[data-test-create-extension-button]'))
+      .hasText('Request Extension');
+
+    await click(
+      this.element.querySelector('[data-test-create-extension-button]')
+    );
+    assert
+      .dom(
+        this.element
+          .querySelector('[data-test-extension-from-content]')
+          .querySelector('button[type=submit]')
+      )
+      .exists();
+  });
+
+  test('When creating extension request, if the newEndsOn is smaller than the oldEndsOn then should throw error', async function (assert) {
+    this.set('task', tasksData[3]);
+    this.set(
+      'closeExtensionModel',
+      closeExtensionModel(this.set, 'extensionFormOpened')
+    );
+    this.set(
+      'closeExtensionForm',
+      closeExtensionForm(this.set, 'extensionFormOpened')
+    );
+
+    await render(
+      hbs`<Task::ExtensionForm 
+      @task={{this.task}} 
+      @closeForm={{this.closeExtensionForm}} 
+      @title='Form for extension Request' 
+      @closeModel={{this.closeExtensionModel}}/>`
+    );
+    await waitFor('[data-test-create-extension-button]');
+    assert
+      .dom(this.element.querySelector('[data-test-create-extension-button]'))
+      .hasText('Create an extension request');
+
+    await click(
+      this.element.querySelector('[data-test-create-extension-button]')
+    );
+    assert
+      .dom(
+        this.element
+          .querySelector('[data-test-extension-from-content]')
+          .querySelector('button[type=submit]')
+      )
+      .exists();
+
+    await fillIn(
+      '[data-test-extension-form-newEndsOn-input]',
+      '2021-09-09T09:45'
+    );
+    assert
+      .dom(this.element.querySelector('[data-test-extension-from-error]'))
+      .hasText(
+        'Error: The newEndsOn value cannot be smaller than the oldEndsOn value'
+      );
+
+    await settled();
+    // if filled valid time then remove the error
+    await fillIn(
+      '[data-test-extension-form-newEndsOn-input]',
+      '2024-09-09T09:45'
+    );
+    assert
+      .dom(this.element.querySelector('[data-test-extension-from-error]'))
+      .doesNotExist();
+  });
+
+  test('When no extension requests found, we should be able to create one', async function (assert) {
+    this.set('task', tasksData[3]);
+    this.set(
+      'closeExtensionModel',
+      closeExtensionModel(this.set, 'extensionFormOpened')
+    );
+    this.set(
+      'closeExtensionForm',
+      closeExtensionForm(this.set, 'extensionFormOpened')
+    );
+
+    await render(
+      hbs`<Task::ExtensionForm 
+      @task={{this.task}} 
+      @closeForm={{this.closeExtensionForm}} 
+      @title='Extension Details' 
+      @closeModel={{this.closeExtensionModel}}/>`
+    );
+    await waitFor('[data-test-create-extension-button]');
+    assert
+      .dom(this.element.querySelector('[data-test-create-extension-button]'))
+      .hasText('Create an extension request');
+
+    await click(
+      this.element.querySelector('[data-test-create-extension-button]')
+    );
+    assert
+      .dom(
+        this.element
+          .querySelector('[data-test-extension-from-content]')
+          .querySelector('button[type=submit]')
+      )
+      .exists();
+
+    //create extension request
+    await fillIn('[data-test-extension-form-reason-input]', 'Testing');
+    await fillIn(
+      '[data-test-extension-form-newEndsOn-input]',
+      '2030-12-31T02:43'
+    );
+    await fillIn('[data-test-extension-form-title-input]', 'TestingAgain');
+    await click(this.element.querySelector('button[type=submit]'));
+
+    // rendering the component again to check the new data
+    await render(
+      hbs`<Task::ExtensionForm 
+      @task={{this.task}} 
+      @closeForm={{this.closeExtensionForm}} 
+      @title='Extension Details' 
+      @closeModel={{this.closeExtensionModel}}/>`
+    );
+    await waitFor('[data-test-extension-info-content]');
+    assert
+      .dom(this.element.querySelector('[data-test-extension-info-content]'))
+      .containsText('Testing')
+      .containsText('TestingAgain')
+      .containsText('PENDING')
+      .containsText('1');
+  });
+
+  test('When previous extension request is approved, the button to create extension request should be there', async function (assert) {
+    let extensionRequestData = extensionRequests[0];
+    this.set('task', tasksData[0]);
+    this.set('previousExtensionStatus', extensionRequestData.status);
+    this.set(
+      'closeExtensionModel',
+      closeExtensionModel(this.set, 'extensionFormOpened')
+    );
+    this.set(
+      'closeExtensionForm',
+      closeExtensionForm(this.set, 'extensionFormOpened')
+    );
+
+    await render(
+      hbs`<Task::MultipleExtensionForm 
+      @task={{this.task}} 
+      @closeForm={{this.closeExtensionForm}} 
+      @title='Form for extension Request'
+      @closeModel={{this.closeExtensionModel}}/>
+      }`
+    );
+    await waitFor('[data-test-extension-info-content]');
+    assert
+      .dom(this.element.querySelector('[data-test-extension-info-content]'))
+      .containsText(extensionRequestData['title'])
+      .containsText(extensionRequestData['reason'])
+      .containsText(extensionRequestData['status']);
+    // Assert the initial state
+    if (['APPROVED', 'DENIED'].includes(this.previousExtensionStatus)) {
+      assert.dom('button[data-test-create-another-extension]').exists();
+
+      // Trigger the action to create a new extension request
+      await click('button[data-test-create-another-extension]');
+
+      assert
+        .dom(
+          this.element
+            .querySelector('[data-test-extension-from-content]')
+            .querySelector('button[type=submit]')
+        )
+        .exists();
+    } else {
+      assert.dom('[data-test-create-another-extension] button').doesNotExist();
+    }
+  });
+
+  test('When previous extension request is pending, the option to create extension request should show and then later open form', async function (assert) {
+    // Set up test data and conditions, such as setting this.previousExtensionStatus
+    let extensionRequestData = extensionRequests[1];
+    this.set('task', tasksData[0]);
+    this.set('previousExtensionStatus', extensionRequestData.status);
+
+    this.set(
+      'closeExtensionModel',
+      closeExtensionModel(this.set, 'extensionFormOpened')
+    );
+    this.set(
+      'closeExtensionForm',
+      closeExtensionForm(this.set, 'extensionFormOpened')
+    );
+
+    await render(
+      hbs`<Task::MultipleExtensionForm 
+        @task={{this.task}} 
+        @closeForm={{this.closeExtensionForm}} 
+        @title='Form for extension Request'
+        @closeModel={{this.closeExtensionModel}}/>`
+    );
+
+    await waitFor('[data-test-extension-info-content]');
+
+    // Assert the initial state
+    assert.dom('[data-test-extension-form-container]').doesNotExist(); // Replace with the actual selector for the component
+
+    // Trigger the action to create a new extension request
+    assert.dom('[data-test-create-another-extension] button').doesNotExist();
+
+    // Assert the resulting state after the action
+    assert.dom('[data-test-extension-form]').doesNotExist(); // Replace with the actual selector for the extension form
+  });
+});

From 0d93af1bb02287e555e4ff706e671538f244e306 Mon Sep 17 00:00:00 2001
From: Joy <56365512+ardourApeX@users.noreply.github.com>
Date: Wed, 18 Oct 2023 23:55:55 +0530
Subject: [PATCH 09/18] Extension request should show reviewer's log if the
 request has been either approved or denied (#503)

* Feat : Added reviewed by log in extension status modal

* Test : Added test cases to verify review log
---
 .../task/multiple-extension-form.hbs          | 116 ++++++++++--------
 tests/fixtures/extension-requests.js          |   1 +
 .../tasks/multiple-extension-form-test.js     |  67 ++++++++++
 3 files changed, 136 insertions(+), 48 deletions(-)

diff --git a/app/components/task/multiple-extension-form.hbs b/app/components/task/multiple-extension-form.hbs
index c13d76ec..ac0ba8ed 100644
--- a/app/components/task/multiple-extension-form.hbs
+++ b/app/components/task/multiple-extension-form.hbs
@@ -1,6 +1,7 @@
 <div class='extension-form__container-parent'>
   <div
-    role='button' id='create'
+    role='button'
+    id='create'
     class='extension-form__container-back'
     data-test-extension-form-container-back
     {{on 'click' @closeModel}}
@@ -42,24 +43,27 @@
             name='title'
             data-test-extension-form-title-input
           ></textarea>
-          <div class="error-container" id='error'>
-          <span class='error-placeholder' data-test-extension-from-error></span>
+          <div class='error-container' id='error'>
+            <span
+              class='error-placeholder'
+              data-test-extension-from-error
+            ></span>
           </div>
           <div class='buttons' id='form'>
-          <button
-            class='multiple-extension-form__container-close'
-            data-test-extension-form-container-close
-            type='button'
-            {{on 'click' @closeForm}}
-          >
-            Cancel
-          </button>
+            <button
+              class='multiple-extension-form__container-close'
+              data-test-extension-form-container-close
+              type='button'
+              {{on 'click' @closeForm}}
+            >
+              Cancel
+            </button>
 
-          <button
-            class='multiple-extension-form__create-button primary-button-style'
-            disabled={{this.isSubmitButtonDisabled}}
-            type='submit'
-          >Submit</button>
+            <button
+              class='multiple-extension-form__create-button primary-button-style'
+              disabled={{this.isSubmitButtonDisabled}}
+              type='submit'
+            >Submit</button>
           </div>
         </form>
       </div>
@@ -69,28 +73,44 @@
           <div class='extension-form__content-wrapper'>
             {{#each this.extensionData.value as |extension|}}
               <Task::LatestExtensionInfo @extension={{extension}} />
+              {{#if extension.reviewedBy}}
+                <p data-reviewed-log>Your request was
+                  {{#if
+                    (eq extension.status 'APPROVED')
+                  }}approved{{else}}denied{{/if}}
+                  by
+                  {{extension.reviewedBy}}
+                  {{convertDate (array extension.timestamp) end_date=0}}.
+                </p>
+              {{/if}}
             {{/each}}
           </div>
+
           <div class='buttons' id='detail'>
-          <button
-            class='multiple-extension-form__container-close'
-            data-test-extension-form-container-close
-            type='button'
-            {{on 'click' @closeForm}}
-          >
-            Close
-          </button>
-          
-          {{#if (or (eq this.previousExtensionStatus 'APPROVED') (eq this.previousExtensionStatus 'DENIED'))}}
             <button
-              class='multiple-extension-form__open-button primary-button-style'
-              data-test-create-another-extension
+              class='multiple-extension-form__container-close'
+              data-test-extension-form-container-close
               type='button'
-              {{on 'click' this.createNewExtensionRequest}}
+              {{on 'click' @closeForm}}
             >
-              Request Extension
+              Close
             </button>
-          {{/if}}
+
+            {{#if
+              (or
+                (eq this.previousExtensionStatus 'APPROVED')
+                (eq this.previousExtensionStatus 'DENIED')
+              )
+            }}
+              <button
+                class='multiple-extension-form__open-button primary-button-style'
+                data-test-create-another-extension
+                type='button'
+                {{on 'click' this.createNewExtensionRequest}}
+              >
+                Request Extension
+              </button>
+            {{/if}}
           </div>
         {{else if this.extensionData.isLoading}}
           <div class='task-card__loader-container'>
@@ -99,25 +119,25 @@
         {{else if this.extensionData.error}}
           <h4>{{this.extensionData.error}}</h4>
           <div class='buttons' id='create'>
-          <button
-            class='multiple-extension-form__container-close'
-            data-test-extension-form-container-close
-            type='button'
-            {{on 'click' @closeForm}}
-          >
-            Close
-          </button>
-          <button
-            class='multiple-extension-form__open-button primary-button-style'
-            data-test-create-extension-button
-            type='button'
-            {{on 'click' this.createNewExtensionRequest}}
-          >
-            Request Extension
-          </button>
+            <button
+              class='multiple-extension-form__container-close'
+              data-test-extension-form-container-close
+              type='button'
+              {{on 'click' @closeForm}}
+            >
+              Close
+            </button>
+            <button
+              class='multiple-extension-form__open-button primary-button-style'
+              data-test-create-extension-button
+              type='button'
+              {{on 'click' this.createNewExtensionRequest}}
+            >
+              Request Extension
+            </button>
           </div>
         {{/if}}
       </div>
     {{/if}}
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/tests/fixtures/extension-requests.js b/tests/fixtures/extension-requests.js
index 57daf0c3..241dfe34 100644
--- a/tests/fixtures/extension-requests.js
+++ b/tests/fixtures/extension-requests.js
@@ -9,6 +9,7 @@ const extensionRequests = [
     id: 'T0S56aa3zaNsNghEPLeS',
     timestamp: 1673784012,
     assignee: 'ivinayakg',
+    reviewedBy: 'Joy Gupta',
   },
   {
     oldEndsOn: 57658796,
diff --git a/tests/integration/components/tasks/multiple-extension-form-test.js b/tests/integration/components/tasks/multiple-extension-form-test.js
index 64e6e08d..9e101ae2 100644
--- a/tests/integration/components/tasks/multiple-extension-form-test.js
+++ b/tests/integration/components/tasks/multiple-extension-form-test.js
@@ -283,6 +283,73 @@ module('Integration | Component | Multiple Extension Form', function (hooks) {
     }
   });
 
+  test('Review log should present if extension status is either approved or denied and reviewedBy field is present', async function (assert) {
+    const extensionRequestData = extensionRequests[0];
+    this.set('task', tasksData[0]);
+    this.set('value', [extensionRequestData]);
+    this.set('previousExtensionStatus', extensionRequestData.status);
+    this.set(
+      'closeExtensionModel',
+      closeExtensionModel(this.set, 'extensionFormOpened')
+    );
+    this.set(
+      'closeExtensionForm',
+      closeExtensionForm(this.set, 'extensionFormOpened')
+    );
+
+    await render(
+      hbs`<Task::MultipleExtensionForm 
+      @task={{this.task}} 
+      @closeForm={{this.closeExtensionForm}} 
+      @title='Form for extension Request'
+      @closeModel={{this.closeExtensionModel}}/>
+      }`
+    );
+    await waitFor('[data-test-extension-info-content]');
+
+    // Assert the initial state
+    if (['APPROVED', 'DENIED'].includes(this.previousExtensionStatus)) {
+      assert
+        .dom(this.element.querySelector('[data-reviewed-log]'))
+        .containsText(extensionRequestData['reviewedBy'])
+        .exists();
+    } else {
+      assert
+        .dom(this.element.querySelector('[data-reviewed-log]'))
+        .doesNotExist();
+    }
+  });
+
+  test('Review log should not be present as extensionRequestData does not contains reviewedBy field', async function (assert) {
+    const extensionRequestData = extensionRequests[2];
+    this.set('task', tasksData[2]);
+    this.set('value', [extensionRequestData]);
+    this.set('previousExtensionStatus', extensionRequestData.status);
+    this.set(
+      'closeExtensionModel',
+      closeExtensionModel(this.set, 'extensionFormOpened')
+    );
+    this.set(
+      'closeExtensionForm',
+      closeExtensionForm(this.set, 'extensionFormOpened')
+    );
+
+    await render(
+      hbs`<Task::MultipleExtensionForm 
+      @task={{this.task}} 
+      @closeForm={{this.closeExtensionForm}} 
+      @title='Form for extension Request'
+      @closeModel={{this.closeExtensionModel}}/>
+      }`
+    );
+    await waitFor('[data-test-extension-info-content]');
+
+    // Assert the initial state
+    assert
+      .dom(this.element.querySelector('[data-reviewed-log]'))
+      .doesNotExist();
+  });
+
   test('When previous extension request is pending, the option to create extension request should show and then later open form', async function (assert) {
     // Set up test data and conditions, such as setting this.previousExtensionStatus
     let extensionRequestData = extensionRequests[1];

From a6c862f047daed731765d29a8c337bebd5078d75 Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 11:06:10 +0530
Subject: [PATCH 10/18] Adding UNASSIGNED and DONE to task status options

---
 app/components/task/holder.hbs                |  25 ++-
 app/constants/tasks.js                        |  15 ++
 .../components/tasks/holder-test.js           | 142 +++++++++++++++++-
 3 files changed, 175 insertions(+), 7 deletions(-)

diff --git a/app/components/task/holder.hbs b/app/components/task/holder.hbs
index b6b38809..4895f554 100644
--- a/app/components/task/holder.hbs
+++ b/app/components/task/holder.hbs
@@ -41,12 +41,25 @@
         >
           {{#each this.availabletaskStatusList as |taskStatus|}}
             {{#if (not-eq taskStatus.key this.TASK_KEYS.ALL)}}
-              <option
-                value={{taskStatus.key}}
-                selected={{eq taskStatus.key this.status}}
-              >
-                {{taskStatus.displayLabel}}
-              </option>
+              {{#if @dev}}
+                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.AVAILABLE) (eq taskStatus.key this.TASK_KEYS.COMPLETED)))}}
+                    <option
+                      value={{taskStatus.key}}
+                      selected={{eq taskStatus.key this.status}}
+                    >
+                      {{taskStatus.displayLabel}}
+                    </option>
+                {{/if}}
+              {{else}}
+                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.UNASSIGNED) (eq taskStatus.key this.TASK_KEYS.DONE)))}}
+                    <option
+                      value={{taskStatus.key}}
+                      selected={{eq taskStatus.key this.status}}
+                    >
+                      {{taskStatus.displayLabel}}
+                    </option>
+                {{/if}}
+              {{/if}}
             {{/if}}
           {{/each}}
         </select>
diff --git a/app/constants/tasks.js b/app/constants/tasks.js
index 3947ee71..450c4dfe 100644
--- a/app/constants/tasks.js
+++ b/app/constants/tasks.js
@@ -2,6 +2,7 @@ const TASK_KEYS = {
   ALL: 'ALL',
   AVAILABLE: 'AVAILABLE',
   ASSIGNED: 'ASSIGNED',
+  UNASSIGNED: 'UNASSIGNED',
   IN_PROGRESS: 'IN_PROGRESS',
   BLOCKED: 'BLOCKED',
   SMOKE_TESTING: 'SMOKE_TESTING',
@@ -14,16 +15,19 @@ const TASK_KEYS = {
   REGRESSION_CHECK: 'REGRESSION_CHECK',
   RELEASED: 'RELEASED',
   VERIFIED: 'VERIFIED',
+  DONE: 'DONE',
 };
 
 const {
   ALL,
   AVAILABLE,
   ASSIGNED,
+  UNASSIGNED,
   IN_PROGRESS,
   BLOCKED,
   SMOKE_TESTING,
   COMPLETED,
+  DONE,
   NEEDS_REVIEW,
   IN_REVIEW,
   APPROVED,
@@ -47,6 +51,10 @@ const TASK_STATUS_LIST = [
     displayLabel: 'Assigned',
     key: ASSIGNED,
   },
+  {
+    displayLabel: 'Unassigned',
+    key: UNASSIGNED,
+  },
   {
     displayLabel: 'In Progress',
     key: IN_PROGRESS,
@@ -63,6 +71,10 @@ const TASK_STATUS_LIST = [
     displayLabel: 'Completed',
     key: COMPLETED,
   },
+  {
+    displayLabel: 'Done',
+    key: DONE,
+  },
   {
     displayLabel: 'Needs Review',
     key: NEEDS_REVIEW,
@@ -143,3 +155,6 @@ export const TASK_PERCENTAGE = {
 };
 
 export { TASK_KEYS, TASK_STATUS_LIST, TABS_TASK_STATUS_LIST };
+
+export const oldTaskStatus = { AVAILABLE: 'AVAILABLE', COMPLETED: 'COMPLETED' };
+export const newTaskStatus = { UNASSIGNED: 'UNASSIGNED', DONE: 'DONE' };
diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index 77ad27c0..5fa7b338 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -1,7 +1,12 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { tasks, overDueTask } from 'website-my/tests/fixtures/tasks';
-import { TASK_KEYS, TASK_STATUS_LIST } from 'website-my/constants/tasks';
+import {
+  TASK_KEYS,
+  TASK_STATUS_LIST,
+  oldTaskStatus,
+  newTaskStatus,
+} from 'website-my/constants/tasks';
 import { find, render, waitUntil, fillIn, select } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 
@@ -242,4 +247,139 @@ module('Integration | Component | Tasks Holder', function (hooks) {
 
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
+
+  test('Check if UNASSIGNED and DONE is not in task status options when dev is false', async function (assert) {
+    this.set('task', tasksData[3]);
+    this.set('mock', () => {});
+    this.set('isLoading', false);
+    this.set('disabled', false);
+    this.set('defaultType', DEFAULT_TASK_TYPE);
+
+    await render(hbs`<Task::Holder
+    @task={{this.task}} 
+    @onTaskChange={{this.mock}} 
+    @onStausChange={{this.mock}} 
+    @onTaskUpdate={{this.mock}} 
+    @isLoading={{this.isLoading}} 
+    @userSelectedTask={{this.defaultType}} 
+    @disabled={{this.disabled}}
+  />`);
+
+    await waitUntil(() => find('[data-test-task-status-select]'));
+
+    const taskStatusList = this.element.querySelector(
+      '[data-test-task-status-select]'
+    );
+
+    const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
+      (key) => !(key in newTaskStatus)
+    );
+
+    for (let i = 0; i < taskStatusList.options.length; i++) {
+      const optionValue = taskStatusList.options[i].value;
+      assert.ok(updatedTaskKeys.includes(optionValue));
+    }
+  });
+
+  test('Check if UNASSIGNED and DONE is in task status options when dev is true', async function (assert) {
+    this.set('task', tasksData[3]);
+    this.set('mock', () => {});
+    this.set('isLoading', false);
+    this.set('disabled', false);
+    this.set('defaultType', DEFAULT_TASK_TYPE);
+
+    await render(hbs`<Task::Holder
+    @task={{this.task}} 
+    @onTaskChange={{this.mock}} 
+    @onStausChange={{this.mock}} 
+    @onTaskUpdate={{this.mock}} 
+    @isLoading={{this.isLoading}} 
+    @userSelectedTask={{this.defaultType}} 
+    @disabled={{this.disabled}}
+    @dev={{true}}
+  />`);
+
+    await waitUntil(() => find('[data-test-task-status-select]'));
+
+    const taskStatusList = this.element.querySelector(
+      '[data-test-task-status-select]'
+    );
+
+    const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
+      (key) => !(key in oldTaskStatus)
+    );
+
+    for (let i = 0; i < taskStatusList.options.length; i++) {
+      const optionValue = taskStatusList.options[i].value;
+      assert.ok(updatedTaskKeys.includes(optionValue));
+    }
+  });
+
+  test('Verify task status update to UNASSIGNED when dev is true', async function (assert) {
+    const testTask = tasksData[3];
+
+    testTask.status = TASK_KEYS.IN_PROGRESS;
+
+    let onTaskUpdateCalled = 0;
+
+    this.set('task', testTask);
+    this.set('onTaskUpdate', () => {
+      onTaskUpdateCalled++;
+    });
+    this.set('mock', () => {});
+    this.set('isLoading', false);
+    this.set('disabled', false);
+    this.set('defaultType', DEFAULT_TASK_TYPE);
+
+    await render(hbs`<Task::Holder
+    @task={{this.task}}
+    @onTaskUpdate={{onTaskUpdate}}
+    @onTaskChange={{this.mock}}
+    @userSelectedTask={{this.defaultType}}
+    @disabled={{this.disabled}}
+    @dev={{true}}
+  />`);
+
+    assert
+      .dom('[data-test-task-status-select]')
+      .hasValue(TASK_KEYS.IN_PROGRESS);
+
+    await select('[data-test-task-status-select]', TASK_KEYS.UNASSIGNED);
+
+    assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
+  });
+
+  test('Verify task status update to DONE when dev is true', async function (assert) {
+    const testTask = tasksData[3];
+
+    testTask.status = TASK_KEYS.IN_PROGRESS;
+
+    let onTaskUpdateCalled = 0;
+
+    this.set('task', testTask);
+    this.set('onTaskUpdate', () => {
+      onTaskUpdateCalled++;
+    });
+    this.set('mock', () => {});
+    this.set('isLoading', false);
+    this.set('disabled', false);
+    this.set('defaultType', DEFAULT_TASK_TYPE);
+
+    await render(hbs`<Task::Holder
+    @task={{this.task}}
+    @onTaskUpdate={{onTaskUpdate}}
+    @onTaskChange={{this.mock}}
+    @userSelectedTask={{this.defaultType}}
+    @disabled={{this.disabled}}
+    @dev={{true}}
+  />`);
+
+    assert
+      .dom('[data-test-task-status-select]')
+      .hasValue(TASK_KEYS.IN_PROGRESS);
+
+    await select('[data-test-task-status-select]', TASK_KEYS.DONE);
+
+    assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
+  });
 });

From e31c3ea62532faff3e85237f32db47ce32a40b98 Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 12:15:37 +0530
Subject: [PATCH 11/18] Updating test name

---
 tests/integration/components/tasks/holder-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index 5fa7b338..30aaa86e 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -248,7 +248,7 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
 
-  test('Check if UNASSIGNED and DONE is not in task status options when dev is false', async function (assert) {
+  test('Check if old task status options are displayed when dev is false', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);
@@ -281,7 +281,7 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     }
   });
 
-  test('Check if UNASSIGNED and DONE is in task status options when dev is true', async function (assert) {
+  test('Check if new task status options are displayed when dev is true', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);

From f6207151b0b9f46b381ca0486ec4185d1c6fa36b Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 17:23:18 +0530
Subject: [PATCH 12/18] Removing UNASSIGNED status from task status options

---
 app/components/task/holder.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/task/holder.hbs b/app/components/task/holder.hbs
index 4895f554..635d4d46 100644
--- a/app/components/task/holder.hbs
+++ b/app/components/task/holder.hbs
@@ -42,7 +42,7 @@
           {{#each this.availabletaskStatusList as |taskStatus|}}
             {{#if (not-eq taskStatus.key this.TASK_KEYS.ALL)}}
               {{#if @dev}}
-                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.AVAILABLE) (eq taskStatus.key this.TASK_KEYS.COMPLETED)))}}
+                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.AVAILABLE) (eq taskStatus.key this.TASK_KEYS.COMPLETED) (eq taskStatus.key this.TASK_KEYS.UNASSIGNED)))}}
                     <option
                       value={{taskStatus.key}}
                       selected={{eq taskStatus.key this.status}}

From e82b4a2ed4ec3185d2c78d89d36362527392fd07 Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 18:33:44 +0530
Subject: [PATCH 13/18] Updating tests in holder-test file

---
 app/components/task/holder.hbs                |  4 +-
 app/constants/tasks.js                        |  8 +--
 .../components/tasks/holder-test.js           | 59 ++++++++-----------
 3 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/app/components/task/holder.hbs b/app/components/task/holder.hbs
index 635d4d46..4f512be1 100644
--- a/app/components/task/holder.hbs
+++ b/app/components/task/holder.hbs
@@ -42,7 +42,7 @@
           {{#each this.availabletaskStatusList as |taskStatus|}}
             {{#if (not-eq taskStatus.key this.TASK_KEYS.ALL)}}
               {{#if @dev}}
-                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.AVAILABLE) (eq taskStatus.key this.TASK_KEYS.COMPLETED) (eq taskStatus.key this.TASK_KEYS.UNASSIGNED)))}}
+                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.AVAILABLE) (eq taskStatus.key this.TASK_KEYS.COMPLETED)))}}
                     <option
                       value={{taskStatus.key}}
                       selected={{eq taskStatus.key this.status}}
@@ -51,7 +51,7 @@
                     </option>
                 {{/if}}
               {{else}}
-                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.UNASSIGNED) (eq taskStatus.key this.TASK_KEYS.DONE)))}}
+                  {{#if (not (or (eq taskStatus.key this.TASK_KEYS.DONE)))}}
                     <option
                       value={{taskStatus.key}}
                       selected={{eq taskStatus.key this.status}}
diff --git a/app/constants/tasks.js b/app/constants/tasks.js
index 450c4dfe..5fbb8aa3 100644
--- a/app/constants/tasks.js
+++ b/app/constants/tasks.js
@@ -2,7 +2,6 @@ const TASK_KEYS = {
   ALL: 'ALL',
   AVAILABLE: 'AVAILABLE',
   ASSIGNED: 'ASSIGNED',
-  UNASSIGNED: 'UNASSIGNED',
   IN_PROGRESS: 'IN_PROGRESS',
   BLOCKED: 'BLOCKED',
   SMOKE_TESTING: 'SMOKE_TESTING',
@@ -22,7 +21,6 @@ const {
   ALL,
   AVAILABLE,
   ASSIGNED,
-  UNASSIGNED,
   IN_PROGRESS,
   BLOCKED,
   SMOKE_TESTING,
@@ -51,10 +49,6 @@ const TASK_STATUS_LIST = [
     displayLabel: 'Assigned',
     key: ASSIGNED,
   },
-  {
-    displayLabel: 'Unassigned',
-    key: UNASSIGNED,
-  },
   {
     displayLabel: 'In Progress',
     key: IN_PROGRESS,
@@ -157,4 +151,4 @@ export const TASK_PERCENTAGE = {
 export { TASK_KEYS, TASK_STATUS_LIST, TABS_TASK_STATUS_LIST };
 
 export const oldTaskStatus = { AVAILABLE: 'AVAILABLE', COMPLETED: 'COMPLETED' };
-export const newTaskStatus = { UNASSIGNED: 'UNASSIGNED', DONE: 'DONE' };
+export const newTaskStatus = { DONE: 'DONE' };
diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index 30aaa86e..63f6614c 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -248,7 +248,7 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
 
-  test('Check if old task status options are displayed when dev is false', async function (assert) {
+  test('Check if UNASSIGNED is not displayed when dev is true', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);
@@ -263,25 +263,21 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     @isLoading={{this.isLoading}} 
     @userSelectedTask={{this.defaultType}} 
     @disabled={{this.disabled}}
+    @dev={{true}}
   />`);
 
-    await waitUntil(() => find('[data-test-task-status-select]'));
-
     const taskStatusList = this.element.querySelector(
       '[data-test-task-status-select]'
     );
 
-    const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
-      (key) => !(key in newTaskStatus)
-    );
-
+    const displayedTaskStatus = [];
     for (let i = 0; i < taskStatusList.options.length; i++) {
-      const optionValue = taskStatusList.options[i].value;
-      assert.ok(updatedTaskKeys.includes(optionValue));
+      displayedTaskStatus.push(taskStatusList.options[i].textContent);
     }
+    assert.ok(!displayedTaskStatus.includes('UNASSIGNED'));
   });
 
-  test('Check if new task status options are displayed when dev is true', async function (assert) {
+  test('Check if old task status options are displayed when dev is false', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);
@@ -296,17 +292,14 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     @isLoading={{this.isLoading}} 
     @userSelectedTask={{this.defaultType}} 
     @disabled={{this.disabled}}
-    @dev={{true}}
   />`);
 
-    await waitUntil(() => find('[data-test-task-status-select]'));
-
     const taskStatusList = this.element.querySelector(
       '[data-test-task-status-select]'
     );
 
     const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
-      (key) => !(key in oldTaskStatus)
+      (key) => !(key in newTaskStatus)
     );
 
     for (let i = 0; i < taskStatusList.options.length; i++) {
@@ -315,38 +308,36 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     }
   });
 
-  test('Verify task status update to UNASSIGNED when dev is true', async function (assert) {
-    const testTask = tasksData[3];
-
-    testTask.status = TASK_KEYS.IN_PROGRESS;
-
-    let onTaskUpdateCalled = 0;
-
-    this.set('task', testTask);
-    this.set('onTaskUpdate', () => {
-      onTaskUpdateCalled++;
-    });
+  test('Check if new task status options are displayed when dev is true', async function (assert) {
+    this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);
     this.set('disabled', false);
     this.set('defaultType', DEFAULT_TASK_TYPE);
 
     await render(hbs`<Task::Holder
-    @task={{this.task}}
-    @onTaskUpdate={{onTaskUpdate}}
-    @onTaskChange={{this.mock}}
-    @userSelectedTask={{this.defaultType}}
+    @task={{this.task}} 
+    @onTaskChange={{this.mock}} 
+    @onStausChange={{this.mock}} 
+    @onTaskUpdate={{this.mock}} 
+    @isLoading={{this.isLoading}} 
+    @userSelectedTask={{this.defaultType}} 
     @disabled={{this.disabled}}
     @dev={{true}}
   />`);
 
-    assert
-      .dom('[data-test-task-status-select]')
-      .hasValue(TASK_KEYS.IN_PROGRESS);
+    const taskStatusList = this.element.querySelector(
+      '[data-test-task-status-select]'
+    );
 
-    await select('[data-test-task-status-select]', TASK_KEYS.UNASSIGNED);
+    const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
+      (key) => !(key in oldTaskStatus)
+    );
 
-    assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
+    for (let i = 0; i < taskStatusList.options.length; i++) {
+      const optionValue = taskStatusList.options[i].value;
+      assert.ok(updatedTaskKeys.includes(optionValue));
+    }
   });
 
   test('Verify task status update to DONE when dev is true', async function (assert) {

From 67d657363621204211c03d38eab4524e42d43fe3 Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 18:35:09 +0530
Subject: [PATCH 14/18] Updating tests in holder-test file

---
 .../components/tasks/holder-test.js           | 29 -------------------
 1 file changed, 29 deletions(-)

diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index 63f6614c..b270c4e4 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -248,35 +248,6 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
 
-  test('Check if UNASSIGNED is not displayed when dev is true', async function (assert) {
-    this.set('task', tasksData[3]);
-    this.set('mock', () => {});
-    this.set('isLoading', false);
-    this.set('disabled', false);
-    this.set('defaultType', DEFAULT_TASK_TYPE);
-
-    await render(hbs`<Task::Holder
-    @task={{this.task}} 
-    @onTaskChange={{this.mock}} 
-    @onStausChange={{this.mock}} 
-    @onTaskUpdate={{this.mock}} 
-    @isLoading={{this.isLoading}} 
-    @userSelectedTask={{this.defaultType}} 
-    @disabled={{this.disabled}}
-    @dev={{true}}
-  />`);
-
-    const taskStatusList = this.element.querySelector(
-      '[data-test-task-status-select]'
-    );
-
-    const displayedTaskStatus = [];
-    for (let i = 0; i < taskStatusList.options.length; i++) {
-      displayedTaskStatus.push(taskStatusList.options[i].textContent);
-    }
-    assert.ok(!displayedTaskStatus.includes('UNASSIGNED'));
-  });
-
   test('Check if old task status options are displayed when dev is false', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});

From b116a97dd3d67dc91cee256bcd3639c4695c4d65 Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Sun, 8 Oct 2023 19:00:45 +0530
Subject: [PATCH 15/18] Adding test to check if AVAILABLE is not displayed when
 dev is true

---
 .../components/tasks/holder-test.js           | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index b270c4e4..2a71a9fd 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -248,6 +248,35 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
 
+  test('Check if AVAILABLE is not displayed when dev is true', async function (assert) {
+    this.set('task', tasksData[3]);
+    this.set('mock', () => {});
+    this.set('isLoading', false);
+    this.set('disabled', false);
+    this.set('defaultType', DEFAULT_TASK_TYPE);
+
+    await render(hbs`<Task::Holder
+    @task={{this.task}} 
+    @onTaskChange={{this.mock}} 
+    @onStausChange={{this.mock}} 
+    @onTaskUpdate={{this.mock}} 
+    @isLoading={{this.isLoading}} 
+    @userSelectedTask={{this.defaultType}} 
+    @disabled={{this.disabled}}
+    @dev={{true}}
+  />`);
+
+    const taskStatusList = this.element.querySelector(
+      '[data-test-task-status-select]'
+    );
+
+    const displayedTaskStatus = [];
+    for (let i = 0; i < taskStatusList.options.length; i++) {
+      displayedTaskStatus.push(taskStatusList.options[i].value);
+    }
+    assert.ok(!displayedTaskStatus.includes('AVAILABLE'));
+  });
+
   test('Check if old task status options are displayed when dev is false', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});

From 1d94049f8d723fd82aab2075e99e89dbf5fef7e9 Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Thu, 26 Oct 2023 20:06:36 +0530
Subject: [PATCH 16/18] Adding new task status DONE to task status options

---
 app/components/task/holder.js                 |  24 +++-
 app/constants/tasks.js                        |  86 +++++++++++++-
 tests/integration/components/tasks-test.js    |   5 +
 .../components/tasks/holder-test.js           | 105 +++++++++---------
 4 files changed, 161 insertions(+), 59 deletions(-)

diff --git a/app/components/task/holder.js b/app/components/task/holder.js
index 4e058848..745cbf39 100644
--- a/app/components/task/holder.js
+++ b/app/components/task/holder.js
@@ -1,18 +1,34 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
-import { TASK_KEYS, TASK_STATUS_LIST } from 'website-my/constants/tasks';
 import { tracked } from '@glimmer/tracking';
-import { TASK_PERCENTAGE } from '../../constants/tasks';
+import {
+  TASK_KEYS,
+  TASK_STATUS_LIST,
+  TASK_KEYS_NEW,
+  TASK_STATUS_LIST_NEW,
+  TASK_PERCENTAGE,
+} from '../../constants/tasks';
+import { inject as service } from '@ember/service';
 
 export default class TasksHolderComponent extends Component {
   @tracked percentCompleted = this.args.task.percentCompleted;
   @tracked status = this.args.task.status;
   @tracked extensionFormOpened = false;
   @tracked isLoading = false;
+  @service featureFlag;
   queryParams = ['dev'];
 
-  TASK_KEYS = TASK_KEYS;
-  availabletaskStatusList = TASK_STATUS_LIST;
+  get isDevMode() {
+    return this.featureFlag.isDevMode;
+  }
+
+  get TASK_KEYS() {
+    return this.isDevMode ? TASK_KEYS_NEW : TASK_KEYS;
+  }
+
+  get availabletaskStatusList() {
+    return this.isDevMode ? TASK_STATUS_LIST_NEW : TASK_STATUS_LIST;
+  }
 
   get taskStyleClass() {
     const statusNotOverDueList = [
diff --git a/app/constants/tasks.js b/app/constants/tasks.js
index 5fbb8aa3..a0969dc9 100644
--- a/app/constants/tasks.js
+++ b/app/constants/tasks.js
@@ -17,6 +17,23 @@ const TASK_KEYS = {
   DONE: 'DONE',
 };
 
+const TASK_KEYS_NEW = {
+  ALL: 'ALL',
+  ASSIGNED: 'ASSIGNED',
+  IN_PROGRESS: 'IN_PROGRESS',
+  BLOCKED: 'BLOCKED',
+  SMOKE_TESTING: 'SMOKE_TESTING',
+  DONE: 'DONE',
+  NEEDS_REVIEW: 'NEEDS_REVIEW',
+  IN_REVIEW: 'IN_REVIEW',
+  APPROVED: 'APPROVED',
+  MERGED: 'MERGED',
+  SANITY_CHECK: 'SANITY_CHECK',
+  REGRESSION_CHECK: 'REGRESSION_CHECK',
+  RELEASED: 'RELEASED',
+  VERIFIED: 'VERIFIED',
+};
+
 const {
   ALL,
   AVAILABLE,
@@ -25,7 +42,6 @@ const {
   BLOCKED,
   SMOKE_TESTING,
   COMPLETED,
-  DONE,
   NEEDS_REVIEW,
   IN_REVIEW,
   APPROVED,
@@ -36,6 +52,8 @@ const {
   VERIFIED,
 } = TASK_KEYS;
 
+const { DONE } = TASK_KEYS_NEW;
+
 const TASK_STATUS_LIST = [
   {
     displayLabel: 'All',
@@ -99,6 +117,61 @@ const TASK_STATUS_LIST = [
   },
 ];
 
+const TASK_STATUS_LIST_NEW = [
+  {
+    displayLabel: 'All',
+    key: ALL,
+  },
+  {
+    displayLabel: 'Assigned',
+    key: ASSIGNED,
+  },
+  {
+    displayLabel: 'In Progress',
+    key: IN_PROGRESS,
+  },
+  {
+    displayLabel: 'Blocked',
+    key: BLOCKED,
+  },
+  {
+    displayLabel: 'Smoke Testing',
+    key: SMOKE_TESTING,
+  },
+  {
+    displayLabel: 'Done',
+    key: DONE,
+  },
+  {
+    displayLabel: 'Needs Review',
+    key: NEEDS_REVIEW,
+  },
+  {
+    displayLabel: 'In Review',
+    key: IN_REVIEW,
+  },
+  {
+    displayLabel: 'Approved',
+    key: APPROVED,
+  },
+  {
+    displayLabel: 'Sanity Check',
+    key: SANITY_CHECK,
+  },
+  {
+    displayLabel: 'Regression Check',
+    key: REGRESSION_CHECK,
+  },
+  {
+    displayLabel: 'Released',
+    key: RELEASED,
+  },
+  {
+    displayLabel: 'Verified',
+    key: VERIFIED,
+  },
+];
+
 const TABS_TASK_STATUS_LIST = [
   {
     displayLabel: 'All',
@@ -148,7 +221,10 @@ export const TASK_PERCENTAGE = {
   completedPercentage: '100',
 };
 
-export { TASK_KEYS, TASK_STATUS_LIST, TABS_TASK_STATUS_LIST };
-
-export const oldTaskStatus = { AVAILABLE: 'AVAILABLE', COMPLETED: 'COMPLETED' };
-export const newTaskStatus = { DONE: 'DONE' };
+export {
+  TASK_KEYS,
+  TASK_STATUS_LIST,
+  TABS_TASK_STATUS_LIST,
+  TASK_KEYS_NEW,
+  TASK_STATUS_LIST_NEW,
+};
diff --git a/tests/integration/components/tasks-test.js b/tests/integration/components/tasks-test.js
index 67f44022..4248a644 100644
--- a/tests/integration/components/tasks-test.js
+++ b/tests/integration/components/tasks-test.js
@@ -4,6 +4,7 @@ import { find, render, waitUntil, fillIn } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { tasks } from 'website-my/tests/fixtures/tasks';
 import { TASK_KEYS } from 'website-my/constants/tasks';
+import Service from '@ember/service';
 
 module('Integration | Component | tasks', function (hooks) {
   setupRenderingTest(hooks);
@@ -43,6 +44,10 @@ module('Integration | Component | tasks', function (hooks) {
 
   test('Spinner should be visible only on the current updating card', async function (assert) {
     tasks[0].status = 'IN_PROGRESS';
+    class MockFeatureFlagService extends Service {
+      isDevMode = true;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
     this.setProperties({
       onTaskChange: () => {},
       onTaskUpdate: () => {},
diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index 2a71a9fd..96e3df1e 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -4,11 +4,11 @@ import { tasks, overDueTask } from 'website-my/tests/fixtures/tasks';
 import {
   TASK_KEYS,
   TASK_STATUS_LIST,
-  oldTaskStatus,
-  newTaskStatus,
+  TASK_KEYS_NEW,
 } from 'website-my/constants/tasks';
 import { find, render, waitUntil, fillIn, select } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
+import Service from '@ember/service';
 
 module('Integration | Component | Tasks Holder', function (hooks) {
   setupRenderingTest(hooks);
@@ -27,7 +27,10 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     this.set('isLoading', false);
     this.set('disabled', false);
     this.set('defaultType', DEFAULT_TASK_TYPE);
-
+    class MockFeatureFlagService extends Service {
+      isDevMode = false;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
     await render(hbs`<Task::Holder
     @task={{this.task}} 
     @onTaskChange={{this.mock}} 
@@ -52,7 +55,10 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     this.set('isLoading', false);
     this.set('disabled', false);
     this.set('defaultType', DEFAULT_TASK_TYPE);
-
+    class MockFeatureFlagService extends Service {
+      isDevMode = false;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
     await render(hbs`<Task::Holder
     @task={{this.task}} 
     @onTaskChange={{this.mock}} 
@@ -76,7 +82,10 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     this.set('isLoading', false);
     this.set('disabled', false);
     this.set('defaultType', DEFAULT_TASK_TYPE);
-
+    class MockFeatureFlagService extends Service {
+      isDevMode = false;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
     await render(hbs`<Task::Holder
     @task={{this.task}} 
     @onTaskChange={{this.mock}} 
@@ -96,7 +105,10 @@ module('Integration | Component | Tasks Holder', function (hooks) {
   test('Render Task holder and verify style for on-time task', async function (assert) {
     const onTimeTask = tasksData[3];
     onTimeTask.startedOn = Date.now() / 1000;
-
+    class MockFeatureFlagService extends Service {
+      isDevMode = false;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
     //Current time + 5days in seconds
     onTimeTask.endsOn = (Date.now() + 1000 * 60 * 60 * 24 * 5) / 1000;
 
@@ -131,7 +143,10 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     this.set('isLoading', false);
     this.set('disabled', false);
     this.set('defaultType', DEFAULT_TASK_TYPE);
-
+    class MockFeatureFlagService extends Service {
+      isDevMode = false;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
     await render(hbs`<Task::Holder
     @task={{this.task}} 
     @onTaskChange={{this.mock}} 
@@ -155,7 +170,10 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     const testTask = tasksData[3];
     testTask.percentCompleted = '50';
     testTask.status = TASK_KEYS.IN_PROGRESS;
-
+    class MockFeatureFlagService extends Service {
+      isDevMode = false;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
     this.set('task', testTask);
     this.set('mock', () => {});
     this.set('onTaskUpdate', (taskId, error) => {
@@ -185,7 +203,10 @@ module('Integration | Component | Tasks Holder', function (hooks) {
   test('Verify values of task status upon api failures', async function (assert) {
     const testTask = tasksData[3];
     testTask.status = TASK_KEYS.IN_PROGRESS;
-
+    class MockFeatureFlagService extends Service {
+      isDevMode = false;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
     this.set('task', testTask);
     this.set('mock', () => {});
     this.set('onTaskUpdate', (taskId, error) => {
@@ -221,6 +242,10 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     testTask.status = TASK_KEYS.IN_PROGRESS;
 
     let onTaskUpdateCalled = 0;
+    class MockFeatureFlagService extends Service {
+      isDevMode = false;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
 
     this.set('task', testTask);
     this.set('onTaskUpdate', () => {
@@ -248,42 +273,16 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });
 
-  test('Check if AVAILABLE is not displayed when dev is true', async function (assert) {
-    this.set('task', tasksData[3]);
-    this.set('mock', () => {});
-    this.set('isLoading', false);
-    this.set('disabled', false);
-    this.set('defaultType', DEFAULT_TASK_TYPE);
-
-    await render(hbs`<Task::Holder
-    @task={{this.task}} 
-    @onTaskChange={{this.mock}} 
-    @onStausChange={{this.mock}} 
-    @onTaskUpdate={{this.mock}} 
-    @isLoading={{this.isLoading}} 
-    @userSelectedTask={{this.defaultType}} 
-    @disabled={{this.disabled}}
-    @dev={{true}}
-  />`);
-
-    const taskStatusList = this.element.querySelector(
-      '[data-test-task-status-select]'
-    );
-
-    const displayedTaskStatus = [];
-    for (let i = 0; i < taskStatusList.options.length; i++) {
-      displayedTaskStatus.push(taskStatusList.options[i].value);
-    }
-    assert.ok(!displayedTaskStatus.includes('AVAILABLE'));
-  });
-
   test('Check if old task status options are displayed when dev is false', async function (assert) {
     this.set('task', tasksData[3]);
     this.set('mock', () => {});
     this.set('isLoading', false);
     this.set('disabled', false);
     this.set('defaultType', DEFAULT_TASK_TYPE);
-
+    class MockFeatureFlagService extends Service {
+      isDevMode = false;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
     await render(hbs`<Task::Holder
     @task={{this.task}} 
     @onTaskChange={{this.mock}} 
@@ -298,14 +297,13 @@ module('Integration | Component | Tasks Holder', function (hooks) {
       '[data-test-task-status-select]'
     );
 
-    const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
-      (key) => !(key in newTaskStatus)
-    );
+    const oldTaskKeys = Object.keys(TASK_KEYS);
 
     for (let i = 0; i < taskStatusList.options.length; i++) {
       const optionValue = taskStatusList.options[i].value;
-      assert.ok(updatedTaskKeys.includes(optionValue));
+      assert.ok(oldTaskKeys.includes(optionValue));
     }
+    assert.equal(taskStatusList.options.length, 13);
   });
 
   test('Check if new task status options are displayed when dev is true', async function (assert) {
@@ -314,7 +312,10 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     this.set('isLoading', false);
     this.set('disabled', false);
     this.set('defaultType', DEFAULT_TASK_TYPE);
-
+    class MockFeatureFlagService extends Service {
+      isDevMode = true;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
     await render(hbs`<Task::Holder
     @task={{this.task}} 
     @onTaskChange={{this.mock}} 
@@ -330,20 +331,19 @@ module('Integration | Component | Tasks Holder', function (hooks) {
       '[data-test-task-status-select]'
     );
 
-    const updatedTaskKeys = Object.keys(TASK_KEYS).filter(
-      (key) => !(key in oldTaskStatus)
-    );
+    const newTaskKeys = Object.keys(TASK_KEYS_NEW);
 
     for (let i = 0; i < taskStatusList.options.length; i++) {
       const optionValue = taskStatusList.options[i].value;
-      assert.ok(updatedTaskKeys.includes(optionValue));
+      assert.ok(newTaskKeys.includes(optionValue));
     }
+    assert.equal(taskStatusList.options.length, 12);
   });
 
   test('Verify task status update to DONE when dev is true', async function (assert) {
     const testTask = tasksData[3];
 
-    testTask.status = TASK_KEYS.IN_PROGRESS;
+    testTask.status = TASK_KEYS_NEW.IN_PROGRESS;
 
     let onTaskUpdateCalled = 0;
 
@@ -356,6 +356,11 @@ module('Integration | Component | Tasks Holder', function (hooks) {
     this.set('disabled', false);
     this.set('defaultType', DEFAULT_TASK_TYPE);
 
+    class MockFeatureFlagService extends Service {
+      isDevMode = true;
+    }
+    this.owner.register('service:featureFlag', MockFeatureFlagService);
+
     await render(hbs`<Task::Holder
     @task={{this.task}}
     @onTaskUpdate={{onTaskUpdate}}
@@ -369,7 +374,7 @@ module('Integration | Component | Tasks Holder', function (hooks) {
       .dom('[data-test-task-status-select]')
       .hasValue(TASK_KEYS.IN_PROGRESS);
 
-    await select('[data-test-task-status-select]', TASK_KEYS.DONE);
+    await select('[data-test-task-status-select]', TASK_KEYS_NEW.DONE);
 
     assert.equal(onTaskUpdateCalled, 1, 'onTaskUpdate should be called once');
   });

From 202bfcc3a18624ee2c1646839ee6e07c0f1d5313 Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Thu, 26 Oct 2023 22:18:04 +0530
Subject: [PATCH 17/18] Update holder-test.js

---
 tests/integration/components/tasks/holder-test.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/integration/components/tasks/holder-test.js b/tests/integration/components/tasks/holder-test.js
index 96e3df1e..7218a15b 100644
--- a/tests/integration/components/tasks/holder-test.js
+++ b/tests/integration/components/tasks/holder-test.js
@@ -303,7 +303,6 @@ module('Integration | Component | Tasks Holder', function (hooks) {
       const optionValue = taskStatusList.options[i].value;
       assert.ok(oldTaskKeys.includes(optionValue));
     }
-    assert.equal(taskStatusList.options.length, 13);
   });
 
   test('Check if new task status options are displayed when dev is true', async function (assert) {
@@ -337,7 +336,6 @@ module('Integration | Component | Tasks Holder', function (hooks) {
       const optionValue = taskStatusList.options[i].value;
       assert.ok(newTaskKeys.includes(optionValue));
     }
-    assert.equal(taskStatusList.options.length, 12);
   });
 
   test('Verify task status update to DONE when dev is true', async function (assert) {

From d84b4ccac399d2b4c847f1f0d91e08012d9d41dd Mon Sep 17 00:00:00 2001
From: Chandra Reddy <77037622+chandrareddy7@users.noreply.github.com>
Date: Fri, 27 Oct 2023 19:22:50 +0530
Subject: [PATCH 18/18] Modifying task constants

---
 app/constants/tasks.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/constants/tasks.js b/app/constants/tasks.js
index 56ba382f..af78a545 100644
--- a/app/constants/tasks.js
+++ b/app/constants/tasks.js
@@ -83,10 +83,6 @@ const TASK_STATUS_LIST = [
     displayLabel: 'Completed',
     key: COMPLETED,
   },
-  {
-    displayLabel: 'Done',
-    key: DONE,
-  },
   {
     displayLabel: 'Needs Review',
     key: NEEDS_REVIEW,
@@ -142,10 +138,6 @@ const TASK_STATUS_LIST_NEW = [
     displayLabel: 'Done',
     key: DONE,
   },
-  {
-    displayLabel: 'Done',
-    key: DONE,
-  },
   {
     displayLabel: 'Needs Review',
     key: NEEDS_REVIEW,