Fixes for avatar payloads #5921
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
zomars
requested review from
alannnc,
hariombalhara and
a team
and removed request for
alannnc
zomars
commented
Dec 7, 2022
| | "timeFormat" | ||
| | "metadata" | ||
| >; | ||
| user: Pick<User, "username" | "metadata">; |
There was a problem hiding this comment.
Picking only needed fields
| | "timeFormat" | ||
| | "metadata" | ||
| >; | ||
| user: Pick<User, "username" | "metadata">; |
| import { getPlaceholderAvatar } from "@calcom/lib/getPlaceholderAvatar"; | ||
| import prisma from "@calcom/prisma"; | ||
|
|
||
| import { defaultAvatarSrc } from "@lib/profile"; | ||
|
|
||
| export default async function handler(req: NextApiRequest, res: NextApiResponse) { |
There was a problem hiding this comment.
This endpoint was pretty hard to read, I hope this improves legibility a bit.
| const { data: user, isLoading } = trpc.viewer.me.useQuery(); | ||
| const { data: avatar, isLoading: isLoadingAvatar } = trpc.viewer.avatar.useQuery(); |
There was a problem hiding this comment.
We fetch raw avatar in separate endpoint
Comment on lines
+82
to
+84
| utils.viewer.me.invalidate(); | ||
| utils.viewer.avatar.invalidate(); | ||
| setTempFormValues(null); |
| // TODO: Setting avatar value to /avatar.png(which is a dynamic route) would actually reset the avatar because /avatar.png is supposed to return the value of user.avatar | ||
| // if (user.avatar) user.avatar = `${CAL_URL}/${user.username}/avatar.png`; | ||
| const avatar = user.avatar || defaultAvatarSrc({ email }); | ||
| user.avatar = rawAvatar ? `${WEBAPP_URL}/${user.username}/avatar.png` : defaultAvatarSrc({ email }); |
There was a problem hiding this comment.
Hopefully this set the nail in the coffin from #5299
| @@ -160,7 +158,7 @@ const loggedInViewerRouter = router({ | |||
| locale: user.locale, | |||
| timeFormat: user.timeFormat, | |||
| timeZone: user.timeZone, | |||
| avatar: `${CAL_URL}/${user.username}/avatar.png`, | |||
There was a problem hiding this comment.
This is already handled in createContext
Comment on lines
+179
to
+181
| avatar: authedProcedure.query(({ ctx }) => ({ | ||
| avatar: ctx.user.rawAvatar, | ||
| })), |
There was a problem hiding this comment.
Basic query to fetch raw avatar data.
| @@ -1,12 +1,12 @@ | |||
| import React, { forwardRef, ReactElement, ReactNode, Ref, useCallback, useId, useState } from "react"; | |||
| import { Edit2, Eye, EyeOff } from "react-feather"; | |||
| import { FieldValues, FormProvider, SubmitHandler, useFormContext, UseFormReturn } from "react-hook-form"; | ||
|
|
||
| import classNames from "@calcom/lib/classNames"; | ||
| import { getErrorFromUnknown } from "@calcom/lib/errors"; | ||
| import { useLocale } from "@calcom/lib/hooks/useLocale"; | ||
|
|
||
| import { Alert, showToast, Icon, Skeleton, Tooltip, UnstyledSelect } from "../../.."; | ||
| import { Alert, Icon, showToast, Skeleton, Tooltip, UnstyledSelect } from "../../.."; |
emrysal
approved these changes
Dec 8, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Builds upon #5299
viewer.me/api/avatarendpointType of change
How should this be tested?