dry_wash_inc/dry-wash-pl
dry_wash_inc/dry-wash-pl
3
1
Fork 0
Code Issues 17 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl

Browse Source
This commit is contained in:
RustamRu 2025-03-20 11:54:32 +03:00
commit eb91c89cd9
13 changed files with 140 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/__data__/service/api.ts
View File

@ -21,8 +21,16 @@ export const api = createApi({
}),
tagTypes: ['Masters', 'Orders'],
endpoints: (builder) => ({
getMasters: builder.query<Master[], void>({
query: () => ({ url: '/arm/masters' }),
getMasters: builder.query<Master[], { date: Date }>({
query: ({ date }) => {
const startDate = dayjs(date).startOf('day').toISOString();
const endDate = dayjs(date).endOf('day').toISOString();
return {
url: '/arm/masters/list',
method: 'POST',
body: { startDate, endDate },
};
},
transformResponse: extractBodyFromResponse<Master[]>,
providesTags: ['Masters'],
}),
@ -32,7 +40,7 @@ export const api = createApi({
method: 'PATCH',
body: { status, notes, master },
}),
invalidatesTags: ['Orders'],
invalidatesTags: ['Orders', 'Masters'],
}),
getOrders: builder.query<OrderArm[], { date: Date }>({
query: ({ date }) => {
@ -54,14 +62,14 @@ export const api = createApi({
method: 'POST',
body: master,
}),
invalidatesTags: ['Masters'],
invalidatesTags: ['Masters', 'Orders'],
}),
deleteMaster: builder.mutation<void, { id: string }>({
query: ({ id }) => ({
url: `/arm/masters/${id}`,
method: 'DELETE',
}),
invalidatesTags: ['Masters'],
invalidatesTags: ['Masters', 'Orders'],
}),
updateMaster: builder.mutation<void, UpdateMasterPayload>({
query: ({ id, name, phone }) => ({
@ -69,7 +77,7 @@ export const api = createApi({
method: 'PATCH',
body: { name, phone },
}),
invalidatesTags: ['Masters'],
invalidatesTags: ['Masters', 'Orders'],
}),
}),
});

1
src/__data__/service/utils.ts
View File

@ -3,7 +3,6 @@ import { FetchBaseQueryError } from '@reduxjs/toolkit/query';
import { BaseResponse } from '../../models/api';
export const extractBodyFromResponse = <Body>(response: BaseResponse<Body>) => {
console.log('response', response);
if (response.success) {
return response.body;
}

3
src/components/Header/Header.tsx
View File

@ -1,4 +1,4 @@
import { Box, Button, Heading, HStack, Divider, Flex } from '@chakra-ui/react';
import { Box, Button, Heading, HStack, Flex } from '@chakra-ui/react';
import React from 'react';
import { useLocation, Link } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
@ -30,7 +30,6 @@ const Header = () => {
{t('orders')}
</Button>
)}
<Divider orientation='vertical' height='30px' />
{URLs.armMaster.isOn && (
<Button
as={Link}

31
src/components/Map/Map.tsx
View File

@ -1,11 +1,13 @@
import React, { useMemo } from 'react';
import React, { useState } from 'react';
import { Box, Flex, Heading, Spinner } from '@chakra-ui/react';
import { useTranslation } from 'react-i18next';
import { YMaps, Map, Placemark } from '@pbe/react-yandex-maps';
import { useLocation } from 'react-router-dom';
import dayjs from 'dayjs';
import { useGetOrdersQuery } from '../../__data__/service/api';
import getCoordinates from '../../utils/getCoordinates';
import DateNavigator from '../DateNavigator';
const OrdersMap = () => {
const { t } = useTranslation('~', {
@ -14,14 +16,13 @@ const OrdersMap = () => {
const location = useLocation();
const params = new URLSearchParams(location.search);
const latFromUrl = parseFloat(params.get('lat') || 55.78);
const lonFromUrl = parseFloat(params.get('lon') || 49.12);
const currentDate = useMemo(
() =>
params.get('currentDate')
? new Date(params.get('currentDate'))
: new Date(),
[],
const latFromUrl = parseFloat(params.get('lat') || '55.78');
const lonFromUrl = parseFloat(params.get('lon') || '49.12');
const [currentDate, setCurrentDate] = useState(
params.get('currentDate')
? new Date(params.get('currentDate'))
: new Date(),
);
const {
@ -44,6 +45,18 @@ const OrdersMap = () => {
{t('title')}
</Heading>
<DateNavigator
currentDate={currentDate}
onPreviousDate={() =>
setCurrentDate((prevDate) =>
dayjs(prevDate).subtract(1, 'day').toDate(),
)
}
onNextDate={() =>
setCurrentDate((prevDate) => dayjs(prevDate).add(1, 'day').toDate())
}
/>
{isLoading && (
<Flex justifyContent='center' alignItems='center'>
<Spinner size='lg' />

26
src/components/Masters/Masters.tsx
View File

@ -1,4 +1,4 @@
import React, { useEffect } from 'react';
import React, { useEffect, useState } from 'react';
import {
Box,
Heading,
@ -15,11 +15,13 @@ import {
Spinner,
} from '@chakra-ui/react';
import { useTranslation } from 'react-i18next';
import dayjs from 'dayjs';
import MasterItem from '../MasterItem';
import MasterDrawer from '../MasterDrawer';
import { useGetMastersQuery } from '../../__data__/service/api';
import useShowToast from '../../hooks/useShowToast';
import DateNavigator from '../DateNavigator';
const TABLE_HEADERS = [
'name' as const,
@ -31,12 +33,18 @@ const TABLE_HEADERS = [
const Masters = () => {
const { isOpen, onOpen, onClose } = useDisclosure();
const showToast = useShowToast();
const [currentDate, setCurrentDate] = useState(new Date());
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.arm.master',
});
const { data: masters, error, isLoading, isSuccess } = useGetMastersQuery();
const {
data: masters,
error,
isLoading,
isSuccess,
} = useGetMastersQuery({ date: currentDate });
useEffect(() => {
if (error) {
@ -46,12 +54,24 @@ const Masters = () => {
return (
<Box p='8'>
<Flex justifyContent='space-between' alignItems='center' mb='5'>
<Flex justifyContent='space-between' alignItems='baseline' mb='5'>
<Heading size='lg'> {t('title')}</Heading>
<Button colorScheme='green' onClick={onOpen}>
+ {t('add')}
</Button>
</Flex>
<DateNavigator
currentDate={currentDate}
onPreviousDate={() =>
setCurrentDate((prevDate) =>
dayjs(prevDate).subtract(1, 'day').toDate(),
)
}
onNextDate={() =>
setCurrentDate((prevDate) => dayjs(prevDate).add(1, 'day').toDate())
}
/>
<Table variant='simple' colorScheme='blackAlpha'>
<Thead>
<Tr>

2
src/components/Orders/Orders.tsx
View File

@ -53,7 +53,7 @@ const Orders = () => {
isSuccess: isMastersSuccess,
isError: isMastersError,
error: mastersError,
} = useGetMastersQuery();
} = useGetMastersQuery({ date: currentDate });
const isLoading = isOrdersLoading || isMastersLoading;
const isSuccess = isOrdersSuccess && isMastersSuccess;

75
src/pages/__tests__/__snapshots__/masters.test.tsx.snap
View File

@ -25,10 +25,6 @@ exports[`Master Page should display master list and show details when master but
>
Заказы
</a>
<hr
aria-orientation="vertical"
class="chakra-divider css-zw0v9u"
/>
<a
class="chakra-button css-g11sl9"
data-testid="master-button"
@ -36,6 +32,12 @@ exports[`Master Page should display master list and show details when master but
>
Мастера
</a>
<a
class="chakra-button css-19byqlw"
href="/map"
>
Карта заказов
</a>
</div>
</div>
</header>
@ -46,7 +48,7 @@ exports[`Master Page should display master list and show details when master but
class="css-1glkkdp"
>
<div
class="css-sd3fvu"
class="css-1dvg3xs"
>
<h2
class="chakra-heading css-1jb3vzl"
@ -62,6 +64,45 @@ exports[`Master Page should display master list and show details when master but
Добавить
</button>
</div>
<div
class="css-1u3smh"
>
<button
class="chakra-button css-ez23ye"
type="button"
>
<svg
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"
fill="currentColor"
/>
</svg>
</button>
<p
class="chakra-text css-52ukzg"
>
17.03.2025
</p>
<button
class="chakra-button css-ez23ye"
type="button"
>
<svg
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z"
fill="currentColor"
/>
</svg>
</button>
</div>
<table
class="chakra-table css-5605sr"
>
@ -216,11 +257,11 @@ exports[`Master Page should display master list and show details when master but
class="css-zgoslk"
>
<button
aria-controls="menu-list-:r2:"
aria-controls="menu-list-:r3:"
aria-expanded="false"
aria-haspopup="menu"
class="chakra-button chakra-menu__menu-button css-13sr8jm"
id="menu-button-:r2:"
id="menu-button-:r3:"
type="button"
>
<svg
@ -251,7 +292,7 @@ exports[`Master Page should display master list and show details when master but
<div
aria-orientation="vertical"
class="chakra-menu__menu-list css-s5t7bz"
id="menu-list-:r2:"
id="menu-list-:r3:"
role="menu"
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.8) translateZ(0);"
tabindex="-1"
@ -260,7 +301,7 @@ exports[`Master Page should display master list and show details when master but
aria-disabled="false"
class="chakra-menu__menuitem css-y7jzs3"
data-index="0"
id="menu-list-:r2:-menuitem-:r3:"
id="menu-list-:r3:-menuitem-:r4:"
role="menuitem"
tabindex="-1"
type="button"
@ -391,11 +432,11 @@ exports[`Master Page should display master list and show details when master but
class="css-zgoslk"
>
<button
aria-controls="menu-list-:r5:"
aria-controls="menu-list-:r6:"
aria-expanded="false"
aria-haspopup="menu"
class="chakra-button chakra-menu__menu-button css-13sr8jm"
id="menu-button-:r5:"
id="menu-button-:r6:"
type="button"
>
<svg
@ -426,7 +467,7 @@ exports[`Master Page should display master list and show details when master but
<div
aria-orientation="vertical"
class="chakra-menu__menu-list css-s5t7bz"
id="menu-list-:r5:"
id="menu-list-:r6:"
role="menu"
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.8) translateZ(0);"
tabindex="-1"
@ -435,7 +476,7 @@ exports[`Master Page should display master list and show details when master but
aria-disabled="false"
class="chakra-menu__menuitem css-y7jzs3"
data-index="0"
id="menu-list-:r5:-menuitem-:r6:"
id="menu-list-:r6:-menuitem-:r7:"
role="menuitem"
tabindex="-1"
type="button"
@ -571,11 +612,11 @@ exports[`Master Page should display master list and show details when master but
class="css-zgoslk"
>
<button
aria-controls="menu-list-:r8:"
aria-controls="menu-list-:r9:"
aria-expanded="false"
aria-haspopup="menu"
class="chakra-button chakra-menu__menu-button css-13sr8jm"
id="menu-button-:r8:"
id="menu-button-:r9:"
type="button"
>
<svg
@ -606,7 +647,7 @@ exports[`Master Page should display master list and show details when master but
<div
aria-orientation="vertical"
class="chakra-menu__menu-list css-s5t7bz"
id="menu-list-:r8:"
id="menu-list-:r9:"
role="menu"
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.8) translateZ(0);"
tabindex="-1"
@ -615,7 +656,7 @@ exports[`Master Page should display master list and show details when master but
aria-disabled="false"
class="chakra-menu__menuitem css-y7jzs3"
data-index="0"
id="menu-list-:r8:-menuitem-:r9:"
id="menu-list-:r9:-menuitem-:ra:"
role="menuitem"
tabindex="-1"
type="button"

126
src/pages/__tests__/__snapshots__/ordersList.test.tsx.snap
View File

@ -25,10 +25,6 @@ exports[`Страница заказов должна корректно ото
>
Заказы
</a>
<hr
aria-orientation="vertical"
class="chakra-divider css-zw0v9u"
/>
<a
class="chakra-button css-g11sl9"
data-testid="master-button"
@ -36,6 +32,12 @@ exports[`Страница заказов должна корректно ото
>
Мастера
</a>
<a
class="chakra-button css-g11sl9"
href="/auth/login"
>
Карта заказов
</a>
</div>
</div>
</header>
@ -71,7 +73,7 @@ exports[`Страница заказов должна корректно ото
<p
class="chakra-text css-52ukzg"
>
12.03.2025
17.03.2025
</p>
<button
class="chakra-button css-ez23ye"
@ -264,13 +266,9 @@ exports[`Страница заказов должна корректно ото
<td
class="css-zgoslk"
>
<button
aria-controls="popover-content-:r1:"
aria-expanded="false"
aria-haspopup="dialog"
<a
class="chakra-button css-ez23ye"
id="popover-trigger-:r1:"
type="button"
href="/auth/login/arm//auth/login?lat=55.78&lon=49.12&currentDate=Mon Mar 17 2025 20:55:45 GMT+0300 (Moscow Standard Time)"
>
<svg
class="chakra-icon css-onkibi"
@ -290,54 +288,7 @@ exports[`Страница заказов должна корректно ото
/>
</g>
</svg>
</button>
<div
class="chakra-popover__popper css-iy22zq"
style="visibility: hidden; position: absolute; min-width: max-content; inset: 0 auto auto 0;"
>
<section
aria-describedby="popover-body-:r1:"
class="chakra-popover__content css-sjj62m"
id="popover-content-:r1:"
role="dialog"
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.95) translateZ(0);"
tabindex="-1"
>
<div
class="chakra-popover__arrow-positioner css-0"
data-popper-arrow=""
style="position: absolute;"
>
<div
class="chakra-popover__arrow css-0"
data-popper-arrow-inner=""
/>
</div>
<button
aria-label="Close"
class="chakra-popover__close-btn css-1o8qips"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M.439,21.44a1.5,1.5,0,0,0,2.122,2.121L11.823,14.3a.25.25,0,0,1,.354,0l9.262,9.263a1.5,1.5,0,1,0,2.122-2.121L14.3,12.177a.25.25,0,0,1,0-.354l9.263-9.262A1.5,1.5,0,0,0,21.439.44L12.177,9.7a.25.25,0,0,1-.354,0L2.561.44A1.5,1.5,0,0,0,.439,2.561L9.7,11.823a.25.25,0,0,1,0,.354Z"
fill="currentColor"
/>
</svg>
</button>
<div
class="chakra-popover__body css-45vz3u"
id="popover-body-:r1:"
>
Казань, ул. Баумана, 1
</div>
</section>
</div>
</a>
</td>
</tr>
<tr
@ -471,13 +422,9 @@ exports[`Страница заказов должна корректно ото
<td
class="css-zgoslk"
>
<button
aria-controls="popover-content-:r3:"
aria-expanded="false"
aria-haspopup="dialog"
<a
class="chakra-button css-ez23ye"
id="popover-trigger-:r3:"
type="button"
href="/auth/login/arm//auth/login?lat=55.78&lon=49.12&currentDate=Mon Mar 17 2025 20:55:45 GMT+0300 (Moscow Standard Time)"
>
<svg
class="chakra-icon css-onkibi"
@ -497,54 +444,7 @@ exports[`Страница заказов должна корректно ото
/>
</g>
</svg>
</button>
<div
class="chakra-popover__popper css-iy22zq"
style="visibility: hidden; position: absolute; min-width: max-content; inset: 0 auto auto 0;"
>
<section
aria-describedby="popover-body-:r3:"
class="chakra-popover__content css-sjj62m"
id="popover-content-:r3:"
role="dialog"
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.95) translateZ(0);"
tabindex="-1"
>
<div
class="chakra-popover__arrow-positioner css-0"
data-popper-arrow=""
style="position: absolute;"
>
<div
class="chakra-popover__arrow css-0"
data-popper-arrow-inner=""
/>
</div>
<button
aria-label="Close"
class="chakra-popover__close-btn css-1o8qips"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M.439,21.44a1.5,1.5,0,0,0,2.122,2.121L11.823,14.3a.25.25,0,0,1,.354,0l9.262,9.263a1.5,1.5,0,1,0,2.122-2.121L14.3,12.177a.25.25,0,0,1,0-.354l9.263-9.262A1.5,1.5,0,0,0,21.439.44L12.177,9.7a.25.25,0,0,1-.354,0L2.561.44A1.5,1.5,0,0,0,.439,2.561L9.7,11.823a.25.25,0,0,1,0,.354Z"
fill="currentColor"
/>
</svg>
</button>
<div
class="chakra-popover__body css-45vz3u"
id="popover-body-:r3:"
>
Казань, ул. Баумана, 43
</div>
</section>
</div>
</a>
</td>
</tr>
</tbody>

2
src/pages/__tests__/masters.test.tsx
View File

@ -20,7 +20,7 @@ import { store } from '../../__data__/store';
import Page from '../arm';
const server = setupServer(
http.get('/api/arm/masters', () => {
http.post('/api/arm/masters/list', () => {
return HttpResponse.json({
success: true,
body: [

2
src/pages/__tests__/ordersEmpty.test.tsx
View File

@ -25,7 +25,7 @@ const server = setupServer(
body: [],
});
}),
http.get('/api/arm/masters', () => {
http.post('/api/arm/masters/list', () => {
return HttpResponse.json({
success: true,
body: [],

2
src/pages/__tests__/ordersError.test.tsx
View File

@ -24,7 +24,7 @@ const server = setupServer(
http.post('/api/arm/orders', () => {
return HttpResponse.json({}, { status: 500 });
}),
http.get('/api/arm/masters', () => {
http.post('/api/arm/masters/list', () => {
return HttpResponse.json({
success: true,
body: [

2
src/pages/__tests__/ordersList.test.tsx
View File

@ -55,7 +55,7 @@ const server = setupServer(
],
});
}),
http.get('/api/arm/masters', () => {
http.post('/api/arm/masters/list', () => {
return HttpResponse.json({
success: true,
body: [

10
stubs/api/index.js
View File

@ -8,12 +8,12 @@ const commonError = { success: false, message: 'Что-то пошло не та
const sleep =
(duration = 1000) =>
(req, res, next) =>
setTimeout(next, duration);
(req, res, next) =>
setTimeout(next, duration);
router.use(sleep());
router.get('/arm/masters', (req, res) => {
router.post('/arm/masters/list', (req, res) => {
res
.status(/error/.test(STUBS.masters) ? 500 : 200)
.send(
@ -108,9 +108,7 @@ router.post('/order/:orderId/upload-car-img', (req, res) => {
.send(require(`../json/landing-order-car-image-upload/${stubName}.json`));
} catch (e) {
console.error(e);
res
.status(500)
.send(commonError);
res.status(500).send(commonError);
}
});