Close.com App #3709

leog · 2022-08-04T20:31:27Z

What does this PR do?

Close.com app for the App Store.

Implements #2619

Environment: Staging(main branch) / Production

Type of change

New feature (non-breaking change which adds functionality)

How should this be tested?

Go to App Store and select Close.com app from the Other category

vercel · 2022-08-04T20:31:30Z

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

Name	Status	Updated
cal	❌ Failed (Inspect)	Aug 15, 2022 at 8:47PM (UTC)
cal-com	❌ Failed (Inspect)	Aug 15, 2022 at 8:47PM (UTC)
nightly-cal	❌ Failed (Inspect)	Aug 15, 2022 at 8:47PM (UTC)

1 Ignored Deployment

Name	Status	Preview	Updated
swagger	⬜️ Ignored (Inspect)		Aug 15, 2022 at 8:47PM (UTC)

zomars

Loving the TDD style for far. Great job @leog I'm pressing for some quality improvements we can achieve so we can merge 🙏🏽

packages/app-store/closecomothercalendar/api/add.ts

packages/app-store/closecomothercalendar/api/check.ts

zomars · 2022-08-12T19:30:27Z

packages/app-store/closecomothercalendar/jest.config.ts

+  setupFiles: ["<rootDir>/test/globals.ts"],
+};
+
+export default config;


How can we run these tests?

packages/app-store/closecomothercalendar/lib/CalendarService.ts

zomars · 2022-08-12T20:03:49Z

packages/app-store/closecomothercalendar/pages/setup/index.tsx

+                  const res = await fetch("/api/integrations/closecomothercalendar/add", {
+                    method: "POST",
+                    body: JSON.stringify(values),
+                    headers: {
+                      "Content-Type": "application/json",
+                    },
+                  });
+                  const json = await res.json();
+
+                  if (res.ok) {
+                    router.push(json.url);
+                  } else {
+                    showToast(json.message, "error");
+                  }


Can we adopt a similar style as routing forms here?

@zomars I guess we could, but to be honest, it feels a bit too much for what needs to be done compared to routing forms. Are we looking to standardize that kind of handling? If so, makes sense to refactor it.

We're moving away from api handlers in web app but we'll let it slide for now.

zomars · 2022-08-12T20:04:12Z

packages/app-store/closecomothercalendar/test/globals.ts

