Merge branch 'main' into fixes-0-35

.vscode/twenty.code-workspace

@@ -24,6 +24,10 @@
       "name": "packages/twenty-emails",
       "path": "../packages/twenty-emails"
     },
+    {
+      "name": "packages/twenty-shared",
+      "path": "../packages/twenty-shared"
+    },
     {
       "name": "packages/twenty-server",
       "path": "../packages/twenty-server"

packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx

@@ -111,15 +111,15 @@ export const NavigationDrawer = ({
         onMouseEnter={handleHover}
         onMouseLeave={handleMouseLeave}
       >
-        {isSettingsDrawer && title
-          ? !isMobile && <NavigationDrawerBackButton title={title} />
-          : logo && (
-              <NavigationDrawerHeader
-                name={title}
-                logo={logo}
-                showCollapseButton={isHovered}
-              />
-            )}
+        {isSettingsDrawer && title ? (
+          !isMobile && <NavigationDrawerBackButton title={title} />
+        ) : (
+          <NavigationDrawerHeader
+            name={title}
+            logo={logo || ''}
+            showCollapseButton={isHovered}
+          />
+        )}
         <StyledItemsContainer isSettings={isSettingsDrawer}>
           {children}
         </StyledItemsContainer>

packages/twenty-server/jest-integration.config.ts

@@ -21,6 +21,7 @@ const jestConfig: JestConfigWithTsJest = {
     }),
     '^test/(.*)$': '<rootDir>/test/$1',
     'twenty-emails': '<rootDir>/../twenty-emails/dist/index.js',
+    'twenty-shared': '<rootDir>/../twenty-shared/dist/index.js',
   },
   fakeTimers: {
     enableGlobally: true,

packages/twenty-server/src/database/commands/database-command.module.ts

@@ -10,7 +10,7 @@ import { ConfirmationQuestion } from 'src/database/commands/questions/confirmati
 import { UpgradeTo0_32CommandModule } from 'src/database/commands/upgrade-version/0-32/0-32-upgrade-version.module';
 import { UpgradeTo0_33CommandModule } from 'src/database/commands/upgrade-version/0-33/0-33-upgrade-version.module';
 import { UpgradeTo0_34CommandModule } from 'src/database/commands/upgrade-version/0-34/0-34-upgrade-version.module';
-import { UpgradeTo0_40CommandModule } from 'src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module';
+import { UpgradeTo0_35CommandModule } from 'src/database/commands/upgrade-version/0-35/0-35-upgrade-version.module';
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
 import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
@@ -52,7 +52,7 @@ import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/worksp
     UpgradeTo0_32CommandModule,
     UpgradeTo0_33CommandModule,
     UpgradeTo0_34CommandModule,
-    UpgradeTo0_40CommandModule,
+    UpgradeTo0_35CommandModule,
     FeatureFlagModule,
   ],
   providers: [

packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-create-column.command.ts → packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command.ts

@@ -15,7 +15,6 @@ import {
   FieldMetadataEntity,
   FieldMetadataType,
 } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/services/workspace-metadata-version.service';
 import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
 import {
@@ -30,7 +29,7 @@ import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/wo
 import { isDefined } from 'src/utils/is-defined';
 
 @Command({
-  name: 'upgrade-0.40:phone-calling-code-create-column',
+  name: 'upgrade-0.35:phone-calling-code-create-column',
   description: 'Create the callingCode column',
 })
 export class PhoneCallingCodeCreateColumnCommand extends ActiveWorkspacesCommandRunner {
@@ -39,8 +38,6 @@ export class PhoneCallingCodeCreateColumnCommand extends ActiveWorkspacesCommand
     protected readonly workspaceRepository: Repository<Workspace>,
     @InjectRepository(FieldMetadataEntity, 'metadata')
     private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-    @InjectRepository(ObjectMetadataEntity, 'metadata')
-    private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
     private readonly workspaceMigrationService: WorkspaceMigrationService,
     private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
     private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,

packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-migrate-data.command.ts → packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command.ts

@@ -54,7 +54,7 @@ const isCallingCode = (callingCode: string): boolean => {
 };
 
 @Command({
-  name: 'upgrade-0.40:phone-calling-code-migrate-data',
+  name: 'upgrade-0.35:phone-calling-code-migrate-data',
   description: 'Add calling code and change country code with default one',
 })
 export class PhoneCallingCodeMigrateDataCommand extends ActiveWorkspacesCommandRunner {

packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command.ts → packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command.ts

@@ -9,7 +9,7 @@ import { RecordPositionBackfillService } from 'src/engine/api/graphql/workspace-
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 
 @Command({
-  name: 'upgrade-0.40:record-position-backfill',
+  name: 'upgrade-0.35:record-position-backfill',
   description: 'Backfill record position',
 })
 export class RecordPositionBackfillCommand extends ActiveWorkspacesCommandRunner {

packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command.ts → packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.command.ts

@@ -5,18 +5,18 @@ import { Repository } from 'typeorm';
 
 import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
 import { BaseCommandOptions } from 'src/database/commands/base.command';
-import { PhoneCallingCodeCreateColumnCommand } from 'src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-create-column.command';
-import { PhoneCallingCodeMigrateDataCommand } from 'src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-migrate-data.command';
-import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command';
-import { ViewGroupNoValueBackfillCommand } from 'src/database/commands/upgrade-version/0-40/0-40-view-group-no-value-backfill.command';
+import { PhoneCallingCodeCreateColumnCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command';
+import { PhoneCallingCodeMigrateDataCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command';
+import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command';
+import { ViewGroupNoValueBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command';
 
 @Command({
-  name: 'upgrade-0.40',
-  description: 'Upgrade to 0.40',
+  name: 'upgrade-0.35',
+  description: 'Upgrade to 0.35',
 })
-export class UpgradeTo0_40Command extends ActiveWorkspacesCommandRunner {
+export class UpgradeTo0_35Command extends ActiveWorkspacesCommandRunner {
   constructor(
     @InjectRepository(Workspace, 'core')
     protected readonly workspaceRepository: Repository<Workspace>,

packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module.ts → packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.module.ts

@@ -1,11 +1,11 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
-import { PhoneCallingCodeCreateColumnCommand } from 'src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-create-column.command';
-import { PhoneCallingCodeMigrateDataCommand } from 'src/database/commands/upgrade-version/0-40/0-40-phone-calling-code-migrate-data.command';
-import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command';
-import { UpgradeTo0_40Command } from 'src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command';
-import { ViewGroupNoValueBackfillCommand } from 'src/database/commands/upgrade-version/0-40/0-40-view-group-no-value-backfill.command';
+import { PhoneCallingCodeCreateColumnCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command';
+import { PhoneCallingCodeMigrateDataCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command';
+import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command';
+import { UpgradeTo0_35Command } from 'src/database/commands/upgrade-version/0-35/0-35-upgrade-version.command';
+import { ViewGroupNoValueBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command';
 import { RecordPositionBackfillModule } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-module';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
@@ -35,12 +35,12 @@ import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manage
     FieldMetadataModule,
   ],
   providers: [
-    UpgradeTo0_40Command,
-    PhoneCallingCodeMigrateDataCommand,
+    UpgradeTo0_35Command,
     PhoneCallingCodeCreateColumnCommand,
+    PhoneCallingCodeMigrateDataCommand,
     WorkspaceMigrationFactory,
     RecordPositionBackfillCommand,
     ViewGroupNoValueBackfillCommand,
   ],
 })
-export class UpgradeTo0_40CommandModule {}
+export class UpgradeTo0_35CommandModule {}

packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-view-group-no-value-backfill.command.ts → packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command.ts

@@ -13,7 +13,7 @@ import { ViewGroupWorkspaceEntity } from 'src/modules/view/standard-objects/view
 import { ViewWorkspaceEntity } from 'src/modules/view/standard-objects/view.workspace-entity';
 
 @Command({
-  name: 'migrate-0.40:backfill-view-group-no-value',
+  name: 'migrate-0.35:backfill-view-group-no-value',
   description: 'Backfill view group no value',
 })
 export class ViewGroupNoValueBackfillCommand extends ActiveWorkspacesCommandRunner {

packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts

@@ -4,6 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { isDefined } from 'class-validator';
 import FileType from 'file-type';
+import { TWENTY_ICONS_BASE_URL } from 'twenty-shared';
 import { Repository } from 'typeorm';
 import { v4 } from 'uuid';
 
@@ -23,17 +24,19 @@ import { EnvironmentService } from 'src/engine/core-modules/environment/environm
 import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
 import { OnboardingService } from 'src/engine/core-modules/onboarding/onboarding.service';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { userValidator } from 'src/engine/core-modules/user/user.validate';
 import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
+import { WorkspaceAuthProvider } from 'src/engine/core-modules/workspace/types/workspace.type';
 import {
   Workspace,
   WorkspaceActivationStatus,
 } from 'src/engine/core-modules/workspace/workspace.entity';
 import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
+import { getDomainNameByEmail } from 'src/utils/get-domain-name-by-email';
 import { getImageBufferFromUrl } from 'src/utils/image';
-import { WorkspaceAuthProvider } from 'src/engine/core-modules/workspace/types/workspace.type';
-import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { isWorkEmail } from 'src/utils/is-work-email';
 
 export type SignInUpServiceInput = {
   email: string;
@@ -333,12 +336,17 @@ export class SignInUpService {
       }
     }
 
+    const logo = isWorkEmail(email)
+      ? `${TWENTY_ICONS_BASE_URL}/${getDomainNameByEmail(email)}`
+      : undefined;
+
     const workspaceToCreate = this.workspaceRepository.create({
       subdomain: await this.domainManagerService.generateSubdomain(),
       displayName: '',
       domainName: '',
       inviteHash: v4(),
       activationStatus: WorkspaceActivationStatus.PENDING_CREATION,
+      logo,
     });
 
     const workspace = await this.workspaceRepository.save(workspaceToCreate);

packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import axios, { AxiosInstance } from 'axios';
 import uniqBy from 'lodash.uniqby';
+import { TWENTY_COMPANIES_BASE_URL } from 'twenty-shared';
 import { DeepPartial, EntityManager, ILike } from 'typeorm';
 
 import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
@@ -25,7 +26,7 @@ export class CreateCompanyService {
 
   constructor(private readonly twentyORMGlobalManager: TwentyORMGlobalManager) {
     this.httpService = axios.create({
-      baseURL: 'https://twenty-companies.com',
+      baseURL: TWENTY_COMPANIES_BASE_URL,
     });
   }
 

packages/twenty-server/tsconfig.json

@@ -27,7 +27,8 @@
     "paths": {
       "src/*": ["packages/twenty-server/src/*"],
       "test/*": ["packages/twenty-server/test/*"],
-      "twenty-emails": ["packages/twenty-emails/dist"]
+      "twenty-emails": ["packages/twenty-emails/dist"],
+      "twenty-shared": ["packages/twenty-shared/dist"]
     }
   },
   "ts-node": {

packages/twenty-shared/src/constants/TwentyCompaniesBaseUrl.ts

@@ -0,0 +1 @@
+export const TWENTY_COMPANIES_BASE_URL = 'https://twenty-companies.com';

packages/twenty-shared/src/constants/TwentyIconsBaseUrl.ts

@@ -0,0 +1 @@
+export const TWENTY_ICONS_BASE_URL = 'https://twenty-icons.com';

packages/twenty-shared/src/index.ts

@@ -1 +1,3 @@
+export * from './constants/TwentyCompaniesBaseUrl';
+export * from './constants/TwentyIconsBaseUrl';
 export * from './utils/image/getImageAbsoluteURI';