feat: Skip contact owner even if it matches attribute routing

packages/app-store/routing-forms/TODO.md

@@ -31,15 +31,20 @@
 - [ ] getAttributes
  - [ ] Querying Logic Test
 - [ ] getRoutedUsers tests
+- [ ] getAvailableSlots 
+ - [ ] should use routedTeamMemberIds in availability query
 
-### Documentation
+
+### Documentation / Tooltip
 - [ ] Document well that the option label in Routing Form Field and Attribute Option label must be same to connect them.
  - Due to the connection requirement b/w Attribute Option and Field Option, we use label(lowercased) to match attributes instead of attribute slug
+- [ ] Fixed hosts of the event will be included through attribute routing as well. They aren't tested for attribute routing logic.
 
 ### V2.0
 - [ ] Fallback for when no team member matches the criteria.
  - Fallback will be attributes query builder that would match a different set of users. Though the booking will use the team members assigned to the event type, it might be better to be able to identify such a scenario and use a different set of users. It also makes it easy to identify when the fallback scenario happens.
 - [ ] cal.routedTeamMembersIds query param - Could possible become a big payload and possibly break the URL limit. We could work on a short-lived row in a table that would hold that info and we pass the id of that row only in query param. handleNewBooking can then retrieve the routedTeamMembersIds from that short-lived row and delete the entry after successfully creating a booking.
+- [ ] Better ability to test with contact owner from Routing Form Preview itself(if possible). Right now, we need to test the entire booking flow to verify that.
 
 
 ## TODO - Attributes

packages/app-store/routing-forms/__tests__/getEventTypeRedirectUrl.test.ts

@@ -0,0 +1,79 @@
+import { describe, it, expect } from "vitest";
+
+import { CAL_URL } from "@calcom/lib/constants";
+
+import { getAbsoluteEventTypeRedirectUrl } from "../getEventTypeRedirectUrl";
+
+describe("getAbsoluteEventTypeRedirectUrl", () => {
+ const defaultForm = {
+ team: null,
+ nonOrgUsername: null,
+ nonOrgTeamslug: null,
+ userOrigin: "https://user.cal.com",
+ teamOrigin: "https://team.cal.com",
+ };
+
+ const defaultParams = {
+ eventTypeRedirectUrl: "user/event",
+ form: defaultForm,
+ allURLSearchParams: new URLSearchParams(),
+ isEmbed: false,
+ };
+
+ it("should return CAL_URL for non-migrated user", () => {
+ const result = getAbsoluteEventTypeRedirectUrl({
+ ...defaultParams,
+ eventTypeRedirectUrl: "user/event",
+ form: { ...defaultForm, nonOrgUsername: "user" },
+ });
+ expect(result).toBe(`${CAL_URL}/user/event?`);
+ });
+
+ it("should return user origin for migrated user", () => {
+ const result = getAbsoluteEventTypeRedirectUrl(defaultParams);
+ expect(result).toBe("https://user.cal.com/user/event?");
+ });
+
+ it("should return CAL_URL for non-migrated team", () => {
+ const result = getAbsoluteEventTypeRedirectUrl({
+ ...defaultParams,
+ eventTypeRedirectUrl: "team/team1/event",
+ form: { ...defaultForm, nonOrgTeamslug: "team1" },
+ });
+ expect(result).toBe(`${CAL_URL}/team/team1/event?`);
+ });
+
+ it("should return team origin for migrated team", () => {
+ const result = getAbsoluteEventTypeRedirectUrl({
+ ...defaultParams,
+ eventTypeRedirectUrl: "team/team1/event",
+ });
+ expect(result).toBe("https://team.cal.com/team/team1/event?");
+ });
+
+ it("should append URL search params", () => {
+ const result = getAbsoluteEventTypeRedirectUrl({
+ ...defaultParams,
+ allURLSearchParams: new URLSearchParams("foo=bar&baz=qux"),
+ });
+ expect(result).toBe("https://user.cal.com/user/event?foo=bar&baz=qux");
+ });
+
+ it("should append /embed for embedded views", () => {
+ const result = getAbsoluteEventTypeRedirectUrl({
+ ...defaultParams,
+ allURLSearchParams: new URLSearchParams("foo=bar&baz=qux"),
+ isEmbed: true,
+ });
+ expect(result).toBe("https://user.cal.com/user/event/embed?foo=bar&baz=qux");
+ });
+
+ it("should throw an error if invalid team event redirect URL is provided", () => {
+ expect(() =>
+ getAbsoluteEventTypeRedirectUrl({
+ ...defaultParams,
+ eventTypeRedirectUrl: "team/",
+ })
+ ).toThrow("eventTypeRedirectUrl must have username or teamSlug");
+ });
+});

