From 8cb64dd5baef51ed682c82ede89e7d4a5f456ea7 Mon Sep 17 00:00:00 2001
From: maxim <bozzhik@ya.ru>
Date: Sun, 16 Mar 2025 22:18:26 +0300
Subject: [PATCH] finalize `country, city, carrier` routes

---
 src/App.tsx                       |  2 +-
 src/components/CustomDataGrid.tsx |  4 +++-
 src/pages/carrier/list.tsx        | 20 +++++++++-----------
 src/pages/carrier/show.tsx        |  3 ++-
 src/pages/city/list.tsx           |  4 +---
 src/pages/city/show.tsx           |  3 ++-
 src/pages/country/list.tsx        |  9 +++------
 src/pages/country/show.tsx        |  2 +-
 8 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index ef051bc..ab7cc23 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -181,7 +181,7 @@ function App() {
                     <Route path="/country">
                       <Route index element={<CountryList />} />
                       <Route path="create" element={<CountryCreate />} />
-                      <Route path="edit/:name" element={<CountryEdit />} />
+                      <Route path="edit/:id" element={<CountryEdit />} />
                       <Route path="show/:id" element={<CountryShow />} />
                     </Route>
 
diff --git a/src/components/CustomDataGrid.tsx b/src/components/CustomDataGrid.tsx
index 00ded27..5341490 100644
--- a/src/components/CustomDataGrid.tsx
+++ b/src/components/CustomDataGrid.tsx
@@ -3,6 +3,8 @@ import {Stack, Button} from '@mui/material'
 import React, {useState, useEffect, useMemo} from 'react'
 import Cookies from 'js-cookie'
 
+import {localeText} from '../locales/ru/localeText'
+
 interface CustomDataGridProps extends DataGridProps {
   hasCoordinates?: boolean
 }
@@ -69,7 +71,7 @@ export const CustomDataGrid = ({hasCoordinates = false, columns = [], ...props}:
 
   return (
     <Stack spacing={2}>
-      <DataGrid {...props} columns={columns} columnVisibilityModel={columnVisibilityModel} onColumnVisibilityModelChange={setColumnVisibilityModel} />
+      <DataGrid {...props} columns={columns} localeText={localeText} columnVisibilityModel={columnVisibilityModel} onColumnVisibilityModelChange={setColumnVisibilityModel} />
       <Stack direction="row" spacing={2} sx={{mb: 2}}>
         {hasCoordinates && (
           <Button variant="contained" onClick={toggleCoordinates}>
diff --git a/src/pages/carrier/list.tsx b/src/pages/carrier/list.tsx
index c63dc3f..dcd68a5 100644
--- a/src/pages/carrier/list.tsx
+++ b/src/pages/carrier/list.tsx
@@ -3,8 +3,6 @@ import {CustomDataGrid} from '../../components/CustomDataGrid'
 import {DeleteButton, EditButton, List, ShowButton, useDataGrid} from '@refinedev/mui'
 import React from 'react'
 
-import {localeText} from '../../locales/ru/localeText'
-
 export const CarrierList = () => {
   const {dataGridProps} = useDataGrid({})
 
@@ -26,14 +24,6 @@ export const CarrierList = () => {
         align: 'left',
         headerAlign: 'left',
       },
-      {
-        field: 'city',
-        headerName: 'Город',
-        type: 'string',
-        minWidth: 150,
-        align: 'left',
-        headerAlign: 'left',
-      },
       {
         field: 'full_name',
         headerName: 'Полное имя',
@@ -45,6 +35,14 @@ export const CarrierList = () => {
         headerName: 'Короткое имя',
         type: 'string',
         minWidth: 150,
+      },
+      {
+        field: 'city',
+        headerName: 'Город',
+        type: 'string',
+        minWidth: 150,
+        align: 'left',
+        headerAlign: 'left',
         flex: 1,
       },
       {
@@ -71,7 +69,7 @@ export const CarrierList = () => {
 
   return (
     <List>
-      <CustomDataGrid {...dataGridProps} columns={columns} localeText={localeText} />
+      <CustomDataGrid {...dataGridProps} columns={columns} />
     </List>
   )
 }
diff --git a/src/pages/carrier/show.tsx b/src/pages/carrier/show.tsx
index ef26e56..24295aa 100644
--- a/src/pages/carrier/show.tsx
+++ b/src/pages/carrier/show.tsx
@@ -10,9 +10,10 @@ export const CarrierShow = () => {
 
   const fields = [
     // {label: 'ID', data: 'id'},
-    {label: 'ID города', data: 'city_id'},
+    // {label: 'ID города', data: 'city_id'},
     {label: 'Полное имя', data: 'full_name'},
     {label: 'Короткое имя', data: 'short_name'},
+    {label: 'Город', data: 'city'},
   ]
 
   return (
diff --git a/src/pages/city/list.tsx b/src/pages/city/list.tsx
index 79698c1..e3251f6 100644
--- a/src/pages/city/list.tsx
+++ b/src/pages/city/list.tsx
@@ -3,8 +3,6 @@ import {CustomDataGrid} from '../../components/CustomDataGrid'
 import {DeleteButton, EditButton, List, ShowButton, useDataGrid} from '@refinedev/mui'
 import React from 'react'
 
-import {localeText} from '../../locales/ru/localeText'
-
 export const CityList = () => {
   const {dataGridProps} = useDataGrid({})
 
@@ -65,7 +63,7 @@ export const CityList = () => {
 
   return (
     <List>
-      <CustomDataGrid {...dataGridProps} columns={columns} localeText={localeText} />
+      <CustomDataGrid {...dataGridProps} columns={columns} />
     </List>
   )
 }
diff --git a/src/pages/city/show.tsx b/src/pages/city/show.tsx
index 17e4a96..54777be 100644
--- a/src/pages/city/show.tsx
+++ b/src/pages/city/show.tsx
@@ -11,7 +11,8 @@ export const CityShow = () => {
   const fields = [
     // {label: 'ID', data: 'id'},
     {label: 'Название', data: 'name'},
-    {label: 'Код страны', data: 'country_code'},
+    // {label: 'Код страны', data: 'country_code'},
+    {label: 'Страна', data: 'country'},
   ]
 
   return (
diff --git a/src/pages/country/list.tsx b/src/pages/country/list.tsx
index bc3accc..a3091c8 100644
--- a/src/pages/country/list.tsx
+++ b/src/pages/country/list.tsx
@@ -3,8 +3,6 @@ import {CustomDataGrid} from '../../components/CustomDataGrid'
 import {DeleteButton, EditButton, List, ShowButton, useDataGrid} from '@refinedev/mui'
 import React from 'react'
 
-import {localeText} from '../../locales/ru/localeText'
-
 export const CountryList = () => {
   const {dataGridProps} = useDataGrid({})
 
@@ -14,8 +12,7 @@ export const CountryList = () => {
         field: 'code',
         headerName: 'Код',
         type: 'string',
-        minWidth: 100,
-        display: 'flex',
+        minWidth: 150,
         align: 'left',
         headerAlign: 'left',
       },
@@ -23,7 +20,7 @@ export const CountryList = () => {
         field: 'name',
         headerName: 'Название',
         type: 'string',
-        minWidth: 100,
+        minWidth: 150,
         flex: 1,
       },
       {
@@ -50,7 +47,7 @@ export const CountryList = () => {
 
   return (
     <List>
-      <CustomDataGrid {...dataGridProps} columns={columns} localeText={localeText} getRowId={(row: any) => row.code} />
+      <CustomDataGrid {...dataGridProps} columns={columns} getRowId={(row: any) => row.code} />
     </List>
   )
 }
diff --git a/src/pages/country/show.tsx b/src/pages/country/show.tsx
index f25801f..14ce2d7 100644
--- a/src/pages/country/show.tsx
+++ b/src/pages/country/show.tsx
@@ -9,7 +9,7 @@ export const CountryShow = () => {
   const record = data?.data
 
   const fields = [
-    {label: 'Код', data: 'code'},
+    // {label: 'Код', data: 'code'},
     {label: 'Название', data: 'name'},
   ]