Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add visibility condition for timesheet and limit counter to 100+ #3383

Merged
merged 2 commits into from
Nov 30, 2024
Merged

Add visibility condition for timesheet and limit counter to 100+ #3383

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4b2324
Add visibility condition for timesheet and limit counter to 100+
Innocent-Akim Nov 29, 2024
78de16e
fix: CodeRabbit
Innocent-Akim Nov 29, 2024
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
15 changes: 15 additions & 0 deletions apps/web/app/[locale]/timesheet/[memberId]/components/TimeSheetFilterPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { SettingFilterIcon } from '@/assets/svg';
import { useTranslations } from 'next-intl';
import { clsxm } from '@/app/utils';
import { useTimelogFilterOptions } from '@/app/hooks';
import { useTimesheet } from '@/app/hooks/features/useTimesheet';

export const TimeSheetFilterPopover = React.memo(function TimeSheetFilterPopover() {
const [shouldRemoveItems, setShouldRemoveItems] = React.useState(false);
Expand All @@ -16,12 +17,17 @@ export const TimeSheetFilterPopover = React.memo(function TimeSheetFilterPopover
const t = useTranslations();
const { setEmployeeState, setProjectState, setStatusState, setTaskState, employee, project, statusState, task } =
useTimelogFilterOptions();
const { timesheet, statusTimesheet } = useTimesheet({})

React.useEffect(() => {
if (shouldRemoveItems) {
setShouldRemoveItems(false);
}
}, [shouldRemoveItems]);
const totalItems = React.useMemo(() => {
if (!statusTimesheet) return 0;
return Object.values(statusTimesheet).reduce((sum, status) => sum + status.length, 0);
}, [statusTimesheet]);

return (
<>
Expand All @@ -33,6 +39,15 @@ export const TimeSheetFilterPopover = React.memo(function TimeSheetFilterPopover
>
<SettingFilterIcon className="text-gray-700 dark:text-white w-3.5" strokeWidth="1.8" />
<span className="text-gray-700 dark:text-white">{t('common.FILTER')}</span>
{timesheet && timesheet.length > 0 && (
<span
role="status"
aria-label={`${totalItems} items filtered`}
className="rounded-full bg-primary dark:bg-primary-light h-7 w-7 flex items-center justify-center text-white text-center text-[12px]"
>
{totalItems > 100 ? "100+" : totalItems}
</span>
)}
</Button>
</PopoverTrigger>
<PopoverContent className="w-96">
Expand Down