Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ import attendanceName from "src/entities/attendance-name";
import attGradeEffect from './entities/att-grade-effect';
import reportGroup from './entities/report-group';
import reportGroupSession from './entities/report-group-session';
import phoneTemplate from './entities/phone-template';
import phoneCampaign from './entities/phone-campaign';
import Settings from 'src/settings/Settings';

import StudentAttendanceList from 'src/pivots/StudentAttendanceList';
Expand All @@ -66,7 +68,7 @@ import paymentTrack from '@shared/components/common-entities/payment-track';
import yemotCall from '@shared/components/common-entities/yemot-call';

import { isShowUsersData, isEditPagesData, isEditPaymentTracksData, isAdmin } from "@shared/utils/permissionsUtil";
import { isLessonSignature, isOnlyInLessonReport, isTeacherView, isTransportation } from 'src/utils/appPermissions';
import { isLessonSignature, isOnlyInLessonReport, isTeacherView, isTransportation, isPhoneCampaign } from 'src/utils/appPermissions';
import YemotSimulator from "@shared/components/views/YemotSimulator";
import { RegisterPage } from '@shared/components/layout/RegisterPage';
import { LoginPage } from '@shared/components/layout/LoginPage';
Expand Down Expand Up @@ -107,6 +109,8 @@ import MonetizationOnIcon from '@mui/icons-material/MonetizationOn';
import LocalAtmIcon from '@mui/icons-material/LocalAtm';
import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettings';
import DirectionsBusIcon from '@mui/icons-material/DirectionsBus';
import CampaignIcon from '@mui/icons-material/Campaign';
import MessageIcon from '@mui/icons-material/Message';

const i18nProvider = getI18nProvider(domainTranslations);

