From 107603e438bad6931977b25383f8ab1a5427a166 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 5 Sep 2026 06:37:38 +0000 Subject: [PATCH 1/2] server: remove dead imports and stale commented-out code Low-risk cleanup pass, no behavior change: - Remove unused TypeORM/type imports across entities, view-entities, and a few entity-modules/reports/utils files (IsUniqueCombination, OneToMany/Klass/Lesson/StudentKlass, DataSource/JoinColumn/ManyToOne, AttGradeEffect, formatTime, Any, fillDefaultYearValue where unused). - Drop an unused destructured `userId` in teacherReportFile.ts. - Remove stale commented-out code blocks left over from prior work: an inert early-return guard in student-by-year.config.ts, a disabled '0%' branch in studentReportData.util.ts, and unused header-row scaffolding (hoursRow/topicRow/etc.) in klassAttendanceReport.ts. Verified via `yarn test` in server/ before and after: 117/117 suites, 1028/1028 tests passing both times (no regressions). Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01Nk3qfmWuX1u4GpRMBL2jog --- server/src/db/entities/AbsenceType.entity.ts | 2 +- .../db/entities/ReportGroupSession.entity.ts | 1 - server/src/db/entities/User.entity.ts | 5 +---- .../view-entities/AttReportAndGrade.entity.ts | 6 +----- .../db/view-entities/LessonKlassName.entity.ts | 4 +--- .../db/view-entities/StudentByYear.entity.ts | 2 +- .../TeacherGradeReportStatus.entity.ts | 2 +- .../TeacherReportStatus.entity.ts | 2 +- .../entity-modules/student-by-year.config.ts | 3 --- .../student-percent-report.config.ts | 1 - server/src/reports/klassAttendanceReport.ts | 18 ++---------------- server/src/reports/teacherReportFile.ts | 2 +- server/src/utils/studentReportData.util.ts | 3 +-- 13 files changed, 11 insertions(+), 40 deletions(-) diff --git a/server/src/db/entities/AbsenceType.entity.ts b/server/src/db/entities/AbsenceType.entity.ts index 138f3f1e..b5aad02b 100644 --- a/server/src/db/entities/AbsenceType.entity.ts +++ b/server/src/db/entities/AbsenceType.entity.ts @@ -3,7 +3,7 @@ import { IHasUserId } from '@shared/base-entity/interface'; import { User } from 'src/db/entities/User.entity'; import { IsOptional, Min } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, IsUniqueCombination, MaxLength, IsNumber } from '@shared/utils/validation/class-validator-he'; +import { IsNotEmpty, MaxLength, IsNumber } from '@shared/utils/validation/class-validator-he'; import { StringType, NumberType } from '@shared/utils/entity/class-transformer'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; diff --git a/server/src/db/entities/ReportGroupSession.entity.ts b/server/src/db/entities/ReportGroupSession.entity.ts index ca5e29d5..ed940f2a 100644 --- a/server/src/db/entities/ReportGroupSession.entity.ts +++ b/server/src/db/entities/ReportGroupSession.entity.ts @@ -16,7 +16,6 @@ import { Grade } from './Grade.entity'; import { CrudValidationGroups } from '@dataui/crud'; import { IsNotEmpty, IsDate } from '@shared/utils/validation/class-validator-he'; import { StringType, NumberType, DateType } from '@shared/utils/entity/class-transformer'; -import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { cleanDateFields, cleanTimeFields } from '@shared/utils/entity/deafultValues.util'; @Index('report_group_sessions_user_id_idx', ['userId'], {}) diff --git a/server/src/db/entities/User.entity.ts b/server/src/db/entities/User.entity.ts index 4d1ba1c4..c373d394 100644 --- a/server/src/db/entities/User.entity.ts +++ b/server/src/db/entities/User.entity.ts @@ -1,11 +1,8 @@ -import { Entity, OneToMany } from 'typeorm'; +import { Entity } from 'typeorm'; import { User as BaseUser } from '@shared/entities/User.entity'; import { Grade } from 'src/db/entities/Grade.entity'; import { KlassType } from 'src/db/entities/KlassType.entity'; -import { Klass } from 'src/db/entities/Klass.entity'; import { KnownAbsence } from 'src/db/entities/KnownAbsence.entity'; -import { Lesson } from 'src/db/entities/Lesson.entity'; -import { StudentKlass } from 'src/db/entities/StudentKlass.entity'; import { Student } from 'src/db/entities/Student.entity'; import { Teacher } from 'src/db/entities/Teacher.entity'; diff --git a/server/src/db/view-entities/AttReportAndGrade.entity.ts b/server/src/db/view-entities/AttReportAndGrade.entity.ts index 3fe7ed8f..b668e832 100644 --- a/server/src/db/view-entities/AttReportAndGrade.entity.ts +++ b/server/src/db/view-entities/AttReportAndGrade.entity.ts @@ -1,9 +1,5 @@ -import { Column, DataSource, JoinColumn, ManyToOne, ViewEntity } from 'typeorm'; +import { Column, ViewEntity } from 'typeorm'; import { IHasUserId } from '@shared/base-entity/interface'; -import { StudentKlass } from 'src/db/entities/StudentKlass.entity'; -import { Student } from '../entities/Student.entity'; -import { AttReport } from '../entities/AttReport.entity'; -import { Grade } from '../entities/Grade.entity'; @ViewEntity('att_report_and_grade', { expression: ` diff --git a/server/src/db/view-entities/LessonKlassName.entity.ts b/server/src/db/view-entities/LessonKlassName.entity.ts index bed5aa21..8c32c58e 100644 --- a/server/src/db/view-entities/LessonKlassName.entity.ts +++ b/server/src/db/view-entities/LessonKlassName.entity.ts @@ -1,7 +1,5 @@ -import { Column, DataSource, ViewEntity } from 'typeorm'; +import { Column, ViewEntity } from 'typeorm'; import { IHasUserId } from '@shared/base-entity/interface'; -import { Klass } from '../entities/Klass.entity'; -import { Lesson } from '../entities/Lesson.entity'; import { getGroupConcatExpression, getJsonTableColumn, diff --git a/server/src/db/view-entities/StudentByYear.entity.ts b/server/src/db/view-entities/StudentByYear.entity.ts index 486c9a79..7e5c3291 100644 --- a/server/src/db/view-entities/StudentByYear.entity.ts +++ b/server/src/db/view-entities/StudentByYear.entity.ts @@ -1,4 +1,4 @@ -import { Column, DataSource, JoinColumn, ManyToOne, ViewEntity } from 'typeorm'; +import { Column, DataSource, ViewEntity } from 'typeorm'; import { IHasUserId } from '@shared/base-entity/interface'; import { StudentKlass } from 'src/db/entities/StudentKlass.entity'; import { Student } from '../entities/Student.entity'; diff --git a/server/src/db/view-entities/TeacherGradeReportStatus.entity.ts b/server/src/db/view-entities/TeacherGradeReportStatus.entity.ts index 98975d2f..3911e7c6 100644 --- a/server/src/db/view-entities/TeacherGradeReportStatus.entity.ts +++ b/server/src/db/view-entities/TeacherGradeReportStatus.entity.ts @@ -1,4 +1,4 @@ -import { Column, DataSource, JoinColumn, ManyToOne, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm'; +import { Column, DataSource, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm'; import { IHasUserId } from '@shared/base-entity/interface'; import { Teacher } from '../entities/Teacher.entity'; import { ReportMonth } from '../entities/ReportMonth.entity'; diff --git a/server/src/db/view-entities/TeacherReportStatus.entity.ts b/server/src/db/view-entities/TeacherReportStatus.entity.ts index f33eb9fa..970329a6 100644 --- a/server/src/db/view-entities/TeacherReportStatus.entity.ts +++ b/server/src/db/view-entities/TeacherReportStatus.entity.ts @@ -1,4 +1,4 @@ -import { Column, DataSource, JoinColumn, ManyToOne, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm'; +import { Column, DataSource, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm'; import { IHasUserId } from '@shared/base-entity/interface'; import { Teacher } from '../entities/Teacher.entity'; import { ReportMonth } from '../entities/ReportMonth.entity'; diff --git a/server/src/entity-modules/student-by-year.config.ts b/server/src/entity-modules/student-by-year.config.ts index 22b3d505..d48ab7f6 100644 --- a/server/src/entity-modules/student-by-year.config.ts +++ b/server/src/entity-modules/student-by-year.config.ts @@ -97,9 +97,6 @@ class StudentByYearService extends BaseEntityS }); pivotData.forEach((item) => { - // if (item.absCount === 0) { - // return; - // } const key = `${item.lessonReferenceId}`; headers[key] ??= { value: key, label: `${item.lesson?.name}` }; studentMap[item.studentReferenceId][key] ??= 0; diff --git a/server/src/entity-modules/student-percent-report.config.ts b/server/src/entity-modules/student-percent-report.config.ts index d9c698ad..46d72eb6 100644 --- a/server/src/entity-modules/student-percent-report.config.ts +++ b/server/src/entity-modules/student-percent-report.config.ts @@ -6,7 +6,6 @@ import { IHeader } from '@shared/utils/exporter/types'; import { getPercentsFormatter } from '@shared/utils/formatting/formatter.util'; import { AbsCountEffectByUser } from 'src/db/view-entities/AbsCountEffectByUser.entity'; import { GradeEffectByUser } from 'src/db/view-entities/GradeEffectByUser.entity'; -import { AttGradeEffect } from 'src/db/entities/AttGradeEffect'; import { GradeName } from 'src/db/entities/GradeName.entity'; import { AttendanceName } from 'src/db/entities/AttendanceName.entity'; import { KnownAbsence } from 'src/db/entities/KnownAbsence.entity'; diff --git a/server/src/reports/klassAttendanceReport.ts b/server/src/reports/klassAttendanceReport.ts index 56978c73..ba6e6cf8 100644 --- a/server/src/reports/klassAttendanceReport.ts +++ b/server/src/reports/klassAttendanceReport.ts @@ -14,7 +14,7 @@ import { IImageField, ISpecialField } from '@shared/utils/importer/types'; import * as ExcelJS from 'exceljs'; import { getUniqueValues, groupDataByKeysAndCalc, groupDataByKeyFn } from '@shared/utils/reportData.util'; import { ReportGroup } from 'src/db/entities/ReportGroup.entity'; -import { formatTime, formatDate, formatDisplayName } from '@shared/utils/formatting/formatter.util'; +import { formatDate, formatDisplayName } from '@shared/utils/formatting/formatter.util'; export interface KlassAttendanceReportParams { userId: number; @@ -310,21 +310,7 @@ const BUILDING = { (s) => `${s.date.getDate().toString().padStart(2, '0')}/${(s.date.getMonth() + 1).toString().padStart(2, '0')}`, ), ]; - // const hoursRow = ['שעות לימוד', ...sessions.map(s => `${formatTime(s.startTime)}-${formatTime(s.endTime)}`)]; - // const topicRow = ['שיעור', ...sessions.map(s => s.topic)]; - // const lessonCountRow = ['מס\' שעות לימוד', ...sessions.map(s => s.lessonCount.toString())]; - // const teacherRow = ['שם המורה', ...sessions.map(s => s.teacherName)]; - // const separatorRow = ['', ...sessions.map(() => '--')]; - - const rows = [ - dayRow, - dateRow, - // hoursRow, - // topicRow, - // lessonCountRow, - // teacherRow, - // separatorRow - ]; + const rows = [dayRow, dateRow]; // Convert header rows to special fields with styling const specialFields: ISpecialField[] = []; diff --git a/server/src/reports/teacherReportFile.ts b/server/src/reports/teacherReportFile.ts index c2d2f6ef..b62d6453 100644 --- a/server/src/reports/teacherReportFile.ts +++ b/server/src/reports/teacherReportFile.ts @@ -35,7 +35,7 @@ const getReportData: IGetReportDataFunction = async ( params: TeacherReportFileParams, dataSource, ): Promise => { - const [userId, teacherId, reportMonthId, year] = params.id.split('_'); + const [, teacherId, reportMonthId, year] = params.id.split('_'); const teacherReportTable = params.isGrades ? TeacherGradeReportStatus : TeacherReportStatus; const [user, teacher, teacherReportStatus, reportMonth] = await Promise.all([ dataSource.getRepository(User).findOneBy({ id: params.userId }), diff --git a/server/src/utils/studentReportData.util.ts b/server/src/utils/studentReportData.util.ts index fcd6013a..1e3bee26 100644 --- a/server/src/utils/studentReportData.util.ts +++ b/server/src/utils/studentReportData.util.ts @@ -9,7 +9,7 @@ import { roundFractional, } from '@shared/utils/reportData.util'; import { getReportDateFilter } from '@shared/utils/entity/filters.util'; -import { FindOptionsWhere, FindOperator, In, Not, Any } from 'typeorm'; +import { FindOptionsWhere, FindOperator, In, Not } from 'typeorm'; import { KnownAbsence } from 'src/db/entities/KnownAbsence.entity'; import { AttReportAndGrade } from 'src/db/view-entities/AttReportAndGrade.entity'; import { AttGradeEffect } from 'src/db/entities/AttGradeEffect'; @@ -221,7 +221,6 @@ export function getDisplayGrade( gradeNames: GradeName[] = [], klassTypeReferenceId?: number, ) { - // if (grade === 0) return '0%'; if (!grade) return ''; // ========== investigation ========== From 334080b8c471b8465f8b03745786dc44fcf8f9e5 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 5 Sep 2026 06:37:48 +0000 Subject: [PATCH 2/2] client: remove unused imports Low-risk cleanup pass, no behavior change: - Remove the unused default `React` import from ~20 components/entities. The project uses @vitejs/plugin-react with the automatic JSX runtime (React 18), so JSX no longer requires React in scope; none of these files referenced `React.*` directly. - Remove other unused named imports found alongside them (react-admin inputs/fields like DateInput, SelectInput, NumberInput, SelectField, BooleanInput, ReferenceArrayField/Input, FormDataConsumer, required, maxLength, filterByUserId, CommonReferenceInputFilter, CommonSelectArrayField, useAuthState, usePermissions) and one unused default import (StudentEventReport in App.jsx). Verified via `yarn test` in client/ before and after: identical results, 31/32 suites passing (1 pre-existing skip), 204/205 tests passing both times (no regressions). Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01Nk3qfmWuX1u4GpRMBL2jog --- client/src/App.jsx | 1 - client/src/RootDashboard.jsx | 1 - client/src/components/ApprovedAbsencesUpload.jsx | 2 +- client/src/components/ApprovedAbsencesUpload/ActionButtons.jsx | 1 - .../components/ApprovedAbsencesUpload/ConfigurationForm.jsx | 1 - .../components/ApprovedAbsencesUpload/FileUploadSection.jsx | 1 - .../src/components/ApprovedAbsencesUpload/PreviewSummary.jsx | 1 - client/src/components/ApprovedAbsencesUpload/PreviewTable.jsx | 1 - client/src/components/LessonSignatureFields.jsx | 1 - client/src/components/StudentView/StudentAccess.jsx | 1 - client/src/components/StudentView/student-event-report.jsx | 1 - client/src/components/TeacherView/TeacherAccess.jsx | 1 - client/src/components/fields/ThresholdColorField.jsx | 1 - client/src/entities/att-grade-effect.jsx | 1 - client/src/entities/att-report-with-report-month.jsx | 1 - client/src/entities/attendance-name.jsx | 1 - client/src/entities/known-absence.jsx | 1 - client/src/entities/lesson.jsx | 2 -- client/src/entities/report-month.jsx | 1 - client/src/entities/student-klass.jsx | 1 - client/src/entities/student-klasses-report.jsx | 2 +- client/src/entities/student.jsx | 3 --- client/src/entities/teacher-salary-report.jsx | 2 +- client/src/entities/teacher.jsx | 1 - client/src/pivots/PercentReportWithDatesList.jsx | 2 -- client/src/pivots/StudentAttendanceList.jsx | 2 -- client/src/reports/InLessonReport.jsx | 2 +- client/src/reports/in-lesson-report/FormActions.jsx | 2 +- client/src/reports/in-lesson-report/LessonSelector.jsx | 2 +- client/src/reports/in-lesson-report/MainReport.jsx | 1 - client/src/reports/in-lesson-report/ReportHeader.jsx | 2 +- client/src/reports/in-lesson-report/StudentList.jsx | 2 +- client/src/reports/in-lesson-report/TeacherSelector.jsx | 2 +- client/src/reports/in-lesson-report/index.jsx | 2 +- client/src/settings/GeneralSettingsInput.jsx | 1 - client/src/settings/ReportCardSettingsInput.jsx | 1 - client/src/settings/ReportStylesInput.jsx | 1 - client/src/settings/Settings.jsx | 1 - 38 files changed, 10 insertions(+), 43 deletions(-) diff --git a/client/src/App.jsx b/client/src/App.jsx index 46fbd8cc..8d8ef24b 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -36,7 +36,6 @@ import transportation from 'src/entities/transportation'; import absenceType from 'src/entities/absenceType'; import uploadedFile from '@shared/components/common-entities/uploaded-file'; import studentKlassesReport from 'src/entities/student-klasses-report'; -import StudentEventReport from 'src/components/StudentView/student-event-report'; import reportMonth from 'src/entities/report-month'; import teacherReportStatus from 'src/entities/teacher-report-status'; import teacherGradeReportStatus from 'src/entities/teacher-grade-report-status'; diff --git a/client/src/RootDashboard.jsx b/client/src/RootDashboard.jsx index 3825dfca..177d80c8 100644 --- a/client/src/RootDashboard.jsx +++ b/client/src/RootDashboard.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Dashboard } from 'src/GeneralLayout'; import { useIsTeacherView, useIsStudentView } from 'src/utils/appPermissions'; import { TeacherGuard } from 'src/components/TeacherView/TeacherAccess'; diff --git a/client/src/components/ApprovedAbsencesUpload.jsx b/client/src/components/ApprovedAbsencesUpload.jsx index ad12d1d9..759d740f 100644 --- a/client/src/components/ApprovedAbsencesUpload.jsx +++ b/client/src/components/ApprovedAbsencesUpload.jsx @@ -1,4 +1,4 @@ -import React, { useState, useRef } from 'react'; +import { useState, useRef } from 'react'; // MUI Components import Container from '@mui/material/Container'; diff --git a/client/src/components/ApprovedAbsencesUpload/ActionButtons.jsx b/client/src/components/ApprovedAbsencesUpload/ActionButtons.jsx index ed1d7ffd..d18a1e0c 100644 --- a/client/src/components/ApprovedAbsencesUpload/ActionButtons.jsx +++ b/client/src/components/ApprovedAbsencesUpload/ActionButtons.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Button } from 'react-admin'; import Box from '@mui/material/Box'; diff --git a/client/src/components/ApprovedAbsencesUpload/ConfigurationForm.jsx b/client/src/components/ApprovedAbsencesUpload/ConfigurationForm.jsx index 3bc1d686..2e531727 100644 --- a/client/src/components/ApprovedAbsencesUpload/ConfigurationForm.jsx +++ b/client/src/components/ApprovedAbsencesUpload/ConfigurationForm.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Form, TextInput } from 'react-admin'; import Box from '@mui/material/Box'; import Stack from '@mui/material/Stack'; diff --git a/client/src/components/ApprovedAbsencesUpload/FileUploadSection.jsx b/client/src/components/ApprovedAbsencesUpload/FileUploadSection.jsx index 9a1ed261..f8bd803b 100644 --- a/client/src/components/ApprovedAbsencesUpload/FileUploadSection.jsx +++ b/client/src/components/ApprovedAbsencesUpload/FileUploadSection.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Button } from 'react-admin'; import Stack from '@mui/material/Stack'; import Box from '@mui/material/Box'; diff --git a/client/src/components/ApprovedAbsencesUpload/PreviewSummary.jsx b/client/src/components/ApprovedAbsencesUpload/PreviewSummary.jsx index 97bc2789..9b4e41e8 100644 --- a/client/src/components/ApprovedAbsencesUpload/PreviewSummary.jsx +++ b/client/src/components/ApprovedAbsencesUpload/PreviewSummary.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import Box from '@mui/material/Box'; import Stack from '@mui/material/Stack'; import Typography from '@mui/material/Typography'; diff --git a/client/src/components/ApprovedAbsencesUpload/PreviewTable.jsx b/client/src/components/ApprovedAbsencesUpload/PreviewTable.jsx index 1b58b9ec..6aee4bc6 100644 --- a/client/src/components/ApprovedAbsencesUpload/PreviewTable.jsx +++ b/client/src/components/ApprovedAbsencesUpload/PreviewTable.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Datagrid, FunctionField, diff --git a/client/src/components/LessonSignatureFields.jsx b/client/src/components/LessonSignatureFields.jsx index 00596ec9..f7ce562c 100644 --- a/client/src/components/LessonSignatureFields.jsx +++ b/client/src/components/LessonSignatureFields.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Box, Divider, Typography } from '@mui/material'; import { required } from 'react-admin'; import SignatureInput from '@shared/components/fields/signature/SignatureInput'; diff --git a/client/src/components/StudentView/StudentAccess.jsx b/client/src/components/StudentView/StudentAccess.jsx index 845028fc..311d1ec1 100644 --- a/client/src/components/StudentView/StudentAccess.jsx +++ b/client/src/components/StudentView/StudentAccess.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar, SaveButton, useResetStore } from 'react-admin'; import { useObjectStore } from 'src/utils/storeUtil'; import Button from '@mui/material/Button'; diff --git a/client/src/components/StudentView/student-event-report.jsx b/client/src/components/StudentView/student-event-report.jsx index 021816be..2588bfa1 100644 --- a/client/src/components/StudentView/student-event-report.jsx +++ b/client/src/components/StudentView/student-event-report.jsx @@ -12,7 +12,6 @@ import { useGetList, Create, SimpleForm, - FormDataConsumer, Loading, ArrayInput, SimpleFormIterator, diff --git a/client/src/components/TeacherView/TeacherAccess.jsx b/client/src/components/TeacherView/TeacherAccess.jsx index 5a038de0..055041f4 100644 --- a/client/src/components/TeacherView/TeacherAccess.jsx +++ b/client/src/components/TeacherView/TeacherAccess.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar, SaveButton, useResetStore } from 'react-admin'; import { useObjectStore } from 'src/utils/storeUtil'; import Button from '@mui/material/Button'; diff --git a/client/src/components/fields/ThresholdColorField.jsx b/client/src/components/fields/ThresholdColorField.jsx index c85ce67a..41058d85 100644 --- a/client/src/components/fields/ThresholdColorField.jsx +++ b/client/src/components/fields/ThresholdColorField.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { FunctionField } from 'react-admin'; import { getColorForValue } from '@shared/utils/thresholdUtil'; diff --git a/client/src/entities/att-grade-effect.jsx b/client/src/entities/att-grade-effect.jsx index d62914d4..4c8eb129 100644 --- a/client/src/entities/att-grade-effect.jsx +++ b/client/src/entities/att-grade-effect.jsx @@ -6,7 +6,6 @@ import { DateField, DateTimeInput, required, - maxLength, } from 'react-admin'; import { CommonDatagrid } from '@shared/components/crudContainers/CommonList'; import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; diff --git a/client/src/entities/att-report-with-report-month.jsx b/client/src/entities/att-report-with-report-month.jsx index 2fca5598..27fb2ba0 100644 --- a/client/src/entities/att-report-with-report-month.jsx +++ b/client/src/entities/att-report-with-report-month.jsx @@ -5,7 +5,6 @@ import { TextField, TextInput, ReferenceField, - required, NumberInput, BooleanInput, NullableBooleanInput, diff --git a/client/src/entities/attendance-name.jsx b/client/src/entities/attendance-name.jsx index bba94de2..636a286e 100644 --- a/client/src/entities/attendance-name.jsx +++ b/client/src/entities/attendance-name.jsx @@ -12,7 +12,6 @@ import { CommonDatagrid } from '@shared/components/crudContainers/CommonList'; import { CommonRepresentation } from '@shared/components/CommonRepresentation'; import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput'; -import { CommonReferenceInputFilter } from '@shared/components/fields/CommonReferenceInputFilter'; import { adminUserFilter } from '@shared/components/fields/PermissionFilter'; const filters = [adminUserFilter, , ]; diff --git a/client/src/entities/known-absence.jsx b/client/src/entities/known-absence.jsx index 04ee2252..3b5c45bb 100644 --- a/client/src/entities/known-absence.jsx +++ b/client/src/entities/known-absence.jsx @@ -18,7 +18,6 @@ import { MultiReferenceField } from '@shared/components/fields/CommonReferenceFi import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; import { CommonReferenceInputFilter, - filterByUserId, filterByUserIdAndYear, } from '@shared/components/fields/CommonReferenceInputFilter'; import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput'; diff --git a/client/src/entities/lesson.jsx b/client/src/entities/lesson.jsx index 8cf8d9b5..0b7e964b 100644 --- a/client/src/entities/lesson.jsx +++ b/client/src/entities/lesson.jsx @@ -4,8 +4,6 @@ import { DateTimeInput, maxLength, NumberInput, - ReferenceArrayField, - ReferenceArrayInput, ReferenceField, required, TextField, diff --git a/client/src/entities/report-month.jsx b/client/src/entities/report-month.jsx index 369f640b..931bebc2 100644 --- a/client/src/entities/report-month.jsx +++ b/client/src/entities/report-month.jsx @@ -3,7 +3,6 @@ import { DateInput, DateTimeInput, maxLength, - NumberInput, ReferenceField, required, TextField, diff --git a/client/src/entities/student-klass.jsx b/client/src/entities/student-klass.jsx index 69603171..ede8854b 100644 --- a/client/src/entities/student-klass.jsx +++ b/client/src/entities/student-klass.jsx @@ -1,6 +1,5 @@ import { DateField, - DateInput, DateTimeInput, NullableBooleanInput, ReferenceField, diff --git a/client/src/entities/student-klasses-report.jsx b/client/src/entities/student-klasses-report.jsx index 5ca62a50..0ce42cfc 100644 --- a/client/src/entities/student-klasses-report.jsx +++ b/client/src/entities/student-klasses-report.jsx @@ -1,4 +1,4 @@ -import { ReferenceField, TextField, SelectField } from 'react-admin'; +import { ReferenceField, TextField } from 'react-admin'; import { CommonDatagrid } from '@shared/components/crudContainers/CommonList'; import { MultiReferenceArrayField, MultiReferenceField } from '@shared/components/fields/CommonReferenceField'; import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; diff --git a/client/src/entities/student.jsx b/client/src/entities/student.jsx index f5da89c1..9a3336cb 100644 --- a/client/src/entities/student.jsx +++ b/client/src/entities/student.jsx @@ -2,7 +2,6 @@ import { BooleanField, BooleanInput, DateField, - DateInput, DateTimeInput, Labeled, maxLength, @@ -10,7 +9,6 @@ import { ReferenceField, ReferenceManyField, required, - SelectInput, TextField, TextInput, } from 'react-admin'; @@ -21,7 +19,6 @@ import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput import { defaultYearFilter } from '@shared/utils/yearFilter'; import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField'; import { useUnique } from '@shared/utils/useUnique'; -import { CommonReferenceInputFilter } from '@shared/components/fields/CommonReferenceInputFilter'; import StudentReportCardReactButton from 'src/reports/studentReportCardReactButton'; import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton'; import CheckCircleIcon from '@mui/icons-material/CheckCircle'; diff --git a/client/src/entities/teacher-salary-report.jsx b/client/src/entities/teacher-salary-report.jsx index a51169dd..9eb90629 100644 --- a/client/src/entities/teacher-salary-report.jsx +++ b/client/src/entities/teacher-salary-report.jsx @@ -1,4 +1,4 @@ -import { ReferenceField, TextField, SelectField, NumberField } from 'react-admin'; +import { ReferenceField, TextField, NumberField } from 'react-admin'; import { CommonDatagrid } from '@shared/components/crudContainers/CommonList'; import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; import { CommonReferenceInputFilter, filterByUserId } from '@shared/components/fields/CommonReferenceInputFilter'; diff --git a/client/src/entities/teacher.jsx b/client/src/entities/teacher.jsx index 9c13f4de..32837057 100644 --- a/client/src/entities/teacher.jsx +++ b/client/src/entities/teacher.jsx @@ -1,6 +1,5 @@ import { DateField, - DateInput, DateTimeInput, EmailField, maxLength, diff --git a/client/src/pivots/PercentReportWithDatesList.jsx b/client/src/pivots/PercentReportWithDatesList.jsx index 22eface5..9ae81595 100644 --- a/client/src/pivots/PercentReportWithDatesList.jsx +++ b/client/src/pivots/PercentReportWithDatesList.jsx @@ -6,8 +6,6 @@ import { useRecordContext, useListFilterContext, TextInput, - useAuthState, - usePermissions, BooleanInput, NullableBooleanInput, } from 'react-admin'; diff --git a/client/src/pivots/StudentAttendanceList.jsx b/client/src/pivots/StudentAttendanceList.jsx index 46d1b6db..100395ea 100644 --- a/client/src/pivots/StudentAttendanceList.jsx +++ b/client/src/pivots/StudentAttendanceList.jsx @@ -12,13 +12,11 @@ import { useListContext, TextInput, DateInput, - BooleanInput, NullableBooleanInput, } from 'react-admin'; import { defaultYearFilter } from '@shared/utils/yearFilter'; import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput'; import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear'; -import { CommonSelectArrayField } from '@shared/components/fields/CommonSelectArrayField'; import { semesterChoices } from 'src/entities/report-month'; import CommonReferenceArrayInput from '@shared/components/fields/CommonReferenceArrayInput'; import { adminUserFilter } from '@shared/components/fields/PermissionFilter'; diff --git a/client/src/reports/InLessonReport.jsx b/client/src/reports/InLessonReport.jsx index 30c43591..1634183e 100644 --- a/client/src/reports/InLessonReport.jsx +++ b/client/src/reports/InLessonReport.jsx @@ -1,4 +1,4 @@ -import React, { useCallback, useMemo, useState } from 'react'; +import { useCallback, useMemo, useState } from 'react'; import { useRedirect, useDataProvider, useNotify } from 'react-admin'; import { useSavableData } from '../../shared/components/import/util'; import { Datagrid as AttDatagrid } from 'src/entities/att-report'; diff --git a/client/src/reports/in-lesson-report/FormActions.jsx b/client/src/reports/in-lesson-report/FormActions.jsx index a1a5588e..4db153f8 100644 --- a/client/src/reports/in-lesson-report/FormActions.jsx +++ b/client/src/reports/in-lesson-report/FormActions.jsx @@ -1,4 +1,4 @@ -import React, { useContext } from 'react'; +import { useContext } from 'react'; import { Box, Divider } from '@mui/material'; import { Button, SaveButton } from 'react-admin'; import { PreviewListWithSavingDialog } from '../../../shared/components/import/PreviewListWithSavingDialog'; diff --git a/client/src/reports/in-lesson-report/LessonSelector.jsx b/client/src/reports/in-lesson-report/LessonSelector.jsx index 984d7259..67617b65 100644 --- a/client/src/reports/in-lesson-report/LessonSelector.jsx +++ b/client/src/reports/in-lesson-report/LessonSelector.jsx @@ -1,4 +1,4 @@ -import React, { useCallback, useState, useMemo } from 'react'; +import { useCallback, useState, useMemo } from 'react'; import { Box, Typography, Divider } from '@mui/material'; import { TabbedForm, Toolbar, SaveButton, TextInput, useDataProvider, useNotify } from 'react-admin'; import PlayArrowIcon from '@mui/icons-material/PlayArrow'; diff --git a/client/src/reports/in-lesson-report/MainReport.jsx b/client/src/reports/in-lesson-report/MainReport.jsx index 8416d0ce..f58eea53 100644 --- a/client/src/reports/in-lesson-report/MainReport.jsx +++ b/client/src/reports/in-lesson-report/MainReport.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { FormDataConsumer, SimpleForm, NumberInput, RecordContextProvider, useStore } from 'react-admin'; import Divider from '@mui/material/Divider'; import { ReportHeader } from './ReportHeader'; diff --git a/client/src/reports/in-lesson-report/ReportHeader.jsx b/client/src/reports/in-lesson-report/ReportHeader.jsx index c0394416..d2b4bcd3 100644 --- a/client/src/reports/in-lesson-report/ReportHeader.jsx +++ b/client/src/reports/in-lesson-report/ReportHeader.jsx @@ -1,4 +1,4 @@ -import React, { useContext } from 'react'; +import { useContext } from 'react'; import { Box, Typography } from '@mui/material'; import { ReportContext } from './context'; diff --git a/client/src/reports/in-lesson-report/StudentList.jsx b/client/src/reports/in-lesson-report/StudentList.jsx index 693d65af..f9b7c26c 100644 --- a/client/src/reports/in-lesson-report/StudentList.jsx +++ b/client/src/reports/in-lesson-report/StudentList.jsx @@ -1,4 +1,4 @@ -import React, { useCallback, useContext, useMemo, useRef, useState, useLayoutEffect } from 'react'; +import { useCallback, useContext, useMemo, useRef, useState, useLayoutEffect } from 'react'; import { NumberInput, DateInput, diff --git a/client/src/reports/in-lesson-report/TeacherSelector.jsx b/client/src/reports/in-lesson-report/TeacherSelector.jsx index 7bb13686..0bd27981 100644 --- a/client/src/reports/in-lesson-report/TeacherSelector.jsx +++ b/client/src/reports/in-lesson-report/TeacherSelector.jsx @@ -1,4 +1,4 @@ -import React, { useCallback, useState } from 'react'; +import { useCallback, useState } from 'react'; import { Box, Typography, Divider } from '@mui/material'; import { TabbedForm, Toolbar, SaveButton, TextInput, useDataProvider, useNotify } from 'react-admin'; import PlayArrowIcon from '@mui/icons-material/PlayArrow'; diff --git a/client/src/reports/in-lesson-report/index.jsx b/client/src/reports/in-lesson-report/index.jsx index bd741506..c52b8348 100644 --- a/client/src/reports/in-lesson-report/index.jsx +++ b/client/src/reports/in-lesson-report/index.jsx @@ -1,4 +1,4 @@ -import React, { useCallback, useState, useEffect } from 'react'; +import { useCallback, useEffect } from 'react'; import { Container, Paper, Stack } from '@mui/material'; import { useNotify, useStore } from 'react-admin'; import { ReportContext, defaultContextValue } from './context'; diff --git a/client/src/settings/GeneralSettingsInput.jsx b/client/src/settings/GeneralSettingsInput.jsx index 45861568..837f2f10 100644 --- a/client/src/settings/GeneralSettingsInput.jsx +++ b/client/src/settings/GeneralSettingsInput.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { NumberInput, required } from 'react-admin'; import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion'; import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput'; diff --git a/client/src/settings/ReportCardSettingsInput.jsx b/client/src/settings/ReportCardSettingsInput.jsx index 31c07a2f..f95e2e74 100644 --- a/client/src/settings/ReportCardSettingsInput.jsx +++ b/client/src/settings/ReportCardSettingsInput.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Box } from '@mui/material'; import { BooleanInput, Link } from 'react-admin'; import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion'; diff --git a/client/src/settings/ReportStylesInput.jsx b/client/src/settings/ReportStylesInput.jsx index 37fe435c..1c7777c5 100644 --- a/client/src/settings/ReportStylesInput.jsx +++ b/client/src/settings/ReportStylesInput.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Box, Button, Table, TableBody, TableCell, TableHead, TableRow, Typography } from '@mui/material'; import RestartAltIcon from '@mui/icons-material/RestartAltOutlined'; import { useFormContext } from 'react-hook-form'; diff --git a/client/src/settings/Settings.jsx b/client/src/settings/Settings.jsx index ea7e1abb..9752ba61 100644 --- a/client/src/settings/Settings.jsx +++ b/client/src/settings/Settings.jsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Card, CardContent } from '@mui/material'; import { SimpleForm,