0.6.0

Reviewed-on: #83

.gitignore

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

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

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

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "dry-wash",
-    "version": "0.5.0",
+    "version": "0.6.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "dry-wash",
-            "version": "0.5.0",
+            "version": "0.6.0",
             "license": "ISC",
             "dependencies": {
                 "@babel/core": "^7.26.7",
@@ -48,7 +48,9 @@
             },
             "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",
@@ -3619,6 +3621,21 @@
                 "node": ">=14"
             }
         },
+        "node_modules/@playwright/test": {
+            "version": "1.50.1",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.1.tgz",
+            "integrity": "sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ==",
+            "dev": true,
+            "dependencies": {
+                "playwright": "1.50.1"
+            },
+            "bin": {
+                "playwright": "cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
         "node_modules/@popperjs/core": {
             "version": "2.11.8",
             "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
@@ -4003,12 +4020,11 @@
             "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
         },
         "node_modules/@types/node": {
-            "version": "22.9.0",
+            "version": "22.13.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
-            "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
+            "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
-            "license": "MIT",
             "dependencies": {
-                "undici-types": "~6.19.8"
+                "undici-types": "~6.20.0"
             }
         },
         "node_modules/@types/parse-json": {
@@ -12110,6 +12126,50 @@
                 "node": ">=4"
             }
         },
+        "node_modules/playwright": {
+            "version": "1.50.1",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.1.tgz",
+            "integrity": "sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw==",
+            "dev": true,
+            "dependencies": {
+                "playwright-core": "1.50.1"
+            },
+            "bin": {
+                "playwright": "cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "optionalDependencies": {
+                "fsevents": "2.3.2"
+            }
+        },
+        "node_modules/playwright-core": {
+            "version": "1.50.1",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.1.tgz",
+            "integrity": "sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ==",
+            "dev": true,
+            "bin": {
+                "playwright-core": "cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/playwright/node_modules/fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "dev": true,
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
         "node_modules/popmotion": {
             "version": "11.0.3",
             "resolved": "https://registry.npmjs.org/popmotion/-/popmotion-11.0.3.tgz",
@@ -14382,10 +14442,9 @@
             }
         },
         "node_modules/undici-types": {
-            "version": "6.19.8",
+            "version": "6.20.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-            "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+            "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
-            "license": "MIT"
         },
         "node_modules/unicode-canonical-property-names-ecmascript": {
             "version": "2.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dry-wash",
-    "version": "0.5.0",
+  "version": "0.6.0",
   "description": "<a id=\"readme-top\"></a>",
   "main": "./src/index.tsx",
   "scripts": {
@@ -17,11 +17,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-        "@brojs/cli": "^1.8.4",
     "@babel/core": "^7.26.7",
     "@babel/preset-env": "^7.26.7",
     "@babel/preset-react": "^7.26.3",
     "@babel/preset-typescript": "^7.26.0",
+    "@brojs/cli": "^1.8.4",
     "@chakra-ui/icons": "^2.2.4",
     "@chakra-ui/react": "^2.10.5",
     "@emotion/react": "^11.4.1",
@@ -56,7 +56,9 @@
   },
   "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",

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__/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/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,6 +36,8 @@ const Page: FC = () => {
       centerContent
     >
       <VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
+        {createOrderMutation.isUninitialized ? (
+          <>
             <Heading textAlign='center' mt={4}>
               {t('title')}
             </Heading>
@@ -55,6 +45,15 @@ const Page: FC = () => {
               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>
+                      {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"
+  }
+}

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