Merge pull request #9 from AyaDigital/hotfix/DMVP-1079

DMVP-1079 - Установить запросы для получения списка профилей в админи…

src/_store/api/practitioners.api.js

@@ -12,7 +12,7 @@ const AVATAR = '/avatar';
 const UPLOAD = '/upload';
 const ABOUT_INFO = '/about-info';
 const PROFILES = '/api/profiles';
-const PROFILES_LIST = '/search-app/idm/profiles';
+const PROFILES_LIST = '/api/profiles/all';
 const SPECIALITIES = '/api/specialities';
 const SPECIALITIES_ADD = SPECIALITIES + "/add";
 const SPECIALITIES_DESTROY = SPECIALITIES + "/destroy";
@@ -68,8 +68,8 @@ export const practitionersApi = createApi({
 			providesTags: (result) => ["Practitioner"],
 		}),
 		fetchPractitioners: build.query({
-			query: () => ({
-				  url: HEALTHAPP_URI + PROFILES_LIST
+			query: (page = 0) => ({
+				  url: ADMIN_URI + PROFILES_LIST + "?page=" + page
 			}),
 			providesTags: (result) => ["Practitioners"],
 		}),

src/pages/clinicPage/index.jsx

 import React, {useState} from 'react';
 import { useNavigate, useLocation } from "react-router-dom";
-import ErrorBoundary from '_components/error/ErrorBoundary';
 import clone from 'lodash/clone';
 import { Button } from '@chakra-ui/react';
 import { Checkbox } from '@chakra-ui/react';

src/pages/insuranse/Insurance.jsx

 import React, {useState} from 'react';
 import { useNavigate } from "react-router-dom";
-import upperfirst from 'lodash.upperfirst';
 import Pagination from 'rc-pagination';
 import clone from 'lodash/clone';
 import { Button } from '@chakra-ui/react';

src/pages/practitioners/Practitioners.jsx

 import React, { useState, useEffect } from 'react';
-import upperfirst from 'lodash.upperfirst';
 import Loader from '_components/Loader';
 import { ModalForm } from '_components/controls/modal';
 import clone from 'lodash/clone';
 import { useNavigate  } from 'react-router-dom';
+import Pagination from 'rc-pagination';
 import {
 	Modal,
 	ModalOverlay,
@@ -33,8 +33,9 @@ import {  } from "react-router-dom";
 const Practitioners = () => {
 	// useGetPostsQuery();
 	const navigate = useNavigate();
-	const { isLoading, isError, data = {}} = useFetchPractitionersQuery();
-	const { data: practitioners = [] } = data;
+	const [page, setPage] = useState(0);
+	const { isLoading, isError, data = {}} = useFetchPractitionersQuery(page);
+	const { content: practitioners = [], totalElements} = data;
 	const [
 		deletePractitioner,
 		{
@@ -53,18 +54,21 @@ const Practitioners = () => {
 	const { isLoading: isFetchingOnePractitioner, data: practitioner = {}} = useFetchOnePractitionerQuery(id, {
 		skip
 	});
-	const handleOpen = () => setOpen(true);
 	const handleClose = () => setOpen(false);
 	const handleModalClose = () => setIsModalOpen(false);
 
 	const handleCreateFormClose = () => setIsCreateFormOpen(false);
-	const handleCreateFormOpen = () => setIsCreateFormOpen(true);
+
 	const handleScheduleFormClose = () => {
 		setIsScheduleFormOpen(false);
 		setIsScheduleCreationError()
 	}
 	const handleScheduleFormOpen = () => setIsScheduleFormOpen(true);
 
+	const handlePageSelect = (pageNum) => {
+		setPage(pageNum - 1)
+	}
+
 	useEffect(() => {
 		if (isPractitionerDeleted) {
 			setSelectedPractitioners([])
@@ -187,9 +191,9 @@ const Practitioners = () => {
 							<div className='practitioners-table'>
 								<div className='table-header'>
 									<div className='rc-checkbox'></div>
-									<div className='id'>ID</div>
+									<div className='id'>First name</div>
+									<div className='phone'>Last Name</div>
 									<div className='email'>Email</div>
-									<div className='phone'>Phone</div>
 									<div className='uuid'>UUID</div>
 									<div>Email verified</div>
 									<div>Is active</div>
@@ -204,9 +208,9 @@ const Practitioners = () => {
 														disabled={open}
 													/>
 												</div>
-												<div className='id'>{item.id}</div>
+												<div className='id'>{item.firstName}</div>
+												<div className='phone'>{item.lastName}</div>
 												<div className='email'>{item.email}</div>
-												<div className='phone'>{item.phone}</div>
 												<div className='uuid'>{item.uuid}</div>
 												<div className='email-verified'>
 													{
@@ -233,6 +237,9 @@ const Practitioners = () => {
 						</>
 					)
 				}
+				<div className='pagination'>
+					<Pagination onChange={handlePageSelect} current={page + 1} total={totalElements} />
+				</div>
 				<Modal
 					isOpen={open}
 					size='2xl'

src/pages/practitioners/practitioners.scss

@@ -32,6 +32,10 @@
         align-items: center;
     }
 
+    .pagination {
+        padding: 10px 0px 10px 0px;
+    }
+
     .practitioners-table {
         @include flex-col();