Refactor library editing

rsconcept/frontend/src/context/LibraryContext.tsx

@@ -1,17 +1,19 @@
 import { createContext, useCallback, useContext, useEffect, useState } from 'react';
 
 import { ErrorInfo } from '../components/BackendError';
-import { getLibrary } from '../utils/backendAPI';
+import { DataCallback, getLibrary, postNewRSForm } from '../utils/backendAPI';
-import { ILibraryFilter, IRSFormMeta, matchRSFormMeta } from '../utils/models';
+import { ILibraryFilter, IRSFormCreateData, IRSFormMeta, matchRSFormMeta } from '../utils/models';
 
 interface ILibraryContext {
   items: IRSFormMeta[]
   loading: boolean
+  processing: boolean
   error: ErrorInfo
   setError: (error: ErrorInfo) => void
 
   reload: () => void 
   filter: (params: ILibraryFilter) => IRSFormMeta[]
+  createSchema: (data: IRSFormCreateData, callback?: DataCallback<IRSFormMeta>) => void
 }
 
 const LibraryContext = createContext<ILibraryContext | null>(null)
@@ -32,6 +34,7 @@ interface LibraryStateProps {
 export const LibraryState = ({ children }: LibraryStateProps) => {
   const [ items, setItems ] = useState<IRSFormMeta[]>([])
   const [ loading, setLoading ] = useState(false);
+  const [ processing, setProcessing ] = useState(false);
   const [ error, setError ] = useState<ErrorInfo>(undefined);
 
   const filter = useCallback(
@@ -63,12 +66,27 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
 
   useEffect(() => {
     reload();
-  }, [reload])
+  }, [reload]);
+
+  const createSchema = useCallback(
+  (data: IRSFormCreateData, callback?: DataCallback<IRSFormMeta>) => {
+    setError(undefined);
+    postNewRSForm({
+      data: data,
+      showError: true,
+      setLoading: setProcessing,
+      onError: error => { setError(error); },
+      onSuccess: newSchema => {
+        reload();
+        if (callback) callback(newSchema);
+      }
+    });
+  }, [reload]);
 
   return (
     <LibraryContext.Provider value={{ 
-      items, loading, error, setError, 
+      items, loading, processing, error, setError, 
-      reload, filter
+      reload, filter, createSchema
     }}>
       { children }
     </LibraryContext.Provider>

rsconcept/frontend/src/context/RSFormContext.tsx

@@ -5,14 +5,17 @@ import { type ErrorInfo } from '../components/BackendError'
 import { useRSFormDetails } from '../hooks/useRSFormDetails'
 import {
   type DataCallback, deleteRSForm, getTRSFile,
-  patchConstituenta, patchDeleteConstituenta, patchMoveConstituenta, patchResetAliases,
+  patchConstituenta, patchDeleteConstituenta, 
-patchRSForm,
+  patchMoveConstituenta, patchResetAliases, patchRSForm,
-patchUploadTRS,  postClaimRSForm, postCloneRSForm,postNewConstituenta} from '../utils/backendAPI'
+  patchUploadTRS,  postClaimRSForm, postCloneRSForm, postNewConstituenta
+} from '../utils/backendAPI'
 import {
   IConstituentaList, IConstituentaMeta, ICstCreateData,
-  ICstMovetoData, ICstUpdateData, IRSForm, IRSFormCreateData, IRSFormData, IRSFormMeta, IRSFormUpdateData, IRSFormUploadData
+  ICstMovetoData, ICstUpdateData, IRSForm, IRSFormCreateData, 
+  IRSFormData, IRSFormMeta, IRSFormUpdateData, IRSFormUploadData
 } from '../utils/models'
 import { useAuth } from './AuthContext'
+import { useLibrary } from './LibraryContext'
 
 interface IRSFormContext {
   schema?: IRSForm
@@ -63,15 +66,16 @@ interface RSFormStateProps {
 }
 
 export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
-  const { user } = useAuth()
+  const { user } = useAuth();
-  const { schema, reload, error, setError, setSchema, loading } = useRSFormDetails({ target: schemaID })
+  const { schema, reload, error, setError, setSchema, loading } = useRSFormDetails({ target: schemaID });
-  const [processing, setProcessing] = useState(false)
+  const [ processing, setProcessing ] = useState(false);
+  const library = useLibrary();
 
-  const [isForceAdmin, setIsForceAdmin] = useState(false)
+  const [ isForceAdmin, setIsForceAdmin ] = useState(false);
-  const [isReadonly, setIsReadonly] = useState(false)
+  const [ isReadonly, setIsReadonly ] = useState(false);
 
-  const isOwned = useMemo(() => user?.id === schema?.owner || false, [user, schema?.owner])
+  const isOwned = useMemo(() => user?.id === schema?.owner || false, [user, schema?.owner]);
-  const isClaimable = useMemo(() => user?.id !== schema?.owner || false, [user, schema?.owner])
+  const isClaimable = useMemo(() => user?.id !== schema?.owner || false, [user, schema?.owner]);
   const isEditable = useMemo(
     () => {
       return (
@@ -83,12 +87,12 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
   const isTracking = useMemo(
     () => {
       return true
-    }, [])
+    }, []);
 
   const toggleTracking = useCallback(
     () => {
       toast.info('Отслеживание в разработке...')
-    }, [])
+    }, []);
 
   const update = useCallback(
   (data: IRSFormUpdateData, callback?: DataCallback<IRSFormMeta>) => {
@@ -100,13 +104,13 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
       data: data,
       showError: true,
       setLoading: setProcessing,
-        onError: error => { setError(error) },
+      onError: error => setError(error),
       onSuccess: newData => {
         setSchema(Object.assign(schema, newData));
         if (callback) callback(newData);
       }
     });
-    }, [schemaID, setError, setSchema, schema])
+  }, [schemaID, setError, setSchema, schema]);
   
   const upload = useCallback(
   (data: IRSFormUploadData, callback?: () => void) => {
@@ -118,13 +122,13 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
       data: data,
       showError: true,
       setLoading: setProcessing,
-        onError: error => { setError(error) },
+      onError: error => setError(error),
       onSuccess: newData => {
         setSchema(newData);
         if (callback) callback();
       }
     });
