20141115 RC

jest-setup.ts

@@ -3,7 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+
 import '@testing-library/jest-dom';
+
 import failOnConsole from 'jest-fail-on-console';
 import fetchMock from 'jest-fetch-mock';
 import { http } from 'msw';
@@ -21,8 +23,7 @@ import { handleGetConvRequest } from './src/tests/mocks/network/msw/handle-get-c
 import { handleGetMsgRequest } from './src/tests/mocks/network/msw/handle-get-msg';
 
 failOnConsole({
-	...getFailOnConsoleDefaultConfig(),
-	shouldFailOnWarn: false
+	...getFailOnConsoleDefaultConfig()
 });
 
 beforeAll(() => {

package.json

@@ -19,7 +19,8 @@
 		"lint-stats": "eslint --ext .js,.jsx,.ts,.tsx --format node_modules/eslint-stats/byErrorAndWarningStacked --resolve-plugins-relative-to node_modules/@zextras/carbonio-ui-configs src",
 		"lint-check": "npm run lint-errors; npm run type-check",
 		"test": "TZ=Europe/Rome jest --testTimeout=20000 --maxWorkers=50%",
-		"build:dev": "sdk build --dev --pkgRel $(date +%s)"
+		"build:dev": "sdk build --dev --pkgRel $(date +%s)",
+		"dev-deploy": "sdk build && sdk deploy"
 	},
 	"files": [
 		"src/types/"
@@ -45,32 +46,33 @@
 		"@commitlint/cli": "^19.1.0",
 		"@commitlint/config-conventional": "^19.1.0",
 		"@faker-js/faker": "^8.4.1",
-		"@testing-library/jest-dom": "^5.16.5",
-		"@testing-library/react": "^12.1.5",
-		"@testing-library/react-hooks": "^8.0.1",
-		"@testing-library/user-event": "^14.4.3",
-		"@types/jest": "^28.1.6",
-		"@types/lodash": "^4.17.0",
-		"@types/react": "^17.0.76",
+		"@testing-library/jest-dom": "^6.4.5",
+		"@testing-library/react": "^16.0.1",
+		"@testing-library/user-event": "^14.5.2",
+		"@testing-library/dom": "^10.4.0",
+		"@types/jest": "^29.5.12",
+		"@types/lodash": "^4.17.4",
+		"@types/react": "^18.3.2",
 		"@types/react-redux": "^7.1.25",
 		"@types/react-router-dom": "^5.3.3",
 		"@types/styled-components": "^5.1.26",
 		"@zextras/carbonio-ui-configs": "^1.0.0",
 		"@zextras/carbonio-ui-sdk": "^1.7.7",
 		"babel-plugin-styled-components": "^2.0.7",
 		"babel-plugin-transform-import-meta": "^2.2.0",
-		"eslint-plugin-jest-dom": "^4.0.3",
+		"eslint-plugin-jest-dom": "^5.4.0",
 		"eslint-plugin-notice": "^0.9.10",
 		"eslint-plugin-testing-library": "^5.10.1",
 		"eslint-plugin-unused-imports": "^2.0.0",
 		"eslint-stats": "^1.0.1",
-		"jest": "^29.5.0",
-		"jest-environment-jsdom": "^29.5.0",
-		"jest-fail-on-console": "^3.0.2",
+		"jest": "^29.7.0",
+		"jest-environment-jsdom": "^29.7.0",
+		"jest-fail-on-console": "^3.1.2",
 		"jest-fetch-mock": "^3.0.3",
 		"msw": "^2.2.3",
 		"npm": "^10.5.0",
-		"ts-node": "^10.9.1"
+		"ts-node": "^10.9.1",
+		"typescript": "^4.9.5"
 	},
 	"dependencies": {
 		"@emotion/react": "^11.11.4",
@@ -80,10 +82,10 @@
 		"@reduxjs/toolkit": "^1.9.3",
 		"@types/webpack": "^5.28.2",
 		"@types/webpack-env": "^1.18.1",
-		"@zextras/carbonio-design-system": "^7.1.1",
-		"@zextras/carbonio-shell-ui": "^8.0.1",
-		"@zextras/carbonio-ui-preview": "^2.1.0",
-		"axios": "^1.6.7",
+		"@zextras/carbonio-design-system": "^8.1.0",
+		"@zextras/carbonio-shell-ui": "^9.0.0",
+		"@zextras/carbonio-ui-preview": "^3.1.0",
+    "axios": "^1.6.7",
 		"babel-jest": "^29.4.3",
 		"core-js": "^3.36.0",
 		"eslint": "^8.57.0",
@@ -93,9 +95,9 @@
 		"lodash": "^4.17.21",
 		"moment": "^2.29.4",
 		"prop-types": "^15.8.1",
-		"react": "^17.0.2",
+		"react": "^18.3.1",
 		"react-colorful": "^5.6.1",
-		"react-dom": "^17.0.2",
+		"react-dom": "^18.3.1",
 		"react-hook-form": "^7.51.0",
 		"react-i18next": "^12.2.0",
 		"react-redux": "^8.0.5",

src/api/get-msg.ts

@@ -4,16 +4,20 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 import { soapFetch } from '@zextras/carbonio-shell-ui';
+import { map } from 'lodash';
 
+import { MAIL_VERIFICATION_HEADERS } from '../constants';
 import type { GetMsgParameters, GetMsgRequest, GetMsgResponse } from '../types';
 
-export async function getMsgSoapAPI({ msgId }: GetMsgParameters): Promise<GetMsgResponse> {
+export async function getMsgSoapAPI({ msgId, max }: GetMsgParameters): Promise<GetMsgResponse> {
 	return soapFetch<GetMsgRequest, GetMsgResponse>('GetMsg', {
 		_jsns: 'urn:zimbraMail',
 		m: {
 			html: 1,
 			id: msgId,
-			needExp: 1
+			needExp: 1,
+			header: map(MAIL_VERIFICATION_HEADERS, (header) => ({ n: header })),
+			...{ max }
 		}
 	});
 }

src/api/request-service-catalog.ts

@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Zextras <https://www.zextras.com>
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { ServicesCatalog } from '../types';
+
+export const requestServiceCatalog = (): Promise<ServicesCatalog> =>
+	fetch('/services/catalog/services')
+		.then(async (response) => {
+			if (response.ok) {
+				const { items } = await response.json();
+				return items;
+			}
+			console.error('Error fetching services catalog', response);
+			return [];
+		})
+		.catch((e) => {
+			console.error('Error fetching services catalog', e);
+			return [];
+		});

src/api/search-conv.ts

@@ -4,7 +4,9 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 import { soapFetch } from '@zextras/carbonio-shell-ui';
+import { map } from 'lodash';
 
+import { MAIL_VERIFICATION_HEADERS } from '../constants';
 import type { SearchConvRequest, SearchConvResponse } from '../types';
 
 type SearchConvParameters = {
@@ -25,6 +27,8 @@ export async function searchConvSoapAPI({
 		sortBy: 'dateDesc',
 		offset: 0,
 		fetch,
+		max: 250_000,
+		header: map(MAIL_VERIFICATION_HEADERS, (header) => ({ n: header })),
 		needExp: 1,
 		limit: 250,
 		html: 1

src/api/tests/get-msg.test.ts

@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Zextras <https://www.zextras.com>
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { createSoapAPIInterceptor } from '../../carbonio-ui-commons/test/mocks/network/msw/create-api-interceptor';
+import { GetMsgRequest } from '../../types';
+import { getMsgSoapAPI } from '../get-msg';
+
+describe('GetMsg', () => {
+	it('should send max parameter if present', async () => {
+		const interceptor = createSoapAPIInterceptor<GetMsgRequest>('GetMsg');
+		getMsgSoapAPI({ msgId: '1', max: 10 });
+		const request = await interceptor;
+		expect(request.m.max).toBe(10);
+	});
+	it('should not send max parameter if not present', async () => {
+		const interceptor = createSoapAPIInterceptor<GetMsgRequest>('GetMsg');
+		getMsgSoapAPI({ msgId: '1' });
+		const request = await interceptor;
+		expect(request.m.max).not.toBeDefined();
+	});
+});

src/app-utils/register-shell-actions.ts

@@ -6,21 +6,20 @@
 
 import { SyntheticEvent } from 'react';
 
-import { ACTION_TYPES, registerActions, t } from '@zextras/carbonio-shell-ui';
+import { Action, ACTION_TYPES, NewAction, registerActions, t } from '@zextras/carbonio-shell-ui';
 import { isArray, some } from 'lodash';
 
 import { ParticipantRole } from '../carbonio-ui-commons/constants/participants';
 import { EditViewActions, MAIL_APP_ID } from '../constants';
 import { mailToSharedFunction } from '../integrations/shared-functions';
 import { createEditBoard } from '../views/app/detail-panel/edit/edit-view-board';
 
-type MailToActionType = {
+interface MailToActionType extends Action {
 	id: string;
-	label: string;
 	icon: string;
-	onClick: (e: SyntheticEvent<HTMLElement, Event> | KeyboardEvent) => void;
+	execute: (e: SyntheticEvent<HTMLElement, Event> | KeyboardEvent) => void;
 	disabled: boolean;
-};
+}
 
 export const mailToActionOnClick = (
 	e: SyntheticEvent<HTMLElement, Event> | KeyboardEvent,
@@ -47,20 +46,10 @@ export const mailToAction = (contacts: unknown): MailToActionType => ({
 	id: 'mail-to',
 	label: t('label.send_mail', 'Send Mail'),
 	icon: 'MailModOutline',
-	onClick: (e) => mailToActionOnClick(e, contacts),
+	execute: (e) => mailToActionOnClick(e, contacts),
 	disabled: isArray(contacts) && some(contacts, (contact) => !contact.address)
 });
 
-type NewEmailActionType = {
-	id: string;
-	label: string;
-	icon: string;
-	onClick: (e: SyntheticEvent<HTMLElement, Event> | KeyboardEvent) => void;
-	disabled: boolean;
-	group: string;
-	primary: boolean;
-};
-
 export const newEmailActionOnClick = (
 	e: SyntheticEvent<HTMLElement, Event> | KeyboardEvent
 ): void => {
@@ -71,27 +60,25 @@ export const newEmailActionOnClick = (
 	});
 };
 
-export const newEmailAction = (): NewEmailActionType => ({
+export const newEmailAction = (): NewAction => ({
 	id: 'new-email',
 	label: t('label.new_email', 'New E-mail'),
 	icon: 'MailModOutline',
-	onClick: newEmailActionOnClick,
+	execute: newEmailActionOnClick,
 	disabled: false,
 	group: MAIL_APP_ID,
 	primary: true
 });
 
 export const registerShellActions = (): void => {
-	registerActions(
-		{
-			action: mailToAction,
-			id: 'mail-to',
-			type: 'contact-list'
-		},
-		{
-			action: newEmailAction,
-			id: 'new-email',
-			type: ACTION_TYPES.NEW
-		}
-	);
+	registerActions<NewAction>({
+		action: newEmailAction,
+		id: 'new-email',
+		type: ACTION_TYPES.NEW
+	});
+	registerActions<MailToActionType>({
+		action: mailToAction,
+		id: 'mail-to',
+		type: 'contact-list'
+	});
 };

src/app-utils/test/add-shell-components.test.tsx

@@ -5,16 +5,22 @@
  */
 
 import { addRoute, addSearchView, addSettingsView } from '@zextras/carbonio-shell-ui';
+import { HttpResponse } from 'msw';
 
+import { createAPIInterceptor } from '../../carbonio-ui-commons/test/mocks/network/msw/create-api-interceptor';
 import { mockAdvancedAccountAPI } from '../../tests/utils';
 import { addComponentsToShell } from '../add-shell-components';
 
+beforeEach(() => {
+	createAPIInterceptor('get', 'zx/login/v3/account', HttpResponse.json({}));
+});
+
 describe('addShellComponents', () => {
 	const label = 'label.app_name';
 	it('should call addRoute with the correct parameters', async () => {
 		await addComponentsToShell();
 
-		expect(addRoute).toBeCalledWith(
+		expect(addRoute).toHaveBeenCalledWith(
 			expect.objectContaining({
 				route: 'mails',
 				position: 100,
@@ -29,7 +35,7 @@ describe('addShellComponents', () => {
 	it('should call addSearchView with the correct parameters', async () => {
 		await addComponentsToShell();
 
-		expect(addSearchView).toBeCalledWith(
+		expect(addSearchView).toHaveBeenCalledWith(
 			expect.objectContaining({
 				route: 'mails',
 				component: expect.anything(),
@@ -40,7 +46,7 @@ describe('addShellComponents', () => {
 	it('should call addBoardView with the correct parameters', async () => {
 		await addComponentsToShell();
 
-		expect(addSearchView).toBeCalledWith(
+		expect(addSearchView).toHaveBeenCalledWith(
 			expect.objectContaining({
 				route: 'mails',
 				component: expect.anything()
@@ -52,7 +58,7 @@ describe('addShellComponents', () => {
 
 		await addComponentsToShell();
 
-		expect(addSettingsView).toBeCalledWith(
+		expect(addSettingsView).toHaveBeenCalledWith(
 			expect.objectContaining({
 				subSections: [
 					{ id: 'displaying_messages', label: 'settings.label.display_messages' },
@@ -73,7 +79,7 @@ describe('addShellComponents', () => {
 
 		await addComponentsToShell();
 
-		expect(addSettingsView).toBeCalledWith(
+		expect(addSettingsView).toHaveBeenCalledWith(
 			expect.objectContaining({
 				route: 'mails',
 				label,

src/app-utils/test/register-shell-actions.test.ts

@@ -19,18 +19,16 @@ describe('registerShellActions', () => {
 	it('should register the correct objects', async () => {
 		registerShellActions();
 
-		expect(registerActions).toHaveBeenCalledWith(
-			{
-				action: expect.any(Function),
-				id: 'mail-to',
-				type: 'contact-list'
-			},
-			{
-				action: expect.any(Function),
-				id: 'new-email',
-				type: 'new'
-			}
-		);
+		expect(registerActions).toHaveBeenCalledWith({
+			action: expect.any(Function),
+			id: 'mail-to',
+			type: 'contact-list'
+		});
+		expect(registerActions).toHaveBeenCalledWith({
+			action: expect.any(Function),
+			id: 'new-email',
+			type: 'new'
+		});
 	});
 });
 
@@ -40,7 +38,7 @@ describe('mailToAction', () => {
 			id: 'mail-to',
 			label: 'label.send_mail',
 			icon: 'MailModOutline',
-			onClick: expect.any(Function),
+			execute: expect.any(Function),
 			disabled: false
 		};
 		expect(mailToAction({})).toMatchObject(expectedMailToActionResult);
@@ -51,7 +49,7 @@ describe('mailToAction', () => {
 			id: 'mail-to',
 			label: 'label.send_mail',
 			icon: 'MailModOutline',
-			onClick: expect.any(Function),
+			execute: expect.any(Function),
 			disabled: true
 		};
 		const contacts = [
@@ -86,7 +84,7 @@ describe('newEmailAction', () => {
 			id: 'new-email',
 			label: 'label.new_email',
 			icon: 'MailModOutline',
-			onClick: expect.any(Function),
+			execute: expect.any(Function),
 			disabled: false,
 			group: 'carbonio-mails-ui',
 			primary: true