New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix/availability not loading #7789
Conversation
The latest updates on your projects. Learn more about Vercel for Git ↗︎
1 Ignored Deployment
|
isLoading: boolean; | ||
schedules: RouterOutputs["viewer"]["availability"]["list"]["schedules"] | []; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved the query up a level to display the empty screen component if there are no schedules
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
During load it flashes the empty screen component before showing the schedule. (blocking because of this)
There is a design implementation error on the empty screen with a double border. NIT as it's unrelated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -153,7 +154,7 @@ export default function Availability() { | |||
|
|||
return ( | |||
<Shell | |||
backPath="/availability" | |||
backPath={fromEventType ? true : "/availability"} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we create a new schedule from an event type, the back button should bring the user back to the event type.
if (!user.defaultScheduleId) { | ||
await prisma.user.update({ | ||
where: { | ||
id: user.id, | ||
}, | ||
data: { | ||
defaultScheduleId: schedule.id, | ||
}, | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This function returns the first schedule as the default if the user does not have one set. If this is the case then we should set that schedule as the default
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't this what setupDefaultSchedule did/does? 😕
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's what I thought as well, but it wasn't triggering
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dug into it some more. The getter always returned an id, either the user default id or the first schedule in the query. That means the update was never triggered.
@@ -247,7 +254,7 @@ export const availabilityRouter = router({ | |||
id: user.id, | |||
}, | |||
data: { | |||
defaultScheduleId: scheduleToSetAsDefault?.id, | |||
defaultScheduleId: scheduleToSetAsDefault?.id || null, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If a user deletes a schedule, the next available schedule should be their default. If there are none, then we should set the field to null.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good spot!
📦 Next.js Bundle AnalysisThis analysis was generated by the next.js bundle analysis action 🤖
|
Page | Size (compressed) |
---|---|
global |
233.24 KB (🟡 +22 B) |
Details
The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.
Any third party scripts you have added directly to your app using the <script>
tag are not accounted for in this analysis
If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!
Forty-three Pages Changed Size
The following pages changed size from the code in this PR compared to its base branch:
Page | Size (compressed) | First Load | % of Budget (350 KB ) |
---|---|---|---|
/apps |
167.17 KB |
400.41 KB | 114.40% (+/- <0.01%) |
/apps/[slug] |
190.9 KB |
424.14 KB | 121.18% (+/- <0.01%) |
/apps/[slug]/[...pages] |
392.31 KB |
625.55 KB | 178.73% (+/- <0.01%) |
/apps/categories |
152.07 KB |
385.31 KB | 110.09% (+/- <0.01%) |
/apps/categories/[category] |
155.94 KB |
389.18 KB | 111.19% (+/- <0.01%) |
/apps/installed/[category] |
197.04 KB |
430.28 KB | 122.94% (+/- <0.01%) |
/availability |
155.38 KB |
388.62 KB | 111.03% (🟡 +0.03%) |
/availability/[schedule] |
272.13 KB |
505.38 KB | 144.39% (🟡 +0.02%) |
/availability/troubleshoot |
152.76 KB |
386 KB | 110.29% (🟢 -0.01%) |
/bookings/[status] |
272.38 KB |
505.62 KB | 144.46% (+/- <0.01%) |
/event-types |
349.31 KB |
582.55 KB | 166.44% (+/- <0.01%) |
/event-types/[type] |
382.89 KB |
616.13 KB | 176.04% (🟡 +0.15%) |
/insights |
386.24 KB |
619.48 KB | 176.99% (+/- <0.01%) |
/more |
151.7 KB |
384.94 KB | 109.98% (+/- <0.01%) |
/settings/admin |
157.15 KB |
390.39 KB | 111.54% (+/- <0.01%) |
/settings/admin/apps |
165.84 KB |
399.08 KB | 114.02% (+/- <0.01%) |
/settings/admin/apps/[category] |
165.82 KB |
399.06 KB | 114.02% (+/- <0.01%) |
/settings/admin/flags |
160.05 KB |
393.29 KB | 112.37% (+/- <0.01%) |
/settings/admin/impersonation |
157.44 KB |
390.68 KB | 111.62% (+/- <0.01%) |
/settings/billing |
157.26 KB |
390.5 KB | 111.57% (+/- <0.01%) |
/settings/developer/api-keys |
186.42 KB |
419.66 KB | 119.90% (+/- <0.01%) |
/settings/developer/webhooks |
159.76 KB |
393 KB | 112.28% (+/- <0.01%) |
/settings/developer/webhooks/[id] |
190.61 KB |
423.85 KB | 121.10% (+/- <0.01%) |
/settings/developer/webhooks/new |
190.47 KB |
423.71 KB | 121.06% (+/- <0.01%) |
/settings/my-account/appearance |
171.23 KB |
404.47 KB | 115.56% (+/- <0.01%) |
/settings/my-account/calendars |
191.45 KB |
424.69 KB | 121.34% (+/- <0.01%) |
/settings/my-account/conferencing |
163.03 KB |
396.27 KB | 113.22% (+/- <0.01%) |
/settings/my-account/general |
266.42 KB |
499.66 KB | 142.76% (+/- <0.01%) |
/settings/my-account/profile |
274.31 KB |
507.55 KB | 145.02% (🟢 -0.01%) |
/settings/security/impersonation |
159.3 KB |
392.54 KB | 112.16% (🟢 -0.01%) |
/settings/security/password |
192.6 KB |
425.84 KB | 121.67% (+/- <0.01%) |
/settings/security/sso |
167 KB |
400.24 KB | 114.35% (+/- <0.01%) |
/settings/security/two-factor-auth |
161.76 KB |
395 KB | 112.86% (+/- <0.01%) |
/settings/teams |
156.9 KB |
390.14 KB | 111.47% (+/- <0.01%) |
/settings/teams/[id]/appearance |
171.25 KB |
404.49 KB | 115.57% (+/- <0.01%) |
/settings/teams/[id]/billing |
157.13 KB |
390.37 KB | 111.54% (🟢 -0.01%) |
/settings/teams/[id]/members |
297.13 KB |
530.38 KB | 151.54% (🟢 -0.01%) |
/settings/teams/[id]/profile |
269.52 KB |
502.76 KB | 143.65% (+/- <0.01%) |
/settings/teams/[id]/sso |
167.09 KB |
400.33 KB | 114.38% (+/- <0.01%) |
/settings/teams/new |
92.72 KB |
325.96 KB | 93.13% (+/- <0.01%) |
/teams |
151.91 KB |
385.15 KB | 110.04% (+/- <0.01%) |
/workflows |
164.81 KB |
398.05 KB | 113.73% (+/- <0.01%) |
/workflows/[workflow] |
294.01 KB |
527.25 KB | 150.64% (+/- <0.01%) |
Details
Only the gzipped size is provided here based on an expert tip.
First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link
is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.
Any third party scripts you have added directly to your app using the <script>
tag are not accounted for in this analysis
The "Budget %" column shows what percentage of your performance budget the First Load total takes up. For example, if your budget was 100kb, and a given page's first load size was 10kb, it would be 10% of your budget. You can also see how much this has increased or decreased compared to the base branch of your PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this. If you see "+/- <0.01%" it means that there was a change in bundle size, but it is a trivial enough amount that it can be ignored.
No failed tests 🎉 |
isLoading: boolean; | ||
schedules: RouterOutputs["viewer"]["availability"]["list"]["schedules"] | []; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
During load it flashes the empty screen component before showing the schedule. (blocking because of this)
There is a design implementation error on the empty screen with a double border. NIT as it's unrelated
if (!user.defaultScheduleId) { | ||
await prisma.user.update({ | ||
where: { | ||
id: user.id, | ||
}, | ||
data: { | ||
defaultScheduleId: schedule.id, | ||
}, | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't this what setupDefaultSchedule did/does? 😕
@@ -247,7 +254,7 @@ export const availabilityRouter = router({ | |||
id: user.id, | |||
}, | |||
data: { | |||
defaultScheduleId: scheduleToSetAsDefault?.id, | |||
defaultScheduleId: scheduleToSetAsDefault?.id || null, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good spot!
@@ -459,6 +467,11 @@ const getDefaultScheduleId = async (userId: number, prisma: PrismaClient) => { | |||
}, | |||
}); | |||
|
|||
await prisma.user.update({ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
An update in a getter is very unexpected, function probably needs renaming (or logic modified)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
packages/prisma/schema.prisma
Outdated
@@ -168,7 +168,7 @@ model User { | |||
teams Membership[] | |||
bookings Booking[] | |||
schedules Schedule[] | |||
defaultScheduleId Int? | |||
defaultScheduleId Int |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Made optional in the next commit
@emrysal from our conversation, I prevented users from deleting their last schedule. Also, during setup when the first schedule is created, it should automatically populate the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
What does this PR do?
This PR fixes
https://www.loom.com/share/dd7e533941f5418db5d2667b142ad8be
Fixes #7783
Environment: Staging(main branch) / Production
Type of change
How should this be tested?
Checklist