Co 1725 conversation message store refactor

src/api/helpers/get-msg-service.ts

@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Zextras <https://www.zextras.com>
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { normalizeMailMessageFromSoap } from '../../normalizations/normalize-message';
+import type { MailMessage } from '../../types';
+import { getMsgSoapAPI } from '../get-msg';
+
+type GetMsgCallProps = {
+	msgId: string;
+};
+
+export const getMsg = async ({ msgId }: GetMsgCallProps): Promise<MailMessage> => {
+	const result = await getMsgSoapAPI({ msgId, max: 250000 });
+	const msg = result?.m[0];
+	return normalizeMailMessageFromSoap(msg, true) as MailMessage;
+};
+
+export const getFullMsg = async ({ msgId }: GetMsgCallProps): Promise<MailMessage> => {
+	const result = await getMsgSoapAPI({ msgId });
+	const msg = result?.m[0];
+	return normalizeMailMessageFromSoap(msg, true) as MailMessage;
+};

src/api/msg-action.ts

@@ -0,0 +1,42 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Zextras <https://www.zextras.com>
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { soapFetch } from '@zextras/carbonio-shell-ui';
+import { omitBy, isNil } from 'lodash';
+
+import {
+	MsgActionParameters,
+	MsgActionRequest,
+	MsgActionResponse,
+	MsgActionResult
+} from '../types';
+
+export const msgActionSoapApi = async ({
+	ids,
+	operation,
+	parent,
+	tagName,
+	flag
+}: MsgActionParameters): Promise<MsgActionResult> => {
+	const { action } = await soapFetch<MsgActionRequest, MsgActionResponse>('MsgAction', {
+		_jsns: 'urn:zimbraMail',
+
+		action: omitBy(
+			{
+				id: ids.join(','),
+				op: operation,
+				l: parent,
+				tn: tagName,
+				f: flag
+			},
+			isNil
+		)
+	});
+	return {
+		ids: action.id.split(','),
+		operation: action.op
+	};
+};

src/api/search-conv.ts

@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { soapFetch } from '@zextras/carbonio-shell-ui';
+import { AccountSettings, getUserSettings, soapFetch } from '@zextras/carbonio-shell-ui';
 import { map } from 'lodash';
 
 import { MAIL_VERIFICATION_HEADERS } from '../constants';
