0.9.1

Reviewed-on: #90

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "i18n-ally.localesPaths": [
+        "locales"
+    ]
+}

Jenkinsfile

@@ -1,7 +1,7 @@
 pipeline {
     agent {
         docker {
-            image 'node:20'
+            image 'node:22'
         }
     }
 
@@ -30,25 +30,21 @@ pipeline {
             }
         }
 
-        stage('checks') {
+        stage('eslint') {
-            parallel {
+            steps {
-                stage('eslint') {
+                sh 'npm run eslint'
-                    steps {
+            }
-                        sh 'npm run eslint'
+        }
-                    }
-                }
 
-                stage('test') {
+        stage('test') {
-                    steps {
+            steps {
-                        sh 'npm run test'
+                sh 'npm run test'
-                    }
+            }
-                }
+        }
 
-                stage('build') {
+        stage('build') {
-                    steps {
+            steps {
-                        sh 'npm run build'
+                sh 'npm run build'
-                    }
-                }
             }
         }
 

bro.config.js

@@ -21,7 +21,16 @@ module.exports = {
   features: {
     'dry-wash': {
       // add your features here in the format [featureName]: { value: string }
-      'order-view-status-polling': { value: '3000' }
+      "order-view-status-polling": {
+        "on": true,
+        "value": "3000",
+        "key": "order-view-status-polling"
+      },
+      "car-img-upload": {
+        "on": true,
+        "value": "true",
+        "key": "car-img-upload"
+      }
     },
   },
   config: {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "dry-wash",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dry-wash",
-      "version": "0.8.0",
+      "version": "0.9.1",
       "license": "ISC",
       "dependencies": {
         "@babel/core": "^7.26.7",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dry-wash",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "<a id=\"readme-top\"></a>",
   "main": "./src/index.tsx",
   "scripts": {
@@ -9,8 +9,8 @@
     "build": "npm run clean && brojs build --dev",
     "build:prod": "npm run clean && brojs build",
     "clean": "rimraf dist",
-    "eslint": "npx eslint .",
+    "eslint": "npx eslint src",
-    "eslint:fix": "npx eslint . --fix",
+    "eslint:fix": "npx eslint src --fix",
     "preversion": "npm run eslint"
   },
   "keywords": [],

src/__data__/features.ts

@@ -11,5 +11,8 @@ export const FEATURE = {
         return interval;
       }
     }
+  },
+  carImageUpload: {
+    isOn: Boolean(features?.['car-img-upload'])
   }
 };

src/__data__/service/utils.ts

@@ -13,6 +13,7 @@ export const extractErrorMessageFromResponse = ({
 }: FetchBaseQueryError) => {
   if (
     typeof data === 'object' &&
+    data !== null &&
     'error' in data &&
     typeof data.error === 'string'
   ) {

src/__data__/store.ts

@@ -7,7 +7,9 @@ export const store = configureStore({
     [api.reducerPath]: api.reducer,
   },
   middleware: (getDefaultMiddleware) =>
-    getDefaultMiddleware().concat(api.middleware),
+    getDefaultMiddleware({
+      serializableCheck: false
+    }).concat(api.middleware),
 });
 
 export type RootState = ReturnType<typeof store.getState>;

src/components/ErrorBoundary/ErrorBoundary.tsx

@@ -28,7 +28,6 @@ class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
 
   componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
     console.error('Error caught by ErrorBoundary:', error, errorInfo);
-    console.error('4545');
     this.setState({ error, errorInfo });
   }
 

src/components/ErrorBoundary/__tests__/ErrorBoundary.test.tsx

@@ -24,6 +24,10 @@ jest.mock('@brojs/cli', () => {
 
 describe('ErrorBoundary', () => {
   it('должен отобразить запасной UI при ошибке', async () => {
+    // Подавляем вывод ошибки в консоль во время теста
+    const consoleSpy = jest.spyOn(console, 'error');
+    consoleSpy.mockImplementation(() => {});
+
     const { container } = render(
       <Provider store={store}>
         <ErrorBoundary>
@@ -39,7 +43,9 @@ describe('ErrorBoundary', () => {
     );
 
     expect(button).not.toBeNull();
-
     expect(container).toMatchSnapshot();
+
+    // Восстанавливаем console.error после теста
+    consoleSpy.mockRestore();
   });
 });

src/components/order-view/car-img/car-img-form.tsx

@@ -64,7 +64,7 @@ export const CarImageForm: FC<CarImageFormProps> = memo(function CarImageForm({
                 <Input
                   {...field}
                   ref={fileInputRef}
-                  accept='.jpg,.png'
+                  accept='image/png,image/jpeg'
                   value={value?.fileName}
                   onChange={(event) => {
                     onChange(event.target.files[0]);

src/components/order-view/car-img/helper.ts

@@ -11,7 +11,7 @@ export const useHandleUploadCarImageResponse = (query: {
 }) => {
   const toast = useToast();
   const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.order-create.upload-car-image-query',
+    keyPrefix: 'dry-wash.order-view.upload-car-image-query',
   });
 
   useEffect(() => {

src/pages/__tests__/__snapshots__/masters.test.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Master Page render  1`] = `
+exports[`Master Page should display master list and show details when master button is clicked 1`] = `
 <div>
   <div
     class="css-1yeiifd"

src/pages/__tests__/__snapshots__/order-view.test.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Order View page, initial load shows order details 1`] = `
+exports[`Страница просмотра заказа отображает детали заказа после успешной загрузки 1`] = `
 <div>
   <div
     class="chakra-container css-3n6qh3"
@@ -16,7 +16,6 @@ exports[`Order View page, initial load shows order details 1`] = `
       </h2>
       <div
         class="chakra-stack css-1n38vgh"
-        created="2025-01-19T14:04:02.985Z"
         data-testid="order-details"
       >
         <div
@@ -26,6 +25,9 @@ exports[`Order View page, initial load shows order details 1`] = `
             class="chakra-heading css-1jb3vzl"
           >
             Заказ №{{number}}
+             (
+            Sunday, January 19, 2025 5:04 PM
+            )
           </h2>
           <span
             class="css-6jfsiv"
@@ -126,7 +128,7 @@ exports[`Order View page, initial load shows order details 1`] = `
 </div>
 `;
 
-exports[`Order View page, initial load shows order details loading 1`] = `
+exports[`Страница просмотра заказа отображает индикатор загрузки деталей заказа 1`] = `
 <div>
   <div
     class="chakra-container css-3n6qh3"
@@ -171,7 +173,7 @@ exports[`Order View page, initial load shows order details loading 1`] = `
 </div>
 `;
 
-exports[`Order View page, initial load shows order error 1`] = `
+exports[`Страница просмотра заказа отображает ошибку при некорректном ID заказа 1`] = `
 <div>
   <div
     class="chakra-container css-3n6qh3"

src/pages/__tests__/__snapshots__/ordersList.test.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`order page получение списка заказов  1`] = `
+exports[`Страница заказов должна корректно отображать список заказов после загрузки данных 1`] = `
 <div>
   <div
     class="css-1yeiifd"
@@ -75,7 +75,7 @@ exports[`order page получение списка заказов  1`] = `
           <p
             class="chakra-text css-52ukzg"
           >
-            16.02.2025
+            23.02.2025
           </p>
           <button
             class="chakra-button css-ez23ye"

src/pages/__tests__/masters.test.tsx

@@ -54,6 +54,41 @@ const server = setupServer(
       ],
     });
   }),
+  http.post('/api/arm/orders', () => {
+    return HttpResponse.json({
+      success: true,
+      body: [
+        {
+          id: 'order1',
+          carNumber: 'A123BC',
+          startWashTime: '2024-11-24T10:30:00.000Z',
+          endWashTime: '2024-11-24T16:30:00.000Z',
+          orderDate: '2024-11-24T08:41:46.366Z',
+          status: 'pending',
+          phone: '79001234563',
+          location: 'Казань, ул. Баумана, 1',
+          master: {
+            name: 'Олег Макаров',
+            phone: '79001234567',
+            id: '23423442',
+          },
+          notes: '',
+        },
+        {
+          id: 'order2',
+          carNumber: 'A245BC',
+          startWashTime: '2024-11-24T11:30:00.000Z',
+          endWashTime: '2024-11-24T17:30:00.000Z',
+          orderDate: '2024-11-24T07:40:46.366Z',
+          status: 'progress',
+          phone: '79001234567',
+          location: 'Казань, ул. Баумана, 43',
+          master: [],
+          notes: '',
+        },
+      ],
+    });
+  }),
 );
 
 jest.mock('@brojs/cli', () => {
@@ -70,11 +105,7 @@ describe('Master Page', () => {
   afterEach(() => server.resetHandlers());
   afterAll(() => server.close());
 
-  it('render ', async () => {
+  it('should display master list and show details when master button is clicked', async () => {
-    server.events.on('request:start', ({ request }) => {
-      console.log('Outgoing:', request.method, request.url);
-    });
-
     const { container } = render(
       <Provider store={store}>
         <ChakraProvider theme={chakraTheme}>
@@ -88,10 +119,14 @@ describe('Master Page', () => {
     );
 
     const button = await waitFor(() => screen.getByTestId('master-button'));
-
     fireEvent.click(button);
 
-    await waitFor(() => screen.getByText('Иван Иванов'));
+    // Проверяем отображение всех мастеров
+    await waitFor(() => {
+      expect(screen.getByText('Иван Иванов')).toBeInTheDocument();
+      expect(screen.getByText('Олег Макаров')).toBeInTheDocument();
+      expect(screen.getByText('Иван Галкин')).toBeInTheDocument();
+    });
 
     expect(container).toMatchSnapshot();
   });

src/pages/__tests__/order-view.test.tsx

@@ -11,12 +11,12 @@ jest.mock('react-router-dom', () => ({
   useParams: jest.fn(),
 }));
 
-describe('Order View page, initial load', () => {
+describe('Страница просмотра заказа', () => {
   beforeAll(() => server.listen());
   afterEach(() => server.resetHandlers());
   afterAll(() => server.close());
 
-  test('shows order details loading', () => {
+  test('отображает индикатор загрузки деталей заказа', () => {
     (useParams as jest.Mock).mockReturnValue({ orderId: 'id1' });
 
     const { container } = render(
@@ -33,7 +33,7 @@ describe('Order View page, initial load', () => {
     expect(container).toMatchSnapshot();
   });
 
-  test('shows order details', async () => {
+  test('отображает детали заказа после успешной загрузки', async () => {
     (useParams as jest.Mock).mockReturnValue({ orderId: 'id1' });
 
     const { container } = render(
@@ -52,7 +52,7 @@ describe('Order View page, initial load', () => {
     expect(container).toMatchSnapshot();
   });
 
-  test('shows order error', async () => {
+  test('отображает ошибку при некорректном ID заказа', async () => {
     (useParams as jest.Mock).mockReturnValue({ orderId: null });
 
     const { container } = render(

src/pages/__tests__/ordersEmpty.test.tsx

@@ -46,10 +46,6 @@ describe('order page', () => {
   afterAll(() => server.close());
 
   it('получение пустого списка', async () => {
-    server.events.on('request:start', ({ request }) => {
-      console.log('Outgoing:', request.method, request.url);
-    });
-
     render(
       <Provider store={store}>
         <ChakraProvider theme={chakraTheme}>

src/pages/__tests__/ordersError.test.tsx

@@ -21,9 +21,43 @@ import Page from '../arm';
 import { PageSpinner } from '../../components';
 
 const server = setupServer(
-  http.get('/api/arm/orders', () => {
+  http.post('/api/arm/orders', () => {
     return HttpResponse.json({}, { status: 500 });
   }),
+  http.get('/api/arm/masters', () => {
+    return HttpResponse.json({
+      success: true,
+      body: [
+        {
+          id: '4545423234',
+          name: 'Иван Иванов',
+          phone: '+7 900 123 45 67',
+        },
+        {
+          name: 'Олег Макаров',
+          phone: '79001234567',
+          id: '23423442',
+        },
+        {
+          id: '345354234',
+          name: 'Иван Галкин',
+          schedule: [
+            {
+              id: 'order1',
+              startWashTime: '2024-11-24T10:30:00.000Z',
+              endWashTime: '2024-11-24T16:30:00.000Z',
+            },
+            {
+              id: 'order2',
+              startWashTime: '2024-11-24T11:30:00.000Z',
+              endWashTime: '2024-11-24T17:30:00.000Z',
+            },
+          ],
+          phone: '+7 900 123 45 67',
+        },
+      ],
+    });
+  }),
 );
 
 jest.mock('@brojs/cli', () => {

src/pages/__tests__/ordersList.test.tsx

@@ -98,16 +98,12 @@ jest.mock('@brojs/cli', () => {
   };
 });
 
-describe('order page', () => {
+describe('Страница заказов', () => {
   beforeAll(() => server.listen());
   afterEach(() => server.resetHandlers());
   afterAll(() => server.close());
 
-  it('получение списка заказов ', async () => {
+  it('должна корректно отображать список заказов после загрузки данных', async () => {
-    server.events.on('request:start', ({ request }) => {
-      console.log('Outgoing:', request.method, request.url);
-    });
-
     const { container } = render(
       <Provider store={store}>
         <ChakraProvider theme={chakraTheme}>

src/pages/order-view/index.tsx

@@ -70,7 +70,7 @@ const Page: FC = () => {
             <>
               <>
                 {isSuccess && (
-                  <VStack p={4} alignItems='flex-start' gap={4}>
+                  <VStack p={4} alignItems='flex-start' gap={4} data-testid='order-details'>
                     <OrderDetails
                       orderNumber={order.orderNumber}
                       status={order.status}
@@ -82,9 +82,8 @@ const Page: FC = () => {
                       startWashTime={order.startWashTime}
                       endWashTime={order.endWashTime}
                       created={order.created}                      
-                      data-testid='order-details'
                     />
-                    <CarImageForm orderId={orderId} />
+                    {FEATURE.carImageUpload.isOn && <CarImageForm orderId={orderId} />}                    
                   </VStack>
                 )}
               </>