fix: re-implement filter components in /insights/routing by eunjae-lee · Pull Request #18655 · calcom/cal.diy

eunjae-lee · 2025-01-14T14:49:34Z

What does this PR do?

Fixes CAL-5013

Cloned TeamAndSelfList into OrgTeamsFilter and removed implementation regarding useFilterContext()
Cloned ClearFilters into DataTableFilters.ClearFiltersButton and removed implementation regarding useFilterContext()
Removed custom "Routing Form" and "People" filter components and use proper tanstack filter system.
Removed externalFilters-related code from useDataTable(). It was a temporary way to keep "Routing Form" and "People" filter as-is.

Screenshot.2025-01-14.at.17.17.33.mp4

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
N/A - I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

All the filters work the same on /insights/routing

linear · 2025-01-14T14:49:37Z

CAL-5013 Improve team filter component

vercel · 2025-01-14T14:49:41Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Jan 24, 2025 3:36pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Jan 24, 2025 3:36pm

linear · 2025-01-14T15:56:35Z

CAL-5012 Redesign filters

eunjae-lee · 2025-01-14T16:29:53Z

  table: Table<TData>;
-  externalFilters?: ExternalFilter[];
 }


externalFilters is no longer needed as I've migrated Routing Form and People filter properly.

eunjae-lee · 2025-01-14T16:31:35Z

@@ -263,43 +261,56 @@ export function RoutingFormResponsesTableContent() {
  const { t } = useLocale();
  const { filter } = useFilterContext();


Now, we rely on useFilterContext() only for the date selectors. All the other parameters are managed below.

eunjae-lee · 2025-01-14T16:33:10Z

+      columnHelper.accessor("formId", {
+        id: "formId",
+        header: t("routing_forms"),
+        enableColumnFilter: true,
+        enableSorting: false,
+        meta: {
+          filter: { type: "single_select" },
+        },
+        cell: () => null,
+      }),
+      columnHelper.accessor("bookingUserId", {
+        id: "bookingUserId",
+        header: t("people"),
+        enableColumnFilter: true,
+        enableSorting: false,
+        meta: {
+          filter: { type: "single_select" },
+        },
+        cell: () => null,
+      }),


these are hidden columns but they exist to feed the filterable columns to the tanstack table.

eunjae-lee · 2025-01-14T16:34:10Z

          </>
        }>
-        <RoutingKPICards />
+        <RoutingKPICards given={{ isAll, teamId, userId }} />


We caxn provide isAll, teamId, userId to this component, so that it won't attempt to read them from useFilterContext().

eunjae-lee · 2025-01-14T16:36:11Z

