ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-26 04:50:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

onSucccess->onSuccess

Browse Source
This commit is contained in:
Ulle9 2023-07-26 10:59:55 +03:00
parent e7016aab21
commit 468de70465
12 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rsconcept/frontend/src/context/AuthContext.tsx
View File

@ -39,7 +39,7 @@ export const AuthState = ({ children }: AuthStateProps) => {
async () => { async () => {
await getAuth({ await getAuth({
onError: () => { setUser(undefined); }, onError: () => { setUser(undefined); },
onSucccess: response => { onSuccess: response => {
if (response.data.id) { if (response.data.id) {
setUser(response.data); setUser(response.data);
} else { } else {
@ -57,7 +57,7 @@ export const AuthState = ({ children }: AuthStateProps) => {
showError: true, showError: true,
setLoading, setLoading,
onError: error => { setError(error); }, onError: error => { setError(error); },
onSucccess: onSuccess:
(response) => { (response) => {
loadCurrentUser() loadCurrentUser()
.then(() => { if (callback) callback(response); }) .then(() => { if (callback) callback(response); })
@ -70,7 +70,7 @@ export const AuthState = ({ children }: AuthStateProps) => {
setError(undefined); setError(undefined);
postLogout({ postLogout({
showError: true, showError: true,
onSucccess: onSuccess:
(response) => { (response) => {
loadCurrentUser() loadCurrentUser()
.then(() => { if (callback) callback(response); }) .then(() => { if (callback) callback(response); })
@ -86,7 +86,7 @@ export const AuthState = ({ children }: AuthStateProps) => {
showError: true, showError: true,
setLoading, setLoading,
onError: error => { setError(error); }, onError: error => { setError(error); },
onSucccess: onSuccess:
(response) => { (response) => {
loadCurrentUser() loadCurrentUser()
.then(() => { if (callback) callback(response); }) .then(() => { if (callback) callback(response); })

16
rsconcept/frontend/src/context/RSFormContext.tsx
View File

@ -101,7 +101,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
showError: true, showError: true,
setLoading: setProcessing, setLoading: setProcessing,
onError: error => { setError(error) }, onError: error => { setError(error) },
onSucccess: (response) => { onSuccess: (response) => {
reload(setProcessing) reload(setProcessing)
.then(() => { if (callback != null) callback(response); }) .then(() => { if (callback != null) callback(response); })
.catch(console.error); .catch(console.error);
@ -116,7 +116,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
showError: true, showError: true,
setLoading: setProcessing, setLoading: setProcessing,
onError: error => { setError(error) }, onError: error => { setError(error) },
onSucccess: callback onSuccess: callback
}).catch(console.error); }).catch(console.error);
}, [schemaID, setError]) }, [schemaID, setError])
@ -130,7 +130,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
showError: true, showError: true,
setLoading: setProcessing, setLoading: setProcessing,
onError: error => { setError(error) }, onError: error => { setError(error) },
onSucccess: (response) => { onSuccess: (response) => {
schema.owner = user.id; schema.owner = user.id;
schema.time_update = response.data.time_update; schema.time_update = response.data.time_update;
setSchema(schema); setSchema(schema);
@ -146,7 +146,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
showError: true, showError: true,
setLoading: setProcessing, setLoading: setProcessing,
onError: error => { setError(error) }, onError: error => { setError(error) },
onSucccess: callback onSuccess: callback
}).catch(console.error); }).catch(console.error);
}, [schemaID, setError]) }, [schemaID, setError])
@ -158,7 +158,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
showError: true, showError: true,
setLoading: setProcessing, setLoading: setProcessing,
onError: error => { setError(error) }, onError: error => { setError(error) },
onSucccess: (response) => { onSuccess: (response) => {
reload(setProcessing) reload(setProcessing)
.then(() => { if (callback != null) callback(response); }) .then(() => { if (callback != null) callback(response); })
.catch(console.error); .catch(console.error);
@ -174,7 +174,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
showError: true, showError: true,
setLoading: setProcessing, setLoading: setProcessing,
onError: error => { setError(error) }, onError: error => { setError(error) },
onSucccess: (response) => { onSuccess: (response) => {
setSchema(response.data.schema); setSchema(response.data.schema);
if (callback != null) callback(response); if (callback != null) callback(response);
} }
@ -189,7 +189,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
showError: true, showError: true,
setLoading: setProcessing, setLoading: setProcessing,
onError: error => { setError(error) }, onError: error => { setError(error) },
onSucccess: (response) => { onSuccess: (response) => {
setSchema(response.data) setSchema(response.data)
if (callback != null) callback(response) if (callback != null) callback(response)
} }
@ -204,7 +204,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
showError: true, showError: true,
setLoading: setProcessing, setLoading: setProcessing,
onError: error => { setError(error) }, onError: error => { setError(error) },
onSucccess: (response) => { onSuccess: (response) => {
setSchema(response.data); setSchema(response.data);
if (callback != null) callback(response); if (callback != null) callback(response);
} }

4
rsconcept/frontend/src/context/UsersContext.tsx
View File

@ -30,7 +30,7 @@ export const UsersState = ({ children }: UsersStateProps) => {
const getUserLabel = (userID?: number) => { const getUserLabel = (userID?: number) => {
const user = users.find(({ id }) => id === userID) const user = users.find(({ id }) => id === userID)
if (user == null) { if (user == null) {
return (userID !== undefined ? userID.toString() : 'Отсутствует'); return (userID ? userID.toString() : 'Отсутствует');
} }
const hasFirstName = user.first_name != null && user.first_name !== ''; const hasFirstName = user.first_name != null && user.first_name !== '';
const hasLastName = user.last_name != null && user.last_name !== ''; const hasLastName = user.last_name != null && user.last_name !== '';
@ -51,7 +51,7 @@ export const UsersState = ({ children }: UsersStateProps) => {
await getActiveUsers({ await getActiveUsers({
showError: true, showError: true,
onError: () => { setUsers([]); }, onError: () => { setUsers([]); },
onSucccess: response => { setUsers(response.data); } onSuccess: response => { setUsers(response.data); }
}); });
}, [setUsers] }, [setUsers]
) )

2
rsconcept/frontend/src/hooks/useCheckExpression.ts
View File

@ -20,7 +20,7 @@ function useCheckExpression({ schema }: { schema?: IRSForm }) {
showError: true, showError: true,
setLoading, setLoading,
onError: error => { setError(error); }, onError: error => { setError(error); },
onSucccess: (response) => { onSuccess: (response) => {
setParseData(response.data); setParseData(response.data);
if (onSuccess) onSuccess(response); if (onSuccess) onSuccess(response);
} }

2
rsconcept/frontend/src/hooks/useNewRSForm.ts
View File

@ -22,7 +22,7 @@ function useNewRSForm() {
showError: true, showError: true,
setLoading, setLoading,
onError: error => { setError(error); }, onError: error => { setError(error); },
onSucccess: response => { onSuccess(response.data.id); } onSuccess: response => { onSuccess(response.data.id); }
}); });
} }

2
rsconcept/frontend/src/hooks/useRSFormDetails.ts
View File

@ -25,7 +25,7 @@ export function useRSFormDetails({ target }: { target?: string }) {
showError: true, showError: true,
setLoading: setCustomLoading ?? setLoading, setLoading: setCustomLoading ?? setLoading,
onError: error => { setInnerSchema(undefined); setError(error); }, onError: error => { setInnerSchema(undefined); setError(error); },
onSucccess: (response) => { setSchema(response.data); } onSuccess: (response) => { setSchema(response.data); }
}); });
}, [target]); }, [target]);

2
rsconcept/frontend/src/hooks/useRSForms.ts
View File

@ -24,7 +24,7 @@ export function useRSForms() {
showError: true, showError: true,
setLoading, setLoading,
onError: error => { setError(error); }, onError: error => { setError(error); },
onSucccess: response => { setRSForms(response.data); } onSuccess: response => { setRSForms(response.data); }
}); });
}, []); }, []);

