Merge pull request 'fix: fill location from autocomplete (#71 )' (#72 ) from feature/order-form-upgrade into main

Reviewed-on: #72 Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
fix: fill location from autocomplete (#71 )
2025-01-26 15:59:57 +03:00 · 2025-01-26 15:47:53 +03:00 · 2025-01-26 15:26:03 +03:00 · 2025-01-26 15:06:11 +03:00 · 2025-01-26 12:48:54 +03:00 · 2025-01-26 12:43:40 +03:00
25 changed files with 366 additions and 133 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,6 +17,7 @@
                "@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",
                "@types/react": "^18.3.12",
                "dayjs": "^1.11.13",
                "express": "^4.21.1",
@@ -29,6 +30,7 @@
                "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"
            },
            "devDependencies": {
@@ -2639,6 +2641,38 @@
                "url": "https://opencollective.com/popperjs"
            }
        },
+        "node_modules/@reduxjs/toolkit": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.5.0.tgz",
+            "integrity": "sha512-awNe2oTodsZ6LmRqmkFhtb/KH03hUhxOamEQy411m3Njj3BbFvoBovxo4Q1cBWnV1ErprVj9MlF0UPXkng0eyg==",
+            "dependencies": {
+                "immer": "^10.0.3",
+                "redux": "^5.0.1",
+                "redux-thunk": "^3.1.0",
+                "reselect": "^5.1.0"
+            },
+            "peerDependencies": {
+                "react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
+                "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "react": {
+                    "optional": true
+                },
+                "react-redux": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@reduxjs/toolkit/node_modules/immer": {
+            "version": "10.1.1",
+            "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+            "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/immer"
+            }
+        },
        "node_modules/@remix-run/router": {
            "version": "1.20.0",
            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz",
@@ -2802,6 +2836,11 @@
                "@types/react": "*"
            }
        },
+        "node_modules/@types/use-sync-external-store": {
+            "version": "0.0.6",
+            "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
+            "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg=="
+        },
        "node_modules/@types/yandex-maps": {
            "version": "2.1.29",
            "resolved": "https://registry.npmjs.org/@types/yandex-maps/-/yandex-maps-2.1.29.tgz",
@@ -8735,6 +8774,28 @@
                "react-dom": ">=16.8"
            }
        },
+        "node_modules/react-redux": {
+            "version": "9.2.0",
+            "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
+            "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
+            "dependencies": {
+                "@types/use-sync-external-store": "^0.0.6",
+                "use-sync-external-store": "^1.4.0"
+            },
+            "peerDependencies": {
+                "@types/react": "^18.2.25 || ^19",
+                "react": "^18.0 || ^19",
+                "redux": "^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "redux": {
+                    "optional": true
+                }
+            }
+        },
        "node_modules/react-remove-scroll": {
            "version": "2.6.2",
            "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.2.tgz",
@@ -8892,6 +8953,19 @@
                "recursive-watch": "bin.js"
            }
        },
+        "node_modules/redux": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+            "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
+        },
+        "node_modules/redux-thunk": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+            "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+            "peerDependencies": {
+                "redux": "^5.0.0"
+            }
+        },
        "node_modules/reflect.getprototypeof": {
            "version": "1.0.6",
            "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz",
@@ -9009,6 +9083,11 @@
                "node": ">=0.10.0"
            }
        },
+        "node_modules/reselect": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+            "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="
+        },
        "node_modules/resolve": {
            "version": "1.22.8",
            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
@@ -10249,6 +10328,14 @@
                }
            }
        },
+        "node_modules/use-sync-external-store": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz",
+            "integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==",
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            }
+        },
        "node_modules/util-deprecate": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
        "@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",
        "@types/react": "^18.3.12",
        "dayjs": "^1.11.13",
        "express": "^4.21.1",
