0.6.0

Reviewed-on: #83

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

@@ -25,10 +25,16 @@
   "dry-wash.arm.master.table.header.phone": "Телефон",
   "dry-wash.arm.master.table.header.actions": "Действия",
   "dry-wash.arm.master.table.actionsMenu.delete": "Удалить мастера",
+  "dry-wash.arm.master.table.actionsMenu.toast.success": "Мастер удалён",
+  "dry-wash.arm.master.table.actionsMenu.toast.error.title": "Ошибка!",
+  "dry-wash.arm.master.table.actionsMenu.toast.error.description": "Не удалось удалить мастера. Попробуйте ещё раз.",
   "dry-wash.arm.master.schedule.empty": "Свободен",
   "dry-wash.arm.master.editable.aria.cancel": "Отменить изменения",
   "dry-wash.arm.master.editable.aria.save": "Сохранить изменения",
   "dry-wash.arm.master.editable.aria.edit": "Редактировать",
+  "dry-wash.arm.master.editable.toast.success": "Успешно!",
+  "dry-wash.arm.master.editable.toast.error.description": "Не удалось обновить данные",
+  "dry-wash.arm.master.editable.toast.error.title": "Ошибка!",
   "dry-wash.arm.master.drawer.title": "Добавить нового мастера",
   "dry-wash.arm.master.drawer.inputName.label": "ФИО",
   "dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
@@ -88,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",

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

src/__data__/service/api.ts

@@ -1,20 +1,51 @@
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
 import { getConfigValue } from '@brojs/cli';
+import dayjs from 'dayjs';
 
-import { Master } from '../../models/api/master';
+import { Master, OrderArm } from '../../models/api';
 
 import { extractBodyFromResponse } from './utils';
 
