better Jenkins file

Reviewed-on: #28

Jenkinsfile

@@ -1,37 +1,57 @@
 pipeline {
-  agent {
+    agent {
-    docker {
+        docker {
-      image 'node:18'
+            image 'node:20'
-    }
+        }
-  }
-
-  stages {
-    stage('install') {
-      steps {
-        sh 'node -v'
-        sh 'npm -v'
-        sh 'npm ci'
-      }
     }
 
-    stage('eslint') {
+    stages {
-      steps {
+        stage('install') {
-        sh 'npm run eslint'
+            steps {
-      }
+                sh 'node -v'
-    }
+                sh 'npm -v'
+                script {
+                    String tag = sh(returnStdout: true, script: 'git tag --contains').trim()
+                    String branchName = sh(returnStdout: true, script: 'git rev-parse --abbrev-ref HEAD').trim()
+                    String commit = sh(returnStdout: true, script: 'git log -1 --oneline').trim()
+                    String commitMsg = commit.substring(commit.indexOf(' ')).trim()
 
-    stage('build') {
+                    if (tag) {
-      steps {
+                        currentBuild.displayName = "#${BUILD_NUMBER}, tag ${tag}"
-        sh 'npm run build'
+                    } else {
-      }
+                        currentBuild.displayName = "#${BUILD_NUMBER}, branch ${branchName}"
-    }
+                    }
 
-    stage('clean-all') {
+                    String author = sh(returnStdout: true, script: "git log -1 --pretty=format:'%an'").trim()
-      steps {
+                    currentBuild.description = "${author}<br />${commitMsg}"
-        sh 'rm -rf .[!.]*'
+                    echo 'starting installing'
-        sh 'rm -rf ./*'
+                    sh 'npm ci'
-        sh 'ls -a'
+                }
-      }
+            }
+        }
+
+        stage('checks') {
+            parallel {
+                stage('eslint') {
+                    steps {
+                        sh 'npm run eslint'
+                    }
+                }
+
+                stage('build') {
+                    steps {
+                        sh 'npm run build'
+                    }
+                }
+            }
+        }
+
+        stage('clean-all') {
+            steps {
+                sh 'rm -rf .[!.]*'
+                sh 'rm -rf ./*'
+                sh 'ls -a'
+            }
+        }
     }
-  }
 }

README.md

@@ -19,7 +19,7 @@ npm install
 пропишите в hosts строку
 
 ```
-127.0.0.1 ift-b1.kc.inno-js.test
+127.0.0.1 journal.test
 ```
 
 ## Запуск
@@ -28,4 +28,4 @@ npm install
 npm start
 ```
 
-откройте в браузере [проект](http://ift-b1.kc.inno-js.test)
+откройте в браузере [проект](http://journal.test)

ijl.config.js

@@ -1,22 +1,31 @@
 const pkg = require('./package')
 
 module.exports = {
-    apiPath: 'stubs/api',
+  apiPath: 'stubs/api',
-    webpackConfig: {
+  webpackConfig: {
-        output: {
+    output: {
-            publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`
+      publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`,
-        }
     },
-    navigations: {
+  },
-        'journal.main': '/journal.pl'
+  navigations: {
+    'journal.main': '/journal.pl',
+  },
+  features: {
+    journal: {
+      'lesson.bar': {
+        on: true,
+        value: '',
+        key: 'lesson.bar',
+      },
+      'group.by.date': {
+        on: true,
+        value: '',
+        key: 'group.by.date',
+      },
     },
-    features: {
+  },
-        'journal': {
+  config: {
-            // add your features here in the format [featureName]: { value: string }
+    'journal.back.url': '/api',
-        },
+    'journal.polling-interval': '10000',
-    },
+  },
-    config: {
-    "journal.back.url": "/api",
-    "journal.polling-interval": "10000"
-  }
 }

package.json

@@ -1,51 +1,53 @@
 {
     "name": "journal.pl",
-    "version": "2.1.1",
+    "version": "2.4.5",
-    "description": "inno-js platform journal ui repo",
+    "description": "bro-js platform journal ui repo",
     "main": "./src/index.tsx",
     "scripts": {
-        "start": "start chrome http://ift-b1.kc.inno-js.test/journal.pl & ijl-cli server --port=80",
+        "start": "brojs server --port=8099 --with-open-browser",
-        "build": "npm run clean && ijl-cli build --dev",
+        "build": "npm run clean && brojs build --dev",
-        "build:prod": "npm run clean && ijl-cli build",
+        "build:prod": "npm run clean && brojs build",
         "clean": "rimraf dist",
         "test": "echo ok",
         "eslint": "npx eslint ."
     },
     "repository": {
         "type": "git",
-        "url": "ssh://git@85.143.175.152:10022/omni-tech/journal.pl.git"
+        "url": "ssh://git@85.143.175.152:222/bro-js/journal.pl.git"
     },
     "keywords": [],
     "author": "",
     "license": "MIT",
     "devDependencies": {
-        "@ijl/cli": "^5.0.3",
         "@typescript-eslint/eslint-plugin": "^7.4.0",
         "@typescript-eslint/parser": "^7.4.0",
         "eslint": "^8.57.0",
         "eslint-plugin-react": "^7.34.1"
     },
     "dependencies": {
+        "@brojs/cli": "^0.0.4-alpha.9",
         "@chakra-ui/icons": "^2.1.1",
         "@chakra-ui/react": "^2.8.2",
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.0",
+        "@nivo/bar": "^0.85.1",
         "@reduxjs/toolkit": "^2.2.1",
         "@types/react": "^18.2.60",
         "@types/react-dom": "^18.2.19",
         "dayjs": "^1.11.10",
-        "express": "^4.18.2",
+        "express": "^4.19.2",
         "js-sha256": "^0.11.0",
         "keycloak-js": "^23.0.7",
         "prettier": "^3.2.5",
         "qrcode": "^1.5.3",
-        "react": "^18.2.0",
+        "react": "^18.3.1",
-        "react-dom": "^18.2.0",
+        "react-dom": "^18.3.1",
         "react-helmet": "^6.1.0",
         "react-hook-form": "^7.51.2",
         "react-redux": "^9.1.0",
         "react-router-dom": "^6.22.1",
         "redux": "^5.0.1",
-        "typescript": "^5.3.3"
+        "typescript": "^5.3.3",
+        "webpack-hot-middleware": "^2.26.1"
     }
 }

src/__data__/api/api.ts

@@ -1,5 +1,5 @@
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
-import { getConfigValue } from '@ijl/cli'
+import { getConfigValue } from '@brojs/cli'
 
 import { keycloak } from '../kc'
 import {

src/__data__/kc.ts

@@ -1,8 +1,8 @@
 import Keycloak from 'keycloak-js';
 
 export const keycloak = new Keycloak({
-  url: 'https://kc.inno-js.ru',
+  url: 'https://kc.bro-js.ru',
-  realm: 'inno-js',
+  realm: 'bro-js',
   clientId: 'journal'
 });
 

src/dashboard.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, Suspense } from 'react'
 import { Routes, Route, useNavigate } from 'react-router-dom'
 import { Provider } from 'react-redux'
-import { getNavigationsValue } from '@ijl/cli'
+import { getNavigationsValue } from '@brojs/cli'
 import { Box, Container, Spinner, VStack } from '@chakra-ui/react'
 
 import {

src/pages/course-list.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import dayjs from 'dayjs'
 import { Link as ConnectedLink } from 'react-router-dom'
-import { getNavigationsValue } from '@ijl/cli'
+import { getNavigationsValue } from '@brojs/cli'
 import {
   Box,
   CardHeader,

src/pages/lesson-details.tsx

@@ -3,7 +3,7 @@ import { useParams, Link } from 'react-router-dom'
 import dayjs from 'dayjs'
 import QRCode from 'qrcode'
 import { sha256 } from 'js-sha256'
-import { getConfigValue, getNavigationsValue } from '@ijl/cli'
+import { getConfigValue, getNavigationsValue } from '@brojs/cli'
 import {
   Box,
   Breadcrumb,

src/pages/lesson-list.tsx

@@ -1,7 +1,13 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
+import React, {
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
+import { ResponsiveBar } from '@nivo/bar'
 import dayjs from 'dayjs'
 import { Link, useParams } from 'react-router-dom'
-import { getNavigationsValue } from '@ijl/cli'
+import { getNavigationsValue, getFeatures } from '@brojs/cli'
 import { useForm, Controller } from 'react-hook-form'
 import {
   Breadcrumb,
@@ -54,6 +60,11 @@ import { Lesson } from '../__data__/model'
 
 import { ErrorSpan, BreadcrumbsWrapper } from './style'
 
+const features = getFeatures('journal')
+
+const barFeature = features?.['lesson.bar']
+const groupByDate = features?.['group.by.date']
+
 interface NewLessonForm {
   name: string
   date: string
@@ -65,6 +76,8 @@ interface LessonFormProps {
   onCancel: () => void
   onSubmit: (lesson: Lesson) => void
   error?: string
+  title: string
+  nameButton: string
 }
 
 const LessonForm = ({
@@ -73,6 +86,8 @@ const LessonForm = ({
   onCancel,
   onSubmit,
   error,
+  title,
+  nameButton,
 }: LessonFormProps) => {
   const {
     control,
@@ -90,7 +105,7 @@ const LessonForm = ({
     <Card align="left">
       <CardHeader display="flex">
         <Heading as="h2" mt="0">
-          Создание лекции
+          {title}
         </Heading>
         <CloseButton
           ml="auto"
@@ -153,7 +168,7 @@ const LessonForm = ({
                 colorScheme="blue"
                 isLoading={isLoading}
               >
-                Создать
+                {nameButton}
               </Button>
             </Box>
           </VStack>
@@ -168,7 +183,7 @@ const LessonForm = ({
 const LessonList = () => {
   const { courseId } = useParams()
   const user = useAppSelector((s) => s.user)
-  const { data, isLoading, error } = api.useLessonListQuery(courseId)
+  const { data, isLoading, error, isSuccess } = api.useLessonListQuery(courseId)
   const [createLesson, crLQuery] = api.useCreateLessonMutation()
   const [deleteLesson, deletingRqst] = api.useDeleteLessonMutation()
   const [updateLesson, updateLessonRqst] = api.useUpdateLessonMutation()
@@ -179,6 +194,37 @@ const LessonList = () => {
   const toastRef = useRef(null)
   const createdLessonRef = useRef(null)
   const [editLesson, setEditLesson] = useState<Lesson>(null)
+  const sorted = useMemo(() => [...(data?.body || [])]?.sort((a, b) => a.date > b.date ? 1 : -1), [data, data?.body])
+
+  const lessonCalc = useMemo(() => {
+    if (!isSuccess) {
+      return []
+    }
+
+
+    if (!groupByDate) {
+      return [{ date: '', data: sorted }]
+    }
+
+    const lessonsData = []
+    for (let i = 0; i < sorted.length; i++) {
+      const element = sorted[i]
+      const find = lessonsData.find(
+        (item) => dayjs(element.date).diff(dayjs(item.date), 'day') === 0,
+      )
+
+      if (find) {
+        find.data.push(element)
+      } else {
+        lessonsData.push({
+          date: element.date,
+          data: [element],
+        })
+      }
+    }
+
+    return lessonsData.sort((a, b) => a.date < b.date? 1 : -1)
+  }, [groupByDate, isSuccess, sorted])
 
   const onSubmit = (lessonData) => {
     toastRef.current = toast({
@@ -329,7 +375,7 @@ const LessonList = () => {
           </BreadcrumbItem>
         </Breadcrumb>
       </BreadcrumbsWrapper>
-      <Container maxW="container.xl">
+      <Container maxW="container.xl" position="relative">
         {isTeacher(user) && (
           <Box mt="15" mb="15">
             {showForm ? (
@@ -343,6 +389,8 @@ const LessonList = () => {
                 }}
                 error={(crLQuery.error as any)?.error}
                 lesson={editLesson}
+                title={editLesson ? 'Редактирование лекции' : 'Создание лекции'}
+                nameButton={editLesson ? 'Редактировать' : 'Создать'}
               />
             ) : (
               <Box p="2" m="2">
@@ -357,7 +405,17 @@ const LessonList = () => {
             )}
           </Box>
         )}
-        <TableContainer whiteSpace="wrap">
+        {barFeature && sorted?.length && (
+          <Box height="300">
+            <Bar
+              data={sorted.map((lesson, index) => ({
+                lessonIndex: `#${index + 1}`,
+                count: lesson.students.length,
+              }))}
+            />
+          </Box>
+        )}
+        <TableContainer whiteSpace="wrap" pb={13}>
           <Table variant="striped" colorScheme="cyan">
             <Thead>
               <Tr>
