Various fixes (#11448)

# Scrollbar fix

Fixes https://github.com/twentyhq/twenty/issues/11403

<img width="1512" alt="image"
src="https://github.com/user-attachments/assets/b13fe0f2-8c61-4ea8-9ea1-e61e571a90da"
/>

---------

Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
This commit is contained in:
Charles Bochet
2025-04-09 01:03:43 +02:00
committed by GitHub
parent ab63214efa
commit b6e344e7be
41 changed files with 265 additions and 470 deletions

View File

@ -12,10 +12,14 @@ export const emailModuleFactory = (
switch (driver) {
case EmailDriver.Logger:
return {};
return {
type: EmailDriver.Logger,
};
case EmailDriver.Smtp: {
const options: EmailModuleOptions = {};
const options: EmailModuleOptions = {
type: EmailDriver.Smtp,
};
const host = environmentService.get('EMAIL_SMTP_HOST');
const port = environmentService.get('EMAIL_SMTP_PORT');

View File

@ -1,6 +1,9 @@
import { DynamicModule, Global } from '@nestjs/common';
import { EmailModuleAsyncOptions } from 'src/engine/core-modules/email/interfaces/email.interface';
import {
EmailDriver,
EmailModuleAsyncOptions,
} from 'src/engine/core-modules/email/interfaces/email.interface';
import { LoggerDriver } from 'src/engine/core-modules/email/drivers/logger.driver';
import { SmtpDriver } from 'src/engine/core-modules/email/drivers/smtp.driver';
@ -16,7 +19,9 @@ export class EmailModule {
useFactory: (...args: any[]) => {
const config = options.useFactory(...args);
return config ? new SmtpDriver(config) : new LoggerDriver();
return config.type === EmailDriver.Smtp
? new SmtpDriver(config)
: new LoggerDriver();
},
inject: options.inject || [],
};

View File

@ -7,7 +7,13 @@ export enum EmailDriver {
Smtp = 'smtp',
}
export type EmailModuleOptions = SMTPConnection.Options | undefined;
export type EmailModuleOptions =
| (SMTPConnection.Options & {
type: EmailDriver.Smtp;
})
| {
type: EmailDriver.Logger;
};
export type EmailModuleAsyncOptions = {
useFactory: (...args: any[]) => EmailModuleOptions;