fix/auto-connect-calendar-3582 #3891

alannnc · 2022-08-17T21:36:25Z

What does this PR do?

Removes label that says no connected calendar to an event type
Shows new info Alert on event-types page when no destinationCalendar (default calendar) is found
Adds onCascade: true to destinationCalendar model
Now we display destinationCalendar (default) in event-type/$id page in select when no specific calendar is selected.

Fixes #3582

https://www.loom.com/share/dbf7372d65ad4104baea2bcc46b78980

Environment: Staging(main branch) / Production

Type of change

Bug fix (non-breaking change which fixes an issue)

How should this be tested?

Remove any calendar, go to event-types pages an alert should be showing up
Enter event-type/$id page and when no destinationCalendar it's selected for that event type we should display user.destinationCalendar(default) as placeholder in Select component.

Checklist

I haven't added tests that prove my fix is effective or that my feature works

vercel · 2022-08-17T21:36:29Z

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

Name	Status	Preview	Updated
cal	❌ Failed (Inspect)		Aug 22, 2022 at 7:27PM (UTC)

1 Ignored Deployment

Name	Status	Preview	Updated
swagger	⬜️ Ignored (Inspect)		Aug 22, 2022 at 7:27PM (UTC)

alannnc · 2022-08-17T21:37:06Z

apps/web/components/DestinationCalendarSelector.tsx

@@ -11,13 +12,15 @@ interface Props {
  hidePlaceholder?: boolean;
  /** The external Id of the connected calendar */
  value: string | undefined;
+  destinationCalendar?: DestinationCalendar | null;


DestinationCalendar its now being received as prop to show it as placeholder when no option is selected.

alannnc · 2022-08-17T21:37:30Z

apps/web/pages/event-types/index.tsx

+                  }
+                />
+              )}
+


New alert when user.destinationCalendar is not found

alannnc · 2022-08-17T21:37:47Z

apps/web/public/static/locales/en/common.json

  "company_size": "Company size",
  "what_help_needed": "What do you need help with?",
  "variable_format": "Variable format",
-  "custom_input_as_variable_info": "Ignore all special characters of the additonal input label (use only letters and numbers), use uppercase for all letters and replace whitespaces with underscores.",
+  "custom_input_as_variable_info": "Ignore all special characters of the additional input label (use only letters and numbers), use uppercase for all letters and replace whitespaces with underscores.",


alannnc · 2022-08-17T21:38:08Z

packages/prisma/migrations/20220817201039_/migration.sql

+ALTER TABLE "DestinationCalendar" ADD CONSTRAINT "DestinationCalendar_eventTypeId_fkey" FOREIGN KEY ("eventTypeId") REFERENCES "EventType"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DestinationCalendar" ADD CONSTRAINT "DestinationCalendar_credentialId_fkey" FOREIGN KEY ("credentialId") REFERENCES "Credential"("id") ON DELETE CASCADE ON UPDATE CASCADE;


missing onCascade relationship actions

apps/web/pages/event-types/index.tsx

