From 89f64aae98f35cccc32cb6b29e7e22614a014d6d Mon Sep 17 00:00:00 2001
From: dyakonovr <dyakonov.rr@bk.ru>
Date: Wed, 3 Apr 2024 19:44:08 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=81=D1=8C=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B0=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/App.tsx                      | 26 +++++++++++--------------
 client/src/components/Message/Edit.tsx  |  4 ++--
 client/src/components/Message/List.tsx  | 10 +++++++---
 client/src/components/Message/index.tsx |  3 +++
 client/src/components/Role/index.tsx    |  3 +++
 client/src/components/Section/List.tsx  |  6 ++++--
 client/src/components/Section/index.tsx |  3 +++
 client/src/components/Thread/List.tsx   | 14 ++++++++-----
 client/src/components/Thread/index.tsx  |  3 +++
 client/src/components/User/index.tsx    |  3 +++
 10 files changed, 48 insertions(+), 27 deletions(-)
 create mode 100644 client/src/components/Message/index.tsx
 create mode 100644 client/src/components/Role/index.tsx
 create mode 100644 client/src/components/Section/index.tsx
 create mode 100644 client/src/components/Thread/index.tsx
 create mode 100644 client/src/components/User/index.tsx

diff --git a/client/src/App.tsx b/client/src/App.tsx
index dd2147a..a520f79 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -1,19 +1,10 @@
 import { Admin, Resource } from "react-admin";
 import dataProvider from "./dataProvider";
