fix: place orders in the model

feat: add hook useShowToast.ts
fear: change requests to RTK query
2025-02-08 22:36:30 +03:00 · 2025-02-08 22:18:32 +03:00 · 2025-02-08 21:21:57 +03:00
22 changed files with 317 additions and 618 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -130,10 +130,4 @@ dist
 .yarn/install-state.gz
 .pnp.*

-.idea
-
-# Playwright
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
+.idea
--- a/locales/ru.json
+++ b/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": "Введите ФИО",
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,9 +48,7 @@
            },
            "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",
@@ -3621,21 +3619,6 @@
                "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",
@@ -4020,11 +4003,12 @@
            "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
        },
        "node_modules/@types/node": {
-            "version": "22.13.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
-            "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
+            "version": "22.9.0",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
+            "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
+            "license": "MIT",
            "dependencies": {
-                "undici-types": "~6.20.0"
+                "undici-types": "~6.19.8"
            }
        },
        "node_modules/@types/parse-json": {
@@ -12126,50 +12110,6 @@
                "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",
@@ -14442,9 +14382,10 @@
            }
        },
        "node_modules/undici-types": {
-            "version": "6.20.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-            "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
+            "version": "6.19.8",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+            "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+            "license": "MIT"
        },
        "node_modules/unicode-canonical-property-names-ecmascript": {
            "version": "2.0.1",
--- a/package.json
+++ b/package.json
@@ -1,74 +1,72 @@
 {
-  "name": "dry-wash",
-  "version": "0.5.0",
-  "description": "<a id=\"readme-top\"></a>",
-  "main": "./src/index.tsx",
-  "scripts": {
-    "test": "jest -u",
-    "start": "brojs server --port=8099 --with-open-browser",
-    "build": "npm run clean && brojs build --dev",
-    "build:prod": "npm run clean && brojs build",
-    "clean": "rimraf dist",
-    "eslint": "npx eslint .",
-    "eslint:fix": "npx eslint . --fix",
-    "preversion": "npm run eslint"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@babel/core": "^7.26.7",
-    "@babel/preset-env": "^7.26.7",
-    "@babel/preset-react": "^7.26.3",
-    "@babel/preset-typescript": "^7.26.0",
-    "@brojs/cli": "^1.8.4",
-    "@chakra-ui/icons": "^2.2.4",
-    "@chakra-ui/react": "^2.10.5",
-    "@emotion/react": "^11.4.1",
-    "@emotion/styled": "^11.3.0",
-    "@fontsource/open-sans": "^5.1.0",
-    "@lottiefiles/react-lottie-player": "^3.5.4",
-    "@pbe/react-yandex-maps": "^1.2.5",
-    "@reduxjs/toolkit": "^2.5.0",
-    "@testing-library/dom": "^10.4.0",
-    "@testing-library/react": "^16.2.0",
-    "@types/react": "^18.3.12",
-    "babel-jest": "^29.7.0",
-    "dayjs": "^1.11.13",
-    "express": "^4.21.1",
-    "framer-motion": "^6.2.8",
-    "i18next": "^23.16.4",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-fixed-jsdom": "^0.0.9",
-    "keycloak-js": "^23.0.7",
-    "msw": "^2.7.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-hook-form": "^7.53.2",
-    "react-i18next": "^15.1.1",
-    "react-icons": "^5.3.0",
-    "react-phone-number-input": "^3.4.9",
-    "react-redux": "^9.2.0",
-    "react-router-dom": "^6.27.0",
-    "ts-jest": "^29.2.5",
-    "ts-node": "^10.9.2"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.14.0",
-    "@playwright/test": "^1.50.1",
-    "@stylistic/eslint-plugin": "^2.10.1",
-    "@types/node": "^22.13.1",
-    "@types/react-dom": "^18.3.1",
-    "eslint": "^9.14.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-react": "^7.37.2",
-    "globals": "^15.11.0",
-    "prettier": "3.3.3",
-    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.12.2"
-  },
-  "jest": {
-    "preset": "./jest-preset-it/jest-preset.ts"
-  }
+    "name": "dry-wash",
+    "version": "0.5.0",
+    "description": "<a id=\"readme-top\"></a>",
+    "main": "./src/index.tsx",
+    "scripts": {
+        "test": "jest -u",
+        "start": "brojs server --port=8099 --with-open-browser",
+        "build": "npm run clean && brojs build --dev",
+        "build:prod": "npm run clean && brojs build",
+        "clean": "rimraf dist",
+        "eslint": "npx eslint .",
+        "eslint:fix": "npx eslint . --fix",
+        "preversion": "npm run eslint"
+    },
+    "keywords": [],
+    "author": "",
+    "license": "ISC",
+    "dependencies": {
+        "@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",
+        "@emotion/styled": "^11.3.0",
+        "@fontsource/open-sans": "^5.1.0",
+        "@lottiefiles/react-lottie-player": "^3.5.4",
+        "@pbe/react-yandex-maps": "^1.2.5",
+        "@reduxjs/toolkit": "^2.5.0",
+        "@testing-library/dom": "^10.4.0",
+        "@testing-library/react": "^16.2.0",
+        "@types/react": "^18.3.12",
+        "babel-jest": "^29.7.0",
+        "dayjs": "^1.11.13",
+        "express": "^4.21.1",
+        "framer-motion": "^6.2.8",
+        "i18next": "^23.16.4",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
+        "jest-fixed-jsdom": "^0.0.9",
+        "keycloak-js": "^23.0.7",
+        "msw": "^2.7.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "react-hook-form": "^7.53.2",
+        "react-i18next": "^15.1.1",
+        "react-icons": "^5.3.0",
+        "react-phone-number-input": "^3.4.9",
+        "react-redux": "^9.2.0",
+        "react-router-dom": "^6.27.0",
+        "ts-jest": "^29.2.5",
+        "ts-node": "^10.9.2"
+    },
+    "devDependencies": {
+        "@eslint/js": "^9.14.0",
+        "@stylistic/eslint-plugin": "^2.10.1",
+        "@types/react-dom": "^18.3.1",
+        "eslint": "^9.14.0",
+        "eslint-plugin-import": "^2.31.0",
+        "eslint-plugin-react": "^7.37.2",
+        "globals": "^15.11.0",
+        "prettier": "3.3.3",
+        "typescript": "^5.7.3",
+        "typescript-eslint": "^8.12.2"
+    },
+    "jest": {
+        "preset": "./jest-preset-it/jest-preset.ts"
+    }
 }
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -1,79 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// import dotenv from 'dotenv';
-// import path from 'path';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './tests',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    // baseURL: 'http://127.0.0.1:3000',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] },
-    },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-
-    /* Test against mobile viewports. */
-    // {
-    //   name: 'Mobile Chrome',
-    //   use: { ...devices['Pixel 5'] },
-    // },
-    // {
-    //   name: 'Mobile Safari',
-    //   use: { ...devices['iPhone 12'] },
-    // },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    // },
-  ],
-
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command: 'npm run start',
-  //   url: 'http://127.0.0.1:3000',
-  //   reuseExistingServer: !process.env.CI,
-  // },
-});
--- a/src/data/service/api.ts
+++ b/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;
--- a/src/data/service/utils.ts
+++ b/src/data/service/utils.ts
@@ -12,4 +12,4 @@ export const extractErrorMessageFromResponse = ({ data }: FetchBaseQueryError) =
  if (typeof data === 'object' && 'message' in data && typeof data.message === 'string') {
    return data.message;
  }
