Merge branch 'main' into fix-memory-leak

calcom · Oct 12, 2024 · af70617 · af70617
2 parents 31657c3 + b1d9e2b
commit af70617
Show file tree

Hide file tree

Showing 15 changed files with 406 additions and 96 deletions.
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
@@ -2644,6 +2644,15 @@
   "month_to_date": "month to date",
   "year_to_date": "year to date",
   "custom_range": "custom range",
+  "salesforce_create_record_as": "On booking, add events on and new attendees as:",
+  "salesforce_lead": "Lead",
+  "salesforce_contact_under_account": "Contact under an account", 
+  "salesforce_skip_entry_creation": "Skip creating {{entry}} record if they do not exist in Salesforce",
+  "salesforce_if_account_does_not_exist": "If the contact does not exist under an account, create new lead from attendee",
+  "salesforce_create_new_contact_under_account": "Create a new contact under an account based on email domain of attendee and existing contacts", 
   "mass_assign_attributes": "Mass assign attributes",
+  "salesforce_book_directly_with_attendee_owner": "If attendee exists in Salesforce, book directly with the owner",
+  "salesforce_check_owner_of": "Entity to check owner of to book directly",
+  "account": "Account",
   "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
 }
diff --git a/packages/app-store/_utils/CRMRoundRobinSkip.ts b/packages/app-store/_utils/CRMRoundRobinSkip.ts
@@ -24,7 +24,7 @@ export async function getCRMContactOwnerForRRLeadSkip(
 
   if (!crm) return;
 
-  const contact = await crm.getContacts(bookerEmail, true);
+  const contact = await crm.getContacts({ emails: bookerEmail, forRoundRobinSkip: true });
   if (!contact?.length) return;
   return contact[0].ownerEmail;
 }
@@ -57,5 +57,5 @@ async function getCRMManagerWithRRLeadSkip(apps: z.infer<typeof EventTypeAppMeta
     },
   });
   if (!crmCredential) return;
-  return new CrmManager(crmCredential);
+  return new CrmManager(crmCredential, crmRoundRobinLeadSkip);
 }
diff --git a/packages/app-store/_utils/getCrm.ts b/packages/app-store/_utils/getCrm.ts
@@ -6,10 +6,10 @@ import appStore from "..";
 
 type Class<I, Args extends any[] = any[]> = new (...args: Args) => I;
 
-type CrmClass = Class<CRM, [CredentialPayload]>;
+type CrmClass = Class<CRM, [CredentialPayload, any]>;
 
 const log = logger.getSubLogger({ prefix: ["CrmManager"] });
