From 1934db0b4e541d31c36cb07613c81e0238e016e3 Mon Sep 17 00:00:00 2001 From: hamid zarghami Date: Sun, 18 May 2025 14:32:49 +0330 Subject: [PATCH] announcement --- src/pages/annoncement/Create.tsx | 51 ++----------------- src/pages/annoncement/Update.tsx | 51 ++----------------- .../annoncement/types/AnnoncementTypes.ts | 3 -- src/pages/types/AnnouncementTypes.ts | 2 - 4 files changed, 7 insertions(+), 100 deletions(-) diff --git a/src/pages/annoncement/Create.tsx b/src/pages/annoncement/Create.tsx index d591523..c3187ff 100644 --- a/src/pages/annoncement/Create.tsx +++ b/src/pages/annoncement/Create.tsx @@ -1,4 +1,4 @@ -import { FC, useEffect, useRef, useState } from 'react' +import { FC, useEffect, useRef } from 'react' import { useTranslation } from 'react-i18next' import Button from '../../components/Button' import { InfoCircle, TickCircle } from 'iconsax-react' @@ -6,29 +6,22 @@ import Input from '../../components/Input' import Quill from 'quill' import DatePickerComponent from '../../components/DatePicker' import CheckBoxComponent from '../../components/CheckBoxComponent' -import Select from '../../components/Select' -import { useGetAllServices } from '../service/hooks/useServiceData' import { useFormik } from 'formik' -import { AnnoncementCreateType, UserServiceItemType } from './types/AnnoncementTypes' +import { AnnoncementCreateType } from './types/AnnoncementTypes' import * as Yup from 'yup' -import { ServiceItemType } from '../service/types/ServiceTypes' -import { useCreateAnnoncement, useGetCustomersService } from './hooks/useAnnoncementData' import { ErrorType } from '../../helpers/types' import { toast } from 'react-toastify' import moment from 'moment-jalaali' import { useNavigate } from 'react-router-dom' import { Pages } from '../../config/Pages' +import { useCreateAnnoncement } from './hooks/useAnnoncementData' const Create: FC = () => { const { t } = useTranslation('global') const navigate = useNavigate() const editorRef = useRef(null); - const [serviceId, setServiceId] = useState('') - const [customerId, setCustomerId] = useState('') - const getServices = useGetAllServices('', 1, '', '', false) - const createAnnoncement = useCreateAnnoncement() - const getCustomer = useGetCustomersService(serviceId) + const createAnnoncement = useCreateAnnoncement(); const formik = useFormik({ initialValues: { @@ -37,9 +30,6 @@ const Create: FC = () => { publishAt: '', isPublic: false, isImportant: false, - serviceId: '', - groupIds: [], - userIds: undefined }, validationSchema: Yup.object({ title: Yup.string().required(t('errors.required')), @@ -47,13 +37,6 @@ const Create: FC = () => { publishAt: Yup.string().required(t('errors.required')), }), onSubmit: (values) => { - if (!values.serviceId) { - values.serviceId = undefined - } - if (customerId) { - values.serviceId = undefined - values.userIds = [customerId] - } createAnnoncement.mutate(values, { onSuccess: () => { formik.resetForm() @@ -157,32 +140,6 @@ const Create: FC = () => { -
- ({ - label: item.firstname + ' ' + item.lastname, - value: item.id - })) || []} - onChange={(e) => setCustomerId(e.target.value)} - /> -
diff --git a/src/pages/annoncement/Update.tsx b/src/pages/annoncement/Update.tsx index 55326a8..0d36bf9 100644 --- a/src/pages/annoncement/Update.tsx +++ b/src/pages/annoncement/Update.tsx @@ -1,4 +1,4 @@ -import { FC, useEffect, useRef, useState } from 'react' +import { FC, useEffect, useRef } from 'react' import { useTranslation } from 'react-i18next' import Button from '../../components/Button' import { InfoCircle, TickCircle } from 'iconsax-react' @@ -6,13 +6,10 @@ import Input from '../../components/Input' import Quill from 'quill' import DatePickerComponent from '../../components/DatePicker' import CheckBoxComponent from '../../components/CheckBoxComponent' -import Select from '../../components/Select' -import { useGetAllServices } from '../service/hooks/useServiceData' import { useFormik } from 'formik' -import { AnnoncementCreateType, UserServiceItemType } from './types/AnnoncementTypes' +import { AnnoncementCreateType } from './types/AnnoncementTypes' import * as Yup from 'yup' -import { ServiceItemType } from '../service/types/ServiceTypes' -import { useGetAnnoncementDetail, useGetCustomersService, useUpdateAnnoncement } from './hooks/useAnnoncementData' +import { useGetAnnoncementDetail, useUpdateAnnoncement } from './hooks/useAnnoncementData' import { ErrorType } from '../../helpers/types' import { toast } from 'react-toastify' import moment from 'moment-jalaali' @@ -25,10 +22,6 @@ const Update: FC = () => { const navigate = useNavigate() const { id } = useParams() const editorRef = useRef(null); - const [serviceId, setServiceId] = useState('') - const [customerId, setCustomerId] = useState('') - const getServices = useGetAllServices('', 1, '', '', false) - const getCustomer = useGetCustomersService(serviceId) const getAnnoncement = useGetAnnoncementDetail(id || '') const updateAnnoncement = useUpdateAnnoncement(id || '') @@ -39,9 +32,6 @@ const Update: FC = () => { publishAt: '', isPublic: false, isImportant: false, - serviceId: '', - groupIds: [], - userIds: undefined }, validationSchema: Yup.object({ title: Yup.string().required(t('errors.required')), @@ -49,13 +39,6 @@ const Update: FC = () => { publishAt: Yup.string().required(t('errors.required')), }), onSubmit: (values) => { - if (!values.serviceId) { - values.serviceId = undefined - } - if (customerId) { - values.serviceId = undefined - values.userIds = [customerId] - } updateAnnoncement.mutate(values, { onSuccess: () => { formik.resetForm() @@ -95,8 +78,6 @@ const Update: FC = () => { useEffect(() => { if (getAnnoncement.data) { formik.setValues(getAnnoncement.data?.data?.announcement) - setServiceId(getAnnoncement.data?.data?.announcement?.targetService?.id) - setCustomerId(getAnnoncement.data?.data?.announcement?.userIds?.[0]) const editorElement = editorRef.current?.querySelector('.ql-editor'); if (editorElement) { @@ -177,32 +158,6 @@ const Update: FC = () => { -
- ({ - label: item.firstname + ' ' + item.lastname, - value: item.id - })) || []} - onChange={(e) => setCustomerId(e.target.value)} - /> -
diff --git a/src/pages/annoncement/types/AnnoncementTypes.ts b/src/pages/annoncement/types/AnnoncementTypes.ts index 4cae896..98e50ce 100644 --- a/src/pages/annoncement/types/AnnoncementTypes.ts +++ b/src/pages/annoncement/types/AnnoncementTypes.ts @@ -4,9 +4,6 @@ export type AnnoncementCreateType = { publishAt: string; isPublic: boolean; isImportant: boolean; - serviceId?: string; - groupIds: string[]; - userIds?: string[]; }; export type AnnoncementItemType = { diff --git a/src/pages/types/AnnouncementTypes.ts b/src/pages/types/AnnouncementTypes.ts index 68320ee..540a0cc 100644 --- a/src/pages/types/AnnouncementTypes.ts +++ b/src/pages/types/AnnouncementTypes.ts @@ -4,6 +4,4 @@ export type CreateAnnouncementType = { publishAt: string; isPublic: boolean; isImportant: boolean; - serviceId?: string; - groupIds: string[]; };