Update workspace entities to make all TEXT nullable (#16144)
Follow up on #15926 --------- Co-authored-by: Etienne <45695613+etiennejouan@users.noreply.github.com> Co-authored-by: guillim <guigloo@msn.com>
This commit is contained in:
+8
@@ -133,6 +133,10 @@ export class CleanerWorkspaceService {
|
||||
const i18n = this.i18nService.getI18nInstance(workspaceMember.locale);
|
||||
const subject = i18n._(workspaceDeletionMsg);
|
||||
|
||||
if (!isDefined(workspaceMember.userEmail)) {
|
||||
throw new Error('Workspace member email is missing');
|
||||
}
|
||||
|
||||
this.emailService.send({
|
||||
to: workspaceMember.userEmail,
|
||||
from: `${this.twentyConfigService.get(
|
||||
@@ -207,6 +211,10 @@ export class CleanerWorkspaceService {
|
||||
const html = await render(emailTemplate, { pretty: true });
|
||||
const text = await render(emailTemplate, { plainText: true });
|
||||
|
||||
if (!isDefined(workspaceMember.userEmail)) {
|
||||
throw new Error('Workspace member email is missing');
|
||||
}
|
||||
|
||||
this.emailService.send({
|
||||
to: workspaceMember.userEmail,
|
||||
from: `${this.twentyConfigService.get(
|
||||
|
||||
+2
-3
@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
|
||||
|
||||
import { type WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
|
||||
|
||||
import { type FlatRole } from 'src/engine/metadata-modules/flat-role/types/flat-role.type';
|
||||
import { fromStandardRoleDefinitionToFlatRole } from 'src/engine/metadata-modules/flat-role/utils/from-standard-role-definition-to-flat-role.util';
|
||||
import { type RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
|
||||
import { type StandardRoleDefinition } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-roles/types/standard-role-definition.interface';
|
||||
@@ -13,8 +12,8 @@ export class StandardRoleFactory {
|
||||
roleDefinitions: StandardRoleDefinition[],
|
||||
context: WorkspaceSyncContext,
|
||||
existingRoles: RoleEntity[],
|
||||
): FlatRole[] {
|
||||
const computedRoles: FlatRole[] = [];
|
||||
): Partial<RoleEntity>[] {
|
||||
const computedRoles: Partial<RoleEntity>[] = [];
|
||||
|
||||
for (const roleDefinition of roleDefinitions) {
|
||||
const existingRole = existingRoles.find(
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ export class WorkspaceSyncRoleService {
|
||||
|
||||
const roleComparatorResults = this.workspaceRoleComparator.compare({
|
||||
fromFlatRoles: existingStandardRoleEntities.map(fromRoleEntityToFlatRole),
|
||||
toFlatRoles: targetStandardRoles,
|
||||
toFlatRoles: targetStandardRoles.map(fromRoleEntityToFlatRole),
|
||||
});
|
||||
|
||||
for (const roleComparatorResult of roleComparatorResults) {
|
||||
|
||||
Reference in New Issue
Block a user