From 48e5d18ea1c653bf4abe6d5cf5699ebd1fd73820 Mon Sep 17 00:00:00 2001 From: Peer Richelsen Date: Fri, 17 Feb 2023 18:48:13 +0100 Subject: [PATCH] show upgrade badge and hide /team/null when team unpublished (#7059) * untested but i think this works * fix upgrade badge --------- Co-authored-by: CarinaWolli --- apps/web/pages/event-types/index.tsx | 33 ++++++++++++++++--- .../trpc/server/routers/viewer/eventTypes.ts | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/apps/web/pages/event-types/index.tsx b/apps/web/pages/event-types/index.tsx index 430a5975f5..eb9e00da31 100644 --- a/apps/web/pages/event-types/index.tsx +++ b/apps/web/pages/event-types/index.tsx @@ -128,11 +128,17 @@ const Item = ({ type, group, readOnly }: { type: EventType; group: EventTypeGrou data-testid={"event-type-title-" + type.id}> {type.title} - {`/${group.profile.slug}/${type.slug}`} + {group.profile.slug ? ( + + {`/${group.profile.slug}/${type.slug}`} + + ) : ( + <> + )} {readOnly && ( - + {t("readonly")} )} @@ -557,6 +563,18 @@ const EventTypeListHeading = ({ membershipCount, teamId, }: EventTypeListHeadingProps): JSX.Element => { + const { t } = useLocale(); + const router = useRouter(); + + const publishTeamMutation = trpc.viewer.teams.publish.useMutation({ + onSuccess(data) { + router.push(data.url); + }, + onError: (error) => { + showToast(error.message, "error"); + }, + }); + return (
)}
+ {!profile?.slug && !!teamId && ( + + )} ); }; diff --git a/packages/trpc/server/routers/viewer/eventTypes.ts b/packages/trpc/server/routers/viewer/eventTypes.ts index 3e28821f4d..a8b8081105 100644 --- a/packages/trpc/server/routers/viewer/eventTypes.ts +++ b/packages/trpc/server/routers/viewer/eventTypes.ts @@ -338,7 +338,7 @@ export const eventTypesRouter = router({ profile: { name: membership.team.name, image: `${CAL_URL}/team/${membership.team.slug}/avatar.png`, - slug: "team/" + membership.team.slug, + slug: membership.team.slug ? "team/" + membership.team.slug : null, }, metadata: { membershipCount: membership.team.members.length,