Merge pull request 'feature/order-form-upgrade' (#82) from feature/order-form-upgrade into main

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

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

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

locales/ru.json

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

package.json

@@ -4,7 +4,7 @@
     "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",
@@ -18,6 +18,10 @@
     "license": "ISC",
     "dependencies": {
         "@brojs/cli": "^1.8.4",
+        "@babel/core": "^7.26.7",
+        "@babel/preset-env": "^7.26.7",
+        "@babel/preset-react": "^7.26.3",
+        "@babel/preset-typescript": "^7.26.0",
         "@chakra-ui/icons": "^2.2.4",
         "@chakra-ui/react": "^2.10.5",
         "@emotion/react": "^11.4.1",
@@ -26,12 +30,19 @@
         "@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",
@@ -39,7 +50,9 @@
         "react-icons": "^5.3.0",
         "react-phone-number-input": "^3.4.9",
         "react-redux": "^9.2.0",
-        "react-router-dom": "^6.27.0"
+        "react-router-dom": "^6.27.0",
+        "ts-jest": "^29.2.5",
+        "ts-node": "^10.9.2"
     },
     "devDependencies": {
         "@eslint/js": "^9.14.0",
@@ -50,6 +63,10 @@
         "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"
     }
 }

src/__data__/service/landing.api.ts

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

src/api/index.ts

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

src/api/landing.tsx

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

src/api/types.ts

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

src/assets/animation/index.ts

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

src/models/api/common.ts

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

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

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

src/pages/order-create/index.tsx

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

src/pages/order-view/index.tsx

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

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-pending' };
+const STUBS = { masters: 'success', orders: 'success', orderCreate: 'success', orderView: 'success-pending' };
 
 router.get('/set/:name/:value', (req, res) => {
   const { name, value } = req.params;
@@ -27,6 +27,11 @@ router.get('/', (req, res) => {
       ${generateRadioInput('orders', 'empty')}
     </fieldset>
     <fieldset>
+    <legend>Лендинг - Сделать заказ</legend>
+      ${generateRadioInput('orderCreate', 'success')}
+      ${generateRadioInput('orderCreate', 'error')}
+    </fieldset>
+    <fieldset>
     <legend>Лендинг - Детали заказа</legend>
       ${generateRadioInput('orderView', 'success-pending')}
       ${generateRadioInput('orderView', 'success-working')}

stubs/api/index.js

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

stubs/json/landing-order-create/error.json

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

stubs/json/landing-order-create/success.json

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