3
rsconcept/frontend/src/hooks/useUserProfile.ts
View File

@ -13,11 +13,12 @@ export function useUserProfile() {
async () => { async () => {
setError(undefined); setError(undefined);
setUser(undefined); setUser(undefined);
await getProfile({ await getProfile({
showError: true, showError: true,
setLoading, setLoading,
onError: error => { setError(error); }, onError: error => { setError(error); },
onSucccess: response => { setUser(response.data); } onSuccess: response => { setUser(response.data); }
}); });
}, [setUser] }, [setUser]
) )

19
rsconcept/frontend/src/pages/UserProfilePage/UserProfile.tsx
View File

@ -1,14 +1,15 @@
import { type IUserProfile } from '../../utils/models'; import { useUserProfile } from '../../hooks/useUserProfile';
interface UserProfileProps { export function UserProfile() {
profile: IUserProfile const { user } = useUserProfile();
} console.log(user)
export function UserProfile({ profile }: UserProfileProps) {
return ( return (
<div className='flex justify-center'> <div className='flex flex-col items-center justify-center px-2 py-2 border'>
<p>username: {profile.username}</p> <p>Логин: {user?.username ?? 'Логин'}</p>
<p>email: {profile.email}</p> <p>Имя: {user?.first_name ?? 'Имя'}</p>
<p>Фамилия: {user?.last_name ?? 'Фамилия'}</p>
<p>Электронная почта: {user?.email ?? ''}</p>
<button className='px-2 py-1 bg-green-500 border' onClick={() => { console.log('123') } } >Сохранить</button>
</div> </div>
); );
} }

