Skip to content

Commit 31c6bbb

Browse files
authored
Revert "init: hide cal branding on user level (calcom#27594)" (calcom#27626)
This reverts commit 2c28c9c.
1 parent c183223 commit 31c6bbb

9 files changed

Lines changed: 3 additions & 25 deletions

File tree

packages/emails/src/templates/BaseScheduledEmail.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export const BaseScheduledEmail = (
6565

6666
return (
6767
<BaseEmailHtml
68-
hideLogo={Boolean(props.calEvent.platformClientId || props.calEvent.hideBranding)}
68+
hideLogo={Boolean(props.calEvent.platformClientId)}
6969
headerType={props.headerType || "checkCircle"}
7070
subject={props.subject || subject}
7171
title={t(

packages/features/CalendarEventBuilder.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,6 @@ export class CalendarEventBuilder {
271271
builder.withDestinationCalendar([user.destinationCalendar]);
272272
}
273273

274-
builder.withHideBranding(!!eventType.owner?.hideBranding);
275-
276274
return builder;
277275
}
278276

@@ -551,14 +549,6 @@ export class CalendarEventBuilder {
551549
return this;
552550
}
553551

554-
withHideBranding(hideBranding: boolean) {
555-
this.event = {
556-
...this.event,
557-
hideBranding,
558-
};
559-
return this;
560-
}
561-
562552
build(): CalendarEvent | null {
563553
// Validate required fields
564554
if (

packages/features/bookings/lib/handleCancelBooking.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ async function handler(input: CancelBookingInput, dependencies?: Dependencies) {
396396
platformRescheduleUrl,
397397
platformCancelUrl,
398398
hideOrganizerEmail: bookingToDelete.eventType?.hideOrganizerEmail,
399-
hideBranding: !!bookingToDelete.eventType?.owner?.hideBranding,
400399
platformBookingUrl,
401400
customReplyToEmail: bookingToDelete.eventType?.customReplyToEmail,
402401
organizationId: ownerProfile?.organizationId ?? null,

packages/features/bookings/lib/service/RegularBookingService.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,6 @@ async function handler(
15741574
}
15751575

15761576
let evt: CalendarEvent = builtEvt;
1577-
evt.hideBranding = !!eventType.owner?.hideBranding;
15781577

15791578
if (input.bookingData.thirdPartyRecurringEventId) {
15801579
const updatedEvt = CalendarEventBuilder.fromEvent(evt)

packages/features/bookings/repositories/BookingRepository.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,6 @@ const selectStatementToGetBookingForCalEventBuilder = {
303303
destinationCalendar: true,
304304
},
305305
},
306-
owner: {
307-
select: {
308-
hideBranding: true,
309-
},
310-
},
311306
hosts: {
312307
select: {
313308
userId: true,

packages/features/ee/managed-event-types/reassignment/services/ManagedEventManualReassignmentService.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,7 @@ export class ManagedEventManualReassignmentService {
503503
.withIdentifiers({
504504
iCalUID: newBooking.iCalUID || undefined,
505505
})
506-
.withUid(newBooking.uid)
507-
.withHideBranding(!!newUser.hideBranding);
506+
.withUid(newBooking.uid);
508507

509508
if (newUser.destinationCalendar) {
510509
builder.withDestinationCalendar([newUser.destinationCalendar]);
@@ -717,8 +716,7 @@ export class ManagedEventManualReassignmentService {
717716
.withLocation({
718717
location: bookingLocation || null,
719718
})
720-
.withUid(newBooking.uid)
721-
.withHideBranding(!!newUser.hideBranding);
719+
.withUid(newBooking.uid);
722720

723721
if (videoCallData) {
724722
emailBuilder.withVideoCallData(videoCallData);

packages/features/ee/round-robin/roundRobinManualReassignment.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ export const roundRobinManualReassignment = async ({
354354
booking,
355355
}),
356356
customReplyToEmail: eventType?.customReplyToEmail,
357-
hideBranding: !!eventType?.owner?.hideBranding,
358357
location: bookingLocation,
359358
...(platformClientParams ? platformClientParams : {}),
360359
conferenceCredentialId: conferenceCredentialId ?? undefined,

packages/features/users/repositories/UserRepository.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,6 @@ export class UserRepository {
13311331
locale: true,
13321332
timeFormat: true,
13331333
metadata: true,
1334-
hideBranding: true,
13351334
credentials: {
13361335
select: credentialForCalendarServiceSelect,
13371336
},

packages/types/Calendar.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ export interface CalendarEvent {
207207
iCalUID?: string | null;
208208
iCalSequence?: number | null;
209209
hideOrganizerEmail?: boolean;
210-
hideBranding?: boolean;
211210
disableCancelling?: boolean;
212211
disableRescheduling?: boolean;
213212

0 commit comments

Comments
 (0)