packages/app-store/routing-forms/test/lib/jsonLogicToPrisma.test.ts → packages/app-store/routing-forms/__tests__/jsonLogicToPrisma.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it, afterEach, vi } from "vitest";
 
-import { jsonLogicToPrisma } from "../../jsonLogicToPrisma";
+import { jsonLogicToPrisma } from "../jsonLogicToPrisma";
 
 afterEach(() => {
  vi.resetAllMocks();

packages/app-store/routing-forms/components/SingleForm.tsx

@@ -259,7 +259,7 @@ function SingleForm({ form, appUrl, Page, enrichedWithUserProfileForm }: SingleF
 
  function testRouting() {
  const route = findMatchingRoute({ form, response });
- 
+
  if (route?.action?.type === "eventTypeRedirectUrl") {
  setEventTypeUrl(
  enrichedWithUserProfileForm
@@ -271,9 +271,9 @@ function SingleForm({ form, appUrl, Page, enrichedWithUserProfileForm }: SingleF
  : ""
  );
  }
- 
+
  setChosenRoute(route || null);
- 
+
  if (!route) return;
 
  findTeamMembersMatchingAttributeLogicMutation.mutate({

packages/app-store/routing-forms/components/react-awesome-query-builder/config/BasicConfig.ts

@@ -1,18 +1,20 @@
 // This is taken from "react-awesome-query-builder/lib/config/basic";
 import type {
- Operators as RAQBOperators,
  Conjunction as RAQBConjunction,
  Widget as RAQBWidget,
  Type as RAQBType,
  Settings as RAQBSettings,
  Operator as RAQBOperator,
 } from "react-awesome-query-builder";
 
-export type Conjunction = Omit<RAQBConjunction, "formatConj" | "sqlFormatConj" | "spelFormatConj" | "mongoConj">;
+export type Conjunction = Omit<
+ RAQBConjunction,
+ "formatConj" | "sqlFormatConj" | "spelFormatConj" | "mongoConj"
+>;
 export type Conjunctions = Record<string, Conjunction>;
 export type Operator = RAQBOperator & {
  _jsonLogicIsExclamationOp?: boolean;
-}
+};
 export type Operators = Record<string, Operator>;
 export type WidgetWithoutFactory = Omit<RAQBWidget, "factory"> & {
  type: string;
@@ -450,4 +452,4 @@ export default {
  widgets,
  types,
  settings,
-};
+};

packages/app-store/routing-forms/getEventTypeRedirectUrl.ts

@@ -1,5 +1,5 @@
 import { CAL_URL } from "@calcom/lib/constants";
-import { Ensure } from "@calcom/types/utils";
+import type { Ensure } from "@calcom/types/utils";
 
 function getUserAndEventTypeSlug(eventTypeRedirectUrl: string) {
  if (eventTypeRedirectUrl.startsWith("/")) {
@@ -14,6 +14,8 @@ function getUserAndEventTypeSlug(eventTypeRedirectUrl: string) {
 }
 
 /**
+ * @param eventTypeRedirectUrl - The event path without a starting slash
+ *
  * Handles the following cases
  * 1. A team form where the team isn't a sub-team
  * 1.1 A team form where team isn't a sub-team and the user is migrated. i.e. User has been migrated but not the team

packages/app-store/routing-forms/lib/InitialConfig.tsx

@@ -1,4 +1,7 @@
-import { FormFieldsBaseConfig, AttributesBaseConfig } from "../components/react-awesome-query-builder/config/config";
+import {
+ FormFieldsBaseConfig,
+ AttributesBaseConfig,
+} from "../components/react-awesome-query-builder/config/config";
 
 export const FormFieldsInitialConfig = FormFieldsBaseConfig;
 export const AttributesInitialConfig = AttributesBaseConfig;

packages/app-store/routing-forms/lib/evaluateRaqbLogic.ts

@@ -1,8 +1,11 @@
 "use client";
 
 import { Utils as QbUtils, type JsonTree } from "react-awesome-query-builder";
-import jsonLogic from "./jsonLogic";
+
 import { safeStringify } from "@calcom/lib/safeStringify";
+
+import jsonLogic from "./jsonLogic";
+
 export const enum RaqbLogicResult {
  MATCH = "MATCH",
  NO_MATCH = "NO_MATCH",
@@ -30,7 +33,10 @@ export const evaluateRaqbLogic = ({
  if (beStrictWithEmptyLogic && queryValue.children1 && Object.keys(queryValue.children1).length > 0) {
  throw new Error("Couldn't build the logic from the query value");
  }
- console.log("No logic found", safeStringify({ queryValue, queryBuilderConfigFields: queryBuilderConfig.fields }));
+ console.log(
+ "No logic found",
+ safeStringify({ queryValue, queryBuilderConfigFields: queryBuilderConfig.fields })
+ );
  // If no logic is provided, then consider it a match
  return RaqbLogicResult.LOGIC_NOT_FOUND_SO_MATCHED;
  }

packages/app-store/routing-forms/lib/getAttributes.ts

@@ -2,10 +2,11 @@
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import prisma from "@calcom/prisma";
+
 import type { Attribute } from "../types/types";
 
 async function getAttributeToUserWithMembershipAndAttributesForTeam({ teamId }: { teamId: number }) {
- let log = logger.getSubLogger({ prefix: ["getAttributeToUserWithMembershipAndAttributes"] });
+ const log = logger.getSubLogger({ prefix: ["getAttributeToUserWithMembershipAndAttributes"] });
 
  const whereClauseForAttributesAssignedToMembersOfTeam = {
  member: {
@@ -52,9 +53,9 @@ async function getAttributeToUserWithMembershipAndAttributesForTeam({ teamId }:
 }
 
 async function getAttributesAssignedToMembersOfTeam({ teamId }: { teamId: number }) {
- let log = logger.getSubLogger({ prefix: ["getAttributeToUserWithMembershipAndAttributes"] });
+ const log = logger.getSubLogger({ prefix: ["getAttributeToUserWithMembershipAndAttributes"] });
 
- const whereClauseForAttributesAssignedToMembersOfTeam =  {
+ const whereClauseForAttributesAssignedToMembersOfTeam = {
  options: {
  some: {
  assignedUsers: {
@@ -72,7 +73,7 @@ async function getAttributesAssignedToMembersOfTeam({ teamId }: { teamId: number
  },
  },
  },
- }
+ };
 
  log.debug(
  safeStringify({

packages/app-store/routing-forms/lib/getQueryBuilderConfig.ts

@@ -1,4 +1,5 @@
 import { AttributeType } from "@calcom/prisma/enums";
+
 import type { RoutingForm, Attribute } from "../types/types";
 import { FieldTypes, RoutingFormFieldType } from "./FieldTypes";
 import { AttributesInitialConfig, FormFieldsInitialConfig } from "./InitialConfig";

packages/app-store/routing-forms/lib/getSerializableForm.ts

@@ -2,6 +2,8 @@ import type { App_RoutingForms_Form } from "@prisma/client";
 import type { z } from "zod";
 
 import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils";
+import logger from "@calcom/lib/logger";
+import { safeStringify } from "@calcom/lib/safeStringify";
 import { RoutingFormSettings } from "@calcom/prisma/zod-utils";
 
 import type { SerializableForm, SerializableFormTeamMembers } from "../types/types";
@@ -11,8 +13,7 @@ import getConnectedForms from "./getConnectedForms";
 import isRouter from "./isRouter";
 import isRouterLinkedField from "./isRouterLinkedField";
 import { getFieldWithOptions } from "./selectOptions";
-import logger from "@calcom/lib/logger";
-import { safeStringify } from "@calcom/lib/safeStringify";
+
 const log = logger.getSubLogger({ prefix: ["getSerializableForm"] });
 /**
  * Doesn't have deleted fields by default

packages/app-store/routing-forms/lib/processRoute.tsx

@@ -5,10 +5,10 @@ import type { z } from "zod";
 
 import type { FormResponse, Route, SerializableForm } from "../types/types";
 import type { zodNonRouterRoute } from "../zod";
+import { evaluateRaqbLogic, RaqbLogicResult } from "./evaluateRaqbLogic";
 import { getQueryBuilderConfigForFormFields } from "./getQueryBuilderConfig";
 import { isFallbackRoute } from "./isFallbackRoute";
 import isRouter from "./isRouter";
-import { evaluateRaqbLogic, RaqbLogicResult } from "./evaluateRaqbLogic";
 
 export function findMatchingRoute({
  form,
@@ -54,7 +54,7 @@ export function findMatchingRoute({
  queryBuilderConfig,
  data: responseValues,
  });
- 
+
  if (result === RaqbLogicResult.MATCH || result === RaqbLogicResult.LOGIC_NOT_FOUND_SO_MATCHED) {
  chosenRoute = route;
  break;

packages/app-store/routing-forms/package.json

@@ -11,6 +11,10 @@
  "json-logic-js": "^2.0.2",
  "react-awesome-query-builder": "^5.1.2"
  },
+ "scripts": {
+ "lint": "eslint .",
+ "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix"
+ },
  "devDependencies": {
  "@calcom/types": "*",
  "@types/json-logic-js": "^1.2.1"

packages/app-store/routing-forms/pages/reporting/[...appPages].tsx

@@ -22,14 +22,15 @@ import { useInViewObserver } from "@lib/hooks/useInViewObserver";
 import SingleForm, {
  getServerSidePropsForSingleFormView as getServerSideProps,
 } from "../../components/SingleForm";
-import type {FormFieldsBaseConfig} from "../../components/react-awesome-query-builder/config/config";
 import "../../components/react-awesome-query-builder/styles.css";
 import type { JsonLogicQuery } from "../../jsonLogicToPrisma";
-import { getQueryBuilderConfigForFormFields,type FormFieldsQueryBuilderConfigWithRaqbFields } from "../../lib/getQueryBuilderConfig";
+import {
+ getQueryBuilderConfigForFormFields,
+ type FormFieldsQueryBuilderConfigWithRaqbFields,
+} from "../../lib/getQueryBuilderConfig";
 
 export { getServerSideProps };
 
-
 const Result = ({ formId, jsonLogicQuery }: { formId: string; jsonLogicQuery: JsonLogicQuery | null }) => {
  const { t } = useLocale();
 
@@ -167,7 +168,7 @@ const Reporter = ({ form }: { form: inferSSRProps<typeof getServerSideProps>["fo
  return (
  <div className="cal-query-builder">
  <Query
- {...config as unknown as Config}
+ {...(config as unknown as Config)}
  value={query.state.tree}
  onChange={(immutableTree, config) => {
  onChange(immutableTree, config as unknown as FormFieldsQueryBuilderConfigWithRaqbFields);