Merge pull request 'CRUD лекции' (#17) from feature/edit-delete-lesson into master

Reviewed-on: https://git.inno-js.ru/bro-js/journal.pl/pulls/17

.gitignore

@@ -9,6 +9,8 @@ pids
 *.pid
 *.seed
 
+*prom.json
+
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 

Jenkinsfile

@@ -8,7 +8,6 @@ pipeline {
   stages {
     stage('install') {
       steps {
-        sh 'ls -a'
         sh 'node -v'
         sh 'npm -v'
         sh 'npm ci'

src/__data__/api/api.ts

@@ -1,80 +1,112 @@
-import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
-import { getConfigValue } from "@ijl/cli";
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
+import { getConfigValue } from '@ijl/cli'
 
-import { keycloak } from "../kc";
-import { AccessCode, BaseResponse, Course, Lesson, User, UserData } from "../model";
+import { keycloak } from '../kc'
+import {
+  AccessCode,
+  BaseResponse,
+  Course,
+  Lesson,
+  User,
+  UserData,
+} from '../model'
 
 export const api = createApi({
-  reducerPath: "auth",
+  reducerPath: 'auth',
   baseQuery: fetchBaseQuery({
-    baseUrl: getConfigValue("journal.back.url"),
-    fetchFn: async (input: RequestInfo | URL, init?: RequestInit | undefined) => {
-      const response = await fetch(input, init);
+    baseUrl: getConfigValue('journal.back.url'),
+    fetchFn: async (
+      input: RequestInfo | URL,
+      init?: RequestInit | undefined,
+    ) => {
+      const response = await fetch(input, init)
 
       if (response.status === 403) keycloak.login()
 
-      return response;
+      return response
     },
     headers: {
-      "Content-Type": "application/json;charset=utf-8",
+      'Content-Type': 'application/json;charset=utf-8',
     },
     prepareHeaders: (headers) => {
       headers.set('Authorization', `Bearer ${keycloak.token}`)
-    }
+    },
   }),
   tagTypes: ['LessonList', 'CourseList'],
   endpoints: (builder) => ({
     coursesList: builder.query<BaseResponse<Course[]>, void>({
       query: () => '/course/list',
-      providesTags: ['CourseList']
+      providesTags: ['CourseList'],
     }),
-    createUpdateCourse: builder.mutation<BaseResponse<Course>, Partial<Course> & Pick<Course, 'name'>>({
+    createUpdateCourse: builder.mutation<
+      BaseResponse<Course>,
+      Partial<Course> & Pick<Course, 'name'>
+    >({
       query: (course) => ({
         url: '/course',
         method: 'POST',
         body: course,
       }),
-      invalidatesTags: ['CourseList']
+      invalidatesTags: ['CourseList'],
     }),
     courseAllStudents: builder.query<BaseResponse<User[]>, string>({
-      query: (courseId) => `/course/students/${courseId}`
+      query: (courseId) => `/course/students/${courseId}`,
     }),
-    manualAddStudent: builder.mutation<BaseResponse<void>, { lessonId: string, user: User }>({
-      query: ({lessonId, user}) => ({
+    manualAddStudent: builder.mutation<
+      BaseResponse<void>,
+      { lessonId: string; user: User }
+    >({
+      query: ({ lessonId, user }) => ({
         url: `/lesson/add-student/${lessonId}`,
         method: 'POST',
-        body: user
-      })
+        body: user,
+      }),
     }),
 
     lessonList: builder.query<BaseResponse<Lesson[]>, string>({
       query: (courseId) => `/lesson/list/${courseId}`,
-      providesTags: ['LessonList']
+      providesTags: ['LessonList'],
     }),
-    createLesson: builder.mutation<BaseResponse<Lesson>, Pick<Lesson, 'name' | 'date'> & { courseId: string }>({
-      query: ({ name, courseId, date }) => ({
+    createLesson: builder.mutation<
+      BaseResponse<Lesson>,
+      Partial<Lesson> & Pick<Lesson, 'name' | 'date'> & { courseId: string }
+    >({
+      query: (data) => ({
         url: '/lesson',
         method: 'POST',
-        body: { name, courseId, date },
+        body: data,
       }),
-      invalidatesTags: ['LessonList']
+      invalidatesTags: ['LessonList'],
+    }),
+    deleteLesson: builder.mutation<null, string>({
+      query: (lessonId) => ({
+        url: `/lesson/${lessonId}`,
+        method: 'DELETE',
+      }),
+      invalidatesTags: ['LessonList'],
     }),
     lessonById: builder.query<BaseResponse<Lesson>, string>({
-      query: (lessonId: string) => `/lesson/${lessonId}`
+      query: (lessonId: string) => `/lesson/${lessonId}`,
     }),
 
-    createAccessCode: builder.query<BaseResponse<AccessCode>, { lessonId: string }>({
+    createAccessCode: builder.query<
+      BaseResponse<AccessCode>,
+      { lessonId: string }
+    >({
       query: ({ lessonId }) => ({
         url: '/lesson/access-code',
         method: 'POST',
         body: { lessonId },
-      })
+      }),
     }),
-    getAccess: builder.query<BaseResponse<{ user: UserData, accessCode: AccessCode }>, { accessCode: string }>({
+    getAccess: builder.query<
+      BaseResponse<{ user: UserData; accessCode: AccessCode }>,
+      { accessCode: string }
+    >({
       query: ({ accessCode }) => ({
         url: `/lesson/access-code/${accessCode}`,
         method: 'GET',
-      })
-    })
+      }),
+    }),
   }),
-});
+})

src/pages/course-list.tsx

@@ -35,6 +35,7 @@ import { useAppSelector } from '../__data__/store'
 import { api } from '../__data__/api/api'
 import { isTeacher } from '../utils/user'
 import { AddIcon, ArrowDownIcon, ArrowUpIcon, LinkIcon } from '@chakra-ui/icons'
+import { Course } from '../__data__/model'
 
 interface NewCourseForm {
   startDt: string
@@ -226,7 +227,15 @@ const CoursesList = () => {
   )
 }
 
-const CourseCard = ({ course, isOpened, openDetails }) => {
+const CourseCard = ({
+  course,
+  isOpened,
+  openDetails,
+}: {
+  course: Course
+  isOpened: boolean
+  openDetails: () => void
+}) => {
   const [getLessonList, lessonList] = api.useLazyLessonListQuery()
   useEffect(() => {
     if (isOpened) {
@@ -262,6 +271,7 @@ const CourseCard = ({ course, isOpened, openDetails }) => {
                   {lessonList.data?.body?.map((lesson) => (
                     <Link
                       as={ConnectedLink}
+                      key={lesson._id}
                       to={
                         isTeacher(user)
                           ? `${getNavigationsValue('journal.main')}/lesson/${course._id}/${lesson._id}`

src/pages/lesson-details.tsx

@@ -20,6 +20,7 @@ import {
   Lessonname,
   AddMissedButton,
   UnorderList,
+  BreadcrumbsWrapper,
 } from './style'
 import { api } from '../__data__/api/api'
 import { User } from '../__data__/model'
@@ -86,8 +87,8 @@ const LessonDetail = () => {
   }, [accessCode?.body, AllStudents.data])
 
   return (
-    <Container maxW="container.xl" centerContent px="200">
-      <VStack align="left">
+    <>
+      <BreadcrumbsWrapper>
         <Breadcrumb>
           <BreadcrumbItem>
             <BreadcrumbLink as={Link} to={getNavigationsValue('journal.main')}>
@@ -108,41 +109,45 @@ const LessonDetail = () => {
             <BreadcrumbLink href="#">Лекция</BreadcrumbLink>
           </BreadcrumbItem>
         </Breadcrumb>
-        <Heading as='h3' mt='4' mb='3'>
-          Тема занятия: 
-        </Heading>
-        <Box as="span">
-          {accessCode?.body?.lesson?.name}
-        </Box>
-        <Box as='span'>
-          {dayjs(accessCode?.body?.lesson?.date).format('DD MMMM YYYYг.')}{' '}
-          Отмечено - {accessCode?.body?.lesson?.students?.length}{' '}
-          {AllStudents.isSuccess ? `/ ${AllStudents?.data?.body?.length}` : ''}{' '}
-          человек
-        </Box>
-      </VStack>
-      <HStack spacing="8">
-        <a href={userUrl}>
-          <QRCanvas ref={canvRef} />
-        </a>
-        <UnorderList>
-          {studentsArr.map((student) => (
-            <LessonItem key={student.sub} warn={!student.present}>
-              <Lessonname>
-                {student.name || student.preferred_username}{' '}
-                {!student.present && (
-                  <AddMissedButton
-                    onClick={() => manualAdd({ lessonId, user: student })}
-                  >
-                    add
-                  </AddMissedButton>
-                )}
-              </Lessonname>
-            </LessonItem>
-          ))}
-        </UnorderList>
-      </HStack>
-    </Container>
+      </BreadcrumbsWrapper>
+      <Container maxW="container.xl" centerContent px="200">
+        <VStack align="left">
+          <Heading as="h3" mt="4" mb="3">
+            Тема занятия:
+          </Heading>
+          <Box as="span">{accessCode?.body?.lesson?.name}</Box>
+          <Box as="span">
+            {dayjs(accessCode?.body?.lesson?.date).format('DD MMMM YYYYг.')}{' '}
+            Отмечено - {accessCode?.body?.lesson?.students?.length}{' '}
+            {AllStudents.isSuccess
+              ? `/ ${AllStudents?.data?.body?.length}`
+              : ''}{' '}
+            человек
+          </Box>
+        </VStack>
+        <HStack spacing="8">
+          <a href={userUrl}>
+            <QRCanvas ref={canvRef} />
+          </a>
+          <UnorderList>
+            {studentsArr.map((student) => (
+              <LessonItem key={student.sub} warn={!student.present}>
+                <Lessonname>
+                  {student.name || student.preferred_username}{' '}
+                  {!student.present && (
+                    <AddMissedButton
+                      onClick={() => manualAdd({ lessonId, user: student })}
+                    >
+                      add
+                    </AddMissedButton>
+                  )}
+                </Lessonname>
+              </LessonItem>
+            ))}
+          </UnorderList>
+        </HStack>
+      </Container>
+    </>
   )
 }
 

src/pages/lesson-list.tsx

@@ -14,26 +14,45 @@ import {
   CardHeader,
   Heading,
   Button,
-  ButtonGroup,
   CloseButton,
   useToast,
-  Stack,
   VStack,
   FormControl,
   FormLabel,
+  Toast,
   FormHelperText,
   FormErrorMessage,
   Input,
+  TableContainer,
+  Table,
+  Thead,
+  Tr,
+  Th,
+  Tbody,
+  Td,
+  Menu,
+  MenuButton,
+  MenuItem,
+  Text,
+  MenuList,
+  Center,
+  Spinner,
+  AlertDialog,
+  AlertDialogBody,
+  AlertDialogContent,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogOverlay,
 } from '@chakra-ui/react'
+import { AddIcon, EditIcon } from '@chakra-ui/icons'
 
-import { AddIcon } from '@chakra-ui/icons'
+import { ErrorSpan, BreadcrumbsWrapper } from './style'
 
-import { LessonItem, Lessonname, ErrorSpan } from './style'
-
-import { keycloak } from '../__data__/kc'
 import { useAppSelector } from '../__data__/store'
 import { api } from '../__data__/api/api'
 import { isTeacher } from '../utils/user'
+import { qrCode } from '../assets'
+import { Lesson } from '../__data__/model'
 
 interface NewLessonForm {
   name: string
@@ -45,8 +64,10 @@ const LessonList = () => {
   const user = useAppSelector((s) => s.user)
   const { data, isLoading, error } = api.useLessonListQuery(courseId)
   const [createLesson, crLQuery] = api.useCreateLessonMutation()
-  const [value, setValue] = useState('')
+  const [deleteLesson, deletingRqst] = api.useDeleteLessonMutation()
   const [showForm, setShowForm] = useState(false)
+  const [lessonToDelete, setlessonToDelete] = useState<Lesson>(null)
+  const cancelRef = React.useRef()
   const {
     control,
     handleSubmit,
@@ -62,12 +83,6 @@ const LessonList = () => {
   const toast = useToast()
   const toastRef = useRef(null)
 
-  const handleChange = useCallback(
-    (event) => {
-      setValue(event.target.value.toUpperCase())
-    },
-    [setValue],
-  )
   const onSubmit = ({ name, date }) => {
     toastRef.current = toast({
       title: 'Отправляем',
@@ -77,6 +92,46 @@ const LessonList = () => {
     createLesson({ name, courseId, date })
   }
 
+  useEffect(() => {
+    if (deletingRqst.isError) {
+      toast({
+        title: (deletingRqst.error as any)?.error,
+        status: 'error',
+        duration: 3000,
+      })
+    }
+
+    if (deletingRqst.isSuccess) {
+      const lesson = { ...lessonToDelete }
+      toast({
+        status: 'warning',
+        duration: 9000,
+        render(props) {
+          return (
+            <Toast
+              {...props}
+              title={
+                <>
+                  <Box pb={3}>
+                    <Text fontSize="xl">{`Удалена лекция ${lesson.name}`}</Text>
+                  </Box>
+                  <Button
+                    onClick={() =>
+                      createLesson({ courseId, ...lesson })
+                    }
+                  >
+                    Восстановить
+                  </Button>
+                </>
+              }
+            />
+          )
+        },
+      })
+      setlessonToDelete(null)
+    }
+  }, [deletingRqst.isLoading, deletingRqst.isSuccess, deletingRqst.isError])
+
   useEffect(() => {
     if (crLQuery.isSuccess) {
       const values = getValues()
@@ -93,136 +148,229 @@ const LessonList = () => {
     }
   }, [crLQuery.isSuccess])
 
+  if (isLoading) {
+    return (
+      <Container maxW="container.xl">
+        <Center h="300px">
+          <Spinner
+            thickness="4px"
+            speed="0.65s"
+            emptyColor="gray.200"
+            color="blue.500"
+            size="xl"
+          />
+        </Center>
+      </Container>
+    )
+  }
+
   return (
-    <Container maxW="container.xl">
-      <Breadcrumb>
-        <BreadcrumbItem>
-          <BreadcrumbLink as={Link} to={getNavigationsValue('journal.main')}>
-            Журнал
-          </BreadcrumbLink>
-        </BreadcrumbItem>
+    <>
+      <AlertDialog
+        isOpen={Boolean(lessonToDelete)}
+        leastDestructiveRef={cancelRef}
+        onClose={() => setlessonToDelete(null)}
+      >
+        <AlertDialogOverlay>
+          <AlertDialogContent>
+            <AlertDialogHeader fontSize="lg" fontWeight="bold">
+              Удалить занятие от{' '}
+              {dayjs(lessonToDelete?.date).format('DD.MM.YY')}?
+            </AlertDialogHeader>
 
-        <BreadcrumbItem isCurrentPage>
-          <BreadcrumbLink href="#">Курс</BreadcrumbLink>
-        </BreadcrumbItem>
-      </Breadcrumb>
+            <AlertDialogBody>
+              Все данные о посещении данного занятия будут удалены
+            </AlertDialogBody>
 
-      {isTeacher(user) && (
-        <Box mt="15" mb="15">
-          {showForm ? (
-            <Card align="left">
-              <CardHeader display="flex">
-                <Heading as="h2" mt="0">
-                  Создание лекции
-                </Heading>
-                <CloseButton ml="auto" onClick={() => setShowForm(false)} />
-              </CardHeader>
-              <CardBody>
-                <form onSubmit={handleSubmit(onSubmit)}>
-                  <VStack spacing="10" align="left">
-                    <Controller
-                      control={control}
-                      name="date"
-                      rules={{ required: 'Обязательное поле' }}
-                      render={({ field }) => (
-                        <FormControl>
-                          <FormLabel>Дата</FormLabel>
-                          <Input
-                            {...field}
-                            required={false}
-                            placeholder="Укажите дату лекции"
-                            size="md"
-                            type="datetime-local"
-                          />
-                          {errors.date ? (
-                            <FormErrorMessage>
-                              {errors.date?.message}
-                            </FormErrorMessage>
-                          ) : (
-                            <FormHelperText>
-                              Укажите дату и время лекции
-                            </FormHelperText>
-                          )}
-                        </FormControl>
-                      )}
-                    />
-
-                    <Controller
-                      control={control}
-                      name="name"
-                      rules={{ required: 'Обязательное поле' }}
-                      render={({ field }) => (
-                        <FormControl
-                          isRequired
-                          isInvalid={Boolean(errors.name)}
-                        >
-                          <FormLabel>Название новой лекции:</FormLabel>
-                          <Input
-                            {...field}
-                            required={false}
-                            placeholder="Название лекции"
-                            size="md"
-                          />
-                          {errors.name && (
-                            <FormErrorMessage>
-                              {errors.name.message}
-                            </FormErrorMessage>
-                          )}
-                        </FormControl>
-                      )}
-                    />
-                    <Box mt="10">
-                      <Button
-                        size="lg"
-                        type="submit"
-                        leftIcon={<AddIcon />}
-                        colorScheme="blue"
-                      >
-                        Создать
-                      </Button>
-                    </Box>
-                  </VStack>
-
-                  {crLQuery.error && (
-                    <ErrorSpan>{(crLQuery.error as any).error}</ErrorSpan>
-                  )}
-                </form>
-              </CardBody>
-            </Card>
-          ) : (
-            <Box p="2" m="2">
+            <AlertDialogFooter>
               <Button
-                leftIcon={<AddIcon />}
-                colorScheme="green"
-                onClick={() => setShowForm(true)}
+                isDisabled={deletingRqst.isLoading}
+                ref={cancelRef}
+                onClick={() => setlessonToDelete(null)}
               >
-                Добавить
+                Cancel
               </Button>
-            </Box>
-          )}
-        </Box>
-      )}
-      <ul style={{ paddingLeft: 0 }}>
-        {data?.body?.map((lesson) => (
-          <LessonItem key={lesson._id}>
-            <Link
-              to={
-                isTeacher(user)
-                  ? `${getNavigationsValue('journal.main')}/lesson/${courseId}/${lesson._id}`
-                  : ''
-              }
-              style={{ display: 'flex' }}
-            >
-              <Lessonname>{lesson.name}</Lessonname>
-              <span>{dayjs(lesson.date).format('DD MMMM YYYYг.')}</span>
-              <span style={{ marginLeft: 'auto' }}>
-                Участников - {lesson.students.length}
-              </span>
-            </Link>
-          </LessonItem>
-        ))}
-      </ul>
-    </Container>
+              <Button
+                colorScheme="red"
+                loadingText=""
+                isLoading={deletingRqst.isLoading}
+                onClick={() => deleteLesson(lessonToDelete._id)}
+                ml={3}
+              >
+                Delete
+              </Button>
+            </AlertDialogFooter>
+          </AlertDialogContent>
+        </AlertDialogOverlay>
+      </AlertDialog>
+      <BreadcrumbsWrapper>
+        <Breadcrumb>
+          <BreadcrumbItem>
+            <BreadcrumbLink as={Link} to={getNavigationsValue('journal.main')}>
+              Журнал
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+
+          <BreadcrumbItem isCurrentPage>
+            <BreadcrumbLink href="#">Курс</BreadcrumbLink>
+          </BreadcrumbItem>
+        </Breadcrumb>
+      </BreadcrumbsWrapper>
+      <Container maxW="container.xl">
+        {isTeacher(user) && (
+          <Box mt="15" mb="15">
+            {showForm ? (
+              <Card align="left">
+                <CardHeader display="flex">
+                  <Heading as="h2" mt="0">
+                    Создание лекции
+                  </Heading>
+                  <CloseButton ml="auto" onClick={() => setShowForm(false)} />
+                </CardHeader>
+                <CardBody>
+                  <form onSubmit={handleSubmit(onSubmit)}>
+                    <VStack spacing="10" align="left">
+                      <Controller
+                        control={control}
+                        name="date"
+                        rules={{ required: 'Обязательное поле' }}
+                        render={({ field }) => (
+                          <FormControl>
+                            <FormLabel>Дата</FormLabel>
+                            <Input
+                              {...field}
+                              required={false}
+                              placeholder="Укажите дату лекции"
+                              size="md"
+                              type="datetime-local"
+                            />
+                            {errors.date ? (
+                              <FormErrorMessage>
+                                {errors.date?.message}
+                              </FormErrorMessage>
+                            ) : (
+                              <FormHelperText>
+                                Укажите дату и время лекции
+                              </FormHelperText>
+                            )}
+                          </FormControl>
+                        )}
+                      />
+
+                      <Controller
+                        control={control}
+                        name="name"
+                        rules={{ required: 'Обязательное поле' }}
+                        render={({ field }) => (
+                          <FormControl
+                            isRequired
+                            isInvalid={Boolean(errors.name)}
+                          >
+                            <FormLabel>Название новой лекции:</FormLabel>
+                            <Input
+                              {...field}
+                              required={false}
+                              placeholder="Название лекции"
+                              size="md"
+                            />
+                            {errors.name && (
+                              <FormErrorMessage>
+                                {errors.name.message}
+                              </FormErrorMessage>
+                            )}
+                          </FormControl>
+                        )}
+                      />
+                      <Box mt="10">
+                        <Button
+                          size="lg"
+                          type="submit"
+                          leftIcon={<AddIcon />}
+                          colorScheme="blue"
+                        >
+                          Создать
+                        </Button>
+                      </Box>
+                    </VStack>
+
+                    {crLQuery.error && (
+                      <ErrorSpan>{(crLQuery.error as any).error}</ErrorSpan>
+                    )}
+                  </form>
+                </CardBody>
+              </Card>
+            ) : (
+              <Box p="2" m="2">
+                <Button
+                  leftIcon={<AddIcon />}
+                  colorScheme="green"
+                  onClick={() => setShowForm(true)}
+                >
+                  Добавить
+                </Button>
+              </Box>
+            )}
+          </Box>
+        )}
+        <TableContainer whiteSpace="wrap">
+          <Table variant="striped" colorScheme="cyan">
+            <Thead>
+              <Tr>
+                {isTeacher(user) && (
+                  <Th align="center" width={1}>
+                    ссылка
+                  </Th>
+                )}
+                <Th textAlign="center" width={1}>
+                  Дата
+                </Th>
+                <Th>Название</Th>
+                <Th>action</Th>
+                <Th isNumeric>Отмечено</Th>
+              </Tr>
+            </Thead>
+            <Tbody>
+              {data?.body?.map((lesson) => (
+                <Tr key={lesson._id}>
+                  {isTeacher(user) && (
+                    <Td>
+                      <Link
+                        to={`${getNavigationsValue('journal.main')}/lesson/${courseId}/${lesson._id}`}
+                        style={{ display: 'flex' }}
+                      >
+                        <img
+                          width={24}
+                          src={qrCode}
+                          style={{ margin: '0 auto' }}
+                        />
+                      </Link>
+                    </Td>
+                  )}
+                  <Td textAlign="center">
+                    {dayjs(lesson.date).format('H:mm DD.MM.YY')}
+                  </Td>
+                  <Td>{lesson.name}</Td>
+                  <Td>
+                    <Menu>
+                      <MenuButton as={Button}>
+                        <EditIcon />
+                      </MenuButton>
+                      <MenuList>
+                        <MenuItem isDisabled>Edit</MenuItem>
+                        <MenuItem onClick={() => setlessonToDelete(lesson)}>
+                          Delete
+                        </MenuItem>
+                      </MenuList>
+                    </Menu>
+                  </Td>
+                  <Td isNumeric>{lesson.students.length}</Td>
+                </Tr>
+              ))}
+            </Tbody>
+          </Table>
+        </TableContainer>
+      </Container>
+    </>
   )
 }
 

src/pages/style.ts

@@ -4,6 +4,9 @@ import {
   Card
 } from '@chakra-ui/react'
 
+export const BreadcrumbsWrapper = styled.div`
+  padding: 12px;
+`;
 
 export const MainWrapper = styled.main`
   display: flex;