@@ -370,53 +428,62 @@ const LessonList = () => {
                   Дата
                 </Th>
                 <Th>Название</Th>
-                <Th>action</Th>
+                {isTeacher(user) && <Th>action</Th>}
                 <Th isNumeric>Отмечено</Th>
               </Tr>
             </Thead>
             <Tbody>
-              {data?.body?.map((lesson) => (
+              {lessonCalc?.map(({ data: lessons, date }) => (
-                <Tr key={lesson._id}>
+                <React.Fragment key={date}>
-                  {isTeacher(user) && (
+                  {date && <Tr><Td colSpan={isTeacher(user) ? 5 : 3}>{dayjs(date).format('DD MMMM YYYY')}</Td></Tr>}
-                    <Td>
+                  {lessons.map((lesson) => (
-                      <Link
+                    <Tr key={lesson._id}>
-                        to={`${getNavigationsValue('journal.main')}/lesson/${courseId}/${lesson._id}`}
+                      {isTeacher(user) && (
-                        style={{ display: 'flex' }}
+                        <Td>
-                      >
+                          <Link
-                        <img
+                            to={`${getNavigationsValue('journal.main')}/lesson/${courseId}/${lesson._id}`}
-                          width={24}
+                            style={{ display: 'flex' }}
-                          src={qrCode}
+                          >
-                          style={{ margin: '0 auto' }}
+                            <img
-                        />
+                              width={24}
-                      </Link>
+                              src={qrCode}
-                    </Td>
+                              style={{ margin: '0 auto' }}
-                  )}
+                            />
-                  <Td textAlign="center">
+                          </Link>
-                    {dayjs(lesson.date).format('H:mm DD.MM.YY')}
+                        </Td>
-                  </Td>
+                      )}
-                  <Td>{lesson.name}</Td>
+                      <Td textAlign="center">
-                  <Td>
+                        {dayjs(lesson.date).format(groupByDate ? 'HH:mm' : 'HH:mm DD.MM.YY')}
-                    <Menu>
+                      </Td>
-                      <MenuButton as={Button}>
+                      <Td>{lesson.name}</Td>
-                        <EditIcon />
+                      {isTeacher(user) && (
-                      </MenuButton>
+                        <Td>
-                      <MenuList>
+                          <Menu>
-                        <MenuItem
+                            <MenuButton as={Button}>
-                          onClick={() => {
+                              <EditIcon />
-                            setShowForm(true)
+                            </MenuButton>
-                            setEditLesson(lesson)
+                            <MenuList>
-                          }}
+                              <MenuItem
-                        >
+                                onClick={() => {
-                          Edit
+                                  setShowForm(true)
-                        </MenuItem>
+                                  setEditLesson(lesson)
-                        <MenuItem onClick={() => setlessonToDelete(lesson)}>
+                                }}
-                          Delete
+                              >
-                        </MenuItem>
+                                Edit
-                      </MenuList>
+                              </MenuItem>
-                    </Menu>
+                              <MenuItem
-                  </Td>
+                                onClick={() => setlessonToDelete(lesson)}
-                  <Td isNumeric>{lesson.students.length}</Td>
+                              >
-                </Tr>
+                                Delete
+                              </MenuItem>
+                            </MenuList>
+                          </Menu>
+                        </Td>
+                      )}
+                      <Td isNumeric>{lesson.students.length}</Td>
+                    </Tr>
+                  ))}
+                </React.Fragment>
               ))}
             </Tbody>
           </Table>
@@ -427,3 +494,29 @@ const LessonList = () => {
 }
 
 export default LessonList
+
+const Bar = ({ data }) => (
+  <ResponsiveBar
+    data={data}
+    keys={['count']}
+    indexBy="lessonIndex"
+    margin={{ top: 50, right: 130, bottom: 50, left: 60 }}
+    padding={0.3}
+    valueScale={{ type: 'linear' }}
+    indexScale={{ type: 'band', round: true }}
+    colors={{ scheme: 'set3' }}
+    axisTop={null}
+    axisRight={null}
+    labelSkipWidth={12}
+    labelSkipHeight={12}
+    labelTextColor={{
+      from: 'color',
+      modifiers: [['brighter', 1.4]],
+    }}
+    role="application"
+    ariaLabel="График посещаемости лекций"
+    barAriaLabel={(e) =>
+      e.id + ': ' + e.formattedValue + ' on lection: ' + e.indexValue
+    }
+  />
+)

tsconfig.json

@@ -22,4 +22,4 @@
         "**/*.test.tsx",
         "node_modules/@types/jest"
     ]        
-}
+}