-};
+};
--- a/src/api/arm.ts
+++ b/src/api/arm.ts
@@ -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 };
--- a/src/components/Editable/Editable.tsx
+++ b/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: ({
-    id,
-    name,
-    phone,
-  }: {
-    id: string;
-    name?: string;
-    phone?: string;
-  }) => Promise<unknown>;
-  as: 'phone' | 'name';
+  fieldName: '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 onSubmit({ id, [as]: newValue });
+    await updateMaster({ id, [fieldName]: 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);
-    }
+    setCurrentValue(newValue);
  };

+  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,
--- a/src/components/MasterActionsMenu/MasterActionsMenu.tsx
+++ b/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 toast = useToast();
+  const [deleteMaster, { isSuccess, isError, error, isLoading }] =
+    useDeleteMasterMutation();
+
+  const showToast = useShowToast();

  const handleClickDelete = async () => {
-    try {
-      await deleteMaster({ id });
-      toast({
-        title: 'Мастер удалён.',
-        description: `Мастер с ID "${id}" успешно удалён.`,
-        status: 'success',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
-      });
-    } catch (error) {
-      toast({
-        title: 'Ошибка удаления мастера.',
-        description: 'Не удалось удалить мастера. Попробуйте ещё раз.',
-        status: 'error',
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
-      });
+    await deleteMaster({ id });
+  };
+
+  useEffect(() => {
+    if (isSuccess) {
+      showToast(t('toast.success'), 'success');
+    }
+  }, [isSuccess]);
+
+  useEffect(() => {
+    if (isError) {
+      showToast(t('toast.error.title'), 'error', t('toast.error.description'));
      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>
  );
--- a/src/components/MasterDrawer/MasterDrawer.tsx
+++ b/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 showToast from '../../helpers/showToast';
+import { useAddMasterMutation } from '../../__data__/service/api';
 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({
-        toast,
-        title: t('toast.error.base'),
-        description: t('toast.error.empty-fields'),
-        status: 'error',
-      });
+      showToast(t('toast.error.base'), 'error', t('toast.error.empty-fields'));
      return;
    }

    await addMaster(trimMaster);
  };

-  const [addMaster, { error, isSuccess }] = api.useAddMasterMutation();
-  const toast = useToast();
+  const [addMaster, { error, isSuccess }] = useAddMasterMutation();
+  const showToast = useShowToast();

  useEffect(() => {
    if (isSuccess) {
-      showToast({
-        toast,
-        title: t('toast.create-master'),
-        status: 'success',
-      });
+      showToast(t('toast.create-master'), 'success');
      reset();
      onClose();
    }
@@ -79,12 +69,11 @@ const MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {

  useEffect(() => {
    if (error) {
-      showToast({
-        toast,
-        title: t('toast.error.create-master'),
-        description: t('toast.error.create-master-details'),
-        status: 'error',
-      });
+      showToast(
+        t('toast.error.create-master'),
+        'error',
+        t('toast.error.create-master-details'),
+      );
      console.error(error);
    }
  }, [error]);
--- a/src/components/MasterItem/MasterItem.tsx
+++ b/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
-          id={id}
-          as={'name'}
-          value={name}
-          onSubmit={updateMaster}
-        />
+        <EditableWrapper id={id} fieldName={'name'} value={name} />
      </Td>
      <Td>
        {schedule?.length > 0 ? (
@@ -37,12 +30,7 @@ const MasterItem = ({ name, phone, id, schedule }) => {
        )}
      </Td>
      <Td>
-        <EditableWrapper
-          id={id}
-          as={'phone'}
-          value={phone}
-          onSubmit={updateMaster}
-        />
+        <EditableWrapper id={id} fieldName={'phone'} value={phone} />
      </Td>
      <Td>
        <MasterActionsMenu id={id} />
--- a/src/components/Masters/Masters.tsx
+++ b/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 {
-    data: masters,
-    error,
-    isLoading,
-    isSuccess,
-  } = api.useGetMastersQuery();
+  const { data: masters, error, isLoading, isSuccess } = useGetMastersQuery();

  useEffect(() => {
    if (error) {
-      toast({
-        title: t('error.title'),
-        status: 'error',
-        isClosable: true,
-        position: 'bottom-right',
-      });
+      showToast(t('error.title'), 'error');
    }
  }, [error]);

--- a/src/components/OrderItem/OrderItem.tsx
+++ b/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 { armService } from '../../api/arm';
-
-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];
+import { useUpdateOrdersMutation } from '../../__data__/service/api';
+import { OrderArm, Status, statuses } from '../../models/api';

 const statusColors: Record<Status, string> = {
  pending: 'yellow.100',
@@ -53,9 +26,8 @@ const OrderItem = ({
  master,
  allMasters,
  id,
-}: OrderProps) => {
-  const { updateOrders } = armService();
-
+}: OrderArm) => {
+  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 (
--- a/src/components/Orders/Orders.tsx
+++ b/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 () => {
-      setLoading(true);
-      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);
-      }
-    };
-
-    loadData();
-  }, [currentDate, toast, t]);
+    if (isError) {
+      showToast(t('error.title'), 'error');
+    }
+  }, [isError, ordersError, mastersError, 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 &&
-            !error &&
+          {isSuccess &&
            orders.map((order, index) => (
              <OrderItem
-                allMasters={allMasters}
+                allMasters={masters}
                key={index}
                {...order}
                status={order.status as OrderProps['status']}
--- a/src/helpers/showToast.ts
+++ b/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;
--- a/src/hooks/useShowToast.ts
+++ b/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;
--- a/src/models/api/common.ts
+++ b/src/models/api/common.ts
@@ -10,4 +10,4 @@ type ErrorResponse = {
  message: ErrorMessage;
 };

-export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
+export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
--- a/src/models/api/index.ts
+++ b/src/models/api/index.ts
@@ -1,2 +1,3 @@
 export * from './common';
-export * from './order';
+export * from './order';
+export * from './master';
--- a/src/models/api/order.ts
+++ b/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;
+};
--- a/stubs/api/index.js
+++ b/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(
--- a/tests/example.spec.ts
+++ b/tests/example.spec.ts
@@ -1,26 +0,0 @@
-import { test, expect } from '@playwright/test';
-
-test.beforeEach('check server is up', async ({ page }) => {
-  try {
-    await page.goto('http://localhost:8099/dry-wash');
-    const makeOrderText = page.getByText('Сделать заказ', { exact: true });
-    await expect(makeOrderText).toBeVisible();
-  } catch (error) {
-    console.error('server not up');
-    test.skip();
-  }
-});
-
-test('login', async ({ page }) => {
-  await page.goto('http://localhost:8099/dry-wash/arm');
-  await page.getByRole('textbox', { name: 'Username or email' }).click();
-  await page
-    .getByRole('textbox', { name: 'Username or email' })
-    .fill('237x237');
-  await page.getByRole('textbox', { name: 'Password' }).click();
-  await page.getByRole('textbox', { name: 'Password' }).fill('');
-  await page.getByRole('button', { name: 'Sign In' }).click();
-  await page.getByRole('heading', { name: 'Заказы' }).click();
-  await page.getByRole('link', { name: 'Мастера' }).click();
-  await page.getByRole('link', { name: 'Заказы' }).click();
-});
Author	SHA1	Message	Date
ilnaz	658e23d4e3	fix: place orders in the model Some checks are pending it-academy/dry-wash-pl/pipeline/pr-main Build started... Details it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-02-08 22:36:30 +03:00
ilnaz	ed8ae95436	feat: add hook useShowToast.ts All checks were successful it-academy/dry-wash-pl/pipeline/pr-main This commit looks good Details	2025-02-08 22:18:32 +03:00
ilnaz	a00aaff29d	fear: change requests to RTK query All checks were successful it-academy/dry-wash-pl/pipeline/pr-main This commit looks good Details	2025-02-08 21:21:57 +03:00