* 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 <zomars@me.com> * fix: padding of kBarTrigger (#3846) * fixes issue with variables not working (#3859) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * fix: remove redundant AND (#3833) Co-authored-by: hussamkhatib <hussamkhatib@gmail.com> * 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 <peeroke@gmail.com> * New Crowdin translations by Github Action (#3857) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> * 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 <zomars@me.com> * 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 <zomars@me.com> * 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 <zomars@me.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> * Submodule sync * temporally removed missing calendar badge on event-types (#3889) * New Crowdin translations by Github Action (#3878) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> * use default cursor on desktop (#3876) * New Crowdin translations by Github Action (#3890) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> * NEXTAUTH_DOMAIN isn't used * Sync submodules * New Crowdin translations by Github Action (#3897) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> * 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 <support+bot@crowdin.com> * New Crowdin translations by Github Action (#3924) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> * New Crowdin translations by Github Action (#3926) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> * 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 <peeroke@gmail.com> Co-authored-by: zomars <zomars@me.com> * redesigned cancel page to new design (#3923) Co-authored-by: Alex van Andel <me@alexvanandel.com> * New Crowdin translations by Github Action (#3927) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> * New Crowdin translations by Github Action (#3929) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> * Design issues on success page in some languages (#3900) Co-authored-by: gitstart <gitstart@users.noreply.github.com> Co-authored-by: Nitesh Singh <nitesh.singh@gitstart.dev> Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev> Co-authored-by: Matheus Muniz <87545749+matheusmuniz03@users.noreply.github.com> Co-authored-by: Matheus Benini <matheus_benini@hotmail.com> Co-authored-by: Grace Nshokano <grace.devolop@gmail.com> Co-authored-by: Matheus Muniz <matheusmuniz100@hotmail.com> Co-authored-by: gitstart <gitstart@gitstart.com> Co-authored-by: Murilo Amaral <87545137+MuriloAmarals@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> * fix: developer docs url (#3914) * fix: developer docs url added * chore : remove / * chore : import url Co-authored-by: Zach Waterfield <zlwaterfield@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> * 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 <zlwaterfield@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> * 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 <alannnc@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Zach Waterfield <zlwaterfield@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> * v1.9.1 Co-authored-by: Leo Giovanetti <hello@leog.me> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> Co-authored-by: zomars <zomars@me.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: mohammed hussam <52914487+hussamkhatib@users.noreply.github.com> Co-authored-by: hussamkhatib <hussamkhatib@gmail.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Jake Cooper <jake.elijah.cooper@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: Julian Benegas <julianbenegas99@gmail.com> Co-authored-by: alannnc <alannnc@gmail.com> Co-authored-by: GitStart <1501599+gitstart@users.noreply.github.com> Co-authored-by: gitstart <gitstart@users.noreply.github.com> Co-authored-by: Nitesh Singh <nitesh.singh@gitstart.dev> Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev> Co-authored-by: Matheus Muniz <87545749+matheusmuniz03@users.noreply.github.com> Co-authored-by: Matheus Benini <matheus_benini@hotmail.com> Co-authored-by: Grace Nshokano <grace.devolop@gmail.com> Co-authored-by: Matheus Muniz <matheusmuniz100@hotmail.com> Co-authored-by: gitstart <gitstart@gitstart.com> Co-authored-by: Murilo Amaral <87545137+MuriloAmarals@users.noreply.github.com> Co-authored-by: Zach Waterfield <zlwaterfield@gmail.com>

alannnc added 3 commits August 17, 2022 15:00

Added alert when there isn't default calendar connected

c96c035

Add default calendar externalId to select placeholder

56d86de

Fix typos

57cdf40

alannnc linked an issue Aug 17, 2022 that may be closed by this pull request

Auto-Connect Calendar #3582

Closed

alannnc self-assigned this Aug 17, 2022

alannnc commented Aug 17, 2022

View reviewed changes

apps/web/pages/event-types/index.tsx

}

/>

)}

Copy link

Contributor Author

alannnc Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New alert when user.destinationCalendar is not found

alannnc commented Aug 17, 2022

View reviewed changes

alannnc requested a review from a team August 17, 2022 21:38

merge with main, solution for todo comment was made

ad7b3fe

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

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

ciaranha added this to the v.2.0 milestone Aug 17, 2022

Merge branch 'main' into auto-connect-calendar-3582

a991889

PeerRich requested review from emrysal, zomars and hariombalhara August 18, 2022 19:52

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

Merge branch 'main' into auto-connect-calendar-3582

1c5a228

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

Merge branch 'main' into auto-connect-calendar-3582

5c6ed07

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

Fixes prisma import

c385d56

zomars approved these changes Aug 22, 2022

View reviewed changes

apps/web/pages/event-types/index.tsx Outdated Show resolved Hide resolved

apps/web/pages/event-types/index.tsx Outdated Show resolved Hide resolved

zomars added ♻️ autoupdate tells kodiak to keep this branch up-to-date automerge labels Aug 22, 2022

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

kodiakhq bot merged commit b328527 into main Aug 22, 2022

kodiakhq bot deleted the auto-connect-calendar-3582 branch August 22, 2022 19:34

sean-brydon mentioned this pull request Aug 25, 2022

V1->V2 connect calendar #3961

Merged

PeerRich added the core area: core, team members only label Jul 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix/auto-connect-calendar-3582 #3891

fix/auto-connect-calendar-3582 #3891

alannnc commented Aug 17, 2022

vercel bot commented Aug 17, 2022 •

edited

Loading

alannnc Aug 17, 2022

alannnc Aug 17, 2022

alannnc Aug 17, 2022

alannnc Aug 17, 2022

fix/auto-connect-calendar-3582 #3891

fix/auto-connect-calendar-3582 #3891

Conversation

alannnc commented Aug 17, 2022

What does this PR do?

Type of change

How should this be tested?

Checklist

vercel bot commented Aug 17, 2022 • edited Loading

alannnc Aug 17, 2022

Choose a reason for hiding this comment

alannnc Aug 17, 2022

Choose a reason for hiding this comment

alannnc Aug 17, 2022

Choose a reason for hiding this comment

alannnc Aug 17, 2022

Choose a reason for hiding this comment

vercel bot commented Aug 17, 2022 •

edited

Loading