diff --git a/src/components/LinkedItems.tsx b/src/components/LinkedItems.tsx index 4d535bc..ce62f74 100644 --- a/src/components/LinkedItems.tsx +++ b/src/components/LinkedItems.tsx @@ -358,11 +358,11 @@ export const LinkedItemsContents = { - if (childResource === "article") { + if (childResource === "article" && type==="edit") { setArticleModalOpenAction(true); setArticleIdAction(item.id); } - if (childResource === "station") { + if (childResource === "station" && type==="edit") { setStationModalOpenAction(true); setStationIdAction(item.id); setRouteIdAction(Number(parentId)); diff --git a/src/pages/carrier/edit.tsx b/src/pages/carrier/edit.tsx index 27e14ab..8f9767e 100644 --- a/src/pages/carrier/edit.tsx +++ b/src/pages/carrier/edit.tsx @@ -19,7 +19,7 @@ export const CarrierEdit = observer(() => { }); const { autocompleteProps: cityAutocompleteProps } = useAutocomplete({ - resource: "city", + resource: `city`, onSearch: (value) => [ { field: "name", @@ -27,7 +27,7 @@ export const CarrierEdit = observer(() => { value, }, ], - ...META_LANGUAGE("ru") + ...META_LANGUAGE(language) }); const { autocompleteProps: mediaAutocompleteProps } = useAutocomplete({ @@ -38,8 +38,7 @@ export const CarrierEdit = observer(() => { operator: "contains", value, }, - ], - ...META_LANGUAGE("ru") + ] }); diff --git a/src/pages/media/edit.tsx b/src/pages/media/edit.tsx index 9e5b6e3..8db550c 100644 --- a/src/pages/media/edit.tsx +++ b/src/pages/media/edit.tsx @@ -153,7 +153,7 @@ export const MediaEdit = observer(() => { helperText={(errors as any)?.media_name?.message} margin="normal" fullWidth - InputLabelProps={{ shrink: true }} + slotProps={{inputLabel: {shrink: true}}} type="text" label="Название *" name="media_name" diff --git a/src/pages/route/edit.tsx b/src/pages/route/edit.tsx index 09fdcbe..821a3de 100644 --- a/src/pages/route/edit.tsx +++ b/src/pages/route/edit.tsx @@ -144,7 +144,7 @@ export const RouteEdit = observer(() => { helperText={(errors as any)?.route_number?.message} margin="normal" fullWidth - InputLabelProps={{ shrink: true }} + slotProps={{inputLabel: {shrink: true}}} type="text" label={"Номер маршрута"} name="route_number" @@ -220,7 +220,7 @@ export const RouteEdit = observer(() => { helperText={(errors as any)?.path?.message} margin="normal" fullWidth - InputLabelProps={{ shrink: true }} + slotProps={{inputLabel: {shrink: true}}} type="text" label={"Координаты маршрута *"} name="path" @@ -241,7 +241,7 @@ export const RouteEdit = observer(() => { helperText={(errors as any)?.route_sys_number?.message} margin="normal" fullWidth - InputLabelProps={{ shrink: true }} + slotProps={{inputLabel: {shrink: true}}} type="number" label={"Системный номер маршрута *"} name="route_sys_number" @@ -299,7 +299,7 @@ export const RouteEdit = observer(() => { helperText={(errors as any)?.scale_min?.message} margin="normal" fullWidth - InputLabelProps={{ shrink: true }} + slotProps={{inputLabel: {shrink: true}}} type="number" label={"Масштаб (мин)"} name="scale_min" @@ -314,7 +314,7 @@ export const RouteEdit = observer(() => { helperText={(errors as any)?.scale_max?.message} margin="normal" fullWidth - InputLabelProps={{ shrink: true }} + slotProps={{inputLabel: {shrink: true}}} type="number" label={"Масштаб (макс)"} name="scale_max" @@ -329,7 +329,7 @@ export const RouteEdit = observer(() => { helperText={(errors as any)?.rotate?.message} margin="normal" fullWidth - InputLabelProps={{ shrink: true }} + slotProps={{inputLabel: {shrink: true}}} type="number" label={"Поворот"} name="rotate" @@ -344,7 +344,7 @@ export const RouteEdit = observer(() => { helperText={(errors as any)?.center_latitude?.message} margin="normal" fullWidth - InputLabelProps={{ shrink: true }} + slotProps={{inputLabel: {shrink: true}}} type="number" label={"Центр. широта"} name="center_latitude" @@ -359,7 +359,7 @@ export const RouteEdit = observer(() => { helperText={(errors as any)?.center_longitude?.message} margin="normal" fullWidth - InputLabelProps={{ shrink: true }} + slotProps={{inputLabel: {shrink: true}}} type="number" label={"Центр. долгота"} name="center_longitude" diff --git a/src/pages/sight/edit.tsx b/src/pages/sight/edit.tsx index 62bb84f..ecd47ed 100644 --- a/src/pages/sight/edit.tsx +++ b/src/pages/sight/edit.tsx @@ -385,15 +385,15 @@ export const SightEdit = observer(() => { diff --git a/src/providers/data.ts b/src/providers/data.ts index b09ce38..f054ae8 100644 --- a/src/providers/data.ts +++ b/src/providers/data.ts @@ -3,7 +3,7 @@ import dataProvider from "@refinedev/simple-rest"; import { TOKEN_KEY } from "@providers"; import axios from "axios"; -import { languageStore } from "../store/LanguageStore"; +import { languageStore } from "@stores"; export const axiosInstance = axios.create({ baseURL: import.meta.env.VITE_KRBL_API, }); @@ -17,7 +17,7 @@ axiosInstance.interceptors.request.use((config) => { // Добавляем язык в кастомный заголовок - config.headers["X-Language"] = languageStore.language; + config.headers["X-Language"] = config.headers["Accept-Language"]; console.log("Request headers:", config.headers);