feat: detete ts jest

feat: add master test
feat: add test for orders
2025-02-16 11:36:13 +03:00 · 2025-02-16 11:31:26 +03:00 · 2025-02-16 11:31:05 +03:00 · 2025-02-09 12:40:31 +03:00 · 2025-02-09 11:31:52 +03:00 · 2025-02-09 11:31:36 +03:00
39 changed files with 17242 additions and 15998 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -130,4 +130,10 @@ dist
 .yarn/install-state.gz
 .pnp.*

-.idea
+.idea
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
--- a/mocks/lottiefiles-mock.tsx
+++ b/mocks/lottiefiles-mock.tsx
@@ -0,0 +1,6 @@
+import { jest } from '@jest/globals';
+import React from 'react';
+
+jest.mock('@lottiefiles/react-lottie-player', () => ({
+  Player: jest.fn(() => <></>),
+}));
--- a/mocks/react-i18next.ts
+++ b/mocks/react-i18next.ts
@@ -0,0 +1,9 @@
+import localeRu from '../locales/ru.json';
+
+module.exports = {
+  useTranslation: (_, { keyPrefix }) => {
+    return {
+      t: (key: string) => localeRu[`${keyPrefix}.${key}`],
+    };
+  }
+};
--- a/e2e/example.spec.ts
+++ b/e2e/example.spec.ts
@@ -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();
+});
--- a/jest-preset-it/jest-preset.ts
+++ b/jest-preset-it/jest-preset.ts
@@ -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'],
 };
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -25,10 +25,16 @@
  "dry-wash.arm.master.table.header.phone": "Телефон",
  "dry-wash.arm.master.table.header.actions": "Действия",
  "dry-wash.arm.master.table.actionsMenu.delete": "Удалить мастера",
+  "dry-wash.arm.master.table.actionsMenu.toast.success": "Мастер удалён",
+  "dry-wash.arm.master.table.actionsMenu.toast.error.title": "Ошибка!",
+  "dry-wash.arm.master.table.actionsMenu.toast.error.description": "Не удалось удалить мастера. Попробуйте ещё раз.",
  "dry-wash.arm.master.schedule.empty": "Свободен",
  "dry-wash.arm.master.editable.aria.cancel": "Отменить изменения",
  "dry-wash.arm.master.editable.aria.save": "Сохранить изменения",
  "dry-wash.arm.master.editable.aria.edit": "Редактировать",
+  "dry-wash.arm.master.editable.toast.success": "Успешно!",
+  "dry-wash.arm.master.editable.toast.error.description": "Не удалось обновить данные",
+  "dry-wash.arm.master.editable.toast.error.title": "Ошибка!",
  "dry-wash.arm.master.drawer.title": "Добавить нового мастера",
  "dry-wash.arm.master.drawer.inputName.label": "ФИО",
  "dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -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.7.2",
+  "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"
+  }
 }
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -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,
+  // },
+});
--- a/src/data/service/api.ts
+++ b/src/data/service/api.ts
@@ -1,20 +1,53 @@
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
 import { getConfigValue } from '@brojs/cli';
+import dayjs from 'dayjs';

-import { Master } from '../../models/api/master';
+import { Master, OrderArm } from '../../models/api';

 import { extractBodyFromResponse } from './utils';

