Refactor editor organizer

src/actions/appointment-actions-fn.tsx

@@ -59,7 +59,7 @@ export const createCopy =
 					folders: availableFolders,
 					dispatch: context.dispatch,
 					panel: context.panel ?? true,
-					organizer,
+					organizer: { email: organizer?.address ?? '', fullName: organizer?.fullName ?? '' },
 					recur: isSeries ? invite.recurrenceRule : undefined,
 					exceptId: undefined,
 					isInstance,

src/commons/editor-generator.test.ts

@@ -65,10 +65,8 @@ describe('Editor generator', () => {
 			// expect a default calendar is selected
 			expect(editor.calendar).toBeDefined();
 
-			// expect organizer to be defined and to be the default
 			expect(editor.organizer).toBeDefined();
 			expect(editor.organizer.fullName).toBe(identity1.fullName);
-			expect(editor.organizer.identityName).toBe('DEFAULT');
 
 			// all parameters are the default ones
 			expect(editor.allDay).toBe(false);
@@ -169,18 +167,14 @@ describe('Editor generator', () => {
 					}
 				],
 				organizer: {
-					address: '[email protected]',
-					fullName: 'Francesco Gottardi',
-					identityName: 'DEFAULT',
-					label: 'DEFAULT Francesco Gottardi (<[email protected]>) ',
-					type: undefined,
-					value: '0'
+					email: '[email protected]',
+					fullName: 'user fullName'
 				},
 				title: 'Single istance',
 				location: 'Location',
 				room: {
 					label: 'Room name',
-					link: 'https://mail.zextras.com/meeting/meet-now/ZWFGRAOJ'
+					link: 'https://room.link.com/meeting/meet-now/ZWFGRAOJ'
 				},
 				attendees: [],
 				optionalAttendees: [],
@@ -235,18 +229,11 @@ describe('Editor generator', () => {
 			expect(editor.plainText).toBe('test content');
 			expect(editor.richText).toBe('<p>test content</p>');
 			expect(editor.organizer).toBeDefined();
-			expect(editor.organizer).toHaveProperty(
-				'label',
-				'DEFAULT Francesco Gottardi (<[email protected]>) '
-			);
 			expect(editor.title).toBe('Single istance');
 			expect(editor.location).toBe('Location');
 			expect(editor.room).toBeDefined();
 			expect(editor.room).toHaveProperty('label', 'Room name');
-			expect(editor.room).toHaveProperty(
-				'link',
-				'https://mail.zextras.com/meeting/meet-now/ZWFGRAOJ'
-			);
+			expect(editor.room).toHaveProperty('link', 'https://room.link.com/meeting/meet-now/ZWFGRAOJ');
 			expect(editor.attendees).toStrictEqual([]);
 			expect(editor.optionalAttendees).toStrictEqual([]);
 			expect(editor.freeBusy).toBe('F');
@@ -266,26 +253,4 @@ describe('Editor generator', () => {
 			expect(editor.attachmentFiles[0].disposition).toBe('attachment');
 		});
 	});
-	describe('Edit event', () => {
-		test('event without organizer has the calendar owner as default', () => {
-			const store = configureStore({ reducer: combineReducers(reducers) });
-
-			const event = mockedData.getEvent({
-				resource: {
-					organizer: undefined,
-					calendar: folder
-				}
-			});
-			const invite = mockedData.getInvite({ event });
-
-			const context = { folders, dispatch: store.dispatch };
-			const editor = generateEditor({
-				context,
-				invite,
-				event
-			});
-			expect(editor.organizer.address).toBe(identity1.email);
-			expect(editor.organizer.fullName).toBe(identity1.fullName);
-		});
-	});
 });

src/commons/editor-generator.ts

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+import { getUserAccount } from '@zextras/carbonio-shell-ui';
 import { find, isEmpty, isNaN, omit, startsWith } from 'lodash';
 import moment from 'moment';
 import momentLocalizer from 'react-widgets-moment';
