From 0ee30ff07126736e8176d20075093cb01c77c495 Mon Sep 17 00:00:00 2001
From: Kevin Charles <kevinmcharles@gmail.com>
Date: Fri, 24 Mar 2023 03:43:34 +0000
Subject: [PATCH] Settings go to correct referrer

---
 src/Tools/_framework/Panels/NewSupportPanel.jsx  |  2 +-
 .../Paths/PortfolioActivitySettings.jsx          | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Tools/_framework/Panels/NewSupportPanel.jsx b/src/Tools/_framework/Panels/NewSupportPanel.jsx
index 5c56cc5382..a9cfc2c02c 100644
--- a/src/Tools/_framework/Panels/NewSupportPanel.jsx
+++ b/src/Tools/_framework/Panels/NewSupportPanel.jsx
@@ -59,7 +59,7 @@ export default function SupportPanel({ hide, children, panelTitles=[], panelInde
     return (
       <>
       <ControlsWrapper $hide={hide} aria-label="complementary controls" data-test="Support Panel Controls">
-        {recoilPageToolView?.page == 'portfolioeditor' ? <Button value="Settings" onClick={()=>navigate(`/portfolio/${doenetId}/settings`)}/> : null }
+        {recoilPageToolView?.page == 'portfolioeditor' ? <Button value="Settings" onClick={()=>navigate(`/portfolio/${doenetId}/settings?referrer=portfolioeditor`)}/> : null }
         <Button value="Documentation" onClick={()=>window.open("/public?tool=editor&doenetId=_DG5JOeFNTc5rpWuf2uA-q")}/>
       </ControlsWrapper>
     <SupportWrapper  $hide={hide} role="complementary" data-test="Support Panel">{children}</SupportWrapper>
diff --git a/src/Tools/_framework/Paths/PortfolioActivitySettings.jsx b/src/Tools/_framework/Paths/PortfolioActivitySettings.jsx
index bd5150fb06..adbd8050ed 100644
--- a/src/Tools/_framework/Paths/PortfolioActivitySettings.jsx
+++ b/src/Tools/_framework/Paths/PortfolioActivitySettings.jsx
@@ -10,17 +10,29 @@ import { faFileImage } from '@fortawesome/free-solid-svg-icons';
 
 
 export async function action({ request, params }) {
+  const queryString = window.location.search;
+  const urlParams = new URLSearchParams(queryString);
+  const referrer = urlParams.get('referrer');
+
   const formData = await request.formData();
   let updates = Object.fromEntries(formData);
   let response = await axios.post("/api/updatePortfolioActivitySettings.php",{
     ...updates, doenetId:params.doenetId
   })
-  // const portfolioCourseId = response.data.portfolioCourseId;
+
+  if (referrer == "portfolioeditor"){
+    return redirect(`/portfolioeditor?tool=editor&doenetId=${updates.doenetId}&pageId=${updates.pageDoenetId}`) 
+  }else{
+    const portfolioCourseId = response.data.portfolioCourseId;
+    return redirect(`/portfolio/${portfolioCourseId}`) 
+  }
+  
+  
 
       // if (response.ok) {
       //   // let { doenetId } = await response.json();
       // if (updates._source == "_source")
-        return redirect(`/portfolioeditor?tool=editor&doenetId=${updates.doenetId}&pageId=${updates.pageDoenetId}`) 
+        // return redirect(`/portfolioeditor?tool=editor&doenetId=${updates.doenetId}&pageId=${updates.pageDoenetId}`) 
         // return redirect(`/portfolioeditor?tool=editor&doenetId=${updates.doenetId}&pageId=${updates.pageDoenetId}`) 
 // }else{
 //   return redirect(`/portfolio/${portfolioCourseId}`)