Expand Down Expand Up @@ -179,6 +183,12 @@ const App = () => (
<Resource name="grade_name" {...gradeName} options={{ menuGroup: 'settings' }} icon={LabelIcon} />
<Resource name="attendance_name" {...attendanceName} options={{ menuGroup: 'settings' }} icon={LabelIcon} />
<Resource name="att_grade_effect" {...attGradeEffect} options={{ menuGroup: 'settings' }} icon={CalculateIcon} />

{(isPhoneCampaign(permissions) || isAdmin(permissions)) && <>
<Resource name="phone_template" {...phoneTemplate} options={{ menuGroup: 'settings' }} icon={MessageIcon} />
<Resource name="phone_campaign" {...phoneCampaign} options={{ menuGroup: 'settings' }} icon={CampaignIcon} />
</>}

<Resource name="student_by_year" {...(isAdmin(permissions) ? resourceEntityGuesser : {})} recordRepresentation={CommonRepresentation} options={{ menuGroup: 'admin' }} icon={PermContactCalendarIcon} />
<Resource name="grade_effect_by_user" {...(isAdmin(permissions) ? resourceEntityGuesser : {})} recordRepresentation={'effect'} options={{ menuGroup: 'admin' }} icon={AdminPanelSettingsIcon} />
<Resource name="abs_count_effect_by_user" {...(isAdmin(permissions) ? resourceEntityGuesser : {})} recordRepresentation={'effect'} options={{ menuGroup: 'admin' }} icon={AdminPanelSettingsIcon} />
Expand Down
26 changes: 26 additions & 0 deletions client/src/components/PhoneTemplateBulkButton.jsx

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot


I guess resource is not needed to be sent explicitly

const response = await firstValueFrom(
this.httpService.post(
${this.baseUrl}/CreateTemplate,
{},
{
headers: {
'authorization': apiKey,
},
params: {
description,
},
}
)
this can be written onc and re-used

in general - i feel we can generalize things a bit and reuse code more

regarding service einject - you can inject with @Inject not inside constructor

The MVP stores the Yemot API key in User.additionalData.yemotApiKey. The frontend needs a settings UI to allow users to configure this. This could be:

Added to the existing Settings page (client/src/settings/Settings.jsx)
do this

Migration Considerations
you should generate migratino scxripts too (using docker exec typeorm:generate)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simplified PhoneTemplateBulkButton to use BulkActionButton pattern (commit d5362c4):

  • Removed custom dialog implementation and state management
  • Now uses BulkActionButton with CommonReferenceInput as child
  • Reduced from ~165 lines to ~20 lines
  • Leverages built-in action handling and filtering (isActive: true)
  • Follows the same pattern as other bulk actions in the codebase

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import React from 'react';
import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton';
import PhoneIcon from '@mui/icons-material/Phone';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { required } from 'react-admin';

const PhoneTemplateBulkButton = ({ resource }) => {
return (
<BulkActionButton
label="שליחת הודעות טלפון"
icon={<PhoneIcon />}
name="execute-phone-campaign"
reloadOnEnd
>
<CommonReferenceInput
source="templateId"
reference="phone_template"
validate={required()}
filter={{ isActive: true }}
label="בחר תבנית הודעה"
/>
</BulkActionButton>
);
};

export default PhoneTemplateBulkButton;
63 changes: 63 additions & 0 deletions client/src/domainTranslations.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export default {
'reportCardSettings.downComment': 'הצג הערה מתחת שם תלמידה',
'reportCardSettings.lastGrade': 'חשב ציון אחרון',
'reportCardSettings.debug': 'הצג פירוט',
yemotApiKey: 'מפתח API של Yemot',
}
},
att_report: {
Expand Down Expand Up @@ -507,5 +508,67 @@ export default {
topic: 'נושא',
}
},
phone_template: {
name: 'תבנית שיחה |||| תבניות שיחות',
fields: {
...generalResourceFieldsTranslation,
name: 'שם',
description: 'תיאור',
messageType: 'סוג הודעה',
messageText: 'טקסט ההודעה',
callerId: 'מספר מזהה שיחה',
isActive: 'פעיל',
yemotTemplateId: 'מזהה תבנית ימות',
test_phone: 'מספר טלפון לבדיקה',
},
messageTypes: {
text: 'טקסט להקראה (TTS)',
},
help: {
callerId: 'מספר טלפון שיוצג למקבל השיחה',
},
actions: {
test: 'שלח שיחת בדיקה',
},
dialogs: {
test_title: 'שלח שיחת בדיקה',
},
notifications: {
test_sent: 'שיחת הבדיקה נשלחה בהצלחה',
test_failed: 'שליחת שיחת הבדיקה נכשלה',
},
},
phone_campaign: {
name: 'משלוח שיחות |||| משלוחי שיחות',
fields: {
...generalResourceFieldsTranslation,
template: 'תבנית',
phoneTemplateId: 'תבנית',
status: 'סטטוס',
yemotCampaignId: 'מזהה קמפיין ימות',
totalPhones: 'סה"כ שיחות',
successfulCalls: 'שיחות מוצלחות',
failedCalls: 'שיחות כושלות',
successRate: 'אחוז הצלחה',
errorMessage: 'הודעת שגיאה',
completedAt: 'הושלם ב',
dateFrom: 'מתאריך',
dateTo: 'עד תאריך',
},
statuses: {
pending: 'ממתין',
running: 'בביצוע',
completed: 'הושלם',
failed: 'נכשל',
cancelled: 'בוטל',
},
actions: {
refresh: 'רענן סטטוס',
},
notifications: {
status_refreshed: 'הסטטוס עודכן בהצלחה',
refresh_failed: 'עדכון הסטטוס נכשל',
},
},
}
};
87 changes: 87 additions & 0 deletions client/src/entities/phone-campaign.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
import {
DateField,
DateInput,
SelectInput,
TextField,
TextInput,
NumberField,
ChipField,
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton';
import RefreshIcon from '@mui/icons-material/Refresh';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';

const statusChoices = [
{ id: 'pending', name: 'resources.phone_campaign.statuses.pending' },
{ id: 'running', name: 'resources.phone_campaign.statuses.running' },
{ id: 'completed', name: 'resources.phone_campaign.statuses.completed' },
{ id: 'failed', name: 'resources.phone_campaign.statuses.failed' },
{ id: 'cancelled', name: 'resources.phone_campaign.statuses.cancelled' },
];

const filters = [
...commonAdminFilters,
<SelectInput
source="status"
choices={statusChoices}
/>,
<TextInput source="phoneTemplateId" />,
<DateInput source="createdAt:$gte" label="resources.phone_campaign.fields.dateFrom" />,
<DateInput source="createdAt:$lte" label="resources.phone_campaign.fields.dateTo" />,
];

const StatusField = ({ record }) => {
const colorMap = {
pending: 'default',
running: 'primary',
completed: 'success',
failed: 'error',
cancelled: 'warning',
};

return (
<ChipField
source="status"
color={colorMap[record?.status] || 'default'}
/>
);
};

const additionalBulkButtons = [
<BulkActionButton
key="refresh-status"
label="resources.phone_campaign.actions.refresh"
icon={<RefreshIcon />}
name="refresh-status"
reloadOnEnd
/>,
];

const Datagrid = ({ isAdmin, children, ...props }) => {
return (
<CommonDatagrid {...props} readonly additionalBulkButtons={additionalBulkButtons}>
{children}
{isAdmin && <TextField source="id" />}
{isAdmin && <TextField source="userId" />}
<TextField source="phoneTemplateId" />
<StatusField />
<NumberField source="totalPhones" />
<NumberField source="successfulCalls" />
<NumberField source="failedCalls" />
<TextField source="errorMessage" />
<DateField showDate showTime source="createdAt" />
</CommonDatagrid>
);
};

const Representation = (record) => `Campaign #${record.id}`;

const entity = {
Datagrid,
Representation,
filters,
};

export default getResourceComponents(entity);
159 changes: 159 additions & 0 deletions client/src/entities/phone-template.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
import {
BooleanField,
BooleanInput,
DateField,
DateTimeInput,
required,
SelectInput,
TextField,
TextInput,
maxLength,
useNotify,
useDataProvider,
useGetRecordId,
useGetIdentity,
SimpleForm,
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { CommonRepresentation } from '@shared/components/CommonRepresentation';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import { ActionOrDialogButton } from '@shared/components/crudContainers/ActionOrDialogButton';
import { Alert } from '@mui/material';
import PhoneIcon from '@mui/icons-material/Phone';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';

const filters = [
...commonAdminFilters,
<TextInput source="name:$cont" alwaysOn />,
<BooleanInput source="isActive" />,
];

const TestCallButton = ({ ...props }) => {
const recordId = useGetRecordId();
const dataProvider = useDataProvider();
const notify = useNotify();

const handleTest = async (values, onClose) => {
try {
await dataProvider.action('phone_template', 'test', {
'extra.templateId': recordId,
'extra.phoneNumber': values.phoneNumber,
});

notify('resources.phone_template.notifications.test_sent', { type: 'success' });
onClose?.();
} catch (error) {
notify(error.message || 'resources.phone_template.notifications.test_failed', { type: 'error' });
}
};

return (
<ActionOrDialogButton
label="resources.phone_template.actions.test"
icon={<PhoneIcon />}
title="resources.phone_template.dialogs.test_title"
dialogContent={({ onClose }) => (
<SimpleForm onSubmit={values => handleTest(values, onClose)}>
<TextInput
source="phoneNumber"
label="resources.phone_template.fields.test_phone"
type="tel"
validate={required()}
placeholder="05XXXXXXXX"
fullWidth
autoFocus
/>
</SimpleForm>
)}
/>
);
};

const Datagrid = ({ isAdmin, children, ...props }) => {
return (
<CommonDatagrid {...props}>
{children}
{isAdmin && <TextField source="id" />}
{isAdmin && <TextField source="userId" />}
<TextField source="name" />
<TextField source="description" />
<BooleanField source="isActive" />
{isAdmin && <DateField showDate showTime source="createdAt" />}
{isAdmin && <DateField showDate showTime source="updatedAt" />}
<TestCallButton />
</CommonDatagrid>
);
};

const ApiKeyWarning = () => {
const { identity } = useGetIdentity();
const hasApiKey = identity?.additionalData?.yemotApiKey;

if (hasApiKey) return null;

return (
<Alert severity="warning" sx={{ mb: 2 }}>
Please configure your Yemot API key in your user settings before creating phone templates.
</Alert>
);
};

const Inputs = ({ isCreate, isAdmin }) => {
const { identity } = useGetIdentity();
const hasApiKey = identity?.additionalData?.yemotApiKey;

return <>
{isCreate && <ApiKeyWarning />}
{!isCreate && <TestCallButton />}
{!isCreate && isAdmin && <TextInput source="id" disabled />}
{isAdmin && <CommonReferenceInput source="userId" reference="user" validate={required()} />}
<TextInput source="name" validate={[required(), maxLength(100)]} disabled={isCreate && !hasApiKey} />
<TextInput
source="description"
multiline
rows={3}
validate={[required(), maxLength(500)]}
disabled={isCreate && !hasApiKey}
/>
<SelectInput
source="messageType"
choices={[
{ id: 'text', name: 'resources.phone_template.messageTypes.text' },
]}
defaultValue="text"
disabled
/>
<TextInput
source="messageText"
multiline
rows={5}
validate={[required()]}
disabled={isCreate && !hasApiKey}
/>
<TextInput
source="callerId"
helperText="resources.phone_template.help.callerId"
disabled={isCreate && !hasApiKey}
/>
<BooleanInput
source="isActive"
defaultValue={true}
disabled={isCreate && !hasApiKey}
/>
{!isCreate && isAdmin && <TextField source="yemotTemplateId" />}
{!isCreate && isAdmin && <DateTimeInput source="createdAt" disabled />}
{!isCreate && isAdmin && <DateTimeInput source="updatedAt" disabled />}
</>;
};

const Representation = CommonRepresentation;

const entity = {
Datagrid,
Inputs,
Representation,
filters,
};

export default getResourceComponents(entity);
Loading