+export type UpdateMasterPayload = Required<Pick<Master, 'id'>> &
+  Partial<Omit<Master, 'id'>>;
+
+type UpdateOrderProps = Required<Pick<OrderArm, 'id'>> &
+  Partial<Pick<OrderArm, 'status' | 'notes'>> & {
+    master?: string;
+  };
+
 export const api = createApi({
  reducerPath: 'api',
-  baseQuery: fetchBaseQuery({ baseUrl: getConfigValue('dry-wash.api') }),
-  tagTypes: ['Masters'],
+  baseQuery: fetchBaseQuery({
+    baseUrl: new URL(getConfigValue('dry-wash.api'), location.origin).href,
+  }),
+  tagTypes: ['Masters', 'Orders'],
  endpoints: (builder) => ({
    getMasters: builder.query<Master[], void>({
      query: () => ({ url: '/arm/masters' }),
      transformResponse: extractBodyFromResponse<Master[]>,
      providesTags: ['Masters'],
    }),
+    updateOrders: builder.mutation<void, UpdateOrderProps>({
+      query: ({ id, status, notes, master }) => ({
+        url: `/order/${id}`,
+        method: 'PATCH',
+        body: { status, notes, master },
+      }),
+      invalidatesTags: ['Orders'],
+    }),
+    getOrders: builder.query<OrderArm[], { date: Date }>({
+      query: ({ date }) => {
+        const startDate = dayjs(date).startOf('day').toISOString();
+        const endDate = dayjs(date).endOf('day').toISOString();
+        return {
+          url: '/arm/orders',
+          method: 'POST',
+          body: { startDate, endDate },
+        };
+      },
+      transformResponse: extractBodyFromResponse<OrderArm[]>,
+      providesTags: ['Orders'],
+    }),
+
    addMaster: builder.mutation<void, Pick<Master, 'name' | 'phone'>>({
      query: (master) => ({
        url: '/arm/masters',
@@ -23,5 +56,29 @@ export const api = createApi({
      }),
      invalidatesTags: ['Masters'],
    }),
+    deleteMaster: builder.mutation<void, { id: string }>({
+      query: ({ id }) => ({
+        url: `/arm/masters/${id}`,
+        method: 'DELETE',
+      }),
+      invalidatesTags: ['Masters'],
+    }),
+    updateMaster: builder.mutation<void, UpdateMasterPayload>({
+      query: ({ id, name, phone }) => ({
+        url: `/arm/masters/${id}`,
+        method: 'PATCH',
+        body: { name, phone },
+      }),
+      invalidatesTags: ['Masters'],
+    }),
  }),
 });
+
+export const {
+  useGetMastersQuery,
+  useAddMasterMutation,
+  useDeleteMasterMutation,
+  useUpdateMasterMutation,
+  useGetOrdersQuery,
+  useUpdateOrdersMutation,
+} = api;
--- a/src/data/service/landing.api.ts
+++ b/src/data/service/landing.api.ts
@@ -13,7 +13,7 @@ export const landingApi = api.injectEndpoints({
    createOrder: mutation<CreateOrder.Response, CreateOrder.Params>({
      query: ({ body }) => ({
        url: `/order/create`,
-        params: { body },
+        body,
        method: 'POST'
      }),
      transformResponse: extractBodyFromResponse<CreateOrder.Response>,
--- a/src/data/service/utils.ts
+++ b/src/data/service/utils.ts
@@ -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;
  }
-};
+};
--- a/src/api/arm.ts
+++ b/src/api/arm.ts
@@ -1,139 +0,0 @@
-import { getConfigValue } from '@brojs/cli';
-import dayjs from 'dayjs';
-
-enum ArmEndpoints {
-  ORDERS = '/arm/orders',
-  MASTERS = '/arm/masters',
-}
-
-const armService = () => {
-  const endpoint = getConfigValue('dry-wash.api');
-
-  const fetchOrders = async ({ date }: { date: Date }) => {
-    const startDate = dayjs(date).startOf('day').toISOString();
-    const endDate = dayjs(date).endOf('day').toISOString();
-
-    const response = await fetch(`${endpoint}${ArmEndpoints.ORDERS}`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ startDate, endDate }),
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch orders: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  const fetchMasters = async () => {
-    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`);
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch masters: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  const addMaster = async ({
-    name,
-    phone,
-  }: {
-    name: string;
-    phone: string;
-  }) => {
-    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ name, phone }),
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch masters: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  const deleteMaster = async ({ id }: { id: string }) => {
-    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
-      method: 'DELETE',
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch masters: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  const updateOrders = async ({
-    id,
-    status,
-    notes,
-    masterId,
-  }: {
-    id: string;
-    status?: string;
-    notes?: string;
-    masterId?: string;
-  }) => {
-    const body = JSON.stringify({ status, notes, masterId });
-
-    const response = await fetch(`${endpoint}/order/${id}`, {
-      method: 'PATCH',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body,
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch update masters: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  const updateMaster = async ({
-    id,
-    name,
-    phone,
-  }: {
-    id: string;
-    name?: string;
-    phone?: string;
-  }) => {
-    const body = JSON.stringify({ name, phone });
-
-    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
-      method: 'PATCH',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body,
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch update masters: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  return {
-    fetchOrders,
-    fetchMasters,
-    addMaster,
-    deleteMaster,
-    updateMaster,
-    updateOrders,
-  };
-};
-
-export { armService, ArmEndpoints };
--- a/src/components/Editable/Editable.tsx
+++ b/src/components/Editable/Editable.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
  Editable,
  EditableInput,
@@ -9,63 +9,51 @@ import {
  useEditableControls,
  ButtonGroup,
  Stack,
-  useToast,
 } from '@chakra-ui/react';
 import { CheckIcon, CloseIcon, EditIcon } from '@chakra-ui/icons';
 import { useTranslation } from 'react-i18next';

+import { useUpdateMasterMutation } from '../../__data__/service/api';
+import useShowToast from '../../hooks/useShowToast';
+
 interface EditableWrapperProps {
  value: string;
-  onSubmit: ({
-    id,
-    name,
-    phone,
-  }: {
-    id: string;
-    name?: string;
-    phone?: string;
-  }) => Promise<unknown>;
-  as: 'phone' | 'name';
+  fieldName: 'phone' | 'name';
  id: string;
 }

-const EditableWrapper = ({ value, onSubmit, as, id }: EditableWrapperProps) => {
+const EditableWrapper = ({ value, fieldName, id }: EditableWrapperProps) => {
+  const [updateMaster, { isError, isSuccess, error }] =
+    useUpdateMasterMutation();
+
  const { t } = useTranslation('~', {
    keyPrefix: 'dry-wash.arm.master.editable',
  });

-  const toast = useToast();
+  const showToast = useShowToast();
  const [currentValue, setCurrentValue] = useState<string>(value);

  const handleSubmit = async (newValue: string) => {
    if (currentValue === newValue) return;

-    try {
-      await onSubmit({ id, [as]: newValue });
+    await updateMaster({ id, [fieldName]: newValue });

-      setCurrentValue(newValue);
-
-      toast({
-        title: 'Успешно!',
-        description: 'Данные обновлены.',
-        status: 'success',
-        duration: 2000,
-        isClosable: true,
-        position: 'top-right',
-      });
-    } catch (error) {
-      toast({
-        title: 'Ошибка!',
-        description: 'Не удалось обновить данные.',
-        status: 'error',
-        duration: 2000,
-        isClosable: true,
-        position: 'top-right',
-      });
-      console.error('Ошибка при обновлении данных:', error);
-    }
+    setCurrentValue(newValue);
  };

+  useEffect(() => {
+    if (isSuccess) {
+      showToast(t('toast.success'), 'success');
+    }
+  }, [isSuccess]);
+
+  useEffect(() => {
+    if (isError) {
+      showToast(t('toast.error.title'), 'error', t('toast.error.description'));
+      console.error(t('toast.error.description'), error);
+    }
+  }, [isError, error]);
+
  function EditableControls() {
    const {
      isEditing,
--- a/src/components/ErrorBoundary/ErrorBoundary.tsx
+++ b/src/components/ErrorBoundary/ErrorBoundary.tsx
@@ -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')}
--- a/src/components/ErrorBoundary/tests/ErrorBoundary.test.tsx
+++ b/src/components/ErrorBoundary/tests/ErrorBoundary.test.tsx
@@ -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();
+  });
+});
--- a/src/components/ErrorBoundary/tests/snapshots/ErrorBoundary.test.tsx.snap
+++ b/src/components/ErrorBoundary/tests/snapshots/ErrorBoundary.test.tsx.snap
@@ -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>
+`;
--- a/src/components/MasterActionsMenu/MasterActionsMenu.tsx
+++ b/src/components/MasterActionsMenu/MasterActionsMenu.tsx
@@ -1,16 +1,16 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import {
  Menu,
  MenuButton,
  MenuList,
  MenuItem,
  IconButton,
-  useToast,
 } from '@chakra-ui/react';
 import { EditIcon } from '@chakra-ui/icons';
 import { useTranslation } from 'react-i18next';

-import { armService } from '../../api/arm';
+import { useDeleteMasterMutation } from '../../__data__/service/api';
+import useShowToast from '../../hooks/useShowToast';

 interface MasterActionsMenu {
  id: string;
@@ -21,38 +21,35 @@ const MasterActionsMenu = ({ id }: MasterActionsMenu) => {
    keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
  });

-  const { deleteMaster } = armService();
-  const toast = useToast();
+  const [deleteMaster, { isSuccess, isError, error, isLoading }] =
+    useDeleteMasterMutation();
+
+  const showToast = useShowToast();

  const handleClickDelete = async () => {
-    try {
-      await deleteMaster({ id });
-      toast({
-        title: 'Мастер удалён.',
-        description: `Мастер с ID "${id}" успешно удалён.`,
-        status: 'success',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
-      });
-    } catch (error) {
-      toast({
-        title: 'Ошибка удаления мастера.',
-        description: 'Не удалось удалить мастера. Попробуйте ещё раз.',
-        status: 'error',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
-      });
+    await deleteMaster({ id });
+  };
+
+  useEffect(() => {
+    if (isSuccess) {
+      showToast(t('toast.success'), 'success');
+    }
+  }, [isSuccess]);
+
+  useEffect(() => {
+    if (isError) {
+      showToast(t('toast.error.title'), 'error', t('toast.error.description'));
      console.error(error);
    }
-  };
+  }, [isError]);

  return (
    <Menu>
      <MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
      <MenuList>
-        <MenuItem onClick={handleClickDelete}>{t('delete')}</MenuItem>
+        <MenuItem onClick={handleClickDelete} isDisabled={isLoading}>
+          {t('delete')}
+        </MenuItem>
      </MenuList>
    </Menu>
  );
--- a/src/components/MasterDrawer/MasterDrawer.tsx
+++ b/src/components/MasterDrawer/MasterDrawer.tsx
@@ -12,7 +12,6 @@ import {
  DrawerFooter,
  DrawerHeader,
  DrawerOverlay,
-  useToast,
  InputGroup,
  InputLeftElement,
  FormErrorMessage,
@@ -20,9 +19,9 @@ import {
 import { useTranslation } from 'react-i18next';
 import { PhoneIcon } from '@chakra-ui/icons';

-import { api } from '../../__data__/service/api';
-import showToast from '../../helpers/showToast';
+import { useAddMasterMutation } from '../../__data__/service/api';
 import { DrawerInputs } from '../../models/arm/form';
+import useShowToast from '../../hooks/useShowToast';

 interface MasterDrawerProps {
  isOpen: boolean;
@@ -50,28 +49,19 @@ const MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {
    const isEmptyFields = trimMaster.name === '' || trimMaster.phone === '';

    if (isEmptyFields) {
-      showToast({
-        toast,
-        title: t('toast.error.base'),
-        description: t('toast.error.empty-fields'),
-        status: 'error',
-      });
+      showToast(t('toast.error.base'), 'error', t('toast.error.empty-fields'));
      return;
    }

    await addMaster(trimMaster);
  };

-  const [addMaster, { error, isSuccess }] = api.useAddMasterMutation();
-  const toast = useToast();
+  const [addMaster, { error, isSuccess }] = useAddMasterMutation();
+  const showToast = useShowToast();

  useEffect(() => {
    if (isSuccess) {
-      showToast({
-        toast,
-        title: t('toast.create-master'),
-        status: 'success',
-      });
+      showToast(t('toast.create-master'), 'success');
      reset();
      onClose();
    }
@@ -79,12 +69,11 @@ const MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {

  useEffect(() => {
    if (error) {
-      showToast({
-        toast,
-        title: t('toast.error.create-master'),
-        description: t('toast.error.create-master-details'),
-        status: 'error',
-      });
+      showToast(
+        t('toast.error.create-master'),
+        'error',
+        t('toast.error.create-master-details'),
+      );
      console.error(error);
    }
  }, [error]);
--- a/src/components/MasterItem/MasterItem.tsx
+++ b/src/components/MasterItem/MasterItem.tsx
@@ -5,10 +5,8 @@ import { useTranslation } from 'react-i18next';
 import MasterActionsMenu from '../MasterActionsMenu';
 import { getTimeSlot } from '../../lib';
 import EditableWrapper from '../Editable/Editable';
-import { armService } from '../../api/arm';

 const MasterItem = ({ name, phone, id, schedule }) => {
-  const { updateMaster } = armService();
  const { t } = useTranslation('~', {
    keyPrefix: 'dry-wash.arm.master',
  });
@@ -16,12 +14,7 @@ const MasterItem = ({ name, phone, id, schedule }) => {
  return (
    <Tr>
      <Td>
-        <EditableWrapper
-          id={id}
-          as={'name'}
-          value={name}
-          onSubmit={updateMaster}
-        />
+        <EditableWrapper id={id} fieldName={'name'} value={name} />
      </Td>
      <Td>
        {schedule?.length > 0 ? (
@@ -37,12 +30,7 @@ const MasterItem = ({ name, phone, id, schedule }) => {
        )}
      </Td>
      <Td>
-        <EditableWrapper
-          id={id}
-          as={'phone'}
-          value={phone}
-          onSubmit={updateMaster}
-        />
+        <EditableWrapper id={id} fieldName={'phone'} value={phone} />
      </Td>
      <Td>
        <MasterActionsMenu id={id} />
--- a/src/components/Masters/Masters.tsx
+++ b/src/components/Masters/Masters.tsx
@@ -10,7 +10,6 @@ import {
  Button,
  useDisclosure,
  Flex,
-  useToast,
  Td,
  Text,
  Spinner,
@@ -19,7 +18,8 @@ import { useTranslation } from 'react-i18next';

 import MasterItem from '../MasterItem';
 import MasterDrawer from '../MasterDrawer';
-import { api } from '../../__data__/service/api';
+import { useGetMastersQuery } from '../../__data__/service/api';
+import useShowToast from '../../hooks/useShowToast';

 const TABLE_HEADERS = [
  'name' as const,
@@ -30,26 +30,17 @@ const TABLE_HEADERS = [

 const Masters = () => {
  const { isOpen, onOpen, onClose } = useDisclosure();
-  const toast = useToast();
+  const showToast = useShowToast();
+
  const { t } = useTranslation('~', {
    keyPrefix: 'dry-wash.arm.master',
  });

-  const {
-    data: masters,
-    error,
-    isLoading,
-    isSuccess,
-  } = api.useGetMastersQuery();
+  const { data: masters, error, isLoading, isSuccess } = useGetMastersQuery();

  useEffect(() => {
    if (error) {
-      toast({
-        title: t('error.title'),
-        status: 'error',
-        isClosable: true,
-        position: 'bottom-right',
-      });
+      showToast(t('error.title'), 'error');
    }
  }, [error]);

--- a/src/components/OrderItem/OrderItem.tsx
+++ b/src/components/OrderItem/OrderItem.tsx
@@ -4,35 +4,8 @@ import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';

 import { getTimeSlot } from '../../lib';
-import { Master } from '../../models/api/master';
-import { armService } from '../../api/arm';
-
-const statuses = [
-  'pending' as const,
-  'progress' as const,
-  'working' as const,
-  'canceled' as const,
-  'complete' as const,
-];
-
-type GetArrItemType<ArrType> =
-  ArrType extends Array<infer ItemType> ? ItemType : never;
-
-export type OrderProps = {
-  carNumber?: string;
-  startWashTime?: string;
-  endWashTime?: string;
-  orderDate?: string;
-  status?: GetArrItemType<typeof statuses>;
-  phone?: string;
-  location?: string;
-  master: Master;
-  notes: '';
-  allMasters: Master[];
-  id: string;
-};
-
-type Status = (typeof statuses)[number];
+import { useUpdateOrdersMutation } from '../../__data__/service/api';
+import { OrderArm, Status, statuses } from '../../models/api';

 const statusColors: Record<Status, string> = {
  pending: 'yellow.100',
@@ -53,9 +26,8 @@ const OrderItem = ({
  master,
  allMasters,
  id,
-}: OrderProps) => {
-  const { updateOrders } = armService();
-
+}: OrderArm) => {
+  const [updateOrders] = useUpdateOrdersMutation();
  const { t } = useTranslation('~', {
    keyPrefix: 'dry-wash.arm.order',
  });
@@ -72,16 +44,16 @@ const OrderItem = ({

    if (selectedMaster) {
      setMaster(masterName);
-      updateOrders({ id, masterId: selectedMaster.id });
+      updateOrders({ id, master: selectedMaster.id });
    } else {
      console.error('Master not found');
    }
  };

  const handeChangeStatus = (e: ChangeEvent<HTMLSelectElement>) => {
-    const status = e.target.value;
+    const status = e.target.value as OrderArm['status'];
    updateOrders({ id, status });
-    setStatus(e.target.value as OrderProps['status']);
+    setStatus(status);
  };

  return (
--- a/src/components/Orders/Orders.tsx
+++ b/src/components/Orders/Orders.tsx
@@ -10,16 +10,18 @@ import {
  Spinner,
  Text,
  Td,
-  useToast,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';

 import OrderItem from '../OrderItem';
-import { OrderProps } from '../OrderItem/OrderItem';
-import { armService } from '../../api/arm';
 import DateNavigator from '../DateNavigator';
-import { Master } from '../../models/api/master';
+import {
+  useGetMastersQuery,
+  useGetOrdersQuery,
+} from '../../__data__/service/api';
+import useShowToast from '../../hooks/useShowToast';
+import { OrderArm } from '../../models/api';

 const TABLE_HEADERS = [
  'carNumber' as const,
@@ -34,54 +36,40 @@ const Orders = () => {
  const { t } = useTranslation('~', {
    keyPrefix: 'dry-wash.arm.order',
  });
+  const showToast = useShowToast();

-  const { fetchOrders } = armService();
-  const { fetchMasters } = armService();
-
-  const toast = useToast();
-
-  const [orders, setOrders] = useState<OrderProps[]>([]);
-  const [allMasters, setAllMasters] = useState<Master[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
  const [currentDate, setCurrentDate] = useState(new Date());
+  const {
+    data: orders,
+    isLoading: isOrdersLoading,
+    isSuccess: isOrdersSuccess,
+    isError: isOrdersError,
+    error: ordersError,
+  } = useGetOrdersQuery({ date: currentDate });
+
+  const {
+    data: masters,
+    isLoading: isMastersLoading,
+    isSuccess: isMastersSuccess,
+    isError: isMastersError,
+    error: mastersError,
+  } = useGetMastersQuery();
+
+  const isLoading = isOrdersLoading || isMastersLoading;
+  const isSuccess = isOrdersSuccess && isMastersSuccess;
+  const isError = isOrdersError || isMastersError;

  useEffect(() => {
-    const loadData = async () => {
-      setLoading(true);
-      setError(null);
-
-      try {
-        const [ordersData, mastersData] = await Promise.all([
-          fetchOrders({ date: currentDate }),
-          fetchMasters(),
-        ]);
-
-        setOrders(ordersData.body);
-        setAllMasters(mastersData.body);
-      } catch (err) {
-        setError(err.message);
-        toast({
-          title: t('error.title'),
-          status: 'error',
-          duration: 5000,
-          isClosable: true,
-          position: 'bottom-right',
-        });
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    loadData();
-  }, [currentDate, toast, t]);
+    if (isError) {
+      showToast(t('error.title'), 'error');
+    }
+  }, [isError, ordersError, mastersError, t]);

  return (
    <Box p='8'>
      <Heading size='lg' mb='5'>
        {t('title')}
      </Heading>
-
      <DateNavigator
        currentDate={currentDate}
        onPreviousDate={() =>
@@ -103,28 +91,27 @@ const Orders = () => {
          </Tr>
        </Thead>
        <Tbody>
-          {loading && (
+          {isLoading && (
            <Tr>
              <Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
                <Spinner size='lg' />
              </Td>
            </Tr>
          )}
-          {!loading && orders.length === 0 && !error && (
+          {isSuccess && orders.length === 0 && (
            <Tr>
              <Td colSpan={TABLE_HEADERS.length}>
                <Text>{t('table.empty')}</Text>
              </Td>
            </Tr>
          )}
-          {!loading &&
-            !error &&
+          {isSuccess &&
            orders.map((order, index) => (
              <OrderItem
-                allMasters={allMasters}
+                allMasters={masters}
                key={index}
                {...order}
-                status={order.status as OrderProps['status']}
+                status={order.status as OrderArm['status']}
              />
            ))}
        </Tbody>
--- a/src/components/PageSpinner/PageSpinner.tsx
+++ b/src/components/PageSpinner/PageSpinner.tsx
@@ -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'
--- a/src/components/Sidebar/Sidebar.tsx
+++ b/src/components/Sidebar/Sidebar.tsx
@@ -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>
--- a/src/helpers/showToast.ts
+++ b/src/helpers/showToast.ts
@@ -1,21 +0,0 @@
-import { UseToastOptions } from '@chakra-ui/react';
-
-interface ShowToast {
-  toast: (options: UseToastOptions) => void;
-  title: string;
-  description?: string;
-  status: 'info' | 'warning' | 'success' | 'error';
-}
-
-const showToast = ({ toast, title, description, status }: ShowToast) => {
-  toast({
-    title,
-    description,
-    status,
-    duration: 5000,
-    isClosable: true,
-    position: 'top-right',
-  });
-};
-
-export default showToast;
--- a/src/hooks/useShowToast.ts
+++ b/src/hooks/useShowToast.ts
@@ -0,0 +1,28 @@
+import { useToast } from '@chakra-ui/react';
+import { useCallback } from 'react';
+
+const useShowToast = () => {
+  const toast = useToast();
+
+  const showToast = useCallback(
+    (
+      title: string,
+      status: 'info' | 'warning' | 'success' | 'error',
+      description?: string,
+    ) => {
+      toast({
+        title,
+        description,
+        status,
+        duration: 5000,
+        isClosable: true,
+        position: 'top-right',
+      });
+    },
+    [toast],
+  );
+
+  return showToast;
+};
+
+export default useShowToast;
--- a/src/models/api/common.ts
+++ b/src/models/api/common.ts
@@ -12,4 +12,4 @@ type ErrorResponse = {
  message: ErrorMessage;
 };

-export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
+export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
--- a/src/models/api/index.ts
+++ b/src/models/api/index.ts
@@ -1,2 +1,3 @@
 export * from './common';
-export * from './order';
+export * from './order';
+export * from './master';
--- a/src/models/api/order.ts
+++ b/src/models/api/order.ts
@@ -1,21 +1,49 @@
 /* eslint-disable @typescript-eslint/no-namespace */
-import { Order } from "../landing";
+import { Order } from '../landing';

-import { ErrorMessage } from "./common";
+import { ErrorMessage } from './common';
+import { Master } from './master';

 export namespace GetOrder {
  export type Response = Order.View;
  export type Params = {
-    orderId: Order.Id
+    orderId: Order.Id;
  };
  export type Error = ErrorMessage;
 }

 export namespace CreateOrder {
  export type Response = {
-    id: Order.Id
+    id: Order.Id;
  };
  export type Params = {
-    body: Order.Create
+    body: Order.Create;
  };
-};
+}
+
+type GetArrItemType<ArrType> =
+  ArrType extends Array<infer ItemType> ? ItemType : never;
+
+export const statuses = [
+  'pending' as const,
+  'progress' as const,
+  'working' as const,
+  'canceled' as const,
+  'complete' as const,
+];
+
+export type Status = (typeof statuses)[number];
+
+export type OrderArm = {
+  carNumber?: string;
+  startWashTime?: string;
+  endWashTime?: string;
+  orderDate?: string;
+  status?: GetArrItemType<typeof statuses>;
+  phone?: string;
+  location?: string;
+  master: Master;
+  notes: '';
+  allMasters: Master[];
+  id: string;
+};
--- a/src/pages/tests/snapshots/arm.test.tsx.snap
+++ b/src/pages/tests/snapshots/arm.test.tsx.snap
@@ -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>
-`;
--- a/src/pages/tests/snapshots/masters.test.tsx.snap
+++ b/src/pages/tests/snapshots/masters.test.tsx.snap
@@ -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>
+`;
--- a/src/pages/tests/snapshots/ordersList.test.tsx.snap
+++ b/src/pages/tests/snapshots/ordersList.test.tsx.snap
@@ -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>
+`;
--- a/src/pages/tests/masters.test.tsx
+++ b/src/pages/tests/masters.test.tsx
@@ -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();
+  });
+});
--- a/src/pages/tests/ordersEmpty.test.tsx
+++ b/src/pages/tests/ordersEmpty.test.tsx
@@ -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('Список пуст'));
+  });
+});
--- a/src/pages/tests/ordersError.test.tsx
+++ b/src/pages/tests/ordersError.test.tsx
@@ -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();
+  });
+});
--- a/src/pages/tests/ordersList.test.tsx
+++ b/src/pages/tests/ordersList.test.tsx
@@ -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();
--- a/stubs/api/index.js
+++ b/stubs/api/index.js
@@ -53,7 +53,7 @@ router.delete('/arm/masters/:id', (req, res) => {
    );
 });

-router.patch('/orders/:id', (req, res) => {
+router.patch('/order/:id', (req, res) => {
  res
    .status(/error/.test(STUBS.orders) ? 500 : 200)
    .send(
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,5 +21,5 @@
        "**/*.test.ts",
        "**/*.test.tsx",
        "node_modules/@types/jest"
-    ]        
-}
+    ]
+}
Author	SHA1	Message	Date
ilnaz	fdc20e7464	feat: detete ts jest Some checks failed it-academy/dry-wash-pl/pipeline/pr-main Build started... Details it-academy/dry-wash-pl/pipeline/head There was a failure building this commit Details	2025-02-16 11:36:13 +03:00
ilnaz	a616d3815b	feat: add master test All checks were successful it-academy/dry-wash-pl/pipeline/pr-main This commit looks good Details it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-02-16 11:31:26 +03:00
ilnaz	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 Details	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 Details	2025-02-09 11:31:52 +03:00
RustamRu	142067e9ce	0.7.1	2025-02-09 11:31:36 +03:00
Rustam	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 Details 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... Details it-academy/dry-wash-pl/pipeline/head This commit looks good Details	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 Details	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 Details	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 Details	2025-02-09 10:20:21 +03:00
Primakov Alexandr Alexandrovich	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 Details Reviewed-on: #83	2025-02-09 10:12:42 +03:00
Primakov Alexandr Alexandrovich	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 Details Reviewed-on: #78 Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>	2025-02-09 10:10:40 +03:00
ilnaz	859fa4f2e1	feat: add playwright All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details it-academy/dry-wash-pl/pipeline/pr-main This commit looks good Details	2025-02-09 09:57:04 +03:00
ilnaz	658e23d4e3	fix: place orders in the model Some checks are pending it-academy/dry-wash-pl/pipeline/pr-main Build started... Details it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-02-08 22:36:30 +03:00
ilnaz	ed8ae95436	feat: add hook useShowToast.ts All checks were successful it-academy/dry-wash-pl/pipeline/pr-main This commit looks good Details	2025-02-08 22:18:32 +03:00
ilnaz	a00aaff29d	fear: change requests to RTK query All checks were successful it-academy/dry-wash-pl/pipeline/pr-main This commit looks good Details	2025-02-08 21:21:57 +03:00