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

src/_store/api/degrees.api.js

@@ -5,7 +5,6 @@ const HEALTHAPP_URI = process.env.REACT_APP_BASE_URL
 
 const SEARCH_MEDICAL_DEGREES = '/search-app/medical-degrees';
 const SEARCH_PROFILE_DEGREES = '/api/settings/medical-degrees/list-profile-by-uuid';
-const REFRESH_PROFILE_DEGREES = '/api/settings/medical-degrees/refresh-by-uuid';
 const CREATE_DEGREE = '/api/settings/medical-degrees/create';
 const EDIT_DEGREE = '/api/settings/medical-degrees/edit';
 const DESTROY_DEGREE = '/api/settings/medical-degrees/destroy';
@@ -78,14 +77,6 @@ export const degreesApi = createApi({
 			}),
 			providesTags: ["UserDegrees", "UserDegree"]
 		}),
-		refreshUserDegrees: builder.mutation({
-			query: ({id, data}) => ({
-				url: HEALTHAPP_URI + REFRESH_PROFILE_DEGREES + '/' + id,
-				method: 'PUT',
-				body: data
-			  }),
-			invalidatesTags: ["UserDegrees", "UserDegree"],
-		}),
 	}),
 })
 
@@ -93,7 +84,6 @@ export const {
 	useFetchMedicalDegreesQuery,
 	useFetchMedicalDegreesByPageQuery,
 	useFetchUserDegreesQuery,
-	useRefreshUserDegreesMutation,
 	useCreateMedicalDegreeMutation,
 	useDestroyMedicalDegreeMutation,
 	useEditMedicalDegreeMutation,

src/_store/api/insurances.api.js

@@ -48,22 +48,6 @@ export const insuranceApi = createApi({
 			  },
 			  providesTags: (result) => ["Insurance"],
 		}),
