update: after edit return to previous page (#948)

frontend/app/src/components/form/bounty/index.tsx

@@ -706,13 +706,16 @@ function Form(props: FormProps) {
                   <div style={{ display: 'flex', alignItems: 'center' }}>
                     <Button
                       disabled={disableFormButtons || props.loading}
-                      onClick={() => {
+                      onClick={async () => {
                         if (dynamicSchemaName) {
                           // inject type in body
                           setFieldValue('type', dynamicSchemaName);
                         }
-                        handleSubmit();
-                        history.push('/bounties');
+                        await handleSubmit(true);
+                        setTimeout(() => {
+                          props.setLoading && props.setLoading(false);
+                          props.onEditSuccess && props.onEditSuccess();
+                        }, 500);
                       }}
                       loading={props.loading}
                       style={{ ...buttonStyle, width: '140px' }}

frontend/app/src/components/form/interfaces.ts

@@ -16,4 +16,6 @@ export interface FormProps {
   loading?: boolean;
   delete?: () => void;
   submitText?: string;
+  onEditSuccess?: () => void;
+  setLoading?: (value: boolean) => void;
 }

frontend/app/src/pages/tickets/TicketModalPage.tsx

@@ -64,7 +64,7 @@ export const TicketModalPage = observer(({ setConnectPerson }: Props) => {
 
   useEffect(() => {
     getBounty();
-  }, [getBounty]);
+  }, [getBounty, removeNextAndPrev]);
 
   const goBack = async () => {
     setVisible(false);

frontend/app/src/people/interfaces.ts

@@ -37,6 +37,7 @@ export interface FocusViewProps {
   setIsExtraStyle?: any;
   bounty?: PersonBounty[];
   setRemoveNextAndPrev?: (boolean) => void;
+  setAfterEdit?: (boolean) => void;
 }
 
 export interface PeopleMobileeHeaderProps {
@@ -239,7 +240,7 @@ export interface WantedSummaryProps {
   show: boolean;
   setIsModalSideButton: (any) => void;
   setIsExtraStyle: (any) => void;
-  formSubmit: (any, close?: boolean) => void;
+  formSubmit: (any, notEdit?: boolean) => void;
   title: string;
   org_uuid?: string;
   id?: number;

frontend/app/src/people/main/FocusView.tsx

@@ -6,7 +6,6 @@ import { FocusViewProps } from 'people/interfaces';
 import { EuiGlobalToastList } from '@elastic/eui';
 import { Organization } from 'store/main';
 import { Box } from '@mui/system';
-import history from 'config/history';
 import { useStores } from '../../store';
 import Form from '../../components/form/bounty';
 import {
@@ -41,7 +40,8 @@ function FocusedView(props: FocusViewProps) {
     newDesign,
     setIsModalSideButton,
     bounty,
-    setRemoveNextAndPrev
+    setRemoveNextAndPrev,
+    setAfterEdit
   } = props;
   const { ui, main } = useStores();
 
@@ -200,9 +200,8 @@ function FocusedView(props: FocusViewProps) {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-  async function submitForm(body: any, shouldCloseModal: boolean = true) {
+  async function submitForm(body: any, notEdit?: boolean) {
     let newBody = cloneDeep(body);
-
     try {
       newBody = await preSubmitFunctions(newBody);
     } catch (e) {
@@ -238,15 +237,16 @@ function FocusedView(props: FocusViewProps) {
       // Refresh the tickets page if a user eidts from the tickets tab
       if (window.location.href.includes('wanted')) {
         await main.getPersonCreatedBounties({}, info.pubkey);
-        history.goBack();
       }
     } catch (e) {
       console.log('e', e);
     }
 
     if (props?.onSuccess) props.onSuccess();
 
-    setLoading(false);
+    if (notEdit === true) {
+      setLoading(false);
+    }
     if (ui?.meInfo?.hasOwnProperty('url') && !isNotHttps(ui?.meInfo?.url) && props?.ReCallBounties)
       props?.ReCallBounties();
   }
@@ -320,6 +320,13 @@ function FocusedView(props: FocusViewProps) {
     setRemoveNextAndPrev && setRemoveNextAndPrev(true);
   }
 
+  function handleEditFinish() {
+    setEditable(true);
+    setEditMode(false);
+    setRemoveNextAndPrev && setRemoveNextAndPrev(false);
+    setAfterEdit && setAfterEdit(true);
+  }
+
   function handleFormClose() {
     if (skipEditLayer && goBack) goBack();
     else {
@@ -365,6 +372,8 @@ function FocusedView(props: FocusViewProps) {
                     }
                   : {}
               }
+              onEditSuccess={handleEditFinish}
+              setLoading={setLoading}
             />
           )}
         </B>

frontend/app/src/people/main/bountyModal/BountyModal.tsx

@@ -1,7 +1,7 @@
 import { Modal } from 'components/common';
 import { useIsMobile, usePerson } from 'hooks';
 import { widgetConfigs } from 'people/utils/Constants';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 import { useHistory, useParams } from 'react-router-dom';
 import { useStores } from 'store';
 import { BountyModalProps } from 'people/interfaces';
@@ -20,6 +20,7 @@ export const BountyModal = ({ basePath, fromPage, bountyOwner }: BountyModalProp
   const { ui, main } = useStores();
   const { person } = usePerson(ui.selectedPerson);
   const [bounty, setBounty] = useState<PersonBounty[]>([]);
+  const [afterEdit, setAfterEdit] = useState(false);
 
   const personToDisplay = fromPage === 'usertickets' ? bountyOwner : person;
 
@@ -33,20 +34,31 @@ export const BountyModal = ({ basePath, fromPage, bountyOwner }: BountyModalProp
     });
   };
 
-  useEffect(() => {
-    async function getBounty() {
+  const getBounty = useCallback(
+    async (afterEdit?: boolean) => {
       /** check for the bounty length, else the request
        * will be made continously which will lead to an
        * infinite loop and crash the app
        */
-      if (wantedId && !bounty.length) {
+      if ((wantedId && !bounty.length) || afterEdit) {
         const bounty = await main.getBountyById(Number(wantedId));
         setBounty(bounty);
       }
-    }
+    },
+    [bounty, main, wantedId]
+  );
 
+  useEffect(() => {
     getBounty();
-  }, [bounty, main, wantedId]);
+  }, [getBounty]);
+
+  useEffect(() => {
+    if (afterEdit) {
+      getBounty(afterEdit);
+      setAfterEdit(false);
+    }
+  }, [afterEdit, getBounty]);
+
   const isMobile = useIsMobile();
 
   if (isMobile) {
@@ -59,6 +71,7 @@ export const BountyModal = ({ basePath, fromPage, bountyOwner }: BountyModalProp
           selectedIndex={Number(wantedIndex)}
           config={config}
           goBack={onGoBack}
+          setAfterEdit={setAfterEdit}
         />
       </Modal>
     );
@@ -99,6 +112,7 @@ export const BountyModal = ({ basePath, fromPage, bountyOwner }: BountyModalProp
           onGoBack();
         }}
         fromBountyPage={true}
+        setAfterEdit={setAfterEdit}
       />
     </Modal>
   );

frontend/app/src/people/widgetViews/summaries/WantedSummary.tsx

@@ -154,7 +154,7 @@ function WantedSummary(props: WantedSummaryProps) {
         created: created
       };
 
-      formSubmit && formSubmit(newValue);
+      formSubmit && formSubmit(newValue, true);
     },
     [
       coding_languages,
@@ -192,7 +192,7 @@ function WantedSummary(props: WantedSummaryProps) {
       type: type,
       created: created
     };
-    formSubmit && formSubmit(newValue, false);
+    formSubmit && formSubmit(newValue, true);
   }, [
     coding_languages,
     created,