show upgrade badge and hide /team/null when team unpublished #7059

PeerRich · 2023-02-12T13:42:00Z

untested but i think this works

@zomars how can i test an unpublished team on localhost?

linear · 2023-02-12T13:42:02Z

CAL-1045 make an "Upgrade" badge next to /null/ teams and hide slug

CleanShot 2023-02-12 at 13.05.122x.jpg

vercel · 2023-02-12T13:42:05Z

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

Name	Status	Preview	Comments	Updated
cal	✅ Ready (Inspect)	Visit Preview	💬 Add your feedback	Feb 15, 2023 at 7:58PM (UTC)

1 Ignored Deployment

Name	Status	Preview	Comments	Updated
ui	⬜️ Ignored (Inspect)	Visit Preview		Feb 15, 2023 at 7:58PM (UTC)

sean-brydon · 2023-02-12T21:59:53Z

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

@@ -60,6 +60,8 @@ import SkeletonLoader from "@components/eventtype/SkeletonLoader";

 import { ssrInit } from "@server/lib/ssr";

+import { UpgradeTeamsBadge } from "../../../../packages/ui/components/badge/UpgradeTeamsBadge";


Suggested change

import { UpgradeTeamsBadge } from "../../../../packages/ui/components/badge/UpgradeTeamsBadge";

import { UpgradeTeamsBadge } from "@calcom/ui/components/badge/UpgradeTeamsBadge";

@sean-brydon does this really belong in @calcom/ui? NIT

Likely not to be honest @emrysal

true. its a smart component, better in features

but we actually dont wanna use this component at all haha

sean-brydon · 2023-02-12T22:00:52Z

untested but i think this works

@zomars how can i test an unpublished team on localhost?

You can create a unpublished team by going to step one of create a team -> Then just hit back or navigate back to localhost:3000

PeerRich · 2023-02-12T22:53:54Z

actually the badge needs to link to stripe not to /teams

we need to replace that @zomars

emrysal

Approved although it is not clear whether your request for feedback was intended to be a blocker @PeerRich (just approving and not auto-merge in case it was)

PeerRich · 2023-02-13T18:49:57Z

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