@@ -12,9 +13,10 @@ import { getIdentityItems } from './get-identity-items';
 import { Folders, LinkFolder } from '../carbonio-ui-commons/types';
 import { getPrefs } from '../carbonio-ui-commons/utils/get-prefs';
 import { PREFS_DEFAULTS } from '../constants';
-import { EventPropType, normalizeEditor } from '../normalizations/normalize-editor';
+import { normalizeEditor } from '../normalizations/normalize-editor';
 import { createNewEditor } from '../store/slices/editor-slice';
 import { Editor } from '../types/editor';
+import { EventType } from '../types/event';
 import { Invite } from '../types/store/invite';
 import { getNewId } from '../utils/event';
 
@@ -64,7 +66,12 @@ export const createEmptyEditor = (id: string, folders: Folders): Editor => {
 		zimbraPrefCalendarApptReminderWarningTime,
 		zimbraPrefDefaultCalendarId
 	} = getPrefs();
-	const defaultOrganizer = find(identities, ['identityName', 'DEFAULT']);
+	const account = getUserAccount();
+	const defaultOrganizerIdentity = find(identities, ['identityName', 'DEFAULT']);
+	const defaultOrganizer = {
+		email: defaultOrganizerIdentity?.address ?? account?.name ?? '',
+		fullName: defaultOrganizerIdentity?.fullName
+	};
 	const defaultCalendar = find(folders, [
 		'id',
 		zimbraPrefDefaultCalendarId ?? PREFS_DEFAULTS.DEFAULT_CALENDAR_ID
@@ -128,7 +135,7 @@ export const applyContextToEditor = ({
 	context
 }: {
 	editor: Editor;
-	context: any;
+	context: EditorContext;
 }): Editor => {
 	const contextObj = omit(context, ['disabled', 'folders', 'dispatch']);
 	let editorWithContext = { ...editor };
@@ -161,7 +168,7 @@ export const generateEditor = ({
 	invite,
 	context
 }: {
-	event?: EventPropType;
+	event?: EventType;
 	invite?: Invite;
 	context: EditorContext;
 }): Editor => {

src/commons/get-appointment.ts

@@ -55,7 +55,7 @@ export const getAppointmentAndInvite = async ({
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export const normalizeFromGetAppointment = (appt: any): Appointment => <Appointment>omitBy(
 		{
-			id: appt?.apptId,
+			id: appt?.id,
 			l: appt.ciFolder,
 			alarm: appt?.inv?.[0]?.comp?.[0]?.alarm,
 			alarmData: appt?.inv?.[0]?.comp?.[0]?.alarmData,

src/normalizations/normalize-editor.ts

@@ -14,7 +14,7 @@ import { CALENDAR_RESOURCES, PREFS_DEFAULTS } from '../constants';
 import { PARTICIPANT_ROLE } from '../constants/api';
 import { CRB_XPARAMS, CRB_XPROPS } from '../constants/xprops';
 import { CalendarEditor, Editor } from '../types/editor';
-import { DateType } from '../types/event';
+import { DateType, EventType } from '../types/event';
 import { Attendee, Invite } from '../types/store/invite';
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
@@ -187,10 +187,14 @@ export const normalizeEditor = ({
 }: {
 	emptyEditor: Editor;
 	invite?: Invite;
-	event?: EventPropType;
+	event?: EventType;
 	context: any;
 }): Editor => {
 	if (event && invite) {
+		const organizer = {
+			email: event.resource.organizer?.email ?? '',
+			fullName: event.resource.organizer?.name
+		};
 		const isSeries = event?.resource?.isRecurrent;
 		const isInstance = context?.isInstance ?? !!event?.resource?.ridZ;
 		const isException = event?.resource?.isException ?? false;
@@ -228,6 +232,7 @@ export const normalizeEditor = ({
 				isInstance,
 				isSeries,
 				isException,
+				organizer,
 				exceptId: invite?.exceptId,
 				title: event?.title,
 				location: event?.resource?.location,

src/normalizations/normalize-soap-message-from-editor.test.ts

@@ -15,9 +15,7 @@ import {
 } from '../carbonio-ui-commons/test/mocks/accounts/fakeAccounts';
 import { generateEditor } from '../commons/editor-generator';
 import { getIdentityItems } from '../commons/get-identity-items';
-import mockedData from '../test/generators';
 import { ParticipationStatus } from '../types/store/invite';
-import { Editor } from '../types/editor';
 
 const mainAccount = createFakeIdentity();
 const identity = createFakeIdentity();
@@ -197,7 +195,7 @@ describe('normalize soap message from editor', () => {
 								folders: {},
 								dispatch: jest.fn(),
 								calendar: mainAccountEditorFolder,
-								sender: identities[1]
+								sender: { email: identities[1].address ?? '', fullName: identities[1].fullName }
 							}
 						});
 						const body = normalizeSoapMessageFromEditor(editor);
@@ -232,7 +230,7 @@ describe('normalize soap message from editor', () => {
 								folders: {},
 								dispatch: jest.fn(),
 								calendar: mainAccountEditorFolder,
-								sender: identities[1]
+								sender: { email: identities[1].address ?? '', fullName: identities[1].fullName }
 							}
 						});
 						const body = normalizeSoapMessageFromEditor(editor);
@@ -277,7 +275,7 @@ describe('normalize soap message from editor', () => {
 								folders: {},
 								dispatch: jest.fn(),
 								calendar: mainAccountEditorFolder,
-								sender: identities[1]
+								sender: { email: identities[1].address ?? '', fullName: identities[1].fullName }
 							}
 						});
 						const body = normalizeSoapMessageFromEditor(editor);
@@ -315,7 +313,7 @@ describe('normalize soap message from editor', () => {
 								folders: {},
 								dispatch: jest.fn(),
 								calendar: mainAccountEditorFolder,
-								sender: identities[1]
+								sender: { email: identities[1].address ?? '', fullName: identities[1].fullName }
 							}
 						});
 						const body = normalizeSoapMessageFromEditor(editor);
@@ -415,7 +413,7 @@ describe('normalize soap message from editor', () => {
 								folders: {},
 								dispatch: jest.fn(),
 								calendar: sharedEditorFolder,
-								sender: identities[1]
+								sender: { email: identities[1].address ?? '', fullName: identities[1].fullName }
 							}
 						});
 						const body = normalizeSoapMessageFromEditor(editor);
@@ -449,7 +447,7 @@ describe('normalize soap message from editor', () => {
 								folders: {},
 								dispatch: jest.fn(),
 								calendar: sharedEditorFolder,
-								sender: identities[1]
+								sender: { email: identities[1].address ?? '', fullName: identities[1].fullName }
 							}
 						});
 						const body = normalizeSoapMessageFromEditor(editor);
@@ -486,7 +484,7 @@ describe('normalize soap message from editor', () => {
 							folders: {},
 							dispatch: jest.fn(),
 							calendar: sharedEditorFolder,
-							sender: identities[1]
+							sender: { email: identities[1].address ?? '', fullName: identities[1].fullName }
 						}
 					});
 					const body = normalizeSoapMessageFromEditor(editor);
@@ -525,7 +523,7 @@ describe('normalize soap message from editor', () => {
 						folders: {},
 						dispatch: jest.fn(),
 						calendar: sharedEditorFolder,
-						sender: identities[0]
+						sender: { email: identities[0].address ?? '', fullName: identities[0].fullName }
 					}
 				});
 				const body = normalizeSoapMessageFromEditor(editor);
@@ -558,7 +556,7 @@ describe('normalize soap message from editor', () => {
 						folders: {},
 						dispatch: jest.fn(),
 						calendar: sharedEditorFolder,
-						sender: identities[0]
+						sender: { email: identities[0].address ?? '', fullName: identities[0].fullName }
 					}
 				});
 				const body = normalizeSoapMessageFromEditor(editor);
@@ -591,7 +589,7 @@ describe('normalize soap message from editor', () => {
 						folders: {},
 						dispatch: jest.fn(),
 						calendar: sharedEditorFolder,
-						sender: identities[1]
+						sender: { email: identities[1].address ?? '', fullName: identities[1].fullName }
 					}
 				});
 				const body = normalizeSoapMessageFromEditor(editor);
@@ -686,7 +684,7 @@ describe('normalize soap message from editor', () => {
 						folders: {},
 						dispatch: jest.fn(),
 						calendar: sharedAccountEditorFolder,
-						sender: identities[1]
+						sender: { email: identities[1].address ?? '', fullName: identities[1].fullName }
 					}
 				});
 				const body = normalizeSoapMessageFromEditor(editor);
@@ -720,7 +718,7 @@ describe('normalize soap message from editor', () => {
 						folders: {},
 						dispatch: jest.fn(),
 						calendar: sharedAccountEditorFolder,
-						sender: identities[2]
+						sender: { email: identities[2].address ?? '', fullName: identities[2].fullName }
 					}
 				});
 				const body = normalizeSoapMessageFromEditor(editor);

