Skip to content

fix: show email in outlook#5897

Merged
PeerRich merged 58 commits intomainfrom
fix/office365-email
Dec 20, 2022
Merged

fix: show email in outlook#5897
PeerRich merged 58 commits intomainfrom
fix/office365-email

Conversation

@Udit-takkar
Copy link
Copy Markdown
Contributor

@Udit-takkar Udit-takkar commented Dec 6, 2022

Fixes: #5836

Screenshot 2022-12-06 at 5 44 17 PM

fix: change external id to owner address
d8aca46 
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
@vercel
Copy link
Copy Markdown

vercel Bot commented Dec 6, 2022 •
edited
Loading

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

Name Status Preview Updated
cal ✅ Ready (Inspect) Visit Preview Dec 20, 2022 at 9:49PM (UTC)

@mocherfaoui
Copy link
Copy Markdown
Contributor

mocherfaoui commented Dec 6, 2022

hey @Udit-takkar, I think using owner.address as an externalId will create issues with existing/new calendars connected to that email because externalId is used to know the destination calendar. So it will consider all the connected Outlook calendars as destination calendars, you can see "Adding events to" next to all Outlook calendars

@Udit-takkar
Copy link
Copy Markdown
Contributor Author

Udit-takkar commented Dec 6, 2022

@mocherfaoui okay will make some changes to fix this.

@Udit-takkar Udit-takkar marked this pull request as draft December 6, 2022 13:26
@PeerRich
Copy link
Copy Markdown
Member

PeerRich commented Dec 12, 2022

hey @Udit-takkar whats missing so this leaves draft? looks good to me

@Udit-takkar
Copy link
Copy Markdown
Contributor Author

Udit-takkar commented Dec 13, 2022

@PeerRich i would just have to test once with multiple outlook accounts connected.

feat: add email prop in calendar
3582649 
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
fix: only display for outlook
f93f28a 
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
@Udit-takkar Udit-takkar marked this pull request as ready for review December 13, 2022 14:31
Udit-takkar
Udit-takkar commented Dec 13, 2022
View reviewed changes
Comment thread packages/features/calendars/DestinationCalendarSelector.tsx
key: selectedCalendar.credentialId,
label: `${selectedCalendar.integration.title?.replace(/calendar/i, "")} (${
selectedCalendar.primary?.name
selectedCalendar.primary?.integration === "office365_calendar"
Copy link
Copy Markdown
Contributor Author

@Udit-takkar Udit-takkar Dec 13, 2022

Choose a reason for hiding this comment

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

Screenshot 2022-12-13 at 8 03 08 PM

this will also display email in the options

@PeerRich PeerRich requested a review from joeauyeung December 13, 2022 14:37
@PeerRich PeerRich added ♻️ autoupdate tells kodiak to keep this branch up-to-date automerge labels Dec 14, 2022
joeauyeung
joeauyeung reviewed Dec 19, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@joeauyeung joeauyeung left a comment

Choose a reason for hiding this comment

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

For Outlook, it's still not showing the most accurate email. It should be the email being used to connect Cal.
image

Comment thread apps/web/components/apps/CalendarListContainer.tsx Outdated
@Udit-takkar
Copy link
Copy Markdown
Contributor Author

Udit-takkar commented Dec 20, 2022

@joeauyeung idk why you are getting wrong email. let me check the docs once again.

fix: add email for apple calendar
219e7d7 
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
fix: type error and use description
679ff3f 
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
fix: try using email from /me endpoint
d5c521e 
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
@Udit-takkar
Copy link
Copy Markdown
Contributor Author

Udit-takkar commented Dec 20, 2022

@joeauyeung i now used another endpoint /me to get email address. can you try once again now ?

fix: fallback to principal name when mail is not there
845f1af 
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
@joeauyeung joeauyeung self-requested a review December 20, 2022 19:36
chore: use empty string for fallback
fc40f92 
Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
joeauyeung
joeauyeung approved these changes Dec 20, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@joeauyeung joeauyeung left a comment

Choose a reason for hiding this comment

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

LGTM

@PeerRich PeerRich enabled auto-merge (squash) December 20, 2022 21:24
@PeerRich PeerRich added ♻️ autoupdate tells kodiak to keep this branch up-to-date automerge labels Dec 20, 2022
@PeerRich PeerRich merged commit 2d9064e into main Dec 20, 2022
@PeerRich PeerRich deleted the fix/office365-email branch December 20, 2022 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PeerRich PeerRich PeerRich left review comments

@joeauyeung joeauyeung joeauyeung approved these changes

Assignees

No one assigned

Labels

automerge ♻️ autoupdate tells kodiak to keep this branch up-to-date

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[CAL-525] Installed Apps / Outlook Calendar - Connected calendar not showing email address

4 participants

@Udit-takkar @mocherfaoui @PeerRich @joeauyeung