-export const getCrm = async (credential: CredentialPayload) => {
+export const getCrm = async (credential: CredentialPayload, appOptions: any) => {
   if (!credential || !credential.key) return null;
   const { type: crmType } = credential;
 
@@ -26,7 +26,7 @@ export const getCrm = async (credential: CredentialPayload) => {
 
   if (crmApp && "lib" in crmApp && "CrmService" in crmApp.lib) {
     const CrmService = crmApp.lib.CrmService as CrmClass;
-    return new CrmService(credential);
+    return new CrmService(credential, appOptions);
   }
 };
 

diff --git a/packages/app-store/closecom/lib/CrmService.ts b/packages/app-store/closecom/lib/CrmService.ts
@@ -121,7 +121,7 @@ export default class CloseComCRMService implements CRM {
     await this.closeComDeleteCustomActivity(uid);
   }
 
-  async getContacts(emails: string | string[]): Promise<Contact[]> {
+  async getContacts({ emails }: { emails: string | string[] }): Promise<Contact[]> {
     const contactsQuery = await this.closeCom.contact.search({
       emails: Array.isArray(emails) ? emails : [emails],
     });
@@ -177,4 +177,8 @@ export default class CloseComCRMService implements CRM {
 
     return contacts;
   }
+
+  getAppOptions() {
+    console.log("No options implemented");
+  }
 }
diff --git a/packages/app-store/hubspot/lib/CrmService.ts b/packages/app-store/hubspot/lib/CrmService.ts
@@ -198,7 +198,7 @@ export default class HubspotCalendarService implements CRM {
     return await this.hubspotDeleteMeeting(uid);
   }
 
-  async getContacts(emails: string | string[]): Promise<Contact[]> {
+  async getContacts({ emails }: { emails: string | string[] }): Promise<Contact[]> {
     const auth = await this.auth;
     await auth.getToken();
 
@@ -269,4 +269,8 @@ export default class HubspotCalendarService implements CRM {
       };
     });
   }
+
+  getAppOptions() {
+    console.log("No options implemented");
+  }
 }
diff --git a/packages/app-store/pipedrive-crm/lib/CrmService.ts b/packages/app-store/pipedrive-crm/lib/CrmService.ts
@@ -78,8 +78,8 @@ export default class PipedriveCrmService implements CRM {
     return results.map((result) => result.result);
   }
 
-  async getContacts(email: string | string[]): Promise<Contact[]> {
-    const emailArray = Array.isArray(email) ? email : [email];
+  async getContacts({ emails }: { emails: string | string[] }): Promise<Contact[]> {
+    const emailArray = Array.isArray(emails) ? emails : [emails];
 
     const result = emailArray.map(async (attendeeEmail) => {
       const headers = new Headers();
@@ -230,4 +230,8 @@ export default class PipedriveCrmService implements CRM {
   async listCalendars(_event?: CalendarEvent): Promise<IntegrationCalendar[]> {
     return Promise.resolve([]);
   }
+
+  getAppOptions() {
+    console.log("No options implemented");
+  }
 }
diff --git a/packages/app-store/salesforce/components/EventTypeAppCardInterface.tsx b/packages/app-store/salesforce/components/EventTypeAppCardInterface.tsx
@@ -1,4 +1,5 @@
 import { usePathname } from "next/navigation";
+import { useState } from "react";
 
 import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
 import AppCard from "@calcom/app-store/_components/AppCard";
@@ -7,8 +8,9 @@ import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { SchedulingType } from "@calcom/prisma/enums";
-import { Switch, Alert } from "@calcom/ui";
+import { Switch, Alert, Select } from "@calcom/ui";
 
+import { SalesforceRecordEnum } from "../lib/recordEnum";
 import type { appDataSchema } from "../zod";
 
 const EventTypeAppCard: EventTypeAppCardComponent = function EventTypeAppCard({ app, eventType }) {
@@ -17,9 +19,32 @@ const EventTypeAppCard: EventTypeAppCardComponent = function EventTypeAppCard({
   const { getAppData, setAppData, disabled } = useAppContextWithSchema<typeof appDataSchema>();
   const { enabled, updateEnabled } = useIsAppEnabled(app);
   const isRoundRobinLeadSkipEnabled = getAppData("roundRobinLeadSkip");
+  const roundRobinSkipCheckRecordOn =
+    getAppData("roundRobinSkipCheckRecordOn") ?? SalesforceRecordEnum.CONTACT;
   const isSkipContactCreationEnabled = getAppData("skipContactCreation");
+  const createLeadIfAccountNull = getAppData("createLeadIfAccountNull");
+  const createNewContactUnderAccount = getAppData("createNewContactUnderAccount");
+  const createEventOn = getAppData("createEventOn") ?? SalesforceRecordEnum.CONTACT;
   const { t } = useLocale();
 
+  const recordOptions = [
+    { label: t("contact"), value: SalesforceRecordEnum.CONTACT },
+    { label: t("salesforce_lead"), value: SalesforceRecordEnum.LEAD },
+    { label: t("salesforce_contact_under_account"), value: SalesforceRecordEnum.ACCOUNT },
+  ];
+  const [createEventOnSelectedOption, setCreateEventOnSelectedOption] = useState(
+    recordOptions.find((option) => option.value === createEventOn) ?? recordOptions[0]
+  );
+
+  const checkOwnerOptions = [
+    { label: t("contact"), value: SalesforceRecordEnum.CONTACT },
+    { label: t("salesforce_lead"), value: SalesforceRecordEnum.LEAD },
+    { label: t("account"), value: SalesforceRecordEnum.ACCOUNT },
+  ];
+  const [checkOwnerSelectedOption, setCheckOwnerSelectedOption] = useState(
+    checkOwnerOptions.find((option) => option.value === roundRobinSkipCheckRecordOn) ?? checkOwnerOptions[0]
+  );
+
   return (
     <AppCard
       returnTo={`${WEBAPP_URL}${pathname}?tabName=apps`}
@@ -31,34 +56,95 @@ const EventTypeAppCard: EventTypeAppCardComponent = function EventTypeAppCard({
       switchChecked={enabled}
       hideSettingsIcon>
       <>
-        <div>
-          <Switch
-            label={t("skip_contact_creation", { appName: "Salesforce" })}
-            labelOnLeading
-            checked={isSkipContactCreationEnabled}
-            onCheckedChange={(checked) => {
-              setAppData("skipContactCreation", checked);
-            }}
-          />
-        </div>
-      </>
-      {eventType.schedulingType === SchedulingType.ROUND_ROBIN ? (
-        <div className="mt-4">
-          <Switch
-            label={t("skip_rr_assignment_label")}
-            labelOnLeading
-            checked={isRoundRobinLeadSkipEnabled}
-            onCheckedChange={(checked) => {
-              setAppData("roundRobinLeadSkip", checked);
-              if (checked) {
-                // temporary solution, enabled should always be already set
-                setAppData("enabled", checked);
+        <div className="mb-4 ml-2">
+          <label className="text-emphasis mb-2 align-text-top text-sm font-medium">
+            {t("salesforce_create_record_as")}
+          </label>
+          <Select
+            className="mt-2 w-60"
+            options={recordOptions}
+            value={createEventOnSelectedOption}
+            onChange={(e) => {
+              if (e) {
+                setCreateEventOnSelectedOption(e);
+                setAppData("createEventOn", e.value);
               }
             }}
           />
-          <Alert className="mt-2" severity="neutral" title={t("skip_rr_description")} />
         </div>
-      ) : null}
+        {createEventOnSelectedOption.value === SalesforceRecordEnum.CONTACT ? (
+          <div>
+            <Switch
+              label={t("skip_contact_creation", { appName: "Salesforce" })}
+              labelOnLeading
+              checked={isSkipContactCreationEnabled}
+              onCheckedChange={(checked) => {
+                setAppData("skipContactCreation", checked);
+              }}
+            />
+          </div>
+        ) : null}
+        {createEventOnSelectedOption.value === SalesforceRecordEnum.ACCOUNT ? (
+          <>
+            <div className="mb-4">
+              <Switch
+                label={t("salesforce_create_new_contact_under_account")}
+                labelOnLeading
+                checked={createNewContactUnderAccount}
+                onCheckedChange={(checked) => {
+                  setAppData("createNewContactUnderAccount", checked);
+                }}
+              />
+            </div>
+            <div>
+              <Switch
+                label={t("salesforce_if_account_does_not_exist")}
+                labelOnLeading
+                checked={createLeadIfAccountNull}
+                onCheckedChange={(checked) => {
+                  setAppData("createLeadIfAccountNull", checked);
+                }}
+              />
+            </div>
+          </>
+        ) : null}
+
+        {eventType.schedulingType === SchedulingType.ROUND_ROBIN ? (
+          <div className="mt-4">
+            <Switch
+              label={t("salesforce_book_directly_with_attendee_owner")}
+              labelOnLeading
+              checked={isRoundRobinLeadSkipEnabled}
+              onCheckedChange={(checked) => {
+                setAppData("roundRobinLeadSkip", checked);
+                if (checked) {
+                  // temporary solution, enabled should always be already set
+                  setAppData("enabled", checked);
+                }
+              }}
+            />
+            {isRoundRobinLeadSkipEnabled ? (
+              <div className="my-4 ml-2">
+                <label className="text-emphasis mb-2 align-text-top text-sm font-medium">
+                  {t("salesforce_check_owner_of")}
+                </label>
+                <Select
+                  className="mt-2 w-60"
+                  options={checkOwnerOptions}
+                  value={checkOwnerSelectedOption}
+                  onChange={(e) => {
+                    if (e) {
+                      setCheckOwnerSelectedOption(e);
+                      setAppData("roundRobinSkipCheckRecordOn", e.value);
+                    }
+                  }}
+                />
+              </div>
+            ) : null}
+            <Alert className="mt-2" severity="neutral" title={t("skip_rr_description")} />
+          </div>
+        ) : null}
+      </>
     </AppCard>
   );
 };