Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 16 additions & 14 deletions backend/utils/tw/edit_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,24 @@ func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID st
}

// Handle tags

output, err := utils.ExecCommandForOutputInDir(tempDir, "task", taskID, "export")
if err == nil {
var tasks []map[string]interface{}
if err := json.Unmarshal(output, &tasks); err == nil && len(tasks) > 0 {
if existingTags, ok := tasks[0]["tags"].([]interface{}); ok {
for _, tag := range existingTags {
if tagStr, ok := tag.(string); ok {
utils.ExecCommand("task", taskID, "modify", "-"+tagStr)
}
}
}
}
}

if len(tags) > 0 {
for _, tag := range tags {
if strings.HasPrefix(tag, "+") {
// Add tag
tagValue := strings.TrimPrefix(tag, "+")
if err := utils.ExecCommand("task", taskID, "modify", "+"+tagValue); err != nil {
return fmt.Errorf("failed to add tag %s: %v", tagValue, err)
}
} else if strings.HasPrefix(tag, "-") {
// Remove tag
tagValue := strings.TrimPrefix(tag, "-")
if err := utils.ExecCommand("task", taskID, "modify", "-"+tagValue); err != nil {
return fmt.Errorf("failed to remove tag %s: %v", tagValue, err)
}
} else {
// Add tag without prefix
if tag != "" {
if err := utils.ExecCommand("task", taskID, "modify", "+"+tag); err != nil {
return fmt.Errorf("failed to add tag %s: %v", tag, err)
}
Expand Down
54 changes: 7 additions & 47 deletions frontend/src/components/HomeComponents/Tasks/AddTaskDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ import {
SelectValue,
} from '@/components/ui/select';
import { AddTaskDialogProps } from '@/components/utils/types';
import { MultiSelect } from './MultiSelect';
import { format } from 'date-fns';

export const AddTaskdialog = ({
isOpen,
setIsOpen,
newTask,
setNewTask,
tagInput,
setTagInput,
onSubmit,
isCreatingNewProject,
setIsCreatingNewProject,
uniqueProjects = [],
uniqueTags = [],
allTasks = [],
}: AddTaskDialogProps) => {
const [annotationInput, setAnnotationInput] = useState('');
Expand Down Expand Up @@ -102,20 +102,6 @@ export const AddTaskdialog = ({
});
};

const handleAddTag = () => {
if (tagInput && !newTask.tags.includes(tagInput, 0)) {
setNewTask({ ...newTask, tags: [...newTask.tags, tagInput] });
setTagInput('');
}
};

const handleRemoveTag = (tagToRemove: string) => {
setNewTask({
...newTask,
tags: newTask.tags.filter((tag) => tag !== tagToRemove),
});
};

return (
<Dialog open={isOpen} onOpenChange={setIsOpen}>
<DialogTrigger asChild>
Expand Down Expand Up @@ -417,40 +403,14 @@ export const AddTaskdialog = ({
Tags
</Label>
<div className="col-span-6">
<Input
id="tags"
name="tags"
placeholder="Add a tag"
value={tagInput}
onChange={(e) => setTagInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && handleAddTag()}
required
className="col-span-6"
<MultiSelect
availableItems={uniqueTags}
selectedItems={newTask.tags}
onItemsChange={(tags) => setNewTask({ ...newTask, tags })}
placeholder="Select or create tags"
/>
</div>
</div>

<div className="mt-2">
{newTask.tags.length > 0 && (
<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>
<div className="grid grid-cols-8 items-center gap-4">
<Label htmlFor="annotations" className="text-right col-span-2">
Annotation
Expand Down
199 changes: 199 additions & 0 deletions frontend/src/components/HomeComponents/Tasks/MultiSelect.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
import { useState, useRef, useEffect } from 'react';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { MultiSelectProps } from '@/components/utils/types';
import { ChevronDown, Plus, Check, X } from 'lucide-react';
import { getFilteredItems, shouldShowCreateOption } from './multi-select-utils';

export const MultiSelect = ({
availableItems,
selectedItems,
onItemsChange,
placeholder = 'Select or create items',
disabled = false,
className = '',
showActions = false,
onSave,
onCancel,
}: MultiSelectProps) => {
const [isOpen, setIsOpen] = useState(false);
const [searchTerm, setSearchTerm] = useState('');
const dropdownRef = useRef<HTMLDivElement>(null);
const inputRef = useRef<HTMLInputElement>(null);

useEffect(() => {
const handleClickOutside = (event: MouseEvent) => {
if (
dropdownRef.current &&
!dropdownRef.current.contains(event.target as Node)
) {
setIsOpen(false);
setSearchTerm('');
}
};

document.addEventListener('mousedown', handleClickOutside);
return () => document.removeEventListener('mousedown', handleClickOutside);
}, []);

const filteredItems = getFilteredItems(
availableItems,
selectedItems,
searchTerm
);

const handleItemSelect = (item: string) => {
if (!selectedItems.includes(item)) {
onItemsChange([...selectedItems, item]);
}
setSearchTerm('');
};

const handleItemRemove = (itemToRemove: string) => {
onItemsChange(selectedItems.filter((item) => item !== itemToRemove));
};

const handleNewItemCreate = () => {
const trimmedTerm = searchTerm.trim();
if (
trimmedTerm &&
!selectedItems.includes(trimmedTerm) &&
!availableItems.includes(trimmedTerm)
) {
onItemsChange([...selectedItems, trimmedTerm]);
setSearchTerm('');
}
};

const handleKeyDown = (e: React.KeyboardEvent) => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe extract this and other functions to the utils file

if (e.key === 'Enter') {
e.preventDefault();
if (searchTerm.trim()) {
if (filteredItems.length > 0) {
handleItemSelect(filteredItems[0]);
} else {
handleNewItemCreate();
}
}
} else if (e.key === 'Escape') {
setIsOpen(false);
setSearchTerm('');
}
};

const showCreate = shouldShowCreateOption(
searchTerm,
availableItems,
selectedItems
);

return (
<div className={`relative ${className}`} ref={dropdownRef}>
<Button
type="button"
variant="outline"
onClick={() => setIsOpen(!isOpen)}
disabled={disabled}
className="w-full justify-between text-left font-normal"
aria-label="Select items"
>
<span className="truncate">
{selectedItems.length > 0
? `${selectedItems.length} item${selectedItems.length > 1 ? 's' : ''} selected`
: placeholder}
</span>
<ChevronDown className="h-4 w-4 opacity-50" />
</Button>

{selectedItems.length > 0 && (
<div className="flex flex-wrap items-center gap-2 mt-2">
{selectedItems.map((item) => (
<Badge key={item} className="flex items-center gap-1">
<span>{item}</span>
<button
type="button"
onClick={() => handleItemRemove(item)}
className="ml-1 text-red-500 hover:text-red-700 text-xs"
disabled={disabled}
aria-label={`Remove ${item}`}
>
</button>
</Badge>
))}
{showActions && onSave && onCancel && (
<div className="flex items-center gap-1 whitespace-nowrap">
<Button
type="button"
variant="ghost"
size="icon"
onClick={onSave}
className="h-8 w-8"
aria-label="Save items"
>
<Check className="h-4 w-4 text-green-500" />
</Button>
<Button
type="button"
variant="ghost"
size="icon"
onClick={onCancel}
className="h-8 w-8"
aria-label="Cancel"
>
<X className="h-4 w-4 text-red-500" />
</Button>
</div>
)}
</div>
)}

{isOpen && (
<div className="absolute z-50 w-full mt-1 bg-background border border-border rounded-md shadow-lg max-h-60 overflow-hidden">
<div className="p-2 border-b">
<Input
ref={inputRef}
value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)}
onKeyDown={handleKeyDown}
placeholder="Search or create..."
className="h-8"
autoFocus
/>
</div>

<div className="max-h-40 overflow-y-auto">
{filteredItems.map((item) => (
<div
key={item}
className="px-3 py-2 cursor-pointer hover:bg-accent transition-colors"
onClick={() => handleItemSelect(item)}
>
<span className="text-sm">{item}</span>
</div>
))}

{showCreate && (
<div
className="flex items-center gap-2 px-3 py-2 cursor-pointer hover:bg-accent transition-colors border-t"
onClick={handleNewItemCreate}
>
<Plus className="h-4 w-4 text-muted-foreground" />
<span className="flex-1 text-sm">
Create "{searchTerm.trim()}"
</span>
</div>
)}

{filteredItems.length === 0 && !showCreate && (
<div className="px-3 py-2 text-sm text-muted-foreground text-center">
No items found
</div>
)}
</div>
</div>
)}
</div>
);
};
Loading
Loading