diff --git a/src/routes/private/real-boxes-create/DashboardCreateRealBox.tsx b/src/routes/private/real-boxes-create/DashboardCreateRealBox.tsx index f52b985..16afe22 100644 --- a/src/routes/private/real-boxes-create/DashboardCreateRealBox.tsx +++ b/src/routes/private/real-boxes-create/DashboardCreateRealBox.tsx @@ -20,6 +20,7 @@ import { useMyTranslation } from '@/hooks/useMyTranslation'; import { FormValues, RealCreateBoxBodyType, UpdateRealBoxBodyType } from '@/data/real-box/real-box.model'; import get from 'lodash.get'; import useRequest from '@/hooks/useRequest'; +import useInput from '@/hooks/useInput'; const StyledCreateBox = styled(Box)` .item-row { @@ -48,6 +49,7 @@ interface Props { const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => { const { user, isAdmin: isAdminUser } = useAuthContext(); const editMode = !!initialValues?.id; + const [keyword, handleKeyword] = useState(''); const t = useMyTranslation(); const params = useSearchParams(); const { push } = useMyNavigation(); @@ -65,6 +67,8 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => { finished: false, }); + console.log(keyword, "keyword"); + const { register, control, @@ -116,6 +120,7 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => { () => box_requests.getAll({ partyId: partyId, + cargoId: keyword }), { selectData: (data) => data?.data?.data ?? [], @@ -287,6 +292,7 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => { { paketField.onChange(newValue?.value ?? ''); + handleKeyword(newValue?.label ?? ''); }} defaultValue={ editMode && initialValues?.paketIds?.[index] @@ -312,6 +318,7 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => { try { const res = await box_requests.getAll({ partyId, + cargoId: inputValue, }); return res.data.data.data.map((box: any) => ({ label: box.box_name || box.name || `Box ${box.id}`, @@ -330,35 +337,34 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => { {requiredText} )} - {fields.length > 1 && ( - - removePaket(index)} - > - - - - )} + removePaket(index)} + > + + ))} - - } - onClick={appendPaket} - > - {t('add_more')} - - + } + > + {t('add_packet')} + - - {editMode ? t('update') : t('create')} + + {editMode ? t('update_box') : t('create_box')} diff --git a/src/routes/private/real-boxes/DashboardRealBoxesPage.tsx b/src/routes/private/real-boxes/DashboardRealBoxesPage.tsx index cb31550..8f4a660 100644 --- a/src/routes/private/real-boxes/DashboardRealBoxesPage.tsx +++ b/src/routes/private/real-boxes/DashboardRealBoxesPage.tsx @@ -54,7 +54,7 @@ const DashboardRealBoxesPage = (props: Props) => { () => real_box_requests.getAll({ page: page, - cargoId: keyword, + boxName: keyword, status: boxStatusFilter, direction: 'desc', sort: 'id',