agregator bugfix

assemblee-virtuelle · Dec 16, 2023 · 339599a · 339599a
1 parent 688df9a
commit 339599a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/engine/services/engine.js b/engine/services/engine.js
@@ -296,10 +296,11 @@ class Engine {
               if(componentFlow.dataFlow.length==1 && (!componentFlow.deeperFocusData || Object.keys(componentFlow.deeperFocusData).length==0)){
                 // console.log('APPPLY dfob from source!!',componentFlow.dataFlow[0].dfob)
                 componentFlow.deeperFocusData=componentFlow.dataFlow[0].dfob;
-              }  
+              } 
 
-
-              if(!componentFlow?.deeperFocusData && (componentFlow?.deeperFocusData?.activateDf==undefined||componentFlow?.deeperFocusData?.activateDf==false)){
+              // console.log('componentFlow?.deeperFocusData',componentFlow?.deeperFocusData)
+              if((!componentFlow?.deeperFocusData ||Object.keys(componentFlow.deeperFocusData).length==0)&& (componentFlow?.deeperFocusData?.activateDf==undefined||componentFlow?.deeperFocusData?.activateDf==false)){
+                // console.log('DEFAULT DFOB!!')
                 componentFlow.deeperFocusData={
                   dfobPath:'',
                   keepArray:true
@@ -358,6 +359,10 @@ class Engine {
                   let dfobPathNormalized = this.stringReplacer.execute(dfobPath, processingNode.queryParams?.queryParams, componentFlow.primaryflow?.data);
                   var dfobTab = dfobPathNormalized.length > 0 ? dfobPathNormalized.split('.') : []
 
+
+
+                  console.log('___ buildDfobFragmentFlow',componentFlow.primaryflow.fragment,dfobTab,keepArray)
+
                   let dfobFragmentFlow = await this.buildDfobFragmentFlow(
                     componentFlow.primaryflow.fragment,
                     dfobTab,
@@ -371,7 +376,7 @@ class Engine {
 
                   dfobFragmentSelected = Array.isArray(dfobFragmentSelected)?dfobFragmentSelected:[dfobFragmentSelected]
 
-                  // console.log('________________ dfobFragmentSelected',dfobFragmentSelected);
+                  console.log('________________ dfobFragmentSelected',dfobFragmentSelected);
                   // console.log('________________ dfobFragmentSelected data',dfobFragmentSelected.map(f=>f.frag.data));
 
                   if (this.config.quietLog != true) {

diff --git a/engine/workspaceComponentExecutor/simpleAgregator.js b/engine/workspaceComponentExecutor/simpleAgregator.js
@@ -21,17 +21,21 @@ class SimpleAgregator {
       // console.log('___',flowData)
       var resultFlow = []
       for (let flow of flowData) {
-        for(let oririnData of flow.data){
-          if (!Array.isArray(oririnData)) {
-            resultFlow.push(oririnData)
-          } else {
-            for (let record of oririnData) {
-              resultFlow.push(record)
-            }
+        if(Array.isArray(flow.data)){
+          for(let originData of flow.data){
+            // if (Array.isArray(originData)) {
+            //   for (let record of originData) {
+            //     resultFlow.push(record)
+            //   }
+            // } else {
+              resultFlow.push(originData)
+            // }
           }
+        } else{
+          resultFlow.push(flow.data)
         }
-
       }
+      resultFlow=resultFlow.flat();
       resolve({
         data: resultFlow
       })