@@ -20,11 +20,13 @@ export async function searchConvSoapAPI({
 	fetch = 'all',
 	folderId
 }: SearchConvParameters): Promise<SearchConvResponse> {
+	const userSettings: AccountSettings = getUserSettings();
+	const sortBy = userSettings.prefs.zimbraPrefConversationOrder as 'dateDesc' | 'dateAsc';
 	const request: SearchConvRequest = {
 		_jsns: 'urn:zimbraMail',
 		cid: conversationId,
 		recip: '2',
-		sortBy: 'dateDesc',
+		sortBy,
 		offset: 0,
 		fetch,
 		max: 250_000,

src/commons/mail-message-renderer/html-message-renderer.tsx

@@ -18,7 +18,7 @@ import { getAttachmentParts } from '../../helpers/attachments';
 import { getNoIdentityPlaceholder } from '../../helpers/identities';
 import { useAppDispatch } from '../../hooks/redux';
 import { getFullMsgAsyncThunk } from '../../store/actions';
-import { retrieveFullMessage } from '../../store/zustand/search/hooks/hooks';
+import { retrieveFullMessage } from '../../store/zustand/emails/hooks/hooks';
 import { BodyPart, MailMessage } from '../../types';
 import { useInSearchModule } from '../../ui-actions/utils';
 import { getOriginalHtmlContent, getQuotedTextFromOriginalContent } from '../get-quoted-text-util';

src/commons/mail-message-renderer/tests/html-message-renderer.test.tsx

@@ -5,11 +5,11 @@
  */
 import React from 'react';
 
-import { act, screen, waitFor } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 
 import { createSoapAPIInterceptor } from '../../../carbonio-ui-commons/test/mocks/network/msw/create-api-interceptor';
 import { setupTest } from '../../../carbonio-ui-commons/test/test-setup';
-import { updateMessages } from '../../../store/zustand/search/store';
+import { updateMessages } from '../../../store/zustand/emails/store';
 import { generateCompleteMessageFromAPI } from '../../../tests/generators/api';
 import { generateMessage } from '../../../tests/generators/generateMessage';
 import { generateStore } from '../../../tests/generators/store';
@@ -118,8 +118,11 @@ describe('HTML message renderer', () => {
 				});
 
 				await interceptor;
-
-				expect(screen.queryByText('warningBanner.truncatedMessage.button')).not.toBeInTheDocument();
+				await act(async () => {
+					expect(
+						screen.queryByText('warningBanner.truncatedMessage.button')
+					).not.toBeInTheDocument();
+				});
 			});
 		});
 		it('should display empty fragment when message is set only mails store', () => {
@@ -241,20 +244,16 @@ describe('HTML message renderer', () => {
 				]
 			});
 
-			const { user } = setupTest(
-				<HtmlMessageRenderer message={message} />,
-
-				{
-					initialEntries: ['/mails'],
-					store
-				}
-			);
+			const { user } = setupTest(<HtmlMessageRenderer message={message} />, {
+				initialEntries: ['/mails'],
+				store
+			});
 
 			const loadMessageButton = await screen.findByText('warningBanner.truncatedMessage.button');
 			user.click(loadMessageButton);
 
 			await interceptor;
-			await waitFor(() => {
+			await act(async () => {
 				expect(screen.queryByText('warningBanner.truncatedMessage.button')).not.toBeInTheDocument();
 			});
 		});

src/constants/index.ts

@@ -479,7 +479,7 @@ export const TIMEOUTS = {
 export const LIST_LIMIT = {
 	INITIAL_LIMIT: 100,
 	LOAD_MORE_LIMIT: 50
-};
+} as const;
 
 export const LOCAL_STORAGES = {
 	EXPANDED_FOLDERS: 'open_mails_folders'

src/helpers/tests/attachments.test.ts

@@ -3,13 +3,13 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { getMsgCall } from '../../store/actions';
+import { getMsg } from '../../api/helpers/get-msg-service';
 import { getAttachmentParts, isContentIdEqual } from '../attachments';
 
 describe('attachments', () => {
 	describe('getAttachmentParts', () => {
 		test('Inline attachment without content disposition are recognized anyway', async () => {
-			const msg = await getMsgCall({ msgId: '13' });
+			const msg = await getMsg({ msgId: '13' });
 			const attachmentParts = getAttachmentParts(msg.parts);
 			expect(attachmentParts).toHaveLength(1);
 			expect(attachmentParts[0].name).toBe('2');

src/hooks/actions/test/use-msg-apply-tag.test.ts

@@ -14,7 +14,7 @@ import { setupHook } from '../../../carbonio-ui-commons/test/test-setup';
 import { FOLDERS_DESCRIPTORS } from '../../../constants';
 import { generateMessage } from '../../../tests/generators/generateMessage';
 import { generateStore } from '../../../tests/generators/store';
-import { ConvActionRequest } from '../../../types';
+import { MsgActionRequest, MsgActionResponse } from '../../../types';
 import { useMsgApplyTagDescriptor, useMsgApplyTagSubDescriptors } from '../use-msg-apply-tag';
 
 jest.mock('../../../carbonio-ui-commons/store/zustand/tags', () => ({
@@ -167,7 +167,16 @@ describe('useMsgApplyTag', () => {
 					}
 				};
 				(useTags as jest.Mock).mockReturnValue(tags);
-				const interceptor = createSoapAPIInterceptor<ConvActionRequest>('MsgAction');
+				const response: MsgActionResponse = {
+					action: {
+						id: '123',
+						op: 'tag'
+					}
+				};
+				const interceptor = createSoapAPIInterceptor<MsgActionRequest, MsgActionResponse>(
+					'MsgAction',
+					response
+				);
 				const {
 					result: { current: descriptor }
 				} = setupHook(useMsgApplyTagSubDescriptors, {
@@ -185,15 +194,24 @@ describe('useMsgApplyTag', () => {
 				expect(requestParameter.action.l).toBeUndefined();
 			});
 
-			it('should call the API to add the tag from the message', async () => {
+			it('should call the API to add the tag to the message', async () => {
 				const tags = {
 					'1': {
 						id: '1',
 						name: 'tag 1'
 					}
 				};
 				(useTags as jest.Mock).mockReturnValue(tags);
-				const interceptor = createSoapAPIInterceptor<ConvActionRequest>('MsgAction');
+				const response: MsgActionResponse = {
+					action: {
+						id: '123',
+						op: 'tag'
+					}
+				};
+				const interceptor = createSoapAPIInterceptor<MsgActionRequest, MsgActionResponse>(
+					'MsgAction',
+					response
+				);
 				const {
 					result: { current: descriptor }
 				} = setupHook(useMsgApplyTagSubDescriptors, {

src/hooks/actions/test/use-msg-create-appointment.test.ts

@@ -7,10 +7,12 @@ import { act } from 'react';
 
 import { FOLDERS } from '../../../carbonio-ui-commons/constants/folders';
 import { useIntegratedFunction } from '../../../carbonio-ui-commons/test/mocks/carbonio-shell-ui';
+import { createSoapAPIInterceptor } from '../../../carbonio-ui-commons/test/mocks/network/msw/create-api-interceptor';
 import { populateFoldersStore } from '../../../carbonio-ui-commons/test/mocks/store/folders';
 import { setupHook } from '../../../carbonio-ui-commons/test/test-setup';
 import { FOLDERS_DESCRIPTORS } from '../../../constants';
 import { generateMessage } from '../../../tests/generators/generateMessage';
+import { GetMsgRequest } from '../../../types';
 import {
 	useMsgCreateAppointmentDescriptor,
 	useMsgCreateAppointmentFn
@@ -121,6 +123,23 @@ describe('useMsgCreateAppointment', () => {
 					})
 				);
 			});
+
+			it('should retrieve the message if the message is not complete', async () => {
+				const interceptor = createSoapAPIInterceptor<GetMsgRequest>('GetMsg');
+				populateFoldersStore();
+				const incompleteMsg = { ...msg, parent: FOLDERS.INBOX, isComplete: false };
+				const {
+					result: { current: functions }
+				} = setupHook(useMsgCreateAppointmentFn, { initialProps: [incompleteMsg, FOLDERS.INBOX] });
+
+				await act(async () => {
+					functions.execute();
+				});
+
+				const request = await interceptor;
+
+				expect(Object.keys(request)).not.toHaveLength(0);
+			});
 		});
 	});
 });

src/hooks/actions/test/use-msg-set-flag.test.ts

@@ -3,15 +3,16 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+import { act } from 'react';
+
 import { faker } from '@faker-js/faker';
 import { times } from 'lodash';
-import { act } from 'react';
 
 import { createSoapAPIInterceptor } from '../../../carbonio-ui-commons/test/mocks/network/msw/create-api-interceptor';
 import { setupHook } from '../../../carbonio-ui-commons/test/test-setup';
 import { API_REQUEST_STATUS } from '../../../constants';
 import { generateStore } from '../../../tests/generators/store';
-import { MsgActionRequest } from '../../../types';
+import { MsgActionRequest, MsgActionResponse } from '../../../types';
 import { useMsgSetFlagDescriptor, useMsgSetFlagFn } from '../use-msg-set-flag';
 
 describe('useMsgSetFlag', () => {
@@ -92,7 +93,16 @@ describe('useMsgSetFlag', () => {
 			});
 
 			it('should call the API with the proper params if the action can be executed', async () => {
-				const apiInterceptor = createSoapAPIInterceptor<MsgActionRequest>('MsgAction');
+				const response: MsgActionResponse = {
+					action: {
+						id: '',
+						op: 'trash'
+					}
+				};
+				const apiInterceptor = createSoapAPIInterceptor<MsgActionRequest, MsgActionResponse>(
+					'MsgAction',
+					response
+				);
 				const ids = times(faker.number.int({ max: 20 }), () => faker.number.int().toString());
 
 				const {

src/hooks/actions/test/use-msg-set-read.test.ts

@@ -3,16 +3,17 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+import { act } from 'react';
+
 import { faker } from '@faker-js/faker';
 import { times } from 'lodash';
-import { act } from 'react';
 
 import { FOLDERS } from '../../../carbonio-ui-commons/constants/folders';
 import { createSoapAPIInterceptor } from '../../../carbonio-ui-commons/test/mocks/network/msw/create-api-interceptor';
 import { setupHook } from '../../../carbonio-ui-commons/test/test-setup';
 import { FOLDERS_DESCRIPTORS } from '../../../constants';
 import { generateStore } from '../../../tests/generators/store';
-import { MsgActionRequest } from '../../../types';
+import { MsgActionRequest, MsgActionResponse } from '../../../types';
 import { useMsgSetReadDescriptor, useMsgSetReadFn } from '../use-msg-set-read';
 
 describe('useMsgSetRead', () => {
@@ -154,7 +155,16 @@ describe('useMsgSetRead', () => {
 			});
 
 			it('should call the API with the proper params if the action can be executed', async () => {
-				const apiInterceptor = createSoapAPIInterceptor<MsgActionRequest>('MsgAction');
+				const response: MsgActionResponse = {
+					action: {
+						id: '',
+						op: 'trash'
+					}
+				};
+				const apiInterceptor = createSoapAPIInterceptor<MsgActionRequest, MsgActionResponse>(
+					'MsgAction',
+					response
+				);
 				const ids = times(faker.number.int({ max: 20 }), () => faker.number.int().toString());
 
 				const {

src/hooks/actions/test/use-msg-set-unflag.test.ts

@@ -3,14 +3,15 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+import { act } from 'react';
+
 import { faker } from '@faker-js/faker';
 import { times } from 'lodash';
-import { act } from 'react';
 
 import { createSoapAPIInterceptor } from '../../../carbonio-ui-commons/test/mocks/network/msw/create-api-interceptor';
 import { setupHook } from '../../../carbonio-ui-commons/test/test-setup';
 import { generateStore } from '../../../tests/generators/store';
-import { MsgActionRequest } from '../../../types';
+import { MsgActionRequest, MsgActionResponse } from '../../../types';
 import { useMsgSetUnflagDescriptor, useMsgSetUnflagFn } from '../use-msg-set-unflag';
 
 describe('useMsgSetUnflag', () => {
@@ -85,7 +86,16 @@ describe('useMsgSetUnflag', () => {
 			});
 
 			it('should call the API with the proper params if the action can be executed', async () => {
-				const apiInterceptor = createSoapAPIInterceptor<MsgActionRequest>('MsgAction');
+				const response: MsgActionResponse = {
+					action: {
+						id: '',
+						op: 'trash'
+					}
+				};
+				const apiInterceptor = createSoapAPIInterceptor<MsgActionRequest, MsgActionResponse>(
+					'MsgAction',
+					response
+				);
 				const ids = times(faker.number.int({ max: 20 }), () => faker.number.int().toString());
 
 				const {