Skip to content

fix-connect-calendar-minor-issues#4586

Merged
kodiakhq[bot] merged 7 commits intomainfrom
fix/connect-calendar-redirect-v2
Sep 22, 2022
Merged

fix-connect-calendar-minor-issues#4586
kodiakhq[bot] merged 7 commits intomainfrom
fix/connect-calendar-redirect-v2

Conversation

@alannnc
Copy link
Copy Markdown
Contributor

@alannnc alannnc commented Sep 19, 2022

What does this PR do?

  • Fix a visual bug that when redirected from apps/installed both components (List and loading skeleton) were displaying at the same time.
  • Added cookie SSR redirection on new calendar list page for v2

Fixes # (issue)

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

How should this be tested?

  • Do the getting-started flow and now you should be redirected to step 2.
  • While TRPC is loading after being redirected to step 2, you should only be able to see either loading or calendar list.

Checklist

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

… from calendar, added redirect on SSR for installed/calendar page
@vercel
Copy link
Copy Markdown

vercel bot commented Sep 19, 2022

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

Name Status Preview Updated
cal ✅ Ready (Inspect) Visit Preview Sep 22, 2022 at 4:27AM (UTC)

}

// Server side rendering
export async function getServerSideProps(ctx: AppGetServerSidePropsContext) {
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Same code as v1

{/* Already connected calendars */}
{firstCalendar &&
{!queryConnectedCalendars.isLoading &&
firstCalendar &&
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This will prevent that calendar list displays while trpc is loading

@alannnc alannnc requested a review from a team September 19, 2022 00:50
@hariombalhara hariombalhara added the ♻️ autoupdate tells kodiak to keep this branch up-to-date label Sep 19, 2022
Copy link
Copy Markdown
Contributor

@pumfleet pumfleet left a comment

Choose a reason for hiding this comment

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

Code looks good to me, haven't tested

@emrysal emrysal removed the ♻️ autoupdate tells kodiak to keep this branch up-to-date label Sep 21, 2022
@hariombalhara hariombalhara force-pushed the fix/connect-calendar-redirect-v2 branch from ceda3b7 to 31f2496 Compare September 22, 2022 04:13
};
};

export const getStaticPaths: GetStaticPaths = () => {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

cc @leog. This has to go because of SSR requirement.

@hariombalhara hariombalhara added ♻️ autoupdate tells kodiak to keep this branch up-to-date automerge labels Sep 22, 2022
@kodiakhq kodiakhq bot merged commit 341c39c into main Sep 22, 2022
@kodiakhq kodiakhq bot deleted the fix/connect-calendar-redirect-v2 branch September 22, 2022 04:26
@PeerRich PeerRich added the core area: core, team members only label Jul 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge ♻️ autoupdate tells kodiak to keep this branch up-to-date core area: core, team members only

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants