From fb5aa080309467902310f881d91fb8b8e4e676ee Mon Sep 17 00:00:00 2001 From: "Laurie T. Malau" Date: Mon, 1 Aug 2022 14:35:12 +0000 Subject: [PATCH] Allow sorting in the UI --- components/dashboard/src/teams/TeamUsage.tsx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/components/dashboard/src/teams/TeamUsage.tsx b/components/dashboard/src/teams/TeamUsage.tsx index 731002baba3cdf..66913ea289a09c 100644 --- a/components/dashboard/src/teams/TeamUsage.tsx +++ b/components/dashboard/src/teams/TeamUsage.tsx @@ -23,6 +23,7 @@ import { ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error"; import { FeatureFlagContext } from "../contexts/FeatureFlagContext"; import { ReactComponent as CreditsSvg } from "../images/credits.svg"; import { ReactComponent as Spinner } from "../icons/Spinner.svg"; +import Arrow from "../components/Arrow"; function TeamUsage() { const { teams } = useContext(TeamsContext); @@ -39,7 +40,7 @@ function TeamUsage() { const [startDateOfBillMonth, setStartDateOfBillMonth] = useState(timestampStartOfCurrentMonth); const [endDateOfBillMonth, setEndDateOfBillMonth] = useState(Date.now()); const [isLoading, setIsLoading] = useState(true); - const [startedTimeOrder] = useState(SortOrder.Descending); + const [isStartedTimeDescending, setIsStartedTimeDescending] = useState(true); useEffect(() => { if (!team) { @@ -49,7 +50,7 @@ function TeamUsage() { const attributionId = AttributionId.render({ kind: "team", teamId: team.id }); const request: BillableSessionRequest = { attributionId, - startedTimeOrder, + startedTimeOrder: isStartedTimeDescending ? SortOrder.Descending : SortOrder.Ascending, from: startDateOfBillMonth, to: endDateOfBillMonth, }; @@ -64,7 +65,7 @@ function TeamUsage() { setIsLoading(false); } })(); - }, [team, startDateOfBillMonth, endDateOfBillMonth, startedTimeOrder]); + }, [team, startDateOfBillMonth, endDateOfBillMonth, isStartedTimeDescending]); if (!showUsageBasedPricingUI) { return ; @@ -200,7 +201,12 @@ function TeamUsage() { Credits - + + setIsStartedTimeDescending(!isStartedTimeDescending)}> + Started + + + {currentPaginatedResults && currentPaginatedResults.map((usage) => (