Skip to content
Merged
37 changes: 22 additions & 15 deletions apps/customer-portal/webapp/src/api/useSearchProjectTimeCards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
// specific language governing permissions and limitations
// under the License.

import { useQuery, type UseQueryResult } from "@tanstack/react-query";
import {
useInfiniteQuery,
type UseInfiniteQueryResult,
type InfiniteData,
} from "@tanstack/react-query";
import { useAsgardeo } from "@asgardeo/react";
import { useLogger } from "@hooks/useLogger";
import { ApiQueryKeys } from "@constants/apiConstants";
Expand All @@ -26,42 +30,39 @@ export interface UseSearchProjectTimeCardsParams {
projectId: string;
startDate?: string;
endDate?: string;
limit?: number;
offset?: number;
states?: string[];
}

/**
* Custom hook to search project time cards with date range filters.
* Custom hook to search project time cards with date range filters using infinite query.
*
* @param {UseSearchProjectTimeCardsParams} params - Project ID and filters.
* @returns {UseQueryResult<TimeCardSearchResponse, Error>} The query result object.
* @returns {UseInfiniteQueryResult<InfiniteData<TimeCardSearchResponse>, Error>} The infinite query result object.
*/
export default function useSearchProjectTimeCards({
projectId,
startDate,
endDate,
limit = 10,
offset = 0,
}: UseSearchProjectTimeCardsParams): UseQueryResult<
TimeCardSearchResponse,
states,
}: UseSearchProjectTimeCardsParams): UseInfiniteQueryResult<
InfiniteData<TimeCardSearchResponse>,
Error
> {
const logger = useLogger();
const { isSignedIn, isLoading: isAuthLoading } = useAsgardeo();
const fetchFn = useAuthApiClient();

return useQuery<TimeCardSearchResponse, Error>({
return useInfiniteQuery<TimeCardSearchResponse, Error>({
queryKey: [
ApiQueryKeys.TIME_CARDS_SEARCH,
projectId,
startDate,
endDate,
limit,
offset,
states,
],
queryFn: async (): Promise<TimeCardSearchResponse> => {
queryFn: async ({ pageParam = 0 }): Promise<TimeCardSearchResponse> => {
logger.debug(
`Searching time cards for project ID: ${projectId}, start: ${startDate}, end: ${endDate}`,
`Searching time cards for project ID: ${projectId}, start: ${startDate}, end: ${endDate}, offset: ${pageParam}`,
);

try {
Expand All @@ -76,8 +77,9 @@ export default function useSearchProjectTimeCards({
filters: {
startDate,
endDate,
...(states && states.length > 0 && { states }),
},
pagination: { limit, offset },
pagination: { limit: 10, offset: pageParam as number },
};

const response = await fetchFn(requestUrl, {
Expand All @@ -104,6 +106,11 @@ export default function useSearchProjectTimeCards({
throw error;
}
},
initialPageParam: 0,
getNextPageParam: (lastPage) => {
const nextOffset = lastPage.offset + lastPage.limit;
return nextOffset < lastPage.totalRecords ? nextOffset : undefined;
},
enabled:
!!projectId && !!startDate && !!endDate && isSignedIn && !isAuthLoading,
staleTime: 5 * 60 * 1000,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
// under the License.

import { Box, Grid } from "@wso2/oxygen-ui";
import { useState, useMemo, type JSX } from "react";
import { useState, useMemo, useEffect, type JSX } from "react";
import useSearchProjectTimeCards from "@api/useSearchProjectTimeCards";
import useGetTimeCardsStats from "@api/useGetTimeCardsStats";
import useGetProjectFilters from "@api/useGetProjectFilters";
import TimeTrackingStatCards from "@time-tracking/TimeTrackingStatCards";
import TimeCardsDateFilter from "@time-tracking/TimeCardsDateFilter";
import TimeTrackingCard from "@time-tracking/TimeTrackingCard";
Expand Down Expand Up @@ -60,6 +61,9 @@ export default function ProjectTimeTracking({
);
const [startDate, setStartDate] = useState(defaultStart);
const [endDate, setEndDate] = useState(defaultEnd);
const [state, setState] = useState("");

const { data: filters } = useGetProjectFilters(projectId);

const {
data: stats,
Expand All @@ -72,19 +76,31 @@ export default function ProjectTimeTracking({
});

const {
data: timeCardsData,
data,
isLoading: isTimeCardsLoading,
isError: isTimeCardsError,
hasNextPage,
fetchNextPage,
} = useSearchProjectTimeCards({
projectId,
startDate,
endDate,
limit: 50,
offset: 0,
states: state ? [state] : undefined,
});

const timeCards = timeCardsData?.timeCards ?? [];
const totalRecords = timeCardsData?.totalRecords ?? 0;
// Auto-fetch all pages
useEffect(() => {
if (!data || !hasNextPage) return;
void fetchNextPage();
}, [data, hasNextPage, fetchNextPage]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

// Flatten all pages into a single array
const timeCards = useMemo(
() => data?.pages.flatMap((page) => page.timeCards) ?? [],
[data]
);

const totalRecords = data?.pages?.[0]?.totalRecords ?? 0;

return (
<Box>
Expand All @@ -100,9 +116,9 @@ export default function ProjectTimeTracking({
endDate={endDate}
onStartDateChange={setStartDate}
onEndDateChange={setEndDate}
shownCount={timeCards.length}
totalCount={totalRecords}
isLoading={isTimeCardsLoading}
state={state}
onStateChange={setState}
timeCardStates={filters?.timeCardStates}
/>
</Box>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,26 @@ import {
Typography,
TextField,
InputAdornment,
FormControl,
Select,
MenuItem,
} from "@wso2/oxygen-ui";
import { Calendar } from "@wso2/oxygen-ui-icons-react";
import { type JSX } from "react";
import type { MetadataItem } from "@models/responses";

export interface TimeCardsDateFilterProps {
startDate: string;
endDate: string;
onStartDateChange: (value: string) => void;
onEndDateChange: (value: string) => void;
shownCount: number;
totalCount: number;
isLoading?: boolean;
state: string;
onStateChange: (value: string) => void;
timeCardStates?: MetadataItem[];
}

/**
* TimeCardsDateFilter provides date range filters for time cards and shows count summary.
* TimeCardsDateFilter provides date range and state filters for time cards.
*
* @param {TimeCardsDateFilterProps} props - Date values, handlers, and counts.
* @returns {JSX.Element} The rendered filter card.
Expand All @@ -45,9 +49,9 @@ export default function TimeCardsDateFilter({
endDate,
onStartDateChange,
onEndDateChange,
shownCount,
totalCount,
isLoading = false,
state,
onStateChange,
timeCardStates = [],
}: TimeCardsDateFilterProps): JSX.Element {
return (
<Card
Expand All @@ -58,25 +62,23 @@ export default function TimeCardsDateFilter({
gap: 3,
}}
>
<Box sx={{ display: "flex", flexDirection: "column", gap: 2 }}>
<Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
<Calendar size={16} style={{ color: "var(--oxygen-palette-text-secondary)" }} />
<Box
sx={{
display: "flex",
alignItems: "center",
gap: 4,
flexWrap: "wrap",
}}
>
{/* Date Range Filter */}
<Box sx={{ display: "flex", alignItems: "center", gap: 2, flex: 1, minWidth: "300px" }}>
<Typography
variant="body2"
component="label"
sx={{ fontWeight: 500, color: "text.secondary" }}
sx={{ fontWeight: 500, color: "text.secondary", whiteSpace: "nowrap" }}
>
Filter by Date Range:
</Typography>
</Box>
<Box
sx={{
display: "flex",
alignItems: "center",
gap: 2,
flexWrap: "wrap",
}}
>
<Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
<Typography
component="label"
Expand Down Expand Up @@ -127,14 +129,31 @@ export default function TimeCardsDateFilter({
}}
/>
</Box>
</Box>

{/* State Filter */}
<Box sx={{ display: "flex", alignItems: "center", gap: 2, flex: 1, minWidth: "300px" }}>
<Typography
variant="body2"
sx={{ color: "text.secondary", ml: "auto" }}
component="label"
sx={{ fontWeight: 500, color: "text.secondary", whiteSpace: "nowrap" }}
>
{isLoading
? "Loading..."
: `Showing ${shownCount} of ${totalCount} time logs`}
Filter by State:
</Typography>
<FormControl size="small" sx={{ minWidth: 200 }}>
<Select
value={state}
onChange={(e) => onStateChange(e.target.value as string)}
displayEmpty
>
<MenuItem value="">All States</MenuItem>
{timeCardStates.map((stateOption) => (
<MenuItem key={stateOption.id} value={stateOption.label}>
{stateOption.label}
</MenuItem>
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
))}
</Select>
</FormControl>
Comment thread
dileepapeiris marked this conversation as resolved.
Resolved
</Box>
</Box>
</Card>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default function TimeTrackingCard({
sx={getPlainChipSx()}
/>
<Chip
label={state || "--"}
label={state?.label || "--"}
size="small"
variant="outlined"
sx={getSupportOverviewChipSx(stateColorPath, theme)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
import ProjectTimeTracking from "@time-tracking/ProjectTimeTracking";
import useSearchProjectTimeCards from "@api/useSearchProjectTimeCards";
import useGetTimeCardsStats from "@api/useGetTimeCardsStats";
import useGetProjectFilters from "@api/useGetProjectFilters";

vi.mock("@api/useSearchProjectTimeCards");
vi.mock("@api/useGetTimeCardsStats");
vi.mock("@api/useGetProjectFilters");

vi.mock("@time-tracking/TimeTrackingStatCards", () => ({
default: ({ isLoading, isError }: { isLoading?: boolean; isError?: boolean }) => (
Expand Down Expand Up @@ -63,6 +65,19 @@ describe("ProjectTimeTracking", () => {

beforeEach(() => {
vi.clearAllMocks();

// Mock project filters with timeCardStates
vi.mocked(useGetProjectFilters).mockReturnValue({
data: {
timeCardStates: [
{ id: "Pending", label: "Pending" },
{ id: "Submitted", label: "Submitted" },
{ id: "Approved", label: "Approved" },
],
},
isLoading: false,
isError: false,
} as any);
});

it("should render 7 skeletons when time cards are loading", () => {
Expand Down Expand Up @@ -108,7 +123,7 @@ describe("ProjectTimeTracking", () => {
id: "1",
case: { label: "Log 1", number: "CS001", id: "c1" },
totalTime: 60,
state: "Approved",
state: { id: "approved", label: "Approved" },
hasBillable: false,
approvedBy: null,
project: { id: "p1", label: "Project 1" },
Expand All @@ -118,7 +133,7 @@ describe("ProjectTimeTracking", () => {
id: "2",
case: { label: "Log 2", number: "CS002", id: "c2" },
totalTime: 30,
state: "Submitted",
state: { id: "submitted", label: "Submitted" },
hasBillable: true,
approvedBy: null,
project: { id: "p1", label: "Project 1" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,39 +19,46 @@ import { describe, it, expect } from "vitest";
import TimeCardsDateFilter from "@time-tracking/TimeCardsDateFilter";

describe("TimeCardsDateFilter", () => {
const mockTimeCardStates = [
{ id: "Pending", label: "Pending" },
{ id: "Submitted", label: "Submitted" },
{ id: "Approved", label: "Approved" },
];

it("should render filter by date range label and date inputs", () => {
render(
<TimeCardsDateFilter
startDate="2025-01-01"
endDate="2025-12-31"
onStartDateChange={() => {}}
onEndDateChange={() => {}}
shownCount={5}
totalCount={5}
state=""
onStateChange={() => {}}
timeCardStates={mockTimeCardStates}
/>,
);

expect(
screen.getByText("Filter by Date Range:"),
).toBeInTheDocument();
expect(
screen.getByText("Showing 5 of 5 time logs"),
screen.getByText("Filter by State:"),
).toBeInTheDocument();
});

it("should show Loading when isLoading is true", () => {
it("should show state dropdown with options", () => {
render(
<TimeCardsDateFilter
startDate="2025-01-01"
endDate="2025-12-31"
onStartDateChange={() => {}}
onEndDateChange={() => {}}
shownCount={0}
totalCount={0}
isLoading
state=""
onStateChange={() => {}}
timeCardStates={mockTimeCardStates}
/>,
);

expect(screen.getByText("Loading...")).toBeInTheDocument();
expect(screen.getByText("Filter by State:")).toBeInTheDocument();
});
});
Loading