diff --git a/worklenz-frontend/src/components/home-tasks/statusDropdown/home-tasks-status-dropdown.tsx b/worklenz-frontend/src/components/home-tasks/statusDropdown/home-tasks-status-dropdown.tsx index bc75016d..f3595e99 100644 --- a/worklenz-frontend/src/components/home-tasks/statusDropdown/home-tasks-status-dropdown.tsx +++ b/worklenz-frontend/src/components/home-tasks/statusDropdown/home-tasks-status-dropdown.tsx @@ -21,10 +21,10 @@ const HomeTasksStatusDropdown = ({ task, teamId }: HomeTasksStatusDropdownProps) const { socket, connected } = useSocket(); const { homeTasksConfig } = useAppSelector(state => state.homePageReducer); const { - refetch - } = useGetMyTasksQuery(homeTasksConfig, { - skip: true // Skip automatic queries entirely - }); + refetch + } = useGetMyTasksQuery(homeTasksConfig, { + skip: false, // Ensure this query runs + }); const [selectedStatus, setSelectedStatus] = useState(undefined); diff --git a/worklenz-frontend/src/components/home-tasks/taskDatePicker/home-tasks-date-picker.tsx b/worklenz-frontend/src/components/home-tasks/taskDatePicker/home-tasks-date-picker.tsx index 604cbce5..857458ff 100644 --- a/worklenz-frontend/src/components/home-tasks/taskDatePicker/home-tasks-date-picker.tsx +++ b/worklenz-frontend/src/components/home-tasks/taskDatePicker/home-tasks-date-picker.tsx @@ -23,14 +23,14 @@ const HomeTasksDatePicker = ({ record }: HomeTasksDatePickerProps) => { const { t } = useTranslation('home'); const { homeTasksConfig } = useAppSelector(state => state.homePageReducer); const { refetch } = useGetMyTasksQuery(homeTasksConfig, { - skip: true // Skip automatic queries entirely + skip: false }); - + // Use useMemo to avoid re-renders when record.end_date is the same - const initialDate = useMemo(() => + const initialDate = useMemo(() => record.end_date ? dayjs(record.end_date) : null - , [record.end_date]); - + , [record.end_date]); + const [selectedDate, setSelectedDate] = useState(initialDate); // Update selected date when record changes diff --git a/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx b/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx index bd2f605a..cc36de1a 100644 --- a/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx +++ b/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx @@ -89,7 +89,7 @@ const TasksList: React.FC = React.memo(() => { dispatch(getTeamMembers({ index: 0, size: 100, field: null, order: null, search: null, all: true })); }, [dispatch]); - const handleSelectTask = useCallback((task : IMyTask) => { + const handleSelectTask = useCallback((task: IMyTask) => { dispatch(setSelectedTaskId(task.id || '')); dispatch(fetchTask({ taskId: task.id || '', projectId: task.project_id || '' })); dispatch(setProjectId(task.project_id || '')); @@ -155,7 +155,7 @@ const TasksList: React.FC = React.memo(() => { render: (_, record) => { return ( - + {record.project_name} @@ -271,10 +271,10 @@ const TasksList: React.FC = React.memo(() => { columns={columns as TableProps['columns']} size="middle" rowClassName={() => 'custom-row-height'} - loading={homeTasksFetching && !skipAutoRefetch} + loading={homeTasksFetching && skipAutoRefetch} pagination={false} /> - +