* chore: refactor config files to prevent migration tool errors * refactor: upgrade with the tailwind migration tool * chore: restore pre-commit command + mc * refactor(wip): update dependencies and migrate to Tailwind CSS v4 (mainly web) * chore: resolve Tailwind v4 migration conflicts from merging main * chore: remove unused Tailwind packages from config and update dependencies for v4 migration * chore: uncomment Tailwind CSS utility classes in globals.css * fix: resolve token conflicts between calcom and coss ui * fix: textarea scrollbar * Fix CUI-16 * fix: added @tailwindcss/forms plugin and cleaned up CSS classes in various components to remove unnecessary dark mode styles * fix: selects and inputs of different sizes * fix: remove unnecessary leading-20 class from modal titles in various components * fix: update Checkbox component styles to remove unnecessary border on checked state * fix: clean up styles in RequiresConfirmationController, Checkbox, and Radio components to enhance consistency * fix: update button and filter component styles to remove unnecessary rounded classes for consistency * fix: calendar * fix: update KBarSearch * fix: refine styles in Empty and Checkbox components for improved consistency * Fix focus state email input * fix: update button hover and active states to use 'not-disabled' instead of 'enabled' * fix: line-height issues * fix: update class name for muted background in BookingListItem component * fix: sidebar spacing * chore: update class names to use new Tailwind CSS color utilities * fix embed * chore: upgrade Tailwind CSS to version 4.1.16 and update related dependencies * Map css variables and add a playground test for heavy css customization * suggestion for coss-ui * refactor: update CSS variable usage and clean up styles - Replace instances of `--cal-brand-color` with `--cal-brand` in embed-related HTML files. - Remove the now-unnecessary `addAppCssVars` function from the embed core. - Import theme tokens in the embed core styles for better consistency. - Clean up whitespace and formatting in CSS files for improved readability. - Add a comment in `tokens.css` regarding its usage in both embed and webapp contexts. * Handle within tokens.css instead of fixing coss-ui * Remove initial, not needed. Also, remove tailwind.config.js as tailwidn scans the html automaically * fix: examples app breaking * fix: modal not resizing correctly * feat: upgrade atoms to tailwind v4 * fix: atoms build breaking * fix: atoms build breaking * chore: upgrate examples/base to tailwind 4 * chore: update globals.css * fix: add missing scheduler css variables * fix: PlatformAdditionalCalendarSelector * chore: update global styles * chore: update tailwindcss and postcss dependencies to stable versions * chore: remove unneeded class * fix: dialog and toast animation * fix: replace flex-shrink-0 with shrink-0 for consistent styling in various components * fix: dialog modal for Apple connect * add margin in SaveFilterSegmentButton * Fix radix button nested states * add cursor pointer to buttons but keep dsabled state * Fix commandK selectors and adds cursor pointer * Fix teams filter * fix - round checkboxes * fix filter checkbox * fix select indicator's margin * command group font size * style: fix badge and tooltip radius * chore: remove unneeded files * Delete PR_REVIEW_MANAGED_EVENT_REASSIGNMENT.md * remove ui-playground leftover * fix: add missing react phone input styles in atoms * Delete managed-event-reassignment-flow-and-architecture.mermaid * fix: inter font not loading * Add theme to skeleton container so that it can support dark mode * fix: create custom stack-y-* utilities post tw4 upgrade * fix: typo * fix: atoms stack class + remove unused css file * fix default radius valiue * fix space-y in embed * fix skeleton background * Hardcode radius values to match production * fix border in embed * add missing externalThemeClass * feat: create a custom stack-y-* utility * fix: add stack utility to atom global css * fix: Skeleton loader class modalbox * Add stack-y utility in embed * fix: add missing stack utilities in atoms globals.css * update yarn.lock * add popover portla * update --------- Co-authored-by: Sean Brydon <sean@cal.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Ryukemeister <sahalrajiv6900@gmail.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev> Co-authored-by: Anik Dhabal Babu <adhabal2002@gmail.com>
211 lines
6.6 KiB
TypeScript
211 lines
6.6 KiB
TypeScript
"use client";
|
|
|
|
import { useCallback, useState } from "react";
|
|
import { Query, Builder, Utils as QbUtils } from "react-awesome-query-builder";
|
|
import type { ImmutableTree, BuilderProps } from "react-awesome-query-builder";
|
|
import type { JsonTree } from "react-awesome-query-builder";
|
|
|
|
import { buildStateFromQueryValue } from "@calcom/app-store/_utils/raqb/raqbUtils";
|
|
import {
|
|
withRaqbSettingsAndWidgets,
|
|
ConfigFor,
|
|
} from "@calcom/app-store/routing-forms/components/react-awesome-query-builder/config/uiConfig";
|
|
import { getQueryBuilderConfigForAttributes } from "@calcom/app-store/routing-forms/lib/getQueryBuilderConfig";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import { isEqual } from "@calcom/lib/isEqual";
|
|
import type { AttributesQueryValue } from "@calcom/lib/raqb/types";
|
|
import { trpc, type RouterOutputs } from "@calcom/trpc";
|
|
import cn from "@calcom/ui/classNames";
|
|
|
|
export type Attributes = RouterOutputs["viewer"]["appRoutingForms"]["getAttributesForTeam"];
|
|
export function useAttributes(teamId: number) {
|
|
const { data: attributes, isPending } = trpc.viewer.appRoutingForms.getAttributesForTeam.useQuery({
|
|
teamId,
|
|
});
|
|
return {
|
|
attributes,
|
|
isPending,
|
|
};
|
|
}
|
|
|
|
function SegmentWithAttributes({
|
|
attributes,
|
|
teamId,
|
|
queryValue: initialQueryValue,
|
|
onQueryValueChange,
|
|
className,
|
|
}: {
|
|
attributes: Attributes;
|
|
teamId: number;
|
|
queryValue: AttributesQueryValue | null;
|
|
onQueryValueChange: ({ queryValue }: { queryValue: AttributesQueryValue }) => void;
|
|
className?: string;
|
|
}) {
|
|
const attributesQueryBuilderConfig = getQueryBuilderConfigForAttributes({
|
|
attributes,
|
|
});
|
|
|
|
const [queryValue, setQueryValue] = useState(initialQueryValue);
|
|
const attributesQueryBuilderConfigWithRaqbSettingsAndWidgets = withRaqbSettingsAndWidgets({
|
|
config: attributesQueryBuilderConfig,
|
|
configFor: ConfigFor.Attributes,
|
|
});
|
|
|
|
const queryBuilderData = buildStateFromQueryValue({
|
|
queryValue: queryValue as JsonTree,
|
|
config: attributesQueryBuilderConfigWithRaqbSettingsAndWidgets,
|
|
});
|
|
|
|
const renderBuilder = useCallback(
|
|
(props: BuilderProps) => (
|
|
<div className="query-builder-container" data-testid="query-builder-container">
|
|
<div className="query-builder qb-lite">
|
|
<Builder {...props} />
|
|
</div>
|
|
</div>
|
|
),
|
|
[]
|
|
);
|
|
|
|
function onChange(immutableTree: ImmutableTree) {
|
|
const jsonTree = QbUtils.getTree(immutableTree) as AttributesQueryValue;
|
|
|
|
// IMPORTANT: RAQB calls onChange even without explicit user action. It just identifies if the props have changed or not. isEqual ensures that we don't end up having infinite re-renders.
|
|
if (!isEqual(jsonTree, queryValue)) {
|
|
setQueryValue(jsonTree);
|
|
onQueryValueChange({
|
|
queryValue: jsonTree,
|
|
});
|
|
}
|
|
}
|
|
|
|
return (
|
|
// cal-query-builder class has special styling through global CSS, allowing us to customize RAQB
|
|
<div>
|
|
<div className={cn("cal-query-builder", className)}>
|
|
<Query
|
|
{...attributesQueryBuilderConfigWithRaqbSettingsAndWidgets}
|
|
value={queryBuilderData.state.tree}
|
|
onChange={onChange}
|
|
renderBuilder={renderBuilder}
|
|
/>
|
|
</div>
|
|
<div className="mt-4 text-sm">
|
|
<MatchingTeamMembers teamId={teamId} queryValue={queryValue} />
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function MatchingTeamMembers({
|
|
teamId,
|
|
queryValue,
|
|
}: {
|
|
teamId: number;
|
|
queryValue: AttributesQueryValue | null;
|
|
}) {
|
|
const { t } = useLocale();
|
|
|
|
// Check if queryValue has valid children properties value
|
|
const hasValidValue = queryValue?.children1
|
|
? Object.values(queryValue.children1).some(
|
|
(child) => child.properties?.value?.[0] !== undefined && child.properties?.value?.[0] !== null
|
|
)
|
|
: false;
|
|
|
|
const { data: matchingTeamMembersWithResult, isPending } =
|
|
trpc.viewer.attributes.findTeamMembersMatchingAttributeLogic.useQuery(
|
|
{
|
|
teamId,
|
|
attributesQueryValue: queryValue,
|
|
_enablePerf: true,
|
|
},
|
|
{
|
|
enabled: hasValidValue,
|
|
}
|
|
);
|
|
|
|
if (!hasValidValue) {
|
|
return (
|
|
<div className="border-subtle bg-cal-muted mt-4 stack-y-3 rounded-md border p-4">
|
|
<div className="text-subtle flex items-center text-sm font-medium">
|
|
<span>{t("no_filter_set")}</span>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
if (isPending) {
|
|
return (
|
|
<div
|
|
className="border-subtle bg-cal-muted mt-4 stack-y-3 rounded-md border p-4"
|
|
data-testid="segment_loading_state">
|
|
<div className="text-emphasis flex items-center text-sm font-medium">
|
|
<div className="bg-subtle h-4 w-32 animate-pulse rounded" />
|
|
</div>
|
|
<ul className="divide-subtle divide-y">
|
|
{[...Array(3)].map((_, index) => (
|
|
<li key={index} className="flex items-center py-2">
|
|
<div className="flex flex-1 items-center space-x-2 text-sm">
|
|
<div className="bg-subtle h-4 w-24 animate-pulse rounded" />
|
|
<div className="bg-subtle h-4 w-32 animate-pulse rounded" />
|
|
</div>
|
|
</li>
|
|
))}
|
|
</ul>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
if (!matchingTeamMembersWithResult) return <span>{t("something_went_wrong")}</span>;
|
|
const { result: matchingTeamMembers } = matchingTeamMembersWithResult;
|
|
|
|
return (
|
|
<div className="border-subtle bg-cal-muted mt-4 stack-y-3 rounded-md border p-4">
|
|
<div className="text-emphasis flex items-center text-sm font-medium">
|
|
<span>{t("x_matching_members", { x: matchingTeamMembers?.length ?? 0 })}</span>
|
|
</div>
|
|
<ul className="divide-subtle divide-y">
|
|
{matchingTeamMembers?.map((member) => (
|
|
<li key={member.id} className="flex items-center py-2">
|
|
<div className="flex flex-1 items-center space-x-2 text-sm">
|
|
<span className="font-medium">{member.name}</span>
|
|
<span className="text-subtle">({member.email})</span>
|
|
</div>
|
|
</li>
|
|
))}
|
|
</ul>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
export function Segment({
|
|
teamId,
|
|
queryValue,
|
|
onQueryValueChange,
|
|
className,
|
|
}: {
|
|
teamId: number;
|
|
queryValue: AttributesQueryValue | null;
|
|
onQueryValueChange: ({ queryValue }: { queryValue: AttributesQueryValue }) => void;
|
|
className?: string;
|
|
}) {
|
|
const { attributes, isPending } = useAttributes(teamId);
|
|
const { t } = useLocale();
|
|
if (isPending) return <span>Loading...</span>;
|
|
if (!attributes) {
|
|
console.error("Error fetching attributes");
|
|
return <span>{t("something_went_wrong")}</span>;
|
|
}
|
|
|
|
return (
|
|
<SegmentWithAttributes
|
|
teamId={teamId}
|
|
attributes={attributes}
|
|
queryValue={queryValue}
|
|
onQueryValueChange={onQueryValueChange}
|
|
className={className}
|
|
/>
|
|
);
|
|
}
|