Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix : Red Task issue #544

Merged
merged 2 commits into from
Dec 19, 2023
Merged

Bug fix : Red Task issue #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcb2df2
Bug : Fixed task red issue on my site
joyguptaa Dec 14, 2023
49958bd
Test : Added test for status conversion based on flag
joyguptaa Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions app/components/task/holder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,20 @@ export default class TasksHolderComponent extends Component {
TASK_KEYS = TASK_KEYS;
availabletaskStatusList = TASK_STATUS_LIST;

constructor() {
super(...arguments);
if (this.args.dev) {
this.status =
this.args.task.status === TASK_KEYS.COMPLETED
? TASK_KEYS.DONE
: this.args.task.status;
} else {
this.status =
this.args.task.status === TASK_KEYS.DONE
vikhyat187 marked this conversation as resolved.
Show resolved Hide resolved
? TASK_KEYS.COMPLETED
: this.args.task.status;
}
}
get taskStatusList() {
const statusToDisplay = this.availabletaskStatusList.filter(
(taskStatus) => {
Expand All @@ -35,7 +49,7 @@ export default class TasksHolderComponent extends Component {
];
if (
this.args.task.endsOn * 1000 < Date.now() &&
!statusNotOverDueList.includes(this.args.task.status)
!statusNotOverDueList.includes(this.status)
) {
return 'task-late';
} else return '';
Expand Down Expand Up @@ -85,7 +99,7 @@ export default class TasksHolderComponent extends Component {
}

get isProgressBarDisabled() {
return this.args.task.status !== TASK_KEYS.IN_PROGRESS;
return this.status !== TASK_KEYS.IN_PROGRESS;
}

@action
Expand Down
26 changes: 26 additions & 0 deletions tests/fixtures/tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,32 @@ const tasks = [
featureUrl: 'aliqua non minim',
purpose: 'quis nostrud deserunt',
},
{
id: 't5',
title: 'Task Object 1',
startedOn: 1662800000,
isNoteworthy: true,
endsOn: 1662803133,
percentCompleted: 100,
type: 'eu',
status: 'COMPLETED',
assignee: 'user1',
featureUrl: 'aliqua non minim',
purpose: 'quis nostrud deserunt',
},
{
id: 't6',
title: 'Task Object 1',
startedOn: 1662800000,
isNoteworthy: true,
endsOn: 1662803133,
percentCompleted: 100,
type: 'eu',
status: 'DONE',
assignee: 'user1',
featureUrl: 'aliqua non minim',
purpose: 'quis nostrud deserunt',
},
];

const overDueTask = {
Expand Down
46 changes: 46 additions & 0 deletions tests/integration/components/tasks/holder-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,4 +300,50 @@ module('Integration | Component | Tasks Holder', function (hooks) {
assert.dom('[data-test-task-status-select]').exists();
assert.dom('[data-test-dropdown-option=Done]').hasText('Done');
});

test('Render Task holder and check if COMPLETED status is being converted to DONE in dev mode', async function (assert) {
this.set('task', tasksData[4]);
this.set('mock', () => {});
this.set('isLoading', false);
this.set('disabled', false);
this.set('defaultType', DEFAULT_TASK_TYPE);
this.set('dev', true);

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={{this.dev}}
/>`);

assert.dom('[data-test-task-status-select]').exists();
assert.dom('[data-test-dropdown-option=Done]').hasText('Done');
});

test('Render Task holder and check if DONE status is being converted to COMPLETED without dev mode', async function (assert) {
this.set('task', tasksData[5]);
this.set('mock', () => {});
this.set('isLoading', false);
this.set('disabled', false);
this.set('defaultType', DEFAULT_TASK_TYPE);
this.set('dev', false);

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={{this.dev}}
/>`);

assert.dom('[data-test-task-status-select]').exists();
assert.dom('[data-test-dropdown-option=Completed]').hasText('Completed');
});
});
Loading