@@ -37,6 +38,7 @@
        "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"
    },
    "devDependencies": {
--- a/src/data/service/api.ts
+++ b/src/data/service/api.ts
@@ -0,0 +1,41 @@
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
+import { getConfigValue } from '@brojs/cli';
+
+import { Master } from '../../models/api/master';
+
+type SuccessResponse<Body> = {
+  success: true;
+  body: Body;
+};
+
+type ErrorResponse = {
+  success: false;
+  message: string;
+};
+
+type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
+
+export const api = createApi({
+  reducerPath: 'api',
+  baseQuery: fetchBaseQuery({ baseUrl: getConfigValue('dry-wash.api') }),
+  tagTypes: ['Masters'],
+  endpoints: (builder) => ({
+    getMasters: builder.query<Master[], void>({
+      query: () => ({ url: '/arm/masters' }),
+      transformResponse: (response: BaseResponse<Master[]>) => {
+        if (response.success) {
+          return response.body;
+        }
+      },
+      providesTags: ['Masters'],
+    }),
+    addMaster: builder.mutation<void, Pick<Master, 'name' | 'phone'>>({
+      query: (master) => ({
+        url: '/arm/masters',
+        method: 'POST',
+        body: master,
+      }),
+      invalidatesTags: ['Masters'],
+    }),
+  }),
+});
--- a/src/data/store.ts
+++ b/src/data/store.ts
@@ -0,0 +1,14 @@
+import { configureStore } from '@reduxjs/toolkit';
+
+import { api } from './service/api';
+
+export const store = configureStore({
+  reducer: {
+    [api.reducerPath]: api.reducer,
+  },
+  middleware: (getDefaultMiddleware) =>
+    getDefaultMiddleware().concat(api.middleware),
+});
+
+export type RootState = ReturnType<typeof store.getState>;
+export type AppDispatch = typeof store.dispatch;
--- a/src/api/arm.ts
+++ b/src/api/arm.ts
@@ -85,7 +85,7 @@ const armService = () => {
  }) => {
    const body = JSON.stringify({ status, notes, masterId });

-    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
+    const response = await fetch(`${endpoint}/order/${id}`, {
      method: 'PATCH',
      headers: {
        'Content-Type': 'application/json',
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -1,19 +1,23 @@
 import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
 import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
+import { Provider } from 'react-redux';

 import Routers from './routes';
 import ErrorBoundary from './components/ErrorBoundary';
+import { store } from './__data__/store';

 const App = () => {
  return (
-    <ChakraProvider theme={chakraTheme}>
-      <ErrorBoundary>
-        <BrowserRouter>
-          <Routers />
-        </BrowserRouter>
-      </ErrorBoundary>
-    </ChakraProvider>
+    <Provider store={store}>
+      <ChakraProvider theme={chakraTheme}>
+        <ErrorBoundary>
+          <BrowserRouter>
+            <Routers />
+          </BrowserRouter>
+        </ErrorBoundary>
+      </ChakraProvider>
+    </Provider>
  );
 };

--- a/src/assets/images/car-body-type/index.ts
+++ b/src/assets/images/car-body-type/index.ts
@@ -3,6 +3,7 @@ export { default as CrossoverImg } from './crossover.webp';
 export { default as HatchbackImg } from './hatchback.webp';
 export { default as LiftbackImg } from './liftback.webp';
 export { default as MinivanImg } from './minivan.webp';
+export { default as OtherImg } from './other.webp';
 export { default as PickupImg } from './pickup.webp';
 export { default as SedanImg } from './sedan.webp';
 export { default as SportsCarImg } from './sports-car.webp';
--- a/src/assets/images/car-body-type/other.webp
+++ b/src/assets/images/car-body-type/other.webp
--- a/src/components/MasterDrawer/MasterDrawer.tsx
+++ b/src/components/MasterDrawer/MasterDrawer.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
  Button,
  FormControl,
@@ -18,21 +18,29 @@ import {
 import { useTranslation } from 'react-i18next';
 import { PhoneIcon } from '@chakra-ui/icons';

-import { armService } from '../../api/arm';
+import { api } from '../../__data__/service/api';

 const MasterDrawer = ({ isOpen, onClose }) => {
-  const { addMaster } = armService();
+  const [addMaster, { error, isSuccess }] = api.useAddMasterMutation();
  const toast = useToast();

  const [newMaster, setNewMaster] = useState({ name: '', phone: '' });

  const handleSave = async () => {
-    if (newMaster.name.trim() === '' || newMaster.phone.trim() === '') {
+    const trimMaster = {
+      phone: newMaster.phone.trim(),
+      name: newMaster.name.trim(),
+    };
+
+    if (trimMaster.name === '' || trimMaster.phone === '') {
      return;
    }

-    try {
-      await addMaster(newMaster);
+    addMaster(trimMaster);
+  };
+
+  useEffect(() => {
+    if (isSuccess) {
      toast({
        title: 'Мастер создан.',
        description: `Мастер "${newMaster.name}" успешно добавлен.`,
@@ -42,7 +50,11 @@ const MasterDrawer = ({ isOpen, onClose }) => {
        position: 'top-right',
      });
      onClose();
-    } catch (error) {
+    }
+  }, [isSuccess]);
+
+  useEffect(() => {
+    if (error) {
      toast({
        title: 'Ошибка при создании мастера.',
        description: 'Не удалось добавить мастера. Попробуйте еще раз.',
@@ -53,7 +65,7 @@ const MasterDrawer = ({ isOpen, onClose }) => {
      });
      console.error(error);
    }
-  };
+  }, [error]);

  const { t } = useTranslation('~', {
    keyPrefix: 'dry-wash.arm.master.drawer',
--- a/src/components/MasterItem/MasterItem.tsx
+++ b/src/components/MasterItem/MasterItem.tsx
@@ -7,19 +7,6 @@ import { getTimeSlot } from '../../lib';
 import EditableWrapper from '../Editable/Editable';
 import { armService } from '../../api/arm';

-export interface Schedule {
-  id: string;
-  startWashTime: string;
-  endWashTime: string;
-}
-
-export type MasterProps = {
-  id: string;
-  name: string;
-  phone: string;
-  schedule: Schedule[];
-};
-
 const MasterItem = ({ name, phone, id, schedule }) => {
  const { updateMaster } = armService();
  const { t } = useTranslation('~', {
--- a/src/components/Masters/Masters.tsx
+++ b/src/components/Masters/Masters.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import {
  Box,
  Heading,
@@ -19,8 +19,7 @@ import { useTranslation } from 'react-i18next';

 import MasterItem from '../MasterItem';
 import MasterDrawer from '../MasterDrawer';
-import { armService } from '../../api/arm';
-import { MasterProps } from '../MasterItem/MasterItem';
+import { api } from '../../__data__/service/api';

 const TABLE_HEADERS = [
  'name' as const,
@@ -36,35 +35,23 @@ const Masters = () => {
    keyPrefix: 'dry-wash.arm.master',
  });

-  const [masters, setMasters] = useState<MasterProps[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  const { fetchMasters } = armService();
+  const {
+    data: masters,
+    error,
+    isLoading,
+    isSuccess,
+  } = api.useGetMastersQuery();

  useEffect(() => {
-    const loadMasters = async () => {
-      setLoading(true);
-
-      try {
-        const data = await fetchMasters();
-        setMasters(data.body);
-      } catch (err) {
-        setError(err.message);
-        toast({
-          title: t('error.title'),
-          status: 'error',
-          duration: 5000,
-          isClosable: true,
-          position: 'bottom-right',
-        });
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    loadMasters();
-  }, [toast, t]);
+    if (error) {
+      toast({
+        title: t('error.title'),
+        status: 'error',
+        isClosable: true,
+        position: 'bottom-right',
+      });
+    }
+  }, [error]);

  return (
    <Box p='8'>
@@ -83,22 +70,21 @@ const Masters = () => {
          </Tr>
        </Thead>
        <Tbody>
-          {loading && (
+          {isLoading && (
            <Tr>
              <Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
                <Spinner size='lg' />
              </Td>
            </Tr>
          )}
-          {!loading && masters.length === 0 && !error && (
+          {isSuccess && masters.length === 0 && (
            <Tr>
              <Td colSpan={TABLE_HEADERS.length}>
                <Text>{t('table.empty')}</Text>
              </Td>
            </Tr>
          )}
-          {!loading &&
-            !error &&
+          {isSuccess &&
            masters.map((master, index) => (
              <MasterItem key={index} {...master} />
            ))}
--- a/src/components/OrderItem/OrderItem.tsx
+++ b/src/components/OrderItem/OrderItem.tsx
@@ -3,8 +3,8 @@ import { Td, Tr, Link, Select } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';

-import { MasterProps } from '../MasterItem/MasterItem';
 import { getTimeSlot } from '../../lib';
+import { Master } from '../../models/api/master';
 import { armService } from '../../api/arm';

 const statuses = [
@@ -26,9 +26,9 @@ export type OrderProps = {
  status?: GetArrItemType<typeof statuses>;
  phone?: string;
  location?: string;
-  master: MasterProps;
+  master: Master;
  notes: '';
-  allMasters: MasterProps[];
+  allMasters: Master[];
  id: string;
 };

--- a/src/components/Orders/Orders.tsx
+++ b/src/components/Orders/Orders.tsx
@@ -19,7 +19,7 @@ import OrderItem from '../OrderItem';
 import { OrderProps } from '../OrderItem/OrderItem';
 import { armService } from '../../api/arm';
 import DateNavigator from '../DateNavigator';
-import { MasterProps } from '../MasterItem/MasterItem';
+import { Master } from '../../models/api/master';

 const TABLE_HEADERS = [
  'carNumber' as const,
@@ -41,7 +41,7 @@ const Orders = () => {
  const toast = useToast();

  const [orders, setOrders] = useState<OrderProps[]>([]);
-  const [allMasters, setAllMasters] = useState<MasterProps[]>([]);
+  const [allMasters, setAllMasters] = useState<Master[]>([]);
  const [loading, setLoading] = useState(false);
  const [error, setError] = useState<string | null>(null);
  const [currentDate, setCurrentDate] = useState(new Date());
--- a/src/components/order-form/form/car-body/car-body-select.tsx
+++ b/src/components/order-form/form/car-body/car-body-select.tsx
@@ -1,34 +1,38 @@
-import React, { forwardRef, useState } from 'react';
+import React, { forwardRef } from 'react';
 import {
  Input,
-  Image,
-  InputProps,
  Box,
  Popover,
  PopoverAnchor,
  PopoverContent,
  PopoverBody,
-  List,
-  ListItem,
+  useRadioGroup,
+  Grid,
+  GridItem,
+  UseRadioGroupProps,
+  useDisclosure,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';

-import { carBodySelectOptions } from './helper';
-import { CarBodySelectOption } from './types';
+import { carBodySelectOptions, getInputValue } from './helper';
+import { CarBodyOption } from './option';
+import { CarBodySelectProps } from './types';

-export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
+export const CarBodySelect = forwardRef<HTMLInputElement, CarBodySelectProps>(
  function CarBodySelect(props, ref) {
-    const initialOption = carBodySelectOptions.find(({ value }) => value === Number(props.value));
-    const [selected, setSelected] = useState<Partial<CarBodySelectOption>>(initialOption);
-
-    const handleOptionClick = (option: CarBodySelectOption) => {
-      setSelected(option);
+    const handleOptionClick: UseRadioGroupProps['onChange'] = (value) => {
      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
      // @ts-ignore
-      props.onChange(option.value);
+      props.onChange(value);
    };

-    const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
+    const { value, getRadioProps, getRootProps } = useRadioGroup({
+      defaultValue: props.value,
+      value: props.value,
+      onChange: handleOptionClick,
+    });
+
+    const { isOpen, onOpen, onClose } = useDisclosure();

    const { t } = useTranslation('~', {
      keyPrefix: 'dry-wash.order-create.car-body-select',
@@ -37,7 +41,7 @@ export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
    return (
      <Box width='100%'>
        <Popover
-          isOpen={isDropdownOpen}
+          isOpen={isOpen}
          autoFocus={false}
          placement='bottom-start'
          matchWidth
@@ -46,45 +50,29 @@ export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
            <Input
              {...props}
              ref={ref}
-              value={
-                selected?.labelTKey
-                  ? t(`options.${selected.labelTKey}`)
-                  : undefined
-              }
+              value={getInputValue(Number(value), t) ?? props.value}
              readOnly
-              onClick={() => setIsDropdownOpen(true)}
-              onBlur={() => setIsDropdownOpen(false)}
+              onClick={onOpen}
+              onBlur={onClose}
              placeholder={t('placeholder')}
            />
          </PopoverAnchor>
          <PopoverContent width='100%' maxWidth='100%'>
            <PopoverBody border='1px' borderColor='gray.300' p={0}>
-              <List
-                display='grid'
-                gridTemplateColumns='repeat(auto-fit, minmax(150px, 1fr))'
+              <Grid
+                templateColumns='repeat(auto-fit, minmax(150px, 1fr))'
+                {...getRootProps()}
              >
-                {carBodySelectOptions.map((option) => (
-                  <ListItem
-                    key={option.value}
-                    display='flex'
-                    flexDirection='column'
-                    justifyContent='flex-end'
-                    alignItems='center'
-                    p={2}
-                    cursor='pointer'
-                    _hover={{
-                      bgColor: 'primary.50',
-                    }}
-                    _active={{
-                      bgColor: 'primary.100',
-                    }}
-                    onClick={() => handleOptionClick(option)}
-                  >
-                    <Image src={option.img} />
-                    {t(`options.${option.labelTKey}`)}
-                  </ListItem>
+                {carBodySelectOptions.map(({ value, img, labelTKey }) => (
+                  <GridItem key={value}>
+                    <CarBodyOption
+                      image={img}
+                      label={t(`options.${labelTKey}`)}
+                      {...getRadioProps({ value: String(value) })}
+                    />
+                  </GridItem>
                ))}
-              </List>
+              </Grid>
            </PopoverBody>
          </PopoverContent>
        </Popover>
--- a/src/components/order-form/form/car-body/helper.ts
+++ b/src/components/order-form/form/car-body/helper.ts
@@ -1,3 +1,6 @@
+import { TFunction } from "i18next";
+import { InputProps } from "@chakra-ui/react";
+
 import {
  CoupeImg,
  CrossoverImg,
@@ -8,7 +11,8 @@ import {
  SedanImg,
  SportsCarImg,
  StationWagonImg,
-  SuvImg
+  SuvImg,
+  OtherImg
 } from "../../../../assets/images";
 import { Car } from "../../../../models/landing";

@@ -67,6 +71,17 @@ export const carBodySelectOptions: CarBodySelectOption[] = [
  },
  {
    value: Car.BodyStyle.OTHER,
-    labelTKey: 'other'
+    labelTKey: 'other',
+    img: OtherImg
  },
-];
+];
+
+export const getInputValue = (value: Car.BodyStyle, t: TFunction<"~", "dry-wash.order-create.car-body-select">): InputProps['value'] => {
+  const { labelTKey } = carBodySelectOptions.find((option) => value === option.value) ?? {};
+
+  if (labelTKey) {
+    return t(`options.${labelTKey}`);
+  }
+
+  return;
+};
--- a/src/components/order-form/form/car-body/option/car-body-option.tsx
+++ b/src/components/order-form/form/car-body/option/car-body-option.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import {
+  ImageProps,
+  StackProps,
+  Image,
+  useRadio,
+  chakra,
+  Box,
+  UseRadioProps,
+  Flex,
+} from '@chakra-ui/react';
+
+import { getPropsByState } from './helper';
+
+type CarBodyOptionProps = {
+  image: ImageProps['src'];
+  label: StackProps['children'];
+} & UseRadioProps;
+
+export const CarBodyOption = ({
+  image,
+  label,
+  ...radioProps
+}: CarBodyOptionProps) => {
+  const { state, getInputProps, getRadioProps, htmlProps, getLabelProps } =
+    useRadio(radioProps);
+
+  return (
+    <chakra.label {...htmlProps} cursor='pointer'>
+      <input {...getInputProps({})} hidden />
+      <Box {...getRadioProps()} p={2} {...getPropsByState(state)}>
+        <Flex direction='column' alignItems='center' {...getLabelProps()}>
+          <Image src={image} rounded={4} />
+          {label}
+        </Flex>
+      </Box>
+    </chakra.label>
+  );
+};
--- a/src/components/order-form/form/car-body/option/helper.ts
+++ b/src/components/order-form/form/car-body/option/helper.ts
@@ -0,0 +1,19 @@
+import {
+  BoxProps,
+} from '@chakra-ui/react';
+import { RadioState } from '@chakra-ui/react/dist/types/radio/use-radio';
+
+export const getPropsByState = ({ isChecked }: RadioState): BoxProps => {
+  if (isChecked) {
+    return {
+      bgColor: 'primary.200',
+      _hover: { bgColor: 'primary.100' },
+      _active: { bgColor: 'primary.300' },
+    };
+  }
+
+  return {
+    _hover: { bgColor: 'primary.50' },
+    _active: { bgColor: 'primary.100' },
+  };
+};
--- a/src/components/order-form/form/car-body/option/index.ts
+++ b/src/components/order-form/form/car-body/option/index.ts
@@ -0,0 +1 @@
+export { CarBodyOption } from './car-body-option';
--- a/src/components/order-form/form/car-body/types.ts
+++ b/src/components/order-form/form/car-body/types.ts
@@ -1,3 +1,5 @@
+import { InputProps } from "@chakra-ui/react";
+
 import { Car } from "../../../../models/landing";

 export type CarBodySelectOption = {
@@ -16,3 +18,7 @@ export type CarBodySelectOption = {
  'other';
  img?: string;
 };
+
+export type CarBodySelectProps = {
+  value?: string;
+} & Pick<InputProps, 'onChange'>;
--- a/src/components/order-form/form/helper.ts
+++ b/src/components/order-form/form/helper.ts
@@ -9,6 +9,7 @@ export const defaultValues: Partial<OrderFormValues> = {
  phone: '',
  carNumber: '',
  carColor: '',
+  carBody: '',
  availableDatetimeBegin: '',
  availableDatetimeEnd: '',
 };
--- a/src/components/order-form/form/location/location-input/location-input.tsx
+++ b/src/components/order-form/form/location/location-input/location-input.tsx
@@ -42,21 +42,29 @@ export const LocationInput = memo(

      const onInputChange: InputProps['onChange'] = async (e) => {
        const newInputValue = e.target.value;
-        setInputValue(newInputValue);

-        if (newInputValue.trim().length > 3) {
-          try {
-            const address = extractAddress(newInputValue);
-            const results = await ymaps.suggest(address);
-            setSuggestions(results);
-          } catch (error) {
-            console.error(error);
-          }
+        if (
+          isValidLocation(newInputValue) &&
+          (await isRealLocation(ymaps, newInputValue))
+        ) {
+          onChange(newInputValue);
        } else {
-          setSuggestions([]);
+          setInputValue(newInputValue);
+  
+          if (newInputValue.trim().length > 3) {
+            try {
+              const address = extractAddress(newInputValue);
+              const results = await ymaps.suggest(address);
+              setSuggestions(results);
+            } catch (error) {
+              console.error(error);
+            }
+          } else {
+            setSuggestions([]);
+          }
+  
+          setIsSuggestionsPanelOpen(suggestions.length > 1);
        }
-
-        setIsSuggestionsPanelOpen(suggestions.length > 1);
      };

      const onFocus: InputProps['onFocus'] = () => {
@@ -103,7 +111,7 @@ export const LocationInput = memo(
                {...props}
                ref={ref}
                onBlur={onBlur}
-                value={inputValue}
+                value={inputValue ?? value}
                onChange={onInputChange}
                onFocus={onFocus}
                placeholder={t('placeholder')}
--- a/src/models/api/master.ts
+++ b/src/models/api/master.ts
@@ -0,0 +1,12 @@
+export interface Schedule {
+  id: string;
+  startWashTime: string;
+  endWashTime: string;
+}
+
+export type Master = {
+  id: string;
+  name: string;
+  phone: string;
+  schedule: Schedule[];
+};
--- a/stubs/api/admin.js
+++ b/stubs/api/admin.js
@@ -18,11 +18,13 @@ router.get('/', (req, res) => {
    <legend>Мастера</legend>
      ${generateRadioInput('masters', 'success')}
      ${generateRadioInput('masters', 'error')}
+      ${generateRadioInput('masters', 'empty')}
    </fieldset>
    <fieldset> 
    <legend>Заказы</legend>
      ${generateRadioInput('orders', 'success')}
-      ${generateRadioInput('orders', 'error')}
+      ${generateRadioInput('orders', 'error')}  
+      ${generateRadioInput('orders', 'empty')}
    </fieldset>
    <fieldset> 
    <legend>Лендинг - Детали заказа</legend>
@@ -40,4 +42,4 @@ function generateRadioInput(name, type) {
      <input  ${STUBS[name] === type ? 'checked' : ''}  onclick="fetch('/api/admin/set/${name}/${type}')" type="radio" name="${name}"> 
      ${type}
    </label>`;
-}
+}
--- a/stubs/json/arm-masters/empty.json
+++ b/stubs/json/arm-masters/empty.json
@@ -0,0 +1,4 @@
+{
+  "success": true,
+  "body": []
+}
--- a/stubs/json/arm-orders/empty.json
+++ b/stubs/json/arm-orders/empty.json
@@ -0,0 +1,4 @@
+{
+  "success": true,
+  "body": []
+}
Author	SHA1	Message	Date
Rustam	e3d316c418	Merge pull request 'fix: fill location from autocomplete (#71 )' (#72 ) from feature/order-form-upgrade into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #72 Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>	2025-01-26 15:59:57 +03:00
RustamRu	4c26928d23	fix: fill location from autocomplete (#71 ) All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details it-academy/dry-wash-pl/pipeline/pr-main This commit looks good Details	2025-01-26 15:47:53 +03:00
Rustam	1471bf94dd	Merge pull request 'fix: option select (#55 )' (#70 ) from feature/graphic-car-body-select into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #70 Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>	2025-01-26 15:26:03 +03:00
RustamRu	d3ffaa97f8	fix: option select (#55 ) All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details it-academy/dry-wash-pl/pipeline/pr-main This commit looks good Details	2025-01-26 15:06:11 +03:00
ilnaz	acd09d427c	fix: change endpoint order All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-01-26 12:48:54 +03:00
ilnaz	34bf557a6f	fix: change endpoint orders All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-01-26 12:43:40 +03:00
ilnaz	5e0ac9f7a5	fix: change endpoint All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-01-26 12:36:42 +03:00
Ильназ	9a2ef18925	Merge pull request 'feat: add RTK for master' (#69 ) from feature/RTK into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #69	2025-01-26 12:25:44 +03:00
ilnaz	d15bd6f7d2	feat: add RTK for master All checks were successful it-academy/dry-wash-pl/pipeline/pr-main This commit looks good Details it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-01-26 12:21:34 +03:00
Ильназ	adce5392a1	Merge pull request 'feat: add update status and masters (#67 )' (#68 ) from feature/updateOrders into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #68	2025-01-26 12:15:45 +03:00
				`@@ -0,0 +1 @@`
				`export { CarBodyOption } from './car-body-option';`