Skip to content

feat: enhance tag editing functionality in task component #208

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

Merged
its-me-abhishek merged 4 commits into from
Nov 21, 2025
Merged

feat: enhance tag editing functionality in task component #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94fd6a4
feat: enhance tag editing functionality in task component
ParthKshirsagar Nov 18, 2025
a13e4ce
Merge branch 'main' into main
ParthKshirsagar7 Nov 19, 2025
ed6470a
add tests for tag editing functionality in task dialog
ParthKshirsagar Nov 19, 2025
267b304
fix prettier issues
ParthKshirsagar Nov 20, 2025
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
155 changes: 111 additions & 44 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ export const Tasks = (
const [editedTags, setEditedTags] = useState<string[]>(
_selectedTask?.tags || []
);
const [editTagInput, setEditTagInput] = useState<string>('');
const [isEditingTags, setIsEditingTags] = useState(false);
const [isEditingPriority, setIsEditingPriority] = useState(false);
const [editedPriority, setEditedPriority] = useState('NONE');
Expand Down Expand Up @@ -550,6 +551,14 @@ export const Tasks = (
}
};

// Handle adding a tag while editing
const handleAddEditTag = () => {
if (editTagInput && !editedTags.includes(editTagInput, 0)) {
setEditedTags([...editedTags, editTagInput]);
setEditTagInput('');
}
};

