2.2.1

Reviewed-on: https://git.inno-js.ru/bro-js/journal.pl/pulls/21
Reviewed-by: primakov <primakovpro@gmail.com>

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "journal.pl",
-    "version": "2.1.1",
+    "version": "2.2.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "journal.pl",
-            "version": "2.1.1",
+            "version": "2.2.1",
             "license": "MIT",
             "dependencies": {
                 "@chakra-ui/icons": "^2.1.1",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "journal.pl",
-    "version": "2.1.1",
+    "version": "2.2.1",
     "description": "inno-js platform journal ui repo",
     "main": "./src/index.tsx",
     "scripts": {

src/pages/lesson-list.tsx

@@ -65,6 +65,8 @@ interface LessonFormProps {
   onCancel: () => void
   onSubmit: (lesson: Lesson) => void
   error?: string
+  title: string
+  nameButton: string
 }
 
 const LessonForm = ({
@@ -73,6 +75,8 @@ const LessonForm = ({
   onCancel,
   onSubmit,
   error,
+  title,
+  nameButton,
 }: LessonFormProps) => {
   const {
     control,
@@ -90,7 +94,7 @@ const LessonForm = ({
     <Card align="left">
       <CardHeader display="flex">
         <Heading as="h2" mt="0">
-          Создание лекции
+          {title}
         </Heading>
         <CloseButton
           ml="auto"
@@ -153,7 +157,7 @@ const LessonForm = ({
                 colorScheme="blue"
                 isLoading={isLoading}
               >
-                Создать
+                {nameButton}
               </Button>
             </Box>
           </VStack>
@@ -343,6 +347,8 @@ const LessonList = () => {
                 }}
                 error={(crLQuery.error as any)?.error}
                 lesson={editLesson}
+                title={editLesson ? 'Редактирование лекции' : 'Создание лекции'}
+                nameButton={editLesson ? 'Редактировать' : 'Создать'}
               />
             ) : (
               <Box p="2" m="2">
@@ -370,7 +376,7 @@ const LessonList = () => {
                   Дата
                 </Th>
                 <Th>Название</Th>
-                <Th>action</Th>
+                {isTeacher(user) && <Th>action</Th>}
                 <Th isNumeric>Отмечено</Th>
               </Tr>
             </Thead>
@@ -395,26 +401,28 @@ const LessonList = () => {
                     {dayjs(lesson.date).format('H:mm DD.MM.YY')}
                   </Td>
                   <Td>{lesson.name}</Td>
-                  <Td>
+                  {isTeacher(user) && (
-                    <Menu>
+                    <Td>
-                      <MenuButton as={Button}>
+                      <Menu>
-                        <EditIcon />
+                        <MenuButton as={Button}>
-                      </MenuButton>
+                          <EditIcon />
-                      <MenuList>
+                        </MenuButton>
-                        <MenuItem
+                        <MenuList>
-                          onClick={() => {
+                          <MenuItem
-                            setShowForm(true)
+                            onClick={() => {
-                            setEditLesson(lesson)
+                              setShowForm(true)
-                          }}
+                              setEditLesson(lesson)
-                        >
+                            }}
-                          Edit
+                          >
-                        </MenuItem>
+                            Edit
-                        <MenuItem onClick={() => setlessonToDelete(lesson)}>
+                          </MenuItem>
-                          Delete
+                          <MenuItem onClick={() => setlessonToDelete(lesson)}>
-                        </MenuItem>
+                            Delete
-                      </MenuList>
+                          </MenuItem>
-                    </Menu>
+                        </MenuList>
-                  </Td>
+                      </Menu>
+                    </Td>
+                  )}
                   <Td isNumeric>{lesson.students.length}</Td>
                 </Tr>
               ))}