2.4.5

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

ijl.config.js

@@ -12,7 +12,6 @@ module.exports = {
   },
   features: {
     journal: {
-      // add your features here in the format [featureName]: { value: string }
       'lesson.bar': {
         on: true,
         value: '',

package-lock.json

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

package.json

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

src/__data__/kc.ts

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

src/pages/lesson-list.tsx

@@ -194,12 +194,13 @@ 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 []
     }
 
-    const sorted = [...data?.body].sort((a, b) => a.date > b.date ? 1 : -1)
 
     if (!groupByDate) {
       return [{ date: '', data: sorted }]
@@ -222,8 +223,8 @@ const LessonList = () => {
       }
     }
 
-    return lessonsData
-  }, [groupByDate, isSuccess])
+    return lessonsData.sort((a, b) => a.date < b.date? 1 : -1)
+  }, [groupByDate, isSuccess, sorted])
 
   const onSubmit = (lessonData) => {
     toastRef.current = toast({
@@ -404,10 +405,10 @@ const LessonList = () => {
             )}
           </Box>
         )}
-        {barFeature && (
+        {barFeature && sorted?.length && (
           <Box height="300">
             <Bar
-              data={data?.body.map((lesson, index) => ({
+              data={sorted.map((lesson, index) => ({
                 lessonIndex: `#${index + 1}`,
                 count: lesson.students.length,
               }))}
@@ -452,7 +453,7 @@ const LessonList = () => {
                         </Td>
                       )}
                       <Td textAlign="center">
-                        {dayjs(lesson.date).format('H:mm DD.MM.YY')}
+                        {dayjs(lesson.date).format(groupByDate ? 'HH:mm' : 'HH:mm DD.MM.YY')}
                       </Td>
                       <Td>{lesson.name}</Td>
                       {isTeacher(user) && (