-    }, [schemaID, setError, setSchema, schema])
+  }, [schemaID, setError, setSchema, schema]);
 
   const destroy = useCallback(
   (callback?: () => void) => {
@@ -132,13 +136,14 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
     deleteRSForm(schemaID, {
       showError: true,
       setLoading: setProcessing,
-        onError: error => { setError(error) },
+      onError: error => setError(error),
       onSuccess: () => {
         setSchema(undefined);
+        library.reload();
         if (callback) callback();
       }
     });
-    }, [schemaID, setError, setSchema])
+  }, [schemaID, setError, setSchema, library]);
 
   const claim = useCallback(
   (callback?: DataCallback<IRSFormMeta>) => {
@@ -149,13 +154,13 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
     postClaimRSForm(schemaID, {
       showError: true,
       setLoading: setProcessing,
-        onError: error => { setError(error) },
+      onError: error => setError(error),
       onSuccess: newData => {
         setSchema(Object.assign(schema, newData));
         if (callback) callback(newData);
       }
     });
-    }, [schemaID, setError, schema, user, setSchema])
+  }, [schemaID, setError, schema, user, setSchema]);
 
   const clone = useCallback(
   (data: IRSFormCreateData, callback: DataCallback<IRSFormData>) => {
@@ -167,10 +172,13 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
       data: data,
       showError: true,
       setLoading: setProcessing,
-        onError: error => { setError(error) },
+      onError: error => setError(error),
-        onSuccess: callback
+      onSuccess: newSchema => {
+        library.reload();
+        if (callback) callback(newSchema);
+      }
     });