// Handle removing a tag
const handleRemoveTag = (tagToRemove: string) => {
setNewTask({
Expand All @@ -558,6 +567,11 @@ export const Tasks = (
});
};

// Handle removing a tag while editing task
const handleRemoveEditTag = (tagToRemove: string) => {
setEditedTags(editedTags.filter((tag) => tag !== tagToRemove));
};

const sortWithOverdueOnTop = (tasks: Task[]) => {
return [...tasks].sort((a, b) => {
const aOverdue = a.status === 'pending' && isOverdue(a.due);
Expand Down Expand Up @@ -631,6 +645,7 @@ export const Tasks = (
);

setIsEditingTags(false); // Exit editing mode
setEditTagInput(''); // Reset edit tag input
};

const handleCancelTags = () => {
Expand Down Expand Up @@ -911,19 +926,22 @@ export const Tasks = (

<div className="mt-2">
{newTask.tags.length > 0 && (
<div className="flex flex-wrap gap-2">
{newTask.tags.map((tag, index) => (
<Badge key={index}>
<span>{tag}</span>
<button
type="button"
className="ml-2 text-red-500"
onClick={() => handleRemoveTag(tag)}
>
✖
</button>
</Badge>
))}
<div className="grid grid-cols-4 items-center">
<div> </div>
<div className="flex flex-wrap gap-2 col-span-3">
{newTask.tags.map((tag, index) => (
<Badge key={index}>
<span>{tag}</span>
<button
type="button"
className="ml-2 text-red-500"
onClick={() => handleRemoveTag(tag)}
>
✖
</button>
</Badge>
))}
</div>
</div>
)}
</div>
Expand Down Expand Up @@ -1561,45 +1579,94 @@ export const Tasks = (
<TableCell>Tags:</TableCell>
<TableCell>
{isEditingTags ? (
<div className="flex items-center">
<Input
type="text"
value={editedTags.join(', ')}
onChange={(e) =>
setEditedTags(
e.target.value
.split(',')
.map((tag) => tag.trim())
)
}
className="flex-grow mr-2"
/>
<Button
variant="ghost"
size="icon"
onClick={() =>
handleSaveTags(task)
}
>
<CheckIcon className="h-4 w-4 text-green-500" />
</Button>
<Button
variant="ghost"
size="icon"
onClick={handleCancelTags}
>
<XIcon className="h-4 w-4 text-red-500" />
</Button>
<div>
<div className="flex items-center w-full">
<Input
type="text"
value={editTagInput}
onChange={(e) => {
// For allowing only alphanumeric characters
if (
e.target.value.length > 1
) {
/^[a-zA-Z0-9]*$/.test(
e.target.value.trim()
)
? setEditTagInput(
e.target.value.trim()
)
: '';
} else {
/^[a-zA-Z]*$/.test(
e.target.value.trim()
)
? setEditTagInput(
e.target.value.trim()
)
: '';
}
}}
placeholder="Add a tag (press enter to add)"
className="flex-grow mr-2"
onKeyDown={(e) =>
e.key === 'Enter' &&
handleAddEditTag()
}
/>
<Button
variant="ghost"
size="icon"
onClick={() =>
handleSaveTags(task)
}
>
<CheckIcon className="h-4 w-4 text-green-500" />
</Button>
<Button
variant="ghost"
size="icon"
onClick={handleCancelTags}
>
<XIcon className="h-4 w-4 text-red-500" />
</Button>
</div>
<div className="mt-2">
{editedTags != null &&
editedTags.length > 0 && (
<div>
<div className="flex flex-wrap gap-2 col-span-3">
{editedTags.map(
(tag, index) => (
<Badge key={index}>
<span>{tag}</span>
<button
type="button"
className="ml-2 text-red-500"
onClick={() =>
handleRemoveEditTag(
tag
)
}
>
✖
</button>
</Badge>
)
)}
</div>
</div>
)}
</div>
</div>
) : (
<div className="flex items-center">
<div className="flex items-center flex-wrap">
{task.tags !== null &&
task.tags.length >= 1 ? (
task.tags.map((tag, index) => (
<Badge
key={index}
variant="secondary"
className="mr-2"
className="mr-2 mt-1"
>
<Tag className="pr-3" />
{tag}
Expand Down
113 changes: 112 additions & 1 deletion frontend/src/components/HomeComponents/Tasks/__tests__/Tasks.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { render, screen, fireEvent } from '@testing-library/react';
import { render, screen, fireEvent, within } from '@testing-library/react';
import { Tasks } from '../Tasks';

// Mock props for the Tasks component
Expand Down Expand Up @@ -146,6 +146,117 @@ describe('Tasks Component', () => {
expect(screen.getByTestId('current-page')).toHaveTextContent('1');
});

test('shows tags as badges in task dialog and allows editing (add on Enter)', async () => {
render(<Tasks {...mockProps} />);

expect(await screen.findByText('Task 1')).toBeInTheDocument();

const taskRow = screen.getByText('Task 1');
fireEvent.click(taskRow);

expect(await screen.findByText('Tags:')).toBeInTheDocument();

expect(screen.getByText('tag1')).toBeInTheDocument();

const tagsLabel = screen.getByText('Tags:');
const tagsRow = tagsLabel.closest('tr') as HTMLElement;
const pencilButton = within(tagsRow).getByRole('button');
fireEvent.click(pencilButton);

const editInput = await screen.findByPlaceholderText(
'Add a tag (press enter to add)'
);

fireEvent.change(editInput, { target: { value: 'newtag' } });
fireEvent.keyDown(editInput, { key: 'Enter', code: 'Enter' });

expect(await screen.findByText('newtag')).toBeInTheDocument();

expect((editInput as HTMLInputElement).value).toBe('');
});

test('adds a tag while editing and saves updated tags to backend', async () => {
render(<Tasks {...mockProps} />);

expect(await screen.findByText('Task 1')).toBeInTheDocument();

const taskRow = screen.getByText('Task 1');
fireEvent.click(taskRow);

expect(await screen.findByText('Tags:')).toBeInTheDocument();

const tagsLabel = screen.getByText('Tags:');
const tagsRow = tagsLabel.closest('tr') as HTMLElement;
const pencilButton = within(tagsRow).getByRole('button');
fireEvent.click(pencilButton);

const editInput = await screen.findByPlaceholderText(
'Add a tag (press enter to add)'
);

fireEvent.change(editInput, { target: { value: 'addedtag' } });
fireEvent.keyDown(editInput, { key: 'Enter', code: 'Enter' });

expect(await screen.findByText('addedtag')).toBeInTheDocument();

const actionContainer = editInput.parentElement as HTMLElement;
const actionButtons = within(actionContainer).getAllByRole('button');
fireEvent.click(actionButtons[0]);

const hooks = require('../hooks');
expect(hooks.editTaskOnBackend).toHaveBeenCalled();

const callArg = hooks.editTaskOnBackend.mock.calls[0][0];
expect(callArg.tags).toEqual(expect.arrayContaining(['tag1', 'addedtag']));
});

test('removes a tag while editing and saves updated tags to backend', async () => {
render(<Tasks {...mockProps} />);

expect(await screen.findByText('Task 1')).toBeInTheDocument();

const taskRow = screen.getByText('Task 1');
fireEvent.click(taskRow);

expect(await screen.findByText('Tags:')).toBeInTheDocument();

const tagsLabel = screen.getByText('Tags:');
const tagsRow = tagsLabel.closest('tr') as HTMLElement;
const pencilButton = within(tagsRow).getByRole('button');
fireEvent.click(pencilButton);

const editInput = await screen.findByPlaceholderText(
'Add a tag (press enter to add)'
);

fireEvent.change(editInput, { target: { value: 'newtag' } });
fireEvent.keyDown(editInput, { key: 'Enter', code: 'Enter' });

expect(await screen.findByText('newtag')).toBeInTheDocument();

const tagBadge = screen.getByText('tag1');
const badgeContainer = (tagBadge.closest('div') ||
tagBadge.parentElement) as HTMLElement;

const removeButton = within(badgeContainer).getByText('✖');
fireEvent.click(removeButton);

expect(screen.queryByText('tag2')).not.toBeInTheDocument();

const actionContainer = editInput.parentElement as HTMLElement;

const actionButtons = within(actionContainer).getAllByRole('button');

fireEvent.click(actionButtons[0]);

const hooks = require('../hooks');
expect(hooks.editTaskOnBackend).toHaveBeenCalled();

const callArg = hooks.editTaskOnBackend.mock.calls[0][0];

expect(callArg.tags).toEqual(expect.arrayContaining(['newtag', '-tag1']));
});

test('shows red background on task ID and Overdue badge for overdue tasks', async () => {
render(<Tasks {...mockProps} />);

Expand Down
Loading