Compare commits

...

22 Commits

Author SHA1 Message Date
RustamRu
7fc5455c37 0.8.0
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2025-02-16 11:57:38 +03:00
RustamRu
24779e2592 fix: orders date format 2025-02-16 11:55:18 +03:00
RustamRu
9111724519 Merge branch 'main' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2025-02-16 11:45:55 +03:00
RustamRu
c2511e0917 fix: order view status polling 2025-02-16 11:45:42 +03:00
b7d935f557 Merge pull request 'feature/testArm' (#87) from feature/testArm into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #87
2025-02-16 11:36:51 +03:00
fdc20e7464 feat: detete ts jest
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-main Build started...
it-academy/dry-wash-pl/pipeline/head There was a failure building this commit
2025-02-16 11:36:13 +03:00
a616d3815b feat: add master test
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
it-academy/dry-wash-pl/pipeline/head This commit looks good
2025-02-16 11:31:26 +03:00
56f65fbd3a feat: add test for orders 2025-02-16 11:31:05 +03:00
RustamRu
52fec13377 0.7.2
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2025-02-09 12:40:31 +03:00
RustamRu
1d4b796a39 Merge branch 'main' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2025-02-09 11:31:52 +03:00
RustamRu
142067e9ce 0.7.1 2025-02-09 11:31:36 +03:00
3c291baa0e Merge pull request 'fix: create order request body (#81)' (#84) from feature/order-form-upgrade into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #84
2025-02-09 11:30:58 +03:00
RustamRu
3cdc47b91b fix: create order request body (#81)
Some checks are pending
it-academy/dry-wash-pl/pipeline/pr-main Build started...
it-academy/dry-wash-pl/pipeline/head This commit looks good
2025-02-09 11:28:15 +03:00
RustamRu
901d8d78a1 0.7.0
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2025-02-09 11:17:24 +03:00
RustamRu
7736592830 fix: e2e tests
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2025-02-09 11:02:27 +03:00
RustamRu
8d447c9461 0.6.0
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2025-02-09 10:20:21 +03:00
6506b89dc7 Merge pull request 'feat: add playwright' (#83) from feature/playwright into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #83
2025-02-09 10:12:42 +03:00
89d432b360 Merge pull request 'fear: change requests to RTK query' (#78) from feature/rtk-query-arm into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #78
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2025-02-09 10:10:40 +03:00
f6cc2efb86 Merge pull request 'feature/order-form-upgrade' (#82) from feature/order-form-upgrade into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #82
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2025-02-09 10:09:45 +03:00
859fa4f2e1 feat: add playwright
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2025-02-09 09:57:04 +03:00
RustamRu
0ec9e146b9 feat: order creation animation (#77)
Some checks are pending
it-academy/dry-wash-pl/pipeline/head This commit looks good
it-academy/dry-wash-pl/pipeline/pr-main Build started...
2025-02-09 09:03:24 +03:00
RustamRu
1669f01879 feat: use RTK Query to create order deails (#81)
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2025-02-09 08:04:21 +03:00
43 changed files with 17134 additions and 15767 deletions

8
.gitignore vendored
View File

@@ -130,4 +130,10 @@ dist
.yarn/install-state.gz
.pnp.*
.idea
.idea
# Playwright
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/

View File

@@ -0,0 +1,6 @@
import { jest } from '@jest/globals';
import React from 'react';
jest.mock('@lottiefiles/react-lottie-player', () => ({
Player: jest.fn(() => <></>),
}));

View File

@@ -0,0 +1,9 @@
import localeRu from '../locales/ru.json';
module.exports = {
useTranslation: (_, { keyPrefix }) => {
return {
t: (key: string) => localeRu[`${keyPrefix}.${key}`],
};
}
};

View File

@@ -19,7 +19,7 @@ module.exports = {
'dry-wash.arm': '/arm/*',
},
features: {
'dry-wash-pl': {
'dry-wash': {
// add your features here in the format [featureName]: { value: string }
'order-view-status-polling': { value: '3000' }
},

26
e2e/example.spec.ts Normal file
View File

@@ -0,0 +1,26 @@
import { test, expect } from '@playwright/test';
test.beforeEach('check server is up', async ({ page }) => {
try {
await page.goto('http://localhost:8099/dry-wash');
const makeOrderText = page.getByText('Сделать заказ', { exact: true });
await expect(makeOrderText).toBeVisible();
} catch (error) {
console.error('server not up', error);
test.skip();
}
});
test('login', async ({ page }) => {
await page.goto('http://localhost:8099/dry-wash/arm');
await page.getByRole('textbox', { name: 'Username or email' }).click();
await page
.getByRole('textbox', { name: 'Username or email' })
.fill('237x237');
await page.getByRole('textbox', { name: 'Password' }).click();
await page.getByRole('textbox', { name: 'Password' }).fill('');
await page.getByRole('button', { name: 'Sign In' }).click();
await page.getByRole('heading', { name: 'Заказы' }).click();
await page.getByRole('link', { name: 'Мастера' }).click();
await page.getByRole('link', { name: 'Заказы' }).click();
});

View File

@@ -9,9 +9,11 @@ module.exports = {
clearMocks: true,
moduleNameMapper: {
'\\.(svg|webp)$': '<rootDir>/__mocks__/file',
'react-i18next': '<rootDir>/__mocks__/react-i18next',
},
testEnvironmentOptions: {
customExportConditions: [''],
},
testEnvironment: 'jest-fixed-jsdom',
testPathIgnorePatterns: ['/node_modules/', '<rootDir>/e2e'],
};

View File

@@ -39,6 +39,7 @@
"dry-wash.order-create.car-body-select.options.sports-car" : "Sports-car",
"dry-wash.order-create.car-body-select.options.other": "Other",
"dry-wash.order-create.form.submit-button.label": "Submit",
"dry-wash.order-create.order-creation-title": "Creating order ...",
"dry-wash.order-create.create-order-query.success.title": "The order is successfully created",
"dry-wash.order-create.create-order-query.error.title": "Failed to create an order",
"dry-wash.order-view.title": "Your order",

View File

@@ -94,6 +94,7 @@
"dry-wash.order-create.car-body-select.options.sports-car": "Спорткар",
"dry-wash.order-create.car-body-select.options.other": "Другой",
"dry-wash.order-create.form.submit-button.label": "Отправить",
"dry-wash.order-create.order-creation-title": "Создаем заказ ...",
"dry-wash.order-create.create-order-query.success.title": "Заказ успешно создан",
"dry-wash.order-create.create-order-query.error.title": "Не удалось создать заказ",
"dry-wash.order-view.title": "Ваш заказ",

30589
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,72 +1,75 @@
{
"name": "dry-wash",
"version": "0.5.0",
"description": "<a id=\"readme-top\"></a>",
"main": "./src/index.tsx",
"scripts": {
"test": "jest -u",
"start": "brojs server --port=8099 --with-open-browser",
"build": "npm run clean && brojs build --dev",
"build:prod": "npm run clean && brojs build",
"clean": "rimraf dist",
"eslint": "npx eslint .",
"eslint:fix": "npx eslint . --fix",
"preversion": "npm run eslint"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"@brojs/cli": "^1.8.4",
"@babel/core": "^7.26.7",
"@babel/preset-env": "^7.26.7",
"@babel/preset-react": "^7.26.3",
"@babel/preset-typescript": "^7.26.0",
"@chakra-ui/icons": "^2.2.4",
"@chakra-ui/react": "^2.10.5",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@fontsource/open-sans": "^5.1.0",
"@lottiefiles/react-lottie-player": "^3.5.4",
"@pbe/react-yandex-maps": "^1.2.5",
"@reduxjs/toolkit": "^2.5.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/react": "^16.2.0",
"@types/react": "^18.3.12",
"babel-jest": "^29.7.0",
"dayjs": "^1.11.13",
"express": "^4.21.1",
"framer-motion": "^6.2.8",
"i18next": "^23.16.4",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-fixed-jsdom": "^0.0.9",
"keycloak-js": "^23.0.7",
"msw": "^2.7.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.2",
"react-i18next": "^15.1.1",
"react-icons": "^5.3.0",
"react-phone-number-input": "^3.4.9",
"react-redux": "^9.2.0",
"react-router-dom": "^6.27.0",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2"
},
"devDependencies": {
"@eslint/js": "^9.14.0",
"@stylistic/eslint-plugin": "^2.10.1",
"@types/react-dom": "^18.3.1",
"eslint": "^9.14.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-react": "^7.37.2",
"globals": "^15.11.0",
"prettier": "3.3.3",
"typescript": "^5.7.3",
"typescript-eslint": "^8.12.2"
},
"jest": {
"preset": "./jest-preset-it/jest-preset.ts"
}
"name": "dry-wash",
"version": "0.8.0",
"description": "<a id=\"readme-top\"></a>",
"main": "./src/index.tsx",
"scripts": {
"test": "jest -u",
"start": "brojs server --port=8099 --with-open-browser",
"build": "npm run clean && brojs build --dev",
"build:prod": "npm run clean && brojs build",
"clean": "rimraf dist",
"eslint": "npx eslint .",
"eslint:fix": "npx eslint . --fix",
"preversion": "npm run eslint"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"@babel/core": "^7.26.7",
"@babel/preset-env": "^7.26.7",
"@babel/preset-react": "^7.26.3",
"@babel/preset-typescript": "^7.26.0",
"@brojs/cli": "^1.8.4",
"@chakra-ui/icons": "^2.2.4",
"@chakra-ui/react": "^2.10.5",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@fontsource/open-sans": "^5.1.0",
"@lottiefiles/react-lottie-player": "^3.5.4",
"@pbe/react-yandex-maps": "^1.2.5",
"@reduxjs/toolkit": "^2.5.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/react": "^16.2.0",
"@types/react": "^18.3.12",
"babel-jest": "^29.7.0",
"dayjs": "^1.11.13",
"express": "^4.21.1",
"framer-motion": "^6.2.8",
"i18next": "^23.16.4",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-fixed-jsdom": "^0.0.9",
"keycloak-js": "^23.0.7",
"msw": "^2.7.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.2",
"react-i18next": "^15.1.1",
"react-icons": "^5.3.0",
"react-phone-number-input": "^3.4.9",
"react-redux": "^9.2.0",
"react-router-dom": "^6.27.0",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2"
},
"devDependencies": {
"@eslint/js": "^9.14.0",
"@playwright/test": "^1.50.1",
"@stylistic/eslint-plugin": "^2.10.1",
"@testing-library/jest-dom": "^6.6.3",
"@types/node": "^22.13.1",
"@types/react-dom": "^18.3.1",
"eslint": "^9.14.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-react": "^7.37.2",
"globals": "^15.11.0",
"prettier": "3.3.3",
"typescript": "^5.7.3",
"typescript-eslint": "^8.12.2"
},
"jest": {
"preset": "./jest-preset-it/jest-preset.ts"
}
}

79
playwright.config.ts Normal file
View File

@@ -0,0 +1,79 @@
import { defineConfig, devices } from '@playwright/test';
/**
* Read environment variables from file.
* https://github.com/motdotla/dotenv
*/
// import dotenv from 'dotenv';
// import path from 'path';
// dotenv.config({ path: path.resolve(__dirname, '.env') });
/**
* See https://playwright.dev/docs/test-configuration.
*/
export default defineConfig({
testDir: './tests',
/* Run tests in files in parallel */
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
forbidOnly: !!process.env.CI,
/* Retry on CI only */
retries: process.env.CI ? 2 : 0,
/* Opt out of parallel tests on CI. */
workers: process.env.CI ? 1 : undefined,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: 'html',
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
use: {
/* Base URL to use in actions like `await page.goto('/')`. */
// baseURL: 'http://127.0.0.1:3000',
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
trace: 'on-first-retry',
},
/* Configure projects for major browsers */
projects: [
{
name: 'chromium',
use: { ...devices['Desktop Chrome'] },
},
{
name: 'firefox',
use: { ...devices['Desktop Firefox'] },
},
{
name: 'webkit',
use: { ...devices['Desktop Safari'] },
},
/* Test against mobile viewports. */
// {
// name: 'Mobile Chrome',
// use: { ...devices['Pixel 5'] },
// },
// {
// name: 'Mobile Safari',
// use: { ...devices['iPhone 12'] },
// },
/* Test against branded browsers. */
// {
// name: 'Microsoft Edge',
// use: { ...devices['Desktop Edge'], channel: 'msedge' },
// },
// {
// name: 'Google Chrome',
// use: { ...devices['Desktop Chrome'], channel: 'chrome' },
// },
],
/* Run your local dev server before starting the tests */
// webServer: {
// command: 'npm run start',
// url: 'http://127.0.0.1:3000',
// reuseExistingServer: !process.env.CI,
// },
});

View File

@@ -1,12 +1,12 @@
import { getFeatures } from "@brojs/cli";
const features = getFeatures('dry-wash-pl');
const features = getFeatures('dry-wash');
export const FEATURE = {
orderViewStatusPolling: {
isOn: Boolean(features['order-view-status-polling']),
isOn: Boolean(features?.['order-view-status-polling']),
getValue: () => {
const interval = parseInt(features['order-view-status-polling'].value);
const interval = parseInt(features?.['order-view-status-polling']?.value);
if (!Number.isNaN(interval)) {
return interval;
}

View File

@@ -16,7 +16,9 @@ type UpdateOrderProps = Required<Pick<OrderArm, 'id'>> &
export const api = createApi({
reducerPath: 'api',
baseQuery: fetchBaseQuery({ baseUrl: getConfigValue('dry-wash.api') }),
baseQuery: fetchBaseQuery({
baseUrl: new URL(getConfigValue('dry-wash.api'), location.origin).href,
}),
tagTypes: ['Masters', 'Orders'],
endpoints: (builder) => ({
getMasters: builder.query<Master[], void>({

View File

@@ -1,14 +1,23 @@
import { GetOrder } from "../../models/api";
import { GetOrder, CreateOrder } from "../../models/api";
import { api } from "./api";
import { extractBodyFromResponse, extractErrorMessageFromResponse } from "./utils";
export const landingApi = api.injectEndpoints({
endpoints: ({ query }) => ({
endpoints: ({ mutation, query }) => ({
getOrder: query<GetOrder.Response, GetOrder.Params>({
query: ({ orderId }) => `/order/${orderId}`,
transformResponse: extractBodyFromResponse<GetOrder.Response>,
transformErrorResponse: extractErrorMessageFromResponse,
})
}),
createOrder: mutation<CreateOrder.Response, CreateOrder.Params>({
query: ({ body }) => ({
url: `/order/create`,
body,
method: 'POST'
}),
transformResponse: extractBodyFromResponse<CreateOrder.Response>,
transformErrorResponse: extractErrorMessageFromResponse,
}),
})
});

View File

@@ -1,6 +1,6 @@
import { FetchBaseQueryError } from "@reduxjs/toolkit/query";
import { FetchBaseQueryError } from '@reduxjs/toolkit/query';
import { BaseResponse } from "../../models/api";
import { BaseResponse } from '../../models/api';
export const extractBodyFromResponse = <Body>(response: BaseResponse<Body>) => {
if (response.success) {
@@ -8,8 +8,14 @@ export const extractBodyFromResponse = <Body>(response: BaseResponse<Body>) => {
}
};
export const extractErrorMessageFromResponse = ({ data }: FetchBaseQueryError) => {
if (typeof data === 'object' && 'message' in data && typeof data.message === 'string') {
export const extractErrorMessageFromResponse = ({
data,
}: FetchBaseQueryError) => {
if (
typeof data === 'object' &&
'message' in data &&
typeof data.message === 'string'
) {
return data.message;
}
};

View File

@@ -1 +0,0 @@
export * from './landing';

View File

@@ -1,65 +0,0 @@
import { getConfigValue } from '@brojs/cli';
import { useState } from 'react';
import { CreateOrder } from '../models/api';
import { QueryState, Trigger } from './types';
enum LandingEndpoints {
ORDER_CREATE = '/order/create',
}
const endpoint = getConfigValue('dry-wash.api');
const useCreateOrderMutation = <D extends CreateOrder.Response>(): [
Trigger<CreateOrder.Params, QueryState<D>['data']>,
QueryState<D>,
] => {
const [isLoading, setIsLoading] = useState<QueryState<D>['isLoading']>(false);
const [isSuccess, setIsSuccess] = useState<QueryState<D>['isSuccess']>();
const [data, setData] = useState<QueryState<D>['data']>();
const [isError, setIsError] = useState<QueryState<D>['isError']>();
const [error, setError] = useState<QueryState<D>['error']>();
const createOrder = async ({ body }: CreateOrder.Params) => {
setIsLoading(true);
try {
const response = await fetch(
`${endpoint}${LandingEndpoints.ORDER_CREATE}`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(body),
},
);
if (!response.ok) {
const errorResponseObject =
(await response.json()) as QueryState<D>['error'];
setIsError(true);
setError(errorResponseObject);
throw errorResponseObject;
}
const dataResponseObject =
(await response.json()) as QueryState<D>['data'];
setIsSuccess(true);
setData(dataResponseObject);
return dataResponseObject;
} catch (error) {
setIsError(true);
setError(error);
throw error;
} finally {
setIsLoading(false);
}
};
return [createOrder, { isLoading, isSuccess, data, isError, error }];
};
export { useCreateOrderMutation };

View File

@@ -1,22 +0,0 @@
export type QueryData<D> = {
success: true;
body: D;
};
export type QueryErrorData = {
success: false;
error: string;
};
export type QueryState<D> = {
isLoading: boolean;
isSuccess: boolean;
data: QueryData<D>;
isError: boolean;
error: {
status: number;
data: QueryErrorData;
};
};
export type Trigger<P, D> = (params: P) => Promise<D>;

View File

@@ -0,0 +1 @@
export { default as OrderCreationAnimation } from './order-creation.json';

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,7 @@
import React from 'react';
import { Box, Button, Text } from '@chakra-ui/react';
import { ArrowBackIcon, ArrowForwardIcon } from '@chakra-ui/icons';
import dayjs from 'dayjs';
interface DateNavigatorProps {
currentDate: Date;
@@ -19,7 +20,7 @@ const DateNavigator = ({
<ArrowBackIcon />
</Button>
<Text mx='4' fontSize='lg' fontWeight='bold'>
{currentDate.toLocaleDateString()}
{dayjs(currentDate).format('DD.MM.YYYY')}
</Text>
<Button onClick={onNextDate}>
<ArrowForwardIcon />

View File

@@ -28,27 +28,28 @@ class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
console.error('Error caught by ErrorBoundary:', error, errorInfo);
console.error('4545');
this.setState({ error, errorInfo });
}
render() {
const { hasError } = this.state;
//TODO: добавить анимацию после залива 404 страницы
//TODO: может сделать обертку для хука, чтоб язык менялся без перезагрузки
if (hasError) {
return (
<Center minH='100vh'>
<Center minH='100vh' data-testid='error-boundary'>
<VStack spacing={4} textAlign='center'>
<Heading as='h1' size='2xl'>
<Heading as='h1' size='2xl' data-testid='error-title'>
{i18next.t('~:dry-wash.errorBoundary.title')}
</Heading>
<Text fontSize='lg'>
<Text fontSize='lg' data-testid='error-description'>
{i18next.t('~:dry-wash.errorBoundary.description')}
</Text>
<Button
colorScheme='teal'
size='lg'
variant='outline'
data-testid='error-reload-button'
onClick={() => window.location.reload()}
>
{i18next.t('~:dry-wash.errorBoundary.button.reload')}

View File

@@ -0,0 +1,45 @@
import * as React from 'react';
import { describe, expect, it, jest } from '@jest/globals';
import { render, screen, waitFor } from '@testing-library/react';
import { BrowserRouter } from 'react-router-dom';
import { Provider } from 'react-redux';
import { useEffect } from 'react';
import ErrorBoundary from '../ErrorBoundary';
import { store } from '../../../__data__/store';
const ProblematicComponent = () => {
useEffect(() => {
throw new Error('Test Error');
}, []);
return <div>Этот текст не должен появиться</div>;
};
jest.mock('@brojs/cli', () => {
return {
getNavigationValue: () => '/auth/login',
getConfigValue: () => '/api',
};
});
describe('ErrorBoundary', () => {
it('должен отобразить запасной UI при ошибке', async () => {
const { container } = render(
<Provider store={store}>
<ErrorBoundary>
<BrowserRouter>
<ProblematicComponent />
</BrowserRouter>
</ErrorBoundary>
</Provider>,
);
const button = await waitFor(() =>
screen.getByTestId('error-reload-button'),
);
expect(button).not.toBeNull();
expect(container).toMatchSnapshot();
});
});

View File

@@ -0,0 +1,28 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`ErrorBoundary должен отобразить запасной UI при ошибке 1`] = `
<div>
<div
class="css-1o0ed15"
data-testid="error-boundary"
>
<div
class="chakra-stack css-zefqyp"
>
<h1
class="chakra-heading css-0"
data-testid="error-title"
/>
<p
class="chakra-text css-1ezsviu"
data-testid="error-description"
/>
<button
class="chakra-button css-4xx2wk"
data-testid="error-reload-button"
type="button"
/>
</div>
</div>
</div>
`;

View File

@@ -15,13 +15,13 @@ import { useTranslation } from 'react-i18next';
import dayjs from 'dayjs';
import OrderItem from '../OrderItem';
import { OrderProps } from '../OrderItem/OrderItem';
import DateNavigator from '../DateNavigator';
import {
useGetMastersQuery,
useGetOrdersQuery,
} from '../../__data__/service/api';
import useShowToast from '../../hooks/useShowToast';
import { OrderArm } from '../../models/api';
const TABLE_HEADERS = [
'carNumber' as const,
@@ -70,7 +70,6 @@ const Orders = () => {
<Heading size='lg' mb='5'>
{t('title')}
</Heading>
<DateNavigator
currentDate={currentDate}
onPreviousDate={() =>
@@ -112,7 +111,7 @@ const Orders = () => {
allMasters={masters}
key={index}
{...order}
status={order.status as OrderProps['status']}
status={order.status as OrderArm['status']}
/>
))}
</Tbody>

View File

@@ -5,6 +5,7 @@ export const PageSpinner: FC = () => {
return (
<Flex w='full' h='100vh' justifyContent='center' alignItems='center'>
<Spinner
data-testid='spinner'
thickness='5px'
speed='0.65s'
emptyColor='gray.200'

View File

@@ -47,6 +47,7 @@ const Sidebar = () => {
w='100%'
colorScheme={isActive(URLs.armMaster.url) ? 'green' : 'blue'}
variant={isActive(URLs.armMaster.url) ? 'solid' : 'ghost'}
data-testid='master-button'
>
{t('master')}
</Button>

View File

@@ -5,6 +5,8 @@ type SuccessResponse<Body> = {
export type ErrorMessage = string;
export const isErrorMessage = (error: unknown): error is ErrorMessage => typeof error === 'string';
type ErrorResponse = {
success: false;
message: ErrorMessage;

View File

@@ -1,325 +0,0 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Arm Page render 1`] = `
<div>
<div
class="css-1yeiifd"
>
<div
class="css-1fp6kaj"
>
<h2
class="chakra-heading css-9q1d0h"
>
title
</h2>
<div
class="chakra-stack css-1oen434"
>
<hr
aria-orientation="horizontal"
class="chakra-divider css-1upb9tn"
/>
<a
class="chakra-button css-uxt1e8"
href="/auth/login"
>
orders
</a>
<hr
aria-orientation="horizontal"
class="chakra-divider css-1upb9tn"
/>
<a
class="chakra-button css-uxt1e8"
href="/auth/login"
>
master
</a>
<hr
aria-orientation="horizontal"
class="chakra-divider css-1upb9tn"
/>
</div>
</div>
<div
class="css-sy55x5"
>
<div
class="css-hpgf8j"
>
<h2
class="chakra-heading css-r7q7qr"
>
title
</h2>
<div
class="css-1me9tx"
>
<button
class="chakra-button css-4xx2wk"
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-1bntq7d"
>
2/2/2025
</p>
<button
class="chakra-button css-4xx2wk"
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-0"
>
<thead
class="css-0"
>
<tr
class="css-0"
>
<th
class="css-0"
>
table.header.carNumber
</th>
<th
class="css-0"
>
table.header.orderDate
</th>
<th
class="css-0"
>
table.header.status
</th>
<th
class="css-0"
>
table.header.masters
</th>
<th
class="css-0"
>
table.header.telephone
</th>
<th
class="css-0"
>
table.header.location
</th>
</tr>
</thead>
<tbody
class="css-0"
>
<tr
class="css-0"
>
<td
class="css-12rlgei"
colspan="6"
>
<div
class="chakra-spinner css-1y7joxr"
>
<span
class="css-8b45rq"
>
Loading...
</span>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
`;
exports[`Arm Page render 2`] = `
<div>
<div
class="css-1yeiifd"
>
<div
class="css-1fp6kaj"
>
<h2
class="chakra-heading css-9q1d0h"
>
title
</h2>
<div
class="chakra-stack css-1oen434"
>
<hr
aria-orientation="horizontal"
class="chakra-divider css-1upb9tn"
/>
<a
class="chakra-button css-uxt1e8"
href="/auth/login"
>
orders
</a>
<hr
aria-orientation="horizontal"
class="chakra-divider css-1upb9tn"
/>
<a
class="chakra-button css-uxt1e8"
href="/auth/login"
>
master
</a>
<hr
aria-orientation="horizontal"
class="chakra-divider css-1upb9tn"
/>
</div>
</div>
<div
class="css-sy55x5"
>
<div
class="css-hpgf8j"
>
<h2
class="chakra-heading css-r7q7qr"
>
title
</h2>
<div
class="css-1me9tx"
>
<button
class="chakra-button css-4xx2wk"
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-1bntq7d"
>
2/2/2025
</p>
<button
class="chakra-button css-4xx2wk"
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-0"
>
<thead
class="css-0"
>
<tr
class="css-0"
>
<th
class="css-0"
>
table.header.carNumber
</th>
<th
class="css-0"
>
table.header.orderDate
</th>
<th
class="css-0"
>
table.header.status
</th>
<th
class="css-0"
>
table.header.masters
</th>
<th
class="css-0"
>
table.header.telephone
</th>
<th
class="css-0"
>
table.header.location
</th>
</tr>
</thead>
<tbody
class="css-0"
>
<tr
class="css-0"
>
<td
class="css-12rlgei"
colspan="6"
>
<div
class="chakra-spinner css-1y7joxr"
>
<span
class="css-8b45rq"
>
Loading...
</span>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
`;

View File

@@ -0,0 +1,643 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Master Page render 1`] = `
<div>
<div
class="css-1yeiifd"
>
<div
class="css-13owfwq"
>
<h2
class="chakra-heading css-173d1bl"
>
Сухой мастер
</h2>
<div
class="chakra-stack css-1cggwyz"
>
<hr
aria-orientation="horizontal"
class="chakra-divider css-svjswr"
/>
<a
class="chakra-button css-18yoix2"
href="/order"
>
Заказы
</a>
<hr
aria-orientation="horizontal"
class="chakra-divider css-svjswr"
/>
<a
class="chakra-button css-1kg18wp"
data-testid="master-button"
href="/master"
>
Мастера
</a>
<hr
aria-orientation="horizontal"
class="chakra-divider css-svjswr"
/>
</div>
</div>
<div
class="css-jiwy8d"
>
<div
class="css-1glkkdp"
>
<div
class="css-sd3fvu"
>
<h2
class="chakra-heading css-1jb3vzl"
>
Мастера
</h2>
<button
class="chakra-button css-h211ee"
type="button"
>
+
Добавить
</button>
</div>
<table
class="chakra-table css-5605sr"
>
<thead
class="css-0"
>
<tr
class="css-0"
>
<th
class="css-1szkfps"
>
Имя
</th>
<th
class="css-1szkfps"
>
Актуальная занятость
</th>
<th
class="css-1szkfps"
>
Телефон
</th>
<th
class="css-1szkfps"
>
Действия
</th>
</tr>
</thead>
<tbody
class="css-0"
>
<tr
class="css-0"
>
<td
class="css-zgoslk"
>
<div
class="chakra-editable css-vtl58r"
>
<div
class="chakra-stack css-c2wmld"
>
<span
class="chakra-editable__preview css-1gasyng"
>
Иван Иванов
</span>
<input
class="chakra-editable__input chakra-input css-2lpiar"
hidden=""
value="Иван Иванов"
/>
<div
class="css-1l4w6pd"
>
<button
aria-label="Edit"
class="chakra-button css-1pqvhxt"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<g
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-width="2"
>
<path
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
/>
<path
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
/>
</g>
</svg>
</button>
</div>
</div>
</div>
</td>
<td
class="css-zgoslk"
>
<p
class="chakra-text css-q9k0mw"
>
Свободен
</p>
</td>
<td
class="css-zgoslk"
>
<div
class="chakra-editable css-vtl58r"
>
<div
class="chakra-stack css-c2wmld"
>
<span
class="chakra-editable__preview css-1gasyng"
>
+7 900 123 45 67
</span>
<input
class="chakra-editable__input chakra-input css-2lpiar"
hidden=""
value="+7 900 123 45 67"
/>
<div
class="css-1l4w6pd"
>
<button
aria-label="Edit"
class="chakra-button css-1pqvhxt"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<g
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-width="2"
>
<path
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
/>
<path
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
/>
</g>
</svg>
</button>
</div>
</div>
</div>
</td>
<td
class="css-zgoslk"
>
<button
aria-controls="menu-list-:r2:"
aria-expanded="false"
aria-haspopup="menu"
class="chakra-button chakra-menu__menu-button css-13sr8jm"
id="menu-button-:r2:"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<g
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-width="2"
>
<path
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
/>
<path
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
/>
</g>
</svg>
</button>
<div
class="css-ktd6ms"
style="visibility: hidden; position: absolute; min-width: max-content; inset: 0 auto auto 0;"
>
<div
aria-orientation="vertical"
class="chakra-menu__menu-list css-s5t7bz"
id="menu-list-:r2:"
role="menu"
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.8) translateZ(0);"
tabindex="-1"
>
<button
aria-disabled="false"
class="chakra-menu__menuitem css-y7jzs3"
data-index="0"
id="menu-list-:r2:-menuitem-:r3:"
role="menuitem"
tabindex="-1"
type="button"
>
Удалить мастера
</button>
</div>
</div>
</td>
</tr>
<tr
class="css-0"
>
<td
class="css-zgoslk"
>
<div
class="chakra-editable css-vtl58r"
>
<div
class="chakra-stack css-c2wmld"
>
<span
class="chakra-editable__preview css-1gasyng"
>
Олег Макаров
</span>
<input
class="chakra-editable__input chakra-input css-2lpiar"
hidden=""
value="Олег Макаров"
/>
<div
class="css-1l4w6pd"
>
<button
aria-label="Edit"
class="chakra-button css-1pqvhxt"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<g
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-width="2"
>
<path
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
/>
<path
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
/>
</g>
</svg>
</button>
</div>
</div>
</div>
</td>
<td
class="css-zgoslk"
>
<p
class="chakra-text css-q9k0mw"
>
Свободен
</p>
</td>
<td
class="css-zgoslk"
>
<div
class="chakra-editable css-vtl58r"
>
<div
class="chakra-stack css-c2wmld"
>
<span
class="chakra-editable__preview css-1gasyng"
>
79001234567
</span>
<input
class="chakra-editable__input chakra-input css-2lpiar"
hidden=""
value="79001234567"
/>
<div
class="css-1l4w6pd"
>
<button
aria-label="Edit"
class="chakra-button css-1pqvhxt"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<g
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-width="2"
>
<path
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
/>
<path
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
/>
</g>
</svg>
</button>
</div>
</div>
</div>
</td>
<td
class="css-zgoslk"
>
<button
aria-controls="menu-list-:r5:"
aria-expanded="false"
aria-haspopup="menu"
class="chakra-button chakra-menu__menu-button css-13sr8jm"
id="menu-button-:r5:"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<g
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-width="2"
>
<path
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
/>
<path
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
/>
</g>
</svg>
</button>
<div
class="css-ktd6ms"
style="visibility: hidden; position: absolute; min-width: max-content; inset: 0 auto auto 0;"
>
<div
aria-orientation="vertical"
class="chakra-menu__menu-list css-s5t7bz"
id="menu-list-:r5:"
role="menu"
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.8) translateZ(0);"
tabindex="-1"
>
<button
aria-disabled="false"
class="chakra-menu__menuitem css-y7jzs3"
data-index="0"
id="menu-list-:r5:-menuitem-:r6:"
role="menuitem"
tabindex="-1"
type="button"
>
Удалить мастера
</button>
</div>
</div>
</td>
</tr>
<tr
class="css-0"
>
<td
class="css-zgoslk"
>
<div
class="chakra-editable css-vtl58r"
>
<div
class="chakra-stack css-c2wmld"
>
<span
class="chakra-editable__preview css-1gasyng"
>
Иван Галкин
</span>
<input
class="chakra-editable__input chakra-input css-2lpiar"
hidden=""
value="Иван Галкин"
/>
<div
class="css-1l4w6pd"
>
<button
aria-label="Edit"
class="chakra-button css-1pqvhxt"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<g
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-width="2"
>
<path
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
/>
<path
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
/>
</g>
</svg>
</button>
</div>
</div>
</div>
</td>
<td
class="css-zgoslk"
>
<div
class="chakra-stack css-1f0wxn3"
>
<span
class="chakra-badge css-1g1qw76"
/>
<span
class="chakra-badge css-1g1qw76"
/>
</div>
</td>
<td
class="css-zgoslk"
>
<div
class="chakra-editable css-vtl58r"
>
<div
class="chakra-stack css-c2wmld"
>
<span
class="chakra-editable__preview css-1gasyng"
>
+7 900 123 45 67
</span>
<input
class="chakra-editable__input chakra-input css-2lpiar"
hidden=""
value="+7 900 123 45 67"
/>
<div
class="css-1l4w6pd"
>
<button
aria-label="Edit"
class="chakra-button css-1pqvhxt"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<g
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-width="2"
>
<path
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
/>
<path
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
/>
</g>
</svg>
</button>
</div>
</div>
</div>
</td>
<td
class="css-zgoslk"
>
<button
aria-controls="menu-list-:r8:"
aria-expanded="false"
aria-haspopup="menu"
class="chakra-button chakra-menu__menu-button css-13sr8jm"
id="menu-button-:r8:"
type="button"
>
<svg
aria-hidden="true"
class="chakra-icon css-onkibi"
focusable="false"
viewBox="0 0 24 24"
>
<g
fill="none"
stroke="currentColor"
stroke-linecap="round"
stroke-width="2"
>
<path
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
/>
<path
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
/>
</g>
</svg>
</button>
<div
class="css-ktd6ms"
style="visibility: hidden; position: absolute; min-width: max-content; inset: 0 auto auto 0;"
>
<div
aria-orientation="vertical"
class="chakra-menu__menu-list css-s5t7bz"
id="menu-list-:r8:"
role="menu"
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.8) translateZ(0);"
tabindex="-1"
>
<button
aria-disabled="false"
class="chakra-menu__menuitem css-y7jzs3"
data-index="0"
id="menu-list-:r8:-menuitem-:r9:"
role="menuitem"
tabindex="-1"
type="button"
>
Удалить мастера
</button>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<span
hidden=""
id="__chakra_env"
/>
</div>
`;

View File

@@ -0,0 +1,428 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`order page получение списка заказов 1`] = `
<div>
<div
class="css-1yeiifd"
>
<div
class="css-13owfwq"
>
<h2
class="chakra-heading css-173d1bl"
>
Сухой мастер
</h2>
<div
class="chakra-stack css-1cggwyz"
>
<hr
aria-orientation="horizontal"
class="chakra-divider css-svjswr"
/>
<a
class="chakra-button css-1kg18wp"
href="/auth/login"
>
Заказы
</a>
<hr
aria-orientation="horizontal"
class="chakra-divider css-svjswr"
/>
<a
class="chakra-button css-1kg18wp"
data-testid="master-button"
href="/auth/login"
>
Мастера
</a>
<hr
aria-orientation="horizontal"
class="chakra-divider css-svjswr"
/>
</div>
</div>
<div
class="css-jiwy8d"
>
<div
class="css-1glkkdp"
>
<h2
class="chakra-heading css-1xer3cv"
>
Заказы
</h2>
<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"
>
2/16/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"
>
<thead
class="css-0"
>
<tr
class="css-0"
>
<th
class="css-1szkfps"
>
Номер машины
</th>
<th
class="css-1szkfps"
>
Дата заказа
</th>
<th
class="css-1szkfps"
>
Статус
</th>
<th
class="css-1szkfps"
>
Мастер
</th>
<th
class="css-1szkfps"
>
Телефон
</th>
<th
class="css-1szkfps"
>
Расположение
</th>
</tr>
</thead>
<tbody
class="css-0"
>
<tr
class="css-0"
>
<td
class="css-zgoslk"
>
A123BC
</td>
<td
class="css-zgoslk"
>
24.11.2024
<br />
</td>
<td
class="css-zgoslk"
>
<div
class="chakra-select__wrapper css-42b2qy"
>
<select
class="chakra-select css-11j19cx"
>
<option
value=""
>
Выберите статус
</option>
<option
value="pending"
>
В ожидании
</option>
<option
value="progress"
>
Выполняется
</option>
<option
value="working"
>
В работе
</option>
<option
value="canceled"
>
Отменено
</option>
<option
value="complete"
>
Завершено
</option>
</select>
<div
class="chakra-select__icon-wrapper css-iohxn1"
>
<svg
aria-hidden="true"
class="chakra-select__icon"
focusable="false"
role="presentation"
style="width: 1em; height: 1em; color: currentColor;"
viewBox="0 0 24 24"
>
<path
d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
fill="currentColor"
/>
</svg>
</div>
</div>
</td>
<td
class="css-zgoslk"
>
<div
class="chakra-select__wrapper css-42b2qy"
>
<select
class="chakra-select css-161pkch"
>
<option
value=""
>
Выберите мастера
</option>
<option
value="Иван Иванов"
>
Иван Иванов
</option>
<option
value="Олег Макаров"
>
Олег Макаров
</option>
<option
value="Иван Галкин"
>
Иван Галкин
</option>
</select>
<div
class="chakra-select__icon-wrapper css-iohxn1"
>
<svg
aria-hidden="true"
class="chakra-select__icon"
focusable="false"
role="presentation"
style="width: 1em; height: 1em; color: currentColor;"
viewBox="0 0 24 24"
>
<path
d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
fill="currentColor"
/>
</svg>
</div>
</div>
</td>
<td
class="css-zgoslk"
>
<a
class="chakra-link css-spn4bz"
href="tel:"
>
79001234563
</a>
</td>
<td
class="css-zgoslk"
>
Казань, ул. Баумана, 1
</td>
</tr>
<tr
class="css-0"
>
<td
class="css-zgoslk"
>
A245BC
</td>
<td
class="css-zgoslk"
>
24.11.2024
<br />
</td>
<td
class="css-zgoslk"
>
<div
class="chakra-select__wrapper css-42b2qy"
>
<select
class="chakra-select css-lvra4l"
>
<option
value=""
>
Выберите статус
</option>
<option
value="pending"
>
В ожидании
</option>
<option
value="progress"
>
Выполняется
</option>
<option
value="working"
>
В работе
</option>
<option
value="canceled"
>
Отменено
</option>
<option
value="complete"
>
Завершено
</option>
</select>
<div
class="chakra-select__icon-wrapper css-iohxn1"
>
<svg
aria-hidden="true"
class="chakra-select__icon"
focusable="false"
role="presentation"
style="width: 1em; height: 1em; color: currentColor;"
viewBox="0 0 24 24"
>
<path
d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
fill="currentColor"
/>
</svg>
</div>
</div>
</td>
<td
class="css-zgoslk"
>
<div
class="chakra-select__wrapper css-42b2qy"
>
<select
class="chakra-select css-161pkch"
>
<option
value=""
>
Выберите мастера
</option>
<option
value="Иван Иванов"
>
Иван Иванов
</option>
<option
value="Олег Макаров"
>
Олег Макаров
</option>
<option
value="Иван Галкин"
>
Иван Галкин
</option>
</select>
<div
class="chakra-select__icon-wrapper css-iohxn1"
>
<svg
aria-hidden="true"
class="chakra-select__icon"
focusable="false"
role="presentation"
style="width: 1em; height: 1em; color: currentColor;"
viewBox="0 0 24 24"
>
<path
d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
fill="currentColor"
/>
</svg>
</div>
</div>
</td>
<td
class="css-zgoslk"
>
<a
class="chakra-link css-spn4bz"
href="tel:"
>
79001234567
</a>
</td>
<td
class="css-zgoslk"
>
Казань, ул. Баумана, 43
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<span
hidden=""
id="__chakra_env"
/>
</div>
`;

View File

@@ -0,0 +1,98 @@
import * as React from 'react';
import {
describe,
it,
expect,
jest,
beforeAll,
afterEach,
afterAll,
} from '@jest/globals';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { http, HttpResponse } from 'msw';
import { setupServer } from 'msw/node';
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
import ErrorBoundary from '../../components/ErrorBoundary';
import { store } from '../../__data__/store';
import Page from '../arm';
const server = setupServer(
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', () => {
return {
getNavigationValue: (key: string) =>
// eslint-disable-next-line @typescript-eslint/no-require-imports
require('../../../bro.config').navigations[key],
getConfigValue: () => '/api',
};
});
describe('Master Page', () => {
beforeAll(() => server.listen());
afterEach(() => server.resetHandlers());
afterAll(() => server.close());
it('render ', async () => {
server.events.on('request:start', ({ request }) => {
console.log('Outgoing:', request.method, request.url);
});
const { container } = render(
<Provider store={store}>
<ChakraProvider theme={chakraTheme}>
<ErrorBoundary>
<BrowserRouter>
<Page mockUser={{ name: 'ilnaz' }} />
</BrowserRouter>
</ErrorBoundary>
</ChakraProvider>
</Provider>,
);
const button = await waitFor(() => screen.getByTestId('master-button'));
fireEvent.click(button);
await waitFor(() => screen.getByText('Иван Иванов'));
expect(container).toMatchSnapshot();
});
});

View File

@@ -0,0 +1,67 @@
import * as React from 'react';
import {
describe,
it,
jest,
beforeAll,
afterEach,
afterAll,
} from '@jest/globals';
import { render, screen, waitFor } from '@testing-library/react';
import { http, HttpResponse } from 'msw';
import { setupServer } from 'msw/node';
import { BrowserRouter } from 'react-router-dom';
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
import { Provider } from 'react-redux';
import ErrorBoundary from '../../components/ErrorBoundary';
import { store } from '../../__data__/store';
import Page from '../arm';
const server = setupServer(
http.post('/api/arm/orders', () => {
return HttpResponse.json({
success: true,
body: [],
});
}),
http.get('/api/arm/masters', () => {
return HttpResponse.json({
success: true,
body: [],
});
}),
);
jest.mock('@brojs/cli', () => {
return {
getNavigationValue: () => '/auth/login',
getConfigValue: () => '/api',
};
});
describe('order page', () => {
beforeAll(() => server.listen());
afterEach(() => server.resetHandlers());
afterAll(() => server.close());
it('получение пустого списка', async () => {
server.events.on('request:start', ({ request }) => {
console.log('Outgoing:', request.method, request.url);
});
render(
<Provider store={store}>
<ChakraProvider theme={chakraTheme}>
<ErrorBoundary>
<BrowserRouter>
<Page mockUser={{ name: 'ilnaz' }} />
</BrowserRouter>
</ErrorBoundary>
</ChakraProvider>
</Provider>,
);
await waitFor(() => screen.getByText('Список пуст'));
});
});

View File

@@ -0,0 +1,64 @@
import * as React from 'react';
import {
describe,
it,
jest,
beforeAll,
afterEach,
afterAll,
expect,
} from '@jest/globals';
import { render, screen, waitFor } from '@testing-library/react';
import { http, HttpResponse } from 'msw';
import { setupServer } from 'msw/node';
import { BrowserRouter } from 'react-router-dom';
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
import { Provider } from 'react-redux';
import ErrorBoundary from '../../components/ErrorBoundary';
import { store } from '../../__data__/store';
import Page from '../arm';
import { PageSpinner } from '../../components';
const server = setupServer(
http.get('/api/arm/orders', () => {
return HttpResponse.json({}, { status: 500 });
}),
);
jest.mock('@brojs/cli', () => {
return {
getNavigationValue: () => '/auth/login',
getConfigValue: () => '/api',
};
});
describe('order page', () => {
beforeAll(() => server.listen());
afterEach(() => server.resetHandlers());
afterAll(() => server.close());
it('обработка ошибки при загрузке данных', async () => {
render(
<Provider store={store}>
<ChakraProvider theme={chakraTheme}>
<ErrorBoundary>
<BrowserRouter>
<Page mockUser={{ name: 'ilnaz' }} />
</BrowserRouter>
</ErrorBoundary>
</ChakraProvider>
</Provider>,
);
await waitFor(() => screen.getByText('Ошибка при загрузке данных'));
});
});
describe('Routers', () => {
it('отображает PageSpinner ', async () => {
render(<PageSpinner />);
expect(await screen.findByTestId('spinner')).toBeTruthy();
});
});

View File

@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';
import {
describe,
it,
@@ -12,7 +12,11 @@ import { render, screen, waitFor } from '@testing-library/react';
import { http, HttpResponse } from 'msw';
import { setupServer } from 'msw/node';
import { BrowserRouter } from 'react-router-dom';
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
import { Provider } from 'react-redux';
import ErrorBoundary from '../../components/ErrorBoundary';
import { store } from '../../__data__/store';
import Page from '../arm';
const server = setupServer(
@@ -87,17 +91,6 @@ const server = setupServer(
}),
);
jest.mock('react-i18next', () => {
return {
useTranslation: () => {
return {
t: (key: never) => `${key}`,
i18n: {},
};
},
};
});
jest.mock('@brojs/cli', () => {
return {
getNavigationValue: () => '/auth/login',
@@ -105,24 +98,28 @@ jest.mock('@brojs/cli', () => {
};
});
describe('Arm Page', () => {
describe('order page', () => {
beforeAll(() => server.listen());
afterEach(() => server.resetHandlers());
afterAll(() => server.close());
it('render ', async () => {
it('получение списка заказов ', async () => {
server.events.on('request:start', ({ request }) => {
console.log('Outgoing:', request.method, request.url);
});
const { container } = render(
<BrowserRouter>
<Page mockUser={{ name: 'ilnaz' }} />
</BrowserRouter>,
<Provider store={store}>
<ChakraProvider theme={chakraTheme}>
<ErrorBoundary>
<BrowserRouter>
<Page mockUser={{ name: 'ilnaz' }} />
</BrowserRouter>
</ErrorBoundary>
</ChakraProvider>
</Provider>,
);
expect(container).toMatchSnapshot();
await waitFor(() => screen.getByText('A123BC'));
expect(container).toMatchSnapshot();

View File

@@ -1,7 +1,13 @@
import dayjs from "dayjs";
import { useToast } from "@chakra-ui/react";
import { useNavigate } from "react-router-dom";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { Order } from "../../models/landing";
import { OrderFormValues } from "../../components/order-form";
import { isErrorMessage } from "../../models/api";
import { URLs } from '../../__data__/urls';
const removeAllSpaces = (str: string) => str.replace(/\s+/g, '');
@@ -26,4 +32,40 @@ export const formatFormValues = ({ phone, carNumber, carBody, carColor, carLocat
end: dayjs(availableDatetimeEnd).toISOString(),
}
};
};
};
export const useHandleCreateOrderMutationResponse = (query: {
isSuccess: boolean;
data?: {
id: Parameters<typeof URLs.orderView.getUrl>[0];
};
isError: boolean;
error?: unknown;
}) => {
const toast = useToast();
const navigate = useNavigate();
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.order-create.create-order-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) {
const orderId = query.data.id;
navigate({ pathname: URLs.orderView.getUrl(orderId) });
toast({
status: 'success',
title: t('success.title'),
});
}
}, [query.isSuccess]);
};

View File

@@ -1,41 +1,29 @@
import React, { FC } from 'react';
import { useTranslation } from 'react-i18next';
import { Container, Heading, useToast, VStack } from '@chakra-ui/react';
import { useNavigate } from 'react-router-dom';
import { Container, Heading, VStack } from '@chakra-ui/react';
import { Player as LottiePlayer } from '@lottiefiles/react-lottie-player';
import { withLandingThemeProvider } from '../../containers';
import { OrderForm, OrderFormProps } from '../../components/order-form';
import { useCreateOrderMutation } from '../../api';
import { URLs } from '../../__data__/urls';
import { landingApi } from '../../__data__/service/landing.api';
import { OrderCreationAnimation } from '../../assets/animation';
import { formatFormValues } from './helper';
import {
formatFormValues,
useHandleCreateOrderMutationResponse,
} from './helper';
const Page: FC = () => {
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.order-create',
});
const [createOrder, createOrderMutation] = useCreateOrderMutation();
const toast = useToast();
const navigate = useNavigate();
const [createOrder, createOrderMutation] =
landingApi.useCreateOrderMutation();
useHandleCreateOrderMutationResponse(createOrderMutation);
const onOrderFormSubmit: OrderFormProps['onSubmit'] = (values) => {
createOrder({ body: formatFormValues(values) })
.then(({ body: { id: orderId } }) => {
navigate({ pathname: URLs.orderView.getUrl(orderId) });
toast({
status: 'success',
title: t('create-order-query.success.title'),
});
})
.catch(({ error: errorMessage }) => {
toast({
status: 'error',
title: t('create-order-query.error.title'),
description: errorMessage,
});
});
createOrder({ body: formatFormValues(values) });
};
return (
@@ -48,13 +36,24 @@ const Page: FC = () => {
centerContent
>
<VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
<Heading textAlign='center' mt={4}>
{t('title')}
</Heading>
<OrderForm
onSubmit={onOrderFormSubmit}
loading={createOrderMutation.isLoading}
/>
{createOrderMutation.isUninitialized ? (
<>
<Heading textAlign='center' mt={4}>
{t('title')}
</Heading>
<OrderForm
onSubmit={onOrderFormSubmit}
loading={createOrderMutation.isLoading}
/>
</>
) : (
<>
<LottiePlayer autoplay loop src={OrderCreationAnimation} />
<Heading textAlign='center' mt={4}>
{t('order-creation-title')}
</Heading>
</>
)}
</VStack>
</Container>
);

View File

@@ -19,7 +19,7 @@ import {
import { OrderDetails } from '../../components/order-view';
import { Order } from '../../models/landing';
import { landingApi } from '../../__data__/service/landing.api';
import { ErrorMessage } from '../../models/api';
import { isErrorMessage } from '../../models/api';
import { FEATURE } from '../../__data__/features';
const Page: FC = () => {
@@ -45,7 +45,7 @@ const Page: FC = () => {
}
: undefined,
);
const errorMessage = error as ErrorMessage;
const errorMessage = isErrorMessage(error) ? error : undefined;
return (
<LandingThemeProvider>
@@ -91,7 +91,9 @@ const Page: FC = () => {
<AlertTitle>
{t('get-order-query.error.title')}
</AlertTitle>
<AlertDescription>{errorMessage}</AlertDescription>
{errorMessage && (
<AlertDescription>{errorMessage}</AlertDescription>
)}
</Box>
</Alert>
)}

View File

@@ -2,7 +2,7 @@
/* eslint-disable @typescript-eslint/no-require-imports */
const router = require('express').Router();
const STUBS = { masters: 'success', orders: 'success', orderView: 'success-pending' };
const STUBS = { masters: 'success', orders: 'success', orderCreate: 'success', orderView: 'success-pending' };
router.get('/set/:name/:value', (req, res) => {
const { name, value } = req.params;
@@ -14,19 +14,24 @@ router.get('/set/:name/:value', (req, res) => {
router.get('/', (req, res) => {
res.send(`<div>
<fieldset>
<fieldset>
<legend>Мастера</legend>
${generateRadioInput('masters', 'success')}
${generateRadioInput('masters', 'error')}
${generateRadioInput('masters', 'empty')}
</fieldset>
<fieldset>
<fieldset>
<legend>Заказы</legend>
${generateRadioInput('orders', 'success')}
${generateRadioInput('orders', 'error')}
${generateRadioInput('orders', 'empty')}
</fieldset>
<fieldset>
<fieldset>
<legend>Лендинг - Сделать заказ</legend>
${generateRadioInput('orderCreate', 'success')}
${generateRadioInput('orderCreate', 'error')}
</fieldset>
<fieldset>
<legend>Лендинг - Детали заказа</legend>
${generateRadioInput('orderView', 'success-pending')}
${generateRadioInput('orderView', 'success-working')}

View File

@@ -87,7 +87,15 @@ router.get('/order/:orderId', ({ params }, res) => {
});
router.post('/order/create', (req, res) => {
res.status(200).send({ success: true, body: { ok: true } });
const stubName = STUBS.orderCreate;
res
.status(/error/.test(stubName) ? 500 : 200)
.send(
/^error$/.test(stubName)
? commonError
: require(`../json/landing-order-create/${stubName}.json`),
);
});
router.use('/admin', require('./admin'));

View File

@@ -0,0 +1,4 @@
{
"success": false,
"message": "Не удалось создать заказ"
}

View File

@@ -0,0 +1,6 @@
{
"success": true,
"body": {
"id": "id1"
}
}

View File

@@ -21,5 +21,5 @@
"**/*.test.ts",
"**/*.test.tsx",
"node_modules/@types/jest"
]
}
]
}