Skip to content

Commit d7e6334

Browse files
authored
refactor: remove useInsightsParameters() (calcom#25020)
* refactor: remove useInsightsParameters (no longer needed) * remove log
1 parent 06e5c98 commit d7e6334

3 files changed

Lines changed: 18 additions & 93 deletions

File tree

packages/features/insights/components/routing/RoutingFormResponsesTable.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import {
1414
DataTableSegment,
1515
ColumnFilterType,
1616
convertMapToFacetedValues,
17+
useFilterValue,
18+
ZSingleSelectFilterValue,
1719
type FilterableColumn,
1820
} from "@calcom/features/data-table";
1921
import { useInsightsRoutingParameters } from "@calcom/features/insights/hooks/useInsightsRoutingParameters";
@@ -22,7 +24,7 @@ import { trpc } from "@calcom/trpc";
2224
import { RoutingFormResponsesDownload } from "../../filters/Download";
2325
import { OrgTeamsFilter } from "../../filters/OrgTeamsFilter";
2426
import { useInsightsColumns } from "../../hooks/useInsightsColumns";
25-
import { useInsightsParameters } from "../../hooks/useInsightsParameters";
27+
import { useInsightsOrgTeams } from "../../hooks/useInsightsOrgTeams";
2628
import { useInsightsRoutingFacetedUniqueValues } from "../../hooks/useInsightsRoutingFacetedUniqueValues";
2729
import type { RoutingFormTableRow } from "../../lib/types";
2830
import { RoutingKPICards } from "./RoutingKPICards";
@@ -38,7 +40,8 @@ const createdAtColumn: Extract<FilterableColumn, { type: ColumnFilterType.DATE_R
3840
};
3941

4042
export function RoutingFormResponsesTable() {
41-
const { isAll, teamId, userId, routingFormId } = useInsightsParameters();
43+
const { isAll, teamId, userId } = useInsightsOrgTeams();
44+
const routingFormId = useFilterValue("formId", ZSingleSelectFilterValue)?.data as string | undefined;
4245

4346
const { t } = useLocale();
4447

@@ -150,7 +153,7 @@ export function RoutingFormResponsesTable() {
150153
{ctaContainerRef.current &&
151154
createPortal(
152155
<>
153-
<DateRangeFilter column={createdAtColumn} />
156+
<DateRangeFilter column={createdAtColumn} options={{ convertToTimeZone: true }} />
154157
<RoutingFormResponsesDownload sorting={sorting} />
155158
</>,
156159
ctaContainerRef.current

packages/features/insights/hooks/useInsightsParameters.ts

Lines changed: 0 additions & 72 deletions
This file was deleted.

packages/features/insights/hooks/useInsightsRoutingParameters.ts

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { useMemo } from "react";
22

33
import dayjs from "@calcom/dayjs";
44
import { useFilterValue, useColumnFilters, ZDateRangeFilterValue } from "@calcom/features/data-table";
5-
import { useChangeTimeZoneWithPreservedLocalTime } from "@calcom/features/data-table/hooks/useChangeTimeZoneWithPreservedLocalTime";
65
import { getDefaultStartDate, getDefaultEndDate } from "@calcom/features/data-table/lib/dateRange";
76

87
import { useInsightsOrgTeams } from "./useInsightsOrgTeams";
@@ -11,23 +10,18 @@ export function useInsightsRoutingParameters() {
1110
const { scope, selectedTeamId } = useInsightsOrgTeams();
1211

1312
const createdAtRange = useFilterValue("createdAt", ZDateRangeFilterValue)?.data;
14-
// TODO for future: this preserving local time & startOf & endOf should be handled
15-
// from DateRangeFilter out of the box.
16-
// When we do it, we also need to remove those timezone handling logic from the backend side at the same time.
17-
const startDate = useChangeTimeZoneWithPreservedLocalTime(
18-
useMemo(() => {
19-
return dayjs(createdAtRange?.startDate ?? getDefaultStartDate().toISOString())
20-
.startOf("day")
21-
.toISOString();
22-
}, [createdAtRange?.startDate])
23-
);
24-
const endDate = useChangeTimeZoneWithPreservedLocalTime(
25-
useMemo(() => {
26-
return dayjs(createdAtRange?.endDate ?? getDefaultEndDate().toISOString())
27-
.endOf("day")
28-
.toISOString();
29-
}, [createdAtRange?.endDate])
30-
);
13+
14+
const startDate = useMemo(() => {
15+
return dayjs(createdAtRange?.startDate ?? getDefaultStartDate().toISOString())
16+
.startOf("day")
17+
.toISOString();
18+
}, [createdAtRange?.startDate]);
19+
20+
const endDate = useMemo(() => {
21+
return dayjs(createdAtRange?.endDate ?? getDefaultEndDate().toISOString())
22+
.endOf("day")
23+
.toISOString();
24+
}, [createdAtRange?.endDate]);
3125

3226
const columnFilters = useColumnFilters({
3327
exclude: ["createdAt"],

0 commit comments

Comments
 (0)