* feat: implement default filter segments for data tables - Add defaultSegmentId column to UserFilterSegmentPreference table - Support mixed segment ID types (number for user segments, string for default segments) - Add DefaultFilterSegment and CombinedFilterSegment types - Update useSegments hook to handle default segments with date range recalculation - Modify FilterSegmentSelect to group and display default segments separately - Add default segments to bookings view (My Bookings, Upcoming Bookings) - Prevent editing/deleting of default segments in SaveFilterSegmentButton - Update DataTableProvider to support defaultSegments prop - Update parsers and repository to handle mixed segment ID types Implements frontend-only default segments as specified in the requirements. Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * chore: update ESLint dependencies to resolve configuration issues - Update eslint-config-next and @typescript-eslint packages to latest versions - Fix dependency compatibility issues that were blocking pre-commit hooks Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * revert eslint change * some changes * refactor: implement discriminated union for segment types - Update SegmentIdentifier to use discriminated union with 'custom' vs 'default' types - Refactor setSegmentId to accept object parameters: { id: string; type: 'default' } | { id: number; type: 'custom' } - Update type definitions with DefaultFilterSegment, CustomFilterSegment, and CombinedFilterSegment - Modify useSegments hook to handle new segment type structure - Update FilterSegmentSelect component to work with discriminated unions - Refactor database preference handling to store segment type alongside ID - Add proper type safety throughout the data flow - Remove description property from DefaultFilterSegment type Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: update unit test to expect discriminated union format for preferredSegmentId The test was expecting preferredSegmentId to be a number, but after the discriminated union refactor it now returns { id: number, type: 'custom' } for custom segments. Updated the assertion to use toEqual() for deep object comparison. Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: correct SegmentIdentifier type to exclude undefined - Remove null from SegmentIdentifier type definition since null/undefined indicate absence of identifier - Update DataTableProvider and useSegments to handle SegmentIdentifier | null properly - Fix type safety while maintaining discriminated union functionality - Ensure setAndPersistSegmentId accepts null values for clearing segments Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * remove unused segment * a little update * feat: add default- prefix to default segment IDs for clearer type identification - Update 'my_bookings' to 'default-my_bookings' - Update 'upcoming-bookings' to 'default-upcoming-bookings' - Makes it easier to verify segment type by looking at the ID string - Maintains all existing discriminated union functionality Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: rename segment types from default/custom to system/user for better semantics Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: update unit test to expect 'user' type instead of 'custom' in discriminated union Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: complete type renaming from default/custom to system/user across all component files Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: update segment ID prefix from default- to system- to match type naming Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * remove unused segment * some fixes * revert schema change * rename defaultSegmentId to systemSegmentId * renaming * fix save button * remove as any * clean up prisma migrations * type fixes * many fixes * remove icon property * fix infinite rendering * fix race condition * re-visiting useSegments implementation WIP * extract useElementByClassName * add e2e tests * fix a bug that the created segment was not selected automatically * add useSegments to /insights and fix e2e test * fix type error * fix type error * apply feedback --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
241 lines
7.0 KiB
TypeScript
241 lines
7.0 KiB
TypeScript
import { expect } from "@playwright/test";
|
|
|
|
import { randomString } from "@calcom/lib/random";
|
|
import prisma from "@calcom/prisma";
|
|
|
|
import { clearFilters, applySelectFilter } from "./filter-helpers";
|
|
import { test } from "./lib/fixtures";
|
|
|
|
test.describe.configure({ mode: "parallel" });
|
|
|
|
const createTeamsAndMembership = async (userIdOne: number, userIdTwo: number) => {
|
|
const teamOne = await prisma.team.create({
|
|
data: {
|
|
name: "test-insights",
|
|
slug: `test-insights-${Date.now()}-${randomString(5)}}`,
|
|
},
|
|
});
|
|
|
|
const teamTwo = await prisma.team.create({
|
|
data: {
|
|
name: "test-insights-2",
|
|
slug: `test-insights-2-${Date.now()}-${randomString(5)}}`,
|
|
},
|
|
});
|
|
if (!userIdOne || !userIdTwo || !teamOne || !teamTwo) {
|
|
throw new Error("Failed to create test data");
|
|
}
|
|
|
|
// create memberships
|
|
await prisma.membership.create({
|
|
data: {
|
|
userId: userIdOne,
|
|
teamId: teamOne.id,
|
|
accepted: true,
|
|
role: "ADMIN",
|
|
},
|
|
});
|
|
await prisma.membership.create({
|
|
data: {
|
|
teamId: teamTwo.id,
|
|
userId: userIdOne,
|
|
accepted: true,
|
|
role: "ADMIN",
|
|
},
|
|
});
|
|
await prisma.membership.create({
|
|
data: {
|
|
teamId: teamOne.id,
|
|
userId: userIdTwo,
|
|
accepted: true,
|
|
role: "MEMBER",
|
|
},
|
|
});
|
|
await prisma.membership.create({
|
|
data: {
|
|
teamId: teamTwo.id,
|
|
userId: userIdTwo,
|
|
accepted: true,
|
|
role: "MEMBER",
|
|
},
|
|
});
|
|
return { teamOne, teamTwo };
|
|
};
|
|
|
|
test.afterEach(async ({ users }) => {
|
|
await users.deleteAll();
|
|
});
|
|
|
|
test.describe("Insights", async () => {
|
|
test("should be able to go to insights as admins", async ({ page, users }) => {
|
|
const user = await users.create();
|
|
const userTwo = await users.create();
|
|
await createTeamsAndMembership(user.id, userTwo.id);
|
|
|
|
await user.apiLogin();
|
|
|
|
// go to insights page
|
|
await page.goto("/insights");
|
|
|
|
await page.locator('[data-testid^="insights-filters-false-"]').waitFor();
|
|
});
|
|
|
|
test("should be able to go to insights as members", async ({ page, users }) => {
|
|
const user = await users.create();
|
|
const userTwo = await users.create();
|
|
|
|
await userTwo.apiLogin();
|
|
|
|
await createTeamsAndMembership(user.id, userTwo.id);
|
|
// go to insights page
|
|
await page.goto("/insights");
|
|
|
|
await page.locator('[data-testid^="insights-filters-false-"]').waitFor();
|
|
});
|
|
|
|
test("team select filter should have 2 teams and your account option only as member", async ({
|
|
page,
|
|
users,
|
|
}) => {
|
|
const user = await users.create();
|
|
const userTwo = await users.create();
|
|
|
|
await user.apiLogin();
|
|
|
|
await createTeamsAndMembership(user.id, userTwo.id);
|
|
|
|
// go to insights page
|
|
await page.goto("/insights");
|
|
await page.locator(`[data-testid=insights-filters-false-undefined-${user.id}]`).waitFor();
|
|
|
|
await page.getByTestId("dashboard-shell").getByText("Your account").click();
|
|
|
|
await expect(await page.locator('[data-testid="org-teams-filter-item"]')).toHaveCount(3);
|
|
|
|
await expect(await page.locator('[data-testid="org-teams-filter-item"]', { hasText: "All" })).toHaveCount(
|
|
0
|
|
);
|
|
|
|
await expect(
|
|
await page.locator('[data-testid="org-teams-filter-item"]', { hasText: "Your account" })
|
|
).toHaveCount(1);
|
|
});
|
|
|
|
test("Insights Organization should have isAll option true", async ({ users, page }) => {
|
|
const owner = await users.create(undefined, {
|
|
hasTeam: true,
|
|
isUnpublished: true,
|
|
isOrg: true,
|
|
hasSubteam: true,
|
|
});
|
|
await owner.apiLogin();
|
|
|
|
await page.goto("/insights");
|
|
await page.locator('[data-testid^="insights-filters-true-"]').waitFor();
|
|
|
|
await page.locator('[data-testid^="insights-filters-true-"]').getByText("All").click();
|
|
|
|
await expect(await page.locator('[data-testid="org-teams-filter-item"]')).toHaveCount(3);
|
|
|
|
await expect(
|
|
await page
|
|
.locator('[data-testid="org-teams-filter-item"]', { hasText: "All" })
|
|
.locator('input[type="checkbox"]')
|
|
).toBeChecked();
|
|
});
|
|
|
|
test("should not have all option as admin in non-org", async ({ page, users }) => {
|
|
const owner = await users.create();
|
|
const member = await users.create();
|
|
|
|
await createTeamsAndMembership(owner.id, member.id);
|
|
|
|
await owner.apiLogin();
|
|
|
|
await page.goto("/insights");
|
|
|
|
await page.getByTestId("dashboard-shell").getByText("Your account").click();
|
|
|
|
await expect(await page.locator('[data-testid="org-teams-filter-item"]')).toHaveCount(3);
|
|
|
|
await expect(await page.locator('[data-testid="org-teams-filter-item"]', { hasText: "All" })).toHaveCount(
|
|
0
|
|
);
|
|
});
|
|
|
|
test("should be able to switch between teams and self profile for insights", async ({ page, users }) => {
|
|
const owner = await users.create();
|
|
const member = await users.create();
|
|
|
|
await createTeamsAndMembership(owner.id, member.id);
|
|
|
|
await owner.apiLogin();
|
|
|
|
await page.goto("/insights");
|
|
|
|
await page.getByTestId("dashboard-shell").getByText("Your account").click();
|
|
|
|
await expect(await page.locator('[data-testid="org-teams-filter-item"]')).toHaveCount(3);
|
|
|
|
// switch to self profile
|
|
await page.locator('[data-testid="org-teams-filter-item"]', { hasText: "Your account" }).click();
|
|
|
|
// switch to team 1
|
|
await page.locator('[data-testid="org-teams-filter-item"]', { hasText: "test-insights" }).first().click();
|
|
|
|
// switch to team 2
|
|
await page.locator('[data-testid="org-teams-filter-item"]', { hasText: "test-insights-2" }).click();
|
|
});
|
|
|
|
test("should be able to switch between memberUsers", async ({ page, users }) => {
|
|
const owner = await users.create();
|
|
const member = await users.create();
|
|
|
|
await createTeamsAndMembership(owner.id, member.id);
|
|
|
|
await owner.apiLogin();
|
|
|
|
await page.goto("/insights");
|
|
|
|
// Choose a team
|
|
await page.getByTestId("dashboard-shell").getByText("Your account").click();
|
|
await page.locator('[data-testid="org-teams-filter-item"]').nth(1).click();
|
|
await page.keyboard.press("Escape");
|
|
|
|
await applySelectFilter(page, "userId", member.username || "");
|
|
|
|
await clearFilters(page);
|
|
|
|
await expect(page).not.toHaveURL(/[?&]userId=/);
|
|
});
|
|
|
|
test("should test download button", async ({ page, users }) => {
|
|
const owner = await users.create();
|
|
const member = await users.create();
|
|
|
|
await createTeamsAndMembership(owner.id, member.id);
|
|
|
|
await owner.apiLogin();
|
|
|
|
await page.goto("/insights");
|
|
|
|
const downloadPromise = page.waitForEvent("download");
|
|
|
|
// Expect download button to be visible
|
|
await expect(page.locator("text=Download")).toBeVisible();
|
|
|
|
// Click on Download button
|
|
await page.getByText("Download").click();
|
|
|
|
// Expect as csv option to be visible
|
|
await expect(page.locator("text=as CSV")).toBeVisible();
|
|
|
|
// Start waiting for download before clicking. Note no await.
|
|
await page.getByText("as CSV").click();
|
|
const download = await downloadPromise;
|
|
|
|
// Wait for the download process to complete and save the downloaded file somewhere.
|
|
await download.saveAs("./" + "test-insights.csv");
|
|
});
|
|
});
|