-    }, [schemaID, setError, schema, user])
+  }, [schemaID, setError, schema, user, library]);
 
   const resetAliases = useCallback(
   (callback?: () => void) => {
@@ -187,7 +195,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
         if (callback) callback();
       }
     });
-    }, [schemaID, setError, schema, user, setSchema])
+  }, [schemaID, setError, schema, user, setSchema]);
 
   const download = useCallback(
   (callback: DataCallback<Blob>) => {
@@ -198,7 +206,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
       onError: error => { setError(error) },
       onSuccess: callback
     });
-    }, [schemaID, setError])
+  }, [schemaID, setError]);
 
   const cstCreate = useCallback(
   (data: ICstCreateData, callback?: DataCallback<IConstituentaMeta>) => {
@@ -242,7 +250,7 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
         reload(setProcessing, () => { if (callback != null) callback(newData); })
       }
     });
-    }, [setError, reload])
+  }, [setError, reload]);
 
   const cstMoveTo = useCallback(
   (data: ICstMovetoData, callback?: () => void) => {
@@ -273,5 +281,5 @@ export const RSFormState = ({ schemaID, children }: RSFormStateProps) => {
     }}>
       { children }
     </RSFormContext.Provider>
-  )
+  );
 }

rsconcept/frontend/src/hooks/useNewRSForm.ts

@@ -1,25 +0,0 @@
-import { useState } from 'react'
-
-import { type ErrorInfo } from '../components/BackendError';
-import { DataCallback, postNewRSForm } from '../utils/backendAPI';
-import { IRSFormCreateData, IRSFormMeta } from '../utils/models';
-
-function useNewRSForm() {
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<ErrorInfo>(undefined);
-
-  function createSchema(data: IRSFormCreateData, onSuccess: DataCallback<IRSFormMeta>) {
-    setError(undefined);
-    postNewRSForm({
-      data: data,
-      showError: true,
-      setLoading: setLoading,
-      onError: error => { setError(error); },
-      onSuccess: onSuccess
-    });
-  }
-
-  return { createSchema, error, setError, loading };
-}
-
-export default useNewRSForm;

rsconcept/frontend/src/pages/CreateRSFormPage.tsx

@@ -11,13 +11,11 @@ import TextArea from '../components/Common/TextArea';
 import TextInput from '../components/Common/TextInput';
 import RequireAuth from '../components/RequireAuth';
 import { useLibrary } from '../context/LibraryContext';
-import useNewRSForm from '../hooks/useNewRSForm';
+import { IRSFormCreateData } from '../utils/models';
-import { IRSFormCreateData, IRSFormMeta } from '../utils/models';
 
 function CreateRSFormPage() {
   const navigate = useNavigate();
-  const { createSchema, error, setError, loading } = useNewRSForm();
+  const { createSchema, error, setError, processing } = useLibrary();
-  const library = useLibrary();
 
   const [title, setTitle] = useState('');
   const [alias, setAlias] = useState('');
@@ -37,15 +35,9 @@ function CreateRSFormPage() {
     }
   }
   
-  function onSuccess(newSchema: IRSFormMeta) {
-    toast.success('Схема успешно создана');
-    library.reload();
-    navigate(`/rsforms/${newSchema.id}`);
-  }
-  
   function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
     event.preventDefault();
-    if (loading) {
+    if (processing) {
       return;
     }
     const data: IRSFormCreateData = {
@@ -56,7 +48,10 @@ function CreateRSFormPage() {
       file: file,
       fileName: file?.name
     };
-    createSchema(data, onSuccess);
+    createSchema(data, (newSchema) => {
+      toast.success('Схема успешно создана');
+      navigate(`/rsforms/${newSchema.id}`);
+    });
   }
 
   return (
@@ -95,7 +90,7 @@ function CreateRSFormPage() {
       <div className='flex items-center justify-center py-2 mt-4'>
         <SubmitButton 
           text='Создать схему'
-          loading={loading} 
+          loading={processing} 
         />
       </div>
       { error && <BackendError error={error} />}