-		addUserInsurances: builder.mutation({
-			query: ({id, data}) => ({
-				url: HEALTHAPP_URI + PROFILE_INSURANCES + '/' + id,
-				method: 'POST',
-				body: data
-			  }),
-			invalidatesTags: ["UserInsurances", "UserInsurance"],
-		}),
-		deleteUserInsurances: builder.mutation({
-			query: ({id, data}) => ({
-				url: HEALTHAPP_URI + PROFILE_INSURANCES + '/' + id,
-				method: 'DELETE',
-				body: data
-			  }),
-			invalidatesTags: ["UserInsurances", "UserInsurance"],
-		}),
 		fetchUserInsurances: builder.query({
 			query: (id) => ({
 				url: HEALTHAPP_URI + PROFILE_INSURANCES + '/' + id,
@@ -133,8 +117,6 @@ export const {
 	useFetchInsurancesQuery,
 	useFetchInsurancesListQuery,
 	useFetchUserInsurancesQuery,
-	useDeleteUserInsurancesMutation,
-	useAddUserInsurancesMutation,
 	useCreateInsuranceMutation,
 	// useBindAddressMutation,
 	useFetchOneInsuranceQuery,

src/_store/api/languages.api.js

@@ -10,7 +10,6 @@ const EDIT_LANGUAGE = '/api/settings/languages/edit-language';
 const DELETE_LANGUAGE = '/api/settings/languages/destroy-language';
 
 const SEARCH_PROFILE_LANGUAGES = '/api/settings/languages/list-admin';
-const REFRESH_PROFILE_LANGUAGES = '/api/settings/languages/refresh-by-uuid';
 
 export const languagesApi = createApi({
 	reducerPath: 'languagesApi',
@@ -71,14 +70,6 @@ export const languagesApi = createApi({
 			}),
 			providesTags: ["UserLanguages", "UserLanguage"]
 		}),
-		refreshUserLanguages: builder.mutation({
-			query: ({id, data}) => ({
-				url: HEALTHAPP_URI + REFRESH_PROFILE_LANGUAGES + '/' + id,
-				method: 'PUT',
-				body: data
-			  }),
-			invalidatesTags: ["UserLanguages", "UserLanguage"],
-		}),
 	}),
 })
 
@@ -88,6 +79,5 @@ export const {
 	useCreateLanguageMutation,
 	useEditLanguageMutation,
 	useDeleteLanguageMutation,
-	useFetchUserLanguagesQuery,
-	useRefreshUserLanguagesMutation
+	useFetchUserLanguagesQuery
 } = languagesApi;

src/_store/api/profiles.api.js

@@ -17,6 +17,10 @@ const PROFILES = '/api/profiles';
 const PROFILES_ROLES = '/api/profiles/roles';
 const PROFILE = '/api/profile';
 const API_SETTING_ADDRESS = '/api/settings/address';
+const REFRESH_USER_SPECIALITIES = '/api/specialities/refresh';
+const REFRESH_PROFILE_LANGUAGES = '/api/settings/languages/refresh-by-uuid';
+const REFRESH_PROFILE_DEGREES = '/api/settings/medical-degrees/refresh-by-uuid';
+const PROFILE_INSURANCES = '/api/settings/insurances/profile-insurances-by-uuid';
 
 export const profilesApi = createApi({
 	reducerPath: 'profilesApi',
@@ -143,7 +147,47 @@ export const profilesApi = createApi({
 				method: 'GET'
 			}),
 			providesTags: (result) => ["Address"],
-		})
+		}),
+		refreshUserSpecialities: build.mutation({
+			query: ({id, data}) => ({
+				url: HEALTHAPP_URI + REFRESH_USER_SPECIALITIES + '/' + id,
+				method: 'PUT',
+				body: data
+			  }),
+			invalidatesTags: ["Profile"],
+		}),
+		refreshUserLanguages: build.mutation({
+			query: ({id, data}) => ({
+				url: HEALTHAPP_URI + REFRESH_PROFILE_LANGUAGES + '/' + id,
+				method: 'PUT',
+				body: data
+			  }),
+			  invalidatesTags: ["Profile"],
+		}),
+		refreshUserDegrees: build.mutation({
+			query: ({id, data}) => ({
+				url: HEALTHAPP_URI + REFRESH_PROFILE_DEGREES + '/' + id,
+				method: 'PUT',
+				body: data
+			  }),
+			  invalidatesTags: ["Profile"],
+		}),
+		addUserInsurances: build.mutation({
+			query: ({id, data}) => ({
+				url: HEALTHAPP_URI + PROFILE_INSURANCES + '/' + id,
+				method: 'POST',
+				body: data
+			  }),
+			  invalidatesTags: ["Profile"],
+		}),
+		deleteUserInsurances: build.mutation({
+			query: ({id, data}) => ({
+				url: HEALTHAPP_URI + PROFILE_INSURANCES + '/' + id,
+				method: 'DELETE',
+				body: data
+			  }),
+			  invalidatesTags: ["Profile"],
+		}),
 	}),
 })
 
@@ -162,5 +206,10 @@ export const {
 	useGetProfileAvatarByUuidQuery,
 	useUpdateCredentialsMutation,
 	useUpdateProfileAddressMutation,
-	useGetProfileAddressQuery
+	useGetProfileAddressQuery,
+	useRefreshUserSpecialitiesMutation,
+	useRefreshUserDegreesMutation,
+	useDeleteUserInsurancesMutation,
+	useAddUserInsurancesMutation,
+	useRefreshUserLanguagesMutation
 } = profilesApi;

src/_store/api/specialities.api.js

