feat: add playwright

Reviewed-on: #79
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>

.gitignore

@@ -131,3 +131,9 @@ dist
 .pnp.*
 
 .idea
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

__mocks__/file-mock.ts

@@ -0,0 +1 @@
+module.exports = 'file';

babel.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+  presets: [
+    '@babel/preset-env',
+    '@babel/preset-typescript',
+    ['@babel/preset-react', { runtime: 'automatic' }],
+  ],
+};

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: {

eslint.config.mjs

@@ -1,12 +1,13 @@
-import globals from "globals";
+import globals from 'globals';
-import pluginJs from "@eslint/js";
+import pluginJs from '@eslint/js';
-import tseslint from "typescript-eslint";
+import tseslint from 'typescript-eslint';
-import pluginReact from "eslint-plugin-react";
+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": {
+    rules: {
-      "no-unused-vars": "off",
+      'no-unused-vars': 'off',
-      "@typescript-eslint/no-unused-vars": [
+      '@typescript-eslint/no-unused-vars': [
-        "warn", // or "error"
+        'warn', // or "error"
         {
-          "argsIgnorePattern": "^_",
+          argsIgnorePattern: '^_',
-          "varsIgnorePattern": "^_",
+          varsIgnorePattern: '^_',
-          "caughtErrorsIgnorePattern": "^_"
+          caughtErrorsIgnorePattern: '^_',
-        }
+        },
       ],
-      "sort-imports": ["off"],
+      'sort-imports': ['off'],
-      "import/order": [
+      'import/order': [
-        "error",
+        'error',
         {
-          "groups": [
+          groups: [
-            "builtin",
+            'builtin',
-            "external",
+            'external',
-            "internal",
+            'internal',
-            "parent",
+            'parent',
-            ["sibling", "index"]
+            ['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'],
   },
-  }
 ];

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',
+};

locales/en.json

@@ -39,9 +39,10 @@
   "dry-wash.order-create.car-body-select.options.sports-car" : "Sports-car",
   "dry-wash.order-create.car-body-select.options.other": "Other",
   "dry-wash.order-create.form.submit-button.label": "Submit",
+  "dry-wash.order-create.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.error.title": "Error",
+  "dry-wash.order-view.get-order-query.error.title": "Failed to fetch the details of order",
-  "dry-wash.order-view.fetch.error": "Failed to fetch the details of order #{{number}}",
   "dry-wash.order-view.details.title": "Order #{{number}}",
   "dry-wash.order-view.details.owner": "Owner",
   "dry-wash.order-view.details.car": "Car",
@@ -57,7 +58,8 @@
   "dry-wash.arm.order.status.pending": "Pending",
   "dry-wash.arm.order.status.working": "Working",
   "dry-wash.arm.order.status.canceled": "Canceled",
-  "dry-wash.arm.order.status.placeholder": "Select Status",
+  "dry-wash.arm.order.status.placeholder": "Select status",
+  "dry-wash.arm.order.master.placeholder": "Select master",
   "dry-wash.arm.order.table.header.carNumber": "Car Number",
   "dry-wash.arm.order.table.header.washingTime": "Washing Time",
   "dry-wash.arm.order.table.header.orderDate": "Order Date",
@@ -73,6 +75,10 @@
   "dry-wash.arm.master.table.header.phone": "Phone",
   "dry-wash.arm.master.table.header.actions": "Actions",
   "dry-wash.arm.master.table.actionsMenu.delete": "Delete Master",
+  "dry-wash.arm.master.schedule.empty": "free",
+  "dry-wash.arm.master.editable.aria.cancel": "Undo changes",
+  "dry-wash.arm.master.editable.aria.save": "Save changes ",
+  "dry-wash.arm.master.editable.aria.edit": "Edit",
   "dry-wash.arm.master.drawer.title": "Add New Master",
   "dry-wash.arm.master.drawer.inputName.label": "Full Name",
   "dry-wash.arm.master.drawer.inputName.placeholder": "Enter Full Name",
@@ -80,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",

locales/ru.json

@@ -7,6 +7,7 @@
   "dry-wash.arm.order.status.working": "В работе",
   "dry-wash.arm.order.status.canceled": "Отменено",
   "dry-wash.arm.order.status.placeholder": "Выберите статус",
+  "dry-wash.arm.order.master.placeholder": "Выберите мастера",
   "dry-wash.arm.order.table.header.carNumber": "Номер машины",
   "dry-wash.arm.order.table.header.washingTime": "Время мойки",
   "dry-wash.arm.order.table.header.orderDate": "Дата заказа",
@@ -24,6 +25,10 @@
   "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.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.drawer.title": "Добавить нового мастера",
   "dry-wash.arm.master.drawer.inputName.label": "ФИО",
   "dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
@@ -31,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": "Сухой мастер",
@@ -74,9 +88,10 @@
   "dry-wash.order-create.car-body-select.options.sports-car": "Спорткар",
   "dry-wash.order-create.car-body-select.options.other": "Другой",
   "dry-wash.order-create.form.submit-button.label": "Отправить",
+  "dry-wash.order-create.create-order-query.success.title": "Заказ успешно создан",
+  "dry-wash.order-create.create-order-query.error.title": "Не удалось создать заказ",
   "dry-wash.order-view.title": "Ваш заказ",
-  "dry-wash.order-view.error.title": "Ошибка",
+  "dry-wash.order-view.get-order-query.error.title": "Не удалось загрузить детали заказа",
-  "dry-wash.order-view.fetch.error": "Не удалось загрузить детали заказа №{{number}}",
   "dry-wash.order-view.details.title": "Заказ №{{number}}",
   "dry-wash.order-view.details.owner": "Владелец",
   "dry-wash.order-view.details.car": "Автомобиль",

package.json

@@ -1,10 +1,10 @@
 {
   "name": "dry-wash",
-    "version": "0.4.0",
+  "version": "0.5.0",
   "description": "<a id=\"readme-top\"></a>",
   "main": "./src/index.tsx",
   "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
+    "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",
@@ -17,37 +17,58 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-        "@brojs/cli": "^1.6.3",
+    "@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.4.2",
+    "@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-router-dom": "^6.27.0"
+    "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"
   }
 }

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,
+  // },
+});

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;
+      }
+    }
+  }
+};

src/__data__/service/api.ts