2
rsconcept/frontend/src/pages/UserProfilePage/index.tsx
View File

@ -10,7 +10,7 @@ function UserProfilePage() {
<div className='w-full'> <div className='w-full'>
{ loading && <Loader /> } { loading && <Loader /> }
{ error && <BackendError error={error} />} { error && <BackendError error={error} />}
{ user && <UserProfile profile={user} /> } { user && <UserProfile /> }
</div> </div>
); );
} }

12
rsconcept/frontend/src/utils/backendAPI.ts
View File

@ -9,7 +9,7 @@ import { type ICurrentUser, type IRSForm, type IUserInfo, type IUserProfile } fr
export type BackendCallback = (response: AxiosResponse) => void; export type BackendCallback = (response: AxiosResponse) => void;
export interface IFrontRequest { export interface IFrontRequest {
onSucccess?: BackendCallback onSuccess?: BackendCallback
onError?: (error: ErrorInfo) => void onError?: (error: ErrorInfo) => void
setLoading?: (loading: boolean) => void setLoading?: (loading: boolean) => void
showError?: boolean showError?: boolean
@ -182,7 +182,7 @@ async function AxiosGet<ReturnType>({ endpoint, request, title }: IAxiosRequest)
axios.get<ReturnType>(endpoint) axios.get<ReturnType>(endpoint)
.then((response) => { .then((response) => {
if (request?.setLoading) request?.setLoading(false); if (request?.setLoading) request?.setLoading(false);
if (request?.onSucccess) request.onSucccess(response); if (request?.onSuccess) request.onSuccess(response);
}) })
.catch((error) => { .catch((error) => {
if (request?.setLoading) request?.setLoading(false); if (request?.setLoading) request?.setLoading(false);
@ -197,7 +197,7 @@ async function AxiosGetBlob({ endpoint, request, title }: IAxiosRequest) {
axios.get(endpoint, { responseType: 'blob' }) axios.get(endpoint, { responseType: 'blob' })
.then((response) => { .then((response) => {
if (request?.setLoading) request?.setLoading(false); if (request?.setLoading) request?.setLoading(false);
if (request?.onSucccess) request.onSucccess(response); if (request?.onSuccess) request.onSuccess(response);
}) })
.catch((error) => { .catch((error) => {
if (request?.setLoading) request?.setLoading(false); if (request?.setLoading) request?.setLoading(false);
@ -212,7 +212,7 @@ async function AxiosPost({ endpoint, request, title }: IAxiosRequest) {
axios.post(endpoint, request?.data) axios.post(endpoint, request?.data)
.then((response) => { .then((response) => {
if (request?.setLoading) request?.setLoading(false); if (request?.setLoading) request?.setLoading(false);
if (request?.onSucccess) request.onSucccess(response); if (request?.onSuccess) request.onSuccess(response);
}) })
.catch((error) => { .catch((error) => {
if (request?.setLoading) request?.setLoading(false); if (request?.setLoading) request?.setLoading(false);
@ -227,7 +227,7 @@ async function AxiosDelete({ endpoint, request, title }: IAxiosRequest) {
axios.delete(endpoint) axios.delete(endpoint)
.then((response) => { .then((response) => {
if (request?.setLoading) request?.setLoading(false); if (request?.setLoading) request?.setLoading(false);
if (request?.onSucccess) request.onSucccess(response); if (request?.onSuccess) request.onSuccess(response);
}) })
.catch((error) => { .catch((error) => {
if (request?.setLoading) request?.setLoading(false); if (request?.setLoading) request?.setLoading(false);
@ -242,7 +242,7 @@ async function AxiosPatch<ReturnType>({ endpoint, request, title }: IAxiosReques
axios.patch<ReturnType>(endpoint, request?.data) axios.patch<ReturnType>(endpoint, request?.data)
.then((response) => { .then((response) => {
if (request?.setLoading) request?.setLoading(false); if (request?.setLoading) request?.setLoading(false);
if (request?.onSucccess) request.onSucccess(response); if (request?.onSuccess) request.onSuccess(response);
return response.data; return response.data;
}) })
.catch((error) => { .catch((error) => {