Disable innactive areabased (#2028)

* filter no active * disable switch * disable * Update core/survey/_survey/surveyAnalysis.js * Update core/survey/_survey/surveyAnalysis.js Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
openforis · Dec 22, 2021 · d133d09 · d133d09
1 parent 85099ca
commit d133d09
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/core/survey/_survey/surveyAnalysis.js b/core/survey/_survey/surveyAnalysis.js
@@ -14,7 +14,7 @@ export const getAnalysisNodeDefs =
     showSamplingNodeDefs = true,
     hideSamplingNodeDefsWithoutSibilings = true,
     hideAreaBasedEstimate = true,
-    showInactiveResultVariables = false
+    showInactiveResultVariables = false,
   }) =>
   (survey) => {
     const _nodeDefs = SurveyNodeDefs.getNodeDefsArray(survey)
@@ -55,12 +55,22 @@ export const getAnalysisNodeDefs =
         if (!hasAnalysisSibilings) return false
       }
 
-      if(hideAreaBasedEstimate && NodeDef.isAreaBasedEstimatedOf(nodeDef)){
+      if (hideAreaBasedEstimate && NodeDef.isAreaBasedEstimatedOf(nodeDef)) {
         return false
       }
 
-      if(!showInactiveResultVariables && !NodeDef.getActive(nodeDef)){
-          return false 
+      if (!showInactiveResultVariables && !NodeDef.getActive(nodeDef)) {
+        return false
+      }
+
+      if (
+       NodeDef.isAreaBasedEstimatedOf(nodeDef) &&
+        !showInactiveResultVariables &&
+        !NodeDef.getActive(
+          _nodeDefs.find((_nodeDef) => NodeDef.getUuid(_nodeDef) === NodeDef.getAreaBasedEstimatedOf(nodeDef))
+        )
+      ) {
+        return false
       }
 
       return true