@@ -11,7 +11,7 @@ const GET_USRES_SPECIALITIES = '/api/specialities/show-specialities-by-uuid';
 export const specialitiesApi = createApi({
 	reducerPath: 'specialitiesApi',
 	baseQuery: baseQueryWithToken,
-	entityTypes: ["Specialities", "Speciality", "UserSpecialities", "UserSpeciality"],
+	entityTypes: ["Specialities", "Speciality", "UserSpecialities", "UserSpeciality", "Practitioner"],
 	endpoints: (builder) => ({
 		fetchSpecialities: builder.query({
 			query({scrollId, page, search}) {
@@ -36,14 +36,6 @@ export const specialitiesApi = createApi({
 			  },
 			  providesTags: (result) => ["Specialities"],
 		}),
-		refreshUserSpecialities: builder.mutation({
-			query: ({id, data}) => ({
-				url: HEALTHAPP_URI + REFRESH_USER_SPECIALITIES + '/' + id,
-				method: 'PUT',
-				body: data
-			  }),
-			invalidatesTags: ["UserSpecialities", "UserSpeciality"],
-		}),
 		fetchUserSpecialities: builder.query({
 			query: (id) => ({
 				url: HEALTHAPP_URI + GET_USRES_SPECIALITIES + '/' + id,
@@ -79,7 +71,6 @@ export const specialitiesApi = createApi({
 
 export const {
 	useFetchUserSpecialitiesQuery,
-	useRefreshUserSpecialitiesMutation,
 	useFetchSpecialitiesQuery,
 	useFetchSpecialitiesByPageQuery,
 	useCreateSpecialityMutation,

src/pages/profilesEdition/ProfilesEdition.jsx

@@ -20,7 +20,7 @@ const ProfilesEdition = () => {
 	const navigate = useNavigate();
 	const { pathname } = useLocation();
 	const profileId =  pathname.split('/').pop();
-	const { isLoading, isSuccess, data: profile = {}} = useGetProfileByIdQuery(profileId);
+	const { isLoading, isSuccess, data: profile = {} } = useGetProfileByIdQuery(profileId);
 
 	return (
 			<div className='settings-layout'>
@@ -78,6 +78,10 @@ const ProfilesEdition = () => {
 									<TabPanel>
 										<SpecialityData
 											id={profileId}
+											usersInsurances={profile.insurances || []}
+											userSpecialities={profile.specialities || []}
+											usersLanguages={profile.languages || []}
+											usersDegrees={profile.medicalDegrees || []}
 										/>
 									</TabPanel>
 									<TabPanel>

src/pages/profilesEdition/components/blocks/baseData.jsx

@@ -302,7 +302,7 @@ const BaseData = ({
 						</GridItem>
 
 						{
-							roles.length ? (
+							(roles.length && rolesList.length) ? (
 								<GridItem h='auto' colSpan={3}>
 									<div className='items-cloud'>
 										{

src/pages/profilesEdition/components/blocks/dictionaryLoaders/specialities.jsx

@@ -47,13 +47,12 @@ const SpecialitiesLoader = ({
 
 	  useEffect(() => {
 		if (search) {
-			console.log('search')
 			setPage(0)
 			setCurrentScrollToken(null);
 			setCurrentList([])
 		}
 	  }, [search])
-	console.log('8888')
+
 	return (
 		<div className='speciality-layout'>
 			<>

src/pages/profilesEdition/components/blocks/specialityData.jsx

@@ -10,14 +10,10 @@ import {
 } from '@chakra-ui/react';
 
 import {
-	useFetchUserSpecialitiesQuery,
 	useRefreshUserSpecialitiesMutation,
-	useFetchUserInsurancesQuery,
 	useDeleteUserInsurancesMutation,
 	useAddUserInsurancesMutation,
-	useFetchUserLanguagesQuery,
 	useRefreshUserLanguagesMutation,
-	useFetchUserDegreesQuery,
 	useRefreshUserDegreesMutation,
 	useUpdateProfileAboutInfoMutation,
 	useGetProfileAboutInfoQuery,
@@ -38,7 +34,11 @@ import { LanguagesLoader } from './dictionaryLoaders/languages';
 import '../../profilesEdition.scss';
 
 const SpecialityData = ({
-	id = null
+	id = null,
+	userSpecialities = [],
+	usersInsurances = [],
+	usersLanguages = [],
+	usersDegrees = []
 }) => {
 	const isLoading = false;
 	const [file, setFile] = useState([]);
@@ -47,10 +47,6 @@ const SpecialityData = ({
 	const [bio, setBio] = useState();
 	const [fileObject, setFileObject] = useState([]);
 
-	const { isLoading: isUserSpecialitiesLoading, data: userSpecialities = [] } = useFetchUserSpecialitiesQuery(id);
-	const { isLoading: isUsersInsurancesFetching, data: usersInsurances = []} = useFetchUserInsurancesQuery(id);
-	const { isLoading: isUsersLanguagesFetching, data: usersLanguages = []} = useFetchUserLanguagesQuery(id);
-	const { isLoading: isUsersDegreesFetching, data: usersDegrees = []} = useFetchUserDegreesQuery(id);
 	const { isLoading: isAvatarLoading, isSuccess: isAvatarLoaded, data: avatarData = {} } = useGetProfileAvatarByUuidQuery(id);
 
 	const [ updateAvatar, { isLoading: isAvatarUpdating }] = useUploadProfileAvatarByUuidMutation();
@@ -61,7 +57,7 @@ const SpecialityData = ({
 	const { data: aboutInfo } = useGetProfileAboutInfoQuery(id);
 	const { data: educationData } = useGetProfileEducationQuery(id);
 
-	const [refreshSpecialities, { isLoading: isRefreshLoading, isSuccess: isSpecialitiesRefreshed }]
+	const [refreshSpecialities, { isLoading: isRefresSpecialitieshLoading, isSuccess: isSpecialitiesRefreshed }]
 	 	= useRefreshUserSpecialitiesMutation();
 	const [refreshLanguages, { isLoading: isRefreshLanguageLoading, isSuccess: isLanguagesRefreshed }]
 	 	= useRefreshUserLanguagesMutation();
@@ -69,7 +65,19 @@ const SpecialityData = ({
 		= useRefreshUserDegreesMutation();
 
 	const [ deleteInsurance, { isSuccess: isInsuranceRemoved }] = useDeleteUserInsurancesMutation();
-	const [ addInsurance, { isSuccess: isInsuranceAdded }] = useAddUserInsurancesMutation();
+	const [ addInsurance, { isSuccess: isInsuranceAdded, isLoading: isRefreshInsuranceLoading }] = useAddUserInsurancesMutation();
+
+	useEffect(() => {
+		if (
+			isSpecialitiesRefreshed ||
+			isLanguagesRefreshed ||
+			isDegreesRefreshed ||
+			isInsuranceRemoved ||
+			isInsuranceAdded
+		) {
+			// updateProfile();
+		}
+	}, [isSpecialitiesRefreshed, isLanguagesRefreshed, isDegreesRefreshed, isInsuranceAdded, isInsuranceRemoved])
 
 	useEffect(() => {
 		// setIsInsuransesListOpen(false);
@@ -237,7 +245,7 @@ const SpecialityData = ({
 							/>
 						</GridItem>
 						{
-							usersInsurances.length ? (
+							(usersInsurances !== null && usersInsurances.length) ? (
 								<GridItem h='auto' p={'10px'} colSpan={3}>
 									<div className='items-cloud'>
 										{
@@ -268,7 +276,7 @@ const SpecialityData = ({
 
 						</GridItem>
 						{
-							userSpecialities.length ? (
+							(userSpecialities !== null && userSpecialities.length) ? (
 								<GridItem h='auto' p={'10px'} colSpan={3}>
 									<div className='items-cloud'>
 										{
@@ -299,7 +307,7 @@ const SpecialityData = ({
 
 						</GridItem>
 						{
-							usersDegrees.length ? (
+							(usersDegrees !== null && usersDegrees.length) ? (
 								<GridItem h='auto' p={'10px'} colSpan={3}>
 									<div className='items-cloud'>
 										{
@@ -326,7 +334,7 @@ const SpecialityData = ({
 							<DegreesLoader handleAddDegree={handleAddDegree} />
 						</GridItem>
 						{
-							usersLanguages.length ? (
+							(usersLanguages !== null && usersLanguages.length) ? (
 								<GridItem h='auto' p={'10px'} colSpan={3}>
 									<div className='items-cloud'>
 										{