Compare commits
19 Commits
fix/arm-or
...
main
Author | SHA1 | Date | |
---|---|---|---|
|
351420bc62 | ||
|
61b042eee6 | ||
|
ac006267a2 | ||
|
63d9d069c0 | ||
c83ebf02bc | |||
|
1968df7bb3 | ||
|
811e0e3f24 | ||
a2ffd6f38f | |||
|
20017cad3c | ||
|
de54ac6669 | ||
|
eda869622e | ||
|
7b3889aa02 | ||
|
cee124fca5 | ||
|
b77eccc8e8 | ||
|
ebfaa7ea8f | ||
|
0027cc09b1 | ||
|
dd612d662c | ||
|
69251745fa | ||
|
253e3b3856 |
5
.vscode/settings.json
vendored
Normal file
5
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"i18n-ally.localesPaths": [
|
||||||
|
"locales"
|
||||||
|
]
|
||||||
|
}
|
32
Jenkinsfile
vendored
32
Jenkinsfile
vendored
@ -1,7 +1,7 @@
|
|||||||
pipeline {
|
pipeline {
|
||||||
agent {
|
agent {
|
||||||
docker {
|
docker {
|
||||||
image 'node:20'
|
image 'node:22'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -30,25 +30,21 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('checks') {
|
stage('eslint') {
|
||||||
parallel {
|
steps {
|
||||||
stage('eslint') {
|
sh 'npm run eslint'
|
||||||
steps {
|
}
|
||||||
sh 'npm run eslint'
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('test') {
|
stage('test') {
|
||||||
steps {
|
steps {
|
||||||
sh 'npm run test'
|
sh 'npm run test'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('build') {
|
stage('build') {
|
||||||
steps {
|
steps {
|
||||||
sh 'npm run build'
|
sh 'npm run build'
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,7 +21,16 @@ module.exports = {
|
|||||||
features: {
|
features: {
|
||||||
'dry-wash': {
|
'dry-wash': {
|
||||||
// add your features here in the format [featureName]: { value: string }
|
// add your features here in the format [featureName]: { value: string }
|
||||||
'order-view-status-polling': { value: '3000' }
|
"order-view-status-polling": {
|
||||||
|
"on": true,
|
||||||
|
"value": "3000",
|
||||||
|
"key": "order-view-status-polling"
|
||||||
|
},
|
||||||
|
"car-img-upload": {
|
||||||
|
"on": true,
|
||||||
|
"value": "true",
|
||||||
|
"key": "car-img-upload"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
config: {
|
config: {
|
||||||
|
@ -50,6 +50,12 @@
|
|||||||
"dry-wash.order-view.details.location": "Where",
|
"dry-wash.order-view.details.location": "Where",
|
||||||
"dry-wash.order-view.details.datetime-range": "When",
|
"dry-wash.order-view.details.datetime-range": "When",
|
||||||
"dry-wash.order-view.details.alert": "The operator will contact you about the payment at the specified phone number",
|
"dry-wash.order-view.details.alert": "The operator will contact you about the payment at the specified phone number",
|
||||||
|
"dry-wash.order-view.upload-car-image.field.label": "Upload a photo of your car, and our service will quickly calculate the pre-order price!",
|
||||||
|
"dry-wash.order-view.upload-car-image.field.help": "Allowed formats: .jpg, .png. Maximum size: 5MB",
|
||||||
|
"dry-wash.order-view.upload-car-image.file-input.placeholder": "Upload a file",
|
||||||
|
"dry-wash.order-view.upload-car-image.file-input.button": "Upload",
|
||||||
|
"dry-wash.order-view.upload-car-image-query.success.title": "The car image is successfully uploaded",
|
||||||
|
"dry-wash.order-view.upload-car-image-query.error.title": "Failed to upload the car image",
|
||||||
"dry-wash.arm.master.add": "Add",
|
"dry-wash.arm.master.add": "Add",
|
||||||
"dry-wash.arm.order.title": "Orders",
|
"dry-wash.arm.order.title": "Orders",
|
||||||
"dry-wash.arm.order.table.empty": "Table empty",
|
"dry-wash.arm.order.table.empty": "Table empty",
|
||||||
|
@ -105,6 +105,12 @@
|
|||||||
"dry-wash.order-view.details.location": "Где",
|
"dry-wash.order-view.details.location": "Где",
|
||||||
"dry-wash.order-view.details.datetime-range": "Когда",
|
"dry-wash.order-view.details.datetime-range": "Когда",
|
||||||
"dry-wash.order-view.details.alert": "С вами свяжется оператор насчет оплаты по указанному номеру телефона",
|
"dry-wash.order-view.details.alert": "С вами свяжется оператор насчет оплаты по указанному номеру телефона",
|
||||||
|
"dry-wash.order-view.upload-car-image.field.label": "Загрузите фото вашего автомобиля, и наш сервис быстро рассчитает предварительную стоимость заказа!",
|
||||||
|
"dry-wash.order-view.upload-car-image.field.help": "Допустимые форматы: .jpg, .png. Максимальный размер: 5МБ",
|
||||||
|
"dry-wash.order-view.upload-car-image.file-input.placeholder": "Загрузите файл",
|
||||||
|
"dry-wash.order-view.upload-car-image.file-input.button": "Загрузить",
|
||||||
|
"dry-wash.order-view.upload-car-image-query.success.title": "Изображение автомобиля успешно загружено",
|
||||||
|
"dry-wash.order-view.upload-car-image-query.error.title": "Не удалось загрузить изображение автомобиля",
|
||||||
"dry-wash.notFound.title": "Страница не найдена",
|
"dry-wash.notFound.title": "Страница не найдена",
|
||||||
"dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
|
"dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
|
||||||
"dry-wash.notFound.button.back": "Вернуться на главную",
|
"dry-wash.notFound.button.back": "Вернуться на главную",
|
||||||
|
4
package-lock.json
generated
4
package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "dry-wash",
|
"name": "dry-wash",
|
||||||
"version": "0.8.0",
|
"version": "0.9.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "dry-wash",
|
"name": "dry-wash",
|
||||||
"version": "0.8.0",
|
"version": "0.9.1",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/core": "^7.26.7",
|
"@babel/core": "^7.26.7",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "dry-wash",
|
"name": "dry-wash",
|
||||||
"version": "0.8.0",
|
"version": "0.9.1",
|
||||||
"description": "<a id=\"readme-top\"></a>",
|
"description": "<a id=\"readme-top\"></a>",
|
||||||
"main": "./src/index.tsx",
|
"main": "./src/index.tsx",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@ -9,8 +9,8 @@
|
|||||||
"build": "npm run clean && brojs build --dev",
|
"build": "npm run clean && brojs build --dev",
|
||||||
"build:prod": "npm run clean && brojs build",
|
"build:prod": "npm run clean && brojs build",
|
||||||
"clean": "rimraf dist",
|
"clean": "rimraf dist",
|
||||||
"eslint": "npx eslint .",
|
"eslint": "npx eslint src",
|
||||||
"eslint:fix": "npx eslint . --fix",
|
"eslint:fix": "npx eslint src --fix",
|
||||||
"preversion": "npm run eslint"
|
"preversion": "npm run eslint"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
|
@ -11,5 +11,8 @@ export const FEATURE = {
|
|||||||
return interval;
|
return interval;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
carImageUpload: {
|
||||||
|
isOn: Boolean(features?.['car-img-upload'])
|
||||||
}
|
}
|
||||||
};
|
};
|
@ -1,4 +1,4 @@
|
|||||||
import { GetOrder, CreateOrder } from "../../models/api";
|
import { GetOrder, CreateOrder, UploadCarImage } from "../../models/api";
|
||||||
|
|
||||||
import { api } from "./api";
|
import { api } from "./api";
|
||||||
import { extractBodyFromResponse, extractErrorMessageFromResponse } from "./utils";
|
import { extractBodyFromResponse, extractErrorMessageFromResponse } from "./utils";
|
||||||
@ -19,5 +19,13 @@ export const landingApi = api.injectEndpoints({
|
|||||||
transformResponse: extractBodyFromResponse<CreateOrder.Response>,
|
transformResponse: extractBodyFromResponse<CreateOrder.Response>,
|
||||||
transformErrorResponse: extractErrorMessageFromResponse,
|
transformErrorResponse: extractErrorMessageFromResponse,
|
||||||
}),
|
}),
|
||||||
|
uploadCarImage: mutation<UploadCarImage.Response, UploadCarImage.Params>({
|
||||||
|
query: ({ orderId, body }) => ({
|
||||||
|
url: `/order/${orderId}/upload-car-img`,
|
||||||
|
body,
|
||||||
|
method: 'POST'
|
||||||
|
}),
|
||||||
|
transformErrorResponse: extractErrorMessageFromResponse,
|
||||||
|
}),
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
@ -13,9 +13,10 @@ export const extractErrorMessageFromResponse = ({
|
|||||||
}: FetchBaseQueryError) => {
|
}: FetchBaseQueryError) => {
|
||||||
if (
|
if (
|
||||||
typeof data === 'object' &&
|
typeof data === 'object' &&
|
||||||
'message' in data &&
|
data !== null &&
|
||||||
typeof data.message === 'string'
|
'error' in data &&
|
||||||
|
typeof data.error === 'string'
|
||||||
) {
|
) {
|
||||||
return data.message;
|
return data.error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -7,7 +7,9 @@ export const store = configureStore({
|
|||||||
[api.reducerPath]: api.reducer,
|
[api.reducerPath]: api.reducer,
|
||||||
},
|
},
|
||||||
middleware: (getDefaultMiddleware) =>
|
middleware: (getDefaultMiddleware) =>
|
||||||
getDefaultMiddleware().concat(api.middleware),
|
getDefaultMiddleware({
|
||||||
|
serializableCheck: false
|
||||||
|
}).concat(api.middleware),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type RootState = ReturnType<typeof store.getState>;
|
export type RootState = ReturnType<typeof store.getState>;
|
||||||
|
@ -28,7 +28,6 @@ class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
|
|||||||
|
|
||||||
componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
|
componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
|
||||||
console.error('Error caught by ErrorBoundary:', error, errorInfo);
|
console.error('Error caught by ErrorBoundary:', error, errorInfo);
|
||||||
console.error('4545');
|
|
||||||
this.setState({ error, errorInfo });
|
this.setState({ error, errorInfo });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,6 +24,10 @@ jest.mock('@brojs/cli', () => {
|
|||||||
|
|
||||||
describe('ErrorBoundary', () => {
|
describe('ErrorBoundary', () => {
|
||||||
it('должен отобразить запасной UI при ошибке', async () => {
|
it('должен отобразить запасной UI при ошибке', async () => {
|
||||||
|
// Подавляем вывод ошибки в консоль во время теста
|
||||||
|
const consoleSpy = jest.spyOn(console, 'error');
|
||||||
|
consoleSpy.mockImplementation(() => {});
|
||||||
|
|
||||||
const { container } = render(
|
const { container } = render(
|
||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
@ -39,7 +43,9 @@ describe('ErrorBoundary', () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
expect(button).not.toBeNull();
|
expect(button).not.toBeNull();
|
||||||
|
|
||||||
expect(container).toMatchSnapshot();
|
expect(container).toMatchSnapshot();
|
||||||
|
|
||||||
|
// Восстанавливаем console.error после теста
|
||||||
|
consoleSpy.mockRestore();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
102
src/components/order-view/car-img/car-img-form.tsx
Normal file
102
src/components/order-view/car-img/car-img-form.tsx
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
import React, { FC, memo, useRef } from 'react';
|
||||||
|
import { Controller, useForm } from 'react-hook-form';
|
||||||
|
import {
|
||||||
|
Button,
|
||||||
|
FormControl,
|
||||||
|
FormErrorMessage,
|
||||||
|
FormHelperText,
|
||||||
|
FormLabel,
|
||||||
|
HStack,
|
||||||
|
Input,
|
||||||
|
} from '@chakra-ui/react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import { landingApi } from '../../../__data__/service/landing.api';
|
||||||
|
import { UploadCarImage } from '../../../models/api';
|
||||||
|
|
||||||
|
import { useHandleUploadCarImageResponse } from './helper';
|
||||||
|
|
||||||
|
type FormValues = {
|
||||||
|
carImg: File & {
|
||||||
|
fileName: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
type CarImageFormProps = {
|
||||||
|
orderId: UploadCarImage.Params['orderId'];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const CarImageForm: FC<CarImageFormProps> = memo(function CarImageForm({
|
||||||
|
orderId,
|
||||||
|
}) {
|
||||||
|
const {
|
||||||
|
handleSubmit,
|
||||||
|
control,
|
||||||
|
formState: { errors, isSubmitting },
|
||||||
|
} = useForm<FormValues>({ shouldFocusError: true });
|
||||||
|
|
||||||
|
const [uploadCarImage, uploadCarImageMutation] =
|
||||||
|
landingApi.useUploadCarImageMutation();
|
||||||
|
useHandleUploadCarImageResponse(uploadCarImageMutation);
|
||||||
|
|
||||||
|
const onSubmit = (formData: FormValues) => {
|
||||||
|
const body = new FormData();
|
||||||
|
body.append('file', formData.carImg);
|
||||||
|
uploadCarImage({ orderId, body });
|
||||||
|
};
|
||||||
|
|
||||||
|
const fileInputRef = useRef(null);
|
||||||
|
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.order-view.upload-car-image',
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form>
|
||||||
|
<FormControl>
|
||||||
|
<FormLabel htmlFor='carImg'>{t('field.label')}</FormLabel>
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name='carImg'
|
||||||
|
render={({ field: { value, onChange, ...field } }) => {
|
||||||
|
return (
|
||||||
|
<HStack gap={0}>
|
||||||
|
<Input
|
||||||
|
{...field}
|
||||||
|
ref={fileInputRef}
|
||||||
|
accept='image/png,image/jpeg'
|
||||||
|
value={value?.fileName}
|
||||||
|
onChange={(event) => {
|
||||||
|
onChange(event.target.files[0]);
|
||||||
|
handleSubmit(onSubmit)();
|
||||||
|
}}
|
||||||
|
type='file'
|
||||||
|
hidden
|
||||||
|
/>
|
||||||
|
<Input
|
||||||
|
placeholder={t('file-input.placeholder')}
|
||||||
|
value={value?.name || ''}
|
||||||
|
readOnly
|
||||||
|
borderRightRadius={0}
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
fileInputRef.current.click();
|
||||||
|
}}
|
||||||
|
isLoading={isSubmitting || uploadCarImageMutation.isLoading}
|
||||||
|
colorScheme='primary'
|
||||||
|
paddingInline={8}
|
||||||
|
borderLeftRadius={0}
|
||||||
|
>
|
||||||
|
{t('file-input.button')}
|
||||||
|
</Button>
|
||||||
|
</HStack>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<FormErrorMessage>{errors.carImg?.message}</FormErrorMessage>
|
||||||
|
<FormHelperText>{t('field.help')}</FormHelperText>
|
||||||
|
</FormControl>
|
||||||
|
</form>
|
||||||
|
);
|
||||||
|
});
|
35
src/components/order-view/car-img/helper.ts
Normal file
35
src/components/order-view/car-img/helper.ts
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
import { useEffect } from "react";
|
||||||
|
import { useToast } from "@chakra-ui/react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
|
import { isErrorMessage } from "../../../models/api";
|
||||||
|
|
||||||
|
export const useHandleUploadCarImageResponse = (query: {
|
||||||
|
isSuccess: boolean;
|
||||||
|
isError: boolean;
|
||||||
|
error?: unknown;
|
||||||
|
}) => {
|
||||||
|
const toast = useToast();
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.order-view.upload-car-image-query',
|
||||||
|
});
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (query.isError) {
|
||||||
|
toast({
|
||||||
|
status: 'error',
|
||||||
|
title: t('error.title'),
|
||||||
|
description: isErrorMessage(query.error) ? query.error : undefined,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [query.isError]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (query.isSuccess) {
|
||||||
|
toast({
|
||||||
|
status: 'success',
|
||||||
|
title: t('success.title'),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [query.isSuccess]);
|
||||||
|
};
|
1
src/components/order-view/car-img/index.ts
Normal file
1
src/components/order-view/car-img/index.ts
Normal file
@ -0,0 +1 @@
|
|||||||
|
export { CarImageForm } from './car-img-form';
|
@ -5,11 +5,13 @@ import {
|
|||||||
Heading,
|
Heading,
|
||||||
HStack,
|
HStack,
|
||||||
UnorderedList,
|
UnorderedList,
|
||||||
VStack,
|
|
||||||
ListItem,
|
ListItem,
|
||||||
Text,
|
Text,
|
||||||
} from '@chakra-ui/react';
|
} from '@chakra-ui/react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
import localizedFormat from "dayjs/plugin/localizedFormat";
|
||||||
|
dayjs.extend(localizedFormat);
|
||||||
|
|
||||||
import { Order } from '../../../models/landing';
|
import { Order } from '../../../models/landing';
|
||||||
import { formatDatetime } from '../../../lib';
|
import { formatDatetime } from '../../../lib';
|
||||||
@ -41,7 +43,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
|
|||||||
location,
|
location,
|
||||||
startWashTime,
|
startWashTime,
|
||||||
endWashTime,
|
endWashTime,
|
||||||
...props
|
created
|
||||||
}) => {
|
}) => {
|
||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
keyPrefix: 'dry-wash.order-view.details',
|
keyPrefix: 'dry-wash.order-view.details',
|
||||||
@ -51,7 +53,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
|
|||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<VStack p={4} alignItems='flex-start' gap={4} {...props}>
|
<>
|
||||||
<HStack
|
<HStack
|
||||||
width='full'
|
width='full'
|
||||||
flexWrap='wrap'
|
flexWrap='wrap'
|
||||||
@ -59,7 +61,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
|
|||||||
gap={2}
|
gap={2}
|
||||||
>
|
>
|
||||||
<Heading as='h2' size='lg'>
|
<Heading as='h2' size='lg'>
|
||||||
{t('title', { number: orderNumber })}
|
{t('title', { number: orderNumber })} ({dayjs(created).format('LLLL')})
|
||||||
</Heading>
|
</Heading>
|
||||||
<OrderStatus value={status} />
|
<OrderStatus value={status} />
|
||||||
</HStack>
|
</HStack>
|
||||||
@ -105,7 +107,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
|
|||||||
<AlertIcon />
|
<AlertIcon />
|
||||||
{t('alert')}
|
{t('alert')}
|
||||||
</Alert>
|
</Alert>
|
||||||
</VStack>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ export const isErrorMessage = (error: unknown): error is ErrorMessage => typeof
|
|||||||
|
|
||||||
type ErrorResponse = {
|
type ErrorResponse = {
|
||||||
success: false;
|
success: false;
|
||||||
message: ErrorMessage;
|
error: ErrorMessage;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
|
export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
|
||||||
|
@ -21,6 +21,17 @@ export namespace CreateOrder {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace UploadCarImage {
|
||||||
|
export type Response = void;
|
||||||
|
export type Params = {
|
||||||
|
orderId: Order.Id;
|
||||||
|
/**
|
||||||
|
* @example { file: File }
|
||||||
|
*/
|
||||||
|
body: FormData;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
type GetArrItemType<ArrType> =
|
type GetArrItemType<ArrType> =
|
||||||
ArrType extends Array<infer ItemType> ? ItemType : never;
|
ArrType extends Array<infer ItemType> ? ItemType : never;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
exports[`Master Page render 1`] = `
|
exports[`Master Page should display master list and show details when master button is clicked 1`] = `
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
class="css-1yeiifd"
|
class="css-1yeiifd"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
exports[`Order View page, initial load shows order details 1`] = `
|
exports[`Страница просмотра заказа отображает детали заказа после успешной загрузки 1`] = `
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
class="chakra-container css-3n6qh3"
|
class="chakra-container css-3n6qh3"
|
||||||
@ -16,7 +16,6 @@ exports[`Order View page, initial load shows order details 1`] = `
|
|||||||
</h2>
|
</h2>
|
||||||
<div
|
<div
|
||||||
class="chakra-stack css-1n38vgh"
|
class="chakra-stack css-1n38vgh"
|
||||||
created="2025-01-19T14:04:02.985Z"
|
|
||||||
data-testid="order-details"
|
data-testid="order-details"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
@ -26,6 +25,9 @@ exports[`Order View page, initial load shows order details 1`] = `
|
|||||||
class="chakra-heading css-1jb3vzl"
|
class="chakra-heading css-1jb3vzl"
|
||||||
>
|
>
|
||||||
Заказ №{{number}}
|
Заказ №{{number}}
|
||||||
|
(
|
||||||
|
Sunday, January 19, 2025 5:04 PM
|
||||||
|
)
|
||||||
</h2>
|
</h2>
|
||||||
<span
|
<span
|
||||||
class="css-6jfsiv"
|
class="css-6jfsiv"
|
||||||
@ -126,7 +128,7 @@ exports[`Order View page, initial load shows order details 1`] = `
|
|||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`Order View page, initial load shows order details loading 1`] = `
|
exports[`Страница просмотра заказа отображает индикатор загрузки деталей заказа 1`] = `
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
class="chakra-container css-3n6qh3"
|
class="chakra-container css-3n6qh3"
|
||||||
@ -171,7 +173,7 @@ exports[`Order View page, initial load shows order details loading 1`] = `
|
|||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
exports[`Order View page, initial load shows order error 1`] = `
|
exports[`Страница просмотра заказа отображает ошибку при некорректном ID заказа 1`] = `
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
class="chakra-container css-3n6qh3"
|
class="chakra-container css-3n6qh3"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
exports[`order page получение списка заказов 1`] = `
|
exports[`Страница заказов должна корректно отображать список заказов после загрузки данных 1`] = `
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
class="css-1yeiifd"
|
class="css-1yeiifd"
|
||||||
@ -75,7 +75,7 @@ exports[`order page получение списка заказов 1`] = `
|
|||||||
<p
|
<p
|
||||||
class="chakra-text css-52ukzg"
|
class="chakra-text css-52ukzg"
|
||||||
>
|
>
|
||||||
16.02.2025
|
23.02.2025
|
||||||
</p>
|
</p>
|
||||||
<button
|
<button
|
||||||
class="chakra-button css-ez23ye"
|
class="chakra-button css-ez23ye"
|
||||||
|
@ -54,6 +54,41 @@ const server = setupServer(
|
|||||||
],
|
],
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
|
http.post('/api/arm/orders', () => {
|
||||||
|
return HttpResponse.json({
|
||||||
|
success: true,
|
||||||
|
body: [
|
||||||
|
{
|
||||||
|
id: 'order1',
|
||||||
|
carNumber: 'A123BC',
|
||||||
|
startWashTime: '2024-11-24T10:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T16:30:00.000Z',
|
||||||
|
orderDate: '2024-11-24T08:41:46.366Z',
|
||||||
|
status: 'pending',
|
||||||
|
phone: '79001234563',
|
||||||
|
location: 'Казань, ул. Баумана, 1',
|
||||||
|
master: {
|
||||||
|
name: 'Олег Макаров',
|
||||||
|
phone: '79001234567',
|
||||||
|
id: '23423442',
|
||||||
|
},
|
||||||
|
notes: '',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'order2',
|
||||||
|
carNumber: 'A245BC',
|
||||||
|
startWashTime: '2024-11-24T11:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T17:30:00.000Z',
|
||||||
|
orderDate: '2024-11-24T07:40:46.366Z',
|
||||||
|
status: 'progress',
|
||||||
|
phone: '79001234567',
|
||||||
|
location: 'Казань, ул. Баумана, 43',
|
||||||
|
master: [],
|
||||||
|
notes: '',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
jest.mock('@brojs/cli', () => {
|
jest.mock('@brojs/cli', () => {
|
||||||
@ -70,11 +105,7 @@ describe('Master Page', () => {
|
|||||||
afterEach(() => server.resetHandlers());
|
afterEach(() => server.resetHandlers());
|
||||||
afterAll(() => server.close());
|
afterAll(() => server.close());
|
||||||
|
|
||||||
it('render ', async () => {
|
it('should display master list and show details when master button is clicked', async () => {
|
||||||
server.events.on('request:start', ({ request }) => {
|
|
||||||
console.log('Outgoing:', request.method, request.url);
|
|
||||||
});
|
|
||||||
|
|
||||||
const { container } = render(
|
const { container } = render(
|
||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
<ChakraProvider theme={chakraTheme}>
|
<ChakraProvider theme={chakraTheme}>
|
||||||
@ -88,10 +119,14 @@ describe('Master Page', () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const button = await waitFor(() => screen.getByTestId('master-button'));
|
const button = await waitFor(() => screen.getByTestId('master-button'));
|
||||||
|
|
||||||
fireEvent.click(button);
|
fireEvent.click(button);
|
||||||
|
|
||||||
await waitFor(() => screen.getByText('Иван Иванов'));
|
// Проверяем отображение всех мастеров
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(screen.getByText('Иван Иванов')).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('Олег Макаров')).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('Иван Галкин')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
expect(container).toMatchSnapshot();
|
expect(container).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
@ -11,12 +11,12 @@ jest.mock('react-router-dom', () => ({
|
|||||||
useParams: jest.fn(),
|
useParams: jest.fn(),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
describe('Order View page, initial load', () => {
|
describe('Страница просмотра заказа', () => {
|
||||||
beforeAll(() => server.listen());
|
beforeAll(() => server.listen());
|
||||||
afterEach(() => server.resetHandlers());
|
afterEach(() => server.resetHandlers());
|
||||||
afterAll(() => server.close());
|
afterAll(() => server.close());
|
||||||
|
|
||||||
test('shows order details loading', () => {
|
test('отображает индикатор загрузки деталей заказа', () => {
|
||||||
(useParams as jest.Mock).mockReturnValue({ orderId: 'id1' });
|
(useParams as jest.Mock).mockReturnValue({ orderId: 'id1' });
|
||||||
|
|
||||||
const { container } = render(
|
const { container } = render(
|
||||||
@ -33,7 +33,7 @@ describe('Order View page, initial load', () => {
|
|||||||
expect(container).toMatchSnapshot();
|
expect(container).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
|
||||||
test('shows order details', async () => {
|
test('отображает детали заказа после успешной загрузки', async () => {
|
||||||
(useParams as jest.Mock).mockReturnValue({ orderId: 'id1' });
|
(useParams as jest.Mock).mockReturnValue({ orderId: 'id1' });
|
||||||
|
|
||||||
const { container } = render(
|
const { container } = render(
|
||||||
@ -52,7 +52,7 @@ describe('Order View page, initial load', () => {
|
|||||||
expect(container).toMatchSnapshot();
|
expect(container).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
|
||||||
test('shows order error', async () => {
|
test('отображает ошибку при некорректном ID заказа', async () => {
|
||||||
(useParams as jest.Mock).mockReturnValue({ orderId: null });
|
(useParams as jest.Mock).mockReturnValue({ orderId: null });
|
||||||
|
|
||||||
const { container } = render(
|
const { container } = render(
|
||||||
|
@ -46,10 +46,6 @@ describe('order page', () => {
|
|||||||
afterAll(() => server.close());
|
afterAll(() => server.close());
|
||||||
|
|
||||||
it('получение пустого списка', async () => {
|
it('получение пустого списка', async () => {
|
||||||
server.events.on('request:start', ({ request }) => {
|
|
||||||
console.log('Outgoing:', request.method, request.url);
|
|
||||||
});
|
|
||||||
|
|
||||||
render(
|
render(
|
||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
<ChakraProvider theme={chakraTheme}>
|
<ChakraProvider theme={chakraTheme}>
|
||||||
|
@ -21,9 +21,43 @@ import Page from '../arm';
|
|||||||
import { PageSpinner } from '../../components';
|
import { PageSpinner } from '../../components';
|
||||||
|
|
||||||
const server = setupServer(
|
const server = setupServer(
|
||||||
http.get('/api/arm/orders', () => {
|
http.post('/api/arm/orders', () => {
|
||||||
return HttpResponse.json({}, { status: 500 });
|
return HttpResponse.json({}, { status: 500 });
|
||||||
}),
|
}),
|
||||||
|
http.get('/api/arm/masters', () => {
|
||||||
|
return HttpResponse.json({
|
||||||
|
success: true,
|
||||||
|
body: [
|
||||||
|
{
|
||||||
|
id: '4545423234',
|
||||||
|
name: 'Иван Иванов',
|
||||||
|
phone: '+7 900 123 45 67',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'Олег Макаров',
|
||||||
|
phone: '79001234567',
|
||||||
|
id: '23423442',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '345354234',
|
||||||
|
name: 'Иван Галкин',
|
||||||
|
schedule: [
|
||||||
|
{
|
||||||
|
id: 'order1',
|
||||||
|
startWashTime: '2024-11-24T10:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T16:30:00.000Z',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'order2',
|
||||||
|
startWashTime: '2024-11-24T11:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T17:30:00.000Z',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
phone: '+7 900 123 45 67',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
jest.mock('@brojs/cli', () => {
|
jest.mock('@brojs/cli', () => {
|
||||||
|
@ -98,16 +98,12 @@ jest.mock('@brojs/cli', () => {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('order page', () => {
|
describe('Страница заказов', () => {
|
||||||
beforeAll(() => server.listen());
|
beforeAll(() => server.listen());
|
||||||
afterEach(() => server.resetHandlers());
|
afterEach(() => server.resetHandlers());
|
||||||
afterAll(() => server.close());
|
afterAll(() => server.close());
|
||||||
|
|
||||||
it('получение списка заказов ', async () => {
|
it('должна корректно отображать список заказов после загрузки данных', async () => {
|
||||||
server.events.on('request:start', ({ request }) => {
|
|
||||||
console.log('Outgoing:', request.method, request.url);
|
|
||||||
});
|
|
||||||
|
|
||||||
const { container } = render(
|
const { container } = render(
|
||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
<ChakraProvider theme={chakraTheme}>
|
<ChakraProvider theme={chakraTheme}>
|
||||||
|
@ -21,6 +21,7 @@ import { Order } from '../../models/landing';
|
|||||||
import { landingApi } from '../../__data__/service/landing.api';
|
import { landingApi } from '../../__data__/service/landing.api';
|
||||||
import { isErrorMessage } from '../../models/api';
|
import { isErrorMessage } from '../../models/api';
|
||||||
import { FEATURE } from '../../__data__/features';
|
import { FEATURE } from '../../__data__/features';
|
||||||
|
import { CarImageForm } from '../../components/order-view/car-img';
|
||||||
|
|
||||||
const Page: FC = () => {
|
const Page: FC = () => {
|
||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
@ -69,24 +70,30 @@ const Page: FC = () => {
|
|||||||
<>
|
<>
|
||||||
<>
|
<>
|
||||||
{isSuccess && (
|
{isSuccess && (
|
||||||
<OrderDetails
|
<VStack p={4} alignItems='flex-start' gap={4} data-testid='order-details'>
|
||||||
orderNumber={order.orderNumber}
|
<OrderDetails
|
||||||
status={order.status}
|
orderNumber={order.orderNumber}
|
||||||
phone={order.phone}
|
status={order.status}
|
||||||
carNumber={order.carNumber}
|
phone={order.phone}
|
||||||
carBody={order.carBody}
|
carNumber={order.carNumber}
|
||||||
carColor={order.carColor}
|
carBody={order.carBody}
|
||||||
location={order.location}
|
carColor={order.carColor}
|
||||||
startWashTime={order.startWashTime}
|
location={order.location}
|
||||||
endWashTime={order.endWashTime}
|
startWashTime={order.startWashTime}
|
||||||
created={order.created}
|
endWashTime={order.endWashTime}
|
||||||
data-testid='order-details'
|
created={order.created}
|
||||||
/>
|
/>
|
||||||
|
{FEATURE.carImageUpload.isOn && <CarImageForm orderId={orderId} />}
|
||||||
|
</VStack>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
<>
|
<>
|
||||||
{isError && (
|
{isError && (
|
||||||
<Alert status='error' alignItems='flex-start' data-testid='error'>
|
<Alert
|
||||||
|
status='error'
|
||||||
|
alignItems='flex-start'
|
||||||
|
data-testid='error'
|
||||||
|
>
|
||||||
<AlertIcon />
|
<AlertIcon />
|
||||||
<Box>
|
<Box>
|
||||||
<AlertTitle>
|
<AlertTitle>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-require-imports */
|
/* eslint-disable @typescript-eslint/no-require-imports */
|
||||||
const router = require('express').Router();
|
const router = require('express').Router();
|
||||||
|
|
||||||
const STUBS = { masters: 'success', orders: 'success', orderCreate: 'success', orderView: 'success-pending' };
|
const STUBS = { masters: 'success', orders: 'success', orderCreate: 'success', orderView: 'success-pending', orderCarImg: 'success' };
|
||||||
|
|
||||||
router.get('/set/:name/:value', (req, res) => {
|
router.get('/set/:name/:value', (req, res) => {
|
||||||
const { name, value } = req.params;
|
const { name, value } = req.params;
|
||||||
@ -15,28 +15,34 @@ router.get('/set/:name/:value', (req, res) => {
|
|||||||
router.get('/', (req, res) => {
|
router.get('/', (req, res) => {
|
||||||
res.send(`<div>
|
res.send(`<div>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>Мастера</legend>
|
<legend>Мастера</legend>
|
||||||
${generateRadioInput('masters', 'success')}
|
${generateRadioInput('masters', 'success')}
|
||||||
${generateRadioInput('masters', 'error')}
|
${generateRadioInput('masters', 'error')}
|
||||||
${generateRadioInput('masters', 'empty')}
|
${generateRadioInput('masters', 'empty')}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>Заказы</legend>
|
<legend>Заказы</legend>
|
||||||
${generateRadioInput('orders', 'success')}
|
${generateRadioInput('orders', 'success')}
|
||||||
${generateRadioInput('orders', 'error')}
|
${generateRadioInput('orders', 'error')}
|
||||||
${generateRadioInput('orders', 'empty')}
|
${generateRadioInput('orders', 'empty')}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>Лендинг - Сделать заказ</legend>
|
<legend>Лендинг - Сделать заказ</legend>
|
||||||
${generateRadioInput('orderCreate', 'success')}
|
${generateRadioInput('orderCreate', 'success')}
|
||||||
${generateRadioInput('orderCreate', 'error')}
|
${generateRadioInput('orderCreate', 'error')}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>Лендинг - Детали заказа</legend>
|
<legend>Лендинг - Детали заказа</legend>
|
||||||
${generateRadioInput('orderView', 'success-pending')}
|
${generateRadioInput('orderView', 'success-pending')}
|
||||||
${generateRadioInput('orderView', 'success-working')}
|
${generateRadioInput('orderView', 'success-working')}
|
||||||
${generateRadioInput('orderView', 'error')}
|
${generateRadioInput('orderView', 'error')}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
<fieldset>
|
||||||
|
<legend>Лендинг - Детали заказа, фото машины</legend>
|
||||||
|
${generateRadioInput('orderCarImg', 'success')}
|
||||||
|
${generateRadioInput('orderCarImg', 'error-file-type')}
|
||||||
|
${generateRadioInput('orderCarImg', 'error-file-size')}
|
||||||
|
</fieldset>
|
||||||
</div>`);
|
</div>`);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -98,6 +98,22 @@ router.post('/order/create', (req, res) => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
router.post('/order/:orderId/upload-car-img', (req, res) => {
|
||||||
|
const { orderId } = req.params;
|
||||||
|
const stubName = `${orderId}-${STUBS.orderCarImg}`;
|
||||||
|
|
||||||
|
try {
|
||||||
|
res
|
||||||
|
.status(/error/.test(stubName) ? 500 : 200)
|
||||||
|
.send(require(`../json/landing-order-car-image-upload/${stubName}.json`));
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
res
|
||||||
|
.status(500)
|
||||||
|
.send(commonError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
router.use('/admin', require('./admin'));
|
router.use('/admin', require('./admin'));
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"success": false,
|
||||||
|
"error": "Invalid car image file size. Limit is 5MB"
|
||||||
|
}
|
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"success": false,
|
||||||
|
"error": "Invalid car image file type. Allowed types: jpg, png"
|
||||||
|
}
|
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"success": true
|
||||||
|
}
|
@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"success": false,
|
"success": false,
|
||||||
"message": "Не удалось создать заказ"
|
"error": "Не удалось создать заказ"
|
||||||
}
|
}
|
@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"success": false,
|
"success": false,
|
||||||
"message": "Не удалось загрузить детали заказа"
|
"error": "Не удалось загрузить детали заказа"
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user