+export type OrgTeamsType = "org" | "team" | "yours";
+
+// This is a cleaned-up version of TeamAndSelfList.
+export const OrgTeamsFilter = ({


This button is not a part of "Add Filters" button and its "ActiveFilters". It exists separately on the left-most side.

eunjae-lee · 2025-01-14T16:37:15Z

-    );
-  }
-);
+export const RoutingFormFilterList = memo(() => {


removed showOnlyWhenSelectedInContext as it's no longer needed

eunjae-lee · 2025-01-14T16:37:33Z

-  showOnlyWhenSelectedInContext?: boolean;
-  onClear?: () => void;
-}) => {
+export const UserListInTeam = ({ onClear }: { onClear?: () => void }) => {


Removed showOnlyWhenSelectedInContext as it's no longer needed

eunjae-lee · 2025-01-14T16:38:24Z

This file has no logic change. Just a bit cleaned up for readability.

graphite-app · 2025-01-14T16:50:11Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (01/14/25)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add foundation team as reviewer" took an action on this PR • (01/17/25)

1 reviewer was added to this PR based on Keith Williams's automation.

github-actions · 2025-01-14T23:32:07Z

E2E results are ready!

Workflow #45166.1 latest results

feedback addressed

hbjORbj

I appreciate the self-review!

* fix: re-implement team filter & people filter components * implement DateRangeFilter * show selected filter values --------- Co-authored-by: Benny Joo <sldisek783@gmail.com>

keithwillcode added consumer core area: core, team members only labels Jan 14, 2025

vercel Bot had a problem deploying to Preview – api January 14, 2025 14:53 Failure

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from 7fb53c5 to 46c7c11 Compare January 14, 2025 15:03

vercel Bot deployed to Preview – api January 14, 2025 15:10 View deployment

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from 46c7c11 to b698f40 Compare January 14, 2025 15:18

vercel Bot deployed to Preview – api January 14, 2025 15:24 View deployment

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from b698f40 to 2dbcb73 Compare January 14, 2025 15:39

vercel Bot deployed to Preview – api January 14, 2025 15:45 View deployment

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from 2dbcb73 to 96e21a0 Compare January 14, 2025 16:05

vercel Bot deployed to Preview – api January 14, 2025 16:12 View deployment

eunjae-lee changed the title ~~fix: re-implement team filter & people filter components~~ fix: clean up filter logic in /insights/routing Jan 14, 2025

eunjae-lee commented Jan 14, 2025

View reviewed changes

eunjae-lee marked this pull request as ready for review January 14, 2025 16:46

dosubot Bot added insights area: insights, analytics routing-forms area: routing forms, routing, forms labels Jan 14, 2025

graphite-app Bot requested a review from a team January 14, 2025 16:47

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from 96e21a0 to 2cf0187 Compare January 14, 2025 16:48

vercel Bot deployed to Preview – api January 14, 2025 16:55 View deployment

fix: re-implement team filter & people filter components

26a4e15

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from 2cf0187 to 26a4e15 Compare January 14, 2025 16:58

vercel Bot deployed to Preview – api January 14, 2025 17:04 View deployment

Merge branch 'main' into eunjae/cal-5013-improve-team-filter-component

8c3771c

hbjORbj added the ready-for-e2e label Jan 14, 2025

vercel Bot deployed to Preview – api January 14, 2025 23:18 View deployment

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from 30d0dee to eee4a4c Compare January 16, 2025 16:28

vercel Bot deployed to Preview – api January 16, 2025 16:34 View deployment

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from eee4a4c to b9adac9 Compare January 17, 2025 09:42

vercel Bot deployed to Preview – api January 17, 2025 09:48 View deployment

show selected filter values

85c61b3

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from b9adac9 to 85c61b3 Compare January 17, 2025 10:44

vercel Bot deployed to Preview – api January 17, 2025 10:50 View deployment

vercel Bot deployed to Preview – api January 17, 2025 10:58 View deployment

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from 6df47e1 to b4aaea9 Compare January 17, 2025 12:54

vercel Bot deployed to Preview – api January 17, 2025 13:00 View deployment

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from b4aaea9 to 0d4c38e Compare January 17, 2025 13:48

Merge branch 'main' into eunjae/cal-5013-improve-team-filter-component

c6cbde5

eunjae-lee force-pushed the eunjae/cal-5013-improve-team-filter-component branch from 0d4c38e to c6cbde5 Compare January 17, 2025 13:49

eunjae-lee marked this pull request as ready for review January 17, 2025 13:52

graphite-app Bot requested a review from a team January 17, 2025 13:52

vercel Bot deployed to Preview – api January 17, 2025 14:00 View deployment

Udit-takkar added this to the v5.0 milestone Jan 17, 2025

Merge branch 'main' into eunjae/cal-5013-improve-team-filter-component

c0d2522

This was referenced Jan 21, 2025

fix: convert People filter on /insights/routing from single select to multi select #18735

Merged

chore: split data-table/components/filters/index.tsx #18679

Merged

vercel Bot deployed to Preview – api January 21, 2025 19:10 View deployment

Merge branch 'main' into eunjae/cal-5013-improve-team-filter-component

ec92d7a

vercel Bot deployed to Preview – api January 24, 2025 14:04 View deployment

Merge branch 'main' into eunjae/cal-5013-improve-team-filter-component

9fc9287

vercel Bot deployed to Preview – api January 24, 2025 15:42 View deployment

hbjORbj approved these changes Jan 24, 2025

View reviewed changes

eunjae-lee merged commit d5e633b into main Jan 24, 2025

eunjae-lee deleted the eunjae/cal-5013-improve-team-filter-component branch January 24, 2025 16:38

		@@ -263,43 +261,56 @@ export function RoutingFormResponsesTableContent() {
		const { t } = useLocale();
		const { filter } = useFilterContext();

Conversation

eunjae-lee commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Uh oh!

linear Bot commented Jan 14, 2025

Uh oh!

vercel Bot commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

linear Bot commented Jan 14, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

graphite-app Bot commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Graphite Automations

Uh oh!

github-actions Bot commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

hbjORbj left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

eunjae-lee commented Jan 14, 2025 •

edited

Loading

vercel Bot commented Jan 14, 2025 •

edited

Loading

graphite-app Bot commented Jan 14, 2025 •

edited

Loading

github-actions Bot commented Jan 14, 2025 •

edited

Loading