diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js
index bd33160b..f6aa44a0 100644
--- a/client/src/domainTranslations.js
+++ b/client/src/domainTranslations.js
@@ -16,6 +16,8 @@ export default {
defaultPageSize: 'מספר שורות בטבלה',
lateValue: 'שווי איחור',
phoneNumber: 'מספר טלפון',
+ mailAddressTitle: 'שם השולח',
+ mailAddressAlias: 'כתובת השולח',
yemotApiKey: 'מפתח API של Yemot',
managerPhone: 'טלפון מנהלת',
dashboardItems: 'הגדרות תמונת מצב',
diff --git a/client/src/roadmapFeatures.js b/client/src/roadmapFeatures.js
index 1c6576b4..444699a2 100644
--- a/client/src/roadmapFeatures.js
+++ b/client/src/roadmapFeatures.js
@@ -33,6 +33,7 @@ export default [
{ html: 'עיצוב חדש לדוח המורות שדיווחו: כרטיס לכל כיתה עם שורה לכל שיעור, צביעת מספר החסרות וריבועי סיכום', status: 'בוצע', statusColor: 'success' },
{ html: 'דוח המורות שדיווחו: לחיצה על מספר החסרות מציגה את שמות הבנות שחסרו', status: 'בוצע', statusColor: 'success' },
{ html: 'דוח חדש "מעקב חיסורים": כרטיס לכל כיתה, סף חיסורים לבחירה, כמה חיסורים נשארו לכל תלמידה עד הסף ופירוט בלחיצה', status: 'בוצע', statusColor: 'success' },
+ { html: 'מסך ההגדרות: הגדרת שם וכתובת השולח במיילים שנשלחים מהמערכת', status: 'בוצע', statusColor: 'success' },
// { html: 'הגדרת תקופת זמן לפי תאריכים', status: 'בקרוב', statusColor: 'warning' },
// { html: 'הגדרת תקופת זמן לפי יום בשבוע', status: 'בוצע', statusColor: 'success' },
diff --git a/client/src/settings/MailSettingsInput.jsx b/client/src/settings/MailSettingsInput.jsx
new file mode 100644
index 00000000..ea946840
--- /dev/null
+++ b/client/src/settings/MailSettingsInput.jsx
@@ -0,0 +1,35 @@
+import { TextInput, maxLength, regex } from 'react-admin';
+import { InputAdornment } from '@mui/material';
+import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion';
+
+const MAIL_DOMAIN = 'mail.yoman.online';
+const aliasValidate = regex(/^[a-zA-Z0-9._-]{3,64}$/, 'יש להשתמש באותיות באנגלית, מספרים, נקודה, מקף או קו תחתון (3-64 תווים)');
+
+export function MailSettingsInput() {
+ return (
+
+
+ @{MAIL_DOMAIN},
+ }}
+ inputProps={{ dir: 'ltr' }}
+ />
+
+ );
+}
diff --git a/client/src/settings/Settings.jsx b/client/src/settings/Settings.jsx
index 9752ba61..5e7e06e0 100644
--- a/client/src/settings/Settings.jsx
+++ b/client/src/settings/Settings.jsx
@@ -17,6 +17,7 @@ import { DashboardItemsInput } from '@shared/components/settings/DashboardItemsI
import { getLateValue, getDashboardItems, getReportStyles, getReportCardSettings, normalizeReportStyles } from './settingsUtil';
import { ReportStylesInput } from './ReportStylesInput';
import { GeneralSettingsInput } from './GeneralSettingsInput';
+import { MailSettingsInput } from './MailSettingsInput';
import { ReportCardSettingsInput } from './ReportCardSettingsInput';
import { YemotSettingsInput } from '@shared/components/phone/YemotSettingsInput';
import { PhoneSettingsInput } from '@shared/components/phone/PhoneSettingsInput';
@@ -42,20 +43,26 @@ export default function Settings() {
reportStyles: normalizeReportStyles(getReportStyles(identity)),
reportCardSettings: getReportCardSettings(identity),
phoneNumber: identity?.phoneNumber ?? '',
+ mailAddressTitle: identity?.mailAddressTitle ?? '',
+ mailAddressAlias: identity?.mailAddressAlias ?? '',
};
- const handleSave = async ({ phoneNumber, ...values }) => {
+ const handleSave = async ({ phoneNumber, mailAddressTitle, mailAddressAlias, ...values }) => {
try {
- await dataProvider.updateSettings({ data: values });
- if (phoneNumber !== (identity?.phoneNumber ?? '')) {
- await dataProvider.updateProfile({ data: { phoneNumber } });
+ const profile = Object.fromEntries(
+ Object.entries({ phoneNumber, mailAddressTitle, mailAddressAlias })
+ .filter(([key, value]) => value !== (identity?.[key] ?? ''))
+ );
+ if (Object.keys(profile).length) {
+ await dataProvider.updateProfile({ data: profile });
}
+ await dataProvider.updateSettings({ data: values });
await authProvider.getIdentity(true);
notify('ההגדרות נשמרו בהצלחה', { type: 'info' });
navigate('/');
window.location.reload();
} catch (e) {
- notify('שמירה נכשלה', { type: 'error' });
+ notify(e?.status === 400 && e?.message ? e.message : 'שמירה נכשלה', { type: 'error' });
}
};
@@ -66,6 +73,7 @@ export default function Settings() {
}>
+
({ GeneralSettingsInput: () => null }));
+jest.mock('./ReportStylesInput', () => ({ ReportStylesInput: () => null }));
+jest.mock('./ReportCardSettingsInput', () => ({ ReportCardSettingsInput: () => null }));
+jest.mock('./ManagerPhoneSettingsInput', () => ({ ManagerPhoneSettingsInput: () => null }));
+jest.mock('@shared/components/phone/YemotSettingsInput', () => ({ YemotSettingsInput: () => null }));
+jest.mock('@shared/components/phone/PhoneSettingsInput', () => ({ PhoneSettingsInput: () => null }));
+jest.mock('@shared/components/settings/DashboardItemsInput', () => ({ DashboardItemsInput: () => null }));
+
+const identity = {
+ id: 1,
+ fullName: 'test',
+ phoneNumber: '0500000000',
+ mailAddressTitle: 'Old School',
+ mailAddressAlias: 'old-school',
+ additionalData: {},
+};
+
+const authProvider = {
+ login: jest.fn(),
+ logout: jest.fn(),
+ checkAuth: jest.fn(() => Promise.resolve()),
+ checkError: jest.fn(() => Promise.resolve()),
+ getPermissions: jest.fn(() => Promise.resolve({})),
+ getIdentity: jest.fn(() => Promise.resolve(identity)),
+};
+
+const dataProvider = {
+ updateSettings: jest.fn(() => Promise.resolve({ success: true })),
+ updateProfile: jest.fn(() => Promise.resolve({ success: true })),
+};
+
+const originalLocation = window.location;
+
+beforeEach(() => {
+ jest.clearAllMocks();
+ delete window.location;
+ window.location = { ...originalLocation, href: originalLocation.href, pathname: '/', search: '', hash: '', reload: jest.fn() };
+});
+
+afterAll(() => {
+ window.location = originalLocation;
+});
+
+test('sends only changed mail fields to updateProfile', async () => {
+ render(
+
+
+ ,
+ );
+
+ const titleInput = await screen.findByDisplayValue('Old School');
+ expect(screen.getByDisplayValue('old-school')).toBeInTheDocument();
+
+ fireEvent.change(titleInput, { target: { value: 'New School' } });
+ fireEvent.click(screen.getByRole('button', { name: /save|שמירה/i }));
+
+ await waitFor(() => expect(dataProvider.updateProfile).toHaveBeenCalledWith({ data: { mailAddressTitle: 'New School' } }));
+ expect(dataProvider.updateSettings).toHaveBeenCalled();
+ expect(dataProvider.updateSettings.mock.calls[0][0].data).not.toHaveProperty('mailAddressTitle');
+});
+
+test('skips updateProfile when no profile field changed', async () => {
+ render(
+
+
+ ,
+ );
+
+ await screen.findByDisplayValue('Old School');
+ fireEvent.click(screen.getByRole('button', { name: /save|שמירה/i }));
+
+ await waitFor(() => expect(dataProvider.updateSettings).toHaveBeenCalled());
+ expect(dataProvider.updateProfile).not.toHaveBeenCalled();
+});
diff --git a/server/shared b/server/shared
index fc2c5f4f..8622a336 160000
--- a/server/shared
+++ b/server/shared
@@ -1 +1 @@
-Subproject commit fc2c5f4f8787e2e3bd93714171996c0c70198f07
+Subproject commit 8622a33656f804d88e2d45d81438002f3ee9dcbb