+}));
+
+jest.mock("@calcom/lib/crypto", () => ({
+  symmetricDecrypt: () => `{


zomars · 2022-08-12T20:06:51Z

packages/lib/CloseCom.ts

+
+type CloseComCustomActivityCustomField<T extends string> = `custom.${T}`;
+
+const environmentApiKey = process.env.CLOSECOM_API_KEY || "";


Can we fetch this from the DB? you can follow this style to achieve that.

We actually have two different ways to instance CloseCom. With a key that comes from the user, to manipulate their instance of CloseCom or having one for Cal.com for which that will come from an environment variable.

Let's sync about this @leog

Sure. PTAL at #3814 to know more to what I meant about instancing CloseCom for Cal.com purposes.

zomars · 2022-08-12T20:08:56Z

packages/prisma/seed-app-store.ts

      client_secret: process.env.HUBSPOT_CLIENT_SECRET,
    });
  }
+  // No need to check if environment variable is present, the API Key is set up by the user, not the system


WDYM with this? How is the key set by the user? Do we have a UI for this? Is it saved a credential? If not then this is a system key and should be saved in the DB for consistency with every other app.

Exactly, the setup page for the app gets the key from the user, so in terms of validating if the app can show up as installable, there is no need to check here for any environment variable, as the environment variable for the Close.com API Key is just for our own usage.

* Close.com App (#3709) * WIP close.com app * Removing leaked dev key (now invalid) * Misspelled env variable * Making progress still WIP * Progress + tests * Final touches * More unit tests * Finished up tests * Merge main * Removing unneeded stuff + submodules * Removing static props, fields fix * Removing unneeded stuff p2 * Commenting * Standarizing APIs * Zodifying Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> Co-authored-by: zomars <[email protected]> * fix: padding of kBarTrigger (#3846) * fixes issue with variables not working (#3859) Co-authored-by: CarinaWolli <[email protected]> * fix: remove redundant AND (#3833) Co-authored-by: hussamkhatib <[email protected]> * Hotfix: Embed - Fix issue in accessing sessionStorage in certain scenarios (#3851) * Fixes issue when sessionStorage is not accessible in privacy focussed modes in various browsers * Fix eslint errors Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> * fixed iframe in lark suite, added lark contact info (#3866) * fixed iframe in lark suite, added lark contact info * Update _metadata.ts * Update Railway Template (#3862) * Update Railway Template * Update URL Co-authored-by: Peer Richelsen <[email protected]> * New Crowdin translations by Github Action (#3857) Co-authored-by: Crowdin Bot <[email protected]> * Attempt at redirect to 404 (#3877) * Attempt at redirect to 404 404 should be able to handle the traffic no problem - better ideas welcome. Just a temp fix I imagine; we're not going to want to keep this nor can we expect the User-Agent to continue identifying the traffic source. * Update next.config.js Co-authored-by: zomars <[email protected]> * hotfix dynamic issue (#3864) * Hotfix/dos mitigation attempt error configuration (#3879) * Fixes 'Task timed out after 60.03 seconds' * DDoS rewrite fixes Co-authored-by: zomars <[email protected]> * Fix desktop app link (#3883) * fixed 404 logo on cal video (#3885) * Update all Yarn dependencies (2022-07-29) (#3599) * Update all Yarn dependencies (2022-07-29) * Adds syncpack config * Fixes mismatches * Update yarn.lock * RRule fixes * Locking dayjs to fix build * Type fixes * Fixes mismatches * Submodule sync * Update yarn.lock * Update event.ts * Conflict fixes * Fixes prisma warnings * Liting * Upgrade next, zod * Prevents articfact overwriting * Yarn fixes * Jest fixes * Submodule sync * Formatting * Submodule sync * Adds provider for react-tooltip * Removed dotenv-cli * Readds dotenv-cli * Skips getSchedule tests Until prisma is mocked properly * Fixes * Revert prisma seed script * E2E fixes * test * Removed deprecated req.page in middleware * Make tests stable * Unskip getSchedule tests * fixed 404 logo on cal video (#3885) * Removed PW aliases as aren't needed anymore Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: zomars <[email protected]> Co-authored-by: Hariom Balhara <[email protected]> Co-authored-by: Alex van Andel <[email protected]> Co-authored-by: Peer Richelsen <[email protected]> * Submodule sync * temporally removed missing calendar badge on event-types (#3889) * New Crowdin translations by Github Action (#3878) Co-authored-by: Crowdin Bot <[email protected]> * use default cursor on desktop (#3876) * New Crowdin translations by Github Action (#3890) Co-authored-by: Crowdin Bot <[email protected]> Co-authored-by: Peer Richelsen <[email protected]> * NEXTAUTH_DOMAIN isn't used * Sync submodules * New Crowdin translations by Github Action (#3897) Co-authored-by: Crowdin Bot <[email protected]> * adjust react version * Revert "adjust react version" This reverts commit 6e161da. * cancel booking new design added (#3660) * feat: cancel booking new design added * style: add space-y in button * style: ui fixed for recurring booking * fix: scroll in recurring event and use translation * style: text 2xl instead of text-[24px] * fix: typo, spacing * fix: replaced multiple h2 tags with div * fix: padding and Icon name * Revert " cancel booking new design added" (#3922) This reverts commit a06c564. * New Crowdin translations by Github Action (#3909) Co-authored-by: Crowdin Bot <[email protected]> * New Crowdin translations by Github Action (#3924) Co-authored-by: Crowdin Bot <[email protected]> * New Crowdin translations by Github Action (#3926) Co-authored-by: Crowdin Bot <[email protected]> * fix/auto-connect-calendar-3582 (#3891) * Added alert when there isn't default calendar connected * Add default calendar externalId to select placeholder * Fix typos * Fixes prisma import Co-authored-by: Peer Richelsen <[email protected]> Co-authored-by: zomars <[email protected]> * redesigned cancel page to new design (#3923) Co-authored-by: Alex van Andel <[email protected]> * New Crowdin translations by Github Action (#3927) Co-authored-by: Crowdin Bot <[email protected]> * New Crowdin translations by Github Action (#3929) Co-authored-by: Crowdin Bot <[email protected]> * Design issues on success page in some languages (#3900) Co-authored-by: gitstart <[email protected]> Co-authored-by: Nitesh Singh <[email protected]> Co-authored-by: Júlio Piubello da Silva Cabral <[email protected]> Co-authored-by: Matheus Muniz <[email protected]> Co-authored-by: Matheus Benini <[email protected]> Co-authored-by: Grace Nshokano <[email protected]> Co-authored-by: Matheus Muniz <[email protected]> Co-authored-by: gitstart <[email protected]> Co-authored-by: Murilo Amaral <[email protected]> Co-authored-by: Peer Richelsen <[email protected]> * fix: developer docs url (#3914) * fix: developer docs url added * chore : remove / * chore : import url Co-authored-by: Zach Waterfield <[email protected]> Co-authored-by: Peer Richelsen <[email protected]> * Fixes collective availability for teams with overlapping day timezones (#3898) * WIP * Fix for team availability with time offsets * Prevent empty schedule from opening up everything * When no utcOffset or timeZone's are given, default to 0 utcOffset (UTC) * timeZone should not be part of getUserAvailability * Prevents {days:[X],startTime:0,endTime:0} error entry * Added getAggregateWorkingHours() (#3913) * Added test for getAggregateWorkingHours * Timezone isn't used here anymore * fix: developer docs url (#3914) * fix: developer docs url added * chore : remove / * chore : import url Co-authored-by: Zach Waterfield <[email protected]> Co-authored-by: Peer Richelsen <[email protected]> * Test fixes * Reinstate prisma (generate only) and few comments * Test fixes * Skipping getSchedule again * Added await to expect() as it involves async logic causing the promise to timeout * Test cleanup * Update jest.config.ts Co-authored-by: Alan <[email protected]> Co-authored-by: Alex van Andel <[email protected]> Co-authored-by: Udit Takkar <[email protected]> Co-authored-by: Zach Waterfield <[email protected]> Co-authored-by: Peer Richelsen <[email protected]> * v1.9.1 Co-authored-by: Leo Giovanetti <[email protected]> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> Co-authored-by: zomars <[email protected]> Co-authored-by: Udit Takkar <[email protected]> Co-authored-by: Carina Wollendorfer <[email protected]> Co-authored-by: CarinaWolli <[email protected]> Co-authored-by: mohammed hussam <[email protected]> Co-authored-by: hussamkhatib <[email protected]> Co-authored-by: Hariom Balhara <[email protected]> Co-authored-by: Jake Cooper <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <[email protected]> Co-authored-by: Alex van Andel <[email protected]> Co-authored-by: Syed Ali Shahbaz <[email protected]> Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: Julian Benegas <[email protected]> Co-authored-by: alannnc <[email protected]> Co-authored-by: GitStart <[email protected]> Co-authored-by: gitstart <[email protected]> Co-authored-by: Nitesh Singh <[email protected]> Co-authored-by: Júlio Piubello da Silva Cabral <[email protected]> Co-authored-by: Matheus Muniz <[email protected]> Co-authored-by: Matheus Benini <[email protected]> Co-authored-by: Grace Nshokano <[email protected]> Co-authored-by: Matheus Muniz <[email protected]> Co-authored-by: gitstart <[email protected]> Co-authored-by: Murilo Amaral <[email protected]> Co-authored-by: Zach Waterfield <[email protected]>

leog added 2 commits June 16, 2022 10:27

WIP close.com app

1e3308a

Merge branch 'main' into feat/closecom-app

d55d5d3

leog added the ♻️ autoupdate tells kodiak to keep this branch up-to-date label Aug 4, 2022

leog added this to the v.2.0 milestone Aug 4, 2022

leog linked an issue Aug 4, 2022 that may be closed by this pull request

Close.com App #2619

Closed

leog added 2 commits August 4, 2022 17:33

Removing leaked dev key (now invalid)

73d5d27

Misspelled env variable

4d1c09c

vercel bot deployed to Preview – cal August 4, 2022 20:47 View deployment

Merge branch 'main' into feat/closecom-app

1b9469d

vercel bot deployed to Preview – cal August 5, 2022 05:33 View deployment

Merge branch 'main' into feat/closecom-app

761f18e

vercel bot deployed to Preview – cal August 5, 2022 07:43 View deployment

Merge branch 'main' into feat/closecom-app

0f29f1e

vercel bot deployed to Preview – cal August 5, 2022 08:38 View deployment

Merge branch 'main' into feat/closecom-app

6bb2991

vercel bot deployed to Preview – cal August 5, 2022 08:58 View deployment

Merge branch 'main' into feat/closecom-app

a643736

vercel bot deployed to Preview – cal August 5, 2022 09:16 View deployment

Merge branch 'main' into feat/closecom-app

8964274

vercel bot deployed to Preview – cal August 5, 2022 15:13 View deployment

Making progress still WIP

ab789d5

vercel bot had a problem deploying to Preview – cal August 5, 2022 21:47 Failure

Merge branch 'main' into feat/closecom-app

da7cf23

vercel bot had a problem deploying to Preview – cal August 6, 2022 18:43 Failure

Merge branch 'main' into feat/closecom-app

34705e0

vercel bot had a problem deploying to Preview – cal August 7, 2022 12:36 Failure

Merge branch 'main' into feat/closecom-app

ee41a4b

vercel bot had a problem deploying to Preview – cal August 7, 2022 17:50 Failure

Merge branch 'main' into feat/closecom-app

657bcc8

Merge branch 'main' into feat/closecom-app

72c3397

vercel bot had a problem deploying to Preview – swagger August 11, 2022 19:20 Failure

vercel bot had a problem deploying to Preview – nightly-cal August 11, 2022 19:23 Failure

vercel bot deployed to Preview – cal August 11, 2022 19:30 View deployment

This was referenced Aug 11, 2022

chore: Sync Services to update external tools #3814

Merged

sync user data with helpscout, close and sendgrid #3633

Closed

zomars and others added 2 commits August 12, 2022 13:25

Merge branch 'main' into feat/closecom-app

c19a3d6

Merge branch 'main' into feat/closecom-app

91d84d3

vercel bot had a problem deploying to Preview – cal August 12, 2022 19:48 Failure

zomars suggested changes Aug 12, 2022

View reviewed changes

kodiakhq bot added 2 commits August 12, 2022 20:44

Merge branch 'main' into feat/closecom-app

4accdd0

Merge branch 'main' into feat/closecom-app

d9e4d5e

vercel bot had a problem deploying to Preview – cal August 12, 2022 21:06 Failure

Merge branch 'main' into feat/closecom-app

fb49252

vercel bot had a problem deploying to Preview – cal August 12, 2022 21:42 Failure

Standarizing APIs

f3a3c32

leog requested a review from zomars August 13, 2022 20:15

vercel bot had a problem deploying to Preview – cal August 13, 2022 20:16 Failure

Zodifying

53c7f15

vercel bot had a problem deploying to Preview – cal August 13, 2022 20:35 Failure

zomars approved these changes Aug 15, 2022

View reviewed changes

Merge branch 'main' into feat/closecom-app

d47b553

leog enabled auto-merge (squash) August 15, 2022 20:11

vercel bot had a problem deploying to Preview – cal August 15, 2022 20:13 Failure

kodiakhq bot added 2 commits August 15, 2022 20:21

Merge branch 'main' into feat/closecom-app

55e15c5

Merge branch 'main' into feat/closecom-app

87a1723

leog merged commit 4ce6b91 into main Aug 15, 2022

leog deleted the feat/closecom-app branch August 15, 2022 20:45

vercel bot had a problem deploying to Preview – cal August 15, 2022 20:47 Failure


		type CloseComCustomActivityCustomField<T extends string> = `custom.${T}`;

		const environmentApiKey = process.env.CLOSECOM_API_KEY \|\| "";

Close.com App #3709

Close.com App #3709

Uh oh!

Conversation

leog commented Aug 4, 2022

What does this PR do?

Type of change

How should this be tested?

Uh oh!

vercel bot commented Aug 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zomars left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

vercel bot commented Aug 4, 2022 •

edited

Loading