feat(enhanced-kanban): add task assignees and labels fetching with improved filter management
- Implemented async thunks to fetch task assignees and labels for enhanced Kanban board. - Updated state management to store original and current data for task assignees and labels. - Enhanced filter selection actions to update both original and current data seamlessly. - Integrated filter data loader for improved user experience in task management.
This commit is contained in:
shancds
@@ -30,6 +30,8 @@ import {
|
||||
setDragState,
|
||||
reorderTasks,
|
||||
reorderGroups,
|
||||
fetchEnhancedKanbanTaskAssignees,
|
||||
fetchEnhancedKanbanLabels,
|
||||
} from '@/features/enhanced-kanban/enhanced-kanban.slice';
|
||||
import EnhancedKanbanGroup from './EnhancedKanbanGroup';
|
||||
import EnhancedKanbanTaskCard from './EnhancedKanbanTaskCard';
|
||||
@@ -46,6 +48,7 @@ import { IGroupBy } from '@/features/enhanced-kanban/enhanced-kanban.slice';
|
||||
import EnhancedKanbanCreateSection from './EnhancedKanbanCreateSection';
|
||||
import ImprovedTaskFilters from '../task-management/improved-task-filters';
|
||||
import { fetchStatusesCategories } from '@/features/taskAttributes/taskStatusSlice';
|
||||
import { useFilterDataLoader } from '@/hooks/useFilterDataLoader';
|
||||
|
||||
// Import the TaskListFilters component
|
||||
const TaskListFilters = React.lazy(() => import('@/pages/projects/projectView/taskList/task-list-filters/task-list-filters'));
|
||||
@@ -68,6 +71,10 @@ const EnhancedKanbanBoard: React.FC<EnhancedKanbanBoardProps> = ({ projectId, cl
|
||||
const groupBy = useSelector((state: RootState) => state.enhancedKanbanReducer.groupBy);
|
||||
const project = useAppSelector((state: RootState) => state.projectReducer.project);
|
||||
const { statusCategories, status: existingStatuses } = useAppSelector((state) => state.taskStatusReducer);
|
||||
|
||||
// Load filter data
|
||||
useFilterDataLoader();
|
||||
|
||||
// Local state for drag overlay
|
||||
const [activeTask, setActiveTask] = useState<any>(null);
|
||||
const [activeGroup, setActiveGroup] = useState<any>(null);
|
||||
@@ -86,6 +93,9 @@ const EnhancedKanbanBoard: React.FC<EnhancedKanbanBoardProps> = ({ projectId, cl
|
||||
useEffect(() => {
|
||||
if (projectId) {
|
||||
dispatch(fetchEnhancedKanbanGroups(projectId) as any);
|
||||
// Load filter data for enhanced kanban
|
||||
dispatch(fetchEnhancedKanbanTaskAssignees(projectId) as any);
|
||||
dispatch(fetchEnhancedKanbanLabels(projectId) as any);
|
||||
}
|
||||
if (!statusCategories.length) {
|
||||
dispatch(fetchStatusesCategories() as any);
|
||||
|
||||
@@ -42,8 +42,20 @@ import {
|
||||
setPriorities as setKanbanPriorities,
|
||||
setMembers as setKanbanMembers,
|
||||
fetchEnhancedKanbanGroups,
|
||||
setSelectedPriorities as setKanbanSelectedPriorities,
|
||||
setBoardSearch as setKanbanBoardSearch,
|
||||
setTaskAssigneeSelection,
|
||||
setLabelSelection,
|
||||
} from '@/features/enhanced-kanban/enhanced-kanban.slice';
|
||||
|
||||
// Board slice imports for compatibility
|
||||
import {
|
||||
setBoardSearch,
|
||||
setBoardPriorities,
|
||||
setBoardMembers,
|
||||
setBoardLabels,
|
||||
} from '@/features/board/board-slice';
|
||||
|
||||
// Performance constants
|
||||
const FILTER_DEBOUNCE_DELAY = 300; // ms
|
||||
const SEARCH_DEBOUNCE_DELAY = 500; // ms
|
||||
@@ -60,6 +72,10 @@ const selectFilterData = createSelector(
|
||||
(state: any) => state.taskReducer.taskAssignees,
|
||||
(state: any) => state.boardReducer.taskAssignees,
|
||||
(state: any) => state.projectReducer.project,
|
||||
// Enhanced kanban data - use original data for filter options
|
||||
(state: any) => state.enhancedKanbanReducer.originalTaskAssignees,
|
||||
(state: any) => state.enhancedKanbanReducer.originalLabels,
|
||||
(state: any) => state.enhancedKanbanReducer.priorities,
|
||||
],
|
||||
(
|
||||
priorities,
|
||||
@@ -69,7 +85,10 @@ const selectFilterData = createSelector(
|
||||
boardLabels,
|
||||
taskAssignees,
|
||||
boardAssignees,
|
||||
project
|
||||
project,
|
||||
kanbanOriginalTaskAssignees,
|
||||
kanbanOriginalLabels,
|
||||
kanbanPriorities
|
||||
) => ({
|
||||
priorities: priorities || [],
|
||||
taskPriorities: taskPriorities || [],
|
||||
@@ -80,6 +99,10 @@ const selectFilterData = createSelector(
|
||||
boardAssignees: boardAssignees || [],
|
||||
project,
|
||||
selectedPriorities: taskPriorities || [], // Use taskReducer.priorities as selected priorities
|
||||
// Enhanced kanban data - use original data for filter options
|
||||
kanbanTaskAssignees: kanbanOriginalTaskAssignees || [],
|
||||
kanbanLabels: kanbanOriginalLabels || [],
|
||||
kanbanPriorities: kanbanPriorities || [],
|
||||
})
|
||||
);
|
||||
|
||||
@@ -160,11 +183,15 @@ const useFilterData = (position: 'board' | 'list'): FilterSection[] => {
|
||||
const currentLabels = kanbanState.labels || [];
|
||||
const currentAssignees = kanbanState.taskAssignees || [];
|
||||
const groupByValue = kanbanState.groupBy || 'status';
|
||||
|
||||
// Get priorities from the project or use empty array as fallback
|
||||
const projectPriorities = (kanbanProject as any)?.priorities || [];
|
||||
|
||||
return [
|
||||
{
|
||||
id: 'priority',
|
||||
label: 'Priority',
|
||||
options: (kanbanProject?.priorities || []).map((p: any) => ({
|
||||
options: filterData.priorities.map((p: any) => ({
|
||||
value: p.id,
|
||||
label: p.name,
|
||||
color: p.color_code,
|
||||
@@ -181,7 +208,7 @@ const useFilterData = (position: 'board' | 'list'): FilterSection[] => {
|
||||
multiSelect: true,
|
||||
searchable: true,
|
||||
selectedValues: currentAssignees.filter((m: any) => m.selected && m.id).map((m: any) => m.id || ''),
|
||||
options: currentAssignees.map((assignee: any) => ({
|
||||
options: filterData.kanbanTaskAssignees.map((assignee: any) => ({
|
||||
id: assignee.id || '',
|
||||
label: assignee.name || '',
|
||||
value: assignee.id || '',
|
||||
@@ -196,7 +223,7 @@ const useFilterData = (position: 'board' | 'list'): FilterSection[] => {
|
||||
multiSelect: true,
|
||||
searchable: true,
|
||||
selectedValues: currentLabels.filter((l: any) => l.selected && l.id).map((l: any) => l.id || ''),
|
||||
options: currentLabels.map((label: any) => ({
|
||||
options: filterData.kanbanLabels.map((label: any) => ({
|
||||
id: label.id || '',
|
||||
label: label.name || '',
|
||||
value: label.id || '',
|
||||
@@ -214,7 +241,7 @@ const useFilterData = (position: 'board' | 'list'): FilterSection[] => {
|
||||
options: [
|
||||
{ id: 'status', label: t('statusText'), value: 'status' },
|
||||
{ id: 'priority', label: t('priorityText'), value: 'priority' },
|
||||
{ id: 'phase', label: kanbanProject?.phase_label || t('phaseText'), value: 'phase' },
|
||||
{ id: 'phase', label: (kanbanProject as any)?.phase_label || t('phaseText'), value: 'phase' },
|
||||
],
|
||||
},
|
||||
];
|
||||
@@ -397,11 +424,10 @@ const FilterDropdown: React.FC<{
|
||||
value={searchTerm}
|
||||
onChange={e => setSearchTerm(e.target.value)}
|
||||
placeholder={`Search ${section.label.toLowerCase()}...`}
|
||||
className={`w-full pl-8 pr-2 py-1 rounded border focus:outline-none focus:ring-2 focus:ring-blue-500 transition-colors duration-150 ${
|
||||
isDarkMode
|
||||
? 'bg-gray-700 text-gray-100 placeholder-gray-400 border-gray-600'
|
||||
: 'bg-white text-gray-900 placeholder-gray-400 border-gray-300'
|
||||
}`}
|
||||
className={`w-full pl-8 pr-2 py-1 rounded border focus:outline-none focus:ring-2 focus:ring-blue-500 transition-colors duration-150 ${isDarkMode
|
||||
? 'bg-gray-700 text-gray-100 placeholder-gray-400 border-gray-600'
|
||||
: 'bg-white text-gray-900 placeholder-gray-400 border-gray-300'
|
||||
}`}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -520,9 +546,8 @@ const SearchFilter: React.FC<{
|
||||
{!isExpanded ? (
|
||||
<button
|
||||
onClick={handleToggle}
|
||||
className={`inline-flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-medium rounded-md border transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-1 ${themeClasses.buttonBg} ${themeClasses.buttonBorder} ${themeClasses.buttonText} ${
|
||||
themeClasses.containerBg === 'bg-gray-800' ? 'focus:ring-offset-gray-900' : 'focus:ring-offset-white'
|
||||
}`}
|
||||
className={`inline-flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-medium rounded-md border transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-1 ${themeClasses.buttonBg} ${themeClasses.buttonBorder} ${themeClasses.buttonText} ${themeClasses.containerBg === 'bg-gray-800' ? 'focus:ring-offset-gray-900' : 'focus:ring-offset-white'
|
||||
}`}
|
||||
>
|
||||
<SearchOutlined className="w-3.5 h-3.5" />
|
||||
<span>Search</span>
|
||||
@@ -537,11 +562,10 @@ const SearchFilter: React.FC<{
|
||||
value={localValue}
|
||||
onChange={(e) => setLocalValue(e.target.value)}
|
||||
placeholder={placeholder}
|
||||
className={`w-full pr-4 pl-8 py-1 rounded border focus:outline-none focus:ring-2 focus:ring-blue-500 transition-colors duration-150 ${
|
||||
isDarkMode
|
||||
? 'bg-gray-700 text-gray-100 placeholder-gray-400 border-gray-600'
|
||||
: 'bg-white text-gray-900 placeholder-gray-400 border-gray-300'
|
||||
}`}
|
||||
className={`w-full pr-4 pl-8 py-1 rounded border focus:outline-none focus:ring-2 focus:ring-blue-500 transition-colors duration-150 ${isDarkMode
|
||||
? 'bg-gray-700 text-gray-100 placeholder-gray-400 border-gray-600'
|
||||
: 'bg-white text-gray-900 placeholder-gray-400 border-gray-300'
|
||||
}`}
|
||||
/>
|
||||
{localValue && (
|
||||
<button
|
||||
@@ -588,7 +612,7 @@ const FieldsDropdown: React.FC<{ themeClasses: any; isDarkMode: boolean }> = ({
|
||||
createDebouncedFunction((fieldsToSave: typeof fields) => {
|
||||
localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(fieldsToSave));
|
||||
}, 300),
|
||||
[]);
|
||||
[]);
|
||||
|
||||
useEffect(() => {
|
||||
debouncedSaveFields(fields);
|
||||
@@ -706,6 +730,9 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
const currentTaskAssignees = useAppSelector(state => state.taskReducer.taskAssignees);
|
||||
const currentTaskLabels = useAppSelector(state => state.taskReducer.labels);
|
||||
|
||||
// Enhanced Kanban state
|
||||
const kanbanState = useAppSelector((state: RootState) => state.enhancedKanbanReducer);
|
||||
|
||||
// Use the filter data loader hook
|
||||
useFilterDataLoader();
|
||||
|
||||
@@ -782,7 +809,7 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
if (projectView === 'list') {
|
||||
dispatch(setSearch(value));
|
||||
} else {
|
||||
dispatch(setBoardSearch(value));
|
||||
dispatch(setKanbanSearch(value));
|
||||
}
|
||||
|
||||
// Trigger task refetch with new search value
|
||||
@@ -830,17 +857,42 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
return;
|
||||
}
|
||||
if (sectionId === 'assignees') {
|
||||
dispatch(setKanbanTaskAssignees(
|
||||
// Map to {id, selected, ...}
|
||||
values.map(id => ({ id, selected: true }))
|
||||
));
|
||||
// Update individual assignee selections using the new action
|
||||
const currentAssignees = kanbanState.taskAssignees || [];
|
||||
const currentSelectedIds = currentAssignees.filter((m: any) => m.selected).map((m: any) => m.id);
|
||||
|
||||
// First, clear all selections
|
||||
currentAssignees.forEach((assignee: any) => {
|
||||
if (assignee.selected) {
|
||||
dispatch(setTaskAssigneeSelection({ id: assignee.id, selected: false }));
|
||||
}
|
||||
});
|
||||
|
||||
// Then set the new selections
|
||||
values.forEach(id => {
|
||||
dispatch(setTaskAssigneeSelection({ id, selected: true }));
|
||||
});
|
||||
|
||||
dispatch(fetchEnhancedKanbanGroups(projectId));
|
||||
return;
|
||||
}
|
||||
if (sectionId === 'labels') {
|
||||
dispatch(setKanbanLabels(
|
||||
values.map(id => ({ id, selected: true }))
|
||||
));
|
||||
// Update individual label selections using the new action
|
||||
const currentLabels = kanbanState.labels || [];
|
||||
const currentSelectedIds = currentLabels.filter((l: any) => l.selected).map((l: any) => l.id);
|
||||
|
||||
// First, clear all selections
|
||||
currentLabels.forEach((label: any) => {
|
||||
if (label.selected) {
|
||||
dispatch(setLabelSelection({ id: label.id, selected: false }));
|
||||
}
|
||||
});
|
||||
|
||||
// Then set the new selections
|
||||
values.forEach(id => {
|
||||
dispatch(setLabelSelection({ id, selected: true }));
|
||||
});
|
||||
|
||||
dispatch(fetchEnhancedKanbanGroups(projectId));
|
||||
return;
|
||||
}
|
||||
@@ -852,7 +904,7 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
return;
|
||||
}
|
||||
if (sectionId === 'priority') {
|
||||
dispatch(setSelectedPriorities(values));
|
||||
dispatch(setPriorities(values));
|
||||
dispatch(fetchTasksV3(projectId));
|
||||
return;
|
||||
}
|
||||
@@ -876,7 +928,7 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
}
|
||||
|
||||
}
|
||||
}, [dispatch, projectId, position, currentTaskAssignees, currentTaskLabels]);
|
||||
}, [dispatch, projectId, position, currentTaskAssignees, currentTaskLabels, kanbanState]);
|
||||
|
||||
const handleSearchChange = useCallback((value: string) => {
|
||||
setSearchValue(value);
|
||||
@@ -886,10 +938,14 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
|
||||
if (position === 'board') {
|
||||
dispatch(setKanbanSearch(value));
|
||||
dispatch(fetchEnhancedKanbanGroups(projectId));
|
||||
if (projectId) {
|
||||
dispatch(fetchEnhancedKanbanGroups(projectId));
|
||||
}
|
||||
} else {
|
||||
// Use debounced search
|
||||
debouncedSearchChangeRef.current?.(projectId, value);
|
||||
if (projectId) {
|
||||
debouncedSearchChangeRef.current?.(projectId, value);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -928,7 +984,7 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
if (projectView === 'list') {
|
||||
dispatch(setSearch(''));
|
||||
} else {
|
||||
dispatch(setBoardSearch(''));
|
||||
dispatch(setKanbanBoardSearch(''));
|
||||
}
|
||||
|
||||
// Clear label filters
|
||||
@@ -955,7 +1011,9 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
// Use a short timeout to batch Redux state updates before API call
|
||||
// This ensures all filter state is updated before the API call
|
||||
setTimeout(() => {
|
||||
dispatch(fetchTasksV3(projectId));
|
||||
if (projectId) {
|
||||
dispatch(fetchTasksV3(projectId));
|
||||
}
|
||||
// Reset loading state after API call is initiated
|
||||
setTimeout(() => setClearingFilters(false), 100);
|
||||
}, 0);
|
||||
@@ -969,7 +1027,9 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
setShowArchived(!showArchived);
|
||||
if (position === 'board') {
|
||||
dispatch(setKanbanArchived(!showArchived));
|
||||
dispatch(fetchEnhancedKanbanGroups(projectId));
|
||||
if (projectId) {
|
||||
dispatch(fetchEnhancedKanbanGroups(projectId));
|
||||
}
|
||||
} else {
|
||||
// ... existing logic ...
|
||||
}
|
||||
@@ -1021,13 +1081,12 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
<button
|
||||
onClick={clearAllFilters}
|
||||
disabled={clearingFilters}
|
||||
className={`text-xs font-medium transition-colors duration-150 ${
|
||||
clearingFilters
|
||||
? 'text-gray-400 cursor-not-allowed'
|
||||
: isDarkMode
|
||||
? 'text-blue-400 hover:text-blue-300'
|
||||
: 'text-blue-600 hover:text-blue-700'
|
||||
}`}
|
||||
className={`text-xs font-medium transition-colors duration-150 ${clearingFilters
|
||||
? 'text-gray-400 cursor-not-allowed'
|
||||
: isDarkMode
|
||||
? 'text-blue-400 hover:text-blue-300'
|
||||
: 'text-blue-600 hover:text-blue-700'
|
||||
}`}
|
||||
>
|
||||
{clearingFilters ? 'Clearing...' : 'Clear all'}
|
||||
</button>
|
||||
@@ -1041,11 +1100,10 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
type="checkbox"
|
||||
checked={showArchived}
|
||||
onChange={toggleArchived}
|
||||
className={`w-3.5 h-3.5 text-blue-600 rounded focus:ring-blue-500 transition-colors duration-150 ${
|
||||
isDarkMode
|
||||
? 'border-gray-600 bg-gray-700 focus:ring-offset-gray-800'
|
||||
: 'border-gray-300 bg-white focus:ring-offset-white'
|
||||
}`}
|
||||
className={`w-3.5 h-3.5 text-blue-600 rounded focus:ring-blue-500 transition-colors duration-150 ${isDarkMode
|
||||
? 'border-gray-600 bg-gray-700 focus:ring-offset-gray-800'
|
||||
: 'border-gray-300 bg-white focus:ring-offset-white'
|
||||
}`}
|
||||
/>
|
||||
<span className={`text-xs ${themeClasses.optionText}`}>
|
||||
Show archived
|
||||
@@ -1072,17 +1130,21 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
if (projectId) {
|
||||
// Cancel pending search and immediately clear
|
||||
debouncedSearchChangeRef.current?.cancel();
|
||||
if (projectView === 'list') {
|
||||
dispatch(setSearch(''));
|
||||
if (position === 'board') {
|
||||
dispatch(setKanbanSearch(''));
|
||||
dispatch(fetchEnhancedKanbanGroups(projectId));
|
||||
} else {
|
||||
dispatch(setBoardSearch(''));
|
||||
if (projectView === 'list') {
|
||||
dispatch(setSearch(''));
|
||||
} else {
|
||||
dispatch(setKanbanBoardSearch(''));
|
||||
}
|
||||
dispatch(fetchTasksV3(projectId));
|
||||
}
|
||||
dispatch(fetchTasksV3(projectId));
|
||||
}
|
||||
}}
|
||||
className={`ml-1 rounded-full p-0.5 transition-colors duration-150 ${
|
||||
isDarkMode ? 'hover:bg-blue-800' : 'hover:bg-blue-200'
|
||||
}`}
|
||||
className={`ml-1 rounded-full p-0.5 transition-colors duration-150 ${isDarkMode ? 'hover:bg-blue-800' : 'hover:bg-blue-200'
|
||||
}`}
|
||||
>
|
||||
<CloseOutlined className="w-2.5 h-2.5" />
|
||||
</button>
|
||||
@@ -1121,9 +1183,8 @@ const ImprovedTaskFilters: React.FC<ImprovedTaskFiltersProps> = ({
|
||||
const newValues = section.selectedValues.filter(v => v !== value);
|
||||
handleSelectionChange(section.id, newValues);
|
||||
}}
|
||||
className={`ml-1 rounded-full p-0.5 transition-colors duration-150 ${
|
||||
isDarkMode ? 'hover:bg-gray-600' : 'hover:bg-gray-200'
|
||||
}`}
|
||||
className={`ml-1 rounded-full p-0.5 transition-colors duration-150 ${isDarkMode ? 'hover:bg-gray-600' : 'hover:bg-gray-200'
|
||||
}`}
|
||||
>
|
||||
<CloseOutlined className="w-2.5 h-2.5" />
|
||||
</button>
|
||||
|
||||
@@ -13,6 +13,7 @@ import { ITaskStatusViewModel } from '@/types/tasks/taskStatusGetResponse.types'
|
||||
import { ITaskListStatusChangeResponse } from '@/types/tasks/task-list-status.types';
|
||||
import { ITaskListPriorityChangeResponse } from '@/types/tasks/task-list-priority.types';
|
||||
import { ITaskLabelFilter } from '@/types/tasks/taskLabel.types';
|
||||
import { labelsApiService } from '@/api/taskAttributes/labels/labels.api.service';
|
||||
|
||||
export enum IGroupBy {
|
||||
STATUS = 'status',
|
||||
@@ -55,7 +56,11 @@ interface EnhancedKanbanState {
|
||||
loadingGroups: boolean;
|
||||
error: string | null;
|
||||
|
||||
// Filters
|
||||
// Filters - Original data (should not be filtered)
|
||||
originalTaskAssignees: ITaskListMemberFilter[];
|
||||
originalLabels: ITaskLabelFilter[];
|
||||
|
||||
// Filters - Current filtered data
|
||||
taskAssignees: ITaskListMemberFilter[];
|
||||
loadingAssignees: boolean;
|
||||
statuses: ITaskStatusViewModel[];
|
||||
@@ -102,6 +107,8 @@ const initialState: EnhancedKanbanState = {
|
||||
taskGroups: [],
|
||||
loadingGroups: false,
|
||||
error: null,
|
||||
originalTaskAssignees: [],
|
||||
originalLabels: [],
|
||||
taskAssignees: [],
|
||||
loadingAssignees: false,
|
||||
statuses: [],
|
||||
@@ -155,7 +162,6 @@ export const fetchEnhancedKanbanGroups = createAsyncThunk(
|
||||
try {
|
||||
const state = getState() as { enhancedKanbanReducer: EnhancedKanbanState };
|
||||
const { enhancedKanbanReducer } = state;
|
||||
|
||||
const selectedMembers = enhancedKanbanReducer.taskAssignees
|
||||
.filter(member => member.selected)
|
||||
.map(member => member.id)
|
||||
@@ -317,6 +323,40 @@ export const fetchBoardSubTasks = createAsyncThunk(
|
||||
}
|
||||
);
|
||||
|
||||
// Async thunk for loading task assignees
|
||||
export const fetchEnhancedKanbanTaskAssignees = createAsyncThunk(
|
||||
'enhancedKanban/fetchTaskAssignees',
|
||||
async (projectId: string, { rejectWithValue }) => {
|
||||
try {
|
||||
const response = await tasksApiService.fetchTaskAssignees(projectId);
|
||||
return response.body;
|
||||
} catch (error) {
|
||||
logger.error('Fetch Enhanced Kanban Task Assignees', error);
|
||||
if (error instanceof Error) {
|
||||
return rejectWithValue(error.message);
|
||||
}
|
||||
return rejectWithValue('Failed to fetch task assignees');
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
// Async thunk for loading labels
|
||||
export const fetchEnhancedKanbanLabels = createAsyncThunk(
|
||||
'enhancedKanban/fetchLabels',
|
||||
async (projectId: string, { rejectWithValue }) => {
|
||||
try {
|
||||
const response = await labelsApiService.getPriorityByProject(projectId);
|
||||
return response.body;
|
||||
} catch (error) {
|
||||
logger.error('Fetch Enhanced Kanban Labels', error);
|
||||
if (error instanceof Error) {
|
||||
return rejectWithValue(error.message);
|
||||
}
|
||||
return rejectWithValue('Failed to fetch project labels');
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
const enhancedKanbanSlice = createSlice({
|
||||
name: 'enhancedKanbanReducer',
|
||||
initialState,
|
||||
@@ -407,6 +447,38 @@ const enhancedKanbanSlice = createSlice({
|
||||
state.members = action.payload;
|
||||
},
|
||||
|
||||
// New actions for filter selection that work with original data
|
||||
setTaskAssigneeSelection: (state, action: PayloadAction<{ id: string; selected: boolean }>) => {
|
||||
const { id, selected } = action.payload;
|
||||
// Update both original and current data
|
||||
state.originalTaskAssignees = state.originalTaskAssignees.map(assignee =>
|
||||
assignee.id === id ? { ...assignee, selected } : assignee
|
||||
);
|
||||
state.taskAssignees = state.originalTaskAssignees;
|
||||
},
|
||||
|
||||
setLabelSelection: (state, action: PayloadAction<{ id: string; selected: boolean }>) => {
|
||||
const { id, selected } = action.payload;
|
||||
// Update both original and current data
|
||||
state.originalLabels = state.originalLabels.map(label =>
|
||||
label.id === id ? { ...label, selected } : label
|
||||
);
|
||||
state.labels = state.originalLabels;
|
||||
},
|
||||
|
||||
// Add missing actions for filter compatibility
|
||||
setSelectedPriorities: (state, action: PayloadAction<string[]>) => {
|
||||
state.priorities = action.payload;
|
||||
},
|
||||
|
||||
setBoardSearch: (state, action: PayloadAction<string | null>) => {
|
||||
state.search = action.payload;
|
||||
},
|
||||
|
||||
setBoardArchived: (state, action: PayloadAction<boolean>) => {
|
||||
state.archived = action.payload;
|
||||
},
|
||||
|
||||
// Status updates
|
||||
updateTaskStatus: (state, action: PayloadAction<ITaskListStatusChangeResponse>) => {
|
||||
const { id: task_id, status_id } = action.payload;
|
||||
@@ -562,6 +634,38 @@ const enhancedKanbanSlice = createSlice({
|
||||
|
||||
// Update column order
|
||||
state.columnOrder = reorderedGroups.map(group => group.id);
|
||||
})
|
||||
// Fetch Task Assignees
|
||||
.addCase(fetchEnhancedKanbanTaskAssignees.pending, (state) => {
|
||||
state.loadingAssignees = true;
|
||||
state.error = null;
|
||||
})
|
||||
.addCase(fetchEnhancedKanbanTaskAssignees.fulfilled, (state, action) => {
|
||||
state.loadingAssignees = false;
|
||||
// Store original data and current data
|
||||
state.originalTaskAssignees = action.payload;
|
||||
state.taskAssignees = action.payload;
|
||||
})
|
||||
.addCase(fetchEnhancedKanbanTaskAssignees.rejected, (state, action) => {
|
||||
state.loadingAssignees = false;
|
||||
state.error = action.payload as string;
|
||||
})
|
||||
// Fetch Labels
|
||||
.addCase(fetchEnhancedKanbanLabels.pending, (state) => {
|
||||
state.loadingLabels = true;
|
||||
state.error = null;
|
||||
})
|
||||
.addCase(fetchEnhancedKanbanLabels.fulfilled, (state, action) => {
|
||||
state.loadingLabels = false;
|
||||
// Transform labels to include selected property
|
||||
const newLabels = action.payload.map((label: any) => ({ ...label, selected: false }));
|
||||
// Store original data and current data
|
||||
state.originalLabels = newLabels;
|
||||
state.labels = newLabels;
|
||||
})
|
||||
.addCase(fetchEnhancedKanbanLabels.rejected, (state, action) => {
|
||||
state.loadingLabels = false;
|
||||
state.error = action.payload as string;
|
||||
});
|
||||
},
|
||||
});
|
||||
@@ -584,6 +688,11 @@ export const {
|
||||
setLabels,
|
||||
setPriorities,
|
||||
setMembers,
|
||||
setTaskAssigneeSelection,
|
||||
setLabelSelection,
|
||||
setSelectedPriorities,
|
||||
setBoardSearch,
|
||||
setBoardArchived,
|
||||
updateTaskStatus,
|
||||
updateTaskPriority,
|
||||
deleteTask,
|
||||
|
||||
Reference in New Issue
Block a user