Skip to content

Commit 805160b

Browse files
authored
Merge pull request #63 from cortex-reply/fix/tasks
fix: applies fix on reminders
2 parents f7c4c84 + d0ba5c7 commit 805160b

1 file changed

Lines changed: 19 additions & 8 deletions

File tree

src/components/Projects/TasksView.tsx

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -738,13 +738,9 @@ const ReminderCard: React.FC<{
738738
<div className="flex items-center space-x-4 text-sm text-muted-foreground">
739739
<div className="flex items-center space-x-1">
740740
<Calendar className="h-4 w-4" />
741-
{/* <span
742-
className={
743-
overdue && !reminder.isCompleted ? 'text-destructive font-medium' : ''
744-
}
745-
>
741+
<span className={overdue ? 'text-destructive font-medium' : ''}>
746742
{getDateLabel()}
747-
</span> */}
743+
</span>
748744
</div>
749745

750746
{reminder.dueTime && (
@@ -756,7 +752,11 @@ const ReminderCard: React.FC<{
756752

757753
<div className="flex items-center space-x-1">
758754
<User className="h-4 w-4" />
759-
{/* <span>{reminder.colleague?.name || 'Unknown Colleague'}</span> */}
755+
<span>
756+
{typeof reminder.assignedColleague !== 'number'
757+
? reminder.assignedColleague.name
758+
: 'Unknown Colleague'}
759+
</span>
760760
</div>
761761
</div>
762762

@@ -805,10 +805,21 @@ export const TasksView: React.FC<TasksViewProps> = ({
805805
onDeleteReminder,
806806
}) => {
807807
const [reminders, setReminders] = useState<Reminder[]>(initialReminders.filter(Boolean))
808-
const [colleagues] = useState<DigitalColleague[]>(initialColleagues.filter(Boolean))
808+
const [colleagues, setColleagues] = useState<DigitalColleague[]>(
809+
initialColleagues.filter(Boolean),
810+
)
809811
const [filter, setFilter] = useState<'all' | 'pending' | 'completed' | 'overdue' | 'today'>('all')
810812
const [searchTerm, setSearchTerm] = useState('')
811813
const [openAddReminderModal, setOpenAddReminderModal] = useState(false)
814+
815+
useEffect(() => {
816+
setReminders(initialReminders.filter(Boolean))
817+
}, [initialReminders])
818+
819+
useEffect(() => {
820+
setColleagues(initialColleagues.filter(Boolean))
821+
}, [initialColleagues])
822+
812823
const handleAddReminder = (newReminder: Omit<Reminder, 'id' | 'createdAt'>) => {
813824
// Validate that the reminder has required properties
814825
if (!newReminder.title) {

0 commit comments

Comments
 (0)