feat: use current location as href instead of empty string (#4331)

it directs users to root instead of the same page as should be expected
opengovsg · Jul 26, 2022 · 24d6d92 · 24d6d92
1 parent 48597b4
commit 24d6d92
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/frontend/src/features/admin-form/preview/PreviewFormProvider.tsx b/frontend/src/features/admin-form/preview/PreviewFormProvider.tsx
@@ -74,7 +74,8 @@ export const PreviewFormProvider = ({
           ),
           description: (
             <Text as="span">
-              <Link href="">Refresh</Link> for the latest version of the form.
+              <Link href={window.location.href}>Refresh</Link> for the latest
+              version of the form.
             </Text>
           ),
           duration: null,

diff --git a/frontend/src/features/public-form/PublicFormProvider.tsx b/frontend/src/features/public-form/PublicFormProvider.tsx
@@ -149,7 +149,8 @@ export const PublicFormProvider = ({
           ),
           description: (
             <Text as="span">
-              <Link href="">Refresh</Link> for the latest version of the form.
+              <Link href={window.location.href}>Refresh</Link> for the latest
+              version of the form.
             </Text>
           ),
           duration: null,

diff --git a/frontend/src/features/public-form/components/FormEndPage/FormEndPageContainer.tsx b/frontend/src/features/public-form/components/FormEndPage/FormEndPageContainer.tsx
@@ -53,7 +53,7 @@ export const FormEndPageContainer = ({
         })
       }
     },
-    [submitFormFeedbackMutation, toast],
+    [isPreview, submitFormFeedbackMutation, toast],
   )
 
   if (!form || !submissionData) return null

diff --git a/frontend/src/features/public-form/components/FormEndPage/components/EndPageBlock.tsx b/frontend/src/features/public-form/components/FormEndPage/components/EndPageBlock.tsx
@@ -74,7 +74,7 @@ export const EndPageBlock = ({
       <Box mt="2.25rem">
         <Button
           as="a"
-          href={endPage.buttonLink ?? ''}
+          href={endPage.buttonLink ?? window.location.href}
           variant="solid"
           colorScheme={`theme-${colorTheme}`}
         >
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ export const FormEndPageContainer = ({ @@
             })
           }
         },
-        [submitFormFeedbackMutation, toast],
+        [isPreview, submitFormFeedbackMutation, toast],
       )
       if (!form || !submissionData) return null
@@ Expand Down @@