src/normalizations/normalize-soap-message-from-editor.ts

@@ -28,16 +28,14 @@ type Participants = {
 	t: string;
 };
 
-const isEventSentFromOrganizer = (organizer: string, sender: { address: string }): boolean =>
-	organizer === sender.address;
+const isEventSentFromOrganizer = (organizer: string, sender: { email: string }): boolean =>
+	organizer === sender.email;
 
-const isTheSameIdentity = (
-	organizer: { identityName: string },
-	sender: { identityName: string }
-): boolean => organizer.identityName === sender.identityName;
+const isTheSameIdentity = (organizer: CalendarOrganizer, sender: CalendarSender): boolean =>
+	organizer.email === sender.email && organizer.fullName === sender.fullName;
 
-const isTheSameEmail = (organizer: string, sender: { address: string }): boolean =>
-	organizer === sender.address;
+const isTheSameEmail = (organizer: string, sender: { email: string }): boolean =>
+	organizer === sender.email;
 
 const setResourceDate = ({
 	time,
@@ -126,7 +124,7 @@ export const generateParticipantInformation = (resource: Editor): Array<Partial<
 
 	const sender = omitBy<Participants>(
 		{
-			a: resource?.sender?.address ?? resource?.sender?.label,
+			a: resource?.sender?.email ?? resource?.sender?.fullName,
 			p: resource?.sender?.fullName,
 			t: 's'
 		},
@@ -183,7 +181,7 @@ const getOrganizer = ({
 				{
 					email: user?.name,
 					name: organizer.fullName,
-					sentBy: isSameEmail ? undefined : sender.address
+					sentBy: isSameEmail ? undefined : sender.email
 				},
 				isNil
 			);
@@ -192,7 +190,7 @@ const getOrganizer = ({
 			{
 				email: user?.name,
 				name: sender.fullName,
-				sentBy: isSameEmail ? undefined : sender.address
+				sentBy: isSameEmail ? undefined : sender.email
 			},
 			isNil
 		);
@@ -205,7 +203,7 @@ const getOrganizer = ({
 	}
 	return {
 		email: calendar.owner,
-		sentBy: sender.address
+		sentBy: sender.email
 	};
 };
 

src/soap/counter-appointment-request.ts

@@ -47,7 +47,7 @@ export const counterAppointmentRequest = async ({
 							d: moment(moment(appt.end)).format('YYYYMMDDTHHmm00')
 						},
 						exceptId: appt.exceptId,
-						or: { a: appt.organizer?.address },
+						or: { a: appt.organizer?.email },
 						s: {
 							tz: appt?.timezone,
 							d: moment(moment(appt.start)).format('YYYYMMDDTHHmm00')

src/store/reducers/editor-reducers.ts

@@ -6,13 +6,13 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { isNil, union } from 'lodash';
 
-import type { CalendarEditor, Resource, IdentityItem, Editor, Room } from '../../types/editor';
+import { CalendarEditor, Resource, Editor, Room, CalendarSender } from '../../types/editor';
 import { EditorChipAttendees, InviteClass, InviteFreeBusy } from '../../types/store/invite';
 import type { EditorSlice } from '../../types/store/store';
 
 type SenderPayload = {
 	id: string | undefined;
-	sender: IdentityItem;
+	sender: CalendarSender;
 };
 
 type TitlePayload = {