bo/worklenz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release-v2.1.4' of https://github.com/Worklenz/worklenz into feature/team-utilization

Browse Source
This commit is contained in:
chamikaJ
2025-07-30 12:56:56 +05:30
parent 9dfc1fa375 5cce3bc613
commit 9da6dced01
173 changed files with 12856 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
worklenz-frontend/src/features/account-setup/account-setup.slice.ts
View File

@@ -1,4 +1,5 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
import { IAccountSetupSurveyData } from '@/types/account-setup/survey.types';
interface Task {
id: number;
@@ -17,6 +18,8 @@ interface AccountSetupState {
tasks: Task[];
teamMembers: Email[];
currentStep: number;
surveyData: IAccountSetupSurveyData;
surveySubStep: number;
}
const initialState: AccountSetupState = {
@@ -26,6 +29,8 @@ const initialState: AccountSetupState = {
tasks: [{ id: 0, value: '' }],
teamMembers: [{ id: 0, value: '' }],
currentStep: 0,
surveyData: {},
surveySubStep: 0,
};
const accountSetupSlice = createSlice({
@@ -50,6 +55,16 @@ const accountSetupSlice = createSlice({
setCurrentStep: (state, action: PayloadAction<number>) => {
state.currentStep = action.payload;
},
setSurveyData: (state, action: PayloadAction<Partial<IAccountSetupSurveyData>>) => {
state.surveyData = { ...state.surveyData, ...action.payload };
},
setSurveySubStep: (state, action: PayloadAction<number>) => {
state.surveySubStep = action.payload;
},
resetSurveyData: (state) => {
state.surveyData = {};
state.surveySubStep = 0;
},
resetAccountSetup: () => initialState,
},
});
@@ -61,6 +76,9 @@ export const {
setTasks,
setTeamMembers,
setCurrentStep,
setSurveyData,
setSurveySubStep,
resetSurveyData,
resetAccountSetup,
} = accountSetupSlice.actions;

2
worklenz-frontend/src/features/enhanced-kanban/enhanced-kanban.slice.ts
View File

@@ -575,7 +575,6 @@ const enhancedKanbanSlice = createSlice({
action: PayloadAction<ITaskListPriorityChangeResponse>
) => {
const { id, priority_id, color_code, color_code_dark } = action.payload;
// Find the task in any group
const taskInfo = findTaskInAllGroups(state.taskGroups, id);
if (!taskInfo || !priority_id) return;
@@ -603,7 +602,6 @@ const enhancedKanbanSlice = createSlice({
// Update cache
state.taskCache[id] = task;
},
// Enhanced Kanban assignee update (for use in task drawer dropdown)
updateEnhancedKanbanTaskAssignees: (
state,

59
worklenz-frontend/src/features/home-page/user-activity.slice.ts Normal file
View File

@@ -0,0 +1,59 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
import { ActivityFeedType } from '@/types/home/user-activity.types';
interface ActivityItem {
id: string;
type: string;
description: string;
timestamp: string;
}
interface UserActivityState {
activeTab: ActivityFeedType;
activities: ActivityItem[];
loading: boolean;
error: string | null;
}
const initialState: UserActivityState = {
activeTab: ActivityFeedType.TIME_LOGGED_TASKS,
activities: [],
loading: false,
error: null,
};
const userActivitySlice = createSlice({
name: 'userActivity',
initialState,
reducers: {
setActiveTab(state, action: PayloadAction<ActivityFeedType>) {
state.activeTab = action.payload;
},
fetchActivitiesStart(state) {
state.loading = true;
state.error = null;
},
fetchActivitiesSuccess(state, action: PayloadAction<ActivityItem[]>) {
state.activities = action.payload;
state.loading = false;
state.error = null;
},
fetchActivitiesFailure(state, action: PayloadAction<string>) {
state.loading = false;
state.error = action.payload;
},
clearActivities(state) {
state.activities = [];
},
},
});
export const {
setActiveTab,
fetchActivitiesStart,
fetchActivitiesSuccess,
fetchActivitiesFailure,
clearActivities,
} = userActivitySlice.actions;
export default userActivitySlice.reducer;

4
worklenz-frontend/src/features/navbar/navbar.tsx
View File

@@ -153,8 +153,8 @@ const Navbar = () => {
<Flex align="center">
<SwitchTeamButton />
<NotificationButton />
{/* <TimerButton /> */}
<HelpButton />
<TimerButton />
{/* <HelpButton /> */}
<ProfileButton isOwnerOrAdmin={isOwnerOrAdmin} />
</Flex>
</Flex>

25
worklenz-frontend/src/features/navbar/timers/timer-button.tsx
View File

@@ -17,7 +17,7 @@ import { useAppDispatch } from '@/hooks/useAppDispatch';
import { useSocket } from '@/socket/socketContext';
import { SocketEvents } from '@/shared/socket-events';
import { updateTaskTimeTracking } from '@/features/tasks/tasks.slice';
import moment from 'moment';
import { format, differenceInSeconds, isValid, parseISO } from 'date-fns';
const { Text } = Typography;
const { useToken } = theme;
@@ -70,17 +70,17 @@ const TimerButton = () => {
try {
if (!timer || !timer.task_id || !timer.start_time) return;
const startTime = moment(timer.start_time);
if (!startTime.isValid()) {
const startTime = parseISO(timer.start_time);
if (!isValid(startTime)) {
logError(`Invalid start time for timer ${timer.task_id}: ${timer.start_time}`);
return;
}
const now = moment();
const duration = moment.duration(now.diff(startTime));
const hours = Math.floor(duration.asHours());
const minutes = duration.minutes();
const seconds = duration.seconds();
const now = new Date();
const totalSeconds = differenceInSeconds(now, startTime);
const hours = Math.floor(totalSeconds / 3600);
const minutes = Math.floor((totalSeconds % 3600) / 60);
const seconds = totalSeconds % 60;
newTimes[timer.task_id] =
`${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
} catch (error) {
@@ -96,12 +96,7 @@ const TimerButton = () => {
useEffect(() => {
fetchRunningTimers();
// Set up polling to refresh timers every 30 seconds
const pollInterval = setInterval(() => {
fetchRunningTimers();
}, 30000);
return () => clearInterval(pollInterval);
// Removed periodic polling - rely on socket events for real-time updates
}, [fetchRunningTimers]);
useEffect(() => {
@@ -283,7 +278,7 @@ const TimerButton = () => {
<Text type="secondary" style={{ fontSize: 11 }}>
Started:{' '}
{timer.start_time
? moment(timer.start_time).format('HH:mm')
? format(parseISO(timer.start_time), 'HH:mm')
: '--:--'}
</Text>
<Text

10
worklenz-frontend/src/features/projects/singleProject/members/projectMembersSlice.ts
View File

@@ -8,6 +8,7 @@ interface ProjectMembersState {
currentMembersList: IMentionMemberViewModel[];
isDrawerOpen: boolean;
isLoading: boolean;
isFromAssigner: boolean;
error: string | null;
}
@@ -16,6 +17,7 @@ const initialState: ProjectMembersState = {
currentMembersList: [],
isDrawerOpen: false,
isLoading: false,
isFromAssigner: false,
error: null,
};
@@ -89,6 +91,12 @@ const projectMembersSlice = createSlice({
reducers: {
toggleProjectMemberDrawer: state => {
state.isDrawerOpen = !state.isDrawerOpen;
if (state.isDrawerOpen === false) {
state.isFromAssigner = false;
}
},
setIsFromAssigner: (state, action: PayloadAction<boolean>) => {
state.isFromAssigner = action.payload;
},
},
extraReducers: builder => {
@@ -139,7 +147,7 @@ const projectMembersSlice = createSlice({
},
});
export const { toggleProjectMemberDrawer } = projectMembersSlice.actions;
export const { toggleProjectMemberDrawer, setIsFromAssigner } = projectMembersSlice.actions;
export {
getProjectMembers,
getAllProjectMembers,

62
worklenz-frontend/src/features/reporting/projectReports/projectReportsDrawer/ProjectReportsDrawer.tsx
View File

@@ -1,5 +1,5 @@
import { Drawer, Typography, Flex, Button, Dropdown } from '@/shared/antd-imports';
import React, { useState } from 'react';
import React, { useState, useCallback } from 'react';
import { useAppSelector } from '../../../../hooks/useAppSelector';
import { useAppDispatch } from '../../../../hooks/useAppDispatch';
import { setSelectedProject, toggleProjectReportsDrawer } from '../project-reports-slice';
@@ -8,6 +8,8 @@ import ProjectReportsDrawerTabs from './ProjectReportsDrawerTabs';
import { colors } from '../../../../styles/colors';
import { useTranslation } from 'react-i18next';
import { IRPTProject } from '@/types/reporting/reporting.types';
import { useAuthService } from '../../../../hooks/useAuth';
import { reportingExportApiService } from '@/api/reporting/reporting-export.api.service';
type ProjectReportsDrawerProps = {
selectedProject: IRPTProject | null;
@@ -17,6 +19,8 @@ const ProjectReportsDrawer = ({ selectedProject }: ProjectReportsDrawerProps) =>
const { t } = useTranslation('reporting-projects-drawer');
const dispatch = useAppDispatch();
const currentSession = useAuthService().getCurrentSession();
const [exporting, setExporting] = useState<boolean>(false);
// get drawer open state and project list from the reducer
const isDrawerOpen = useAppSelector(
@@ -35,6 +39,54 @@ const ProjectReportsDrawer = ({ selectedProject }: ProjectReportsDrawerProps) =>
}
};
// Export handlers
const handleExportMembers = useCallback(() => {
if (!selectedProject?.id) return;
try {
setExporting(true);
const teamName = currentSession?.team_name || 'Team';
reportingExportApiService.exportProjectMembers(
selectedProject.id,
selectedProject.name,
teamName
);
} catch (error) {
console.error('Error exporting project members:', error);
} finally {
setExporting(false);
}
}, [selectedProject, currentSession?.team_name]);
const handleExportTasks = useCallback(() => {
if (!selectedProject?.id) return;
try {
setExporting(true);
const teamName = currentSession?.team_name || 'Team';
reportingExportApiService.exportProjectTasks(
selectedProject.id,
selectedProject.name,
teamName
);
} catch (error) {
console.error('Error exporting project tasks:', error);
} finally {
setExporting(false);
}
}, [selectedProject, currentSession?.team_name]);
const handleExportClick = useCallback((key: string) => {
switch (key) {
case '1':
handleExportMembers();
break;
case '2':
handleExportTasks();
break;
default:
break;
}
}, [handleExportMembers, handleExportTasks]);
return (
<Drawer
open={isDrawerOpen}
@@ -56,9 +108,15 @@ const ProjectReportsDrawer = ({ selectedProject }: ProjectReportsDrawerProps) =>
{ key: '1', label: t('membersButton') },
{ key: '2', label: t('tasksButton') },
],
onClick: ({ key }) => handleExportClick(key),
}}
>
<Button type="primary" icon={<DownOutlined />} iconPosition="end">
<Button
type="primary"
loading={exporting}
icon={<DownOutlined />}
iconPosition="end"
>
{t('exportButton')}
</Button>
</Dropdown>

32
worklenz-frontend/src/features/task-management/task-management.slice.ts
View File

@@ -70,6 +70,9 @@ const initialState: TaskManagementState = {
loadingColumns: false,
columns: [],
customColumns: [],
// Add sort-related state
sortField: '',
sortOrder: 'ASC',
};
// Async thunk to fetch tasks from API
@@ -239,12 +242,16 @@ export const fetchTasksV3 = createAsyncThunk(
// Get archived state from task management slice
const archivedState = state.taskManagement.archived;
// Get sort state from task management slice
const sortField = state.taskManagement.sortField;
const sortOrder = state.taskManagement.sortOrder;
const config: ITaskListConfigV2 = {
id: projectId,
archived: archivedState,
group: currentGrouping || '',
field: '',
order: '',
field: sortField,
order: sortOrder,
search: searchValue,
statuses: '',
members: selectedAssignees,
@@ -763,6 +770,16 @@ const taskManagementSlice = createSlice({
toggleArchived: state => {
state.archived = !state.archived;
},
setSortField: (state, action: PayloadAction<string>) => {
state.sortField = action.payload;
},
setSortOrder: (state, action: PayloadAction<'ASC' | 'DESC'>) => {
state.sortOrder = action.payload;
},
setSort: (state, action: PayloadAction<{ field: string; order: 'ASC' | 'DESC' }>) => {
state.sortField = action.payload.field;
state.sortOrder = action.payload.order;
},
resetTaskManagement: state => {
state.loading = false;
state.error = null;
@@ -771,6 +788,8 @@ const taskManagementSlice = createSlice({
state.selectedPriorities = [];
state.search = '';
state.archived = false;
state.sortField = '';
state.sortOrder = 'ASC';
state.ids = [];
state.entities = {};
},
@@ -1160,6 +1179,9 @@ export const {
setSearch,
setArchived,
toggleArchived,
setSortField,
setSortOrder,
setSort,
resetTaskManagement,
toggleTaskExpansion,
addSubtaskToParent,
@@ -1192,8 +1214,10 @@ export const selectError = (state: RootState) => state.taskManagement.error;
export const selectSelectedPriorities = (state: RootState) =>
state.taskManagement.selectedPriorities;
export const selectSearch = (state: RootState) => state.taskManagement.search;
export const selectSubtaskLoading = (state: RootState, taskId: string) =>
state.taskManagement.loadingSubtasks[taskId] || false;
export const selectSortField = (state: RootState) => state.taskManagement.sortField;
export const selectSortOrder = (state: RootState) => state.taskManagement.sortOrder;
export const selectSort = (state: RootState) => ({ field: state.taskManagement.sortField, order: state.taskManagement.sortOrder });
export const selectSubtaskLoading = (state: RootState, taskId: string) => state.taskManagement.loadingSubtasks[taskId] || false;
// Memoized selectors to prevent unnecessary re-renders
export const selectTasksByStatus = createSelector(