@@ -0,0 +1,27 @@
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
+import { getConfigValue } from '@brojs/cli';
+
+import { Master } from '../../models/api/master';
+
+import { extractBodyFromResponse } from './utils';
+
+export const api = createApi({
+  reducerPath: 'api',
+  baseQuery: fetchBaseQuery({ baseUrl: getConfigValue('dry-wash.api') }),
+  tagTypes: ['Masters'],
+  endpoints: (builder) => ({
+    getMasters: builder.query<Master[], void>({
+      query: () => ({ url: '/arm/masters' }),
+      transformResponse: extractBodyFromResponse<Master[]>,
+      providesTags: ['Masters'],
+    }),
+    addMaster: builder.mutation<void, Pick<Master, 'name' | 'phone'>>({
+      query: (master) => ({
+        url: '/arm/masters',
+        method: 'POST',
+        body: master,
+      }),
+      invalidatesTags: ['Masters'],
+    }),
+  }),
+});

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,
+    })
+  })
+});

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;
+  }
+};

src/__data__/store.ts

@@ -0,0 +1,14 @@
+import { configureStore } from '@reduxjs/toolkit';
+
+import { api } from './service/api';
+
+export const store = configureStore({
+  reducer: {
+    [api.reducerPath]: api.reducer,
+  },
+  middleware: (getDefaultMiddleware) =>
+    getDefaultMiddleware().concat(api.middleware),
+});
+
+export type RootState = ReturnType<typeof store.getState>;
+export type AppDispatch = typeof store.dispatch;

src/api/arm.ts

@@ -1,4 +1,5 @@
 import { getConfigValue } from '@brojs/cli';
+import dayjs from 'dayjs';
 
 enum ArmEndpoints {
   ORDERS = '/arm/orders',
@@ -9,12 +10,15 @@ 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({ date }),
+      body: JSON.stringify({ startDate, endDate }),
     });
 
     if (!response.ok) {
@@ -68,7 +72,68 @@ const armService = () => {
     return await response.json();
   };
 
-  return { fetchOrders, fetchMasters, addMaster, deleteMaster };
+  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 };

src/api/index.ts

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

src/api/landing.ts