+export type UpdateMasterPayload = Required<Pick<Master, 'id'>> &
+  Partial<Omit<Master, 'id'>>;
+
+type UpdateOrderProps = Required<Pick<OrderArm, 'id'>> &
+  Partial<Pick<OrderArm, 'status' | 'notes'>> & {
+    master?: string;
+  };
+
 export const api = createApi({
   reducerPath: 'api',
   baseQuery: fetchBaseQuery({ baseUrl: getConfigValue('dry-wash.api') }),
-  tagTypes: ['Masters'],
+  tagTypes: ['Masters', 'Orders'],
   endpoints: (builder) => ({
     getMasters: builder.query<Master[], void>({
       query: () => ({ url: '/arm/masters' }),
       transformResponse: extractBodyFromResponse<Master[]>,
       providesTags: ['Masters'],
     }),
+    updateOrders: builder.mutation<void, UpdateOrderProps>({
+      query: ({ id, status, notes, master }) => ({
+        url: `/order/${id}`,
+        method: 'PATCH',
+        body: { status, notes, master },
+      }),
+      invalidatesTags: ['Orders'],
+    }),
+    getOrders: builder.query<OrderArm[], { date: Date }>({
+      query: ({ date }) => {
+        const startDate = dayjs(date).startOf('day').toISOString();
+        const endDate = dayjs(date).endOf('day').toISOString();
+        return {
+          url: '/arm/orders',
+          method: 'POST',
+          body: { startDate, endDate },
+        };
+      },
+      transformResponse: extractBodyFromResponse<OrderArm[]>,
+      providesTags: ['Orders'],
+    }),
+
     addMaster: builder.mutation<void, Pick<Master, 'name' | 'phone'>>({
       query: (master) => ({
         url: '/arm/masters',
@@ -23,5 +54,29 @@ export const api = createApi({
       }),
       invalidatesTags: ['Masters'],
     }),
+    deleteMaster: builder.mutation<void, { id: string }>({
+      query: ({ id }) => ({
+        url: `/arm/masters/${id}`,
+        method: 'DELETE',
+      }),
+      invalidatesTags: ['Masters'],
+    }),
+    updateMaster: builder.mutation<void, UpdateMasterPayload>({
+      query: ({ id, name, phone }) => ({
+        url: `/arm/masters/${id}`,
+        method: 'PATCH',
+        body: { name, phone },
+      }),
+      invalidatesTags: ['Masters'],
+    }),
   }),
 });
+
+export const {
+  useGetMastersQuery,
+  useAddMasterMutation,
+  useDeleteMasterMutation,
+  useUpdateMasterMutation,
+  useGetOrdersQuery,
+  useUpdateOrdersMutation,
+} = api;

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/arm.ts

@@ -1,139 +0,0 @@
-import { getConfigValue } from '@brojs/cli';
-import dayjs from 'dayjs';
-
-enum ArmEndpoints {
-  ORDERS = '/arm/orders',
-  MASTERS = '/arm/masters',
-}
-
-const armService = () => {
-  const endpoint = getConfigValue('dry-wash.api');
-
-  const fetchOrders = async ({ date }: { date: Date }) => {
-    const startDate = dayjs(date).startOf('day').toISOString();
-    const endDate = dayjs(date).endOf('day').toISOString();
-
-    const response = await fetch(`${endpoint}${ArmEndpoints.ORDERS}`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ startDate, endDate }),
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch orders: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  const fetchMasters = async () => {
-    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`);
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch masters: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  const addMaster = async ({
-    name,
-    phone,
-  }: {
-    name: string;
-    phone: string;
-  }) => {
-    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ name, phone }),
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch masters: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  const deleteMaster = async ({ id }: { id: string }) => {
-    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
-      method: 'DELETE',
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch masters: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  const updateOrders = async ({
-    id,
-    status,
-    notes,
-    masterId,
-  }: {
-    id: string;
-    status?: string;
-    notes?: string;
-    masterId?: string;
-  }) => {
-    const body = JSON.stringify({ status, notes, masterId });
-
-    const response = await fetch(`${endpoint}/order/${id}`, {
-      method: 'PATCH',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body,
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch update masters: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  const updateMaster = async ({
-    id,
-    name,
-    phone,
-  }: {
-    id: string;
-    name?: string;
-    phone?: string;
-  }) => {
-    const body = JSON.stringify({ name, phone });
-
-    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
-      method: 'PATCH',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body,
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch update masters: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  return {
-    fetchOrders,
-    fetchMasters,
-    addMaster,
-    deleteMaster,
-    updateMaster,
-    updateOrders,
-  };
-};
-
-export { armService, ArmEndpoints };

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/components/Editable/Editable.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
   Editable,
   EditableInput,
@@ -9,63 +9,51 @@ import {
   useEditableControls,
   ButtonGroup,
   Stack,
-  useToast,
 } from '@chakra-ui/react';
 import { CheckIcon, CloseIcon, EditIcon } from '@chakra-ui/icons';
 import { useTranslation } from 'react-i18next';
 
+import { useUpdateMasterMutation } from '../../__data__/service/api';
+import useShowToast from '../../hooks/useShowToast';
+
 interface EditableWrapperProps {
   value: string;
-  onSubmit: ({
+  fieldName: 'phone' | 'name';
-    id,
-    name,
-    phone,
-  }: {
-    id: string;
-    name?: string;
-    phone?: string;
-  }) => Promise<unknown>;
-  as: 'phone' | 'name';
   id: string;
 }
 
-const EditableWrapper = ({ value, onSubmit, as, id }: EditableWrapperProps) => {
+const EditableWrapper = ({ value, fieldName, id }: EditableWrapperProps) => {
+  const [updateMaster, { isError, isSuccess, error }] =
+    useUpdateMasterMutation();
+
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.master.editable',
   });
 
-  const toast = useToast();
+  const showToast = useShowToast();
   const [currentValue, setCurrentValue] = useState<string>(value);
 
   const handleSubmit = async (newValue: string) => {
     if (currentValue === newValue) return;
 
-    try {
+    await updateMaster({ id, [fieldName]: newValue });
-      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);
-    }
   };
 
+  useEffect(() => {
+    if (isSuccess) {
+      showToast(t('toast.success'), 'success');
+    }
+  }, [isSuccess]);
+
+  useEffect(() => {
+    if (isError) {
+      showToast(t('toast.error.title'), 'error', t('toast.error.description'));
+      console.error(t('toast.error.description'), error);
+    }
+  }, [isError, error]);
+
   function EditableControls() {
     const {
       isEditing,

src/components/MasterActionsMenu/MasterActionsMenu.tsx

@@ -1,16 +1,16 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import {
   Menu,
   MenuButton,
   MenuList,
   MenuItem,
   IconButton,
-  useToast,
 } from '@chakra-ui/react';
 import { EditIcon } from '@chakra-ui/icons';
 import { useTranslation } from 'react-i18next';
 
-import { armService } from '../../api/arm';
+import { useDeleteMasterMutation } from '../../__data__/service/api';
+import useShowToast from '../../hooks/useShowToast';
 
 interface MasterActionsMenu {
   id: string;
@@ -21,38 +21,35 @@ const MasterActionsMenu = ({ id }: MasterActionsMenu) => {
     keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
   });
 
-  const { deleteMaster } = armService();
+  const [deleteMaster, { isSuccess, isError, error, isLoading }] =
-  const toast = useToast();
+    useDeleteMasterMutation();
+
+  const showToast = useShowToast();
 
   const handleClickDelete = async () => {
-    try {
     await deleteMaster({ id });
-      toast({
+  };
-        title: 'Мастер удалён.',
+
-        description: `Мастер с ID "${id}" успешно удалён.`,
+  useEffect(() => {
-        status: 'success',
+    if (isSuccess) {
-        duration: 5000,
+      showToast(t('toast.success'), 'success');
-        isClosable: true,
+    }
-        position: 'top-right',
+  }, [isSuccess]);
-      });
+
-    } catch (error) {
+  useEffect(() => {
-      toast({
+    if (isError) {
-        title: 'Ошибка удаления мастера.',
+      showToast(t('toast.error.title'), 'error', t('toast.error.description'));
-        description: 'Не удалось удалить мастера. Попробуйте ещё раз.',
-        status: 'error',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
-      });
       console.error(error);
     }
-  };
+  }, [isError]);
 
   return (
     <Menu>
       <MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
       <MenuList>
-        <MenuItem onClick={handleClickDelete}>{t('delete')}</MenuItem>
+        <MenuItem onClick={handleClickDelete} isDisabled={isLoading}>
+          {t('delete')}
+        </MenuItem>
       </MenuList>
     </Menu>
   );

src/components/MasterDrawer/MasterDrawer.tsx

@@ -12,7 +12,6 @@ import {
   DrawerFooter,
   DrawerHeader,
   DrawerOverlay,
-  useToast,
   InputGroup,
   InputLeftElement,
   FormErrorMessage,
@@ -20,9 +19,9 @@ import {
 import { useTranslation } from 'react-i18next';
 import { PhoneIcon } from '@chakra-ui/icons';
 
-import { api } from '../../__data__/service/api';
+import { useAddMasterMutation } from '../../__data__/service/api';
-import showToast from '../../helpers/showToast';
 import { DrawerInputs } from '../../models/arm/form';
+import useShowToast from '../../hooks/useShowToast';
 
 interface MasterDrawerProps {
   isOpen: boolean;
@@ -50,28 +49,19 @@ const MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {
     const isEmptyFields = trimMaster.name === '' || trimMaster.phone === '';
 
     if (isEmptyFields) {
-      showToast({
+      showToast(t('toast.error.base'), 'error', t('toast.error.empty-fields'));
-        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 [addMaster, { error, isSuccess }] = useAddMasterMutation();
-  const toast = useToast();
+  const showToast = useShowToast();
 
   useEffect(() => {
     if (isSuccess) {
-      showToast({
+      showToast(t('toast.create-master'), 'success');
-        toast,
-        title: t('toast.create-master'),
-        status: 'success',
-      });
       reset();
       onClose();
     }
@@ -79,12 +69,11 @@ const MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {
 
   useEffect(() => {
     if (error) {
-      showToast({
+      showToast(
-        toast,
+        t('toast.error.create-master'),
-        title: t('toast.error.create-master'),
+        'error',
-        description: t('toast.error.create-master-details'),
+        t('toast.error.create-master-details'),
-        status: 'error',
+      );
-      });
       console.error(error);
     }
   }, [error]);

src/components/MasterItem/MasterItem.tsx

@@ -5,10 +5,8 @@ import { useTranslation } from 'react-i18next';
 import MasterActionsMenu from '../MasterActionsMenu';
 import { getTimeSlot } from '../../lib';
 import EditableWrapper from '../Editable/Editable';
-import { armService } from '../../api/arm';
 
 const MasterItem = ({ name, phone, id, schedule }) => {
-  const { updateMaster } = armService();
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.master',
   });
@@ -16,12 +14,7 @@ const MasterItem = ({ name, phone, id, schedule }) => {
   return (
     <Tr>
       <Td>
-        <EditableWrapper
+        <EditableWrapper id={id} fieldName={'name'} value={name} />
-          id={id}
-          as={'name'}
-          value={name}
-          onSubmit={updateMaster}
-        />
       </Td>
       <Td>
         {schedule?.length > 0 ? (
@@ -37,12 +30,7 @@ const MasterItem = ({ name, phone, id, schedule }) => {
         )}
       </Td>
       <Td>
-        <EditableWrapper
+        <EditableWrapper id={id} fieldName={'phone'} value={phone} />
-          id={id}
-          as={'phone'}
-          value={phone}
-          onSubmit={updateMaster}
-        />
       </Td>
       <Td>
         <MasterActionsMenu id={id} />

src/components/Masters/Masters.tsx

@@ -10,7 +10,6 @@ import {
   Button,
   useDisclosure,
   Flex,
-  useToast,
   Td,
   Text,
   Spinner,
@@ -19,7 +18,8 @@ import { useTranslation } from 'react-i18next';
 
 import MasterItem from '../MasterItem';
 import MasterDrawer from '../MasterDrawer';
-import { api } from '../../__data__/service/api';
+import { useGetMastersQuery } from '../../__data__/service/api';
+import useShowToast from '../../hooks/useShowToast';
 
 const TABLE_HEADERS = [
   'name' as const,
@@ -30,26 +30,17 @@ const TABLE_HEADERS = [
 
 const Masters = () => {
   const { isOpen, onOpen, onClose } = useDisclosure();
-  const toast = useToast();
+  const showToast = useShowToast();
+
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.master',
   });
 
-  const {
+  const { data: masters, error, isLoading, isSuccess } = useGetMastersQuery();
-    data: masters,
-    error,
-    isLoading,
-    isSuccess,
-  } = api.useGetMastersQuery();
 
   useEffect(() => {
     if (error) {
-      toast({
+      showToast(t('error.title'), 'error');
-        title: t('error.title'),
-        status: 'error',
-        isClosable: true,
-        position: 'bottom-right',
-      });
     }
   }, [error]);
 

src/components/OrderItem/OrderItem.tsx

@@ -4,35 +4,8 @@ import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
 
 import { getTimeSlot } from '../../lib';
-import { Master } from '../../models/api/master';
+import { useUpdateOrdersMutation } from '../../__data__/service/api';
-import { armService } from '../../api/arm';
+import { OrderArm, Status, statuses } from '../../models/api';
-
-const statuses = [
-  'pending' as const,
-  'progress' as const,
-  'working' as const,
-  'canceled' as const,
-  'complete' as const,
-];
-
-type GetArrItemType<ArrType> =
-  ArrType extends Array<infer ItemType> ? ItemType : never;
-
-export type OrderProps = {
-  carNumber?: string;
-  startWashTime?: string;
-  endWashTime?: string;
-  orderDate?: string;
-  status?: GetArrItemType<typeof statuses>;
-  phone?: string;
-  location?: string;
-  master: Master;
-  notes: '';
-  allMasters: Master[];
-  id: string;
-};
-
-type Status = (typeof statuses)[number];
 
 const statusColors: Record<Status, string> = {
   pending: 'yellow.100',
@@ -53,9 +26,8 @@ const OrderItem = ({
   master,
   allMasters,
   id,
-}: OrderProps) => {
+}: OrderArm) => {
-  const { updateOrders } = armService();
+  const [updateOrders] = useUpdateOrdersMutation();
-
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.order',
   });
@@ -72,16 +44,16 @@ const OrderItem = ({
 
     if (selectedMaster) {
       setMaster(masterName);
-      updateOrders({ id, masterId: selectedMaster.id });
+      updateOrders({ id, master: selectedMaster.id });
     } else {
       console.error('Master not found');
     }
   };
 
   const handeChangeStatus = (e: ChangeEvent<HTMLSelectElement>) => {
-    const status = e.target.value;
+    const status = e.target.value as OrderArm['status'];
     updateOrders({ id, status });
-    setStatus(e.target.value as OrderProps['status']);
+    setStatus(status);
   };
 
   return (

src/components/Orders/Orders.tsx

@@ -10,16 +10,18 @@ import {
   Spinner,
   Text,
   Td,
-  useToast,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
 
 import OrderItem from '../OrderItem';
 import { OrderProps } from '../OrderItem/OrderItem';
-import { armService } from '../../api/arm';
 import DateNavigator from '../DateNavigator';
-import { Master } from '../../models/api/master';
+import {
+  useGetMastersQuery,
+  useGetOrdersQuery,
+} from '../../__data__/service/api';
+import useShowToast from '../../hooks/useShowToast';
 
 const TABLE_HEADERS = [
   'carNumber' as const,
@@ -34,47 +36,34 @@ const Orders = () => {
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.order',
   });
+  const showToast = useShowToast();
 
-  const { fetchOrders } = armService();
-  const { fetchMasters } = armService();
-
-  const toast = useToast();
-
-  const [orders, setOrders] = useState<OrderProps[]>([]);
-  const [allMasters, setAllMasters] = useState<Master[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
   const [currentDate, setCurrentDate] = useState(new Date());
+  const {
+    data: orders,
+    isLoading: isOrdersLoading,
+    isSuccess: isOrdersSuccess,
+    isError: isOrdersError,
+    error: ordersError,
+  } = useGetOrdersQuery({ date: currentDate });
+
+  const {
+    data: masters,
+    isLoading: isMastersLoading,
+    isSuccess: isMastersSuccess,
+    isError: isMastersError,
+    error: mastersError,
+  } = useGetMastersQuery();
+
+  const isLoading = isOrdersLoading || isMastersLoading;
+  const isSuccess = isOrdersSuccess && isMastersSuccess;
+  const isError = isOrdersError || isMastersError;
 
   useEffect(() => {
-    const loadData = async () => {
+    if (isError) {
-      setLoading(true);
+      showToast(t('error.title'), 'error');
-      setError(null);
-
-      try {
-        const [ordersData, mastersData] = await Promise.all([
-          fetchOrders({ date: currentDate }),
-          fetchMasters(),
-        ]);
-
-        setOrders(ordersData.body);
-        setAllMasters(mastersData.body);
-      } catch (err) {
-        setError(err.message);
-        toast({
-          title: t('error.title'),
-          status: 'error',
-          duration: 5000,
-          isClosable: true,
-          position: 'bottom-right',
-        });
-      } finally {
-        setLoading(false);
     }
-    };
+  }, [isError, ordersError, mastersError, t]);
-
-    loadData();
-  }, [currentDate, toast, t]);
 
   return (
     <Box p='8'>
@@ -103,25 +92,24 @@ const Orders = () => {
           </Tr>
         </Thead>
         <Tbody>
-          {loading && (
+          {isLoading && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
                 <Spinner size='lg' />
               </Td>
             </Tr>
           )}
-          {!loading && orders.length === 0 && !error && (
+          {isSuccess && orders.length === 0 && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length}>
                 <Text>{t('table.empty')}</Text>
               </Td>
             </Tr>
           )}
-          {!loading &&
+          {isSuccess &&
-            !error &&
             orders.map((order, index) => (
               <OrderItem
-                allMasters={allMasters}
+                allMasters={masters}
                 key={index}
                 {...order}
                 status={order.status as OrderProps['status']}

src/helpers/showToast.ts

@@ -1,21 +0,0 @@
-import { UseToastOptions } from '@chakra-ui/react';
-
-interface ShowToast {
-  toast: (options: UseToastOptions) => void;
-  title: string;
-  description?: string;
-  status: 'info' | 'warning' | 'success' | 'error';
-}
-
-const showToast = ({ toast, title, description, status }: ShowToast) => {
-  toast({
-    title,
-    description,
-    status,
-    duration: 5000,
-    isClosable: true,
-    position: 'top-right',
-  });
-};
-
-export default showToast;

src/hooks/useShowToast.ts

@@ -0,0 +1,28 @@
+import { useToast } from '@chakra-ui/react';
+import { useCallback } from 'react';
+
+const useShowToast = () => {
+  const toast = useToast();
+
+  const showToast = useCallback(
+    (
+      title: string,
+      status: 'info' | 'warning' | 'success' | 'error',
+      description?: string,
+    ) => {
+      toast({
+        title,
+        description,
+        status,
+        duration: 5000,
+        isClosable: true,
+        position: 'top-right',
+      });
+    },
+    [toast],
+  );
+
+  return showToast;
+};
+
+export default useShowToast;

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/models/api/index.ts

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

src/models/api/order.ts

@@ -1,21 +1,49 @@
 /* eslint-disable @typescript-eslint/no-namespace */
-import { Order } from "../landing";
+import { Order } from '../landing';
 
-import { ErrorMessage } from "./common";
+import { ErrorMessage } from './common';
+import { Master } from './master';
 
 export namespace GetOrder {
   export type Response = Order.View;
   export type Params = {
-    orderId: Order.Id
+    orderId: Order.Id;
   };
   export type Error = ErrorMessage;
 }
 
 export namespace CreateOrder {
   export type Response = {
-    id: Order.Id
+    id: Order.Id;
   };
   export type Params = {
-    body: Order.Create
+    body: Order.Create;
   };
+}
+
+type GetArrItemType<ArrType> =
+  ArrType extends Array<infer ItemType> ? ItemType : never;
+
+export const statuses = [
+  'pending' as const,
+  'progress' as const,
+  'working' as const,
+  'canceled' as const,
+  'complete' as const,
+];
+
+export type Status = (typeof statuses)[number];
+
+export type OrderArm = {
+  carNumber?: string;
+  startWashTime?: string;
+  endWashTime?: string;
+  orderDate?: string;
+  status?: GetArrItemType<typeof statuses>;
+  phone?: string;
+  location?: string;
+  master: Master;
+  notes: '';
+  allMasters: Master[];
+  id: string;
 };

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

@@ -53,7 +53,7 @@ router.delete('/arm/masters/:id', (req, res) => {
     );
 });
 
-router.patch('/orders/:id', (req, res) => {
+router.patch('/order/:id', (req, res) => {
   res
     .status(/error/.test(STUBS.orders) ? 500 : 200)
     .send(
@@ -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"
+  }
+}