fix editing challenge reverting recommended layout to empty string

maproulette · Oct 15, 2023 · daa376f · daa376f
1 parent 5ac09c7
commit daa376f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/WidgetWorkspace/WidgetWorkspace.js b/src/components/WidgetWorkspace/WidgetWorkspace.js
@@ -40,7 +40,7 @@ export class WidgetWorkspace extends Component {
   componentDidUpdate() {
     if(!this.state.activeRecommendedLayout && this.props.task?.parent?.widgetLayout) {
       const { task, workspaceConfigurations, saveWorkspaceConfiguration } = this.props;
-      let recommendedLayout = task.parent.widgetLayout
+      let recommendedLayout = task.parent.widgetLayout.workspace
 
       if (this.props.workspaceConfigurations?.recommendedLayout) {
         this.props.deleteWorkspaceConfiguration(this.props.workspaceConfigurations.recommendedLayout.id)

diff --git a/src/services/Challenge/Challenge.js b/src/services/Challenge/Challenge.js
@@ -963,12 +963,12 @@ export const fetchChallenges = function (
 
     // If there is local GeoJSON content being transmitted as a string, parse
     // it into JSON first.
-    if (challengeData.widgetLayout) {
+    if (!challengeData.widgetLayout.workspace && challengeData.widgetLayout) {
       try {
         if (!JSON.parse(challengeData.widgetLayout).workspace) {
           throw new Error("Widget layout with the wrong format was submitted, it was not included in the save.")
         }
-        challengeData.widgetLayout = JSON.parse(challengeData.widgetLayout).workspace
+        challengeData.widgetLayout = JSON.parse(challengeData.widgetLayout)
       } catch(error) {
         challengeData.widgetLayout = "";
         console.error(error);