+            {`/${group.profile.slug}/${type.slug}`}
+          </small>
+        ) : (
+          <UpgradeTeamsBadge />


@zomars can we give this a props => upgradeLink={true} that uses the "upgrade" stripe api link vs the /team url

keep the logic with tooltip etc but link to the stripe checkout

No need to prop AFAIK. we can encapsulate that logic in the components itself.

not sure what that means but if you have a free minute may you wanna add that? you built the initial "upgrade here" top bar banner

PeerRich · 2023-02-15T12:17:21Z

asked @CarinaWolli to help make a new prop that makes the Upgrade batch link to stripe instead fo /teams

CarinaWolli

@PeerRich the <UpgradeTeamsBadge/> only shows when the user doesn't already have a paid plan (so no team and not premium user name). So it's not working for that case as user can already have teams or a premium name and we still want the upgrade badge here to upgrade their new team

…null-teams-and-hide-slug

github-actions · 2023-02-15T16:38:39Z

📦 Next.js Bundle Analysis

This analysis was generated by the next.js bundle analysis action 🤖

⚠️ Global Bundle Size Increased

Page	Size (compressed)
`global`	`210.05 KB` (🟡 +1 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!

One Page Changed Size

The following page changed size from the code in this PR compared to its base branch:

Page	Size (compressed)	First Load	% of Budget (`350 KB`)
`/event-types`	`354.68 KB`	564.73 KB	161.35% (🟡 +0.02%)

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.

CarinaWolli · 2023-02-15T20:01:17Z

@zomars or @alannnc could you check if the upgrade badge is doing what it is supposed to? I don't know how to test that locally and I don't have stripe set up

I made changes myself, needs someone else to review my changes 🙏

…7059) * untested but i think this works * fix upgrade badge --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com>

untested but i think this works

3a26105

PeerRich linked an issue Feb 12, 2023 that may be closed by this pull request

[CAL-1045] make an "Upgrade" badge next to /null/ teams and hide slug #7058

Closed

vercel bot deployed to Preview – cal February 12, 2023 13:51 View deployment

sean-brydon reviewed Feb 12, 2023

View reviewed changes

emrysal approved these changes Feb 13, 2023

View reviewed changes

PeerRich commented Feb 13, 2023

View reviewed changes

PeerRich requested a review from emrysal February 14, 2023 16:25

PeerRich assigned CarinaWolli Feb 15, 2023

CarinaWolli self-requested a review February 15, 2023 14:27

CarinaWolli previously requested changes Feb 15, 2023

View reviewed changes

Merge branch 'main' into 7058-cal-1045-make-an-upgrade-badge-next-to-…

c762964

…null-teams-and-hide-slug

vercel bot deployed to Preview – ui February 15, 2023 16:35 View deployment

vercel bot deployed to Preview – cal February 15, 2023 16:41 View deployment

CarinaWolli marked this pull request as draft February 15, 2023 16:52

fix upgrade badge

d7566df

vercel bot deployed to Preview – cal February 15, 2023 19:58 View deployment

PeerRich marked this pull request as ready for review February 16, 2023 12:06

PeerRich requested a review from CarinaWolli February 17, 2023 17:13

alannnc approved these changes Feb 17, 2023

View reviewed changes

alannnc merged commit 48e5d18 into main Feb 17, 2023

alannnc deleted the 7058-cal-1045-make-an-upgrade-badge-next-to-null-teams-and-hide-slug branch February 17, 2023 17:48

Mythie pushed a commit to Mythie/cal.com that referenced this pull request Mar 5, 2023

show upgrade badge and hide /team/null when team unpublished (calcom#…

c654b3c

…7059) * untested but i think this works * fix upgrade badge --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

show upgrade badge and hide /team/null when team unpublished #7059

show upgrade badge and hide /team/null when team unpublished #7059

PeerRich commented Feb 12, 2023

linear bot commented Feb 12, 2023

vercel bot commented Feb 12, 2023 •

edited

Loading

sean-brydon Feb 12, 2023

emrysal Feb 13, 2023

sean-brydon Feb 13, 2023

PeerRich Feb 13, 2023

PeerRich Feb 13, 2023

sean-brydon commented Feb 12, 2023

PeerRich commented Feb 12, 2023

emrysal left a comment

PeerRich Feb 13, 2023

PeerRich Feb 13, 2023

zomars Feb 13, 2023

PeerRich Feb 13, 2023

PeerRich commented Feb 15, 2023

CarinaWolli left a comment

github-actions bot commented Feb 15, 2023 •

edited

Loading

CarinaWolli commented Feb 15, 2023

		@@ -60,6 +60,8 @@ import SkeletonLoader from "@components/eventtype/SkeletonLoader";

		import { ssrInit } from "@server/lib/ssr";

		import { UpgradeTeamsBadge } from "../../../../packages/ui/components/badge/UpgradeTeamsBadge";

	import { UpgradeTeamsBadge } from "../../../../packages/ui/components/badge/UpgradeTeamsBadge";
	import { UpgradeTeamsBadge } from "@calcom/ui/components/badge/UpgradeTeamsBadge";

show upgrade badge and hide /team/null when team unpublished #7059

show upgrade badge and hide /team/null when team unpublished #7059

Conversation

PeerRich commented Feb 12, 2023

linear bot commented Feb 12, 2023

vercel bot commented Feb 12, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sean-brydon commented Feb 12, 2023

PeerRich commented Feb 12, 2023

emrysal left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PeerRich commented Feb 15, 2023

CarinaWolli left a comment

Choose a reason for hiding this comment

github-actions bot commented Feb 15, 2023 • edited Loading

📦 Next.js Bundle Analysis

⚠️ Global Bundle Size Increased

One Page Changed Size

CarinaWolli commented Feb 15, 2023

vercel bot commented Feb 12, 2023 •

edited

Loading

github-actions bot commented Feb 15, 2023 •

edited

Loading