-import RolesList from "./components/Role/List";
-import RoleCreate from "./components/Role/Create";
-import RoleEdit from "./components/Role/Edit";
-import UsersList from "./components/User/List";
-import UserCreate from "./components/User/Create";
-import UserEdit from "./components/User/Edit";
-import SectionsList from "./components/Section/List";
-import SectionCreate from "./components/Section/Create";
-import SectionEdit from "./components/Section/Edit";
-import ThreadsList from "./components/Thread/List";
-import ThreadCreate from "./components/Thread/Create";
-import MessagesList from "./components/Message/List";
-import MessageCreate from "./components/Message/Create";
-import ThreadEdit from "./components/Thread/Edit";
+import { SectionCreate, SectionEdit, SectionsList } from "./components/Section";
+import { MessagesList, MessageCreate, MessageEdit } from "./components/Message";
+import { RolesList, RoleCreate, RoleEdit } from "./components/Role";
+import { ThreadsList, ThreadCreate, ThreadEdit } from "./components/Thread";
+import { UsersList, UserCreate, UserEdit } from "./components/User";
 
 function App() {
   return (
@@ -42,7 +33,12 @@ function App() {
         create={<ThreadCreate />}
         edit={<ThreadEdit />}
       />
-      <Resource name="messages" list={<MessagesList />} create={<MessageCreate />} />
+      <Resource
+        name="messages"
+        list={<MessagesList />}
+        create={<MessageCreate />}
+        edit={<MessageEdit />}
+      />
     </Admin>
   );
 }
diff --git a/client/src/components/Message/Edit.tsx b/client/src/components/Message/Edit.tsx
index 7f51eb3..74b08f4 100644
--- a/client/src/components/Message/Edit.tsx
+++ b/client/src/components/Message/Edit.tsx
@@ -8,7 +8,7 @@ import {
 } from "react-admin";
 import Title from "../Title";
 
-function SectionEdit() {
+function MessageEdit() {
   return (
     <Edit title={<Title prefixText="Сообщение" />} actions={false}>
       <SimpleForm>
@@ -24,4 +24,4 @@ function SectionEdit() {
   );
 }
 
-export default SectionEdit;
+export default MessageEdit;
diff --git a/client/src/components/Message/List.tsx b/client/src/components/Message/List.tsx
index 9c4bd5d..d8f3a59 100644
--- a/client/src/components/Message/List.tsx
+++ b/client/src/components/Message/List.tsx
@@ -1,4 +1,4 @@
-import { List, Datagrid, TextField, EditButton } from "react-admin";
+import { List, Datagrid, TextField, EditButton, ReferenceField } from "react-admin";
 
 function MessagesList() {
   return (
@@ -6,8 +6,12 @@ function MessagesList() {
       <Datagrid>
         <TextField source="id" />
         <TextField source="text" />
-        <TextField source="user_id" />
-        <TextField source="thread_id" />
+        <ReferenceField label="User" source="user_id" reference="users">
+          <TextField source="nickname" />
+        </ReferenceField>
+        <ReferenceField label="Thread" source="thread_id" reference="threads">
+          <TextField source="name" />
+        </ReferenceField>
         <EditButton />
       </Datagrid>
     </List>
diff --git a/client/src/components/Message/index.tsx b/client/src/components/Message/index.tsx
new file mode 100644
index 0000000..aae41d1
--- /dev/null
+++ b/client/src/components/Message/index.tsx
@@ -0,0 +1,3 @@
+export { default as MessageEdit } from "./Edit";
+export { default as MessageCreate } from "./Create";
+export { default as MessagesList } from "./List";
\ No newline at end of file
diff --git a/client/src/components/Role/index.tsx b/client/src/components/Role/index.tsx
new file mode 100644
index 0000000..51113a8
--- /dev/null
+++ b/client/src/components/Role/index.tsx
@@ -0,0 +1,3 @@
+export { default as RoleEdit } from "./Edit";
+export { default as RoleCreate } from "./Create";
+export { default as RolesList } from "./List";
\ No newline at end of file
diff --git a/client/src/components/Section/List.tsx b/client/src/components/Section/List.tsx
index 7849ca0..4424035 100644
--- a/client/src/components/Section/List.tsx
+++ b/client/src/components/Section/List.tsx
@@ -1,4 +1,4 @@
-import { List, Datagrid, TextField, EditButton } from "react-admin";
+import { List, Datagrid, TextField, EditButton, ReferenceField } from "react-admin";
 
 function SectionsList() {
   return (
@@ -6,7 +6,9 @@ function SectionsList() {
       <Datagrid>
         <TextField source="id" />
         <TextField source="name" />
-        <TextField source="root_section_id" />
+        <ReferenceField label="Root section" source="root_section_id" reference="sections">
+          <TextField source="name" />
+        </ReferenceField>
         <EditButton />
       </Datagrid>
     </List>
diff --git a/client/src/components/Section/index.tsx b/client/src/components/Section/index.tsx
new file mode 100644
index 0000000..bd405a1
--- /dev/null
+++ b/client/src/components/Section/index.tsx
@@ -0,0 +1,3 @@
+export { default as SectionEdit } from "./Edit";
+export { default as SectionCreate } from "./Create";
+export { default as SectionsList } from "./List";
\ No newline at end of file
diff --git a/client/src/components/Thread/List.tsx b/client/src/components/Thread/List.tsx
index 98b1053..4bafe48 100644
--- a/client/src/components/Thread/List.tsx
+++ b/client/src/components/Thread/List.tsx
@@ -1,4 +1,4 @@
-import { List, Datagrid, TextField, EditButton } from "react-admin";
+import { List, Datagrid, TextField, EditButton, ReferenceField } from "react-admin";
 
 function ThreadsList() {
   return (
@@ -6,12 +6,16 @@ function ThreadsList() {
       <Datagrid>
         <TextField source="id" />
         <TextField source="name" />
-        <TextField source="section_id" />
-        <TextField source="creator_id" />
+        <ReferenceField label="Section" source="section_id" reference="sections">
+          <TextField source="name" />
+        </ReferenceField>
+        <ReferenceField label="User" source="creator_id" reference="users">
+          <TextField source="nickname" />
+        </ReferenceField>
         <EditButton />
       </Datagrid>
     </List>
   );
-};
+}
 
-export default ThreadsList;
\ No newline at end of file
+export default ThreadsList;
diff --git a/client/src/components/Thread/index.tsx b/client/src/components/Thread/index.tsx
new file mode 100644
index 0000000..d9002e0
--- /dev/null
+++ b/client/src/components/Thread/index.tsx
@@ -0,0 +1,3 @@
+export { default as ThreadEdit } from "./Edit";
+export { default as ThreadCreate } from "./Create";
+export { default as ThreadsList } from "./List";
\ No newline at end of file
diff --git a/client/src/components/User/index.tsx b/client/src/components/User/index.tsx
new file mode 100644
index 0000000..ae4bc33
--- /dev/null
+++ b/client/src/components/User/index.tsx
@@ -0,0 +1,3 @@
+export { default as UserEdit } from "./Edit";
+export { default as UserCreate } from "./Create";
+export { default as UsersList } from "./List";
\ No newline at end of file