From c1b513cd3401b17386e2650097cd88455fd88863 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Tue, 19 May 2020 16:27:21 +0200
Subject: [PATCH] improve calculate state

---
 src/dashboard/dashboard.js | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/dashboard/dashboard.js b/src/dashboard/dashboard.js
index b959bba..11156da 100644
--- a/src/dashboard/dashboard.js
+++ b/src/dashboard/dashboard.js
@@ -61,7 +61,7 @@ class Dashboard extends Component {
       });
     }
 
-    // obtain all widgets of a dashboard
+    // obtain all widgets of this dashboard
     let widgets = WidgetStore.getState().filter(w => w.dashboardID === parseInt(props.match.params.dashboard, 10));
 
     // compute max y coordinate
@@ -73,10 +73,25 @@ class Dashboard extends Component {
       return thisWidgetHeight > maxHeightSoFar? thisWidgetHeight : maxHeightSoFar;
     }, 0);
 
-    // TODO filter signals to the ones belonging to the scenario at hand!
-    let signals = SignalStore.getState();
+    // filter component configurations to the ones that belong to this scenario
+    let configs = []
+    if (dashboard !== null) {
+      configs = ConfigStore.getState().filter(config => config.scenarioID === dashboard.scenarioID);
+    }
 
-    // get files of all widgets
+    // filter signals to the ones belonging to the scenario at hand
+    let signals = []
+    let allSignals = SignalStore.getState();
+    let sig, con;
+    for (sig of allSignals){
+      for (con of configs){
+        if (sig.configID === con.id){
+          signals.push(sig);
+        }
+      }
+    }
+
+    // filter files to the ones associated with a widget of this dashboard
     let allFiles = FileStore.getState();
     let files = [];
     let file, widget;
@@ -88,13 +103,7 @@ class Dashboard extends Component {
       }
     }
 
-    let configs = []
-    if (dashboard !== null) {
-      // obtain all component configurations of the scenario to which the dashboard belongs
-      configs = ConfigStore.getState().filter(config => config.scenarioID === dashboard.scenarioID);
-    }
-
-    // create list of infrastructure components in use
+    // filter ICs to the ones used by this scenario
     let ics = []
     if (configs.length > 0){
       ics = ICStore.getState().filter(ic => {