feat: add playwright

Merge pull request 'feat: add tests' (#79 ) from feature/test into main
Reviewed-on: #79 Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2025-02-09 09:57:04 +03:00 · 2025-02-04 19:41:58 +03:00 · 2025-02-04 19:38:09 +03:00 · 2025-02-03 00:06:16 +03:00 · 2025-02-02 14:33:31 +03:00 · 2025-02-02 14:28:51 +03:00
45 changed files with 6141 additions and 894 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/file-mock.ts
+++ b/mocks/file-mock.ts
@@ -0,0 +1 @@
+module.exports = 'file';
--- a/babel.config.js
+++ b/babel.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+  presets: [
+    '@babel/preset-env',
+    '@babel/preset-typescript',
+    ['@babel/preset-react', { runtime: 'automatic' }],
+  ],
+};
--- a/bro.config.js
+++ b/bro.config.js
@@ -21,6 +21,7 @@ module.exports = {
  features: {
    'dry-wash-pl': {
      // add your features here in the format [featureName]: { value: string }
+      'order-view-status-polling': { value: '3000' }
    },
  },
  config: {
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,12 +1,13 @@
-import globals from "globals";
-import pluginJs from "@eslint/js";
-import tseslint from "typescript-eslint";
-import pluginReact from "eslint-plugin-react";
+import globals from 'globals';
+import pluginJs from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import pluginReact from 'eslint-plugin-react';
 import stylistic from '@stylistic/eslint-plugin';
 import pluginImport from 'eslint-plugin-import';

 export default [
-  { files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"] },
+  { files: ['**/*.{js,mjs,cjs,ts,jsx,tsx}'] },
+
  { languageOptions: { globals: globals.browser } },
  pluginJs.configs.recommended,
  ...tseslint.configs.recommended,
@@ -14,35 +15,38 @@ export default [
  {
    plugins: {
      '@stylistic': stylistic,
-      'import': pluginImport,
+      import: pluginImport,
    },
-    "rules": {
-      "no-unused-vars": "off",
-      "@typescript-eslint/no-unused-vars": [
-        "warn", // or "error"
+    rules: {
+      'no-unused-vars': 'off',
+      '@typescript-eslint/no-unused-vars': [
+        'warn', // or "error"
        {
-          "argsIgnorePattern": "^_",
-          "varsIgnorePattern": "^_",
-          "caughtErrorsIgnorePattern": "^_"
-        }
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+        },
      ],
-      "sort-imports": ["off"],
-      "import/order": [
-        "error",
+      'sort-imports': ['off'],
+      'import/order': [
+        'error',
        {
-          "groups": [
-            "builtin",
-            "external",
-            "internal",
-            "parent",
-            ["sibling", "index"]
+          groups: [
+            'builtin',
+            'external',
+            'internal',
+            'parent',
+            ['sibling', 'index'],
          ],
-          "newlines-between": "always",
-        }
+          'newlines-between': 'always',
+        },
      ],
-      semi: ["error", "always"],
+      semi: ['error', 'always'],
      '@stylistic/indent': ['error', 2],
-      'react/prop-types': 'off'
+      'react/prop-types': 'off',
    },
-  }
+  },
+  {
+    ignores: ['babel.config.js'],
+  },
 ];
--- a/jest-preset-it/jest-preset.ts
+++ b/jest-preset-it/jest-preset.ts
@@ -0,0 +1,17 @@
+module.exports = {
+  transform: {
+    '^.+\\.tsx?$': 'babel-jest',
+  },
+  coverageProvider: 'v8',
+  coverageDirectory: 'coverage',
+  collectCoverageFrom: ['**/src/**/*.{ts,tsx}', '!**/src/app.tsx'],
+  collectCoverage: true,
+  clearMocks: true,
+  moduleNameMapper: {
+    '\\.(svg|webp)$': '<rootDir>/__mocks__/file',
+  },
+  testEnvironmentOptions: {
+    customExportConditions: [''],
+  },
+  testEnvironment: 'jest-fixed-jsdom',
+};
--- a/locales/en.json
+++ b/locales/en.json
@@ -42,7 +42,7 @@
  "dry-wash.order-create.create-order-query.success.title": "The order is successfully created",
  "dry-wash.order-create.create-order-query.error.title": "Failed to create an order",
  "dry-wash.order-view.title": "Your order",
-  "dry-wash.order-view.get-order-query.error.title": "Failed to fetch the details of order #{{number}}",
+  "dry-wash.order-view.get-order-query.error.title": "Failed to fetch the details of order",
  "dry-wash.order-view.details.title": "Order #{{number}}",
  "dry-wash.order-view.details.owner": "Owner",
  "dry-wash.order-view.details.car": "Car",
@@ -86,6 +86,15 @@
  "dry-wash.arm.master.drawer.inputPhone.placeholder": "Enter Phone Number",
  "dry-wash.arm.master.drawer.button.save": "Save",
  "dry-wash.arm.master.drawer.button.cancel": "Cancel",
+  "dry-wash.arm.master.drawer.toast.create-master": "Master created",
+  "dry-wash.arm.master.drawer.toast.error.empty-fields": "Fields cannot be empty",
+  "dry-wash.arm.master.drawer.toast.error.base": "Error",
+  "dry-wash.arm.master.drawer.toast.error.create-master": "Error creating master",
+  "dry-wash.arm.master.drawer.toast.error.create-master-details": "Failed to add master. Please try again",
+  "dry-wash.arm.master.drawer.form.name.required": "Master name is required",
+  "dry-wash.arm.master.drawer.form.phone.required": "Phone number is required",
+  "dry-wash.arm.master.drawer.form.phone.pattern": "Invalid phone number",
+  "dry-wash.arm.master.drawer.form.name.minLength": "Name must contain at least 2 characters",
  "dry-wash.arm.master.sideBar.orders": "Orders",
  "dry-wash.arm.master.sideBar.master": "Masters",
  "dry-wash.arm.master.sideBar.title": "Dry Master",
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -36,6 +36,15 @@
  "dry-wash.arm.master.drawer.inputPhone.placeholder": "Введите номер телефона",
  "dry-wash.arm.master.drawer.button.save": "Сохранить",
  "dry-wash.arm.master.drawer.button.cancel": "Отменить",
+  "dry-wash.arm.master.drawer.toast.create-master": "Мастер создан",
+  "dry-wash.arm.master.drawer.toast.error.empty-fields": "Поля не могут быть пустыми",
+  "dry-wash.arm.master.drawer.toast.error.base": "Ошибка",
+  "dry-wash.arm.master.drawer.toast.error.create-master": "Ошибка при создании мастера",
+  "dry-wash.arm.master.drawer.toast.error.create-master-details": "Не удалось добавить мастера. Попробуйте еще раз",
+  "dry-wash.arm.master.drawer.form.name.required": "Имя мастера обязательно",
+  "dry-wash.arm.master.drawer.form.phone.required": "Телефон обязателен",
+  "dry-wash.arm.master.drawer.form.phone.pattern": "Некорректный номер телефона",
+  "dry-wash.arm.master.drawer.form.name.minLength": "Имя должно содержать минимум 2 символа",
  "dry-wash.arm.master.sideBar.orders": "Заказы",
  "dry-wash.arm.master.sideBar.master": "Мастера",
  "dry-wash.arm.master.sideBar.title": "Сухой мастер",
@@ -82,7 +91,7 @@
  "dry-wash.order-create.create-order-query.success.title": "Заказ успешно создан",
  "dry-wash.order-create.create-order-query.error.title": "Не удалось создать заказ",
  "dry-wash.order-view.title": "Ваш заказ",
-  "dry-wash.order-view.get-order-query.error.title": "Не удалось загрузить детали заказа №{{number}}",
+  "dry-wash.order-view.get-order-query.error.title": "Не удалось загрузить детали заказа",
  "dry-wash.order-view.details.title": "Заказ №{{number}}",
  "dry-wash.order-view.details.owner": "Владелец",
  "dry-wash.order-view.details.car": "Автомобиль",
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,55 +1,74 @@
 {
-    "name": "dry-wash",
-    "version": "0.5.0",
-    "description": "<a id=\"readme-top\"></a>",
-    "main": "./src/index.tsx",
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
-        "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.6.3",
-        "@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",
-        "@types/react": "^18.3.12",
-        "dayjs": "^1.11.13",
-        "express": "^4.21.1",
-        "framer-motion": "^6.2.8",
-        "i18next": "^23.16.4",
-        "keycloak-js": "^23.0.7",
-        "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"
-    },
-    "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-eslint": "^8.12.2"
-    }
+  "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": {
+    "@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",
+    "@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/features.ts
+++ b/src/data/features.ts
@@ -0,0 +1,15 @@
+import { getFeatures } from "@brojs/cli";
+
+const features = getFeatures('dry-wash-pl');
+
+export const FEATURE = {
+  orderViewStatusPolling: {
+    isOn: Boolean(features['order-view-status-polling']),
+    getValue: () => {
+      const interval = parseInt(features['order-view-status-polling'].value);
+      if (!Number.isNaN(interval)) {
+        return interval;
+      }
+    }
+  }
+};
--- a/src/data/service/api.ts
+++ b/src/data/service/api.ts
@@ -3,17 +3,7 @@ import { getConfigValue } from '@brojs/cli';

 import { Master } from '../../models/api/master';

-type SuccessResponse<Body> = {
-  success: true;
-  body: Body;
-};
-
-type ErrorResponse = {
-  success: false;
-  message: string;
-};
-
-type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
+import { extractBodyFromResponse } from './utils';

 export const api = createApi({
  reducerPath: 'api',
@@ -22,11 +12,7 @@ export const api = createApi({
  endpoints: (builder) => ({
    getMasters: builder.query<Master[], void>({
      query: () => ({ url: '/arm/masters' }),
-      transformResponse: (response: BaseResponse<Master[]>) => {
-        if (response.success) {
-          return response.body;
-        }
-      },
+      transformResponse: extractBodyFromResponse<Master[]>,
      providesTags: ['Masters'],
    }),
    addMaster: builder.mutation<void, Pick<Master, 'name' | 'phone'>>({
--- a/src/data/service/landing.api.ts
+++ b/src/data/service/landing.api.ts
@@ -0,0 +1,14 @@
+import { GetOrder } from "../../models/api";
+
+import { api } from "./api";
+import { extractBodyFromResponse, extractErrorMessageFromResponse } from "./utils";
+
+export const landingApi = api.injectEndpoints({
+  endpoints: ({ query }) => ({
+    getOrder: query<GetOrder.Response, GetOrder.Params>({
+      query: ({ orderId }) => `/order/${orderId}`,
+      transformResponse: extractBodyFromResponse<GetOrder.Response>,
+      transformErrorResponse: extractErrorMessageFromResponse,
+    })
+  })
+});
--- a/src/data/service/utils.ts
+++ b/src/data/service/utils.ts
@@ -0,0 +1,15 @@
+import { FetchBaseQueryError } from "@reduxjs/toolkit/query";
+
+import { BaseResponse } from "../../models/api";
+
+export const extractBodyFromResponse = <Body>(response: BaseResponse<Body>) => {
+  if (response.success) {
+    return response.body;
+  }
+};
+
+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
@@ -85,7 +85,7 @@ const armService = () => {
  }) => {
    const body = JSON.stringify({ status, notes, masterId });

-    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
+    const response = await fetch(`${endpoint}/order/${id}`, {
      method: 'PATCH',
      headers: {
        'Content-Type': 'application/json',
--- a/src/api/landing.tsx
+++ b/src/api/landing.tsx
@@ -1,12 +1,11 @@
 import { getConfigValue } from '@brojs/cli';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';

-import { CreateOrder, GetOrder } from '../models/api';
+import { CreateOrder } from '../models/api';

 import { QueryState, Trigger } from './types';

 enum LandingEndpoints {
-  ORDER = '/order',
  ORDER_CREATE = '/order/create',
 }

@@ -63,45 +62,4 @@ const useCreateOrderMutation = <D extends CreateOrder.Response>(): [
  return [createOrder, { isLoading, isSuccess, data, isError, error }];
 };

-const useGetOrderQuery = <D extends GetOrder.Response>({
-  orderId,
-}: GetOrder.Params): QueryState<D> => {
-  const [isLoading, setIsLoading] = useState<QueryState<D>['isLoading']>(true);
-  const [isSuccess, setIsSuccess] = useState<QueryState<D>['isSuccess']>();
-  const [data, setData] = useState<QueryState<D>['data']>();
-  const [isError, setIsError] = useState<QueryState<D>['isError']>();
-  const [error, setError] = useState<QueryState<D>['error']>();
-  
-  useEffect(() => {
-    (async () => {
-      try {
-        const response = await fetch(
-          `${endpoint}${LandingEndpoints.ORDER}/${orderId}`,
-        );
-
-        if (!response.ok) {
-          const errorResponseObject =
-            (await response.json()) as QueryState<D>['error'];
-          setIsError(true);
-          setError(errorResponseObject);
-          throw errorResponseObject;
-        }
-
-        const dataResponseObject =
-          (await response.json()) as QueryState<D>['data'];
-        setIsSuccess(true);
-        setData(dataResponseObject);
-      } catch (error) {
-        setIsError(true);
-        setError(error);
-        throw error;
-      } finally {
-        setIsLoading(false);
-      }
-    })();
-  }, []);
-
-  return { isLoading, isSuccess, data, isError, error };
-};
-
-export { useCreateOrderMutation, useGetOrderQuery };
+export { useCreateOrderMutation };
--- a/src/assets/images/car-body-type/index.ts
+++ b/src/assets/images/car-body-type/index.ts
@@ -3,6 +3,7 @@ export { default as CrossoverImg } from './crossover.webp';
 export { default as HatchbackImg } from './hatchback.webp';
 export { default as LiftbackImg } from './liftback.webp';
 export { default as MinivanImg } from './minivan.webp';
+export { default as OtherImg } from './other.webp';
 export { default as PickupImg } from './pickup.webp';
 export { default as SedanImg } from './sedan.webp';
 export { default as SportsCarImg } from './sports-car.webp';
--- a/src/assets/images/car-body-type/other.webp
+++ b/src/assets/images/car-body-type/other.webp
--- a/src/components/MasterDrawer/MasterDrawer.tsx
+++ b/src/components/MasterDrawer/MasterDrawer.tsx
@@ -1,4 +1,5 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
+import { useForm, SubmitHandler } from 'react-hook-form';
 import {
  Button,
  FormControl,
@@ -14,107 +15,136 @@ import {
  useToast,
  InputGroup,
  InputLeftElement,
+  FormErrorMessage,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import { PhoneIcon } from '@chakra-ui/icons';

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

-const MasterDrawer = ({ isOpen, onClose }) => {
-  const [addMaster, { error, isSuccess }] = api.useAddMasterMutation();
-  const toast = useToast();
+interface MasterDrawerProps {
+  isOpen: boolean;
+  onClose: () => void;
+}

-  const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
+const MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {
+  const {
+    register,
+    handleSubmit,
+    reset,
+    formState: { errors },
+  } = useForm<DrawerInputs>();

-  const handleSave = async () => {
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.master.drawer',
+  });
+
+  const onSubmit: SubmitHandler<DrawerInputs> = async (data) => {
    const trimMaster = {
-      phone: newMaster.phone.trim(),
-      name: newMaster.name.trim(),
+      name: data.name.trim(),
+      phone: data.phone.trim(),
    };

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

-    addMaster(trimMaster);
+    await addMaster(trimMaster);
  };

+  const [addMaster, { error, isSuccess }] = api.useAddMasterMutation();
+  const toast = useToast();
+
  useEffect(() => {
    if (isSuccess) {
-      toast({
-        title: 'Мастер создан.',
-        description: `Мастер "${newMaster.name}" успешно добавлен.`,
+      showToast({
+        toast,
+        title: t('toast.create-master'),
        status: 'success',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
      });
+      reset();
      onClose();
    }
  }, [isSuccess]);

  useEffect(() => {
    if (error) {
-      toast({
-        title: 'Ошибка при создании мастера.',
-        description: 'Не удалось добавить мастера. Попробуйте еще раз.',
+      showToast({
+        toast,
+        title: t('toast.error.create-master'),
+        description: t('toast.error.create-master-details'),
        status: 'error',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
      });
      console.error(error);
    }
  }, [error]);

-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master.drawer',
-  });
-
  return (
    <Drawer isOpen={isOpen} onClose={onClose} size='md'>
      <DrawerOverlay />
      <DrawerContent>
-        <DrawerCloseButton />
-        <DrawerHeader>{t('title')}</DrawerHeader>
-        <DrawerBody>
-          <FormControl mb='4'>
-            <FormLabel>{t('inputName.label')}</FormLabel>
-            <Input
-              // isInvalid
-              value={newMaster.name}
-              onChange={(e) =>
-                setNewMaster({ ...newMaster, name: e.target.value })
-              }
-              placeholder={t('inputName.placeholder')}
-            />
-          </FormControl>
-          <FormControl>
-            <FormLabel>{t('inputPhone.label')}</FormLabel>
-
-            <InputGroup>
-              <InputLeftElement pointerEvents='none'>
-                <PhoneIcon color='gray.300' />
-              </InputLeftElement>
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <DrawerCloseButton />
+          <DrawerHeader>{t('title')}</DrawerHeader>
+          <DrawerBody>
+            <FormControl mb='4' isInvalid={!!errors.name}>
+              <FormLabel>{t('inputName.label')}</FormLabel>
              <Input
-                // isInvalid
-                value={newMaster.phone}
-                onChange={(e) =>
-                  setNewMaster({ ...newMaster, phone: e.target.value })
-                }
-                placeholder={t('inputPhone.placeholder')}
+                {...register('name', {
+                  required: t('form.name.required'),
+                  minLength: {
+                    value: 2,
+                    message: t('form.name.minLength'),
+                  },
+                })}
+                placeholder={t('inputName.placeholder')}
              />
-            </InputGroup>
-          </FormControl>
-        </DrawerBody>
-        <DrawerFooter>
-          <Button colorScheme='teal' mr={3} onClick={handleSave}>
-            {t('button.save')}
-          </Button>
-          <Button variant='ghost' onClick={onClose}>
-            {t('button.cancel')}
-          </Button>
-        </DrawerFooter>
+              <FormErrorMessage>
+                {errors.name && errors.name.message}
+              </FormErrorMessage>
+            </FormControl>
+            <FormControl isInvalid={!!errors.phone}>
+              <FormLabel>{t('inputPhone.label')}</FormLabel>
+              <InputGroup>
+                <InputLeftElement pointerEvents='none'>
+                  <PhoneIcon color='gray.300' />
+                </InputLeftElement>
+                <Input
+                  {...register('phone', {
+                    required: t('form.phone.required'),
+                    pattern: {
+                      value: /^(\+7|8)\d{10}$/,
+                      message: t('form.phone.pattern'),
+                    },
+                    setValueAs: (value) => value.replace(/[^\d+]/g, ''),
+                  })}
+                  placeholder={t('inputPhone.placeholder')}
+                />
+              </InputGroup>
+              <FormErrorMessage>
+                {errors.phone && errors.phone.message}
+              </FormErrorMessage>
+            </FormControl>
+          </DrawerBody>
+          <DrawerFooter>
+            <Button colorScheme='teal' mr={3} type='submit'>
+              {t('button.save')}
+            </Button>
+            <Button variant='ghost' onClick={onClose}>
+              {t('button.cancel')}
+            </Button>
+          </DrawerFooter>
+        </form>
      </DrawerContent>
    </Drawer>
  );
--- a/src/components/order-form/form/car-body/car-body-select.tsx
+++ b/src/components/order-form/form/car-body/car-body-select.tsx
@@ -1,34 +1,38 @@
-import React, { forwardRef, useState } from 'react';
+import React, { forwardRef } from 'react';
 import {
  Input,
-  Image,
-  InputProps,
  Box,
  Popover,
  PopoverAnchor,
  PopoverContent,
  PopoverBody,
-  List,
-  ListItem,
+  useRadioGroup,
+  Grid,
+  GridItem,
+  UseRadioGroupProps,
+  useDisclosure,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';

-import { carBodySelectOptions } from './helper';
-import { CarBodySelectOption } from './types';
+import { carBodySelectOptions, getInputValue } from './helper';
+import { CarBodyOption } from './option';
+import { CarBodySelectProps } from './types';

-export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
+export const CarBodySelect = forwardRef<HTMLInputElement, CarBodySelectProps>(
  function CarBodySelect(props, ref) {
-    const initialOption = carBodySelectOptions.find(({ value }) => value === Number(props.value));
-    const [selected, setSelected] = useState<Partial<CarBodySelectOption>>(initialOption);
-
-    const handleOptionClick = (option: CarBodySelectOption) => {
-      setSelected(option);
+    const handleOptionClick: UseRadioGroupProps['onChange'] = (value) => {
      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
      // @ts-ignore
-      props.onChange(option.value);
+      props.onChange(value);
    };

-    const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
+    const { value, getRadioProps, getRootProps } = useRadioGroup({
+      defaultValue: props.value,
+      value: props.value,
+      onChange: handleOptionClick,
+    });
+
+    const { isOpen, onOpen, onClose } = useDisclosure();

    const { t } = useTranslation('~', {
      keyPrefix: 'dry-wash.order-create.car-body-select',
@@ -37,7 +41,7 @@ export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
    return (
      <Box width='100%'>
        <Popover
-          isOpen={isDropdownOpen}
+          isOpen={isOpen}
          autoFocus={false}
          placement='bottom-start'
          matchWidth
@@ -46,45 +50,29 @@ export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
            <Input
              {...props}
              ref={ref}
-              value={
-                selected?.labelTKey
-                  ? t(`options.${selected.labelTKey}`)
-                  : undefined
-              }
+              value={getInputValue(Number(value), t) ?? props.value}
              readOnly
-              onClick={() => setIsDropdownOpen(true)}
-              onBlur={() => setIsDropdownOpen(false)}
+              onClick={onOpen}
+              onBlur={onClose}
              placeholder={t('placeholder')}
            />
          </PopoverAnchor>
          <PopoverContent width='100%' maxWidth='100%'>
            <PopoverBody border='1px' borderColor='gray.300' p={0}>
-              <List
-                display='grid'
-                gridTemplateColumns='repeat(auto-fit, minmax(150px, 1fr))'
+              <Grid
+                templateColumns='repeat(auto-fit, minmax(150px, 1fr))'
+                {...getRootProps()}
              >
-                {carBodySelectOptions.map((option) => (
-                  <ListItem
-                    key={option.value}
-                    display='flex'
-                    flexDirection='column'
-                    justifyContent='flex-end'
-                    alignItems='center'
-                    p={2}
-                    cursor='pointer'
-                    _hover={{
-                      bgColor: 'primary.50',
-                    }}
-                    _active={{
-                      bgColor: 'primary.100',
-                    }}
-                    onClick={() => handleOptionClick(option)}
-                  >
-                    <Image src={option.img} />
-                    {t(`options.${option.labelTKey}`)}
-                  </ListItem>
+                {carBodySelectOptions.map(({ value, img, labelTKey }) => (
+                  <GridItem key={value}>
+                    <CarBodyOption
+                      image={img}
+                      label={t(`options.${labelTKey}`)}
+                      {...getRadioProps({ value: String(value) })}
+                    />
+                  </GridItem>
                ))}
-              </List>
+              </Grid>
            </PopoverBody>
          </PopoverContent>
        </Popover>
--- a/src/components/order-form/form/car-body/helper.ts
+++ b/src/components/order-form/form/car-body/helper.ts
@@ -1,3 +1,6 @@
+import { TFunction } from "i18next";
+import { InputProps } from "@chakra-ui/react";
+
 import {
  CoupeImg,
  CrossoverImg,
@@ -8,7 +11,8 @@ import {
  SedanImg,
  SportsCarImg,
  StationWagonImg,
-  SuvImg
+  SuvImg,
+  OtherImg
 } from "../../../../assets/images";
 import { Car } from "../../../../models/landing";

@@ -67,6 +71,17 @@ export const carBodySelectOptions: CarBodySelectOption[] = [
  },
  {
    value: Car.BodyStyle.OTHER,
-    labelTKey: 'other'
+    labelTKey: 'other',
+    img: OtherImg
  },
-];
+];
+
+export const getInputValue = (value: Car.BodyStyle, t: TFunction<"~", "dry-wash.order-create.car-body-select">): InputProps['value'] => {
+  const { labelTKey } = carBodySelectOptions.find((option) => value === option.value) ?? {};
+
+  if (labelTKey) {
+    return t(`options.${labelTKey}`);
+  }
+
+  return;
+};
--- a/src/components/order-form/form/car-body/option/car-body-option.tsx
+++ b/src/components/order-form/form/car-body/option/car-body-option.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import {
+  ImageProps,
+  StackProps,
+  Image,
+  useRadio,
+  chakra,
+  Box,
+  UseRadioProps,
+  Flex,
+} from '@chakra-ui/react';
+
+import { getPropsByState } from './helper';
+
+type CarBodyOptionProps = {
+  image: ImageProps['src'];
+  label: StackProps['children'];
+} & UseRadioProps;
+
+export const CarBodyOption = ({
+  image,
+  label,
+  ...radioProps
+}: CarBodyOptionProps) => {
+  const { state, getInputProps, getRadioProps, htmlProps, getLabelProps } =
+    useRadio(radioProps);
+
+  return (
+    <chakra.label {...htmlProps} cursor='pointer'>
+      <input {...getInputProps({})} hidden />
+      <Box {...getRadioProps()} p={2} {...getPropsByState(state)}>
+        <Flex direction='column' alignItems='center' {...getLabelProps()}>
+          <Image src={image} rounded={4} />
+          {label}
+        </Flex>
+      </Box>
+    </chakra.label>
+  );
+};
--- a/src/components/order-form/form/car-body/option/helper.ts
+++ b/src/components/order-form/form/car-body/option/helper.ts
@@ -0,0 +1,19 @@
+import {
+  BoxProps,
+} from '@chakra-ui/react';
+import { RadioState } from '@chakra-ui/react/dist/types/radio/use-radio';
+
+export const getPropsByState = ({ isChecked }: RadioState): BoxProps => {
+  if (isChecked) {
+    return {
+      bgColor: 'primary.200',
+      _hover: { bgColor: 'primary.100' },
+      _active: { bgColor: 'primary.300' },
+    };
+  }
+
+  return {
+    _hover: { bgColor: 'primary.50' },
+    _active: { bgColor: 'primary.100' },
+  };
+};
--- a/src/components/order-form/form/car-body/option/index.ts
+++ b/src/components/order-form/form/car-body/option/index.ts
@@ -0,0 +1 @@
+export { CarBodyOption } from './car-body-option';
--- a/src/components/order-form/form/car-body/types.ts
+++ b/src/components/order-form/form/car-body/types.ts
@@ -1,3 +1,5 @@
+import { InputProps } from "@chakra-ui/react";
+
 import { Car } from "../../../../models/landing";

 export type CarBodySelectOption = {
@@ -16,3 +18,7 @@ export type CarBodySelectOption = {
  'other';
  img?: string;
 };
+
+export type CarBodySelectProps = {
+  value?: string;
+} & Pick<InputProps, 'onChange'>;
--- a/src/components/order-form/form/helper.ts
+++ b/src/components/order-form/form/helper.ts
@@ -9,6 +9,7 @@ export const defaultValues: Partial<OrderFormValues> = {
  phone: '',
  carNumber: '',
  carColor: '',
+  carBody: '',
  availableDatetimeBegin: '',
  availableDatetimeEnd: '',
 };
--- a/src/components/order-form/form/location/location-input/location-input.tsx
+++ b/src/components/order-form/form/location/location-input/location-input.tsx
@@ -42,21 +42,29 @@ export const LocationInput = memo(

      const onInputChange: InputProps['onChange'] = async (e) => {
        const newInputValue = e.target.value;
-        setInputValue(newInputValue);

-        if (newInputValue.trim().length > 3) {
-          try {
-            const address = extractAddress(newInputValue);
-            const results = await ymaps.suggest(address);
-            setSuggestions(results);
-          } catch (error) {
-            console.error(error);
-          }
+        if (
+          isValidLocation(newInputValue) &&
+          (await isRealLocation(ymaps, newInputValue))
+        ) {
+          onChange(newInputValue);
        } else {
-          setSuggestions([]);
+          setInputValue(newInputValue);
+  
+          if (newInputValue.trim().length > 3) {
+            try {
+              const address = extractAddress(newInputValue);
+              const results = await ymaps.suggest(address);
+              setSuggestions(results);
+            } catch (error) {
+              console.error(error);
+            }
+          } else {
+            setSuggestions([]);
+          }
+  
+          setIsSuggestionsPanelOpen(suggestions.length > 1);
        }
-
-        setIsSuggestionsPanelOpen(suggestions.length > 1);
      };

      const onFocus: InputProps['onFocus'] = () => {
@@ -103,7 +111,7 @@ export const LocationInput = memo(
                {...props}
                ref={ref}
                onBlur={onBlur}
-                value={inputValue}
+                value={inputValue ?? value}
                onChange={onInputChange}
                onFocus={onFocus}
                placeholder={t('placeholder')}
--- a/src/components/order-view/details/order-details.tsx
+++ b/src/components/order-view/details/order-details.tsx
@@ -19,7 +19,7 @@ import { OrderStatus } from './status';

 type OrderDetailsProps = Pick<
  Order.View,
-  | 'id'
+  | 'orderNumber'
  | 'status'
  | 'phone'
  | 'carNumber'
@@ -32,7 +32,7 @@ type OrderDetailsProps = Pick<
 >;

 export const OrderDetails: FC<OrderDetailsProps> = ({
-  id,
+  orderNumber,
  status,
  phone,
  carNumber,
@@ -58,7 +58,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
        gap={2}
      >
        <Heading as='h2' size='lg'>
-          {t('title', { number: id })}
+          {t('title', { number: orderNumber })}
        </Heading>
        <OrderStatus value={status} />
      </HStack>
--- a/src/components/order-view/details/status/order-status.tsx
+++ b/src/components/order-view/details/status/order-status.tsx
@@ -15,19 +15,19 @@ const getPropsByStatus = (
        colorScheme: 'red',
        children: t('canceled'),
      };
-    case 'progress':
-      return {
-        colorScheme: 'yellow',
-        children: t('progress'),
-      };
    case 'pending':
      return {
        colorScheme: 'yellow',
        children: t('pending'),
      };
+    case 'progress':
+      return {
+        colorScheme: 'orange',
+        children: t('progress'),
+      };
    case 'working':
      return {
-        colorScheme: 'yellow',
+        colorScheme: 'orange',
        children: t('working'),
      };
    case 'complete':
--- a/src/helpers/showToast.ts
+++ b/src/helpers/showToast.ts
@@ -0,0 +1,21 @@
+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/models/api/common.ts
+++ b/src/models/api/common.ts
@@ -0,0 +1,13 @@
+type SuccessResponse<Body> = {
+  success: true;
+  body: Body;
+};
+
+export type ErrorMessage = string;
+
+type ErrorResponse = {
+  success: false;
+  message: ErrorMessage;
+};
+
+export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
--- a/src/models/api/index.ts
+++ b/src/models/api/index.ts
@@ -1 +1,2 @@
+export * from './common';
 export * from './order';
--- a/src/models/api/order.ts
+++ b/src/models/api/order.ts
@@ -1,6 +1,16 @@
 /* eslint-disable @typescript-eslint/no-namespace */
 import { Order } from "../landing";

+import { ErrorMessage } from "./common";
+
+export namespace GetOrder {
+  export type Response = Order.View;
+  export type Params = {
+    orderId: Order.Id
+  };
+  export type Error = ErrorMessage;
+}
+
 export namespace CreateOrder {
  export type Response = {
    id: Order.Id
@@ -8,11 +18,4 @@ export namespace CreateOrder {
  export type Params = {
    body: Order.Create
  };
-};
-
-export namespace GetOrder {
-  export type Response = Order.View;
-  export type Params = {
-    orderId: Order.Id
-  };
 };
--- a/src/models/arm/form.ts
+++ b/src/models/arm/form.ts
@@ -0,0 +1,4 @@
+export type DrawerInputs = {
+  phone: string;
+  name: string;
+};
--- a/src/models/landing/order.ts
+++ b/src/models/landing/order.ts
@@ -26,6 +26,8 @@ export type Create = {
  }
 };

+export type Number = string;
+
 export type View = {
  phone: Customer.PhoneNumber;
  carNumber: Car.RegistrationNumber;
@@ -34,6 +36,7 @@ export type View = {
  location: Washing.Location;
  startWashTime: Washing.AvailableBeginDateTime;
  endWashTime: Washing.AvailableEndDateTime;
+  orderNumber: Number,
  status: Status,
  notes: string;
  created: IsoDate;
--- a/src/pages/tests/snapshots/arm.test.tsx.snap
+++ b/src/pages/tests/snapshots/arm.test.tsx.snap
@@ -0,0 +1,325 @@
+// 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/arm.test.tsx
+++ b/src/pages/tests/arm.test.tsx
@@ -0,0 +1,130 @@
+import React from 'react';
+import {
+  describe,
+  it,
+  expect,
+  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 Page from '../arm';
+
+const server = setupServer(
+  http.post('/api/arm/orders', () => {
+    return HttpResponse.json({
+      success: true,
+      body: [
+        {
+          id: 'order1',
+          carNumber: 'A123BC',
+          startWashTime: '2024-11-24T10:30:00.000Z',
+          endWashTime: '2024-11-24T16:30:00.000Z',
+          orderDate: '2024-11-24T08:41:46.366Z',
+          status: 'pending',
+          phone: '79001234563',
+          location: 'Казань, ул. Баумана, 1',
+          master: {
+            name: 'Олег Макаров',
+            phone: '79001234567',
+            id: '23423442',
+          },
+          notes: '',
+        },
+        {
+          id: 'order2',
+          carNumber: 'A245BC',
+          startWashTime: '2024-11-24T11:30:00.000Z',
+          endWashTime: '2024-11-24T17:30:00.000Z',
+          orderDate: '2024-11-24T07:40:46.366Z',
+          status: 'progress',
+          phone: '79001234567',
+          location: 'Казань, ул. Баумана, 43',
+          master: [],
+          notes: '',
+        },
+      ],
+    });
+  }),
+  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('react-i18next', () => {
+  return {
+    useTranslation: () => {
+      return {
+        t: (key: never) => `${key}`,
+        i18n: {},
+      };
+    },
+  };
+});
+
+jest.mock('@brojs/cli', () => {
+  return {
+    getNavigationValue: () => '/auth/login',
+    getConfigValue: () => '/api',
+  };
+});
+
+describe('Arm 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(
+      <BrowserRouter>
+        <Page mockUser={{ name: 'ilnaz' }} />
+      </BrowserRouter>,
+    );
+
+    expect(container).toMatchSnapshot();
+
+    await waitFor(() => screen.getByText('A123BC'));
+
+    expect(container).toMatchSnapshot();
+  });
+});
--- a/src/pages/arm/index.tsx
+++ b/src/pages/arm/index.tsx
@@ -6,8 +6,12 @@ import LayoutArm from '../../components/LayoutArm';
 import authLogin from '../../keycloak';
 import { URLs } from '../../__data__/urls';

-const Page = () => {
-  const [user, setUser] = useState(null);
+interface PageProps {
+  mockUser?: { name: string };
+}
+
+const Page = ({ mockUser }: PageProps) => {
+  const [user, setUser] = useState(mockUser || null);

  const navigate = useNavigate();

--- a/src/pages/order-view/index.tsx
+++ b/src/pages/order-view/index.tsx
@@ -1,5 +1,13 @@
 import React, { FC } from 'react';
-import { Alert, AlertDescription, AlertIcon, AlertTitle, HStack, Spinner } from '@chakra-ui/react';
+import {
+  Alert,
+  AlertDescription,
+  AlertIcon,
+  AlertTitle,
+  Box,
+  HStack,
+  Spinner,
+} from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import { Container, Heading, VStack } from '@chakra-ui/react';
 import { useParams } from 'react-router-dom';
@@ -10,7 +18,9 @@ import {
 } from '../../containers';
 import { OrderDetails } from '../../components/order-view';
 import { Order } from '../../models/landing';
-import { useGetOrderQuery } from '../../api';
+import { landingApi } from '../../__data__/service/landing.api';
+import { ErrorMessage } from '../../models/api';
+import { FEATURE } from '../../__data__/features';

 const Page: FC = () => {
  const { t } = useTranslation('~', {
@@ -21,12 +31,21 @@ const Page: FC = () => {
  const {
    isLoading,
    isSuccess,
-    data: { body: order } = {},
+    data: order,
    isError,
    error,
-  } = useGetOrderQuery({
-    orderId,
-  });
+  } = landingApi.useGetOrderQuery(
+    {
+      orderId,
+    },
+    FEATURE.orderViewStatusPolling.isOn
+      ? {
+        pollingInterval: FEATURE.orderViewStatusPolling.getValue(),
+        skipPollingIfUnfocused: true,
+      }
+      : undefined,
+  );
+  const errorMessage = error as ErrorMessage;

  return (
    <LandingThemeProvider>
@@ -51,7 +70,7 @@ const Page: FC = () => {
              <>
                {isSuccess && (
                  <OrderDetails
-                    id={order.id}
+                    orderNumber={order.orderNumber}
                    status={order.status}
                    phone={order.phone}
                    carNumber={order.carNumber}
@@ -66,14 +85,14 @@ const Page: FC = () => {
              </>
              <>
                {isError && (
-                  <Alert status='error'>
+                  <Alert status='error' alignItems='flex-start'>
                    <AlertIcon />
-                    <AlertTitle>
-                      {t('get-order-query.error.title', {
-                        number: orderId,
-                      })}
-                    </AlertTitle>
-                    <AlertDescription>{error.data?.error}</AlertDescription>
+                    <Box>
+                      <AlertTitle>
+                        {t('get-order-query.error.title')}
+                      </AlertTitle>
+                      <AlertDescription>{errorMessage}</AlertDescription>
+                    </Box>
                  </Alert>
                )}
              </>
--- a/stubs/api/admin.js
+++ b/stubs/api/admin.js
@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-require-imports */
 const router = require('express').Router();

-const STUBS = { masters: 'success', orders: 'success', orderView: 'success' };
+const STUBS = { masters: 'success', orders: 'success', orderView: 'success-pending' };

 router.get('/set/:name/:value', (req, res) => {
  const { name, value } = req.params;
@@ -28,7 +28,8 @@ router.get('/', (req, res) => {
    </fieldset>
    <fieldset> 
    <legend>Лендинг - Детали заказа</legend>
-      ${generateRadioInput('orderView', 'success')}
+      ${generateRadioInput('orderView', 'success-pending')}
+      ${generateRadioInput('orderView', 'success-working')}
      ${generateRadioInput('orderView', 'error')}
    </fieldset>
 </div>`);
--- a/stubs/json/landing-order-view/id1-error.json
+++ b/stubs/json/landing-order-view/id1-error.json
@@ -0,0 +1,4 @@
+{
+  "success": false,
+  "message": "Не удалось загрузить детали заказа"
+}
--- a/stubs/json/landing-order-view/id1-success-pending.json
+++ b/stubs/json/landing-order-view/id1-success-pending.json
@@ -8,10 +8,11 @@
      "startWashTime": "2025-01-19T14:03:00.000Z",
      "endWashTime": "2025-01-19T14:03:00.000Z",
      "location": "55.793833888711006,49.19037910644527 Республика Татарстан (Татарстан), Казань, жилой район Седьмое Небо",
-      "status": "progress",
+      "orderNumber": "1",
+      "status": "pending",
      "notes": "",
      "created": "2025-01-19T14:04:02.985Z",
      "updated": "2025-01-19T14:04:02.987Z",
-      "id": "678d06527d78ec30be2679d8"
+      "id": "id1"
  }
 }
--- a/stubs/json/landing-order-view/id1-success-working.json
+++ b/stubs/json/landing-order-view/id1-success-working.json
@@ -0,0 +1,18 @@
+{
+  "success": true,
+  "body": {
+      "phone": "+79876543210",
+      "carNumber": "А123АА16",
+      "carBody": 2,
+      "carColor": "#ffffff",
+      "startWashTime": "2025-01-19T14:03:00.000Z",
+      "endWashTime": "2025-01-19T14:03:00.000Z",
+      "location": "55.793833888711006,49.19037910644527 Республика Татарстан (Татарстан), Казань, жилой район Седьмое Небо",
+      "orderNumber": "1",
+      "status": "working",
+      "notes": "",
+      "created": "2025-01-19T14:04:02.985Z",
+      "updated": "2025-01-19T14:04:02.987Z",
+      "id": "id1"
+  }
+}
--- a/tests/example.spec.ts
+++ b/tests/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');
+    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();
+});
Author	SHA1	Message	Date
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
Ильназ	ad1f948641	Merge pull request 'feat: add tests' (#79 ) from feature/test into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #79 Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>	2025-02-04 19:41:58 +03:00
Ильназ	bd66f00b81	Merge pull request 'feat: rewrite the form to react-hook-form and add validation' (#80 ) from feature/react-hook-form into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #80 Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>	2025-02-04 19:38:09 +03:00
ilnaz	9a20c9f098	feat: rewrite the form to react-hook-form and add validation 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-03 00:06:16 +03:00
ilnaz	d48f8011c1	fix: update package-lock.json 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-02 14:33:31 +03:00
ilnaz	f2319542e7	feat: add tests Some checks failed it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit Details	2025-02-02 14:28:51 +03:00
ilnaz	3fb01392f0	fix: change place	2025-02-02 14:28:51 +03:00
ilnaz	1dd14caed2	feat: add tests	2025-02-02 14:28:43 +03:00
Rustam	12982cdf9e	Merge pull request 'feature/order-view-upgrade' (#75 ) from feature/order-view-upgrade into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #75 Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>	2025-02-02 13:34:10 +03:00
RustamRu	31b440656c	feat: order view status polling feature (#74 ) 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-01-26 19:28:23 +03:00
RustamRu	45c4ca16c8	feat: use RTK Query to get order deails (#73 )	2025-01-26 19:20:36 +03:00
Rustam	e3d316c418	Merge pull request 'fix: fill location from autocomplete (#71 )' (#72 ) 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: #72 Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>	2025-01-26 15:59:57 +03:00
RustamRu	4c26928d23	fix: fill location from autocomplete (#71 ) 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-01-26 15:47:53 +03:00
Rustam	1471bf94dd	Merge pull request 'fix: option select (#55 )' (#70 ) from feature/graphic-car-body-select into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #70 Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>	2025-01-26 15:26:03 +03:00
RustamRu	d3ffaa97f8	fix: option select (#55 ) 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-01-26 15:06:11 +03:00
ilnaz	acd09d427c	fix: change endpoint order All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-01-26 12:48:54 +03:00
ilnaz	34bf557a6f	fix: change endpoint orders All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-01-26 12:43:40 +03:00
ilnaz	5e0ac9f7a5	fix: change endpoint All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-01-26 12:36:42 +03:00
Ильназ	9a2ef18925	Merge pull request 'feat: add RTK for master' (#69 ) from feature/RTK into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #69	2025-01-26 12:25:44 +03:00
				`@@ -0,0 +1 @@`
				`export { CarBodyOption } from './car-body-option';`