@@ -1,25 +0,0 @@
-import { getConfigValue } from '@brojs/cli';
-
-import { Order } from '../models/landing';
-
-enum LandingEndpoints {
-  ORDER_VIEW = '/order'
-}
-
-const LandingService = () => {
-  const endpoint = getConfigValue('dry-wash.api');
-
-  const fetchOrder = async (orderId: Order.Id) => {
-    const response = await fetch(`${endpoint}${LandingEndpoints.ORDER_VIEW}/${orderId}`);
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch order: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  return { fetchOrder };
-};
-
-export { LandingService, LandingEndpoints };

src/api/landing.tsx

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

src/api/types.ts

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

src/app.tsx

@@ -1,12 +1,15 @@
 import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
 import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
+import { Provider } from 'react-redux';
 
 import Routers from './routes';
 import ErrorBoundary from './components/ErrorBoundary';
+import { store } from './__data__/store';
 
 const App = () => {
   return (
+    <Provider store={store}>
       <ChakraProvider theme={chakraTheme}>
         <ErrorBoundary>
           <BrowserRouter>
@@ -14,6 +17,7 @@ const App = () => {
           </BrowserRouter>
         </ErrorBoundary>
       </ChakraProvider>
+    </Provider>
   );
 };
 

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';

src/components/Editable/Editable.tsx

@@ -0,0 +1,119 @@
+import React, { useState } from 'react';
+import {
+  Editable,
+  EditableInput,
+  EditablePreview,
+  Flex,
+  IconButton,
+  Input,
+  useEditableControls,
+  ButtonGroup,
+  Stack,
+  useToast,
+} from '@chakra-ui/react';
+import { CheckIcon, CloseIcon, EditIcon } from '@chakra-ui/icons';
+import { useTranslation } from 'react-i18next';
+
+interface EditableWrapperProps {
+  value: string;
+  onSubmit: ({
+    id,
+    name,
+    phone,
+  }: {
+    id: string;
+    name?: string;
+    phone?: string;
+  }) => Promise<unknown>;
+  as: 'phone' | 'name';
+  id: string;
+}
+
+const EditableWrapper = ({ value, onSubmit, as, id }: EditableWrapperProps) => {
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.master.editable',
+  });
+
+  const toast = useToast();
+  const [currentValue, setCurrentValue] = useState<string>(value);
+
+  const handleSubmit = async (newValue: string) => {
+    if (currentValue === newValue) return;
+
+    try {
+      await onSubmit({ id, [as]: 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);
+    }
+  };
+
+  function EditableControls() {
+    const {
+      isEditing,
+      getSubmitButtonProps,
+      getCancelButtonProps,
+      getEditButtonProps,
+    } = useEditableControls();
+
+    return isEditing ? (
+      <ButtonGroup justifyContent='center' size='sm'>
+        <IconButton
+          aria-label={t('aria.save')}
+          icon={<CheckIcon />}
+          {...getSubmitButtonProps()}
+        />
+        <IconButton
+          aria-label={t('aria.cancel')}
+          icon={<CloseIcon />}
+          {...getCancelButtonProps()}
+        />
+      </ButtonGroup>
+    ) : (
+      <Flex justifyContent='center'>
+        <IconButton
+          aria-label={t('aria.edit')}
+          size='sm'
+          icon={<EditIcon />}
+          {...getEditButtonProps()}
+        />
+      </Flex>
+    );
+  }
+
+  return (
+    <Editable
+      textAlign='center'
+      defaultValue={currentValue}
+      fontSize='2xl'
+      isPreviewFocusable={false}
+      onSubmit={handleSubmit}
+    >
+      <Stack direction={['column', 'row']} spacing='15px'>
+        <EditablePreview />
+        <Input as={EditableInput} />
+        <EditableControls />
+      </Stack>
+    </Editable>
+  );
+};
+
+export default EditableWrapper;

src/components/MasterDrawer/MasterDrawer.tsx

@@ -1,4 +1,5 @@
-import React, { useState } from 'react';
+import React, { useEffect } from 'react';
+import { useForm, SubmitHandler } from 'react-hook-form';
 import {
   Button,
   FormControl,
@@ -14,95 +15,136 @@ import {
   useToast,
   InputGroup,
   InputLeftElement,
+  FormErrorMessage,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import { PhoneIcon } from '@chakra-ui/icons';
 
-import { armService } from '../../api/arm';
+import { api } from '../../__data__/service/api';
+import showToast from '../../helpers/showToast';
+import { DrawerInputs } from '../../models/arm/form';
 
-const MasterDrawer = ({ isOpen, onClose }) => {
+interface MasterDrawerProps {
-  const { addMaster } = armService();
+  isOpen: boolean;
-  const toast = useToast();
+  onClose: () => void;
+}
 
-  const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
+const MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {
-
+  const {
-  const handleSave = async () => {
+    register,
-    if (newMaster.name.trim() === '' || newMaster.phone.trim() === '') {
+    handleSubmit,
-      return;
+    reset,
-    }
+    formState: { errors },
-
+  } = useForm<DrawerInputs>();
-    try {
-      await addMaster(newMaster);
-      toast({
-        title: 'Мастер создан.',
-        description: `Мастер "${newMaster.name}" успешно добавлен.`,
-        status: 'success',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
-      });
-      onClose();
-    } catch (error) {
-      toast({
-        title: 'Ошибка при создании мастера.',
-        description: 'Не удалось добавить мастера. Попробуйте еще раз.',
-        status: 'error',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
-      });
-      console.error(error);
-    }
-  };
 
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.master.drawer',
   });
 
+  const onSubmit: SubmitHandler<DrawerInputs> = async (data) => {
+    const trimMaster = {
+      name: data.name.trim(),
+      phone: data.phone.trim(),
+    };
+
+    const isEmptyFields = trimMaster.name === '' || trimMaster.phone === '';
+
+    if (isEmptyFields) {
+      showToast({
+        toast,
+        title: t('toast.error.base'),
+        description: t('toast.error.empty-fields'),
+        status: 'error',
+      });
+      return;
+    }
+
+    await addMaster(trimMaster);
+  };
+
+  const [addMaster, { error, isSuccess }] = api.useAddMasterMutation();
+  const toast = useToast();
+
+  useEffect(() => {
+    if (isSuccess) {
+      showToast({
+        toast,
+        title: t('toast.create-master'),
+        status: 'success',
+      });
+      reset();
+      onClose();
+    }
+  }, [isSuccess]);
+
+  useEffect(() => {
+    if (error) {
+      showToast({
+        toast,
+        title: t('toast.error.create-master'),
+        description: t('toast.error.create-master-details'),
+        status: 'error',
+      });
+      console.error(error);
+    }
+  }, [error]);
+
   return (
     <Drawer isOpen={isOpen} onClose={onClose} size='md'>
       <DrawerOverlay />
       <DrawerContent>
+        <form onSubmit={handleSubmit(onSubmit)}>
           <DrawerCloseButton />
           <DrawerHeader>{t('title')}</DrawerHeader>
           <DrawerBody>
-          <FormControl mb='4'>
+            <FormControl mb='4' isInvalid={!!errors.name}>
               <FormLabel>{t('inputName.label')}</FormLabel>
               <Input
-              // isInvalid
+                {...register('name', {
-              value={newMaster.name}
+                  required: t('form.name.required'),
-              onChange={(e) =>
+                  minLength: {
-                setNewMaster({ ...newMaster, name: e.target.value })
+                    value: 2,
-              }
+                    message: t('form.name.minLength'),
+                  },
+                })}
                 placeholder={t('inputName.placeholder')}
               />
+              <FormErrorMessage>
+                {errors.name && errors.name.message}
+              </FormErrorMessage>
             </FormControl>
-          <FormControl>
+            <FormControl isInvalid={!!errors.phone}>
               <FormLabel>{t('inputPhone.label')}</FormLabel>
-
               <InputGroup>
                 <InputLeftElement pointerEvents='none'>
                   <PhoneIcon color='gray.300' />
                 </InputLeftElement>
                 <Input
-                // isInvalid
+                  {...register('phone', {
-                value={newMaster.phone}
+                    required: t('form.phone.required'),
-                onChange={(e) =>
+                    pattern: {
-                  setNewMaster({ ...newMaster, phone: e.target.value })
+                      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} onClick={handleSave}>
+            <Button colorScheme='teal' mr={3} type='submit'>
               {t('button.save')}
             </Button>
             <Button variant='ghost' onClick={onClose}>
               {t('button.cancel')}
             </Button>
           </DrawerFooter>
+        </form>
       </DrawerContent>
     </Drawer>
   );

src/components/MasterItem/MasterItem.tsx

@@ -1,37 +1,48 @@
 import React from 'react';
-import { Badge, Link, Stack, Td, Tr } from '@chakra-ui/react';
+import { Badge, Stack, Td, Tr, Text } from '@chakra-ui/react';
+import { useTranslation } from 'react-i18next';
 
 import MasterActionsMenu from '../MasterActionsMenu';
 import { getTimeSlot } from '../../lib';
-
+import EditableWrapper from '../Editable/Editable';
-export interface Schedule {
+import { armService } from '../../api/arm';
-  id: string;
-  startWashTime: string;
-  endWashTime: string;
-}
-
-export type MasterProps = {
-  id: string;
-  name: string;
-  phone: string;
-  schedule: Schedule[];
-};
 
 const MasterItem = ({ name, phone, id, schedule }) => {
+  const { updateMaster } = armService();
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.master',
+  });
+
   return (
     <Tr>
-      <Td>{name}</Td>
       <Td>
+        <EditableWrapper
+          id={id}
+          as={'name'}
+          value={name}
+          onSubmit={updateMaster}
+        />
+      </Td>
+      <Td>
+        {schedule?.length > 0 ? (
           <Stack direction='row'>
-          {schedule.map(({ startWashTime, endWashTime }, index) => (
+            {schedule?.map(({ startWashTime, endWashTime }, index: number) => (
               <Badge colorScheme={'green'} key={index}>
                 {getTimeSlot(startWashTime, endWashTime)}
               </Badge>
             ))}
           </Stack>
+        ) : (
+          <Text color='gray.500'>{t('schedule.empty')}</Text>
+        )}
       </Td>
       <Td>
-        <Link href='tel:'>{phone}</Link>
+        <EditableWrapper
+          id={id}
+          as={'phone'}
+          value={phone}
+          onSubmit={updateMaster}
+        />
       </Td>
       <Td>
         <MasterActionsMenu id={id} />

src/components/Masters/Masters.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import {
   Box,
   Heading,
@@ -19,8 +19,7 @@ import { useTranslation } from 'react-i18next';
 
 import MasterItem from '../MasterItem';
 import MasterDrawer from '../MasterDrawer';
-import { armService } from '../../api/arm';
+import { api } from '../../__data__/service/api';
-import { MasterProps } from '../MasterItem/MasterItem';
 
 const TABLE_HEADERS = [
   'name' as const,
@@ -36,35 +35,23 @@ const Masters = () => {
     keyPrefix: 'dry-wash.arm.master',
   });
 
-  const [masters, setMasters] = useState<MasterProps[]>([]);
+  const {
-  const [loading, setLoading] = useState(false);
+    data: masters,
-  const [error, setError] = useState<string | null>(null);
+    error,
-
+    isLoading,
-  const { fetchMasters } = armService();
+    isSuccess,
+  } = api.useGetMastersQuery();
 
   useEffect(() => {
-    const loadMasters = async () => {
+    if (error) {
-      setLoading(true);
-
-      try {
-        const data = await fetchMasters();
-        setMasters(data.body);
-      } catch (err) {
-        setError(err.message);
       toast({
         title: t('error.title'),
         status: 'error',
-          duration: 5000,
         isClosable: true,
         position: 'bottom-right',
       });
-      } finally {
-        setLoading(false);
     }
-    };
+  }, [error]);
-
-    loadMasters();
-  }, [toast, t]);
 
   return (
     <Box p='8'>
@@ -83,22 +70,21 @@ const Masters = () => {
           </Tr>
         </Thead>
         <Tbody>
-          {loading && (
+          {isLoading && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
                 <Spinner size='lg' />
               </Td>
             </Tr>
           )}
-          {!loading && masters.length === 0 && !error && (
+          {isSuccess && masters.length === 0 && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length}>
                 <Text>{t('table.empty')}</Text>
               </Td>
             </Tr>
           )}
-          {!loading &&
+          {isSuccess &&
-            !error &&
             masters.map((master, index) => (
               <MasterItem key={index} {...master} />
             ))}

src/components/OrderItem/OrderItem.tsx

@@ -1,10 +1,11 @@
-import React, { useState } from 'react';
+import React, { ChangeEvent, useState } from 'react';
 import { Td, Tr, Link, Select } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
 
-import { MasterProps } from '../MasterItem/MasterItem';
 import { getTimeSlot } from '../../lib';
+import { Master } from '../../models/api/master';
+import { armService } from '../../api/arm';
 
 const statuses = [
   'pending' as const,
@@ -25,9 +26,10 @@ export type OrderProps = {
   status?: GetArrItemType<typeof statuses>;
   phone?: string;
   location?: string;
-  master: MasterProps;
+  master: Master;
   notes: '';
-  allMasters: MasterProps[];
+  allMasters: Master[];
+  id: string;
 };
 
 type Status = (typeof statuses)[number];
@@ -50,7 +52,10 @@ const OrderItem = ({
   location,
   master,
   allMasters,
+  id,
 }: OrderProps) => {
+  const { updateOrders } = armService();
+
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.order',
   });
@@ -59,15 +64,37 @@ const OrderItem = ({
   const bgColor = statusColors[statusSelect];
   const [masterSelect, setMaster] = useState(master?.name);
 
+  const handelChangeMasters = (e: ChangeEvent<HTMLSelectElement>) => {
+    const masterName = e.target.value;
+    const selectedMaster = allMasters.find(
+      (master) => master.name === masterName,
+    );
+
+    if (selectedMaster) {
+      setMaster(masterName);
+      updateOrders({ id, masterId: selectedMaster.id });
+    } else {
+      console.error('Master not found');
+    }
+  };
+
+  const handeChangeStatus = (e: ChangeEvent<HTMLSelectElement>) => {
+    const status = e.target.value;
+    updateOrders({ id, status });
+    setStatus(e.target.value as OrderProps['status']);
+  };
+
   return (
     <Tr>
       <Td>{carNumber}</Td>
-      <Td>{getTimeSlot(startWashTime, endWashTime)}</Td>
+      <Td>
-      <Td>{dayjs(orderDate).format('DD.MM.YYYY')}</Td>
+        {dayjs(orderDate).format('DD.MM.YYYY')} <br />
+        {getTimeSlot(startWashTime, endWashTime)}
+      </Td>
       <Td>
         <Select
           value={statusSelect}
-          onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
+          onChange={handeChangeStatus}
           placeholder={t(`status.placeholder`)}
           bg={bgColor}
         >
@@ -81,8 +108,8 @@ const OrderItem = ({
       <Td>
         <Select
           value={masterSelect}
-          onChange={(e) => setMaster(e.target.value as OrderProps['status'])}
+          onChange={handelChangeMasters}
-          placeholder={t(`status.placeholder`)}
+          placeholder={t(`master.placeholder`)}
         >
           {allMasters.map((item) => (
             <option key={item.id} value={item.name}>

src/components/Orders/Orders.tsx

@@ -19,11 +19,10 @@ import OrderItem from '../OrderItem';
 import { OrderProps } from '../OrderItem/OrderItem';
 import { armService } from '../../api/arm';
 import DateNavigator from '../DateNavigator';
-import { MasterProps } from '../MasterItem/MasterItem';
+import { Master } from '../../models/api/master';
 
 const TABLE_HEADERS = [
   'carNumber' as const,
-  'washingTime' as const,
   'orderDate' as const,
   'status' as const,
   'masters' as const,
@@ -42,7 +41,7 @@ const Orders = () => {
   const toast = useToast();
 
   const [orders, setOrders] = useState<OrderProps[]>([]);
-  const [allMasters, setAllMasters] = useState<MasterProps[]>([]);
+  const [allMasters, setAllMasters] = useState<Master[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [currentDate, setCurrentDate] = useState(new Date());

src/components/order-form/form/car-body/car-body-select.tsx

@@ -1,32 +1,38 @@
-import React, { forwardRef, useState } from 'react';
+import React, { forwardRef } from 'react';
 import {
   Input,
-  Image,
-  InputProps,
   Box,
   Popover,
   PopoverAnchor,
   PopoverContent,
   PopoverBody,
-  List,
+  useRadioGroup,
-  ListItem,
+  Grid,
+  GridItem,
+  UseRadioGroupProps,
+  useDisclosure,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 
-import { carBodySelectOptions } from './helper';
+import { carBodySelectOptions, getInputValue } from './helper';
-import { CarBodySelectOption } from './types';
+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 [selected, setSelected] = useState<Partial<CarBodySelectOption>>({});
+    const handleOptionClick: UseRadioGroupProps['onChange'] = (value) => {
-    const handleOptionClick = (option: CarBodySelectOption) => {
-      setSelected(option);
       // 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',
@@ -35,7 +41,7 @@ export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
     return (
       <Box width='100%'>
         <Popover
-          isOpen={isDropdownOpen}
+          isOpen={isOpen}
           autoFocus={false}
           placement='bottom-start'
           matchWidth
@@ -44,45 +50,29 @@ export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
             <Input
               {...props}
               ref={ref}
-              value={
+              value={getInputValue(Number(value), t) ?? props.value}
-                selected?.labelTKey
-                  ? t(`options.${selected.labelTKey}`)
-                  : undefined
-              }
               readOnly
-              onClick={() => setIsDropdownOpen(true)}
+              onClick={onOpen}
-              onBlur={() => setIsDropdownOpen(false)}
+              onBlur={onClose}
               placeholder={t('placeholder')}
             />
           </PopoverAnchor>
           <PopoverContent width='100%' maxWidth='100%'>
             <PopoverBody border='1px' borderColor='gray.300' p={0}>
-              <List
+              <Grid
-                display='grid'
+                templateColumns='repeat(auto-fit, minmax(150px, 1fr))'
-                gridTemplateColumns='repeat(auto-fit, minmax(150px, 1fr))'
+                {...getRootProps()}
               >
-                {carBodySelectOptions.map((option) => (
+                {carBodySelectOptions.map(({ value, img, labelTKey }) => (
-                  <ListItem
+                  <GridItem key={value}>
-                    key={option.value}
+                    <CarBodyOption
-                    display='flex'
+                      image={img}
-                    flexDirection='column'
+                      label={t(`options.${labelTKey}`)}
-                    justifyContent='flex-end'
+                      {...getRadioProps({ value: String(value) })}
-                    alignItems='center'
+                    />
-                    p={2}
+                  </GridItem>
-                    cursor='pointer'
-                    _hover={{
-                      bgColor: 'primary.50',
-                    }}
-                    _active={{
-                      bgColor: 'primary.100',
-                    }}
-                    onClick={() => handleOptionClick(option)}
-                  >
-                    <Image src={option.img} />
-                    {t(`options.${option.labelTKey}`)}
-                  </ListItem>
                 ))}
-              </List>
+              </Grid>
             </PopoverBody>
           </PopoverContent>
         </Popover>

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;
+};

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>
+  );
+};

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' },
+  };
+};

src/components/order-form/form/car-body/option/index.ts

@@ -0,0 +1 @@
+export { CarBodyOption } from './car-body-option';

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'>;

src/components/order-form/form/helper.ts

@@ -1,7 +1,4 @@
 import { useTranslation } from "react-i18next";
-import { InputProps, SelectProps } from "@chakra-ui/react";
-
-import { Order } from "../../../models/landing";
 
 import { FormFieldProps } from "./field";
 import { OrderFormValues } from "./types";
@@ -12,6 +9,7 @@ export const defaultValues: Partial<OrderFormValues> = {
   phone: '',
   carNumber: '',
   carColor: '',
+  carBody: '',
   availableDatetimeBegin: '',
   availableDatetimeEnd: '',
 };
@@ -30,38 +28,3 @@ export const useGetValidationRules = () => {
     },
   } satisfies Record<string, FormFieldProps['rules']>;
 };
-
-const removeAllSpaces = (str: string) => str.replace(/\s+/g, '');
-
-const getValidCarBodyStyle = (fieldValue: string) => {
-  const carBodyAsNumber = Number(fieldValue);
-  return Number.isNaN(carBodyAsNumber) ? undefined : carBodyAsNumber;
-};
-
-export const formatFormValues = ({ phone, carNumber, carBody, carColor, carLocation, availableDatetimeBegin, availableDatetimeEnd }: OrderFormValues): Order.Create => {
-  return {
-    customer: {
-      phone
-    },
-    car: {
-      number: removeAllSpaces(carNumber),
-      body: getValidCarBodyStyle(carBody),
-      color: carColor
-    },
-    washing: {
-      location: carLocation,
-      begin: availableDatetimeBegin,
-      end: availableDatetimeEnd,
-    }
-  };
-};
-
-export const onSubmit = (values: OrderFormValues) => {
-  return new Promise((resolve) => {
-    console.log(formatFormValues(values));
-    resolve(formatFormValues(values));
-  });
-};
-
-export const inputCommonStyles: Partial<InputProps & SelectProps> = {
-};

src/components/order-form/form/index.ts

@@ -1 +1,2 @@
+export type { OrderFormValues, OrderFormProps } from './types';
 export { OrderForm } from './order-form';

src/components/order-form/form/location/location-input/location-input.tsx

@@ -42,6 +42,13 @@ export const LocationInput = memo(
 
       const onInputChange: InputProps['onChange'] = async (e) => {
         const newInputValue = e.target.value;
+
+        if (
+          isValidLocation(newInputValue) &&
+          (await isRealLocation(ymaps, newInputValue))
+        ) {
+          onChange(newInputValue);
+        } else {
           setInputValue(newInputValue);
   
           if (newInputValue.trim().length > 3) {
@@ -57,6 +64,7 @@ export const LocationInput = memo(
           }
   
           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')}

src/components/order-form/form/order-form.tsx

@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import React from 'react';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { Box, Flex, FormControl, FormLabel, VStack } from '@chakra-ui/react';
@@ -7,14 +7,19 @@ import { CarBodySelect } from './car-body';
 import { CarColorInput } from './car-color';
 import { CarNumberInput } from './car-number';
 import { FormInputField, FormControllerField } from './field';
-import { OrderFormValues } from './types';
+import { OrderFormProps, OrderFormValues } from './types';
 import { PhoneInput } from './phone';
 import { SubmitButton } from './submit';
-import { defaultValues, onSubmit, useGetValidationRules } from './helper';
+import { defaultValues, useGetValidationRules } from './helper';
 import { DateTimeInput } from './date-time';
-import { LocationInput, MapComponent, StringLocation, YMapsProvider } from './location';
+import {
+  LocationInput,
+  MapComponent,
+  StringLocation,
+  YMapsProvider,
+} from './location';
 
-export const OrderForm: FC = () => {
+export const OrderForm = ({ onSubmit, loading }: OrderFormProps) => {
   const {
     handleSubmit,
     control,
@@ -123,7 +128,7 @@ export const OrderForm: FC = () => {
             }}
           />
         </YMapsProvider>
-        <SubmitButton isLoading={isSubmitting} mt={4} />
+        <SubmitButton isLoading={isSubmitting || loading} mt={4} />
       </VStack>
     </Box>
   );

src/components/order-form/form/types.ts

@@ -1,3 +1,5 @@
+import { SubmitHandler } from "react-hook-form";
+
 export type OrderFormValues = {
   phone: string;
   carNumber: string;
@@ -7,3 +9,8 @@ export type OrderFormValues = {
   availableDatetimeBegin: string;
   availableDatetimeEnd: string;
 };
+
+export type OrderFormProps = {
+  onSubmit: SubmitHandler<OrderFormValues>;
+  loading: boolean;
+};

src/components/order-view/details/order-details.tsx

@@ -17,18 +17,30 @@ import { carBodySelectOptions } from '../../order-form/form/car-body/helper';
 
 import { OrderStatus } from './status';
 
-type OrderDetailsProps = Order.View;
+type OrderDetailsProps = Pick<
+  Order.View,
+  | 'orderNumber'
+  | 'status'
+  | 'phone'
+  | 'carNumber'
+  | 'carBody'
+  | 'carColor'
+  | 'location'
+  | 'startWashTime'
+  | 'endWashTime'
+  | 'created'
+>;
 
 export const OrderDetails: FC<OrderDetailsProps> = ({
-  id,
+  orderNumber,
   status,
   phone,
   carNumber,
   carBody,
   carColor,
   location,
-  datetimeBegin,
+  startWashTime,
-  datetimeEnd,
+  endWashTime,
 }) => {
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.order-view.details',
@@ -46,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>
@@ -75,8 +87,8 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
           {
             label: t('datetime-range'),
             value: [
-              formatDatetime(datetimeBegin),
+              formatDatetime(startWashTime),
-              formatDatetime(datetimeEnd),
+              formatDatetime(endWashTime),
             ].join(' - '),
           },
         ].map(({ label, value }, i) => (

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':

src/containers/LandingThemeProvider/LandingThemeProvider.tsx

@@ -1,14 +1,31 @@
-import React, { FC, PropsWithChildren } from 'react';
+import React, { ComponentType, FC, PropsWithChildren } from 'react';
 import { ChakraProvider } from '@chakra-ui/react';
 
 import { default as landingTheme } from './theme-config';
 import Fonts from './Fonts';
+import { toastOptions } from './toast-options';
 
 export const LandingThemeProvider: FC<PropsWithChildren> = ({ children }) => {
   return (
-    <ChakraProvider theme={landingTheme}>
+    <ChakraProvider theme={landingTheme} toastOptions={toastOptions}>
       <Fonts />
       {children}
     </ChakraProvider>
   );
 };
+
+export function withLandingThemeProvider<T extends JSX.IntrinsicAttributes>(WrappedComponent: ComponentType<T>) {
+  const displayName = WrappedComponent.displayName || WrappedComponent.name || 'Component';
+
+  const ComponentWithLandingThemeProvider = (props: T) => {
+    return (
+      <LandingThemeProvider>
+        <WrappedComponent {...props} />
+      </LandingThemeProvider>
+    );
+  };
+
+  ComponentWithLandingThemeProvider.displayName = `withLandingThemeProvider(${displayName})`;
+
+  return ComponentWithLandingThemeProvider;
+}

src/containers/LandingThemeProvider/index.ts

@@ -1 +1 @@
-export { LandingThemeProvider } from './LandingThemeProvider';
+export { LandingThemeProvider, withLandingThemeProvider } from './LandingThemeProvider';

src/containers/LandingThemeProvider/toast-options.ts

@@ -0,0 +1,8 @@
+import { ToastProviderProps } from "@chakra-ui/react";
+
+export const toastOptions: ToastProviderProps = {
+  defaultOptions: {
+    position: 'top-right',
+    isClosable: true,
+  }
+};

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;

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;

src/models/api/index.ts

@@ -1 +1,2 @@
-export * from './order-view';
+export * from './common';
+export * from './order';

src/models/api/master.ts

@@ -0,0 +1,12 @@
+export interface Schedule {
+  id: string;
+  startWashTime: string;
+  endWashTime: string;
+}
+
+export type Master = {
+  id: string;
+  name: string;
+  phone: string;
+  schedule: Schedule[];
+};

src/models/api/order-view.ts

@@ -1,14 +0,0 @@
-import { Order } from "../landing";
-
-export type FetchOrderQueryResponse = {
-  id: string;
-  orderDate: string;
-  carNumber: string;
-  carBody: number;
-  carColor?: string;
-  startWashTime: string;
-  endWashTime: string;
-  status: Order.Status;
-  phone: string;
-  location: string;
-};

src/models/api/order.ts

@@ -0,0 +1,21 @@
+/* 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
+  };
+  export type Params = {
+    body: Order.Create
+  };
+};

src/models/arm/form.ts

@@ -0,0 +1,4 @@
+export type DrawerInputs = {
+  phone: string;
+  name: string;
+};

src/models/common.ts

@@ -0,0 +1 @@
+export type IsoDate = string; // YYYY-MM-DDThh:mm:ss.mmmZ

src/models/landing/car.ts

@@ -1,4 +1,4 @@
-export type RegistrationNumber = string; // А012ВЕ
+export type RegistrationNumber = string; // А012ВЕ16
 
 export type Color = string; // #000000
 

src/models/landing/order.ts

@@ -1,3 +1,5 @@
+import { IsoDate } from "../common";
+
 import { Car, Customer, Washing } from ".";
 
 export type Id = string;
@@ -24,15 +26,20 @@ export type Create = {
   }
 };
 
+export type Number = string;
+
 export type View = {
-  id: Id;
-  orderDate: string,
-  status: Status,
   phone: Customer.PhoneNumber;
   carNumber: Car.RegistrationNumber;
   carBody: Car.BodyStyle;
   carColor?: Car.Color;
   location: Washing.Location;
-  datetimeBegin: Washing.AvailableBeginDateTime;
+  startWashTime: Washing.AvailableBeginDateTime;
-  datetimeEnd: Washing.AvailableEndDateTime;
+  endWashTime: Washing.AvailableEndDateTime;
+  orderNumber: Number,
+  status: Status,
+  notes: string;
+  created: IsoDate;
+  updated: IsoDate;
+  id: Id;
 };

src/models/landing/washing.ts

@@ -1,5 +1,7 @@
-export type Location = string; // ?
+import { IsoDate } from "../common";
 
-export type AvailableBeginDateTime = string; // YYYY-MM-DDThh:mm
+export type Location = string; // 55.754364, 48.743295 Университетская улица, 1, Иннополис, Верхнеуслонский район, Республика Татарстан (Татарстан), 420500
 
-export type AvailableEndDateTime = string; // YYYY-MM-DDThh:mm
+export type AvailableBeginDateTime = IsoDate; 
+
+export type AvailableEndDateTime = IsoDate;

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>
+`;

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();
+  });
+});

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 = () => {
+interface PageProps {
-  const [user, setUser] = useState(null);
+  mockUser?: { name: string };
+}
+
+const Page = ({ mockUser }: PageProps) => {
+  const [user, setUser] = useState(mockUser || null);
 
   const navigate = useNavigate();
 

src/pages/order-create/helper.ts

@@ -0,0 +1,29 @@
+import dayjs from "dayjs";
+
+import { Order } from "../../models/landing";
+import { OrderFormValues } from "../../components/order-form";
+
+const removeAllSpaces = (str: string) => str.replace(/\s+/g, '');
+
+const getValidCarBodyStyle = (fieldValue: string) => {
+  const carBodyAsNumber = Number(fieldValue);
+  return Number.isNaN(carBodyAsNumber) ? undefined : carBodyAsNumber;
+};
+
+export const formatFormValues = ({ phone, carNumber, carBody, carColor, carLocation, availableDatetimeBegin, availableDatetimeEnd }: OrderFormValues): Order.Create => {
+  return {
+    customer: {
+      phone
+    },
+    car: {
+      number: removeAllSpaces(carNumber),
+      body: getValidCarBodyStyle(carBody),
+      color: carColor
+    },
+    washing: {
+      location: carLocation,
+      begin: dayjs(availableDatetimeBegin).toISOString(),
+      end: dayjs(availableDatetimeEnd).toISOString(),
+    }
+  };
+};

src/pages/order-create/index.tsx

@@ -1,17 +1,44 @@
 import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Container, Heading, VStack } from '@chakra-ui/react';
+import { Container, Heading, useToast, VStack } from '@chakra-ui/react';
+import { useNavigate } from 'react-router-dom';
 
-import { LandingThemeProvider } from '../../containers';
+import { withLandingThemeProvider } from '../../containers';
-import { OrderForm } from '../../components/order-form';
+import { OrderForm, OrderFormProps } from '../../components/order-form';
+import { useCreateOrderMutation } from '../../api';
+import { URLs } from '../../__data__/urls';
+
+import { formatFormValues } from './helper';
 
 const Page: FC = () => {
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.order-create',
   });
 
+  const [createOrder, createOrderMutation] = useCreateOrderMutation();
+
+  const toast = useToast();
+  const navigate = useNavigate();
+
+  const onOrderFormSubmit: OrderFormProps['onSubmit'] = (values) => {
+    createOrder({ body: formatFormValues(values) })
+      .then(({ body: { id: orderId } }) => {
+        navigate({ pathname: URLs.orderView.getUrl(orderId) });
+        toast({
+          status: 'success',
+          title: t('create-order-query.success.title'),
+        });
+      })
+      .catch(({ error: errorMessage }) => {
+        toast({
+          status: 'error',
+          title: t('create-order-query.error.title'),
+          description: errorMessage,
+        });
+      });
+  };
+
   return (
-    <LandingThemeProvider>
     <Container
       w='full'
       maxWidth='container.xl'
@@ -21,12 +48,16 @@ const Page: FC = () => {
       centerContent
     >
       <VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
-          <Heading textAlign='center' mt={4}>{t('title')}</Heading>
+        <Heading textAlign='center' mt={4}>
-          <OrderForm />
+          {t('title')}
+        </Heading>
+        <OrderForm
+          onSubmit={onOrderFormSubmit}
+          loading={createOrderMutation.isLoading}
+        />
       </VStack>
     </Container>
-    </LandingThemeProvider>
   );
 };
 
-export default Page;
+export default withLandingThemeProvider(Page);

src/pages/order-view/helper.tsx

@@ -1,40 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { LandingService } from '../../api/landing';
-import { Order } from '../../models/landing';
-import { FetchOrderQueryResponse } from '../../models/api';
-
-export const useFetchOrderDetails = ({
-  orderId,
-}: {
-  orderId: Order.View['id'];
-}) => {
-  const { fetchOrder } = LandingService();
-
-  const [data, setData] = useState<FetchOrderQueryResponse>();
-  const [isLoading, setIsLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  useEffect(() => {
-    const fetchData = async () => {
-      setIsLoading(true);
-
-      try {
-        const data = await fetchOrder(orderId);
-        setData(data.body);
-      } catch (error) {
-        setError(error.message);
-      } finally {
-        setIsLoading(false);
-      }
-    };
-
-    fetchData();
-  }, []);
-
-  return {
-    isLoading,
-    data,
-    error,
-  };
-};

src/pages/order-view/index.tsx

@@ -1,36 +1,51 @@
-import React, { FC, useEffect } from 'react';
+import React, { FC } from 'react';
-import { HStack, Spinner, useToast } 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';
 
-import { LandingThemeProvider } from '../../containers';
+import {
+  LandingThemeProvider,
+  withLandingThemeProvider,
+} from '../../containers';
 import { OrderDetails } from '../../components/order-view';
-
+import { Order } from '../../models/landing';
-import { useFetchOrderDetails } from './helper';
+import { landingApi } from '../../__data__/service/landing.api';
+import { ErrorMessage } from '../../models/api';
+import { FEATURE } from '../../__data__/features';
 
 const Page: FC = () => {
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.order-view',
   });
 
-  const { orderId } = useParams();
+  const { orderId } = useParams<Order.Id>();
-
+  const {
-  const { isLoading, data, error } = useFetchOrderDetails({ orderId });
+    isLoading,
-
+    isSuccess,
-  const toast = useToast();
+    data: order,
-  useEffect(() => {
+    isError,
-    if (error) {
+    error,
-      toast({
+  } = landingApi.useGetOrderQuery(
-        title: t('error.title'),
+    {
-        description: t('fetch.error'),
+      orderId,
-        status: 'error',
+    },
-        duration: 5000,
+    FEATURE.orderViewStatusPolling.isOn
-        isClosable: true,
+      ? {
-        position: 'bottom-right',
+        pollingInterval: FEATURE.orderViewStatusPolling.getValue(),
-      });
+        skipPollingIfUnfocused: true,
       }
-  }, [error]);
+      : undefined,
+  );
+  const errorMessage = error as ErrorMessage;
 
   return (
     <LandingThemeProvider>
@@ -51,20 +66,37 @@ const Page: FC = () => {
               <Spinner size='lg' />
             </HStack>
           ) : (
-            data && (
+            <>
+              <>
+                {isSuccess && (
                   <OrderDetails
-                id={data.id}
+                    orderNumber={order.orderNumber}
-                orderDate={data.orderDate}
+                    status={order.status}
-                status={data.status}
+                    phone={order.phone}
-                phone={data.phone}
+                    carNumber={order.carNumber}
-                carNumber={data.carNumber}
+                    carBody={order.carBody}
-                carBody={data.carBody}
+                    carColor={order.carColor}
-                carColor={data.carColor}
+                    location={order.location}
-                location={data.location}
+                    startWashTime={order.startWashTime}
-                datetimeBegin={data.startWashTime}
+                    endWashTime={order.endWashTime}
-                datetimeEnd={data.endWashTime}
+                    created={order.created}
                   />
-            )
+                )}
+              </>
+              <>
+                {isError && (
+                  <Alert status='error' alignItems='flex-start'>
+                    <AlertIcon />
+                    <Box>
+                      <AlertTitle>
+                        {t('get-order-query.error.title')}
+                      </AlertTitle>
+                      <AlertDescription>{errorMessage}</AlertDescription>
+                    </Box>
+                  </Alert>
+                )}
+              </>
+            </>
           )}
         </VStack>
       </Container>
@@ -72,4 +104,4 @@ const Page: FC = () => {
   );
 };
 
-export default Page;
+export default withLandingThemeProvider(Page);

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;
@@ -18,15 +18,18 @@ router.get('/', (req, res) => {
     <legend>Мастера</legend>
       ${generateRadioInput('masters', 'success')}
       ${generateRadioInput('masters', 'error')}
+      ${generateRadioInput('masters', 'empty')}
     </fieldset>
     <fieldset> 
     <legend>Заказы</legend>
       ${generateRadioInput('orders', 'success')}
       ${generateRadioInput('orders', 'error')}  
+      ${generateRadioInput('orders', 'empty')}
     </fieldset>
     <fieldset> 
     <legend>Лендинг - Детали заказа</legend>
-      ${generateRadioInput('orderView', 'success')}
+      ${generateRadioInput('orderView', 'success-pending')}
+      ${generateRadioInput('orderView', 'success-working')}
       ${generateRadioInput('orderView', 'error')}
     </fieldset>
 </div>`);

stubs/api/index.js

@@ -53,6 +53,16 @@ router.delete('/arm/masters/:id', (req, res) => {
     );
 });
 
+router.patch('/orders/:id', (req, res) => {
+  res
+    .status(/error/.test(STUBS.orders) ? 500 : 200)
+    .send(
+      /^error$/.test(STUBS.orders)
+        ? commonError
+        : require(`../json/arm-orders/${STUBS.orders}.json`),
+    );
+});
+
 router.post('/arm/orders', (req, res) => {
   res
     .status(/error/.test(STUBS.orders) ? 500 : 200)
@@ -76,6 +86,10 @@ router.get('/order/:orderId', ({ params }, res) => {
     );
 });
 
+router.post('/order/create', (req, res) => {
+  res.status(200).send({ success: true, body: { ok: true } });
+});
+
 router.use('/admin', require('./admin'));
 
 module.exports = router;

stubs/json/arm-masters/empty.json

@@ -0,0 +1,4 @@
+{
+  "success": true,
+  "body": []
+}

stubs/json/arm-masters/success.json

@@ -2,23 +2,18 @@
   "success": true,
   "body": [
     {
-      "id": "masters1",
+      "id": "4545423234",
       "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"
     },
     {
-      "id": "masters12",
+      "name": "Олег Макаров",
-      "name": "Иван Иванов",
+      "phone": "79001234567",
+      "id": "23423442"
+    },
+    {
+      "id": "345354234",
+      "name": "Иван Галкин",
       "schedule": [ {
         "id": "order1",
         "startWashTime": "2024-11-24T10:30:00.000Z",

stubs/json/arm-orders/empty.json

@@ -0,0 +1,4 @@
+{
+  "success": true,
+  "body": []
+}

stubs/json/arm-orders/success.json

@@ -7,10 +7,14 @@
       "startWashTime": "2024-11-24T10:30:00.000Z",
       "endWashTime": "2024-11-24T16:30:00.000Z",
       "orderDate": "2024-11-24T08:41:46.366Z",
-      "status": "progress",
+      "status": "pending",
       "phone": "79001234563",
       "location": "Казань, ул. Баумана, 1",
-      "master": [],
+      "master": {
+        "name": "Олег Макаров",
+        "phone": "79001234567",
+        "id": "23423442"
+      },
       "notes": ""
     },
     {

stubs/json/landing-order-view/1-success.json

@@ -1,14 +0,0 @@
-{
-  "success": true,
-  "body": {
-    "id": "order1",
-    "orderDate": "2024-11-24T08:41:46.366Z",
-    "status": "progress",
-    "carNumber": "A123BC",
-    "carBody": 1,
-    "startWashTime": "2024-11-24T10:30:00.000Z",
-    "endWashTime": "2024-11-24T16:30:00.000Z",
-    "phone": "79001234563",
-    "location": "55.754364, 48.743295 Университетская улица, 1, Иннополис, Верхнеуслонский район, Республика Татарстан (Татарстан), 420500"
-  }
-}

stubs/json/landing-order-view/id1-error.json

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

stubs/json/landing-order-view/id1-success-pending.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": "pending",
+      "notes": "",
+      "created": "2025-01-19T14:04:02.985Z",
+      "updated": "2025-01-19T14:04:02.987Z",
+      "id": "id1"
+  }
+}

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"
+  }
+}

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();
+});