Release 1.1.1

apps/schools/dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-alpine AS runner
+FROM node:18-alpine AS runner
 
 RUN node -v
 

apps/schools/domains/circle/components/circleList/index.tsx

@@ -14,20 +14,23 @@ import { mapReturnedData } from '@domains/common/redux/utils'
 import { HighlightText } from '@domains/common/components/table/forming'
 import { getVarsForAddressColumn } from '@domains/common/utils/geo'
 import { AppRoutes, RoutePath } from '@domains/common/constants/routerEnums'
+import { defaultPaginationTablePage, defaultPaginationTablePageSize } from '@domains/common/constants/Table'
+import { scrollToTop } from '@domains/common/utils/scrollInDirection'
 
 export function CircleList() {
     const [searchRequestText, setSearchRequestText] = useState('')
     const { organizationId } = useOrganization()
 
+    const [paginationParams, setPaginationParams] = useState({
+        page: defaultPaginationTablePage,
+        pageSize: defaultPaginationTablePageSize,
+    })
+
     const { data: circles, isFetching: isFetching } = useGetAllCirclesQuery({
         organization_id: organizationId,
         or_search: createSearchTextForRequest(searchRequestText, searchStudentsColumns),
-    })
-
-    const reformattedData = mapReturnedData(circles, (circle) => {
-        const transformedCircle = structuredClone(circle) as unknown as TableType
-        transformedCircle.accepted_count = circle.student_profile_queries.ACCEPTED
-        return transformedCircle
+        page: paginationParams.page,
+        page_size: paginationParams.pageSize,
     })
 
     return (
@@ -58,7 +61,19 @@ export function CircleList() {
                     ['Адрес', 'address'],
                     ['Кол-во принятых заявок', 'accepted_count'],
                 ]}
-                data={reformattedData}
+                pagination={{
+                    current: paginationParams.page,
+                    pageSize: paginationParams.pageSize,
+                    total: circles?.count,
+                    onChange: (page, pageSize) => {
+                        setPaginationParams({
+                            page,
+                            pageSize,
+                        })
+                        scrollToTop()
+                    },
+                }}
+                data={circles}
                 isLoading={isFetching}
                 mainRoute={RoutePath[AppRoutes.CIRCLE_LIST]}
                 searchFields={['name', 'address']}

apps/schools/domains/circle/components/circleList/interfaces.ts

@@ -6,7 +6,7 @@ export interface RowType {
 }
 
 export interface TableType {
-    id?: string
+    id: string
     name: string
     address: string
     accepted_count: number

apps/schools/domains/circle/components/currentCircle/index.tsx

@@ -13,14 +13,13 @@ import { useOrganization } from '@domains/organization/providers/organizationPro
 import { CARD_HEAD_STYLE } from '@domains/circle/components/currentCircle/styles/styles'
 import { Table } from '@domains/common/components/table'
 import { createSearchTextForRequest } from '@domains/common/utils/searchText'
-import { mapReturnedData } from '@domains/common/redux/utils'
 import { ActionBar } from '@domains/common/components/stickyBlock/actionBar'
 import { sumObjectValues } from '@domains/common/utils/sumObjectValues'
 
 import android from '@public/image/Android.svg'
 
 import { searchColumns } from './constants'
-import { CurrentCircleRowType } from './interfaces'
+import { RowType, TableType } from './interfaces'
 import styles from './styles/styles.module.scss'
 import { getVarsForAddressColumn } from '@domains/common/utils/geo'
 import { StatusesEnum } from '@domains/common/constants/Enums'
@@ -53,16 +52,6 @@ const CurrentCircle = () => {
         CANCELED: 0,
     }
 
-    const reformattedData = mapReturnedData(students, (student) => {
-        const transformedCircle = structuredClone(student) as unknown as CurrentCircleRowType
-        transformedCircle.id = student.id
-        transformedCircle.student_name = student.name
-        transformedCircle.student_phone = student.student_profile.phone
-        transformedCircle.parent_names = student.student_profile.parent_names?.replaceAll(',', ',\n')
-        transformedCircle.parent_phones = student.student_profile.parent_phones?.replaceAll(',', '\n')
-        return transformedCircle
-    })
-
     const countAllQueries = sumObjectValues(queriesCount)
     const addressVars = getVarsForAddressColumn(circle?.circle.address ?? '')
 
@@ -134,14 +123,14 @@ const CurrentCircle = () => {
                 </Col>
             </Row>
             <div className={styles.tableContainer}>
-                <Table<CurrentCircleRowType, CurrentCircleRowType>
+                <Table<RowType, TableType>
                     columnsTitlesAndKeys={[
                         ['Ф. И. О обучающегося', 'student_name'],
                         ['Телефон обучающегося', 'student_phone'],
                         ['Ф. И. О родителя', 'parent_names'],
                         ['Телефон родителя', 'parent_phones'],
                     ]}
-                    data={reformattedData}
+                    data={students}
                     mainRoute={RoutePath[AppRoutes.STUDENT_LIST]}
                     isLoading={isLoading}
                     needNumbering={true}

apps/schools/domains/circle/components/currentCircle/interfaces.ts

@@ -1,4 +1,12 @@
-export interface CurrentCircleRowType {
+export interface RowType {
+    id?: string
+    student_name: string
+    student_phone?: string
+    parent_names?: string
+    parent_phones?: string
+}
+
+export interface TableType {
     id?: string
     student_name: string
     student_phone?: string

apps/schools/domains/circle/redux/circleApi.ts

@@ -9,6 +9,8 @@ import {
     ChangeCircleData,
 } from './interfaces'
 import { GetCircle, GetQueryStatus, GetStudent } from '@domains/common/redux/serializers'
+import { mapReturnedData } from '@domains/common/redux/utils'
+import { TableType as TableTypeCurrentCircle } from '@domains/circle/components/currentCircle/interfaces'
 
 const circleApi = commonApi.injectEndpoints({
     endpoints: (build) => ({
@@ -43,12 +45,26 @@ const circleApi = commonApi.injectEndpoints({
             }),
             providesTags: (result, error, arg) => [{ type: 'Circle', id: arg.circle_id }],
         }),
-        getCircleStudents: build.query<ReturnedData<GetStudent[]>, CircleStudentsData>({
+        getCircleStudents: build.query<ReturnedData<TableTypeCurrentCircle[]>, CircleStudentsData>({
             query: (params) => ({
                 url: `/organization-management/circles/${params.circle_id}/students`,
                 method: 'GET',
                 params: params,
             }),
+            transformResponse: (response: ReturnedData<GetStudent[]>) => {
+                return mapReturnedData(response, (student: GetStudent) => {
+                    return {
+                        ...student,
+                        student_name: student.name,
+                        student_profile: {
+                            ...student.student_profile,
+                            phone: student.student_profile.phone,
+                            parent_names: student.student_profile.parent_names,
+                            parent_phones: student.student_profile.parent_phones,
+                        },
+                    }
+                })!
+            },
             providesTags: (result, error, arg) => [{ type: 'Circle', id: arg.circle_id }],
         }),
         deleteCircle: build.mutation<{ circle: GetCircle }, CircleData>({

apps/schools/domains/common/components/table/forming.tsx

@@ -1,5 +1,5 @@
 import { ColumnType } from 'antd/lib/table/interface'
-import React from 'react'
+import React, { ReactElement } from 'react'
 import styles from './styles/styles.module.scss'
 import { getSearchText } from '@domains/common/utils/searchText'
 import {
@@ -53,7 +53,7 @@ export function useGenerateFullColumns<RowType>(
                     const obj = (record as any)[column.dataIndex]
 
                     if (!isReactElement(obj)) return obj === value
-                    return obj.props.text === value
+                    return (obj as ReactElement).props.text === value
                 },
             }
         }

apps/schools/domains/common/constants/Cookies.ts

@@ -0,0 +1 @@
+export const oneYearExpiresDate = new Date(Date.now() + 60 * 60 * 24 * 365 * 1000)

apps/schools/domains/common/constants/Table.ts

@@ -1 +1,3 @@
 export const typeTable = ['tableWithoutSearch']
+export const defaultPaginationTablePage = 1
+export const defaultPaginationTablePageSize = 10

apps/schools/domains/common/utils/scrollInDirection.ts

@@ -0,0 +1,7 @@
+export function scrollToTop() {
+    window.scrollTo({ top: 0, left: 0 })
+}
+
+export function scrollToBottom() {
+    window.scrollTo({ top: document.body.scrollHeight, left: 0 })
+}

apps/schools/domains/employee/components/employeeList/index.tsx

@@ -11,14 +11,23 @@ import { GetListEmployee } from '@domains/employee/redux/interfaces'
 import { RowType } from '@domains/employee/components/employeeList/interfaces'
 import { searchColumns } from '@domains/employee/components/employeeList/constants'
 import { AppRoutes, RoutePath } from '@domains/common/constants/routerEnums'
+import { defaultPaginationTablePage, defaultPaginationTablePageSize } from '@domains/common/constants/Table'
+import { scrollToTop } from '@domains/common/utils/scrollInDirection'
 
 export function EmployeeList() {
     const [searchRequestText, setSearchRequestText] = useState('')
     const { organizationId } = useOrganization()
 
-    const { data, isLoading } = useGetAllEmployeesQuery({
+    const [paginationParams, setPaginationParams] = useState({
+        page: defaultPaginationTablePage,
+        pageSize: defaultPaginationTablePageSize,
+    })
+
+    const { data, isFetching } = useGetAllEmployeesQuery({
         organization: organizationId,
         or_search: createSearchTextForRequest(searchRequestText, searchColumns),
+        page: paginationParams.page,
+        page_size: paginationParams.pageSize,
     })
 
     return (
@@ -41,8 +50,20 @@ export function EmployeeList() {
                     ['Должность', 'position'],
                     ['Телефон', 'phone'],
                 ]}
+                pagination={{
+                    current: paginationParams.page,
+                    pageSize: paginationParams.pageSize,
+                    total: data?.count,
+                    onChange: (page, pageSize) => {
+                        setPaginationParams({
+                            page,
+                            pageSize,
+                        })
+                        scrollToTop()
+                    },
+                }}
                 data={data}
-                isLoading={isLoading}
+                isLoading={isFetching}
                 mainRoute={RoutePath[AppRoutes.EMPLOYEE_LIST]}
                 searchFields={searchColumns}
                 searchRequestText={searchRequestText}

apps/schools/domains/organization/redux/organizationApi.ts

@@ -33,6 +33,10 @@ import {
     UpdateOrganizationInviteEmployee,
 } from '@domains/common/redux/serializers'
 import { GetTicket, GetTicketData, GetTicketsData } from '@domains/ticket/redux/serializers'
+import { mapReturnedData } from '@domains/common/redux/utils'
+import { TableType as TableTypeCircle } from '@domains/circle/components/circleList/interfaces'
+import { TableType as TableTypeTickets } from '@domains/ticket/components/ticketList/interfaces'
+import { TableType as TableTypeQuery } from '@domains/query/components/queryList/interfaces'
 
 const organizationApi = commonApi.injectEndpoints({
     endpoints: (build) => ({
@@ -68,12 +72,19 @@ const organizationApi = commonApi.injectEndpoints({
             }),
             providesTags: (result) => providesList(result?.results, 'Student'),
         }),
-        getAllCircles: build.query<ReturnedData<GetOrganizationCircleList[]>, GetOrganizationCircleListData>({
+        getAllCircles: build.query<ReturnedData<TableTypeCircle[]>, GetOrganizationCircleListData>({
             query: (params) => ({
                 url: `/organization-management/organizations/${params.organization_id}/circles`,
                 method: 'GET',
                 params: params,
             }),
+            transformResponse: (response: ReturnedData<GetOrganizationCircleList[]>) => {
+                return mapReturnedData(response, (circle) => {
+                    const transformedCircle = structuredClone(circle) as unknown as TableTypeCircle
+                    transformedCircle.accepted_count = circle.student_profile_queries.ACCEPTED
+                    return transformedCircle
+                })!
+            },
             providesTags: (result) => providesList(result?.results, 'Circle'),
         }),
         getCurrentCircle: build.query<{ circle: GetOrganizationCircleList }, GetCurrentCircleData>({
@@ -165,6 +176,16 @@ const organizationApi = commonApi.injectEndpoints({
                 method: 'GET',
                 params: params,
             }),
+            transformResponse: (response: ReturnedData<GetStudentJoinCircle[]>) => {
+                return mapReturnedData(response, (query) => {
+                    const transformedQuery = structuredClone(query) as unknown as TableTypeQuery
+                    transformedQuery.parent_name = query.additional.parent_name
+                    transformedQuery.parent_phone = query.additional.parent_phone
+                    transformedQuery.circle_name = query.recipient.name
+                    transformedQuery.student_name = query.body.name
+                    return transformedQuery
+                })!
+            },
             providesTags: (result) => providesList(result?.results, 'StudentJoinCircleQuery'),
         }),
         getOrganizationAnalytics: build.query<{ analytics: GetAnalytics }, GetAnalyticsData>({
@@ -183,12 +204,25 @@ const organizationApi = commonApi.injectEndpoints({
             }),
             providesTags: ['Ticket'],
         }),
-        getAllTickets: build.query<ReturnedData<GetTicket[]>, GetTicketsData>({
+        getAllTickets: build.query<ReturnedData<TableTypeTickets[]>, GetTicketsData>({
             query: (params) => ({
                 url: `/organization-management/organizations/${params.organization_id}/family-tickets`,
                 method: 'GET',
                 params: params,
             }),
+            transformResponse: (response: ReturnedData<GetTicket[]>) => {
+                return mapReturnedData(response, (query) => {
+                    return {
+                        ...query,
+                        content: query.last_comment.value,
+                        sender: query.sender?.name,
+                        contentTrimmed:
+                            query.last_comment.value.length > 200
+                                ? query.last_comment.value.slice(0, 200) + '…'
+                                : query.last_comment.value,
+                    } as TableTypeTickets
+                })!
+            },
             providesTags: ['Ticket'],
         }),
         getTicket: build.query<{ ticket: GetTicket }, GetTicketData>({