Chains: allow accessing chains even when survey is draft (#3212)

Co-authored-by: Stefano Ricci <[email protected]>
openforis · Dec 22, 2023 · 52734c3 · 52734c3
1 parent 7f669e4
commit 52734c3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/webapp/views/App/SideBar/Modules/utils.js b/webapp/views/App/SideBar/Modules/utils.js
@@ -73,7 +73,7 @@ export const getModulesHierarchy = (user, surveyInfo) => {
       module: appModules.analysis,
       children: [
         analysisModules.chains,
-        analysisModules.instances,
+        ...(Survey.isPublished(surveyInfo) ? [analysisModules.instances] : []),
         // , analysisModules.entities
       ],
       hidden: !canAnalyzeRecords,

diff --git a/webapp/views/App/views/Analysis/Analysis.js b/webapp/views/App/views/Analysis/Analysis.js
@@ -1,6 +1,8 @@
 import React from 'react'
 import { useNavigate } from 'react-router'
 
+import * as Survey from '@core/survey/survey'
+
 import { appModules, appModuleUri, analysisModules } from '@webapp/app/appModules'
 
 import ModuleSwitch from '@webapp/components/moduleSwitch'
@@ -11,12 +13,14 @@ import SurveyDefsLoader from '@webapp/components/survey/SurveyDefsLoader'
 import Chains from './Chains'
 import Chain from './Chain'
 import Instances from './Instances'
+import { useSurveyInfo } from '@webapp/store/survey'
 // import Entities from './Entities'
 
 const Analysis = () => {
   const navigate = useNavigate()
+  const surveyInfo = useSurveyInfo()
   return (
-    <SurveyDefsLoader draft requirePublish onSurveyCycleUpdate={() => navigate(appModuleUri(analysisModules.chains))}>
+    <SurveyDefsLoader draft onSurveyCycleUpdate={() => navigate(appModuleUri(analysisModules.chains))}>
       <ModuleSwitch
         moduleRoot={appModules.analysis}
         moduleDefault={analysisModules.chains}
@@ -46,10 +50,15 @@ const Analysis = () => {
             path: `${analysisModules.category.path}/:categoryUuid`,
             props: { analysis: true },
           },
-          {
-            component: Instances,
-            path: analysisModules.instances.path,
-          },
+
+          ...(Survey.isPublished(surveyInfo)
+            ? [
+                {
+                  component: Instances,
+                  path: analysisModules.instances.path,
+                },
+              ]
+            : []),
         ]}
       />
     </SurveyDefsLoader>