From b79de99e9aa8ab2af5cbe731100552ba28ad4ab1 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 22 Nov 2020 22:06:01 +0100
Subject: [PATCH 01/74] WIP: Show status of VILLASnode ICs #265

---
 src/ic/ic-api-store.js         | 49 ++++++++++++++++++++++++++++++++
 src/ic/ic-data-data-manager.js | 18 ++++++++++++
 src/ic/ic-dialog.js            | 51 ++++++++++++++++++++++++++++++++--
 src/ic/ics.js                  | 36 ++++++++++++++++++++----
 4 files changed, 145 insertions(+), 9 deletions(-)
 create mode 100644 src/ic/ic-api-store.js

diff --git a/src/ic/ic-api-store.js b/src/ic/ic-api-store.js
new file mode 100644
index 0000000..d02d644
--- /dev/null
+++ b/src/ic/ic-api-store.js
@@ -0,0 +1,49 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import ArrayStore from '../common/array-store';
+import ICDataDataManager from './ic-data-data-manager';
+
+class ICAPIStore extends ArrayStore {
+  constructor() {
+    super('ic-api', ICDataDataManager);
+  }
+
+
+  reduce(state, action) {
+    switch(action.type) {
+
+      case 'ic-api/get-status':
+        ICDataDataManager.getStatus(action.url, action.socketname, action.token,action.icid);
+        return super.reduce(state, action);
+
+      case 'ic-api/status-received':
+        let tempData = action.data;
+        tempData.icId = action.icid;
+        return this.updateElements(state, [tempData]);
+
+      case 'ic-api/status-error':
+        console.log("status error");
+        return super.reduce(state, action);
+
+      default:
+        return super.reduce(state, action);
+    }
+  }
+}
+
+export default new ICAPIStore();
diff --git a/src/ic/ic-data-data-manager.js b/src/ic/ic-data-data-manager.js
index 0dcc853..5e10007 100644
--- a/src/ic/ic-data-data-manager.js
+++ b/src/ic/ic-data-data-manager.js
@@ -17,6 +17,7 @@
 
 import WebsocketAPI from '../common/api/websocket-api';
 import AppDispatcher from '../common/app-dispatcher';
+import RestAPI from "../common/api/rest-api";
 
 const OFFSET_TYPE = 2;
 const OFFSET_VERSION = 4;
@@ -43,6 +44,23 @@ class IcDataDataManager {
     }
   }
 
+  getStatus(url,socketname,token,icid){
+    RestAPI.get(url, null).then(response => {
+      AppDispatcher.dispatch({
+        type: 'ic-api/status-received',
+        data: response,
+        token: token,
+        socketname: socketname,
+        icid: icid,
+      });
+    }).catch(error => {
+      AppDispatcher.dispatch({
+        type: 'ic-api/status-error',
+        error: error
+      })
+    })
+  }
+
   closeAll() {
     // close every open socket
     for (var identifier in this._sockets) {
diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index b134f95..0a1a411 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -1,6 +1,9 @@
 import React from 'react';
-import {FormLabel} from 'react-bootstrap';
+import {FormLabel, Button} from 'react-bootstrap';
 import Dialog from '../common/dialogs/dialog';
+import {Collapse} from 'react-collapse';
+import Icon from "../common/icon";
+
 
 
 class ICDialog extends React.Component {
@@ -10,10 +13,20 @@ class ICDialog extends React.Component {
     super(props);
 
     this.state = {
-      ic: props.ic
+      timezone: false,
+      kernel: false,
+      system: false,
     };
   }
 
+/*  static getDerivedStateFromProps(props, state){
+    let icStatus = props.icStatus;
+    return {
+      icStatus: icStatus,
+      ic: props.ic,
+    };
+  }*/
+
   onClose(canceled) {
     this.props.onClose();
   }
@@ -22,6 +35,19 @@ class ICDialog extends React.Component {
     
   }
 
+  showFurtherInfo(key){
+    switch(key){
+      case 'timezone':
+        this.setState({timezone: !this.state.timezone});
+        return;
+      case 'kernel':
+        this.setState({kernel: !this.state.kernel});
+        return;
+      case 'system':
+        this.setState({system: !this.state.system});
+        return;
+    }
+  }
 
   render() {
     
@@ -35,7 +61,26 @@ class ICDialog extends React.Component {
         size='lg'
       >
         <form>
-          <FormLabel>Infos and Controls</FormLabel>
+          <FormLabel>Status</FormLabel>
+          {
+            typeof this.props.icStatus !== "undefined" && Object.keys(this.props.icStatus).map(statusKey => (
+              typeof this.props.icStatus[statusKey] === 'object' ?
+              (<div>
+                <Button variant="light" onClick={() => this.showFurtherInfo(statusKey)}  >{statusKey}
+                <Icon icon='chevron-down' style={{color: '#007bff'}}/></Button>
+                <Collapse isOpened={this.state[statusKey]} >
+                  {
+                    Object.keys(this.props.icStatus[statusKey]).map(key => (
+                      <div>{key + ": " + this.props.icStatus[statusKey][key]}</div>
+                    ))
+                  }
+                </Collapse>
+
+              </div>) 
+              :
+              (<div>{statusKey + ": " + this.props.icStatus[statusKey]}</div>)
+            ))
+          }
         </form>
       </Dialog>
     );
diff --git a/src/ic/ics.js b/src/ic/ics.js
index 138852f..2789b1e 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -24,6 +24,7 @@ import moment from 'moment'
 
 import AppDispatcher from '../common/app-dispatcher';
 import InfrastructureComponentStore from './ic-store';
+import ICAPIStore from './ic-api-store';
 
 import Icon from '../common/icon';
 import Table from '../common/table';
@@ -38,7 +39,7 @@ import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class InfrastructureComponents extends Component {
   static getStores() {
-    return [ InfrastructureComponentStore ];
+    return [ InfrastructureComponentStore, ICAPIStore ];
   }
 
   static statePrio(state) {
@@ -73,11 +74,15 @@ class InfrastructureComponents extends Component {
         return a.stateUpdatedAt < b.stateUpdatedAt;
       }
     });
+    
+     const icInfo = ICAPIStore.getState();
 
     return {
       sessionToken: localStorage.getItem("token"),
       ics: ics,
+      icInfo: icInfo,
       modalIC: {},
+      modalICStatus: {},
       deleteModal: false,
       icModal: false,
       selectedICs: [],
@@ -90,11 +95,11 @@ class InfrastructureComponents extends Component {
       type: 'ics/start-load',
       token: this.state.sessionToken,
     });
-
-    // Start timer for periodic refresh
+    
+   // Start timer for periodic refresh
     this.timer = window.setInterval(() => this.refresh(), 10000);
   }
-
+  
   componentWillUnmount() {
     window.clearInterval(this.timer);
   }
@@ -109,6 +114,19 @@ class InfrastructureComponents extends Component {
         type: 'ics/start-load',
         token: this.state.sessionToken,
       });
+
+      this.state.ics.forEach(ic => {
+        if (ic.type === "villas-node" || ic.type === "villas-relay") {
+          let splitWebsocketURL = ic.websocketurl.split("/");
+          AppDispatcher.dispatch({
+            type: 'ic-api/get-status',
+            url: ic.apiurl + "/status",
+            socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
+            token: this.state.sessionToken,
+            icid: ic.id,
+          });
+        }
+      })
     }
   }
 
@@ -320,12 +338,18 @@ class InfrastructureComponents extends Component {
     let ic = this.state.ics.find(ic => ic.name === name);
     let index = this.state.ics.indexOf(ic);
     if(ic.type === "villas-node" || ic.type === "villas-relay"){
-      return <Button variant="link" onClick={() => this.setState({ icModal: true, modalIC: ic, modalIndex: index })}>{name}</Button>    }
+      return <Button variant="link" onClick={(ic) => this.openICStatus(ic)}>{name}</Button>    }
     else{
       return <span>{name}</span>
     }
   }
 
+  openICStatus(ic){
+    let index = this.state.ics.indexOf(ic);
+    let icStatus = this.state.icInfo.find(info => info.icID === ic.id);
+    this.setState({ icModal: true, modalIC: ic, modalICStatus: icStatus, modalIndex: index })
+  }
+
   render() {
     const buttonStyle = {
       marginLeft: '10px'
@@ -396,7 +420,7 @@ class InfrastructureComponents extends Component {
         <NewICDialog show={this.state.newModal} onClose={data => this.closeNewModal(data)} />
         <EditICDialog show={this.state.editModal} onClose={data => this.closeEditModal(data)} ic={this.state.modalIC} />
         <ImportICDialog show={this.state.importModal} onClose={data => this.closeImportModal(data)} />
-        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} />
+        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} icStatus={this.state.modalICStatus} />
 
         <DeleteDialog title="infrastructure-component" name={this.state.modalIC.name || 'Unknown'} show={this.state.deleteModal} onClose={(e) => this.closeDeleteModal(e)} />
       </div>

From 0bc737349f123cf8707fadca1d7a1ac0a48c6bb1 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Fri, 27 Nov 2020 13:38:51 +0100
Subject: [PATCH 02/74] WIP: Show graph representing the current config #265

---
 src/common/api/rest-api.js     | 22 ++++++++++++++++++++++
 src/ic/ic-api-store.js         | 10 ++++++++++
 src/ic/ic-data-data-manager.js | 16 ++++++++++++++++
 src/ic/ics.js                  |  7 +++++++
 4 files changed, 55 insertions(+)

diff --git a/src/common/api/rest-api.js b/src/common/api/rest-api.js
index 084456c..50ff2de 100644
--- a/src/common/api/rest-api.js
+++ b/src/common/api/rest-api.js
@@ -170,6 +170,28 @@ class RestAPI {
     });
   }
 
+  apiDownload(url, token) {
+    return new Promise(function (resolve, reject) {
+      var req = request.get(url).buffer(true).responseType("blob");
+
+      if (token != null) {
+        req.set('Authorization', "Bearer " + token);
+      }
+
+      req.end(function (error, res) {
+        if (res == null || res.status !== 200) {
+          if (req.url !== prevURL) error.handled = isNetworkError(error);
+          prevURL = req.url;
+          reject(error);
+        } else {
+          let parts = url.split("/");
+          resolve({data: res.body, type: res.type, id: parts[parts.length-1]})
+        }
+      });
+    });
+  }
+
+
 }
 
 export default new RestAPI();
diff --git a/src/ic/ic-api-store.js b/src/ic/ic-api-store.js
index d02d644..20d3816 100644
--- a/src/ic/ic-api-store.js
+++ b/src/ic/ic-api-store.js
@@ -40,6 +40,16 @@ class ICAPIStore extends ArrayStore {
         console.log("status error");
         return super.reduce(state, action);
 
+      case 'ic-api/get-graph':
+        ICDataDataManager.getGraph(action.url, action.socketname, action.token);
+        return super.reduce(state, action);
+
+      case 'ic-api/graph-received':
+        return super.reduce(state, action);
+
+      case 'ic-api/graph-error':
+        return super.reduce(state, action);
+
       default:
         return super.reduce(state, action);
     }
diff --git a/src/ic/ic-data-data-manager.js b/src/ic/ic-data-data-manager.js
index 5e10007..d82497a 100644
--- a/src/ic/ic-data-data-manager.js
+++ b/src/ic/ic-data-data-manager.js
@@ -61,6 +61,22 @@ class IcDataDataManager {
     })
   }
 
+  getGraph(url,socketname,token){
+    RestAPI.apiDownload(url, null).then(response => {
+      AppDispatcher.dispatch({
+        type: 'ic-api/status-received',
+        data: response,
+        token: token,
+        socketname: socketname,
+      });
+    }).catch(error => {
+      AppDispatcher.dispatch({
+        type: 'ic-api/status-error',
+        error: error
+      })
+    })
+  }
+
   closeAll() {
     // close every open socket
     for (var identifier in this._sockets) {
diff --git a/src/ic/ics.js b/src/ic/ics.js
index 2789b1e..a7024e8 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -125,6 +125,13 @@ class InfrastructureComponents extends Component {
             token: this.state.sessionToken,
             icid: ic.id,
           });
+
+          AppDispatcher.dispatch({
+            type: 'ic-api/get-graph',
+            url: ic.apiurl + "/graph.svg",
+            socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
+            token: this.state.sessionToken,
+          });
         }
       })
     }

From d605d9c7bb6450425f1684c52c44dd1fd50c1b0a Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sat, 28 Nov 2020 16:44:58 +0100
Subject: [PATCH 03/74] Show status of VILLASnode ICs #265

---
 src/ic/ic-dialog.js | 50 +++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 0a1a411..cdb48ad 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -13,20 +13,9 @@ class ICDialog extends React.Component {
     super(props);
 
     this.state = {
-      timezone: false,
-      kernel: false,
-      system: false,
     };
   }
 
-/*  static getDerivedStateFromProps(props, state){
-    let icStatus = props.icStatus;
-    return {
-      icStatus: icStatus,
-      ic: props.ic,
-    };
-  }*/
-
   onClose(canceled) {
     this.props.onClose();
   }
@@ -36,17 +25,8 @@ class ICDialog extends React.Component {
   }
 
   showFurtherInfo(key){
-    switch(key){
-      case 'timezone':
-        this.setState({timezone: !this.state.timezone});
-        return;
-      case 'kernel':
-        this.setState({kernel: !this.state.kernel});
-        return;
-      case 'system':
-        this.setState({system: !this.state.system});
-        return;
-    }
+    if(typeof this.state[key] === 'undefined') this.setState({[key]: false});
+    this.setState({[key]: !this.state[key]});
   }
 
   render() {
@@ -68,13 +48,25 @@ class ICDialog extends React.Component {
               (<div>
                 <Button variant="light" onClick={() => this.showFurtherInfo(statusKey)}  >{statusKey}
                 <Icon icon='chevron-down' style={{color: '#007bff'}}/></Button>
-                <Collapse isOpened={this.state[statusKey]} >
-                  {
-                    Object.keys(this.props.icStatus[statusKey]).map(key => (
-                      <div>{key + ": " + this.props.icStatus[statusKey][key]}</div>
-                    ))
-                  }
-                </Collapse>
+                  <Collapse isOpened={this.state[statusKey]} >
+                    {
+                      Object.keys(this.props.icStatus[statusKey]).map(key => (
+                        typeof this.props.icStatus[statusKey][key] === 'object' ?
+                          (<div>
+                            <Button variant="light" onClick={() => this.showFurtherInfo(key)}  >{key}
+                              <Icon icon='chevron-down' style={{ color: '#007bff' }} /></Button>
+                            <Collapse isOpened={this.state[key]} >
+
+                              {Object.keys(this.props.icStatus[statusKey][key]).map(index => (
+                                <div>{index + ": " + this.props.icStatus[statusKey][key][index]}</div>
+                              ))}
+                            </Collapse>
+                          </div>)
+                          :
+                          (<div>{key + ": " + this.props.icStatus[statusKey][key]}</div>)
+                      ))
+                    }
+                  </Collapse>
 
               </div>) 
               :

From f88a75a972f2773f93d3ecce4a9285e47a7ebc0d Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sat, 28 Nov 2020 21:17:26 +0100
Subject: [PATCH 04/74] Show graph representing the current config #265

---
 src/ic/ic-data-data-manager.js                | 11 ++--
 src/ic/ic-dialog.js                           | 17 +++++
 src/ic/ic-graph-store.js                      | 62 +++++++++++++++++++
 .../{ic-api-store.js => ic-status-store.js}   | 24 +++----
 src/ic/ics.js                                 | 32 ++++++----
 5 files changed, 112 insertions(+), 34 deletions(-)
 create mode 100644 src/ic/ic-graph-store.js
 rename src/ic/{ic-api-store.js => ic-status-store.js} (70%)

diff --git a/src/ic/ic-data-data-manager.js b/src/ic/ic-data-data-manager.js
index d82497a..d0ca2fd 100644
--- a/src/ic/ic-data-data-manager.js
+++ b/src/ic/ic-data-data-manager.js
@@ -47,7 +47,7 @@ class IcDataDataManager {
   getStatus(url,socketname,token,icid){
     RestAPI.get(url, null).then(response => {
       AppDispatcher.dispatch({
-        type: 'ic-api/status-received',
+        type: 'ic-status/status-received',
         data: response,
         token: token,
         socketname: socketname,
@@ -55,23 +55,24 @@ class IcDataDataManager {
       });
     }).catch(error => {
       AppDispatcher.dispatch({
-        type: 'ic-api/status-error',
+        type: 'ic-status/status-error',
         error: error
       })
     })
   }
 
-  getGraph(url,socketname,token){
+  getGraph(url,socketname,token,icid){
     RestAPI.apiDownload(url, null).then(response => {
       AppDispatcher.dispatch({
-        type: 'ic-api/status-received',
+        type: 'ic-graph/graph-received',
         data: response,
         token: token,
         socketname: socketname,
+        icid: icid,
       });
     }).catch(error => {
       AppDispatcher.dispatch({
-        type: 'ic-api/status-error',
+        type: 'ic-graph/graph-error',
         error: error
       })
     })
diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index cdb48ad..12f65ec 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -29,7 +29,16 @@ class ICDialog extends React.Component {
     this.setState({[key]: !this.state[key]});
   }
 
+  graphError(e){
+    console.log("graph error");
+  }
+
   render() {
+
+    let objectURL=''
+    if(typeof this.props.icGraph !== "undefined") {
+      objectURL = this.props.icGraph.objectURL
+    }
     
     return (
       <Dialog
@@ -73,6 +82,14 @@ class ICDialog extends React.Component {
               (<div>{statusKey + ": " + this.props.icStatus[statusKey]}</div>)
             ))
           }
+          <div>Graph:</div>
+          <div>
+            {objectURL !== '' ? (
+              <img onError={(e) => this.graphError(e)} alt={"Error"} src={objectURL} />
+            ) : (
+                <img alt="Error" />
+              )}
+          </div>
         </form>
       </Dialog>
     );
diff --git a/src/ic/ic-graph-store.js b/src/ic/ic-graph-store.js
new file mode 100644
index 0000000..cb44812
--- /dev/null
+++ b/src/ic/ic-graph-store.js
@@ -0,0 +1,62 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import ArrayStore from '../common/array-store';
+import ICDataDataManager from './ic-data-data-manager';
+
+class ICGraphStore extends ArrayStore {
+  constructor() {
+    super('ic-graph', ICDataDataManager);
+  }
+
+  saveGraph(state, action){
+
+    let icID = parseInt(action.icid);    
+    const dublicate = state.some(element => element.icID === icID);
+    if(dublicate){
+        return state
+    }
+    let icGraph = {};
+    icGraph["icID"] = icID;
+    icGraph["data"] = new Blob([action.data.data], {type: action.data.type});
+    icGraph["type"] = action.data.type;
+    icGraph["objectURL"] = URL.createObjectURL(icGraph["data"]);
+    
+    this.__emitChange();
+    return this.updateElements(state, [icGraph]);
+  }
+
+  reduce(state, action) {
+    switch(action.type) {
+
+      case 'ic-graph/get-graph':
+        ICDataDataManager.getGraph(action.url, action.socketname, action.token, action.icid);
+        return super.reduce(state, action);
+
+      case 'ic-graph/graph-received':
+        return this.saveGraph(state, action);
+
+      case 'ic-graph/graph-error':
+        return super.reduce(state, action);
+
+      default:
+        return super.reduce(state, action);
+    }
+  }
+}
+
+export default new ICGraphStore();
diff --git a/src/ic/ic-api-store.js b/src/ic/ic-status-store.js
similarity index 70%
rename from src/ic/ic-api-store.js
rename to src/ic/ic-status-store.js
index 20d3816..c78353a 100644
--- a/src/ic/ic-api-store.js
+++ b/src/ic/ic-status-store.js
@@ -18,42 +18,32 @@
 import ArrayStore from '../common/array-store';
 import ICDataDataManager from './ic-data-data-manager';
 
-class ICAPIStore extends ArrayStore {
+class ICStatusStore extends ArrayStore {
   constructor() {
-    super('ic-api', ICDataDataManager);
+    super('ic-status', ICDataDataManager);
   }
 
 
   reduce(state, action) {
     switch(action.type) {
 
-      case 'ic-api/get-status':
+      case 'ic-status/get-status':
         ICDataDataManager.getStatus(action.url, action.socketname, action.token,action.icid);
         return super.reduce(state, action);
 
-      case 'ic-api/status-received':
+      case 'ic-status/status-received':
         let tempData = action.data;
-        tempData.icId = action.icid;
+        tempData.icID = action.icid;
         return this.updateElements(state, [tempData]);
 
-      case 'ic-api/status-error':
+      case 'ic-status/status-error':
         console.log("status error");
         return super.reduce(state, action);
 
-      case 'ic-api/get-graph':
-        ICDataDataManager.getGraph(action.url, action.socketname, action.token);
-        return super.reduce(state, action);
-
-      case 'ic-api/graph-received':
-        return super.reduce(state, action);
-
-      case 'ic-api/graph-error':
-        return super.reduce(state, action);
-
       default:
         return super.reduce(state, action);
     }
   }
 }
 
-export default new ICAPIStore();
+export default new ICStatusStore();
diff --git a/src/ic/ics.js b/src/ic/ics.js
index a7024e8..f3ec9d3 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -24,7 +24,8 @@ import moment from 'moment'
 
 import AppDispatcher from '../common/app-dispatcher';
 import InfrastructureComponentStore from './ic-store';
-import ICAPIStore from './ic-api-store';
+import ICStatusStore from './ic-status-store';
+import ICGraphStore from './ic-graph-store';
 
 import Icon from '../common/icon';
 import Table from '../common/table';
@@ -39,7 +40,7 @@ import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class InfrastructureComponents extends Component {
   static getStores() {
-    return [ InfrastructureComponentStore, ICAPIStore ];
+    return [ InfrastructureComponentStore, ICStatusStore, ICGraphStore ];
   }
 
   static statePrio(state) {
@@ -75,14 +76,17 @@ class InfrastructureComponents extends Component {
       }
     });
     
-     const icInfo = ICAPIStore.getState();
-
+     const icStatus = ICStatusStore.getState();
+     const icGraph = ICGraphStore.getState();
+     
     return {
       sessionToken: localStorage.getItem("token"),
       ics: ics,
-      icInfo: icInfo,
+      icStatus: icStatus,
+      icGraph: icGraph,
       modalIC: {},
       modalICStatus: {},
+      modalICGraph: {},
       deleteModal: false,
       icModal: false,
       selectedICs: [],
@@ -119,7 +123,7 @@ class InfrastructureComponents extends Component {
         if (ic.type === "villas-node" || ic.type === "villas-relay") {
           let splitWebsocketURL = ic.websocketurl.split("/");
           AppDispatcher.dispatch({
-            type: 'ic-api/get-status',
+            type: 'ic-status/get-status',
             url: ic.apiurl + "/status",
             socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
             token: this.state.sessionToken,
@@ -127,10 +131,11 @@ class InfrastructureComponents extends Component {
           });
 
           AppDispatcher.dispatch({
-            type: 'ic-api/get-graph',
+            type: 'ic-graph/get-graph',
             url: ic.apiurl + "/graph.svg",
             socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
             token: this.state.sessionToken,
+            icid: ic.id,
           });
         }
       })
@@ -343,18 +348,21 @@ class InfrastructureComponents extends Component {
 
   modifyNameColumn(name){
     let ic = this.state.ics.find(ic => ic.name === name);
-    let index = this.state.ics.indexOf(ic);
+  
     if(ic.type === "villas-node" || ic.type === "villas-relay"){
-      return <Button variant="link" onClick={(ic) => this.openICStatus(ic)}>{name}</Button>    }
+      return <Button variant="link" onClick={() => this.openICStatus(ic)}>{name}</Button>    }
     else{
       return <span>{name}</span>
     }
   }
 
   openICStatus(ic){
+    
     let index = this.state.ics.indexOf(ic);
-    let icStatus = this.state.icInfo.find(info => info.icID === ic.id);
-    this.setState({ icModal: true, modalIC: ic, modalICStatus: icStatus, modalIndex: index })
+    let icStatus = this.state.icStatus.find(status => status.icID === ic.id);
+    let icGraph = this.state.icGraph.find(graph => graph.icID === ic.id);
+  
+    this.setState({ icModal: true, modalIC: ic, modalICStatus: icStatus, modalICGraph: icGraph, modalIndex: index })
   }
 
   render() {
@@ -427,7 +435,7 @@ class InfrastructureComponents extends Component {
         <NewICDialog show={this.state.newModal} onClose={data => this.closeNewModal(data)} />
         <EditICDialog show={this.state.editModal} onClose={data => this.closeEditModal(data)} ic={this.state.modalIC} />
         <ImportICDialog show={this.state.importModal} onClose={data => this.closeImportModal(data)} />
-        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} icStatus={this.state.modalICStatus} />
+        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} icStatus={this.state.modalICStatus} icGraph={this.state.modalICGraph} />
 
         <DeleteDialog title="infrastructure-component" name={this.state.modalIC.name || 'Unknown'} show={this.state.deleteModal} onClose={(e) => this.closeDeleteModal(e)} />
       </div>

From be0c656a22c3a67124bab3561ce665f3abb2fc6d Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 29 Nov 2020 15:22:39 +0100
Subject: [PATCH 05/74] WIP: Send control commands from status dialog #265

---
 src/ic/confirm-command.js | 48 +++++++++++++++++++++++++++++++++++++++
 src/ic/ic-dialog.js       | 20 ++++++++++++++++
 src/ic/ics.js             |  6 ++++-
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 src/ic/confirm-command.js

diff --git a/src/ic/confirm-command.js b/src/ic/confirm-command.js
new file mode 100644
index 0000000..43b6885
--- /dev/null
+++ b/src/ic/confirm-command.js
@@ -0,0 +1,48 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React from 'react';
+import { Button, Modal} from 'react-bootstrap';
+
+class ConfirmCommand extends React.Component {
+    onModalKeyPress = (event) => {
+        if (event.key === 'Enter') {
+            event.preventDefault();
+
+            this.props.onClose(false);
+        }
+      }
+
+    render() {
+        return <Modal keyboard show={this.props.show} onHide={() => this.props.onClose(false)} onKeyPress={this.onModalKeyPress}>
+            <Modal.Header>
+                <Modal.Title>Confirm {this.props.command}</Modal.Title>
+            </Modal.Header>
+
+            <Modal.Body>
+                Are you sure you want to {this.props.command} <strong>'{this.props.name}'</strong>?
+            </Modal.Body>
+
+            <Modal.Footer>
+                <Button onClick={() => this.props.onClose(true)}>Cancel</Button>
+                <Button onClick={() => this.props.onClose(false)}>Confirm</Button>
+            </Modal.Footer>
+        </Modal>;
+    }
+}
+
+export default ConfirmCommand;
diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 12f65ec..0acbcb5 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -3,6 +3,7 @@ import {FormLabel, Button} from 'react-bootstrap';
 import Dialog from '../common/dialogs/dialog';
 import {Collapse} from 'react-collapse';
 import Icon from "../common/icon";
+import ConfirmCommand from './confirm-command';
 
 
 
@@ -13,6 +14,8 @@ class ICDialog extends React.Component {
     super(props);
 
     this.state = {
+      confirmCommand: false,
+      command: '',
     };
   }
 
@@ -33,6 +36,15 @@ class ICDialog extends React.Component {
     console.log("graph error");
   }
 
+  closeConfirmModal(canceled){
+    if(!canceled){
+      this.props.sendControlCommand(this.state.command);
+    }
+
+    this.setState({confirmCommand: false, command: ''});
+  }
+
+  
   render() {
 
     let objectURL=''
@@ -91,7 +103,15 @@ class ICDialog extends React.Component {
               )}
           </div>
         </form>
+        
+        <div>Controls</div>
+        <Button onClick={() => this.setState({ confirmCommand: true, command: 'restart' })}>Restart</Button>
+        <Button onClick={() => this.setState({ confirmCommand: true, command: 'shutdown' })}>Shutdown</Button>
+
+        <ConfirmCommand show={this.state.confirmCommand} command={this.state.command} name={this.props.ic.name} onClose={c => this.closeConfirmModal(c)} />
+
       </Dialog>
+      
     );
   }
 }
diff --git a/src/ic/ics.js b/src/ic/ics.js
index f3ec9d3..c582503 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -365,6 +365,10 @@ class InfrastructureComponents extends Component {
     this.setState({ icModal: true, modalIC: ic, modalICStatus: icStatus, modalICGraph: icGraph, modalIndex: index })
   }
 
+  sendControlCommand(command){
+    console.log(command);
+  }
+
   render() {
     const buttonStyle = {
       marginLeft: '10px'
@@ -435,7 +439,7 @@ class InfrastructureComponents extends Component {
         <NewICDialog show={this.state.newModal} onClose={data => this.closeNewModal(data)} />
         <EditICDialog show={this.state.editModal} onClose={data => this.closeEditModal(data)} ic={this.state.modalIC} />
         <ImportICDialog show={this.state.importModal} onClose={data => this.closeImportModal(data)} />
-        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} icStatus={this.state.modalICStatus} icGraph={this.state.modalICGraph} />
+        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} icStatus={this.state.modalICStatus} icGraph={this.state.modalICGraph} sendControlCommand={(command) => this.sendControlCommand(command)}/>
 
         <DeleteDialog title="infrastructure-component" name={this.state.modalIC.name || 'Unknown'} show={this.state.deleteModal} onClose={(e) => this.closeDeleteModal(e)} />
       </div>

From 207449bf568ebf60672cfd09d01c812003dc8384 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 29 Nov 2020 18:31:39 +0100
Subject: [PATCH 06/74] WIP: implement widget to monitor time offset between
 server and local time #208

---
 package-lock.json                 | 2729 +++++++++++++----------------
 package.json                      |   23 +-
 src/widget/widget-factory.js      |    9 +
 src/widget/widget-toolbox.js      |    1 +
 src/widget/widget.js              |    5 +
 src/widget/widgets/time-offset.js |   48 +
 6 files changed, 1290 insertions(+), 1525 deletions(-)
 create mode 100644 src/widget/widgets/time-offset.js

diff --git a/package-lock.json b/package-lock.json
index 10f2405..745cbea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,9 +13,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz",
-      "integrity": "sha512-725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ=="
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz",
+      "integrity": "sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw=="
     },
     "@babel/core": {
       "version": "7.12.3",
@@ -53,11 +53,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz",
-      "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+      "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
       "requires": {
-        "@babel/types": "^7.12.1",
+        "@babel/types": "^7.12.5",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -106,13 +106,13 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz",
-      "integrity": "sha512-jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz",
+      "integrity": "sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==",
       "requires": {
-        "@babel/compat-data": "^7.12.1",
+        "@babel/compat-data": "^7.12.5",
         "@babel/helper-validator-option": "^7.12.1",
-        "browserslist": "^4.12.0",
+        "browserslist": "^4.14.5",
         "semver": "^5.5.0"
       },
       "dependencies": {
@@ -136,12 +136,11 @@
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz",
-      "integrity": "sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz",
+      "integrity": "sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4",
         "regexpu-core": "^4.7.1"
       }
     },
@@ -190,19 +189,19 @@
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
-      "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz",
+      "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==",
       "requires": {
-        "@babel/types": "^7.12.1"
+        "@babel/types": "^7.12.7"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz",
-      "integrity": "sha512-ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+      "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
       "requires": {
-        "@babel/types": "^7.12.1"
+        "@babel/types": "^7.12.5"
       }
     },
     "@babel/helper-module-transforms": {
@@ -222,11 +221,11 @@
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz",
+      "integrity": "sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==",
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.7"
       }
     },
     "@babel/helper-plugin-utils": {
@@ -234,14 +233,6 @@
       "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
       "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
     },
-    "@babel/helper-regex": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
-      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
-      "requires": {
-        "lodash": "^4.17.19"
-      }
-    },
     "@babel/helper-remap-async-to-generator": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz",
@@ -253,14 +244,14 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz",
-      "integrity": "sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+      "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
       "requires": {
         "@babel/helper-member-expression-to-functions": "^7.12.1",
         "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/traverse": "^7.12.1",
-        "@babel/types": "^7.12.1"
+        "@babel/traverse": "^7.12.5",
+        "@babel/types": "^7.12.5"
       }
     },
     "@babel/helper-simple-access": {
@@ -309,13 +300,13 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz",
-      "integrity": "sha512-9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz",
+      "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==",
       "requires": {
         "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.12.1",
-        "@babel/types": "^7.12.1"
+        "@babel/traverse": "^7.12.5",
+        "@babel/types": "^7.12.5"
       }
     },
     "@babel/highlight": {
@@ -329,9 +320,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.12.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz",
-      "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz",
+      "integrity": "sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg=="
     },
     "@babel/plugin-proposal-async-generator-functions": {
       "version": "7.12.1",
@@ -408,9 +399,9 @@
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz",
-      "integrity": "sha512-MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz",
+      "integrity": "sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
@@ -436,9 +427,9 @@
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz",
-      "integrity": "sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz",
+      "integrity": "sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
@@ -840,22 +831,22 @@
       }
     },
     "@babel/plugin-transform-react-jsx": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.1.tgz",
-      "integrity": "sha512-RmKejwnT0T0QzQUzcbP5p1VWlpnP8QHtdhEtLG55ZDQnJNalbF3eeDyu3dnGKvGzFIQiBzFhBYTwvv435p9Xpw==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz",
+      "integrity": "sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==",
       "requires": {
         "@babel/helper-builder-react-jsx": "^7.10.4",
-        "@babel/helper-builder-react-jsx-experimental": "^7.12.1",
+        "@babel/helper-builder-react-jsx-experimental": "^7.12.4",
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-jsx": "^7.12.1"
       }
     },
     "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.1.tgz",
-      "integrity": "sha512-IilcGWdN1yNgEGOrB96jbTplRh+V2Pz1EoEwsKsHfX1a/L40cUYuD71Zepa7C+ujv7kJIxnDftWeZbKNEqZjCQ==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz",
+      "integrity": "sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg==",
       "requires": {
-        "@babel/helper-builder-react-jsx-experimental": "^7.12.1",
+        "@babel/helper-builder-react-jsx-experimental": "^7.12.4",
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-jsx": "^7.12.1"
       }
@@ -937,12 +928,11 @@
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz",
-      "integrity": "sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz",
+      "integrity": "sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-template-literals": {
@@ -989,13 +979,13 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz",
-      "integrity": "sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz",
+      "integrity": "sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==",
       "requires": {
-        "@babel/compat-data": "^7.12.1",
-        "@babel/helper-compilation-targets": "^7.12.1",
-        "@babel/helper-module-imports": "^7.12.1",
+        "@babel/compat-data": "^7.12.7",
+        "@babel/helper-compilation-targets": "^7.12.5",
+        "@babel/helper-module-imports": "^7.12.5",
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/helper-validator-option": "^7.12.1",
         "@babel/plugin-proposal-async-generator-functions": "^7.12.1",
@@ -1005,10 +995,10 @@
         "@babel/plugin-proposal-json-strings": "^7.12.1",
         "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
         "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-        "@babel/plugin-proposal-numeric-separator": "^7.12.1",
+        "@babel/plugin-proposal-numeric-separator": "^7.12.7",
         "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
         "@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.12.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
         "@babel/plugin-proposal-private-methods": "^7.12.1",
         "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
         "@babel/plugin-syntax-async-generators": "^7.8.0",
@@ -1050,14 +1040,14 @@
         "@babel/plugin-transform-reserved-words": "^7.12.1",
         "@babel/plugin-transform-shorthand-properties": "^7.12.1",
         "@babel/plugin-transform-spread": "^7.12.1",
-        "@babel/plugin-transform-sticky-regex": "^7.12.1",
+        "@babel/plugin-transform-sticky-regex": "^7.12.7",
         "@babel/plugin-transform-template-literals": "^7.12.1",
         "@babel/plugin-transform-typeof-symbol": "^7.12.1",
         "@babel/plugin-transform-unicode-escapes": "^7.12.1",
         "@babel/plugin-transform-unicode-regex": "^7.12.1",
         "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.12.1",
-        "core-js-compat": "^3.6.2",
+        "@babel/types": "^7.12.7",
+        "core-js-compat": "^3.7.0",
         "semver": "^5.5.0"
       },
       "dependencies": {
@@ -1081,14 +1071,14 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.12.1.tgz",
-      "integrity": "sha512-euCExymHCi0qB9u5fKw7rvlw7AZSjw/NaB9h7EkdTt5+yHRrXdiRTh7fkG3uBPpJg82CqLfp1LHLqWGSCrab+g==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.12.7.tgz",
+      "integrity": "sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-transform-react-display-name": "^7.12.1",
-        "@babel/plugin-transform-react-jsx": "^7.12.1",
-        "@babel/plugin-transform-react-jsx-development": "^7.12.1",
+        "@babel/plugin-transform-react-jsx": "^7.12.7",
+        "@babel/plugin-transform-react-jsx-development": "^7.12.7",
         "@babel/plugin-transform-react-jsx-self": "^7.12.1",
         "@babel/plugin-transform-react-jsx-source": "^7.12.1",
         "@babel/plugin-transform-react-pure-annotations": "^7.12.1"
@@ -1119,9 +1109,9 @@
       }
     },
     "@babel/runtime-corejs3": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.12.1.tgz",
-      "integrity": "sha512-umhPIcMrlBZ2aTWlWjUseW9LjQKxi1dpFlQS8DzsxB//5K+u6GLTC/JliPKHsd5kJVPIU6X/Hy0YvWOYPcMxBw==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz",
+      "integrity": "sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==",
       "requires": {
         "core-js-pure": "^3.0.0",
         "regenerator-runtime": "^0.13.4"
@@ -1135,35 +1125,35 @@
       }
     },
     "@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
+      "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
       "requires": {
         "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/parser": "^7.12.7",
+        "@babel/types": "^7.12.7"
       }
     },
     "@babel/traverse": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz",
-      "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==",
+      "version": "7.12.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz",
+      "integrity": "sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==",
       "requires": {
         "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.12.1",
+        "@babel/generator": "^7.12.5",
         "@babel/helper-function-name": "^7.10.4",
         "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/parser": "^7.12.1",
-        "@babel/types": "^7.12.1",
+        "@babel/parser": "^7.12.7",
+        "@babel/types": "^7.12.7",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.19"
       }
     },
     "@babel/types": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
-      "integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
+      "version": "7.12.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz",
+      "integrity": "sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==",
       "requires": {
         "@babel/helper-validator-identifier": "^7.10.4",
         "lodash": "^4.17.19",
@@ -1195,9 +1185,9 @@
       "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg=="
     },
     "@eslint/eslintrc": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.0.tgz",
-      "integrity": "sha512-+cIGPCBdLCzqxdtwppswP+zTsH9BOIGzAeKfBIbtb4gW/giMlfMwP0HUSFfhzh20f9u8uZ8hOp62+4GPquTbwQ==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz",
+      "integrity": "sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==",
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -1233,19 +1223,17 @@
           "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
           "requires": {
             "type-fest": "^0.8.1"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.8.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-            }
           }
         },
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
@@ -1278,9 +1266,9 @@
       }
     },
     "@fortawesome/react-fontawesome": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.12.tgz",
-      "integrity": "sha512-kV6HtqotM3K4YIXlTVvomuIi6QgGCvYm++ImyEx2wwgmSppZ6kbbA29ASwjAUBD63j2OFU0yoxeXpZkjrrX0qQ==",
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.13.tgz",
+      "integrity": "sha512-/HrLnIft5Ks2511Pz6TxHBIctC9QalVscAC64sufQ4sJH/sXaQlG3uR9LCu6VpEwkBemgcBLrz/QPNP/ddbjDg==",
       "requires": {
         "prop-types": "^15.7.2"
       }
@@ -1349,15 +1337,15 @@
       "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="
     },
     "@jest/console": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.1.tgz",
-      "integrity": "sha512-cjqcXepwC5M+VeIhwT6Xpi/tT4AiNzlIx8SMJ9IihduHnsSrnWNvTBfKIpmqOOCNOPqtbBx6w2JqfoLOJguo8g==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^26.6.1",
-        "jest-util": "^26.6.1",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
         "slash": "^3.0.0"
       },
       "dependencies": {
@@ -1407,33 +1395,33 @@
       }
     },
     "@jest/core": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.1.tgz",
-      "integrity": "sha512-p4F0pgK3rKnoS9olXXXOkbus1Bsu6fd8pcvLMPsUy4CVXZ8WSeiwQ1lK5hwkCIqJ+amZOYPd778sbPha/S8Srw==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
       "requires": {
-        "@jest/console": "^26.6.1",
-        "@jest/reporters": "^26.6.1",
-        "@jest/test-result": "^26.6.1",
-        "@jest/transform": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.6.1",
-        "jest-config": "^26.6.1",
-        "jest-haste-map": "^26.6.1",
-        "jest-message-util": "^26.6.1",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.1",
-        "jest-resolve-dependencies": "^26.6.1",
-        "jest-runner": "^26.6.1",
-        "jest-runtime": "^26.6.1",
-        "jest-snapshot": "^26.6.1",
-        "jest-util": "^26.6.1",
-        "jest-validate": "^26.6.1",
-        "jest-watcher": "^26.6.1",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
         "micromatch": "^4.0.2",
         "p-each-series": "^2.1.0",
         "rimraf": "^3.0.0",
@@ -1482,15 +1470,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "jest-resolve": {
-          "version": "26.6.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.1.tgz",
-          "integrity": "sha512-hiHfQH6rrcpAmw9xCQ0vD66SDuU+7ZulOuKwc4jpbmFFsz0bQG/Ib92K+9/489u5rVw0btr/ZhiHqBpmkbCvuQ==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+          "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
           "requires": {
-            "@jest/types": "^26.6.1",
+            "@jest/types": "^26.6.2",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^26.6.1",
+            "jest-util": "^26.6.2",
             "read-pkg-up": "^7.0.1",
             "resolve": "^1.18.1",
             "slash": "^3.0.0"
@@ -1522,21 +1510,14 @@
             "find-up": "^4.1.0",
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.8.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-            }
           }
         },
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         },
@@ -1563,53 +1544,58 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
     "@jest/environment": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.1.tgz",
-      "integrity": "sha512-GNvHwkOFJtNgSwdzH9flUPzF9AYAZhUg124CBoQcwcZCM9s5TLz8Y3fMtiaWt4ffbigoetjGk5PU2Dd8nLrSEw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "requires": {
-        "@jest/fake-timers": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.6.1"
+        "jest-mock": "^26.6.2"
       }
     },
     "@jest/fake-timers": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.1.tgz",
-      "integrity": "sha512-T/SkMLgOquenw/nIisBRD6XAYpFir0kNuclYLkse5BpzeDUukyBr+K31xgAo9M0hgjU9ORlekAYPSzc0DKfmKg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "@sinonjs/fake-timers": "^6.0.1",
         "@types/node": "*",
-        "jest-message-util": "^26.6.1",
-        "jest-mock": "^26.6.1",
-        "jest-util": "^26.6.1"
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       }
     },
     "@jest/globals": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.1.tgz",
-      "integrity": "sha512-acxXsSguuLV/CeMYmBseefw6apO7NuXqpE+v5r3yD9ye2PY7h1nS20vY7Obk2w6S7eJO4OIAJeDnoGcLC/McEQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
       "requires": {
-        "@jest/environment": "^26.6.1",
-        "@jest/types": "^26.6.1",
-        "expect": "^26.6.1"
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
       }
     },
     "@jest/reporters": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.1.tgz",
-      "integrity": "sha512-J6OlXVFY3q1SXWJhjme5i7qT/BAZSikdOK2t8Ht5OS32BDo6KfG5CzIzzIFnAVd82/WWbc9Hb7SJ/jwSvVH9YA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^26.6.1",
-        "@jest/test-result": "^26.6.1",
-        "@jest/transform": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
@@ -1620,16 +1606,16 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^26.6.1",
-        "jest-resolve": "^26.6.1",
-        "jest-util": "^26.6.1",
-        "jest-worker": "^26.6.1",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "node-notifier": "^8.0.0",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^6.0.1"
+        "v8-to-istanbul": "^7.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -1673,15 +1659,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "jest-resolve": {
-          "version": "26.6.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.1.tgz",
-          "integrity": "sha512-hiHfQH6rrcpAmw9xCQ0vD66SDuU+7ZulOuKwc4jpbmFFsz0bQG/Ib92K+9/489u5rVw0btr/ZhiHqBpmkbCvuQ==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+          "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
           "requires": {
-            "@jest/types": "^26.6.1",
+            "@jest/types": "^26.6.2",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^26.6.1",
+            "jest-util": "^26.6.2",
             "read-pkg-up": "^7.0.1",
             "resolve": "^1.18.1",
             "slash": "^3.0.0"
@@ -1713,21 +1699,14 @@
             "find-up": "^4.1.0",
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.8.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-            }
           }
         },
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         },
@@ -1738,13 +1717,18 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
     "@jest/source-map": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz",
-      "integrity": "sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
       "requires": {
         "callsites": "^3.0.0",
         "graceful-fs": "^4.2.4",
@@ -1759,26 +1743,26 @@
       }
     },
     "@jest/test-result": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.1.tgz",
-      "integrity": "sha512-wqAgIerIN2gSdT2A8WeA5+AFh9XQBqYGf8etK143yng3qYd0mF0ie2W5PVmgnjw4VDU6ammI9NdXrKgNhreawg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
       "requires": {
-        "@jest/console": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.1.tgz",
-      "integrity": "sha512-0csqA/XApZiNeTIPYh6koIDCACSoR6hi29T61tKJMtCZdEC+tF3PoNt7MS0oK/zKC6daBgCbqXxia5ztr/NyCQ==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
+      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
       "requires": {
-        "@jest/test-result": "^26.6.1",
+        "@jest/test-result": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.6.1",
-        "jest-runner": "^26.6.1",
-        "jest-runtime": "^26.6.1"
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3"
       },
       "dependencies": {
         "graceful-fs": {
@@ -1789,20 +1773,20 @@
       }
     },
     "@jest/transform": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.1.tgz",
-      "integrity": "sha512-oNFAqVtqRxZRx6vXL3I4bPKUK0BIlEeaalkwxyQGGI8oXDQBtYQBpiMe5F7qPs4QdvvFYB42gPGIMMcxXaBBxQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.6.1",
+        "jest-haste-map": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-util": "^26.6.1",
+        "jest-util": "^26.6.2",
         "micromatch": "^4.0.2",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -1861,9 +1845,9 @@
       }
     },
     "@jest/types": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.1.tgz",
-      "integrity": "sha512-ywHavIKNpAVrStiRY5wiyehvcktpijpItvGiK72RAn5ctqmzvPk8OvKnvHeBqa1XdQr959CTWAJMqxI8BTibyg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
@@ -2022,23 +2006,23 @@
       },
       "dependencies": {
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         }
       }
     },
     "@rollup/plugin-replace": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.3.3.tgz",
-      "integrity": "sha512-XPmVXZ7IlaoWaJLkSCDaa0Y6uVo5XQYHhiMFzOd5qSv5rE+t/UJToPIOE56flKIxBFQI27ONsxb7dqHnwSsjKQ==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.3.4.tgz",
+      "integrity": "sha512-waBhMzyAtjCL1GwZes2jaE9MjuQ/DQF2BatH3fRivUF3z0JBFrU0U6iBNC/4WR+2rLKhaAhPWDNPYp4mI6RqdQ==",
       "requires": {
-        "@rollup/pluginutils": "^3.0.8",
-        "magic-string": "^0.25.5"
+        "@rollup/pluginutils": "^3.1.0",
+        "magic-string": "^0.25.7"
       }
     },
     "@rollup/pluginutils": {
@@ -2055,11 +2039,6 @@
           "version": "0.0.39",
           "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
           "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
-        },
-        "picomatch": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
         }
       }
     },
@@ -2080,9 +2059,9 @@
       }
     },
     "@surma/rollup-plugin-off-main-thread": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.1.tgz",
-      "integrity": "sha512-ZPBWYQDdO4JZiTmTP3DABsHhIPA7bEJk9Znk7tZsrbPGanoGo8YxMv//WLx5Cvb+lRgS42+6yiOIYYHCKDmkpQ==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz",
+      "integrity": "sha512-yBMPqmd1yEJo/280PAMkychuaALyQ9Lkb5q1ck3mjJrFuEobIfhnQ4J3mbvBoISmR3SWMWV+cGB/I0lCQee79A==",
       "requires": {
         "ejs": "^2.6.1",
         "magic-string": "^0.25.0"
@@ -2124,14 +2103,14 @@
       "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q=="
     },
     "@svgr/babel-plugin-transform-svg-component": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.4.0.tgz",
-      "integrity": "sha512-zLl4Fl3NvKxxjWNkqEcpdSOpQ3LGVH2BNFQ6vjaK6sFo2IrSznrhURIPI0HAphKiiIwNYjAfE0TNoQDSZv0U9A=="
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
+      "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ=="
     },
     "@svgr/babel-preset": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.4.0.tgz",
-      "integrity": "sha512-Gyx7cCxua04DBtyILTYdQxeO/pwfTBev6+eXTbVbxe4HTGhOUW6yo7PSbG2p6eJMl44j6XSequ0ZDP7bl0nu9A==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
+      "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
       "requires": {
         "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
         "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0",
@@ -2140,52 +2119,52 @@
         "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
         "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
         "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
-        "@svgr/babel-plugin-transform-svg-component": "^5.4.0"
+        "@svgr/babel-plugin-transform-svg-component": "^5.5.0"
       }
     },
     "@svgr/core": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.4.0.tgz",
-      "integrity": "sha512-hWGm1DCCvd4IEn7VgDUHYiC597lUYhFau2lwJBYpQWDirYLkX4OsXu9IslPgJ9UpP7wsw3n2Ffv9sW7SXJVfqQ==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
+      "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
       "requires": {
-        "@svgr/plugin-jsx": "^5.4.0",
-        "camelcase": "^6.0.0",
-        "cosmiconfig": "^6.0.0"
+        "@svgr/plugin-jsx": "^5.5.0",
+        "camelcase": "^6.2.0",
+        "cosmiconfig": "^7.0.0"
       },
       "dependencies": {
         "camelcase": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz",
-          "integrity": "sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ=="
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="
         }
       }
     },
     "@svgr/hast-util-to-babel-ast": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.4.0.tgz",
-      "integrity": "sha512-+U0TZZpPsP2V1WvVhqAOSTk+N+CjYHdZx+x9UBa1eeeZDXwH8pt0CrQf2+SvRl/h2CAPRFkm+Ey96+jKP8Bsgg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
+      "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
       "requires": {
-        "@babel/types": "^7.9.5"
+        "@babel/types": "^7.12.6"
       }
     },
     "@svgr/plugin-jsx": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.4.0.tgz",
-      "integrity": "sha512-SGzO4JZQ2HvGRKDzRga9YFSqOqaNrgLlQVaGvpZ2Iht2gwRp/tq+18Pvv9kS9ZqOMYgyix2LLxZMY1LOe9NPqw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
+      "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
       "requires": {
-        "@babel/core": "^7.7.5",
-        "@svgr/babel-preset": "^5.4.0",
-        "@svgr/hast-util-to-babel-ast": "^5.4.0",
+        "@babel/core": "^7.12.3",
+        "@svgr/babel-preset": "^5.5.0",
+        "@svgr/hast-util-to-babel-ast": "^5.5.0",
         "svg-parser": "^2.0.2"
       }
     },
     "@svgr/plugin-svgo": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.4.0.tgz",
-      "integrity": "sha512-3Cgv3aYi1l6SHyzArV9C36yo4kgwVdF3zPQUC6/aCDUeXAofDYwE5kk3e3oT5ZO2a0N3lB+lLGvipBG6lnG8EA==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
+      "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
       "requires": {
-        "cosmiconfig": "^6.0.0",
-        "merge-deep": "^3.0.2",
+        "cosmiconfig": "^7.0.0",
+        "deepmerge": "^4.2.2",
         "svgo": "^1.2.2"
       }
     },
@@ -2210,9 +2189,9 @@
       "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="
     },
     "@types/babel__core": {
-      "version": "7.1.10",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz",
-      "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==",
+      "version": "7.1.12",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz",
+      "integrity": "sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==",
       "requires": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0",
@@ -2230,18 +2209,18 @@
       }
     },
     "@types/babel__template": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz",
-      "integrity": "sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
+      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
       "requires": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__traverse": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz",
-      "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==",
+      "version": "7.0.16",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.16.tgz",
+      "integrity": "sha512-S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w==",
       "requires": {
         "@babel/types": "^7.3.0"
       }
@@ -2252,9 +2231,9 @@
       "integrity": "sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ=="
     },
     "@types/eslint": {
-      "version": "7.2.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.4.tgz",
-      "integrity": "sha512-YCY4kzHMsHoyKspQH+nwSe+70Kep7Vjt2X+dZe5Vs2vkRudqtoFoUIv1RlJmZB8Hbp7McneupoZij4PadxsK5Q==",
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.5.tgz",
+      "integrity": "sha512-Dc6ar9x16BdaR3NSxSF7T4IjL9gxxViJq8RmFd+2UAyA+K6ck2W+gUwfgpG/y9TPyUuBL35109bbULpEynvltA==",
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -2346,9 +2325,9 @@
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
     },
     "@types/node": {
-      "version": "14.14.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.3.tgz",
-      "integrity": "sha512-33/L34xS7HVUx23e0wOT2V1qPF1IrHgQccdJVm9uXGTB9vFBrrzBtkQymT8VskeKOxjz55MSqMv0xuLq+u98WQ=="
+      "version": "14.14.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz",
+      "integrity": "sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",
@@ -2416,9 +2395,9 @@
       "integrity": "sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="
     },
     "@types/uglify-js": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz",
-      "integrity": "sha512-I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz",
+      "integrity": "sha512-7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==",
       "requires": {
         "source-map": "^0.6.1"
       }
@@ -2429,9 +2408,9 @@
       "integrity": "sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI="
     },
     "@types/webpack": {
-      "version": "4.41.23",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.23.tgz",
-      "integrity": "sha512-ojA4CupZg8RCzVJLugWlvqrHpT59GWhqFxbinlsnvk10MjQCWB+ot7XDACctbWhnhtdhYK7+HOH1JxkVLiZhMg==",
+      "version": "4.41.25",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz",
+      "integrity": "sha512-cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==",
       "requires": {
         "@types/anymatch": "*",
         "@types/node": "*",
@@ -2459,9 +2438,9 @@
       }
     },
     "@types/yargs": {
-      "version": "15.0.9",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz",
-      "integrity": "sha512-HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==",
+      "version": "15.0.10",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.10.tgz",
+      "integrity": "sha512-z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==",
       "requires": {
         "@types/yargs-parser": "*"
       }
@@ -2472,12 +2451,12 @@
       "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.5.0.tgz",
-      "integrity": "sha512-mjb/gwNcmDKNt+6mb7Aj/TjKzIJjOPcoCJpjBQC9ZnTRnBt1p4q5dJSSmIqAtsZ/Pff5N+hJlbiPc5bl6QN4OQ==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.8.2.tgz",
+      "integrity": "sha512-gQ06QLV5l1DtvYtqOyFLXD9PdcILYqlrJj2l+CGDlPtmgLUzc1GpqciJFIRvyfvgLALpnxYINFuw+n9AZhPBKQ==",
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.5.0",
-        "@typescript-eslint/scope-manager": "4.5.0",
+        "@typescript-eslint/experimental-utils": "4.8.2",
+        "@typescript-eslint/scope-manager": "4.8.2",
         "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
@@ -2486,50 +2465,50 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.5.0.tgz",
-      "integrity": "sha512-bW9IpSAKYvkqDGRZzayBXIgPsj2xmmVHLJ+flGSoN0fF98pGoKFhbunIol0VF2Crka7z984EEhFi623Rl7e6gg==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.8.2.tgz",
+      "integrity": "sha512-hpTw6o6IhBZEsQsjuw/4RWmceRyESfAiEzAEnXHKG1X7S5DXFaZ4IO1JO7CW1aQ604leQBzjZmuMI9QBCAJX8Q==",
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/scope-manager": "4.5.0",
-        "@typescript-eslint/types": "4.5.0",
-        "@typescript-eslint/typescript-estree": "4.5.0",
+        "@typescript-eslint/scope-manager": "4.8.2",
+        "@typescript-eslint/types": "4.8.2",
+        "@typescript-eslint/typescript-estree": "4.8.2",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.5.0.tgz",
-      "integrity": "sha512-xb+gmyhQcnDWe+5+xxaQk5iCw6KqXd8VQxGiTeELTMoYeRjpocZYYRP1gFVM2C8Yl0SpUvLa1lhprwqZ00w3Iw==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.8.2.tgz",
+      "integrity": "sha512-u0leyJqmclYr3KcXOqd2fmx6SDGBO0MUNHHAjr0JS4Crbb3C3d8dwAdlazy133PLCcPn+aOUFiHn72wcuc5wYw==",
       "requires": {
-        "@typescript-eslint/scope-manager": "4.5.0",
-        "@typescript-eslint/types": "4.5.0",
-        "@typescript-eslint/typescript-estree": "4.5.0",
+        "@typescript-eslint/scope-manager": "4.8.2",
+        "@typescript-eslint/types": "4.8.2",
+        "@typescript-eslint/typescript-estree": "4.8.2",
         "debug": "^4.1.1"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.5.0.tgz",
-      "integrity": "sha512-C0cEO0cTMPJ/w4RA/KVe4LFFkkSh9VHoFzKmyaaDWAnPYIEzVCtJ+Un8GZoJhcvq+mPFXEsXa01lcZDHDG6Www==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.8.2.tgz",
+      "integrity": "sha512-qHQ8ODi7mMin4Sq2eh/6eu03uVzsf5TX+J43xRmiq8ujng7ViQSHNPLOHGw/Wr5dFEoxq/ubKhzClIIdQy5q3g==",
       "requires": {
-        "@typescript-eslint/types": "4.5.0",
-        "@typescript-eslint/visitor-keys": "4.5.0"
+        "@typescript-eslint/types": "4.8.2",
+        "@typescript-eslint/visitor-keys": "4.8.2"
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.5.0.tgz",
-      "integrity": "sha512-n2uQoXnyWNk0Les9MtF0gCK3JiWd987JQi97dMSxBOzVoLZXCNtxFckVqt1h8xuI1ix01t+iMY4h4rFMj/303g=="
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.8.2.tgz",
+      "integrity": "sha512-z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw=="
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.5.0.tgz",
-      "integrity": "sha512-gN1mffq3zwRAjlYWzb5DanarOPdajQwx5MEWkWCk0XvqC8JpafDTeioDoow2L4CA/RkYZu7xEsGZRhqrTsAG8w==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.2.tgz",
+      "integrity": "sha512-HToGNwI6fekH0dOw3XEVESUm71Onfam0AKin6f26S2FtUmO7o3cLlWgrIaT1q3vjB3wCTdww3Dx2iGq5wtUOCg==",
       "requires": {
-        "@typescript-eslint/types": "4.5.0",
-        "@typescript-eslint/visitor-keys": "4.5.0",
+        "@typescript-eslint/types": "4.8.2",
+        "@typescript-eslint/visitor-keys": "4.8.2",
         "debug": "^4.1.1",
         "globby": "^11.0.1",
         "is-glob": "^4.0.1",
@@ -2539,11 +2518,11 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.5.0.tgz",
-      "integrity": "sha512-UHq4FSa55NDZqscRU//O5ROFhHa9Hqn9KWTEvJGTArtTQp5GKv9Zqf6d/Q3YXXcFv4woyBml7fJQlQ+OuqRcHA==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.2.tgz",
+      "integrity": "sha512-Vg+/SJTMZJEKKGHW7YC21QxgKJrSbxoYYd3MEUGtW7zuytHuEcksewq0DUmo4eh/CTNrVJGSdIY9AtRb6riWFw==",
       "requires": {
-        "@typescript-eslint/types": "4.5.0",
+        "@typescript-eslint/types": "4.8.2",
         "eslint-visitor-keys": "^2.0.0"
       }
     },
@@ -2905,9 +2884,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
-          "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
@@ -2950,33 +2929,15 @@
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
     },
     "array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz",
+      "integrity": "sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
+        "es-abstract": "^1.18.0-next.1",
+        "get-intrinsic": "^1.0.1",
         "is-string": "^1.0.5"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
       }
     },
     "array-union": {
@@ -2995,62 +2956,24 @@
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
     },
     "array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
+      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
+        "es-abstract": "^1.18.0-next.1"
       }
     },
     "array.prototype.flatmap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz",
-      "integrity": "sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz",
+      "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
+        "es-abstract": "^1.18.0-next.1",
         "function-bind": "^1.1.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
       }
     },
     "arrify": {
@@ -3164,7 +3087,7 @@
     },
     "asynckit": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "resolved": false,
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "at-least-node": {
@@ -3202,9 +3125,9 @@
       "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="
     },
     "axe-core": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.0.2.tgz",
-      "integrity": "sha512-arU1h31OGFu+LPrOLGZ7nB45v940NMDMEJeNmbutu57P+UFDVnkZg3e+J1I2HJRZ9hT7gO8J91dn/PMrAiKakA=="
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.1.1.tgz",
+      "integrity": "sha512-5Kgy8Cz6LPC9DJcNb3yjAXTu3XihQgEdnIg50c//zOC/MyLP0Clg+Y8Sh9ZjjnvBrDZU4DgXS9C3T9r4/scGZQ=="
     },
     "axobject-query": {
       "version": "2.2.0",
@@ -3240,15 +3163,15 @@
       }
     },
     "babel-jest": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.1.tgz",
-      "integrity": "sha512-duMWEOKrSBYRVTTNpL2SipNIWnZOjP77auOBMPQ3zXAdnDbyZQWU8r/RxNWpUf9N6cgPFecQYelYLytTVXVDtA==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
+      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
       "requires": {
-        "@jest/transform": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/babel__core": "^7.1.7",
         "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^26.5.0",
+        "babel-preset-jest": "^26.6.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
@@ -3357,9 +3280,9 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz",
-      "integrity": "sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
       "requires": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -3375,6 +3298,20 @@
         "@babel/runtime": "^7.7.2",
         "cosmiconfig": "^6.0.0",
         "resolve": "^1.12.0"
+      },
+      "dependencies": {
+        "cosmiconfig": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+          "requires": {
+            "@types/parse-json": "^4.0.0",
+            "import-fresh": "^3.1.0",
+            "parse-json": "^5.0.0",
+            "path-type": "^4.0.0",
+            "yaml": "^1.7.2"
+          }
+        }
       }
     },
     "babel-plugin-named-asset-import": {
@@ -3402,9 +3339,9 @@
       "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
     },
     "babel-preset-current-node-syntax": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz",
-      "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz",
+      "integrity": "sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q==",
       "requires": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
@@ -3416,16 +3353,17 @@
         "@babel/plugin-syntax-numeric-separator": "^7.8.3",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
       }
     },
     "babel-preset-jest": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz",
-      "integrity": "sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
       "requires": {
-        "babel-plugin-jest-hoist": "^26.5.0",
-        "babel-preset-current-node-syntax": "^0.1.3"
+        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
     "babel-preset-react-app": {
@@ -3450,6 +3388,112 @@
         "babel-plugin-transform-react-remove-prop-types": "0.4.24"
       },
       "dependencies": {
+        "@babel/plugin-proposal-numeric-separator": {
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz",
+          "integrity": "sha512-MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==",
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.10.4",
+            "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+          }
+        },
+        "@babel/plugin-proposal-optional-chaining": {
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz",
+          "integrity": "sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==",
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.10.4",
+            "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+            "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+          }
+        },
+        "@babel/preset-env": {
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz",
+          "integrity": "sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==",
+          "requires": {
+            "@babel/compat-data": "^7.12.1",
+            "@babel/helper-compilation-targets": "^7.12.1",
+            "@babel/helper-module-imports": "^7.12.1",
+            "@babel/helper-plugin-utils": "^7.10.4",
+            "@babel/helper-validator-option": "^7.12.1",
+            "@babel/plugin-proposal-async-generator-functions": "^7.12.1",
+            "@babel/plugin-proposal-class-properties": "^7.12.1",
+            "@babel/plugin-proposal-dynamic-import": "^7.12.1",
+            "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
+            "@babel/plugin-proposal-json-strings": "^7.12.1",
+            "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
+            "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+            "@babel/plugin-proposal-numeric-separator": "^7.12.1",
+            "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+            "@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
+            "@babel/plugin-proposal-optional-chaining": "^7.12.1",
+            "@babel/plugin-proposal-private-methods": "^7.12.1",
+            "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
+            "@babel/plugin-syntax-async-generators": "^7.8.0",
+            "@babel/plugin-syntax-class-properties": "^7.12.1",
+            "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+            "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+            "@babel/plugin-syntax-json-strings": "^7.8.0",
+            "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+            "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+            "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+            "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+            "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
+            "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+            "@babel/plugin-syntax-top-level-await": "^7.12.1",
+            "@babel/plugin-transform-arrow-functions": "^7.12.1",
+            "@babel/plugin-transform-async-to-generator": "^7.12.1",
+            "@babel/plugin-transform-block-scoped-functions": "^7.12.1",
+            "@babel/plugin-transform-block-scoping": "^7.12.1",
+            "@babel/plugin-transform-classes": "^7.12.1",
+            "@babel/plugin-transform-computed-properties": "^7.12.1",
+            "@babel/plugin-transform-destructuring": "^7.12.1",
+            "@babel/plugin-transform-dotall-regex": "^7.12.1",
+            "@babel/plugin-transform-duplicate-keys": "^7.12.1",
+            "@babel/plugin-transform-exponentiation-operator": "^7.12.1",
+            "@babel/plugin-transform-for-of": "^7.12.1",
+            "@babel/plugin-transform-function-name": "^7.12.1",
+            "@babel/plugin-transform-literals": "^7.12.1",
+            "@babel/plugin-transform-member-expression-literals": "^7.12.1",
+            "@babel/plugin-transform-modules-amd": "^7.12.1",
+            "@babel/plugin-transform-modules-commonjs": "^7.12.1",
+            "@babel/plugin-transform-modules-systemjs": "^7.12.1",
+            "@babel/plugin-transform-modules-umd": "^7.12.1",
+            "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1",
+            "@babel/plugin-transform-new-target": "^7.12.1",
+            "@babel/plugin-transform-object-super": "^7.12.1",
+            "@babel/plugin-transform-parameters": "^7.12.1",
+            "@babel/plugin-transform-property-literals": "^7.12.1",
+            "@babel/plugin-transform-regenerator": "^7.12.1",
+            "@babel/plugin-transform-reserved-words": "^7.12.1",
+            "@babel/plugin-transform-shorthand-properties": "^7.12.1",
+            "@babel/plugin-transform-spread": "^7.12.1",
+            "@babel/plugin-transform-sticky-regex": "^7.12.1",
+            "@babel/plugin-transform-template-literals": "^7.12.1",
+            "@babel/plugin-transform-typeof-symbol": "^7.12.1",
+            "@babel/plugin-transform-unicode-escapes": "^7.12.1",
+            "@babel/plugin-transform-unicode-regex": "^7.12.1",
+            "@babel/preset-modules": "^0.1.3",
+            "@babel/types": "^7.12.1",
+            "core-js-compat": "^3.6.2",
+            "semver": "^5.5.0"
+          }
+        },
+        "@babel/preset-react": {
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.12.1.tgz",
+          "integrity": "sha512-euCExymHCi0qB9u5fKw7rvlw7AZSjw/NaB9h7EkdTt5+yHRrXdiRTh7fkG3uBPpJg82CqLfp1LHLqWGSCrab+g==",
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.10.4",
+            "@babel/plugin-transform-react-display-name": "^7.12.1",
+            "@babel/plugin-transform-react-jsx": "^7.12.1",
+            "@babel/plugin-transform-react-jsx-development": "^7.12.1",
+            "@babel/plugin-transform-react-jsx-self": "^7.12.1",
+            "@babel/plugin-transform-react-jsx-source": "^7.12.1",
+            "@babel/plugin-transform-react-pure-annotations": "^7.12.1"
+          }
+        },
         "@babel/runtime": {
           "version": "7.12.1",
           "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
@@ -3462,6 +3506,11 @@
           "version": "0.13.7",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
           "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -3531,11 +3580,6 @@
             "is-data-descriptor": "^1.0.0",
             "kind-of": "^6.0.2"
           }
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -3545,9 +3589,9 @@
       "integrity": "sha1-4pf2DX7BAUp6lxo568ipjAtoHnA="
     },
     "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "batch": {
       "version": "0.6.1",
@@ -3579,9 +3623,9 @@
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
     "binary-extensions": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="
     },
     "block-stream": {
       "version": "0.0.9",
@@ -3728,19 +3772,12 @@
       }
     },
     "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
       "requires": {
-        "bn.js": "^4.1.0",
+        "bn.js": "^5.0.0",
         "randombytes": "^2.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
-        }
       }
     },
     "browserify-sign": {
@@ -3785,14 +3822,15 @@
       }
     },
     "browserslist": {
-      "version": "4.14.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
-      "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
+      "version": "4.14.7",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz",
+      "integrity": "sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==",
       "requires": {
-        "caniuse-lite": "^1.0.30001135",
-        "electron-to-chromium": "^1.3.571",
-        "escalade": "^3.1.0",
-        "node-releases": "^1.1.61"
+        "caniuse-lite": "^1.0.30001157",
+        "colorette": "^1.2.1",
+        "electron-to-chromium": "^1.3.591",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.66"
       }
     },
     "bser": {
@@ -3829,11 +3867,11 @@
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
     },
     "bufferutil": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.1.tgz",
-      "integrity": "sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.2.tgz",
+      "integrity": "sha512-AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA==",
       "requires": {
-        "node-gyp-build": "~3.7.0"
+        "node-gyp-build": "^4.2.0"
       }
     },
     "builtin-modules": {
@@ -3928,6 +3966,15 @@
         "ylru": "^1.2.0"
       }
     },
+    "call-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz",
+      "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.0"
+      }
+    },
     "caller-callsite": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -3998,9 +4045,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001151",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001151.tgz",
-      "integrity": "sha512-Zh3sHqskX6mHNrqUerh+fkf0N72cMxrmflzje/JyVImfpknscMnkeJrlFGJcqTmaa0iszdYptGpWMJCRQDkBVw=="
+      "version": "1.0.30001161",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz",
+      "integrity": "sha512-JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g=="
     },
     "canvas": {
       "version": "2.6.1",
@@ -4059,11 +4106,6 @@
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
     },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
-    },
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
@@ -4088,6 +4130,14 @@
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
         "readdirp": "~3.5.0"
+      },
+      "dependencies": {
+        "fsevents": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+          "optional": true
+        }
       }
     },
     "chownr": {
@@ -4118,9 +4168,9 @@
       }
     },
     "cjs-module-lexer": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.4.3.tgz",
-      "integrity": "sha512-5RLK0Qfs0PNDpEyBXIr3bIT1Muw3ojSlvpw6dAmkUcO0+uTrsBn7GuEIgx40u+OzbCBLDta7nvmud85P4EmTsQ=="
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw=="
     },
     "class-utils": {
       "version": "0.3.6",
@@ -4161,19 +4211,6 @@
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
     },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="
-    },
     "cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -4207,15 +4244,13 @@
       }
     },
     "clone-deep": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-      "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "requires": {
-        "for-own": "^0.1.3",
-        "is-plain-object": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "lazy-cache": "^1.0.3",
-        "shallow-clone": "^0.1.2"
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
       }
     },
     "co": {
@@ -4483,11 +4518,11 @@
       "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="
     },
     "core-js-compat": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.0.tgz",
+      "integrity": "sha512-o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ==",
       "requires": {
-        "browserslist": "^4.8.5",
+        "browserslist": "^4.14.7",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -4499,25 +4534,25 @@
       }
     },
     "core-js-pure": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz",
-      "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA=="
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.8.0.tgz",
+      "integrity": "sha512-fRjhg3NeouotRoIV0L1FdchA6CK7ZD+lyINyMoz19SyV+ROpC4noS1xItWHFtwZdlqfMfVPJEyEGdfri2bD1pA=="
     },
     "core-util-is": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "resolved": false,
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
       "requires": {
         "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
+        "import-fresh": "^3.2.1",
         "parse-json": "^5.0.0",
         "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
+        "yaml": "^1.10.0"
       }
     },
     "create-ecdh": {
@@ -4682,9 +4717,9 @@
       },
       "dependencies": {
         "camelcase": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz",
-          "integrity": "sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ=="
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="
         }
       }
     },
@@ -4844,26 +4879,26 @@
       "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="
     },
     "csso": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
-      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
       "requires": {
-        "css-tree": "1.0.0-alpha.39"
+        "css-tree": "^1.1.2"
       },
       "dependencies": {
         "css-tree": {
-          "version": "1.0.0-alpha.39",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
-          "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz",
+          "integrity": "sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==",
           "requires": {
-            "mdn-data": "2.0.6",
+            "mdn-data": "2.0.14",
             "source-map": "^0.6.1"
           }
         },
         "mdn-data": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
-          "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="
+          "version": "2.0.14",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
         }
       }
     },
@@ -5146,11 +5181,6 @@
             "is-data-descriptor": "^1.0.0",
             "kind-of": "^6.0.2"
           }
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -5204,7 +5234,7 @@
     },
     "delayed-stream": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "resolved": false,
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
@@ -5276,9 +5306,9 @@
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
     },
     "diff-sequences": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
-      "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q=="
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q=="
     },
     "diffie-hellman": {
       "version": "5.0.3",
@@ -5498,9 +5528,9 @@
       "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="
     },
     "electron-to-chromium": {
-      "version": "1.3.583",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.583.tgz",
-      "integrity": "sha512-L9BwLwJohjZW9mQESI79HRzhicPk1DFgM+8hOCfGgGCFEcA3Otpv7QK6SGtYoZvfQfE3wKLh0Hd5ptqUFv3gvQ=="
+      "version": "1.3.610",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz",
+      "integrity": "sha512-eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g=="
     },
     "elliptic": {
       "version": "6.5.3",
@@ -5545,7 +5575,7 @@
     },
     "encoding": {
       "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "resolved": false,
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "requires": {
         "iconv-lite": "~0.4.13"
@@ -5745,12 +5775,12 @@
       }
     },
     "eslint": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.12.0.tgz",
-      "integrity": "sha512-n5pEU27DRxCSlOhJ2rO57GDLcNsxO0LPpAbpFdh7xmcDmjmlGUfoyrsB3I7yYdQXO5N3gkSTiDrPSPNFiiirXA==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz",
+      "integrity": "sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@eslint/eslintrc": "^0.2.0",
+        "@eslint/eslintrc": "^0.2.1",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -5834,13 +5864,6 @@
           "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
           "requires": {
             "type-fest": "^0.8.1"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.8.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-            }
           }
         },
         "has-flag": {
@@ -5887,6 +5910,11 @@
             "has-flag": "^4.0.0"
           }
         },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+        },
         "which": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -5928,11 +5956,11 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         }
@@ -6060,28 +6088,28 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         }
       }
     },
     "eslint-plugin-jest": {
-      "version": "24.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.1.0.tgz",
-      "integrity": "sha512-827YJ+E8B9PvXu/0eiVSNFfxxndbKv+qE/3GSMhdorCaeaOehtqHGX2YDW9B85TEOre9n/zscledkFW/KbnyGg==",
+      "version": "24.1.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.1.3.tgz",
+      "integrity": "sha512-dNGGjzuEzCE3d5EPZQ/QGtmlMotqnYWD/QpCZ1UuZlrMAdhG5rldh0N0haCvhGnUkSeuORS5VNROwF9Hrgn3Lg==",
       "requires": {
         "@typescript-eslint/experimental-utils": "^4.0.1"
       }
     },
     "eslint-plugin-jsx-a11y": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.0.tgz",
-      "integrity": "sha512-zxAMaDw56XO4rg1nTbjGR/lXFamHNcaBLOhxklZdPNMO0yEfI7czmNi7j7CNU/rg8vLMQP6V+SpJaksITq5UIA==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz",
+      "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
       "requires": {
         "@babel/runtime": "^7.11.2",
         "aria-query": "^4.2.2",
@@ -6092,14 +6120,14 @@
         "damerau-levenshtein": "^1.0.6",
         "emoji-regex": "^9.0.0",
         "has": "^1.0.3",
-        "jsx-ast-utils": "^3.0.0",
+        "jsx-ast-utils": "^3.1.0",
         "language-tags": "^1.0.5"
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
-          "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
@@ -6143,11 +6171,11 @@
           }
         },
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         }
@@ -6159,9 +6187,9 @@
       "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ=="
     },
     "eslint-plugin-testing-library": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.9.2.tgz",
-      "integrity": "sha512-79oWT8dIPerbm4fdZj/QkeKB43P3XgSNbBWLnBi+Li0n+CFEvW078Q962VWeXXqHHofuXJeVOXg7grjiw849BQ==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.10.1.tgz",
+      "integrity": "sha512-nQIFe2muIFv2oR2zIuXE4vTbcFNx8hZKRzgHZqJg8rfopIWwoTwtlbCCNELT/jXzVe1uZF68ALGYoDXjLczKiQ==",
       "requires": {
         "@typescript-eslint/experimental-utils": "^3.10.1"
       },
@@ -6243,15 +6271,43 @@
       "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="
     },
     "eslint-webpack-plugin": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-2.1.0.tgz",
-      "integrity": "sha512-WZT1uoJXSwtEJTkS+81XBERFJzNh0xoZn8fUtQNQWri7++UiYaLJjxJTmwEEyI58NJ536upq9tjN9i3jMwkWQg==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-2.4.0.tgz",
+      "integrity": "sha512-j0lAJj3RnStAFdIH2P0+nsEImiBijwogZhL1go4bI6DE+9OhQuOmJ/xtmxkLtNr1w0cf5SRNkDlmIe8t/pHgww==",
       "requires": {
-        "@types/eslint": "^7.2.0",
+        "@types/eslint": "^7.2.4",
         "arrify": "^2.0.1",
-        "fs-extra": "^9.0.1",
+        "jest-worker": "^26.6.2",
         "micromatch": "^4.0.2",
-        "schema-utils": "^2.7.0"
+        "schema-utils": "^3.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+        },
+        "schema-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "requires": {
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        }
       }
     },
     "espree": {
@@ -6423,15 +6479,15 @@
       }
     },
     "expect": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.1.tgz",
-      "integrity": "sha512-BRfxIBHagghMmr1D2MRY0Qv5d3Nc8HCqgbDwNXw/9izmM5eBb42a2YjLKSbsqle76ozGkAEPELQX4IdNHAKRNA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "ansi-styles": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.6.1",
-        "jest-message-util": "^26.6.1",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0"
       },
       "dependencies": {
@@ -6564,16 +6620,6 @@
         }
       }
     },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -6630,11 +6676,6 @@
             "is-data-descriptor": "^1.0.0",
             "kind-of": "^6.0.2"
           }
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -6682,9 +6723,9 @@
       "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="
     },
     "fastq": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz",
+      "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==",
       "requires": {
         "reusify": "^1.0.4"
       }
@@ -6747,14 +6788,6 @@
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
       "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="
     },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
     "file-entry-cache": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -6801,9 +6834,9 @@
       }
     },
     "file-saver": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.2.tgz",
-      "integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
     },
     "filesize": {
       "version": "6.1.0",
@@ -6921,14 +6954,6 @@
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
     },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "requires": {
-        "for-in": "^1.0.1"
-      }
-    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -7014,11 +7039,6 @@
             }
           }
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -7133,9 +7153,9 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
-      "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz",
+      "integrity": "sha512-bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA==",
       "optional": true
     },
     "fstream": {
@@ -7229,9 +7249,9 @@
       }
     },
     "gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
     },
     "get-caller-file": {
       "version": "2.0.5",
@@ -7244,6 +7264,16 @@
       "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
       "dev": true
     },
+    "get-intrinsic": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz",
+      "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
     "get-own-enumerable-property-symbols": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
@@ -7294,9 +7324,9 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-      "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -7317,13 +7347,6 @@
         "ini": "^1.3.5",
         "kind-of": "^6.0.2",
         "which": "^1.3.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        }
       }
     },
     "globals": {
@@ -7849,11 +7872,6 @@
             }
           }
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -7930,9 +7948,9 @@
       }
     },
     "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
     "iferr": {
       "version": "0.1.5",
@@ -7971,9 +7989,9 @@
       }
     },
     "import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz",
+      "integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==",
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -8057,99 +8075,6 @@
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
-    "inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.19",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "internal-ip": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
@@ -8223,6 +8148,16 @@
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "requires": {
         "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
     "is-arguments": {
@@ -8275,9 +8210,9 @@
       }
     },
     "is-core-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz",
-      "integrity": "sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -8288,6 +8223,16 @@
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "requires": {
         "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
     "is-date-object": {
@@ -8676,21 +8621,21 @@
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
         "jest-cli": {
-          "version": "26.6.1",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.1.tgz",
-          "integrity": "sha512-aPLoEjlwFrCWhiPpW5NUxQA1X1kWsAnQcQ0SO/fHsCvczL3W75iVAcH9kP6NN+BNqZcHNEvkhxT5cDmBfEAh+w==",
+          "version": "26.6.3",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+          "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
           "requires": {
-            "@jest/core": "^26.6.1",
-            "@jest/test-result": "^26.6.1",
-            "@jest/types": "^26.6.1",
+            "@jest/core": "^26.6.3",
+            "@jest/test-result": "^26.6.2",
+            "@jest/types": "^26.6.2",
             "chalk": "^4.0.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.4",
             "import-local": "^3.0.2",
             "is-ci": "^2.0.0",
-            "jest-config": "^26.6.1",
-            "jest-util": "^26.6.1",
-            "jest-validate": "^26.6.1",
+            "jest-config": "^26.6.3",
+            "jest-util": "^26.6.2",
+            "jest-validate": "^26.6.2",
             "prompts": "^2.0.1",
             "yargs": "^15.4.1"
           }
@@ -8761,11 +8706,11 @@
       }
     },
     "jest-changed-files": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.1.tgz",
-      "integrity": "sha512-NhSdZ5F6b/rIN5V46x1l31vrmukD/bJUXgYAY8VtP1SknYdJwjYDRxuLt7Z8QryIdqCjMIn2C0Cd98EZ4umo8Q==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "execa": "^4.0.0",
         "throat": "^5.0.0"
       },
@@ -8781,9 +8726,9 @@
           }
         },
         "execa": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz",
-          "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
           "requires": {
             "cross-spawn": "^7.0.0",
             "get-stream": "^5.0.0",
@@ -8919,28 +8864,28 @@
       }
     },
     "jest-config": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.1.tgz",
-      "integrity": "sha512-mtJzIynIwW1d1nMlKCNCQiSgWaqFn8cH/fOSNY97xG7Y9tBCZbCSuW2GTX0RPmceSJGO7l27JgwC18LEg0Vg+g==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.6.1",
-        "@jest/types": "^26.6.1",
-        "babel-jest": "^26.6.1",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
         "chalk": "^4.0.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.6.1",
-        "jest-environment-node": "^26.6.1",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.6.1",
+        "jest-jasmine2": "^26.6.3",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.1",
-        "jest-util": "^26.6.1",
-        "jest-validate": "^26.6.1",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "micromatch": "^4.0.2",
-        "pretty-format": "^26.6.1"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8984,15 +8929,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "jest-resolve": {
-          "version": "26.6.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.1.tgz",
-          "integrity": "sha512-hiHfQH6rrcpAmw9xCQ0vD66SDuU+7ZulOuKwc4jpbmFFsz0bQG/Ib92K+9/489u5rVw0btr/ZhiHqBpmkbCvuQ==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+          "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
           "requires": {
-            "@jest/types": "^26.6.1",
+            "@jest/types": "^26.6.2",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^26.6.1",
+            "jest-util": "^26.6.2",
             "read-pkg-up": "^7.0.1",
             "resolve": "^1.18.1",
             "slash": "^3.0.0"
@@ -9024,21 +8969,14 @@
             "find-up": "^4.1.0",
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.8.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-            }
           }
         },
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         },
@@ -9049,18 +8987,23 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
     "jest-diff": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.1.tgz",
-      "integrity": "sha512-BBNy/zin2m4kG5In126O8chOBxLLS/XMTuuM2+YhgyHk87ewPzKTuTJcqj3lOWOi03NNgrl+DkMeV/exdvG9gg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "requires": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^26.5.0",
+        "diff-sequences": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.1"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -9117,15 +9060,15 @@
       }
     },
     "jest-each": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.1.tgz",
-      "integrity": "sha512-gSn8eB3buchuq45SU7pLB7qmCGax1ZSxfaWuEFblCyNMtyokYaKFh9dRhYPujK6xYL57dLIPhLKatjmB5XWzGA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-util": "^26.6.1",
-        "pretty-format": "^26.6.1"
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -9174,30 +9117,30 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.1.tgz",
-      "integrity": "sha512-A17RiXuHYNVlkM+3QNcQ6n5EZyAc6eld8ra9TW26luounGWpku4tj03uqRgHJCI1d4uHr5rJiuCH5JFRtdmrcA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
       "requires": {
-        "@jest/environment": "^26.6.1",
-        "@jest/fake-timers": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.6.1",
-        "jest-util": "^26.6.1",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
         "jsdom": "^16.4.0"
       }
     },
     "jest-environment-node": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.1.tgz",
-      "integrity": "sha512-YffaCp6h0j1kbcf1NVZ7umC6CPgD67YS+G1BeornfuSkx5s3xdhuwG0DCxSiHPXyT81FfJzA1L7nXvhq50OWIg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
       "requires": {
-        "@jest/environment": "^26.6.1",
-        "@jest/fake-timers": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.6.1",
-        "jest-util": "^26.6.1"
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       }
     },
     "jest-get-type": {
@@ -9206,11 +9149,11 @@
       "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
     },
     "jest-haste-map": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.1.tgz",
-      "integrity": "sha512-9kPafkv0nX6ta1PrshnkiyhhoQoFWncrU/uUBt3/AP1r78WSCU5iLceYRTwDvJl67H3RrXqSlSVDDa/AsUB7OQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
@@ -9218,9 +9161,9 @@
         "fsevents": "^2.1.2",
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.5.0",
-        "jest-util": "^26.6.1",
-        "jest-worker": "^26.6.1",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "micromatch": "^4.0.2",
         "sane": "^4.0.3",
         "walker": "^1.0.7"
@@ -9234,27 +9177,27 @@
       }
     },
     "jest-jasmine2": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.1.tgz",
-      "integrity": "sha512-2uYdT32o/ZzSxYAPduAgokO8OlAL1YdG/9oxcEY138EDNpIK5XRRJDaGzTZdIBWSxk0aR8XxN44FvfXtHB+Fiw==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.6.1",
-        "@jest/source-map": "^26.5.0",
-        "@jest/test-result": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^26.6.1",
+        "expect": "^26.6.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.6.1",
-        "jest-matcher-utils": "^26.6.1",
-        "jest-message-util": "^26.6.1",
-        "jest-runtime": "^26.6.1",
-        "jest-snapshot": "^26.6.1",
-        "jest-util": "^26.6.1",
-        "pretty-format": "^26.6.1",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
         "throat": "^5.0.0"
       },
       "dependencies": {
@@ -9304,23 +9247,23 @@
       }
     },
     "jest-leak-detector": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.1.tgz",
-      "integrity": "sha512-j9ZOtJSJKlHjrs4aIxWjiQUjyrffPdiAQn2Iw0916w7qZE5Lk0T2KhIH6E9vfhzP6sw0Q0jtnLLb4vQ71o1HlA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
       "requires": {
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.1"
+        "pretty-format": "^26.6.2"
       }
     },
     "jest-matcher-utils": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.1.tgz",
-      "integrity": "sha512-9iu3zrsYlUnl8pByhREF9rr5eYoiEb1F7ymNKg6lJr/0qD37LWS5FSW/JcoDl8UdMX2+zAzabDs7sTO+QFKjCg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^26.6.1",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.1"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -9369,16 +9312,17 @@
       }
     },
     "jest-message-util": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.1.tgz",
-      "integrity": "sha512-cqM4HnqncIebBNdTKrBoWR/4ufHTll0pK/FWwX0YasK+TlBQEMqw3IEdynuuOTjDPFO3ONlFn37280X48beByw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.2"
       },
@@ -9434,11 +9378,11 @@
       }
     },
     "jest-mock": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.1.tgz",
-      "integrity": "sha512-my0lPTBu1awY8iVG62sB2sx9qf8zxNDVX+5aFgoB8Vbqjb6LqIOsfyFA8P1z6H2IsqMbvOX9oCJnK67Y3yUIMA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "@types/node": "*"
       }
     },
@@ -9533,21 +9477,14 @@
             "find-up": "^4.1.0",
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.8.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-            }
           }
         },
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         },
@@ -9558,42 +9495,47 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
     "jest-resolve-dependencies": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.1.tgz",
-      "integrity": "sha512-MN6lufbZJ3RBfTnJesZtHu3hUCBqPdHRe2+FhIt0yiqJ3fMgzWRqMRQyN/d/QwOE7KXwAG2ekZutbPhuD7s51A==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.6.1"
+        "jest-snapshot": "^26.6.2"
       }
     },
     "jest-runner": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.1.tgz",
-      "integrity": "sha512-DmpNGdgsbl5s0FGkmsInmqnmqCtliCSnjWA2TFAJS1m1mL5atwfPsf+uoZ8uYQ2X0uDj4NM+nPcDnUpbNTRMBA==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
       "requires": {
-        "@jest/console": "^26.6.1",
-        "@jest/environment": "^26.6.1",
-        "@jest/test-result": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.7.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.1",
+        "jest-config": "^26.6.3",
         "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.6.1",
-        "jest-leak-detector": "^26.6.1",
-        "jest-message-util": "^26.6.1",
-        "jest-resolve": "^26.6.1",
-        "jest-runtime": "^26.6.1",
-        "jest-util": "^26.6.1",
-        "jest-worker": "^26.6.1",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "source-map-support": "^0.5.6",
         "throat": "^5.0.0"
       },
@@ -9639,15 +9581,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "jest-resolve": {
-          "version": "26.6.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.1.tgz",
-          "integrity": "sha512-hiHfQH6rrcpAmw9xCQ0vD66SDuU+7ZulOuKwc4jpbmFFsz0bQG/Ib92K+9/489u5rVw0btr/ZhiHqBpmkbCvuQ==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+          "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
           "requires": {
-            "@jest/types": "^26.6.1",
+            "@jest/types": "^26.6.2",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^26.6.1",
+            "jest-util": "^26.6.2",
             "read-pkg-up": "^7.0.1",
             "resolve": "^1.18.1",
             "slash": "^3.0.0"
@@ -9679,21 +9621,14 @@
             "find-up": "^4.1.0",
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.8.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-            }
           }
         },
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         },
@@ -9704,38 +9639,43 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
     "jest-runtime": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.1.tgz",
-      "integrity": "sha512-7uOCNeezXDWgjEyzYbRN2ViY7xNZzusNVGAMmU0UHRUNXuY4j4GBHKGMqPo/cBPZA9bSYp+lwK2DRRBU5Dv6YQ==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
       "requires": {
-        "@jest/console": "^26.6.1",
-        "@jest/environment": "^26.6.1",
-        "@jest/fake-timers": "^26.6.1",
-        "@jest/globals": "^26.6.1",
-        "@jest/source-map": "^26.5.0",
-        "@jest/test-result": "^26.6.1",
-        "@jest/transform": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0",
-        "cjs-module-lexer": "^0.4.2",
+        "cjs-module-lexer": "^0.6.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.6.1",
-        "jest-haste-map": "^26.6.1",
-        "jest-message-util": "^26.6.1",
-        "jest-mock": "^26.6.1",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.1",
-        "jest-snapshot": "^26.6.1",
-        "jest-util": "^26.6.1",
-        "jest-validate": "^26.6.1",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
         "yargs": "^15.4.1"
@@ -9802,15 +9742,15 @@
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
         "jest-resolve": {
-          "version": "26.6.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.1.tgz",
-          "integrity": "sha512-hiHfQH6rrcpAmw9xCQ0vD66SDuU+7ZulOuKwc4jpbmFFsz0bQG/Ib92K+9/489u5rVw0btr/ZhiHqBpmkbCvuQ==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+          "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
           "requires": {
-            "@jest/types": "^26.6.1",
+            "@jest/types": "^26.6.2",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^26.6.1",
+            "jest-util": "^26.6.2",
             "read-pkg-up": "^7.0.1",
             "resolve": "^1.18.1",
             "slash": "^3.0.0"
@@ -9842,21 +9782,14 @@
             "find-up": "^4.1.0",
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.8.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-            }
           }
         },
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         },
@@ -9891,6 +9824,11 @@
             "has-flag": "^4.0.0"
           }
         },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+        },
         "wrap-ansi": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -9931,9 +9869,9 @@
       }
     },
     "jest-serializer": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz",
-      "integrity": "sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
       "requires": {
         "@types/node": "*",
         "graceful-fs": "^4.2.4"
@@ -9947,25 +9885,25 @@
       }
     },
     "jest-snapshot": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.1.tgz",
-      "integrity": "sha512-JA7bZp7HRTIJYAi85pJ/OZ2eur2dqmwIToA5/6d7Mn90isGEfeF9FvuhDLLEczgKP1ihreBzrJ6Vr7zteP5JNA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
       "requires": {
         "@babel/types": "^7.0.0",
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.0.0",
         "chalk": "^4.0.0",
-        "expect": "^26.6.1",
+        "expect": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.6.1",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.6.1",
-        "jest-matcher-utils": "^26.6.1",
-        "jest-message-util": "^26.6.1",
-        "jest-resolve": "^26.6.1",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^26.6.1",
+        "pretty-format": "^26.6.2",
         "semver": "^7.3.2"
       },
       "dependencies": {
@@ -10010,15 +9948,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "jest-resolve": {
-          "version": "26.6.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.1.tgz",
-          "integrity": "sha512-hiHfQH6rrcpAmw9xCQ0vD66SDuU+7ZulOuKwc4jpbmFFsz0bQG/Ib92K+9/489u5rVw0btr/ZhiHqBpmkbCvuQ==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+          "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
           "requires": {
-            "@jest/types": "^26.6.1",
+            "@jest/types": "^26.6.2",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^26.6.1",
+            "jest-util": "^26.6.2",
             "read-pkg-up": "^7.0.1",
             "resolve": "^1.18.1",
             "slash": "^3.0.0"
@@ -10050,21 +9988,14 @@
             "find-up": "^4.1.0",
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.8.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-            }
           }
         },
         "resolve": {
-          "version": "1.18.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
           "requires": {
-            "is-core-module": "^2.0.0",
+            "is-core-module": "^2.1.0",
             "path-parse": "^1.0.6"
           }
         },
@@ -10075,15 +10006,20 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
         }
       }
     },
     "jest-util": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.1.tgz",
-      "integrity": "sha512-xCLZUqVoqhquyPLuDXmH7ogceGctbW8SMyQVjD9o+1+NPWI7t0vO08udcFLVPLgKWcvc+zotaUv/RuaR6l8HIA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
@@ -10142,16 +10078,16 @@
       }
     },
     "jest-validate": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.1.tgz",
-      "integrity": "sha512-BEFpGbylKocnNPZULcnk+TGaz1oFZQH/wcaXlaXABbu0zBwkOGczuWgdLucUouuQqn7VadHZZeTvo8VSFDLMOA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "camelcase": "^6.0.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
         "leven": "^3.1.0",
-        "pretty-format": "^26.6.1"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -10163,9 +10099,9 @@
           }
         },
         "camelcase": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz",
-          "integrity": "sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ=="
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="
         },
         "chalk": {
           "version": "4.1.0",
@@ -10272,16 +10208,16 @@
       }
     },
     "jest-watcher": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.1.tgz",
-      "integrity": "sha512-0LBIPPncNi9CaLKK15bnxyd2E8OMl4kJg0PTiNOI+MXztXw1zVdtX/x9Pr6pXaQYps+eS/ts43O4+HByZ7yJSw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
       "requires": {
-        "@jest/test-result": "^26.6.1",
-        "@jest/types": "^26.6.1",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^26.6.1",
+        "jest-util": "^26.6.2",
         "string-length": "^4.0.1"
       },
       "dependencies": {
@@ -10331,9 +10267,9 @@
       }
     },
     "jest-worker": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.1.tgz",
-      "integrity": "sha512-R5IE3qSGz+QynJx8y+ICEkdI2OJ3RJjRQVEyCcFAd3yVhQSEtquziPO29Mlzgn07LOVE8u8jhJ1FqcwegiXWOw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "requires": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -10506,12 +10442,19 @@
       }
     },
     "jsonfile": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-      "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "requires": {
         "graceful-fs": "^4.1.6",
-        "universalify": "^1.0.0"
+        "universalify": "^2.0.0"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+        }
       }
     },
     "jsprim": {
@@ -10559,12 +10502,9 @@
       "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
     },
     "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "requires": {
-        "is-buffer": "^1.1.5"
-      }
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
     "kleur": {
       "version": "3.0.3",
@@ -10622,9 +10562,9 @@
       "integrity": "sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw=="
     },
     "koa-compress": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/koa-compress/-/koa-compress-4.0.1.tgz",
-      "integrity": "sha512-It4WYfsBb9HegnFgcBhiRbPeh1LDjXhRM4+xi2jMp8ujwaVAdqhFzHpbDWuTxbLxuBwStn+Bwdwn2zDZxeNChg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/koa-compress/-/koa-compress-5.0.1.tgz",
+      "integrity": "sha512-uTo7Hcyyt6e9o2X3htRS/SNEKy9vDOUc/r1qs/F0YI2Frv9IEbkjz/9dC6IdJWBQAG34lRuU7jBXeq3DRur9Ng==",
       "requires": {
         "bytes": "^3.0.0",
         "compressible": "^2.0.0",
@@ -10742,9 +10682,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
           }
@@ -10752,9 +10692,9 @@
       }
     },
     "language-subtag-registry": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz",
-      "integrity": "sha512-KPMwROklF4tEx283Xw0pNKtfTj1gZ4UByp4EsIFWLgBavJltF4TiYPc39k06zSTsLzxTVXXDSpbwaQXaFB4Qeg=="
+      "version": "0.3.21",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
+      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg=="
     },
     "language-tags": {
       "version": "1.0.5",
@@ -10773,11 +10713,6 @@
         "webpack-sources": "^1.1.0"
       }
     },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
-    },
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -10804,25 +10739,6 @@
         "immediate": "~3.0.5"
       }
     },
-    "line-column": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz",
-      "integrity": "sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=",
-      "requires": {
-        "isarray": "^1.0.0",
-        "isobject": "^2.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-          "requires": {
-            "isarray": "1.0.0"
-          }
-        }
-      }
-    },
     "lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -10935,9 +10851,9 @@
       "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
     },
     "loglevel": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
-      "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ=="
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
+      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="
     },
     "loglevelnext": {
       "version": "4.0.1",
@@ -11164,16 +11080,6 @@
         }
       }
     },
-    "merge-deep": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz",
-      "integrity": "sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==",
-      "requires": {
-        "arr-union": "^3.1.0",
-        "clone-deep": "^0.2.4",
-        "kind-of": "^3.0.2"
-      }
-    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -11191,7 +11097,7 @@
     },
     "methods": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "resolved": false,
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "microevent.ts": {
@@ -11402,22 +11308,6 @@
         }
       }
     },
-    "mixin-object": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
-      "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "for-in": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE="
-        }
-      }
-    },
     "mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -11464,28 +11354,23 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
     },
     "multiselect-react-dropdown": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/multiselect-react-dropdown/-/multiselect-react-dropdown-1.6.1.tgz",
-      "integrity": "sha512-jFCaK2CWu5SRbFiXKOzA89VajQulO/1hg0h6XfuGPZBtIyCkkWoQL2GFOfJUIHane8KfJxr+xA8Ld6iZ+WP2fA==",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/multiselect-react-dropdown/-/multiselect-react-dropdown-1.6.2.tgz",
+      "integrity": "sha512-9TCL/PTN5jJHQGTItwOKYjprQqHp2/ry7ckL5xPpEuiQuD0tJTcTdiMAfUAYVZDgmdpiaKewWyH2mACSZ1nwyw==",
       "requires": {
         "react": "^16.7.0",
         "react-dom": "^16.7.0"
       }
     },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
-    },
     "nan": {
       "version": "2.14.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
       "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
     },
     "nanoid": {
-      "version": "3.1.16",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.16.tgz",
-      "integrity": "sha512-+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w=="
+      "version": "3.1.18",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz",
+      "integrity": "sha512-rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -11503,13 +11388,6 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        }
       }
     },
     "native-url": {
@@ -11615,9 +11493,9 @@
       }
     },
     "node-gyp-build": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz",
-      "integrity": "sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w=="
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz",
+      "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="
     },
     "node-int64": {
       "version": "0.4.0",
@@ -11780,9 +11658,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.64",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.64.tgz",
-      "integrity": "sha512-Iec8O9166/x2HRMJyLLLWkd0sFFLrFNy+Xf+JQfSQsdBJzPcHpNl3JQ9gD4j+aJxmCa25jNsIbM4bmACtSbkSg=="
+      "version": "1.1.67",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz",
+      "integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg=="
     },
     "node-sass": {
       "version": "4.14.1",
@@ -11987,7 +11865,7 @@
     },
     "object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "resolved": false,
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
@@ -12007,6 +11885,14 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
         }
       }
     },
@@ -12016,12 +11902,12 @@
       "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
     },
     "object-is": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
-      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz",
+      "integrity": "sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
       }
     },
     "object-keys": {
@@ -12038,104 +11924,46 @@
       }
     },
     "object.assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
-      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.0",
         "has-symbols": "^1.0.1",
         "object-keys": "^1.1.1"
       }
     },
     "object.entries": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
-      "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz",
+      "integrity": "sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
+        "es-abstract": "^1.18.0-next.1",
         "has": "^1.0.3"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
       }
     },
     "object.fromentries": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz",
-      "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.3.tgz",
+      "integrity": "sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
+        "es-abstract": "^1.18.0-next.1",
         "has": "^1.0.3"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz",
+      "integrity": "sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
+        "es-abstract": "^1.18.0-next.1"
       }
     },
     "object.pick": {
@@ -12147,34 +11975,14 @@
       }
     },
     "object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz",
+      "integrity": "sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
+        "es-abstract": "^1.18.0-next.1",
         "has": "^1.0.3"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
       }
     },
     "obuf": {
@@ -12300,9 +12108,9 @@
       "integrity": "sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw=="
     },
     "p-each-series": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
-      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA=="
     },
     "p-finally": {
       "version": "1.0.0",
@@ -12500,13 +12308,13 @@
     },
     "performance-now": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "resolved": false,
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "picomatch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz",
-      "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA=="
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
     },
     "pify": {
       "version": "4.0.1",
@@ -12628,9 +12436,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
           }
@@ -12915,9 +12723,9 @@
       }
     },
     "postcss-font-variant": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz",
-      "integrity": "sha512-M8BFYKOvCrI2aITzDad7kWuXXTm0YhGdP9Q8HanmN4EF1Hmcgs1KK5rSHylt/lUJe8yLxiSwWAHdScoEiIxztg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz",
+      "integrity": "sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==",
       "requires": {
         "postcss": "^7.0.2"
       }
@@ -13546,14 +13354,14 @@
       },
       "dependencies": {
         "postcss": {
-          "version": "8.1.4",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.4.tgz",
-          "integrity": "sha512-LfqcwgMq9LOd8pX7K2+r2HPitlIGC5p6PoZhVELlqhh2YGDVcXKpkCseqan73Hrdik6nBd2OvoDPUaP/oMj9hQ==",
+          "version": "8.1.10",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz",
+          "integrity": "sha512-iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg==",
           "requires": {
             "colorette": "^1.2.1",
-            "line-column": "^1.0.2",
-            "nanoid": "^3.1.15",
-            "source-map": "^0.6.1"
+            "nanoid": "^3.1.18",
+            "source-map": "^0.6.1",
+            "vfile-location": "^3.2.0"
           }
         }
       }
@@ -13655,11 +13463,11 @@
       }
     },
     "pretty-format": {
-      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.1.tgz",
-      "integrity": "sha512-MeqqsP5PYcRBbGMvwzsyBdmAJ4EFX7pWFyl7x4+dMVg5pE0ZDdBIvEH2ergvIO+Gvwv1wh64YuOY9y5LuyY/GA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "requires": {
-        "@jest/types": "^26.6.1",
+        "@jest/types": "^26.6.2",
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
         "react-is": "^17.0.1"
@@ -13722,12 +13530,12 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
     },
     "prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
+      "integrity": "sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==",
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       }
     },
     "prop-types": {
@@ -13934,9 +13742,9 @@
       }
     },
     "rc-align": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.8.tgz",
-      "integrity": "sha512-2sRUkmB8z4UEXzaS+lDHzXMoR8HrtKH9nn2yHlHVNyUTnaucjMFbdEoCk+hO1g7cpIgW0MphG8i0EH2scSesfw==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.9.tgz",
+      "integrity": "sha512-myAM2R4qoB6LqBul0leaqY8gFaiECDJ3MtQDmzDo9xM9NRT/04TvWOYd2YHU9zvGzqk9QXF6S9/MifzSKDZeMw==",
       "requires": {
         "@babel/runtime": "^7.10.1",
         "classnames": "2.x",
@@ -13946,9 +13754,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
-          "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
@@ -13961,9 +13769,9 @@
       }
     },
     "rc-motion": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.3.3.tgz",
-      "integrity": "sha512-eOpPDFz6Y+gX1Nd3/AZOhS+Cqv9CiyJ+hrfAinfemJv+fiiVLv/NkFYe2fqw0onNeGiTKJaDF5Ah4Hm006K5yw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.4.1.tgz",
+      "integrity": "sha512-TWLvymfMu8SngPx5MDH8dQ0D2RYbluNTfam4hY/dNNx9RQ3WtGuZ/GXHi2ymLMzH+UNd6EEFYkOuR5JTTtm8Xg==",
       "requires": {
         "@babel/runtime": "^7.11.1",
         "classnames": "^2.2.1",
@@ -13971,9 +13779,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
-          "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
@@ -13986,9 +13794,9 @@
       }
     },
     "rc-slider": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.6.0.tgz",
-      "integrity": "sha512-XJZjS8JWPnhoS83n9IlZrfblP7zt9urGe881Clq7ZvEpeEQ7z3z/HyuZNFI0JL9rZV7l3pWRtYi1ur6G/7wJcA==",
+      "version": "9.6.4",
+      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.6.4.tgz",
+      "integrity": "sha512-TgmfOh1Jj9fHsW2eDeldFy4mOKwyHn4krl4K6gqbXhGFND7jVRdfA0m7TDUx3gGeX7A17fM1QZymMO/NRJmoLw==",
       "requires": {
         "@babel/runtime": "^7.10.1",
         "classnames": "^2.2.5",
@@ -13998,9 +13806,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
-          "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
@@ -14022,9 +13830,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
-          "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
@@ -14037,21 +13845,21 @@
       }
     },
     "rc-trigger": {
-      "version": "5.0.9",
-      "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.0.9.tgz",
-      "integrity": "sha512-N+q/ur2dpJSPDWbZQ34ztpGorms1QIphtmFpxKE5z+wMJw2BIASkMDEfwHJ/ssvZQxScjQza0/eQ0CWUI0e+EQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.1.2.tgz",
+      "integrity": "sha512-A6UdDy95masAEIaNmazPtqHW1EOFDWi2C2bJGDpr9OYpmObDpWKdxyNijVbFb6l1viTkAU9d3FyStgNPddgFzw==",
       "requires": {
         "@babel/runtime": "^7.11.2",
         "classnames": "^2.2.6",
         "rc-align": "^4.0.0",
         "rc-motion": "^2.0.0",
-        "rc-util": "^5.3.4"
+        "rc-util": "^5.5.0"
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
-          "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
@@ -14064,9 +13872,9 @@
       }
     },
     "rc-util": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.4.0.tgz",
-      "integrity": "sha512-kXDn1JyLJTAWLBFt+fjkTcUtXhxKkipQCobQmxIEVrX62iXgo24z8YKoWehWfMxPZFPE+RXqrmEu9j5kHz/Lrg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.5.0.tgz",
+      "integrity": "sha512-YJB+zZGvCll/bhxXRVLAekr7lOvTgqMlRIhgINoINfUek7wQvi5sft46NOi3yYUYhocpuW4k8+5okW46sBsZAQ==",
       "requires": {
         "react-is": "^16.12.0",
         "shallowequal": "^1.1.0"
@@ -14111,9 +13919,9 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "3.6.5",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
-          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+          "version": "3.8.0",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.0.tgz",
+          "integrity": "sha512-W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA=="
         },
         "promise": {
           "version": "8.1.0",
@@ -14129,9 +13937,9 @@
           "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
         },
         "whatwg-fetch": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz",
-          "integrity": "sha512-sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ=="
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz",
+          "integrity": "sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="
         }
       }
     },
@@ -14197,9 +14005,9 @@
       }
     },
     "react-collapse": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/react-collapse/-/react-collapse-5.0.1.tgz",
-      "integrity": "sha512-cN2tkxBWizhPQ2JHfe0aUSJtmMthKA17NZkTElpiQ2snQAAi1hssXZ2fv88rAPNNvG5ss4t0PbOZT0TIl9Lk3Q=="
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/react-collapse/-/react-collapse-5.1.0.tgz",
+      "integrity": "sha512-5v0ywsn9HjiR/odNzbRDs0RZfrnbdSippJebWOBCFFDA12Vx8DddrbI4qWVf1P2wTiVagrpcSy07AU0b6+gM9Q=="
     },
     "react-color": {
       "version": "2.19.3",
@@ -14234,9 +14042,9 @@
       }
     },
     "react-dev-utils": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.0.tgz",
-      "integrity": "sha512-uIZTUZXB5tbiM/0auUkLVjWhZGM7DSI304iGunyhA9m985iIDVXd9I4z6MkNa9jeLzeUJbU9A7TUNrcbXAahxw==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.1.tgz",
+      "integrity": "sha512-rlgpCupaW6qQqvu0hvv2FDv40QG427fjghV56XyPcP5aKtOAPzNAhQ7bHqk1YdS2vpW1W7aSV3JobedxuPlBAA==",
       "requires": {
         "@babel/code-frame": "7.10.4",
         "address": "1.1.2",
@@ -14252,11 +14060,11 @@
         "globby": "11.0.1",
         "gzip-size": "5.1.1",
         "immer": "7.0.9",
-        "inquirer": "7.3.3",
         "is-root": "2.1.0",
         "loader-utils": "2.0.0",
         "open": "^7.0.2",
         "pkg-up": "3.1.0",
+        "prompts": "2.4.0",
         "react-error-overlay": "^6.0.8",
         "recursive-readdir": "2.2.2",
         "shell-quote": "1.7.2",
@@ -14516,9 +14324,9 @@
       }
     },
     "react-scripts": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.0.tgz",
-      "integrity": "sha512-icJ/ctwV5XwITUOupBP9TUVGdWOqqZ0H08tbJ1kVC5VpNWYzEZ3e/x8axhV15ZXRsixLo27snwQE7B6Zd9J2Tg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.1.tgz",
+      "integrity": "sha512-NnniMSC/wjwhcJAyPJCWtxx6CWONqgvGgV9+QXj1bwoW/JI++YF1eEf3Upf/mQ9KmP57IBdjzWs1XvnPq7qMTQ==",
       "requires": {
         "@babel/core": "7.12.3",
         "@pmmmwh/react-refresh-webpack-plugin": "0.4.2",
@@ -14563,8 +14371,9 @@
         "postcss-normalize": "8.0.1",
         "postcss-preset-env": "6.7.0",
         "postcss-safe-parser": "5.0.2",
+        "prompts": "2.4.0",
         "react-app-polyfill": "^2.0.0",
-        "react-dev-utils": "^11.0.0",
+        "react-dev-utils": "^11.0.1",
         "react-refresh": "^0.8.3",
         "resolve": "1.18.1",
         "resolve-url-loader": "^3.1.2",
@@ -14581,15 +14390,9 @@
       },
       "dependencies": {
         "camelcase": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz",
-          "integrity": "sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ=="
-        },
-        "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-          "optional": true
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="
         },
         "resolve": {
           "version": "1.18.1",
@@ -14613,12 +14416,17 @@
     },
     "react-textarea-autosize": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
       "integrity": "sha512-F6bI1dgib6fSvG8so1HuArPUv+iVEfPliuLWusLF+gAKz0FbB4jLrWUrTAeq1afnPT2c9toEZYUdz/y1uKMy4A==",
       "requires": {
         "prop-types": "^15.6.0"
       }
     },
+    "react-trafficlight": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/react-trafficlight/-/react-trafficlight-5.2.1.tgz",
+      "integrity": "sha512-m1XD0Hp1xwq1vSuMNy4ZuuoedEVSe1qnN1JgJt+VJ72xF6J0+mK27RUJaDF4XO+33ipDZRVYw7PH7PXmQgKRIQ=="
+    },
     "react-transition-group": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz",
@@ -14771,9 +14579,9 @@
       }
     },
     "regenerate": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
-      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerate-unicode-properties": {
       "version": "8.2.0",
@@ -14797,9 +14605,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
-          "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
@@ -15194,15 +15002,6 @@
         }
       }
     },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -15344,15 +15143,10 @@
       "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
       "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="
     },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
-    },
     "run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz",
+      "integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="
     },
     "run-queue": {
       "version": "1.0.3",
@@ -15362,14 +15156,6 @@
         "aproba": "^1.1.1"
       }
     },
-    "rxjs": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -15383,6 +15169,11 @@
         "ret": "~0.1.10"
       }
     },
+    "safe-stable-stringify": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz",
+      "integrity": "sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="
+    },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -15479,11 +15270,6 @@
             }
           }
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -15529,9 +15315,9 @@
       "integrity": "sha512-vTxrZz4dX5W86M6oVWVdOVe72ZiPs41Oi7Z6Km4W5Turyz28mrXSJhhEBZoRtzJWIv3833WKVwLSDWWkEfupMg=="
     },
     "sass": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz",
-      "integrity": "sha512-9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A==",
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz",
+      "integrity": "sha512-ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==",
       "requires": {
         "chokidar": ">=2.0.0 <4.0.0"
       }
@@ -15559,16 +15345,6 @@
         "semver": "^6.3.0"
       },
       "dependencies": {
-        "clone-deep": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-          "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-          "requires": {
-            "is-plain-object": "^2.0.4",
-            "kind-of": "^6.0.2",
-            "shallow-clone": "^3.0.0"
-          }
-        },
         "json5": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -15577,11 +15353,6 @@
             "minimist": "^1.2.0"
           }
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        },
         "loader-utils": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
@@ -15596,14 +15367,6 @@
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        },
-        "shallow-clone": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-          "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-          "requires": {
-            "kind-of": "^6.0.2"
-          }
         }
       }
     },
@@ -15861,29 +15624,11 @@
       }
     },
     "shallow-clone": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^2.0.1",
-        "lazy-cache": "^0.2.3",
-        "mixin-object": "^2.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
-          "requires": {
-            "is-buffer": "^1.0.2"
-          }
-        },
-        "lazy-cache": {
-          "version": "0.2.7",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U="
-        }
+        "kind-of": "^6.0.2"
       }
     },
     "shallowequal": {
@@ -16073,11 +15818,6 @@
             "is-data-descriptor": "^1.0.0",
             "kind-of": "^6.0.2"
           }
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -16087,6 +15827,16 @@
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "requires": {
         "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
     "sockjs": {
@@ -16120,9 +15870,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
           }
@@ -16294,9 +16044,9 @@
       "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
     },
     "stack-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-      "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
       "requires": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -16425,54 +16175,35 @@
       }
     },
     "string.prototype.matchall": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz",
-      "integrity": "sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz",
+      "integrity": "sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==",
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
+        "es-abstract": "^1.18.0-next.1",
         "has-symbols": "^1.0.1",
         "internal-slot": "^1.0.2",
         "regexp.prototype.flags": "^1.3.0",
-        "side-channel": "^1.0.2"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
+        "side-channel": "^1.0.3"
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz",
-      "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
+      "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz",
-      "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
+      "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
       }
     },
     "string_decoder": {
@@ -16634,9 +16365,9 @@
       }
     },
     "superstruct": {
-      "version": "0.10.12",
-      "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.10.12.tgz",
-      "integrity": "sha512-FiNhfegyytDI0QxrrEoeGknFM28SnoHqCBpkWewUm8jRNj74NVxLpiiePvkOo41Ze/aKMSHa/twWjNF81mKaQQ=="
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.12.1.tgz",
+      "integrity": "sha512-DLb5DmTKv9scfaBiGY9bPZbRZ0x4Ic8lD/qEXPOrsTnQrpRHGEZ77HbgvZOlj6wWW3LH7X8F4siMjR5SFEngiQ=="
     },
     "supports-color": {
       "version": "5.5.0",
@@ -16823,11 +16554,11 @@
           }
         },
         "p-limit": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
-          "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
           "requires": {
-            "p-try": "^2.0.0"
+            "yocto-queue": "^0.1.0"
           }
         },
         "pkg-dir": {
@@ -16854,9 +16585,9 @@
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
         },
         "terser": {
-          "version": "5.3.8",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz",
-          "integrity": "sha512-zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ==",
+          "version": "5.5.1",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz",
+          "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==",
           "requires": {
             "commander": "^2.20.0",
             "source-map": "~0.7.2",
@@ -16892,11 +16623,6 @@
       "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
       "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA=="
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
     "through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -16917,9 +16643,9 @@
       "integrity": "sha1-k6ABk6Lk+EG/uodROYf02+PAmk4="
     },
     "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
       "requires": {
         "setimmediate": "^1.0.4"
       }
@@ -16944,14 +16670,6 @@
       "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz",
       "integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="
     },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
     "tmpl": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
@@ -16973,6 +16691,16 @@
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "requires": {
         "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
     "to-regex": {
@@ -17160,9 +16888,9 @@
       }
     },
     "typescript": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz",
-      "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz",
+      "integrity": "sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ=="
     },
     "ua-parser-js": {
       "version": "0.7.20",
@@ -17409,11 +17137,11 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
     "utf-8-validate": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.2.tgz",
-      "integrity": "sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.3.tgz",
+      "integrity": "sha512-jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A==",
       "requires": {
-        "node-gyp-build": "~3.7.0"
+        "node-gyp-build": "^4.2.0"
       }
     },
     "util": {
@@ -17433,7 +17161,7 @@
     },
     "util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "resolved": false,
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util.promisify": {
@@ -17483,14 +17211,14 @@
       "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
     },
     "v8-compile-cache": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
-      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
+      "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="
     },
     "v8-to-istanbul": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-6.0.1.tgz",
-      "integrity": "sha512-PzM1WlqquhBvsV+Gco6WSFeg1AGdD53ccMRkFeyHRE/KRZaVacPOmQYP3EeVgDBtKD2BJ8kgynBQ5OtKiHCH+w==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz",
+      "integrity": "sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==",
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
         "convert-source-map": "^1.6.0",
@@ -17543,6 +17271,11 @@
         "extsprintf": "^1.2.0"
       }
     },
+    "vfile-location": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz",
+      "integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="
+    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
@@ -17581,47 +17314,20 @@
       }
     },
     "watchpack": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
-      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
       "requires": {
         "chokidar": "^3.4.1",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0",
-        "watchpack-chokidar2": "^2.0.0"
-      },
-      "dependencies": {
-        "chokidar": {
-          "version": "3.4.3",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
-          "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
-          "optional": true,
-          "requires": {
-            "anymatch": "~3.1.1",
-            "braces": "~3.0.2",
-            "fsevents": "~2.1.2",
-            "glob-parent": "~5.1.0",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.5.0"
-          }
-        },
-        "readdirp": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-          "optional": true,
-          "requires": {
-            "picomatch": "^2.2.1"
-          }
-        }
+        "watchpack-chokidar2": "^2.0.1"
       }
     },
     "watchpack-chokidar2": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
       "optional": true,
       "requires": {
         "chokidar": "^2.1.8"
@@ -17785,12 +17491,6 @@
             }
           }
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "optional": true
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -17998,11 +17698,6 @@
             "minimist": "^1.2.0"
           }
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        },
         "loader-utils": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
@@ -18315,11 +18010,6 @@
             }
           }
         },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -18601,6 +18291,11 @@
           "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
           "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
         },
+        "superstruct": {
+          "version": "0.10.13",
+          "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.10.13.tgz",
+          "integrity": "sha512-W4SitSZ9MOyMPbHreoZVEneSZyPEeNGbdfJo/7FkJyRs/M3wQRFzq+t3S/NBwlrFSWdx1ONLjLb9pB+UKe4IqQ=="
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -18620,9 +18315,9 @@
       }
     },
     "webpack-plugin-serve": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-plugin-serve/-/webpack-plugin-serve-1.2.0.tgz",
-      "integrity": "sha512-wBAQi2ZwDZMUEpbQUQcz//HaBPX6QJp9v6pCyB9efmS1RlhzUwVwRUwQgJ79J/MyElXoos1ToQeLAK5aIStOYQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/webpack-plugin-serve/-/webpack-plugin-serve-1.2.1.tgz",
+      "integrity": "sha512-9FVTFFEqgMuc83pL6xdw3Cmhts9LlS1Oi/iRgvbbMaspfgCfL+DeZvCzoM5sFPm9YwQpMN97UW5OUjgz4/R7cA==",
       "requires": {
         "chalk": "^4.0.0",
         "connect-history-api-fallback": "^1.5.0",
@@ -18632,7 +18327,7 @@
         "is-path-cwd": "^2.2.0",
         "is-promise": "^4.0.0",
         "koa": "^2.5.3",
-        "koa-compress": "^4.0.1",
+        "koa-compress": "^5.0.1",
         "koa-connect": "^2.0.1",
         "koa-route": "^3.2.0",
         "koa-static": "^5.0.0",
@@ -18642,8 +18337,9 @@
         "open": "^7.0.3",
         "p-defer": "^3.0.0",
         "rimraf": "^3.0.2",
+        "safe-stable-stringify": "^1.1.1",
         "strip-ansi": "^6.0.0",
-        "superstruct": "^0.10.12",
+        "superstruct": "^0.12.1",
         "webpack-plugin-ramdisk": "^0.1.2",
         "ws": "^7.1.0"
       },
@@ -18891,9 +18587,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz",
-          "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
@@ -19114,9 +18810,9 @@
       }
     },
     "ws": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz",
+      "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ=="
     },
     "xml-name-validator": {
       "version": "3.0.0",
@@ -19243,6 +18939,11 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     }
   }
 }
diff --git a/package.json b/package.json
index 219d249..fccb600 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,10 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.32",
     "@fortawesome/free-solid-svg-icons": "^5.15.1",
-    "@fortawesome/react-fontawesome": "^0.1.12",
+    "@fortawesome/react-fontawesome": "^0.1.13",
     "babel-runtime": "^6.26.0",
     "bootstrap": "^4.5.3",
-    "bufferutil": "^4.0.1",
+    "bufferutil": "^4.0.2",
     "canvas": "^2.6.1",
     "classnames": "^2.2.6",
     "d3-array": "^2.8.0",
@@ -20,7 +20,7 @@
     "d3-time-format": "^3.0.0",
     "es6-promise": "^4.2.8",
     "fibers": "^5.0.0",
-    "file-saver": "^2.0.2",
+    "file-saver": "^2.0.5",
     "flux": "^3.1.3",
     "gaugeJS": "^1.3.7",
     "handlebars": "^4.7.6",
@@ -29,15 +29,15 @@
     "libcimsvg": "git+https://git.rwth-aachen.de/acs/public/cim/pintura-npm-package.git",
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
-    "multiselect-react-dropdown": "^1.6.1",
+    "multiselect-react-dropdown": "^1.6.2",
     "node-sass": "^4.14.1",
     "popper.js": "^1.16.1",
     "prop-types": "^15.7.2",
-    "rc-slider": "^9.6.0",
+    "rc-slider": "^9.6.4",
     "react": "^16.14.0",
     "react-bootstrap": "^1.4.0",
     "react-bootstrap-time-picker": "^2.0.1",
-    "react-collapse": "^5.0.1",
+    "react-collapse": "^5.1.0",
     "react-color": "^2.19.3",
     "react-contexify": "^4.1.1",
     "react-d3": "^0.4.0",
@@ -51,17 +51,18 @@
     "react-rnd": "^10.2.3",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "^4.0.0",
+    "react-scripts": "^4.0.1",
     "react-svg-pan-zoom": "^3.8.1",
-    "sass": "^1.28.0",
+    "react-trafficlight": "^5.2.1",
+    "sass": "^1.29.0",
     "superagent": "^6.1.0",
     "ts-node": "^9.0.0",
     "type-fest": "^0.13.1",
-    "typescript": "^4.0.5",
-    "utf-8-validate": "^5.0.2",
+    "typescript": "^4.1.2",
+    "utf-8-validate": "^5.0.3",
     "validator": "^13.1.17",
     "webpack-hot-middleware": "^2.25.0",
-    "webpack-plugin-serve": "^1.2.0"
+    "webpack-plugin-serve": "^1.2.1"
   },
   "devDependencies": {
     "chai": "^4.2.0"
diff --git a/src/widget/widget-factory.js b/src/widget/widget-factory.js
index 00dd41e..33cba20 100644
--- a/src/widget/widget-factory.js
+++ b/src/widget/widget-factory.js
@@ -195,6 +195,15 @@ class WidgetFactory {
                 widget.customProperties.lockAspect = true;
                 break;
 
+            case 'TimeOffset':
+                widget.minWidth = 20;
+                widget.minHeight = 20;
+                widget.width = 100;
+                widget.height = 100;
+                widget.customProperties.threshold_yellow = 1;
+                widget.customProperties.threshold_red = 2;
+                widget.customProperties.ic = 1;
+
             default:
                 widget.width = 100;
                 widget.height = 100;
diff --git a/src/widget/widget-toolbox.js b/src/widget/widget-toolbox.js
index 9b057ec..033109c 100644
--- a/src/widget/widget-toolbox.js
+++ b/src/widget/widget-toolbox.js
@@ -164,6 +164,7 @@ class WidgetToolbox extends React.Component {
       <ToolboxItem name='Lamp' type='widget' icon = 'plus' />
       <ToolboxItem name='Gauge' type='widget' icon = 'plus'/>
       <ToolboxItem name='Topology' type='widget' disabled={thereIsTopologyWidget} title={topologyItemMsg} icon = 'plus'/>
+      <ToolboxItem name='TimeOffset' type='widget' icon = 'plus' />
       <OverlayTrigger key={0} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"?"}`}> Drag and drop widgets onto the dashboard </Tooltip>} >
       <Button disabled={true} variant="light" size="sm" key={0}  >
           <Icon icon="question" />
diff --git a/src/widget/widget.js b/src/widget/widget.js
index 4a9322c..d77d9fd 100644
--- a/src/widget/widget.js
+++ b/src/widget/widget.js
@@ -39,6 +39,7 @@ import WidgetGauge from './widgets/gauge';
 import WidgetBox from './widgets/box';
 import WidgetTopology from './widgets/topology';
 import WidgetLine from './widgets/line';
+import WidgetTimeOffset from './widgets/time-offset'
 //import WidgetHTML from './widgets/html';
 
 
@@ -223,6 +224,10 @@ class Widget extends React.Component {
         widget={widget}
         editing={this.props.editing}
       />
+    } else if (widget.type === 'TimeOffset') {
+      return <WidgetTimeOffset
+        widget={widget}
+      />
     }
 
     return null;
diff --git a/src/widget/widgets/time-offset.js b/src/widget/widgets/time-offset.js
new file mode 100644
index 0000000..2ada456
--- /dev/null
+++ b/src/widget/widgets/time-offset.js
@@ -0,0 +1,48 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React, { Component } from 'react';
+import TrafficLight from 'react-trafficlight';
+
+
+class WidgetTimeOffset extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+        redOn: false,
+        yellowOn: false,
+        greenOn: true,
+    };
+  }
+
+  static getDerivedStateFromProps(props, state){
+  }
+
+  render() {
+
+    return (
+        <TrafficLight
+        RedOn={this.state.redOn}
+        YellowOn={this.state.yellowOn}
+        GreenOn={this.state.greenOn}
+      />
+    );
+  }
+}
+
+export default WidgetTimeOffset;

From 62840e939d5567cb60a03c9488e2eab9538e2b1d Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Mon, 30 Nov 2020 14:12:17 +0100
Subject: [PATCH 07/74] TimeOffset Widget now displays the time offset between
 server and local time #208

---
 src/widget/widget-factory.js      |  2 +-
 src/widget/widget.js              |  1 +
 src/widget/widgets/time-offset.js | 31 +++++++++++++++++++++++++------
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/widget/widget-factory.js b/src/widget/widget-factory.js
index 33cba20..cf48d67 100644
--- a/src/widget/widget-factory.js
+++ b/src/widget/widget-factory.js
@@ -202,7 +202,7 @@ class WidgetFactory {
                 widget.height = 100;
                 widget.customProperties.threshold_yellow = 1;
                 widget.customProperties.threshold_red = 2;
-                widget.customProperties.ic = 1;
+                widget.customProperties.icID = 1;
 
             default:
                 widget.width = 100;
diff --git a/src/widget/widget.js b/src/widget/widget.js
index d77d9fd..bca9e5b 100644
--- a/src/widget/widget.js
+++ b/src/widget/widget.js
@@ -227,6 +227,7 @@ class Widget extends React.Component {
     } else if (widget.type === 'TimeOffset') {
       return <WidgetTimeOffset
         widget={widget}
+        data={this.state.icData}
       />
     }
 
diff --git a/src/widget/widgets/time-offset.js b/src/widget/widgets/time-offset.js
index 2ada456..a711742 100644
--- a/src/widget/widgets/time-offset.js
+++ b/src/widget/widgets/time-offset.js
@@ -24,23 +24,42 @@ class WidgetTimeOffset extends Component {
     super(props);
 
     this.state = {
-        redOn: false,
-        yellowOn: false,
-        greenOn: true,
+        timeOffset: '',
+        icID: ''
     };
   }
 
   static getDerivedStateFromProps(props, state){
+
+    if(typeof props.widget.customProperties.icID !== "undefined" && state.icID !== props.widget.customProperties.icID){
+      return {icID: props.widget.customProperties.icID};
+    }
+
+    if (props.data == null
+      || props.data[state.icID] == null
+      || props.data[state.icID].output == null
+      || props.data[state.icID].output.timestamp == null) {
+      return {timeOffset: ''};
+    }
+
+    let serverTime = props.data[state.icID].output.timestamp;
+    let localTime = Date.now();
+    let absoluteOffset = Math.abs(serverTime - localTime);
+    return {timeOffset: Number.parseFloat(absoluteOffset/1000).toPrecision(5)};
   }
 
   render() {
 
     return (
+      <div>
         <TrafficLight
-        RedOn={this.state.redOn}
-        YellowOn={this.state.yellowOn}
-        GreenOn={this.state.greenOn}
+        RedOn={this.props.widget.customProperties.threshold_red <= this.state.timeOffset}
+        YellowOn={(this.props.widget.customProperties.threshold_yellow <= this.state.timeOffset) && (this.state.timeOffset < this.props.widget.customProperties.threshold_red)}
+        GreenOn={this.state.timeOffset < this.props.widget.customProperties.threshold_yellow}
       />
+      <div>Time offset:</div>
+      <strong>{this.state.timeOffset}s</strong>
+      </div>
     );
   }
 }

From cf402c7ca7ae90f4605e2badcbaef06749e7b059 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Mon, 30 Nov 2020 19:25:50 +0100
Subject: [PATCH 08/74] WIP: make TimeOffset Widget editable #208

---
 src/styles/widgets.css                         | 18 +++++++++++++++++-
 .../edit-widget/edit-widget-control-creator.js |  9 +++++++++
 src/widget/widget-factory.js                   |  7 +++++--
 src/widget/widgets/time-offset.js              | 12 ++++++++----
 4 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/styles/widgets.css b/src/styles/widgets.css
index 7919fe3..e68bb2d 100644
--- a/src/styles/widgets.css
+++ b/src/styles/widgets.css
@@ -394,4 +394,20 @@ div[class*="-widget"] label {
     height: 100%;
     border: 2px solid lightgray;
 }
-/* End box widget */
\ No newline at end of file
+/* End box widget */
+
+/* Begin time offset widget */
+.time-offset {
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    flex-direction: column;
+}
+
+.time-offset span {
+    text-align: center;
+    font-size: 1.5em;
+    font-weight: 600;
+    padding-top: 10px;
+}
+/* End time offset widget */
\ No newline at end of file
diff --git a/src/widget/edit-widget/edit-widget-control-creator.js b/src/widget/edit-widget/edit-widget-control-creator.js
index bb0d5b5..4b4aa69 100644
--- a/src/widget/edit-widget/edit-widget-control-creator.js
+++ b/src/widget/edit-widget/edit-widget-control-creator.js
@@ -158,6 +158,15 @@ export default function CreateControls(widgetType = null, widget = null, session
             );
             break;
 
+        case 'TimeOffset':
+            DialogControls.push(
+                <EditWidgetNumberControl key={1} widget={widget} controlId={'customProperties.threshold_yellow'} label={'Threshold yellow'} defaultValue={0} handleChange={(e) => handleChange(e)} />,
+                <EditWidgetNumberControl key={2} widget={widget} controlId={'customProperties.threshold_red'} label={'Threshold red'} defaultValue={0} handleChange={(e) => handleChange(e)} />,
+                <EditWidgetCheckboxControl key={3} widget={widget} controlId={'customProperties.horizontal'} input text="Horizontal" handleChange={e => handleChange(e)} />,
+                <EditWidgetCheckboxControl key={4} widget={widget} controlId={'customProperties.showOffset'} input text="showOffset" handleChange={e => handleChange(e)} />,
+            );
+            break;
+
         default:
             console.log('Non-valid widget type: ' + widgetType);
         }
diff --git a/src/widget/widget-factory.js b/src/widget/widget-factory.js
index cf48d67..ca16911 100644
--- a/src/widget/widget-factory.js
+++ b/src/widget/widget-factory.js
@@ -198,11 +198,14 @@ class WidgetFactory {
             case 'TimeOffset':
                 widget.minWidth = 20;
                 widget.minHeight = 20;
-                widget.width = 100;
-                widget.height = 100;
+                widget.width = 60;
+                widget.height = 60;
                 widget.customProperties.threshold_yellow = 1;
                 widget.customProperties.threshold_red = 2;
                 widget.customProperties.icID = 1;
+                widget.customProperties.horizontal = false;
+                widget.customProperties.showOffset = true;
+                break;
 
             default:
                 widget.width = 100;
diff --git a/src/widget/widgets/time-offset.js b/src/widget/widgets/time-offset.js
index a711742..46b2531 100644
--- a/src/widget/widgets/time-offset.js
+++ b/src/widget/widgets/time-offset.js
@@ -51,14 +51,18 @@ class WidgetTimeOffset extends Component {
   render() {
 
     return (
-      <div>
-        <TrafficLight
+      <div className="time-offset">
+        <TrafficLight Horizontal={this.props.widget.customProperties.horizontal}
         RedOn={this.props.widget.customProperties.threshold_red <= this.state.timeOffset}
         YellowOn={(this.props.widget.customProperties.threshold_yellow <= this.state.timeOffset) && (this.state.timeOffset < this.props.widget.customProperties.threshold_red)}
         GreenOn={this.state.timeOffset < this.props.widget.customProperties.threshold_yellow}
       />
-      <div>Time offset:</div>
-      <strong>{this.state.timeOffset}s</strong>
+      {this.props.widget.customProperties.showOffset ? 
+      (
+      <span>{this.state.timeOffset}s</span>)
+      :
+      (<div></div>)
+      }
       </div>
     );
   }

From e52fdd99a288773819e3e302568762f94b8deeb0 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Fri, 4 Dec 2020 15:54:25 +0100
Subject: [PATCH 09/74] Time Offset Widget: dimensions now fit widget width /
 height

---
 src/widget/edit-widget/edit-widget.js | 5 +++++
 src/widget/widget-factory.js          | 4 ++--
 src/widget/widgets/time-offset.js     | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/widget/edit-widget/edit-widget.js b/src/widget/edit-widget/edit-widget.js
index 0c1aad8..d416e24 100644
--- a/src/widget/edit-widget/edit-widget.js
+++ b/src/widget/edit-widget/edit-widget.js
@@ -141,6 +141,11 @@ class EditWidgetDialog extends React.Component {
         customProperty ? changeObject[parts[0]][parts[1]]= 'default' : changeObject[e.target.id] = 'default';
       }
       changeObject = this.setMaxWidth(changeObject);
+    } else if (parts[1]= 'horizontal'){
+      customProperty ? changeObject[parts[0]][parts[1]] = e.target.value : changeObject[e.target.id] = e.target.value ;
+      let tempWidth = changeObject.width;
+      changeObject.width = changeObject.height;
+      changeObject.height = tempWidth;
     } else {
       customProperty ? changeObject[parts[0]][parts[1]] = e.target.value : changeObject[e.target.id] = e.target.value ;
     }
diff --git a/src/widget/widget-factory.js b/src/widget/widget-factory.js
index ca16911..ab26514 100644
--- a/src/widget/widget-factory.js
+++ b/src/widget/widget-factory.js
@@ -198,8 +198,8 @@ class WidgetFactory {
             case 'TimeOffset':
                 widget.minWidth = 20;
                 widget.minHeight = 20;
-                widget.width = 60;
-                widget.height = 60;
+                widget.width = 100;
+                widget.height = 100;
                 widget.customProperties.threshold_yellow = 1;
                 widget.customProperties.threshold_red = 2;
                 widget.customProperties.icID = 1;
diff --git a/src/widget/widgets/time-offset.js b/src/widget/widgets/time-offset.js
index 46b2531..65b642c 100644
--- a/src/widget/widgets/time-offset.js
+++ b/src/widget/widgets/time-offset.js
@@ -52,7 +52,8 @@ class WidgetTimeOffset extends Component {
 
     return (
       <div className="time-offset">
-        <TrafficLight Horizontal={this.props.widget.customProperties.horizontal}
+        <span>IC: {this.state.icID}</span>
+        <TrafficLight Horizontal={this.props.widget.customProperties.horizontal} width={this.props.widget.width} height={this.props.widget.height}
         RedOn={this.props.widget.customProperties.threshold_red <= this.state.timeOffset}
         YellowOn={(this.props.widget.customProperties.threshold_yellow <= this.state.timeOffset) && (this.state.timeOffset < this.props.widget.customProperties.threshold_red)}
         GreenOn={this.state.timeOffset < this.props.widget.customProperties.threshold_yellow}

From cf05ab9564c578ce05d33cb48fec9cc14a33969b Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 6 Dec 2020 14:28:08 +0100
Subject: [PATCH 10/74] Time Offset Widget: IC now changeable #208

---
 src/dashboard/dashboard.js                    |  1 +
 src/styles/widgets.css                        |  3 +-
 .../edit-widget-control-creator.js            |  4 +-
 .../edit-widget/edit-widget-ic-control.js     | 74 +++++++++++++++++++
 src/widget/edit-widget/edit-widget.js         |  3 +-
 src/widget/widget-factory.js                  |  7 +-
 src/widget/widgets/time-offset.js             | 11 +--
 7 files changed, 91 insertions(+), 12 deletions(-)
 create mode 100644 src/widget/edit-widget/edit-widget-ic-control.js

diff --git a/src/dashboard/dashboard.js b/src/dashboard/dashboard.js
index 19bfd36..56b9880 100644
--- a/src/dashboard/dashboard.js
+++ b/src/dashboard/dashboard.js
@@ -557,6 +557,7 @@ class Dashboard extends Component {
           widget={this.state.modalData}
           signals={this.state.signals}
           files={this.state.files}
+          ics={this.state.ics}
         />
 
         <EditFiles
diff --git a/src/styles/widgets.css b/src/styles/widgets.css
index e68bb2d..06032c2 100644
--- a/src/styles/widgets.css
+++ b/src/styles/widgets.css
@@ -406,8 +406,7 @@ div[class*="-widget"] label {
 
 .time-offset span {
     text-align: center;
-    font-size: 1.5em;
+    font-size: 1em;
     font-weight: 600;
-    padding-top: 10px;
 }
 /* End time offset widget */
\ No newline at end of file
diff --git a/src/widget/edit-widget/edit-widget-control-creator.js b/src/widget/edit-widget/edit-widget-control-creator.js
index 4b4aa69..b5f4b56 100644
--- a/src/widget/edit-widget/edit-widget-control-creator.js
+++ b/src/widget/edit-widget/edit-widget-control-creator.js
@@ -31,9 +31,10 @@ import EditWidgetCheckboxControl from './edit-widget-checkbox-control';
 import EditWidgetColorZonesControl from './edit-widget-color-zones-control';
 import EditWidgetMinMaxControl from './edit-widget-min-max-control';
 import EditWidgetParametersControl from './edit-widget-parameters-control';
+import EditWidgetICControl from './edit-widget-ic-control';
 //import EditWidgetHTMLContent from './edit-widget-html-content';
 
-export default function CreateControls(widgetType = null, widget = null, sessionToken = null, files = null, signals, handleChange) {
+export default function CreateControls(widgetType = null, widget = null, sessionToken = null, files = null,ics = null, signals, handleChange) {
     // Use a list to concatenate the controls according to the widget type
     var DialogControls = [];
 
@@ -160,6 +161,7 @@ export default function CreateControls(widgetType = null, widget = null, session
 
         case 'TimeOffset':
             DialogControls.push(
+                <EditWidgetICControl key={0} widget={widget} controlId={'customProperties.icID'} input ics={ics} handleChange={(e) => handleChange(e)}/>,
                 <EditWidgetNumberControl key={1} widget={widget} controlId={'customProperties.threshold_yellow'} label={'Threshold yellow'} defaultValue={0} handleChange={(e) => handleChange(e)} />,
                 <EditWidgetNumberControl key={2} widget={widget} controlId={'customProperties.threshold_red'} label={'Threshold red'} defaultValue={0} handleChange={(e) => handleChange(e)} />,
                 <EditWidgetCheckboxControl key={3} widget={widget} controlId={'customProperties.horizontal'} input text="Horizontal" handleChange={e => handleChange(e)} />,
diff --git a/src/widget/edit-widget/edit-widget-ic-control.js b/src/widget/edit-widget/edit-widget-ic-control.js
new file mode 100644
index 0000000..7e90f81
--- /dev/null
+++ b/src/widget/edit-widget/edit-widget-ic-control.js
@@ -0,0 +1,74 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React from 'react';
+import {FormGroup, FormControl, FormLabel} from 'react-bootstrap';
+
+class EditWidgetICControl extends React.Component {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      ics: [],
+    };
+  }
+
+  static getDerivedStateFromProps(props, state){
+    return {
+      ics: props.ics
+    };
+  }
+
+  handleICChange(e) {
+    let value = e.target.value === "Select IC" ? (-1) : (e.target.value);
+    this.props.handleChange({ target: { id: this.props.controlId, value: value } });
+  }
+
+  render() {
+
+    let parts = this.props.controlId.split('.');
+    let isCustomProperty = true;
+    if(parts.length === 1){
+      isCustomProperty = false;
+    }
+
+    let icOptions = [];
+    if (this.state.ics !== null && this.state.ics.length > 0){
+      icOptions.push(
+        <option key = {0} default>Select IC</option>
+        )
+      icOptions.push(this.state.ics.map((ic, index) => (
+        <option key={index+1} value={ic.id}>{ic.name}</option>
+      )))
+    } else {
+      icOptions = <option style={{ display: 'none' }}>No ics found</option>
+    }
+
+    return <div>
+      <FormGroup controlId="ic">
+        <FormLabel>IC</FormLabel>
+        <FormControl
+          as="select"
+          value={isCustomProperty ? this.props.widget[parts[0]][parts[1]] : this.props.widget[this.props.controlId]}
+          onChange={(e) => this.handleICChange(e)}>{icOptions} </FormControl>
+      </FormGroup>
+    </div>;
+  }
+}
+
+export default EditWidgetICControl;
diff --git a/src/widget/edit-widget/edit-widget.js b/src/widget/edit-widget/edit-widget.js
index d416e24..5d0d601 100644
--- a/src/widget/edit-widget/edit-widget.js
+++ b/src/widget/edit-widget/edit-widget.js
@@ -141,7 +141,7 @@ class EditWidgetDialog extends React.Component {
         customProperty ? changeObject[parts[0]][parts[1]]= 'default' : changeObject[e.target.id] = 'default';
       }
       changeObject = this.setMaxWidth(changeObject);
-    } else if (parts[1]= 'horizontal'){
+    } else if (parts[1] === 'horizontal'){
       customProperty ? changeObject[parts[0]][parts[1]] = e.target.value : changeObject[e.target.id] = e.target.value ;
       let tempWidth = changeObject.width;
       changeObject.width = changeObject.height;
@@ -168,6 +168,7 @@ class EditWidgetDialog extends React.Component {
             this.state.temporal,
             this.props.sessionToken,
             this.props.files,
+            this.props.ics,
             this.props.signals,
             (e) => this.handleChange(e));
     }
diff --git a/src/widget/widget-factory.js b/src/widget/widget-factory.js
index ab26514..2f6ac6a 100644
--- a/src/widget/widget-factory.js
+++ b/src/widget/widget-factory.js
@@ -199,12 +199,13 @@ class WidgetFactory {
                 widget.minWidth = 20;
                 widget.minHeight = 20;
                 widget.width = 100;
-                widget.height = 100;
+                widget.height = 40;
                 widget.customProperties.threshold_yellow = 1;
                 widget.customProperties.threshold_red = 2;
-                widget.customProperties.icID = 1;
-                widget.customProperties.horizontal = false;
+                widget.customProperties.icID = -1;
+                widget.customProperties.horizontal = true;
                 widget.customProperties.showOffset = true;
+                widget.customProperties.lockAspect = true;
                 break;
 
             default:
diff --git a/src/widget/widgets/time-offset.js b/src/widget/widgets/time-offset.js
index 65b642c..819ecde 100644
--- a/src/widget/widgets/time-offset.js
+++ b/src/widget/widgets/time-offset.js
@@ -39,7 +39,7 @@ class WidgetTimeOffset extends Component {
       || props.data[state.icID] == null
       || props.data[state.icID].output == null
       || props.data[state.icID].output.timestamp == null) {
-      return {timeOffset: ''};
+      return {timeOffset: -1};
     }
 
     let serverTime = props.data[state.icID].output.timestamp;
@@ -49,20 +49,21 @@ class WidgetTimeOffset extends Component {
   }
 
   render() {
-
     return (
       <div className="time-offset">
-        <span>IC: {this.state.icID}</span>
+      {this.props.widget.customProperties.icID !== -1 ? 
+      (<span>IC: {this.state.icID}</span>) : (<span>no IC</span>)
+      }        
         <TrafficLight Horizontal={this.props.widget.customProperties.horizontal} width={this.props.widget.width} height={this.props.widget.height}
         RedOn={this.props.widget.customProperties.threshold_red <= this.state.timeOffset}
         YellowOn={(this.props.widget.customProperties.threshold_yellow <= this.state.timeOffset) && (this.state.timeOffset < this.props.widget.customProperties.threshold_red)}
         GreenOn={this.state.timeOffset < this.props.widget.customProperties.threshold_yellow}
       />
-      {this.props.widget.customProperties.showOffset ? 
+      {this.props.widget.customProperties.showOffset && this.props.widget.customProperties.icID !== -1 ? 
       (
       <span>{this.state.timeOffset}s</span>)
       :
-      (<div></div>)
+      (<span>selected</span>)
       }
       </div>
     );

From b24f5cf638f16fd1550dcfa4b0e4dee3b56c5018 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 6 Dec 2020 16:06:15 +0100
Subject: [PATCH 11/74] Send IC control commands from status dialog #265

---
 src/ic/ic-data-data-manager.js | 34 ++++++++++++++++++++++++++++++++++
 src/ic/ic-dialog.js            |  2 +-
 src/ic/ic-status-store.js      | 26 ++++++++++++++++++++++++--
 src/ic/ics.js                  | 23 ++++++++++++++++++++---
 4 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/src/ic/ic-data-data-manager.js b/src/ic/ic-data-data-manager.js
index d0ca2fd..b26675c 100644
--- a/src/ic/ic-data-data-manager.js
+++ b/src/ic/ic-data-data-manager.js
@@ -78,6 +78,40 @@ class IcDataDataManager {
     })
   }
 
+  restart(url,socketname,token){
+    RestAPI.post(url, null).then(response => {
+      AppDispatcher.dispatch({
+        type: 'ic-status/restart-successful',
+        data: response,
+        token: token,
+        socketname: socketname,
+      });
+    }).catch(error => {
+      AppDispatcher.dispatch({
+        type: 'ic-status/restart-error',
+        error: error
+      })
+    })
+  }
+
+  shutdown(url,socketname,token){
+    RestAPI.post(url, null).then(response => {
+      AppDispatcher.dispatch({
+        type: 'ic-status/shutdown-successful',
+        data: response,
+        token: token,
+        socketname: socketname,
+      });
+    }).catch(error => {
+      AppDispatcher.dispatch({
+        type: 'ic-status/shutdown-error',
+        error: error
+      })
+    })
+  }
+
+
+
   closeAll() {
     // close every open socket
     for (var identifier in this._sockets) {
diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 0acbcb5..4e0e9a4 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -38,7 +38,7 @@ class ICDialog extends React.Component {
 
   closeConfirmModal(canceled){
     if(!canceled){
-      this.props.sendControlCommand(this.state.command);
+      this.props.sendControlCommand(this.state.command,this.props.ic);
     }
 
     this.setState({confirmCommand: false, command: ''});
diff --git a/src/ic/ic-status-store.js b/src/ic/ic-status-store.js
index c78353a..3f701ef 100644
--- a/src/ic/ic-status-store.js
+++ b/src/ic/ic-status-store.js
@@ -28,7 +28,7 @@ class ICStatusStore extends ArrayStore {
     switch(action.type) {
 
       case 'ic-status/get-status':
-        ICDataDataManager.getStatus(action.url, action.socketname, action.token,action.icid);
+        ICDataDataManager.getStatus(action.url, action.socketname, action.token, action.icid);
         return super.reduce(state, action);
 
       case 'ic-status/status-received':
@@ -38,7 +38,29 @@ class ICStatusStore extends ArrayStore {
 
       case 'ic-status/status-error':
         console.log("status error");
-        return super.reduce(state, action);
+        return state;
+
+      case 'ic-status/restart':
+        ICDataDataManager.restart(action.url, action.socketname, action.token);
+        return state;
+
+      case 'ic-status/restart-successful':
+        return state;
+
+      case 'ic-status/restart-error':
+        console.log("restart error");
+        return state;
+
+      case 'ic-status/shutdown':
+        ICDataDataManager.shutdown(action.url, action.socketname, action.token);
+        return state;
+
+      case 'ic-status/shutdown-successful':
+        return state;
+
+      case 'ic-status/shutdown-error':
+        console.log("shutdown error");
+        return state;
 
       default:
         return super.reduce(state, action);
diff --git a/src/ic/ics.js b/src/ic/ics.js
index c582503..4f8e2eb 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -365,8 +365,25 @@ class InfrastructureComponents extends Component {
     this.setState({ icModal: true, modalIC: ic, modalICStatus: icStatus, modalICGraph: icGraph, modalIndex: index })
   }
 
-  sendControlCommand(command){
-    console.log(command);
+  sendControlCommand(command,ic){
+    let splitWebsocketURL = ic.websocketurl.split("/");
+    
+    if(command === "restart"){
+      AppDispatcher.dispatch({
+        type: 'ic-status/restart',
+        url: ic.apiurl + "/restart",
+        socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
+        token: this.state.sessionToken,
+      });
+    }else if(command === "shutdown"){
+      AppDispatcher.dispatch({
+        type: 'ic-status/shutdown',
+        url: ic.apiurl + "/shutdown",
+        socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
+        token: this.state.sessionToken,
+      });
+    }
+
   }
 
   render() {
@@ -439,7 +456,7 @@ class InfrastructureComponents extends Component {
         <NewICDialog show={this.state.newModal} onClose={data => this.closeNewModal(data)} />
         <EditICDialog show={this.state.editModal} onClose={data => this.closeEditModal(data)} ic={this.state.modalIC} />
         <ImportICDialog show={this.state.importModal} onClose={data => this.closeImportModal(data)} />
-        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} icStatus={this.state.modalICStatus} icGraph={this.state.modalICGraph} sendControlCommand={(command) => this.sendControlCommand(command)}/>
+        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} icStatus={this.state.modalICStatus} icGraph={this.state.modalICGraph} sendControlCommand={(command, ic) => this.sendControlCommand(command, ic)}/>
 
         <DeleteDialog title="infrastructure-component" name={this.state.modalIC.name || 'Unknown'} show={this.state.deleteModal} onClose={(e) => this.closeDeleteModal(e)} />
       </div>

From ba81bf14e6e88f567fdc6d01ce827e05b59f6d03 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sat, 12 Dec 2020 17:31:22 +0100
Subject: [PATCH 12/74] IC status and graph now load as soon as ICs are loaded
 #265

---
 src/ic/ic-store.js | 21 +++++++++++++++++++++
 src/ic/ics.js      | 20 --------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/ic/ic-store.js b/src/ic/ic-store.js
index d73e555..78e90ac 100644
--- a/src/ic/ic-store.js
+++ b/src/ic/ic-store.js
@@ -19,6 +19,7 @@ import ArrayStore from '../common/array-store';
 import ICsDataManager from './ics-data-manager';
 import ICDataDataManager from './ic-data-data-manager';
 import NotificationsDataManager from "../common/data-managers/notifications-data-manager";
+import AppDispatcher from '../common/app-dispatcher';
 
 class InfrastructureComponentStore extends ArrayStore {
   constructor() {
@@ -28,6 +29,26 @@ class InfrastructureComponentStore extends ArrayStore {
   reduce(state, action) {
     switch(action.type) {
       case 'ics/loaded':
+        action.data.forEach(ic => {
+          if (ic.type === "villas-node" || ic.type === "villas-relay") {
+            let splitWebsocketURL = ic.websocketurl.split("/");
+            AppDispatcher.dispatch({
+              type: 'ic-status/get-status',
+              url: ic.apiurl + "/status",
+              socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
+              token: action.token,
+              icid: ic.id,
+            });
+  
+            AppDispatcher.dispatch({
+              type: 'ic-graph/get-graph',
+              url: ic.apiurl + "/graph.svg",
+              socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
+              token: action.token,
+              icid: ic.id,
+            });
+          }
+        })
 
         return super.reduce(state, action);
 
diff --git a/src/ic/ics.js b/src/ic/ics.js
index 4f8e2eb..fed6de5 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -119,26 +119,6 @@ class InfrastructureComponents extends Component {
         token: this.state.sessionToken,
       });
 
-      this.state.ics.forEach(ic => {
-        if (ic.type === "villas-node" || ic.type === "villas-relay") {
-          let splitWebsocketURL = ic.websocketurl.split("/");
-          AppDispatcher.dispatch({
-            type: 'ic-status/get-status',
-            url: ic.apiurl + "/status",
-            socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
-            token: this.state.sessionToken,
-            icid: ic.id,
-          });
-
-          AppDispatcher.dispatch({
-            type: 'ic-graph/get-graph',
-            url: ic.apiurl + "/graph.svg",
-            socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
-            token: this.state.sessionToken,
-            icid: ic.id,
-          });
-        }
-      })
     }
   }
 

From 6d59f83002cefaf79ed857652c610cdfc0876111 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sat, 12 Dec 2020 20:08:22 +0100
Subject: [PATCH 13/74] Format IC dialog window #265

---
 src/ic/ic-dialog.js | 51 ++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 4e0e9a4..9b29d9c 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {FormLabel, Button} from 'react-bootstrap';
+import {Button, Row, Col} from 'react-bootstrap';
 import Dialog from '../common/dialogs/dialog';
 import {Collapse} from 'react-collapse';
 import Icon from "../common/icon";
@@ -47,6 +47,9 @@ class ICDialog extends React.Component {
   
   render() {
 
+    let icStatus = this.props.icStatus;
+    delete icStatus['icID'];
+
     let objectURL=''
     if(typeof this.props.icGraph !== "undefined") {
       objectURL = this.props.icGraph.objectURL
@@ -55,46 +58,52 @@ class ICDialog extends React.Component {
     return (
       <Dialog
         show={this.props.show}
-        title="Infos and Controls"
-        buttonTitle="Save"
+        title="Status and Controls"
+        buttonTitle="Close"
         onClose={(c) => this.onClose(c)}
         valid={true}
-        size='lg'
+        size='xl'
+        blendOutCancel = {true}
       >
         <form>
-          <FormLabel>Status</FormLabel>
+        <Row>
+        <Col>
+          <h5>Status:</h5>
           {
-            typeof this.props.icStatus !== "undefined" && Object.keys(this.props.icStatus).map(statusKey => (
-              typeof this.props.icStatus[statusKey] === 'object' ?
+            typeof icStatus !== "undefined" && Object.keys(icStatus).map(statusKey => (
+              typeof icStatus[statusKey] === 'object' ?
               (<div>
                 <Button variant="light" onClick={() => this.showFurtherInfo(statusKey)}  >{statusKey}
                 <Icon icon='chevron-down' style={{color: '#007bff'}}/></Button>
                   <Collapse isOpened={this.state[statusKey]} >
                     {
-                      Object.keys(this.props.icStatus[statusKey]).map(key => (
-                        typeof this.props.icStatus[statusKey][key] === 'object' ?
+                      Object.keys(icStatus[statusKey]).map(key => (
+                        typeof icStatus[statusKey][key] === 'object' ?
                           (<div>
                             <Button variant="light" onClick={() => this.showFurtherInfo(key)}  >{key}
                               <Icon icon='chevron-down' style={{ color: '#007bff' }} /></Button>
                             <Collapse isOpened={this.state[key]} >
 
-                              {Object.keys(this.props.icStatus[statusKey][key]).map(index => (
-                                <div>{index + ": " + this.props.icStatus[statusKey][key][index]}</div>
+                              {Object.keys(icStatus[statusKey][key]).map(index => (
+                                <div>{index + ": " + icStatus[statusKey][key][index]}</div>
                               ))}
                             </Collapse>
                           </div>)
                           :
-                          (<div>{key + ": " + this.props.icStatus[statusKey][key]}</div>)
+                          (<div>{key + ": " + icStatus[statusKey][key]}</div>)
                       ))
                     }
                   </Collapse>
 
               </div>) 
               :
-              (<div>{statusKey + ": " + this.props.icStatus[statusKey]}</div>)
+              (<div>{statusKey + ": " + icStatus[statusKey]}</div>)
             ))
           }
-          <div>Graph:</div>
+          </Col>
+          
+          <Col>
+          <h5>Graph:</h5>
           <div>
             {objectURL !== '' ? (
               <img onError={(e) => this.graphError(e)} alt={"Error"} src={objectURL} />
@@ -102,14 +111,18 @@ class ICDialog extends React.Component {
                 <img alt="Error" />
               )}
           </div>
-        </form>
         
-        <div>Controls</div>
-        <Button onClick={() => this.setState({ confirmCommand: true, command: 'restart' })}>Restart</Button>
-        <Button onClick={() => this.setState({ confirmCommand: true, command: 'shutdown' })}>Shutdown</Button>
+        
+        <h5>Controls:</h5>
+        <div>
+        <Button style={{ margin: '5px' }} size='lg' onClick={() => this.setState({ confirmCommand: true, command: 'restart' })}>Restart</Button>
+        <Button style={{ margin: '5px' }} size='lg' onClick={() => this.setState({ confirmCommand: true, command: 'shutdown' })}>Shutdown</Button>
+        </div>
 
         <ConfirmCommand show={this.state.confirmCommand} command={this.state.command} name={this.props.ic.name} onClose={c => this.closeConfirmModal(c)} />
-
+        </Col>
+        </Row>
+        </form>
       </Dialog>
       
     );

From 04ebd23d8f20f79512263f3bde5ed2b81a742849 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 13 Dec 2020 14:57:39 +0100
Subject: [PATCH 14/74] Time Offset Widget: fix label #208

---
 src/widget/widgets/time-offset.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/widget/widgets/time-offset.js b/src/widget/widgets/time-offset.js
index 819ecde..34a91da 100644
--- a/src/widget/widgets/time-offset.js
+++ b/src/widget/widgets/time-offset.js
@@ -49,6 +49,7 @@ class WidgetTimeOffset extends Component {
   }
 
   render() {
+    let bottomText = this.props.widget.customProperties.icID !== -1 ? "" : "selected";
     return (
       <div className="time-offset">
       {this.props.widget.customProperties.icID !== -1 ? 
@@ -63,7 +64,7 @@ class WidgetTimeOffset extends Component {
       (
       <span>{this.state.timeOffset}s</span>)
       :
-      (<span>selected</span>)
+      (<span>{bottomText}</span>)
       }
       </div>
     );

From 794082320aa1177ddf1e4e2f11d65d6d094e15bd Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Tue, 29 Dec 2020 15:57:58 +0100
Subject: [PATCH 15/74] Time Offset Widget: check connection status #208

---
 src/common/api/websocket-api.js   | 16 +++++++++
 src/widget/websocket-store.js     | 59 +++++++++++++++++++++++++++++++
 src/widget/widget.js              | 11 +++++-
 src/widget/widgets/time-offset.js | 32 ++++++++++++-----
 4 files changed, 109 insertions(+), 9 deletions(-)
 create mode 100644 src/widget/websocket-store.js

diff --git a/src/common/api/websocket-api.js b/src/common/api/websocket-api.js
index 89a1ee6..1462f39 100644
--- a/src/common/api/websocket-api.js
+++ b/src/common/api/websocket-api.js
@@ -14,6 +14,8 @@
  * You should have received a copy of the GNU General Public License
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
+import NotificationsDataManager from "../data-managers/notifications-data-manager";
+import AppDispatcher from '../app-dispatcher';
 
 class WebsocketAPI {
   constructor(websocketurl, callbacks) {
@@ -65,6 +67,10 @@ class WebsocketAPI {
   }
 
   onOpen = e => {
+    AppDispatcher.dispatch({
+      type: 'websocket/connected',
+      data: this.websocketurl,
+    });    
     this.wasConnected = true;
 
     if ('onOpen' in this.callbacks)
@@ -78,6 +84,16 @@ class WebsocketAPI {
     }
     else {
       if (this.wasConnected) {
+        AppDispatcher.dispatch({
+          type: 'websocket/connection-error',
+          data: this.websocketurl,
+        });
+        const IC_WEBSOCKET_CONNECTION_ERROR = {
+          title: 'Websocket connection warning',
+          message: "Connection to " + this.websocketurl + " dropped. Attempt reconnect in 1 sec",
+          level: 'warning'
+        };
+        NotificationsDataManager.addNotification(IC_WEBSOCKET_CONNECTION_ERROR);
         console.log("Connection to " + this.websocketurl + " dropped. Attempt reconnect in 1 sec");
         window.setTimeout(() => { this.reconnect(); }, 1000);
       }
diff --git a/src/widget/websocket-store.js b/src/widget/websocket-store.js
new file mode 100644
index 0000000..0665cf9
--- /dev/null
+++ b/src/widget/websocket-store.js
@@ -0,0 +1,59 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import ArrayStore from '../common/array-store';
+
+class WebsocketStore extends ArrayStore {
+
+    updateSocketStatus(state, socket) {
+        let checkInclusion = false;
+        state.forEach((element) => {
+            if (element.url === socket.url) {
+                element.connected = socket.connected;
+                checkInclusion = true;
+            }
+        })
+        if (!checkInclusion) {
+            state.push(socket);
+        }
+        this.__emitChange();
+
+        return state;
+    }
+
+    reduce(state, action) {
+        let tempSocket = {};
+        switch (action.type) {
+
+            case 'websocket/connected':
+                tempSocket.url = action.data;
+                tempSocket.connected = true;
+                return this.updateSocketStatus(state, tempSocket);
+
+            case 'websocket/connection-error':
+                tempSocket.url = action.data;
+                tempSocket.connected = false;
+                return this.updateSocketStatus(state, tempSocket);
+
+
+            default:
+                return super.reduce(state, action);
+        }
+    }
+}
+
+export default new WebsocketStore();
diff --git a/src/widget/widget.js b/src/widget/widget.js
index bca9e5b..1523545 100644
--- a/src/widget/widget.js
+++ b/src/widget/widget.js
@@ -23,6 +23,8 @@ import ICDataStore from '../ic/ic-data-store';
 import ConfigsStore from '../componentconfig/config-store';
 import FileStore from '../file/file-store';
 import SignalStore from '../signal/signal-store'
+import WebsocketStore from './websocket-store'
+import ICStore from '../ic/ic-store';
 
 import WidgetCustomAction from './widgets/custom-action';
 import WidgetAction from './widgets/action';
@@ -47,11 +49,14 @@ import '../styles/widgets.css';
 
 class Widget extends React.Component {
   static getStores() {
-    return [ ICDataStore, ConfigsStore, FileStore, SignalStore];
+    return [ ICDataStore, ConfigsStore, FileStore, SignalStore, WebsocketStore, ICStore];
   }
 
   static calculateState(prevState, props) {
 
+    let websockets = WebsocketStore.getState();
+    let ics = ICStore.getState();
+
     let icData = {};
 
     if (props.paused) {
@@ -79,6 +84,8 @@ class Widget extends React.Component {
     }
 
     return {
+      ics: ics,
+      websockets: websockets,
       icData: icData,
       signals: signals,
       icIDs: icIDs,
@@ -228,6 +235,8 @@ class Widget extends React.Component {
       return <WidgetTimeOffset
         widget={widget}
         data={this.state.icData}
+        websockets={this.state.websockets}
+        ics={this.state.ics}
       />
     }
 
diff --git a/src/widget/widgets/time-offset.js b/src/widget/widgets/time-offset.js
index 34a91da..48017ee 100644
--- a/src/widget/widgets/time-offset.js
+++ b/src/widget/widgets/time-offset.js
@@ -25,7 +25,8 @@ class WidgetTimeOffset extends Component {
 
     this.state = {
         timeOffset: '',
-        icID: ''
+        icID: '',
+        websocketOpen: false
     };
   }
 
@@ -42,13 +43,28 @@ class WidgetTimeOffset extends Component {
       return {timeOffset: -1};
     }
 
+    let ic = props.ics.find(ic => ic.id === parseInt(state.icID, 10));
+    let websocket = props.websockets.find(ws => ws.url === ic.websocketurl);
+
     let serverTime = props.data[state.icID].output.timestamp;
     let localTime = Date.now();
     let absoluteOffset = Math.abs(serverTime - localTime);
-    return {timeOffset: Number.parseFloat(absoluteOffset/1000).toPrecision(5)};
+    
+    if(typeof websocket === 'undefined'){
+      return {timeOffset: Number.parseFloat(absoluteOffset/1000).toPrecision(5)}
+    }
+    return {timeOffset: Number.parseFloat(absoluteOffset/1000).toPrecision(5), websocketOpen: websocket.connected};
   }
 
   render() {
+
+    let icSelected = " ";
+    if(!this.state.websocketOpen){
+      icSelected = "no connection";
+    } else if (this.props.widget.customProperties.showOffset){
+      icSelected = this.state.timeOffset + 's';
+    }
+
     let bottomText = this.props.widget.customProperties.icID !== -1 ? "" : "selected";
     return (
       <div className="time-offset">
@@ -56,15 +72,15 @@ class WidgetTimeOffset extends Component {
       (<span>IC: {this.state.icID}</span>) : (<span>no IC</span>)
       }        
         <TrafficLight Horizontal={this.props.widget.customProperties.horizontal} width={this.props.widget.width} height={this.props.widget.height}
-        RedOn={this.props.widget.customProperties.threshold_red <= this.state.timeOffset}
-        YellowOn={(this.props.widget.customProperties.threshold_yellow <= this.state.timeOffset) && (this.state.timeOffset < this.props.widget.customProperties.threshold_red)}
-        GreenOn={this.state.timeOffset < this.props.widget.customProperties.threshold_yellow}
+        RedOn={(this.props.widget.customProperties.threshold_red <= this.state.timeOffset) || !this.state.websocketOpen}
+        YellowOn={(this.props.widget.customProperties.threshold_yellow <= this.state.timeOffset) && (this.state.timeOffset < this.props.widget.customProperties.threshold_red) && this.state.websocketOpen}
+        GreenOn={(this.state.timeOffset < this.props.widget.customProperties.threshold_yellow) && this.state.websocketOpen}
       />
-      {this.props.widget.customProperties.showOffset && this.props.widget.customProperties.icID !== -1 ? 
+      {this.props.widget.customProperties.icID !== -1 ? 
       (
-      <span>{this.state.timeOffset}s</span>)
+      <span>{icSelected}</span>)
       :
-      (<span>{bottomText}</span>)
+      (<span>"selected"</span>)
       }
       </div>
     );

From cbec6fe88a014712b1b1e6bd88b3d30d0a570df9 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Tue, 29 Dec 2020 16:36:25 +0100
Subject: [PATCH 16/74] solve warning and error

---
 src/ic/ic-dialog.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 9b29d9c..6e225a5 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -16,9 +16,18 @@ class ICDialog extends React.Component {
     this.state = {
       confirmCommand: false,
       command: '',
+      icStatus: {}
     };
   }
 
+  static getDerivedStateFromProps(props, state){
+    if(typeof props.icStatus !== 'undefined'){
+      return {icStatus: props.icStatus}
+    } else {
+      return {}
+    }
+  }
+
   onClose(canceled) {
     this.props.onClose();
   }
@@ -47,7 +56,7 @@ class ICDialog extends React.Component {
   
   render() {
 
-    let icStatus = this.props.icStatus;
+    let icStatus = this.state.icStatus;
     delete icStatus['icID'];
 
     let objectURL=''
@@ -72,32 +81,32 @@ class ICDialog extends React.Component {
           {
             typeof icStatus !== "undefined" && Object.keys(icStatus).map(statusKey => (
               typeof icStatus[statusKey] === 'object' ?
-              (<div>
+              (<div key={statusKey}>
                 <Button variant="light" onClick={() => this.showFurtherInfo(statusKey)}  >{statusKey}
                 <Icon icon='chevron-down' style={{color: '#007bff'}}/></Button>
                   <Collapse isOpened={this.state[statusKey]} >
                     {
                       Object.keys(icStatus[statusKey]).map(key => (
                         typeof icStatus[statusKey][key] === 'object' ?
-                          (<div>
+                          (<div key={key}>
                             <Button variant="light" onClick={() => this.showFurtherInfo(key)}  >{key}
                               <Icon icon='chevron-down' style={{ color: '#007bff' }} /></Button>
                             <Collapse isOpened={this.state[key]} >
 
                               {Object.keys(icStatus[statusKey][key]).map(index => (
-                                <div>{index + ": " + icStatus[statusKey][key][index]}</div>
+                                <div key={index}>{index + ": " + icStatus[statusKey][key][index]}</div>
                               ))}
                             </Collapse>
                           </div>)
                           :
-                          (<div>{key + ": " + icStatus[statusKey][key]}</div>)
+                          (<div key={key}>{key + ": " + icStatus[statusKey][key]}</div>)
                       ))
                     }
                   </Collapse>
 
               </div>) 
               :
-              (<div>{statusKey + ": " + icStatus[statusKey]}</div>)
+              (<div key={statusKey}>{statusKey + ": " + icStatus[statusKey]}</div>)
             ))
           }
           </Col>

From 826dc6a90a3750a08ed50f5dfb5debbee805546f Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Wed, 30 Dec 2020 20:34:35 +0100
Subject: [PATCH 17/74] make color scheme of Button Widget editable

---
 src/widget/edit-widget/color-picker.js                | 2 +-
 src/widget/edit-widget/edit-widget-color-control.js   | 2 +-
 src/widget/edit-widget/edit-widget-control-creator.js | 5 ++++-
 src/widget/widget-factory.js                          | 4 +++-
 src/widget/widgets/button.js                          | 9 +++++++++
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/widget/edit-widget/color-picker.js b/src/widget/edit-widget/color-picker.js
index 2861333..03f40a4 100644
--- a/src/widget/edit-widget/color-picker.js
+++ b/src/widget/edit-widget/color-picker.js
@@ -94,7 +94,7 @@ class ColorPicker extends React.Component {
       isCustomProperty = false;
     }
 
-    if((this.state.widget.type === "Box" && parts[1] === "border_color") || this.props.controlId === 'strokeStyle'){
+    if((this.state.widget.type === "Box" && parts[1] === "border_color") || this.props.controlId === 'strokeStyle' || this.state.widget.type === "Button" && (parts[1] === "border_color" || parts[1] === "font_color")){
       disableOpacity = true;
     }
     if(this.props.controlId === 'strokeStyle'){
diff --git a/src/widget/edit-widget/edit-widget-color-control.js b/src/widget/edit-widget/edit-widget-color-control.js
index c50039f..d2b8dc1 100644
--- a/src/widget/edit-widget/edit-widget-color-control.js
+++ b/src/widget/edit-widget/edit-widget-color-control.js
@@ -82,7 +82,7 @@ class EditWidgetColorControl extends Component {
     }
 
     let tooltipText = "Change color and opacity";
-    if(this.state.widget.type === "Box" && parts[1] === "border_color"){
+    if(this.state.widget.type === "Box" && parts[1] === "border_color" || this.state.widget.type === "Button" && (parts[1] === "border_color" || parts[1] === "font_color")){
       tooltipText = "Change border color";
     }
 
diff --git a/src/widget/edit-widget/edit-widget-control-creator.js b/src/widget/edit-widget/edit-widget-control-creator.js
index bb0d5b5..6247205 100644
--- a/src/widget/edit-widget/edit-widget-control-creator.js
+++ b/src/widget/edit-widget/edit-widget-control-creator.js
@@ -115,7 +115,10 @@ export default function CreateControls(widgetType = null, widget = null, session
                 <EditWidgetSignalControl key={1} widget={widget} controlId={'signalIDs'} input signals={signals} handleChange={(e) => handleChange(e)} direction={'in'}/>,
                 <EditWidgetCheckboxControl key={2} widget={widget} controlId={'customProperties.toggle'} input text="Toggle" handleChange={e => handleChange(e)} />,
                 <EditWidgetNumberControl key={3} widget={widget} controlId={'customProperties.on_value'} label={'On Value'} defaultValue={1} handleChange={(e) => handleChange(e)} />,
-                <EditWidgetNumberControl key={4} widget={widget} controlId={'customProperties.off_value'} label={'Off Value'} defaultValue={0} handleChange={(e) => handleChange(e)} />
+                <EditWidgetNumberControl key={4} widget={widget} controlId={'customProperties.off_value'} label={'Off Value'} defaultValue={0} handleChange={(e) => handleChange(e)} />,
+                <EditWidgetColorControl key={5} widget={widget} controlId={'customProperties.background_color'} label={'Background Color and Opacity'} handleChange={(e) => handleChange(e)} />,
+                <EditWidgetColorControl key={6} widget={widget} controlId={'customProperties.border_color'} label={'Border Color'} handleChange={(e) => handleChange(e)} />,
+                <EditWidgetColorControl key={7} widget={widget} controlId={'customProperties.font_color'} label={'Font Color'} handleChange={(e) => handleChange(e)} />,
             );
             break;
         case 'Box':
diff --git a/src/widget/widget-factory.js b/src/widget/widget-factory.js
index 00dd41e..d21f2bb 100644
--- a/src/widget/widget-factory.js
+++ b/src/widget/widget-factory.js
@@ -122,8 +122,10 @@ class WidgetFactory {
                 widget.minHeight = 50;
                 widget.width = 100;
                 widget.height = 100;
-                widget.customProperties.background_color = '#4287f5';
+                widget.customProperties.background_color = '#527984';
                 widget.customProperties.font_color = '#4287f5';
+                widget.customProperties.border_color = '#4287f5';
+                widget.customProperties.background_color_opacity = 1;
                 widget.customProperties.on_value = 1;
                 widget.customProperties.off_value = 0;
                 widget.customProperties.toggle = false;
diff --git a/src/widget/widgets/button.js b/src/widget/widgets/button.js
index e95e740..897e1d9 100644
--- a/src/widget/widgets/button.js
+++ b/src/widget/widgets/button.js
@@ -59,10 +59,19 @@ class WidgetButton extends Component {
   }
 
   render() {
+
+    const buttonStyle = {
+      backgroundColor: this.props.widget.customProperties.background_color, 
+      borderColor: this.props.widget.customProperties.border_color,
+      color: this.props.widget.customProperties.font_color,
+      opacity: this.props.widget.customProperties.background_color_opacity
+    };
+
     return (
       <div className="button-widget full">
           <Button
             className="full"
+            style={buttonStyle}
             active={ this.state.pressed }
             disabled={ this.props.editing }
             onMouseDown={ (e) => this.onPress(e) }

From f5ad08e888a3c8472ae6c27b63bc2a8427527cd8 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Wed, 30 Dec 2020 21:01:21 +0100
Subject: [PATCH 18/74] implement better way to disable color picker opacity

---
 src/widget/edit-widget/color-picker.js         |  7 ++-----
 .../edit-widget/edit-widget-color-control.js   |  4 ++--
 .../edit-widget/edit-widget-control-creator.js | 18 +++++++++---------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/widget/edit-widget/color-picker.js b/src/widget/edit-widget/color-picker.js
index 03f40a4..f49700b 100644
--- a/src/widget/edit-widget/color-picker.js
+++ b/src/widget/edit-widget/color-picker.js
@@ -85,7 +85,7 @@ class ColorPicker extends React.Component {
   };
 
   render() {
-    let disableOpacity = false;
+
     let hexColor;
     let opacity = 1;
     let parts = this.props.controlId.split('.');
@@ -94,9 +94,6 @@ class ColorPicker extends React.Component {
       isCustomProperty = false;
     }
 
-    if((this.state.widget.type === "Box" && parts[1] === "border_color") || this.props.controlId === 'strokeStyle' || this.state.widget.type === "Button" && (parts[1] === "border_color" || parts[1] === "font_color")){
-      disableOpacity = true;
-    }
     if(this.props.controlId === 'strokeStyle'){
       if(typeof this.state.widget.customProperties.zones[this.props.zoneIndex] !== 'undefined'){
     hexColor = this.state.widget.customProperties.zones[this.props.zoneIndex]['strokeStyle'];
@@ -117,7 +114,7 @@ class ColorPicker extends React.Component {
           <form>
               <SketchPicker
                   color={rgbColor}
-                  disableAlpha={disableOpacity} 
+                  disableAlpha={this.props.disableOpacity} 
                   onChangeComplete={ this.handleChangeComplete }
                   width={"300"}
               />
diff --git a/src/widget/edit-widget/edit-widget-color-control.js b/src/widget/edit-widget/edit-widget-color-control.js
index d2b8dc1..aba342e 100644
--- a/src/widget/edit-widget/edit-widget-color-control.js
+++ b/src/widget/edit-widget/edit-widget-color-control.js
@@ -82,7 +82,7 @@ class EditWidgetColorControl extends Component {
     }
 
     let tooltipText = "Change color and opacity";
-    if(this.state.widget.type === "Box" && parts[1] === "border_color" || this.state.widget.type === "Button" && (parts[1] === "border_color" || parts[1] === "font_color")){
+    if(this.props.disableOpacity){
       tooltipText = "Change border color";
     }
 
@@ -99,7 +99,7 @@ class EditWidgetColorControl extends Component {
         </OverlayTrigger>
         </div>
 
-        <ColorPicker show={this.state.showColorPicker} onClose={(data) => this.closeEditModal(data)} widget={this.state.widget} controlId={this.props.controlId} />
+        <ColorPicker show={this.state.showColorPicker} onClose={(data) => this.closeEditModal(data)} widget={this.state.widget} controlId={this.props.controlId} disableOpacity={this.props.disableOpacity}/>
       </FormGroup>
 
     )
diff --git a/src/widget/edit-widget/edit-widget-control-creator.js b/src/widget/edit-widget/edit-widget-control-creator.js
index 6247205..da3d7b6 100644
--- a/src/widget/edit-widget/edit-widget-control-creator.js
+++ b/src/widget/edit-widget/edit-widget-control-creator.js
@@ -62,8 +62,8 @@ export default function CreateControls(widgetType = null, widget = null, session
               DialogControls.push(
                 <EditWidgetSignalControl key={0} widget={widget} controlId={'signalIDs'} signals={signals} handleChange={(e) => handleChange(e)} direction={'out'}/>,
                 <EditWidgetTextControl key={1} widget={widget} controlId={'customProperties.threshold'} label={'Threshold'} placeholder={'0.5'} handleChange={e => handleChange(e)} />,
-                <EditWidgetColorControl key={2} widget={widget} controlId={'customProperties.on_color'} label={'Color On'} handleChange={(e) => handleChange(e)} />,
-                <EditWidgetColorControl key={3} widget={widget} controlId={'customProperties.off_color'} label={'Color Off'} handleChange={(e) => handleChange(e)} />,
+                <EditWidgetColorControl key={2} widget={widget} controlId={'customProperties.on_color'} label={'Color On'} handleChange={(e) => handleChange(e)} disableOpacity={false}/>,
+                <EditWidgetColorControl key={3} widget={widget} controlId={'customProperties.off_color'} label={'Color Off'} handleChange={(e) => handleChange(e)} disableOpacity={false}/>,
               );
               break;
         case 'Plot':
@@ -116,22 +116,22 @@ export default function CreateControls(widgetType = null, widget = null, session
                 <EditWidgetCheckboxControl key={2} widget={widget} controlId={'customProperties.toggle'} input text="Toggle" handleChange={e => handleChange(e)} />,
                 <EditWidgetNumberControl key={3} widget={widget} controlId={'customProperties.on_value'} label={'On Value'} defaultValue={1} handleChange={(e) => handleChange(e)} />,
                 <EditWidgetNumberControl key={4} widget={widget} controlId={'customProperties.off_value'} label={'Off Value'} defaultValue={0} handleChange={(e) => handleChange(e)} />,
-                <EditWidgetColorControl key={5} widget={widget} controlId={'customProperties.background_color'} label={'Background Color and Opacity'} handleChange={(e) => handleChange(e)} />,
-                <EditWidgetColorControl key={6} widget={widget} controlId={'customProperties.border_color'} label={'Border Color'} handleChange={(e) => handleChange(e)} />,
-                <EditWidgetColorControl key={7} widget={widget} controlId={'customProperties.font_color'} label={'Font Color'} handleChange={(e) => handleChange(e)} />,
+                <EditWidgetColorControl key={5} widget={widget} controlId={'customProperties.background_color'} label={'Background Color and Opacity'} handleChange={(e) => handleChange(e)} disableOpacity={false}/>,
+                <EditWidgetColorControl key={6} widget={widget} controlId={'customProperties.border_color'} label={'Border Color'} handleChange={(e) => handleChange(e)} disableOpacity={true}/>,
+                <EditWidgetColorControl key={7} widget={widget} controlId={'customProperties.font_color'} label={'Font Color'} handleChange={(e) => handleChange(e)} disableOpacity={true}/>,
             );
             break;
         case 'Box':
             DialogControls.push(
-                <EditWidgetColorControl key={0} widget={widget} controlId={'customProperties.border_color'} label={'Border color'} handleChange={(e) => handleChange(e)} />,
-                <EditWidgetColorControl key={1} widget={widget} controlId={'customProperties.background_color'} label={'Background color'} handleChange={e => handleChange(e)} />,
+                <EditWidgetColorControl key={0} widget={widget} controlId={'customProperties.background_color'} label={'Background Color and Opacity'} handleChange={e => handleChange(e)} disableOpacity={false}/>,
+                <EditWidgetColorControl key={1} widget={widget} controlId={'customProperties.border_color'} label={'Border Color'} handleChange={(e) => handleChange(e)} disableOpacity={true}/>,
             );
             break;
         case 'Label':
             DialogControls.push(
                 <EditWidgetTextControl key={0} widget={widget} controlId={'name'} label={'Text'} placeholder={'Enter text'} handleChange={e => handleChange(e)} />,
                 <EditWidgetTextSizeControl key={1} widget={widget} handleChange={e => handleChange(e)} />,
-                <EditWidgetColorControl key={2} widget={widget} controlId={'customProperties.fontColor'} label={'Text color'} handleChange={e => handleChange(e)} />
+                <EditWidgetColorControl key={2} widget={widget} controlId={'customProperties.fontColor'} label={'Text color'} handleChange={e => handleChange(e)} disableOpacity={false}/>
             );
             break;
         /*case 'HTML':
@@ -155,7 +155,7 @@ export default function CreateControls(widgetType = null, widget = null, session
             break;
         case 'Line':
             DialogControls.push(
-                <EditWidgetColorControl key={0} widget={widget} controlId={'customProperties.border_color'} label={'Line color'} handleChange={(e) => handleChange(e)} />,
+                <EditWidgetColorControl key={0} widget={widget} controlId={'customProperties.border_color'} label={'Line color'} handleChange={(e) => handleChange(e)} disableOpacity={false}/>,
                 <EditWidgetNumberControl key={1} widget={widget} controlId={'customProperties.rotation'} label={'Rotation (degrees)'} defaultValue={0} handleChange={(e) => handleChange(e)} />,
                 <EditWidgetNumberControl key={2} widget={widget} controlId={'customProperties.border_width'} label={'Line width'} defaultValue={0} handleChange={(e) => handleChange(e)} />
             );

From 09c75c4f187f4a841a358e7dde17dcc7739073f0 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 3 Jan 2021 15:40:37 +0100
Subject: [PATCH 19/74] Plot Widget: make line colors editable #275

---
 src/widget/edit-widget/color-picker.js        |  10 +-
 .../edit-widget-color-zones-control.js        |   4 +-
 .../edit-widget-control-creator.js            |   6 +-
 .../edit-widget-plot-colors-control.js        | 101 ++++++++++++++++++
 src/widget/widget-factory.js                  |   1 +
 src/widget/widget-plot/plot-legend.js         |  11 +-
 src/widget/widget-plot/plot.js                |  11 +-
 src/widget/widgets/plot.js                    |   4 +-
 8 files changed, 135 insertions(+), 13 deletions(-)
 create mode 100644 src/widget/edit-widget/edit-widget-plot-colors-control.js

diff --git a/src/widget/edit-widget/color-picker.js b/src/widget/edit-widget/color-picker.js
index f49700b..a8e6615 100644
--- a/src/widget/edit-widget/color-picker.js
+++ b/src/widget/edit-widget/color-picker.js
@@ -55,6 +55,9 @@ class ColorPicker extends React.Component {
     if(this.props.controlId === 'strokeStyle'){
       temp.customProperties.zones[this.props.zoneIndex]['strokeStyle'] = color.hex;
     }
+    else if(this.props.controlId === 'lineColor'){
+      temp.customProperties.lineColors[this.props.lineIndex] = color.hex;
+    }
     else{
     let parts = this.props.controlId.split('.');
     let isCustomProperty = true;
@@ -96,7 +99,12 @@ class ColorPicker extends React.Component {
 
     if(this.props.controlId === 'strokeStyle'){
       if(typeof this.state.widget.customProperties.zones[this.props.zoneIndex] !== 'undefined'){
-    hexColor = this.state.widget.customProperties.zones[this.props.zoneIndex]['strokeStyle'];
+        hexColor = this.state.widget.customProperties.zones[this.props.zoneIndex]['strokeStyle'];
+      }
+    }
+    else if(this.props.controlId === 'lineColor'){
+      if(typeof this.state.widget.customProperties.lineColors[this.props.lineIndex] !== 'undefined'){
+        hexColor = this.state.widget.customProperties.lineColors[this.props.lineIndex];
       }
     }
     else{
diff --git a/src/widget/edit-widget/edit-widget-color-zones-control.js b/src/widget/edit-widget/edit-widget-color-zones-control.js
index 4ade39f..415fbd0 100644
--- a/src/widget/edit-widget/edit-widget-color-zones-control.js
+++ b/src/widget/edit-widget/edit-widget-color-zones-control.js
@@ -191,7 +191,7 @@ class EditWidgetColorZonesControl extends React.Component {
     }
     
     return <FormGroup>
-      <FormLabel>Color zones</FormLabel>
+      <FormLabel>Color Zones</FormLabel>
       <Button  onClick={this.addZone} style={{marginBottom: '10px', marginLeft: '120px'}} disabled={!this.props.widget.customProperties.colorZones}><Icon size='xs' icon="plus" /></Button>
 
     <div>
@@ -205,8 +205,6 @@ class EditWidgetColorZonesControl extends React.Component {
               height: '40px'
             }
             
-
-
             return (<Button
               style={style} key={idx} onClick={i => this.editColorZone(idx)} disabled={!this.props.widget.customProperties.colorZones}><Icon icon="pen" /></Button>
             )
diff --git a/src/widget/edit-widget/edit-widget-control-creator.js b/src/widget/edit-widget/edit-widget-control-creator.js
index da3d7b6..1153569 100644
--- a/src/widget/edit-widget/edit-widget-control-creator.js
+++ b/src/widget/edit-widget/edit-widget-control-creator.js
@@ -31,6 +31,7 @@ import EditWidgetCheckboxControl from './edit-widget-checkbox-control';
 import EditWidgetColorZonesControl from './edit-widget-color-zones-control';
 import EditWidgetMinMaxControl from './edit-widget-min-max-control';
 import EditWidgetParametersControl from './edit-widget-parameters-control';
+import EditWidgetPlotColorsControl from './edit-widget-plot-colors-control';
 //import EditWidgetHTMLContent from './edit-widget-html-content';
 
 export default function CreateControls(widgetType = null, widget = null, sessionToken = null, files = null, signals, handleChange) {
@@ -70,8 +71,9 @@ export default function CreateControls(widgetType = null, widget = null, session
             DialogControls.push(
                 <EditWidgetTimeControl key={0} widget={widget} controlId={'customProperties.time'} handleChange={(e) => handleChange(e)} />,
                 <EditWidgetSignalsControl key={1} widget={widget} controlId={'signalIDs'}  signals={signals} handleChange={(e) => handleChange(e)} direction={'out'}/>,
-                <EditWidgetTextControl key={2} widget={widget} controlId={'customProperties.ylabel'} label={'Y-Axis name'} placeholder={'Enter a name for the y-axis'}  handleChange={(e) => handleChange(e)} />,
-                <EditWidgetMinMaxControl key={3} widget={widget} controlId="customProperties.y" handleChange={e => handleChange(e)} />
+                <EditWidgetPlotColorsControl key={2} widget={widget} controlId={'customProperties.lineColors'} signals={signals} handleChange={(e) => handleChange(e)} />,
+                <EditWidgetTextControl key={3} widget={widget} controlId={'customProperties.ylabel'} label={'Y-Axis name'} placeholder={'Enter a name for the y-axis'}  handleChange={(e) => handleChange(e)} />,
+                <EditWidgetMinMaxControl key={4} widget={widget} controlId="customProperties.y" handleChange={e => handleChange(e)} />
             );
             break;
         case 'Table':
diff --git a/src/widget/edit-widget/edit-widget-plot-colors-control.js b/src/widget/edit-widget/edit-widget-plot-colors-control.js
new file mode 100644
index 0000000..567e84f
--- /dev/null
+++ b/src/widget/edit-widget/edit-widget-plot-colors-control.js
@@ -0,0 +1,101 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React, { Component } from 'react';
+import { FormGroup, OverlayTrigger, Tooltip , FormLabel, Button } from 'react-bootstrap';
+import ColorPicker from './color-picker'
+import Icon from "../../common/icon";
+
+// schemeCategory20 no longer available in d3
+
+class EditWidgetPlotColorsControl extends Component {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      widget: {},
+      showColorPicker: false,
+      originalColor: null,
+      selectedIndex: null
+    };
+  }
+
+  static getDerivedStateFromProps(props, state){
+    return {
+      widget: props.widget
+    };
+  }
+
+//same here
+
+  closeEditModal = (data) => {
+    this.setState({showColorPicker: false})
+    if(typeof data === 'undefined'){
+
+      let temp = this.state.widget;
+      temp.customProperties.lineColors[this.state.selectedIndex] = this.state.originalColor;
+      this.setState({ widget: temp });
+    }
+  }
+
+  editLineColor = (index) => {
+    if(this.state.selectedIndex !== index){
+        let color = this.state.widget.customProperties.lineColors[index];
+        this.setState({selectedIndex: index, showColorPicker: true, originalColor: color});
+        }
+        else{
+          this.setState({selectedIndex: null});
+        }
+  }
+  
+  render() {
+   
+    return (
+      <FormGroup>
+        <FormLabel>Line Colors</FormLabel>
+
+            <div>
+                {
+                    this.state.widget.signalIDs.map((signalID, idx) => {
+                        let color = this.state.widget.customProperties.lineColors[signalID];
+                        let width = 260 / this.state.widget.signalIDs.length;
+                        let style = {
+                            backgroundColor: color,
+                            width: width,
+                            height: '40px'
+                        }
+
+                        let signal = this.props.signals.find(signal => signal.id === signalID);
+                      
+                        return (<OverlayTrigger key={idx} placement={'bottom'} overlay={<Tooltip id={'tooltip-${"signal name"}'}>{signal.name}</Tooltip>}>
+                          <Button
+                            style={style} key={idx} onClick={i => this.editLineColor(signalID)} ><Icon icon="pen" /></Button>
+                            </OverlayTrigger>
+                        )
+                    })
+                }
+            </div>
+
+        <ColorPicker show={this.state.showColorPicker} onClose={(data) => this.closeEditModal(data)} widget={this.state.widget} lineIndex={this.state.selectedIndex} controlId={'lineColor'} disableOpacity={true}/>
+      </FormGroup>
+
+    )
+  }
+}
+
+export default EditWidgetPlotColorsControl;
diff --git a/src/widget/widget-factory.js b/src/widget/widget-factory.js
index d21f2bb..cc21b05 100644
--- a/src/widget/widget-factory.js
+++ b/src/widget/widget-factory.js
@@ -89,6 +89,7 @@ class WidgetFactory {
                 widget.customProperties.yMin = 0;
                 widget.customProperties.yMax = 10;
                 widget.customProperties.yUseMinMax = false;
+                widget.customProperties.lineColors = [];
                 break;
             case 'Table':
                 widget.minWidth = 200;
diff --git a/src/widget/widget-plot/plot-legend.js b/src/widget/widget-plot/plot-legend.js
index 75add6d..1ada30d 100644
--- a/src/widget/widget-plot/plot-legend.js
+++ b/src/widget/widget-plot/plot-legend.js
@@ -20,13 +20,17 @@ import { scaleOrdinal} from 'd3-scale';
 import {schemeCategory10} from 'd3-scale-chromatic'
 
 function Legend(props){
+ 
   const signal = props.sig;
   const hasScalingFactor = (signal.scalingFactor !== 1);
 
+  const newLineColor = scaleOrdinal(schemeCategory10);
+
+  let color = typeof props.lineColor === "undefined" ? newLineColor(signal.id) : props.lineColor;
 
   if(hasScalingFactor){
     return (
-      <li key={signal.id} className="signal-legend" style={{ color: props.colorScale(signal.id) }}>
+      <li key={signal.id} className="signal-legend" style={{ color: color }}>
       <span className="signal-legend-name">{signal.name}</span>
       <span style={{ marginLeft: '0.3em' }} className="signal-unit">{signal.unit}</span>
       <span style={{ marginLeft: '0.3em' }} className="signal-scale">{signal.scalingFactor}</span>
@@ -34,7 +38,7 @@ function Legend(props){
     )
   } else {
     return (
-      <li key={signal.id} className="signal-legend" style={{ color: props.colorScale(signal.id) }}>
+      <li key={signal.id} className="signal-legend" style={{ color: color }}>
         <span className="signal-legend-name">{signal.name}</span>
         <span style={{ marginLeft: '0.3em' }} className="signal-unit">{signal.unit}</span>
       </li>
@@ -45,13 +49,12 @@ function Legend(props){
 
 class PlotLegend extends React.Component {
   render() {
-    const colorScale = scaleOrdinal(schemeCategory10);
 
     return <div className="plot-legend">
       <ul>
         {
           this.props.signals.map( signal =>
-             <Legend key={signal.id} sig={signal} colorScale={colorScale}/>
+             <Legend key={signal.id} sig={signal} lineColor={this.props.lineColors[signal.id]}/>
         )}
       </ul>
     </div>;
diff --git a/src/widget/widget-plot/plot.js b/src/widget/widget-plot/plot.js
index 0b3d4a8..1677915 100644
--- a/src/widget/widget-plot/plot.js
+++ b/src/widget/widget-plot/plot.js
@@ -203,14 +203,21 @@ class Plot extends React.Component {
 
     // generate paths from data
     const sparkLine = line().x(p => xScale(p.x)).y(p => yScale(p.y));
-    const lineColor = scaleOrdinal(schemeCategory10);
+    const newLineColor = scaleOrdinal(schemeCategory10);
 
-    const lines = this.state.data.map((values, index) => <path d={sparkLine(values)} key={index} style={{ fill: 'none', stroke: lineColor(index) }} />);
+    const lines = this.state.data.map((values, index) => {
+      let signalID = this.props.signalIDs[index];
+      if (typeof this.props.lineColors[signalID] === "undefined") {
+        this.props.lineColors[signalID] = newLineColor(signalID);
+      }
+      return <path d={sparkLine(values)} key={index} style={{ fill: 'none', stroke: this.props.lineColors[signalID] }} />
+    });
 
     this.setState({ lines, xAxis, yAxis });
   }
 
   render() {
+
     const yLabelPos = {
       x: 12,
       y: this.props.height / 2
diff --git a/src/widget/widgets/plot.js b/src/widget/widgets/plot.js
index e87e7d1..1479081 100644
--- a/src/widget/widgets/plot.js
+++ b/src/widget/widgets/plot.js
@@ -103,9 +103,11 @@ class WidgetPlot extends React.Component {
           yUseMinMax={this.props.widget.customProperties.yUseMinMax}
           paused={this.props.paused}
           yLabel={this.props.widget.customProperties.ylabel}
+          lineColors={this.props.widget.customProperties.lineColors}
+          signalIDs={this.props.widget.signalIDs}
         />
       </div>
-      <PlotLegend signals={this.state.signals} />
+      <PlotLegend signals={this.state.signals} lineColors={this.props.widget.customProperties.lineColors} />
     </div>;
   }
 }

From 3d9263da3ce2bfc38a65c5f8880bcd29479c8ee2 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 3 Jan 2021 20:38:42 +0100
Subject: [PATCH 20/74] Time Offset Widget: add tooltip with IC name and offset
 #208

---
 src/widget/widgets/time-offset.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/widget/widgets/time-offset.js b/src/widget/widgets/time-offset.js
index 48017ee..6c6569b 100644
--- a/src/widget/widgets/time-offset.js
+++ b/src/widget/widgets/time-offset.js
@@ -17,6 +17,7 @@
 
 import React, { Component } from 'react';
 import TrafficLight from 'react-trafficlight';
+import {OverlayTrigger, Tooltip } from 'react-bootstrap';
 
 
 class WidgetTimeOffset extends Component {
@@ -26,6 +27,7 @@ class WidgetTimeOffset extends Component {
     this.state = {
         timeOffset: '',
         icID: '',
+        icName: '',
         websocketOpen: false
     };
   }
@@ -53,7 +55,7 @@ class WidgetTimeOffset extends Component {
     if(typeof websocket === 'undefined'){
       return {timeOffset: Number.parseFloat(absoluteOffset/1000).toPrecision(5)}
     }
-    return {timeOffset: Number.parseFloat(absoluteOffset/1000).toPrecision(5), websocketOpen: websocket.connected};
+    return {timeOffset: Number.parseFloat(absoluteOffset/1000).toPrecision(5), websocketOpen: websocket.connected, icName: ic.name};
   }
 
   render() {
@@ -64,23 +66,29 @@ class WidgetTimeOffset extends Component {
     } else if (this.props.widget.customProperties.showOffset){
       icSelected = this.state.timeOffset + 's';
     }
-
-    let bottomText = this.props.widget.customProperties.icID !== -1 ? "" : "selected";
+    
     return (
       <div className="time-offset">
       {this.props.widget.customProperties.icID !== -1 ? 
-      (<span>IC: {this.state.icID}</span>) : (<span>no IC</span>)
-      }        
+      (<span></span>) : (<span>no IC</span>)
+      }  
+      <OverlayTrigger key={0} placement={'left'} overlay={<Tooltip id={`tooltip-${"traffic-light"}`}>
+      {this.props.widget.customProperties.icID !== -1 ? 
+      (<span>{this.state.icName}<br></br>Offset: {this.state.timeOffset + "s"}</span>) 
+      : 
+      (<span>Please select Infrastructure Component</span>)}
+      </Tooltip>}>      
         <TrafficLight Horizontal={this.props.widget.customProperties.horizontal} width={this.props.widget.width} height={this.props.widget.height}
         RedOn={(this.props.widget.customProperties.threshold_red <= this.state.timeOffset) || !this.state.websocketOpen}
         YellowOn={(this.props.widget.customProperties.threshold_yellow <= this.state.timeOffset) && (this.state.timeOffset < this.props.widget.customProperties.threshold_red) && this.state.websocketOpen}
         GreenOn={(this.state.timeOffset < this.props.widget.customProperties.threshold_yellow) && this.state.websocketOpen}
       />
+      </OverlayTrigger>
       {this.props.widget.customProperties.icID !== -1 ? 
       (
       <span>{icSelected}</span>)
       :
-      (<span>"selected"</span>)
+      (<span>selected</span>)
       }
       </div>
     );

From 3a5d828d344ae58729c4fe0772ebe08fbcd83c8b Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Tue, 5 Jan 2021 12:03:35 +0100
Subject: [PATCH 21/74] update package-lock

---
 package-lock.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 745cbea..4479160 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3087,7 +3087,7 @@
     },
     "asynckit": {
       "version": "0.4.0",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "at-least-node": {
@@ -4540,7 +4540,7 @@
     },
     "core-util-is": {
       "version": "1.0.2",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
@@ -5234,7 +5234,7 @@
     },
     "delayed-stream": {
       "version": "1.0.0",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
@@ -5575,7 +5575,7 @@
     },
     "encoding": {
       "version": "0.1.12",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "requires": {
         "iconv-lite": "~0.4.13"
@@ -8071,9 +8071,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
     },
     "internal-ip": {
       "version": "4.3.0",
@@ -11097,7 +11097,7 @@
     },
     "methods": {
       "version": "1.1.2",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "microevent.ts": {
@@ -11865,7 +11865,7 @@
     },
     "object-assign": {
       "version": "4.1.1",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
@@ -12308,7 +12308,7 @@
     },
     "performance-now": {
       "version": "2.1.0",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "picomatch": {
@@ -14416,7 +14416,7 @@
     },
     "react-textarea-autosize": {
       "version": "6.1.0",
-      "resolved": "http://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
       "integrity": "sha512-F6bI1dgib6fSvG8so1HuArPUv+iVEfPliuLWusLF+gAKz0FbB4jLrWUrTAeq1afnPT2c9toEZYUdz/y1uKMy4A==",
       "requires": {
         "prop-types": "^15.6.0"
@@ -17161,7 +17161,7 @@
     },
     "util-deprecate": {
       "version": "1.0.2",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util.promisify": {

From 40f5b2286cfcf9258a2cd7b9113c71d16d96e7c3 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Tue, 5 Jan 2021 15:26:53 +0100
Subject: [PATCH 22/74] ICs: fix parameter transfer for new ICs, add opalrt as
 additional simulator type

---
 src/ic/edit-ic.js |  2 +-
 src/ic/new-ic.js  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/ic/edit-ic.js b/src/ic/edit-ic.js
index f2bd679..7ce6d5d 100644
--- a/src/ic/edit-ic.js
+++ b/src/ic/edit-ic.js
@@ -120,7 +120,7 @@ class EditICDialog extends React.Component {
     let typeOptions = [];
     switch(this.state.category){
       case "simulator":
-        typeOptions = ["dummy","generic","dpsim","rtlab","rscad"];
+        typeOptions = ["dummy","generic","dpsim","rtlab","rscad", "opalrt"];
         break;
       case "controller":
         typeOptions = ["kubernetes","villas-controller"];
diff --git a/src/ic/new-ic.js b/src/ic/new-ic.js
index 134c62b..4f52667 100644
--- a/src/ic/new-ic.js
+++ b/src/ic/new-ic.js
@@ -28,10 +28,13 @@ class NewICDialog extends React.Component {
     this.state = {
       name: '',
       websocketurl: '',
+      apiurl: '',
       uuid: '',
       type: '',
       category: '',
       managedexternally: false,
+      description: '',
+      location: ''
     };
   }
 
@@ -44,12 +47,18 @@ class NewICDialog extends React.Component {
           category: this.state.category,
           uuid: this.state.uuid,
           managedexternally: this.state.managedexternally,
+          location: this.state.location,
+          description: this.state.description
         };
 
         if (this.state.websocketurl != null && this.state.websocketurl !== "" && this.state.websocketurl !== 'http://') {
           data.websocketurl = this.state.websocketurl;
         }
 
+        if (this.state.apiurl != null && this.state.apiurl !== "" && this.state.apiurl !== 'http://') {
+          data.apiurl = this.state.apiurl;
+        }
+
         this.props.onClose(data);
         this.setState({managedexternally: false});
       }
@@ -69,7 +78,7 @@ class NewICDialog extends React.Component {
   }
 
   resetState() {
-    this.setState({ name: '', websocketurl: 'http://', uuid: this.uuidv4(), type: '', category: '', managedexternally: false});
+    this.setState({ name: '', websocketurl: 'http://', apiurl: 'http://', uuid: this.uuidv4(), type: '', category: '', managedexternally: false, description: '', location: ''});
   }
 
   validateForm(target) {
@@ -120,7 +129,7 @@ class NewICDialog extends React.Component {
     let typeOptions = [];
     switch(this.state.category){
       case "simulator":
-        typeOptions = ["dummy","generic","dpsim","rtlab","rscad"];
+        typeOptions = ["dummy","generic","dpsim","rtlab","rscad","opalrt"];
           break;
       case "controller":
         typeOptions = ["kubernetes","villas-controller"];

From d4ec861103628e463234c00953ee08adf1b9852e Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Tue, 5 Jan 2021 15:54:08 +0100
Subject: [PATCH 23/74] Add TODO for VILLASnode status updates

---
 src/ic/ic-status-store.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ic/ic-status-store.js b/src/ic/ic-status-store.js
index 3f701ef..62d6d08 100644
--- a/src/ic/ic-status-store.js
+++ b/src/ic/ic-status-store.js
@@ -34,6 +34,10 @@ class ICStatusStore extends ArrayStore {
       case 'ic-status/status-received':
         let tempData = action.data;
         tempData.icID = action.icid;
+
+        // TODO: edit state (e.g. running) of IC according to received state (only for ICs that are NOT managed externally)
+        // TODO: playback state info to backend using start-edit dispatch for IC
+
         return this.updateElements(state, [tempData]);
 
       case 'ic-status/status-error':

From e49456490ce156f0f229be7297813098a3b14062 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Thu, 7 Jan 2021 14:59:40 +0100
Subject: [PATCH 24/74] Move all notifications to NotificationFactory

---
 src/common/api/rest-api.js                    |  15 +--
 src/common/api/websocket-api.js               |  11 +-
 src/common/array-store.js                     |  20 +--
 .../data-managers/notifications-factory.js    | 118 ++++++++++++++++--
 src/ic/ic-store.js                            |  10 +-
 src/scenario/scenario-store.js                |  10 +-
 src/signal/signal-store.js                    |  11 +-
 src/signal/signals-data-manager.js            |  41 ++----
 src/user/user.js                              |  15 +--
 src/user/users-store.js                       |  17 +--
 src/user/users.js                             |   9 +-
 11 files changed, 150 insertions(+), 127 deletions(-)

diff --git a/src/common/api/rest-api.js b/src/common/api/rest-api.js
index 084456c..ecda441 100644
--- a/src/common/api/rest-api.js
+++ b/src/common/api/rest-api.js
@@ -18,19 +18,8 @@
 import request from 'superagent/lib/client';
 import Promise from 'es6-promise';
 import NotificationsDataManager from '../data-managers/notifications-data-manager';
+import NotificationsFactory from "../data-managers/notifications-factory";
 
-// TODO: Add this to a central pool of notifications
-const SERVER_NOT_REACHABLE_NOTIFICATION = {
-          title: 'Server not reachable',
-          message: 'The server could not be reached. Please try again later.',
-          level: 'error'
-        };
-
-const REQUEST_TIMEOUT_NOTIFICATION = {
-          title: 'Request timeout',
-          message: 'Request timed out. Please try again later.',
-          level: 'error'
-        };
 
 // Check if the error was due to network failure, timeouts, etc.
 // Can be used for the rest of requests
@@ -41,7 +30,7 @@ function isNetworkError(err) {
   if (err.status == null || err.status === 500 || err.response == null) {
     result = true;
 
-    let notification = err.timeout? REQUEST_TIMEOUT_NOTIFICATION : SERVER_NOT_REACHABLE_NOTIFICATION;
+    let notification = err.timeout? NotificationsFactory.REQUEST_TIMEOUT : NotificationsFactory.SERVER_NOT_REACHABLE;
     NotificationsDataManager.addNotification(notification);
   }
   return result;
diff --git a/src/common/api/websocket-api.js b/src/common/api/websocket-api.js
index 1462f39..e55290a 100644
--- a/src/common/api/websocket-api.js
+++ b/src/common/api/websocket-api.js
@@ -15,6 +15,7 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 import NotificationsDataManager from "../data-managers/notifications-data-manager";
+import NotificationsFactory from "../data-managers/notifications-factory";
 import AppDispatcher from '../app-dispatcher';
 
 class WebsocketAPI {
@@ -70,7 +71,7 @@ class WebsocketAPI {
     AppDispatcher.dispatch({
       type: 'websocket/connected',
       data: this.websocketurl,
-    });    
+    });
     this.wasConnected = true;
 
     if ('onOpen' in this.callbacks)
@@ -88,12 +89,8 @@ class WebsocketAPI {
           type: 'websocket/connection-error',
           data: this.websocketurl,
         });
-        const IC_WEBSOCKET_CONNECTION_ERROR = {
-          title: 'Websocket connection warning',
-          message: "Connection to " + this.websocketurl + " dropped. Attempt reconnect in 1 sec",
-          level: 'warning'
-        };
-        NotificationsDataManager.addNotification(IC_WEBSOCKET_CONNECTION_ERROR);
+
+        NotificationsDataManager.addNotification(NotificationsFactory.WEBSOCKET_CONNECTION_WARN(this.websocketurl));
         console.log("Connection to " + this.websocketurl + " dropped. Attempt reconnect in 1 sec");
         window.setTimeout(() => { this.reconnect(); }, 1000);
       }
diff --git a/src/common/array-store.js b/src/common/array-store.js
index 1ab4b7f..ff9238c 100644
--- a/src/common/array-store.js
+++ b/src/common/array-store.js
@@ -19,6 +19,7 @@ import { ReduceStore } from 'flux/utils';
 
 import AppDispatcher from './app-dispatcher';
 import NotificationsDataManager from '../common/data-managers/notifications-data-manager';
+import NotificationsFactory from "./data-managers/notifications-factory";
 
 class ArrayStore extends ReduceStore {
   constructor(type, dataManager) {
@@ -83,13 +84,7 @@ class ArrayStore extends ReduceStore {
       case this.type + '/load-error':
         if (action.error && !action.error.handled && action.error.response) {
 
-          const USER_LOAD_ERROR_NOTIFICATION = {
-            title: 'Failed to load',
-            message: action.error.response.body.message,
-            level: 'error'
-          };
-          NotificationsDataManager.addNotification(USER_LOAD_ERROR_NOTIFICATION);
-
+          NotificationsDataManager.addNotification(NotificationsFactory.LOAD_ERROR(action.error.response.body.message));
         }
         return super.reduce(state, action);
 
@@ -120,17 +115,10 @@ class ArrayStore extends ReduceStore {
             return (item.id !== action.data);
           });
         }
-        
+
       case this.type + '/remove-error':
         if (action.error && !action.error.handled && action.error.response) {
-
-          const USER_REMOVE_ERROR_NOTIFICATION = {
-            title: 'Failed to add remove ',
-            message: action.error.response.body.message,
-            level: 'error'
-          };
-          NotificationsDataManager.addNotification(USER_REMOVE_ERROR_NOTIFICATION);
-
+          NotificationsDataManager.addNotification(NotificationsFactory.DELETE_ERROR(action.error.response.body.message));
         }
         return super.reduce(state, action);
 
diff --git a/src/common/data-managers/notifications-factory.js b/src/common/data-managers/notifications-factory.js
index a23768f..325815c 100644
--- a/src/common/data-managers/notifications-factory.js
+++ b/src/common/data-managers/notifications-factory.js
@@ -18,13 +18,117 @@
 class NotificationsFactory {
 
   // This is an example
-    static get EXAMPLE_NOTIFICATION() {
-        return {
-            title: 'Example notification',
-            message: 'Write something here that describes what happend.',
-            level: 'warning'
-        };
-    }
+  static get EXAMPLE_NOTIFICATION() {
+      return {
+          title: 'Example notification',
+          message: 'Write something here that describes what happend.',
+          level: 'warning'
+      };
+  }
+
+  static get SERVER_NOT_REACHABLE() {
+    return {
+      title: 'Server not reachable',
+      message: 'The server could not be reached. Please try again later.',
+      level: 'error'
+    };
+  }
+
+  static get REQUEST_TIMEOUT() {
+    return {
+      title: 'Request timeout',
+      message: 'Request timed out. Please try again later.',
+      level: 'error'
+    };
+  }
+
+  static ADD_ERROR(message) {
+    return {
+      title: "Add Error",
+      message: message,
+      level: 'error'
+    };
+  }
+
+  static UPDATE_ERROR(message) {
+    return {
+      title: 'Update Error ',
+      message: message,
+      level: 'error'
+    };
+  }
+
+  static UPDATE_WARNING(message) {
+    return {
+      title: 'Update Warning ',
+      message: message,
+      level: 'warning'
+    };
+  }
+
+  static LOAD_ERROR(message) {
+    return {
+      title: 'Failed to load',
+      message: message,
+      level: 'error'
+    };
+  }
+
+  static DELETE_ERROR(message) {
+    return {
+      title: 'Failed to delete ',
+      message: message,
+      level: 'error'
+    };
+  }
+
+  static WEBSOCKET_CONNECTION_WARN(websocket_url) {
+    return {
+      title: 'Websocket connection warning',
+      message: "Connection to " + websocket_url + " dropped. Attempt reconnect in 1 sec",
+      level: 'warning'
+    };
+  }
+
+  static WEBSOCKET_URL_WARN(ic_name, ic_uuid) {
+    return {
+      title: 'Websocket connection warning',
+      message: "Websocket URL parameter not available for IC " + ic_name + "(" + ic_uuid + "), connection not possible",
+      level: 'warning'
+    };
+  }
+
+  static SCENARIO_USERS_ERROR(message) {
+    return {
+      title: 'Failed to modify scenario users ',
+      message: message,
+      level: 'error'
+    };
+  }
+
+  static AUTOCONF_INFO() {
+    return {
+      title: 'Auto-configuration info',
+      message: 'Signal configuration loaded successfully.',
+      level: 'info'
+    };
+  }
+
+  static AUTOCONF_WARN(message) {
+    return {
+      title: 'Auto-configuration warning',
+      message: message,
+      level: 'warning'
+    };
+  }
+
+  static AUTOCONF_ERROR(message) {
+    return {
+      title: 'Auto-configuration error',
+      message: message,
+      level: 'error'
+    };
+  }
 
 }
 
diff --git a/src/ic/ic-store.js b/src/ic/ic-store.js
index d73e555..456aba8 100644
--- a/src/ic/ic-store.js
+++ b/src/ic/ic-store.js
@@ -19,6 +19,7 @@ import ArrayStore from '../common/array-store';
 import ICsDataManager from './ics-data-manager';
 import ICDataDataManager from './ic-data-data-manager';
 import NotificationsDataManager from "../common/data-managers/notifications-data-manager";
+import NotificationsFactory from "../common/data-managers/notifications-factory";
 
 class InfrastructureComponentStore extends ArrayStore {
   constructor() {
@@ -47,14 +48,7 @@ class InfrastructureComponentStore extends ArrayStore {
           if (ic.websocketurl	!= null && ic.websocketurl !== '') {
             ICDataDataManager.open(ic.websocketurl, ic.id);
           } else {
-
-            // TODO add to pool of notifications
-            const IC_WEBSOCKET_URL_ERROR = {
-              title: 'Websocket connection warning',
-              message: "Websocket URL parameter not available for IC " + ic.name + "(" + ic.uuid + "), connection not possible",
-              level: 'warning'
-            };
-            NotificationsDataManager.addNotification(IC_WEBSOCKET_URL_ERROR);
+            NotificationsDataManager.addNotification(NotificationsFactory.WEBSOCKET_URL_WARN(ic.name, ic.uuid));
           }
         }
         return super.reduce(state, action);
diff --git a/src/scenario/scenario-store.js b/src/scenario/scenario-store.js
index 24b04cf..f88625c 100644
--- a/src/scenario/scenario-store.js
+++ b/src/scenario/scenario-store.js
@@ -19,6 +19,7 @@
 import ScenariosDataManager from './scenarios-data-manager';
 import ArrayStore from '../common/array-store';
 import NotificationsDataManager from "../common/data-managers/notifications-data-manager";
+import NotificationsFactory from "../common/data-managers/notifications-factory";
 
 
 class ScenarioStore extends ArrayStore{
@@ -89,14 +90,7 @@ class ScenarioStore extends ArrayStore{
 
       case 'scenarios/users-error':
         if (action.error && !action.error.handled && action.error.response) {
-
-          const SCENARIO_USERS_ERROR_NOTIFICATION = {
-            title: 'Failed to modify scenario users ',
-            message: action.error.response.body.message,
-            level: 'error'
-          };
-          NotificationsDataManager.addNotification(SCENARIO_USERS_ERROR_NOTIFICATION);
-
+          NotificationsDataManager.addNotification(NotificationsFactory.SCENARIO_USERS_ERROR(action.error.response.body.message));
         }
         return super.reduce(state, action);
 
diff --git a/src/signal/signal-store.js b/src/signal/signal-store.js
index 82ce6bf..175467c 100644
--- a/src/signal/signal-store.js
+++ b/src/signal/signal-store.js
@@ -18,6 +18,7 @@
 import ArrayStore from '../common/array-store';
 import SignalsDataManager from './signals-data-manager'
 import NotificationsDataManager from "../common/data-managers/notifications-data-manager";
+import NotificationsFactory from "../common/data-managers/notifications-factory";
 
 class SignalStore extends  ArrayStore{
   constructor() {
@@ -45,14 +46,8 @@ class SignalStore extends  ArrayStore{
 
       case 'signals/autoconfig-error':
         if (action.error && !action.error.handled && action.error.response) {
-
-          const SIGNAL_AUTOCONF_ERROR_NOTIFICATION = {
-            title: 'Failed to load signal config ',
-            message: action.error.response.body.message,
-            level: 'error'
-          };
-          NotificationsDataManager.addNotification(SIGNAL_AUTOCONF_ERROR_NOTIFICATION);
-
+          NotificationsDataManager.addNotification(
+            NotificationsFactory.AUTOCONF_ERROR(action.error.response.body.message));
         }
         return super.reduce(state, action);
 
diff --git a/src/signal/signals-data-manager.js b/src/signal/signals-data-manager.js
index 9d61584..3cc6493 100644
--- a/src/signal/signals-data-manager.js
+++ b/src/signal/signals-data-manager.js
@@ -19,6 +19,7 @@ import RestDataManager from '../common/data-managers/rest-data-manager';
 import RestAPI from "../common/api/rest-api";
 import AppDispatcher from "../common/app-dispatcher";
 import NotificationsDataManager from "../common/data-managers/notifications-data-manager";
+import NotificationsFactory from "../common/data-managers/notifications-factory";
 
 class SignalsDataManager extends RestDataManager{
 
@@ -62,12 +63,8 @@ class SignalsDataManager extends RestDataManager{
   saveSignals(nodes, token, configID, socketname){
 
     if(nodes.length === 0){
-      const SIGNAL_AUTOCONF_ERROR_NOTIFICATION = {
-        title: 'Failed to load nodes ',
-        message: 'VILLASnode returned empty response',
-        level: 'error'
-      };
-      NotificationsDataManager.addNotification(SIGNAL_AUTOCONF_ERROR_NOTIFICATION);
+      NotificationsDataManager.addNotification(
+        NotificationsFactory.AUTOCONF_ERROR('Failed to load nodes, VILLASnode returned empty response'));
       return;
     }
 
@@ -79,12 +76,9 @@ class SignalsDataManager extends RestDataManager{
         console.warn("Could not parse the following node config because it lacks a name parameter:", nodeConfig);
       } else if(nodeConfig.name === socketname){
         if(configured){
-          const SIGNAL_AUTOCONF_WARNING_NOTIFICATION = {
-            title: 'There might be a problem with the signal auto-config',
-            message: 'VILLASnode returned multiple node configurations for the websocket ' + socketname + '. This is a problem of the VILLASnode.',
-            level: 'warning'
-          };
-          NotificationsDataManager.addNotification(SIGNAL_AUTOCONF_WARNING_NOTIFICATION);
+          NotificationsDataManager.addNotification(
+            NotificationsFactory.AUTOCONF_WARN('VILLASnode returned multiple node configurations for the websocket ' +
+              socketname + '. This is a problem of the VILLASnode.'));
           continue;
         }
         // signals are not yet configured:
@@ -92,12 +86,8 @@ class SignalsDataManager extends RestDataManager{
         let index_out = 1
 
         if(!nodeConfig.in.hasOwnProperty("signals")){
-          const SIGNAL_AUTOCONF_ERROR_NOTIFICATION = {
-            title: 'Failed to load in signal config ',
-            message: 'No field for in signals contained in response.',
-            level: 'error'
-          };
-          NotificationsDataManager.addNotification(SIGNAL_AUTOCONF_ERROR_NOTIFICATION);
+          NotificationsDataManager.addNotification(
+            NotificationsFactory.AUTOCONF_ERROR('Failed to load in signal config, no field for in signals contained in response.'));
           error = true;
         } else{
 
@@ -128,12 +118,8 @@ class SignalsDataManager extends RestDataManager{
         }
 
         if(!nodeConfig.out.hasOwnProperty("signals")){
-          const SIGNAL_AUTOCONF_ERROR_NOTIFICATION = {
-            title: 'Failed to load out signal config ',
-            message: 'No field for out signals contained in response.',
-            level: 'error'
-          };
-          NotificationsDataManager.addNotification(SIGNAL_AUTOCONF_ERROR_NOTIFICATION);
+          NotificationsDataManager.addNotification(
+            NotificationsFactory.AUTOCONF_ERROR('Failed to load out signal config, no field for out signals contained in response.'));
           error=true;
         }else {
 
@@ -173,12 +159,7 @@ class SignalsDataManager extends RestDataManager{
     }
 
     if(!error) {
-      const SIGNAL_AUTOCONF_INFO_NOTIFICATION = {
-        title: 'Signal configuration loaded successfully.',
-        message: '',
-        level: 'info'
-      };
-      NotificationsDataManager.addNotification(SIGNAL_AUTOCONF_INFO_NOTIFICATION);
+      NotificationsDataManager.addNotification(NotificationsFactory.AUTOCONF_INFO());
     }
 
   }
diff --git a/src/user/user.js b/src/user/user.js
index 850b663..2026771 100644
--- a/src/user/user.js
+++ b/src/user/user.js
@@ -25,6 +25,7 @@ import UsersStore from './users-store';
 import Icon from '../common/icon';
 import EditOwnUserDialog from './edit-own-user'
 import NotificationsDataManager from "../common/data-managers/notifications-data-manager"
+import NotificationsFactory from "../common/data-managers/notifications-factory";
 
 class User extends Component {
   static getStores() {
@@ -81,12 +82,7 @@ class User extends Component {
       updatedData.password = data.password;
       updatedData.oldPassword = data.oldPassword;
     } else if (data.password !== '' && data.password !== data.confirmpassword) {
-      const USER_UPDATE_ERROR_NOTIFICATION = {
-        title: 'Update Error ',
-        message: 'New password not correctly confirmed',
-        level: 'error'
-      };
-      NotificationsDataManager.addNotification(USER_UPDATE_ERROR_NOTIFICATION);
+      NotificationsDataManager.addNotification(NotificationsFactory.UPDATE_ERROR('New password not correctly confirmed'));
       return
     }
 
@@ -102,12 +98,7 @@ class User extends Component {
         token: this.state.token
       });
     } else {
-      const USER_UPDATE_WARNING_NOTIFICATION = {
-        title: 'Update Warning ',
-        message: 'No update requested, no input data',
-        level: 'warning'
-      };
-      NotificationsDataManager.addNotification(USER_UPDATE_WARNING_NOTIFICATION);
+      NotificationsDataManager.addNotification(NotificationsFactory.UPDATE_WARNING('No update requested, no input data'));
     }
   }
   }
diff --git a/src/user/users-store.js b/src/user/users-store.js
index dd155b9..8bda26a 100644
--- a/src/user/users-store.js
+++ b/src/user/users-store.js
@@ -18,6 +18,7 @@
 import ArrayStore from '../common/array-store';
 import UsersDataManager from './users-data-manager';
 import NotificationsDataManager from '../common/data-managers/notifications-data-manager';
+import NotificationsFactory from "../common/data-managers/notifications-factory";
 
 class UsersStore extends ArrayStore {
   constructor() {
@@ -30,12 +31,8 @@ class UsersStore extends ArrayStore {
       case this.type + '/add-error':
         if (action.error && !action.error.handled && action.error.response) {
           // If it was an error and hasn't been handled, user could not be added
-          const USER_ADD_ERROR_NOTIFICATION = {
-            title: 'Failed to add new user',
-            message: action.error.response.body.message,
-            level: 'error'
-          };
-          NotificationsDataManager.addNotification(USER_ADD_ERROR_NOTIFICATION);
+          NotificationsDataManager.addNotification(
+            NotificationsFactory.ADD_ERROR('Failed to add new user: ' + action.error.response.body.message));
 
         }
         return super.reduce(state, action);
@@ -43,12 +40,8 @@ class UsersStore extends ArrayStore {
       case this.type + '/edit-error':
         if (action.error && !action.error.handled && action.error.response) {
           // If it was an error and hasn't been handled, user couldn't not be updated
-          const USER_EDIT_ERROR_NOTIFICATION = {
-            title: 'Failed to edit user',
-            message: action.error.response.body.message,
-            level: 'error'
-          };
-          NotificationsDataManager.addNotification(USER_EDIT_ERROR_NOTIFICATION);
+          NotificationsDataManager.addNotification(
+            NotificationsFactory.UPDATE_ERROR('Failed to edit user: ' + action.error.response.body.message));
 
         }
         return super.reduce(state, action);
diff --git a/src/user/users.js b/src/user/users.js
index f6f03df..af4fbaa 100644
--- a/src/user/users.js
+++ b/src/user/users.js
@@ -30,6 +30,7 @@ import EditUserDialog from './edit-user';
 
 import DeleteDialog from '../common/dialogs/delete-dialog';
 import NotificationsDataManager from "../common/data-managers/notifications-data-manager";
+import NotificationsFactory from "../common/data-managers/notifications-factory";
 
 class Users extends Component {
   static getStores() {
@@ -97,12 +98,8 @@ class Users extends Component {
           token: this.state.token
         });
       } else{
-        const USER_UPDATE_ERROR_NOTIFICATION = {
-          title: 'Update Error ',
-          message: 'New password not correctly confirmed',
-          level: 'error'
-        };
-        NotificationsDataManager.addNotification(USER_UPDATE_ERROR_NOTIFICATION)
+
+        NotificationsDataManager.addNotification(NotificationsFactory.UPDATE_ERROR("New password not correctly confirmed"))
       }
     }
   }

From 631bb7d57ce210ffc17362348eb2e174cddf8903 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Thu, 7 Jan 2021 16:27:27 +0100
Subject: [PATCH 25/74] Improve some notifications

---
 src/common/api/rest-api.js                        | 6 +++---
 src/common/data-managers/notifications-factory.js | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/api/rest-api.js b/src/common/api/rest-api.js
index ecda441..4a837dc 100644
--- a/src/common/api/rest-api.js
+++ b/src/common/api/rest-api.js
@@ -23,14 +23,14 @@ import NotificationsFactory from "../data-managers/notifications-factory";
 
 // Check if the error was due to network failure, timeouts, etc.
 // Can be used for the rest of requests
-function isNetworkError(err) {
+function isNetworkError(err, url) {
   let result = false;
 
   // If not status nor response fields, it is a network error. TODO: Handle timeouts
   if (err.status == null || err.status === 500 || err.response == null) {
     result = true;
 
-    let notification = err.timeout? NotificationsFactory.REQUEST_TIMEOUT : NotificationsFactory.SERVER_NOT_REACHABLE;
+    let notification = err.timeout? NotificationsFactory.REQUEST_TIMEOUT : NotificationsFactory.SERVER_NOT_REACHABLE(url);
     NotificationsDataManager.addNotification(notification);
   }
   return result;
@@ -49,7 +49,7 @@ class RestAPI {
 
       req.end(function (error, res) {
         if (res == null || res.status !== 200) {
-          if (req.url !== prevURL) error.handled = isNetworkError(error);
+          if (req.url !== prevURL) error.handled = isNetworkError(error, url);
           prevURL = req.url;
           reject(error);
         } else {
diff --git a/src/common/data-managers/notifications-factory.js b/src/common/data-managers/notifications-factory.js
index 325815c..7b4867b 100644
--- a/src/common/data-managers/notifications-factory.js
+++ b/src/common/data-managers/notifications-factory.js
@@ -26,18 +26,18 @@ class NotificationsFactory {
       };
   }
 
-  static get SERVER_NOT_REACHABLE() {
+  static SERVER_NOT_REACHABLE(url) {
     return {
       title: 'Server not reachable',
-      message: 'The server could not be reached. Please try again later.',
+      message: 'The url ' + url +' could not be reached. Please try again later.',
       level: 'error'
     };
   }
 
-  static get REQUEST_TIMEOUT() {
+  static REQUEST_TIMEOUT(url) {
     return {
       title: 'Request timeout',
-      message: 'Request timed out. Please try again later.',
+      message: 'Request to ' + url + ' timed out. Please try again later.',
       level: 'error'
     };
   }

From 360f81200e5439a4d16bf67528b36c2dca813f82 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 8 Jan 2021 14:37:10 +0100
Subject: [PATCH 26/74] Set PUBLIC_URL env variable for production build #57

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fccb600..21da990 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,8 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "PUBLIC_URL=https://villas.k8s.eonerc.rwth-aachen.de/ react-scripts build",
+    "build-localhost": "PUBLIC_URL=/ react-scripts build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   },

From c173048d6d77212e2056b19c135ae4d18ac69cfd Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 8 Jan 2021 15:45:45 +0100
Subject: [PATCH 27/74] Remove PUBLIC_URL #57

---
 package.json      | 3 +--
 public/index.html | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 21da990..fccb600 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,7 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "PUBLIC_URL=https://villas.k8s.eonerc.rwth-aachen.de/ react-scripts build",
-    "build-localhost": "PUBLIC_URL=/ react-scripts build",
+    "build": "react-scripts build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   },
diff --git a/public/index.html b/public/index.html
index 47e21e6..3f833df 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="shortcut icon" type=image/x-icon href="%PUBLIC_URL%/favicon.ico">
+    <link rel="shortcut icon" type=image/x-icon href="favicon.ico">
     <!--
       Notice the use of %PUBLIC_URL% in the tag above.
       It will be replaced with the URL of the `public` folder during the build.

From 95f47a3557c01a568ac69bd7e4e9c23ca3a58a8a Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 10 Jan 2021 19:04:47 +0100
Subject: [PATCH 28/74] IC control buttons only available for admins #265

---
 src/ic/ic-dialog.js | 5 ++++-
 src/ic/ics.js       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 6e225a5..68276e7 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -121,12 +121,15 @@ class ICDialog extends React.Component {
               )}
           </div>
         
-        
+        {this.props.userRole === "Admin"? (
+        <div>
         <h5>Controls:</h5>
         <div>
         <Button style={{ margin: '5px' }} size='lg' onClick={() => this.setState({ confirmCommand: true, command: 'restart' })}>Restart</Button>
         <Button style={{ margin: '5px' }} size='lg' onClick={() => this.setState({ confirmCommand: true, command: 'shutdown' })}>Shutdown</Button>
         </div>
+        </div> )
+        : (<div></div>) }
 
         <ConfirmCommand show={this.state.confirmCommand} command={this.state.command} name={this.props.ic.name} onClose={c => this.closeConfirmModal(c)} />
         </Col>
diff --git a/src/ic/ics.js b/src/ic/ics.js
index aa0fffa..a1e494c 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -436,7 +436,7 @@ class InfrastructureComponents extends Component {
         <NewICDialog show={this.state.newModal} onClose={data => this.closeNewModal(data)} />
         <EditICDialog show={this.state.editModal} onClose={data => this.closeEditModal(data)} ic={this.state.modalIC} />
         <ImportICDialog show={this.state.importModal} onClose={data => this.closeImportModal(data)} />
-        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} icStatus={this.state.modalICStatus} icGraph={this.state.modalICGraph} sendControlCommand={(command, ic) => this.sendControlCommand(command, ic)}/>
+        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} userRole={this.state.currentUser.role} icStatus={this.state.modalICStatus} icGraph={this.state.modalICGraph} sendControlCommand={(command, ic) => this.sendControlCommand(command, ic)}/>
 
         <DeleteDialog title="infrastructure-component" name={this.state.modalIC.name || 'Unknown'} show={this.state.deleteModal} onClose={(e) => this.closeDeleteModal(e)} />
       </div>

From 352fc67a743df69158813533b2c58a9b1877fadf Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Tue, 12 Jan 2021 13:36:36 +0100
Subject: [PATCH 29/74] White background in dashboard fullscreen mode, show
 compress and pause buttons in fullscreen mode, closes #154

---
 package-lock.json                       | 16 ++---
 src/dashboard/dashboard-button-group.js | 87 ++++++++++++++-----------
 src/styles/app.css                      |  1 +
 3 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 745cbea..28f8bab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3087,7 +3087,7 @@
     },
     "asynckit": {
       "version": "0.4.0",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "at-least-node": {
@@ -4540,7 +4540,7 @@
     },
     "core-util-is": {
       "version": "1.0.2",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
@@ -5234,7 +5234,7 @@
     },
     "delayed-stream": {
       "version": "1.0.0",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
@@ -11097,7 +11097,7 @@
     },
     "methods": {
       "version": "1.1.2",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "microevent.ts": {
@@ -11865,7 +11865,7 @@
     },
     "object-assign": {
       "version": "4.1.1",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
@@ -12308,7 +12308,7 @@
     },
     "performance-now": {
       "version": "2.1.0",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "picomatch": {
@@ -14416,7 +14416,7 @@
     },
     "react-textarea-autosize": {
       "version": "6.1.0",
-      "resolved": "http://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
       "integrity": "sha512-F6bI1dgib6fSvG8so1HuArPUv+iVEfPliuLWusLF+gAKz0FbB4jLrWUrTAeq1afnPT2c9toEZYUdz/y1uKMy4A==",
       "requires": {
         "prop-types": "^15.6.0"
@@ -17161,7 +17161,7 @@
     },
     "util-deprecate": {
       "version": "1.0.2",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util.promisify": {
diff --git a/src/dashboard/dashboard-button-group.js b/src/dashboard/dashboard-button-group.js
index 7f49292..b2df4de 100644
--- a/src/dashboard/dashboard-button-group.js
+++ b/src/dashboard/dashboard-button-group.js
@@ -24,28 +24,28 @@ class DashboardButtonGroup extends React.Component {
   render() {
     const buttonStyle = {
       marginLeft: '12px',
-      height: '44px', 
+      height: '44px',
       width : '35px'
     };
 
     const iconStyle = {
       color: '#007bff',
-      height: '25px', 
+      height: '25px',
       width : '25px'
     }
 
     const buttons = [];
     let key = 0;
 
-    if (this.props.fullscreen) {
+    /*if (this.props.fullscreen) {
       return null;
-    }
+    }*/
 
     if (this.props.editing) {
       buttons.push(
         <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"save"}`}> Save changes </Tooltip>} >
         <Button variant= 'light' size="lg" key={key} onClick={this.props.onSave} style={buttonStyle}>
-          <Icon icon="save" style={iconStyle} /> 
+          <Icon icon="save" style={iconStyle} />
         </Button>
         </OverlayTrigger>,
         <OverlayTrigger key={key++}  placement={'bottom'} overlay={<Tooltip id={`tooltip-${"cancel"}`}> Discard changes </Tooltip>} >
@@ -59,17 +59,25 @@ class DashboardButtonGroup extends React.Component {
         buttons.push(
           <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"expand"}`}> Change to fullscreen view </Tooltip>} >
           <Button key={key} variant= 'light' size="lg" onClick={this.props.onFullscreen} style={buttonStyle}>
-            <Icon icon="expand" style={iconStyle}/> 
+            <Icon icon="expand" style={iconStyle}/>
           </Button>
           </OverlayTrigger>
         );
+      } else {
+        buttons.push(
+          <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"compress"}`}> Back to normal view </Tooltip>} >
+            <Button key={key} variant= 'light' size="lg" onClick={this.props.onFullscreen} style={buttonStyle}>
+              <Icon icon="compress" style={iconStyle}/>
+            </Button>
+          </OverlayTrigger>
+        );
       }
 
       if (this.props.paused) {
         buttons.push(
           <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"play"}`}> Continue simulation </Tooltip>} >
           <Button key={key} variant= 'light' size="lg" onClick={this.props.onUnpause} style={buttonStyle}>
-            <Icon icon="play" style={iconStyle}/> 
+            <Icon icon="play" style={iconStyle}/>
           </Button>
           </OverlayTrigger>
         );
@@ -77,44 +85,49 @@ class DashboardButtonGroup extends React.Component {
         buttons.push(
           <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"pause"}`}> Pause simulation </Tooltip>} >
           <Button key={key} variant= 'light' size="lg" onClick={this.props.onPause} style={buttonStyle}>
-            <Icon icon="pause" style={iconStyle}/> 
+            <Icon icon="pause" style={iconStyle}/>
           </Button>
           </OverlayTrigger>
         );
       }
 
-      buttons.push(
-        <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete files of scenario </Tooltip>} >
-        <Button key={key} variant= 'light' size="lg" onClick={this.props.onEditFiles} style={buttonStyle}>
-          <Icon icon="file" style={iconStyle}/>
-        </Button>
-        </OverlayTrigger>
-      );
+      if (this.props.fullscreen !== true) {
+        buttons.push(
+          <OverlayTrigger key={key++} placement={'bottom'}
+                          overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete files of scenario </Tooltip>}>
+            <Button key={key} variant='light' size="lg" onClick={this.props.onEditFiles} style={buttonStyle}>
+              <Icon icon="file" style={iconStyle}/>
+            </Button>
+          </OverlayTrigger>
+        );
 
-      buttons.push(
-        <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete input signals </Tooltip>} >
-        <Button key={key} variant= 'light' size="lg" onClick={this.props.onEditInputSignals} style={buttonStyle}>
-          <Icon icon="sign-in-alt" style={iconStyle}/>
-        </Button>
-        </OverlayTrigger>
-      );
+        buttons.push(
+          <OverlayTrigger key={key++} placement={'bottom'}
+                          overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete input signals </Tooltip>}>
+            <Button key={key} variant='light' size="lg" onClick={this.props.onEditInputSignals} style={buttonStyle}>
+              <Icon icon="sign-in-alt" style={iconStyle}/>
+            </Button>
+          </OverlayTrigger>
+        );
 
-      buttons.push(
-        <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete output signals </Tooltip>} >
-        <Button key={key} variant= 'light' size="lg" onClick={this.props.onEditOutputSignals} style={buttonStyle}>
-          <Icon icon="sign-out-alt" style={iconStyle}/>
-        </Button>
-        </OverlayTrigger>
-      );
-
-      buttons.push(
-        <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"layout"}`}> Add widgets and edit layout </Tooltip>} >
-        <Button key={key} variant= 'light' size="lg" onClick={this.props.onEdit} style={buttonStyle}>
-          <Icon icon="pen" style={iconStyle} /> 
-        </Button>
-        </OverlayTrigger>
-      );
+        buttons.push(
+          <OverlayTrigger key={key++} placement={'bottom'}
+                          overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete output signals </Tooltip>}>
+            <Button key={key} variant='light' size="lg" onClick={this.props.onEditOutputSignals} style={buttonStyle}>
+              <Icon icon="sign-out-alt" style={iconStyle}/>
+            </Button>
+          </OverlayTrigger>
+        );
 
+        buttons.push(
+          <OverlayTrigger key={key++} placement={'bottom'}
+                          overlay={<Tooltip id={`tooltip-${"layout"}`}> Add widgets and edit layout </Tooltip>}>
+            <Button key={key} variant='light' size="lg" onClick={this.props.onEdit} style={buttonStyle}>
+              <Icon icon="pen" style={iconStyle}/>
+            </Button>
+          </OverlayTrigger>
+        );
+      }
     }
 
     return <div className='section-buttons-group-right'>
diff --git a/src/styles/app.css b/src/styles/app.css
index a2d887d..50ddfda 100644
--- a/src/styles/app.css
+++ b/src/styles/app.css
@@ -323,6 +323,7 @@ body {
   display: -webkit-flex;
   display: flex;
   flex-direction: column;
+  background-color: #FFFFFF;
 }
 
 .box-header {

From 971fe750fa8c512d2283f8c7a179c6b4dd99be09 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Fri, 15 Jan 2021 14:28:25 +0100
Subject: [PATCH 30/74] add file buttons for result table

---
 src/common/table.js | 69 ++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/common/table.js b/src/common/table.js
index 12d0ebf..ed936e8 100644
--- a/src/common/table.js
+++ b/src/common/table.js
@@ -29,7 +29,7 @@ class CustomTable extends Component {
 
     this.state = {
       rows: CustomTable.getRows(props),
-      editCell: [ -1, -1 ]
+      editCell: [-1, -1]
     };
   }
 
@@ -38,7 +38,7 @@ class CustomTable extends Component {
   };
 
   onClick(event, row, column) {
-    this.setState({ editCell: [ column, row ]});  // x, y
+    this.setState({ editCell: [column, row] });  // x, y
   }
 
   static addCell(data, index, child) {
@@ -71,6 +71,12 @@ class CustomTable extends Component {
         cell.push(<Link to={child.props.link + data[linkKey]}>{content}</Link>);
       } else if (child.props.clickable) {
         cell.push(<Button variant="link" onClick={() => child.props.onClick(index)}>{content}</Button>);
+      } else if (linkKey == 'filebuttons') {
+        content.forEach(element => {
+          cell.push(<OverlayTrigger key={element} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"export"}`}>Download {element}</Tooltip>} >
+          <Button variant='table-control-button' onClick={() => child.props.onDownload(element)} disabled={child.props.onDownload == null}>{element + ' ' }
+            <Icon icon='file-download' /></Button></OverlayTrigger>);
+        });
       } else {
         cell.push(content);
       }
@@ -90,8 +96,8 @@ class CustomTable extends Component {
       cell.push(<span>
         &nbsp;
           <FormLabel column={false} className={labelStyle}>
-            {labelContent}
-          </FormLabel>
+          {labelContent}
+        </FormLabel>
       </span>
       );
     }
@@ -103,14 +109,14 @@ class CustomTable extends Component {
 
     // add buttons
     if (child.props.editButton) {
-      let disable = (typeof data.managedexternally !== "undefined" && data.managedexternally); 
-      cell.push(<OverlayTrigger key={0} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"edit"}`}>{disable? "Externally managed ICs cannot be edited" : "edit"} </Tooltip>} >
-      <Button variant='table-control-button' onClick={() => child.props.onEdit(index)} disabled={disable || child.props.onEdit == null}><Icon icon='edit' /></Button></OverlayTrigger>);
+      let disable = (typeof data.managedexternally !== "undefined" && data.managedexternally);
+      cell.push(<OverlayTrigger key={0} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"edit"}`}>{disable ? "Externally managed ICs cannot be edited" : "edit"} </Tooltip>} >
+        <Button variant='table-control-button' onClick={() => child.props.onEdit(index)} disabled={disable || child.props.onEdit == null}><Icon icon='edit' /></Button></OverlayTrigger>);
     }
 
     if (child.props.deleteButton) {
       cell.push(<OverlayTrigger key={1} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"delete"}`}> Delete </Tooltip>} >
-      <Button variant='table-control-button' onClick={() => child.props.onDelete(index)} disabled={child.props.onDelete == null}><Icon icon='trash' /></Button></OverlayTrigger>);
+        <Button variant='table-control-button' onClick={() => child.props.onDelete(index)} disabled={child.props.onDelete == null}><Icon icon='trash' /></Button></OverlayTrigger>);
     }
 
     if (child.props.checkbox) {
@@ -121,18 +127,23 @@ class CustomTable extends Component {
 
     if (child.props.exportButton) {
       cell.push(<OverlayTrigger key={2} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"export"}`}> Export </Tooltip>} >
-      <Button variant='table-control-button' onClick={() => child.props.onExport(index)} disabled={child.props.onExport == null}><Icon icon='download' /></Button></OverlayTrigger>);
+        <Button variant='table-control-button' onClick={() => child.props.onExport(index)} disabled={child.props.onExport == null}><Icon icon='download' /></Button></OverlayTrigger>);
     }
 
     if (child.props.duplicateButton) {
       cell.push(<OverlayTrigger key={3} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"duplicate"}`}> Duplicate </Tooltip>} >
-      <Button variant='table-control-button' onClick={() => child.props.onDuplicate(index)} disabled={child.props.onDuplicate == null}><Icon icon='copy' /></Button></OverlayTrigger>);
+        <Button variant='table-control-button' onClick={() => child.props.onDuplicate(index)} disabled={child.props.onDuplicate == null}><Icon icon='copy' /></Button></OverlayTrigger>);
+    }
+
+    if (child.props.downloadAllButton) {
+      cell.push(<OverlayTrigger key={4} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"export"}`}>Download All Files</Tooltip>} >
+        <Button variant='table-control-button' onClick={() => child.props.onDownloadAll(index)} disabled={child.props.onDownloadAll == null}><Icon icon='file-download' /></Button></OverlayTrigger>);
     }
 
     return cell;
   } // addCell
 
-  static getDerivedStateFromProps(props, state){
+  static getDerivedStateFromProps(props, state) {
     const rows = CustomTable.getRows(props);
 
     return { rows };
@@ -147,12 +158,12 @@ class CustomTable extends Component {
 
   onCellFocus(index) {
     // When a cell focus is detected, update the current state in order to uncover the input element
-    this.setState({ editCell: [ index.cell, index.row ]});
+    this.setState({ editCell: [index.cell, index.row] });
   }
 
   cellLostFocus() {
     // Reset cell selection state
-    this.setState({ editCell: [ -1, -1 ] });
+    this.setState({ editCell: [-1, -1] });
   }
 
   static getRows(props) {
@@ -164,7 +175,7 @@ class CustomTable extends Component {
       // check if multiple columns
       if (Array.isArray(props.children) === false) {
         // table only has a single column
-        return [ CustomTable.addCell(data, index, props.children) ];
+        return [CustomTable.addCell(data, index, props.children)];
       }
 
       const row = [];
@@ -181,7 +192,7 @@ class CustomTable extends Component {
     // get children
     let children = this.props.children;
     if (Array.isArray(this.props.children) === false) {
-      children = [ children ];
+      children = [children];
     }
 
     return (
@@ -200,28 +211,28 @@ class CustomTable extends Component {
 
                     let isCellInlineEditable = children[cellIndex].props.inlineEditable === true;
 
-                    let tabIndex = isCellInlineEditable? 0 : -1;
+                    let tabIndex = isCellInlineEditable ? 0 : -1;
 
                     let evtHdls = isCellInlineEditable ? {
                       onCellClick: (event) => this.onClick(event, rowIndex, cellIndex),
-                      onCellFocus: () => this.onCellFocus({cell: cellIndex, row: rowIndex}),
+                      onCellFocus: () => this.onCellFocus({ cell: cellIndex, row: rowIndex }),
                       onCellBlur: () => this.cellLostFocus()
                     } : {
-                      onCellClick: () => {},
-                      onCellFocus: () => {},
-                      onCellBlur: () => {}
-                    };
+                        onCellClick: () => { },
+                        onCellFocus: () => { },
+                        onCellBlur: () => { }
+                      };
 
-                    return (<td key={cellIndex} tabIndex={tabIndex} onClick={ evtHdls.onCellClick } onFocus={ evtHdls.onCellFocus } onBlur={ evtHdls.onCellBlur }>
-                      {(this.state.editCell[0] === cellIndex && this.state.editCell[1] === rowIndex ) ? (
+                    return (<td key={cellIndex} tabIndex={tabIndex} onClick={evtHdls.onCellClick} onFocus={evtHdls.onCellFocus} onBlur={evtHdls.onCellBlur}>
+                      {(this.state.editCell[0] === cellIndex && this.state.editCell[1] === rowIndex) ? (
                         <FormControl as='input' type={children[cellIndex].props.inputType} value={cell} onChange={(event) => children[cellIndex].props.onInlineChange(event, rowIndex, cellIndex)} ref={ref => { this.activeInput = ref; }} />
                       ) : (
-                        <span>
-                          {cell.map((element, elementIndex) => (
-                            <span key={elementIndex}>{element}</span>
-                          ))}
-                        </span>
-                      )}
+                          <span>
+                            {cell.map((element, elementIndex) => (
+                              <span key={elementIndex}>{element}</span>
+                            ))}
+                          </span>
+                        )}
                     </td>)
                   })
                 }

From 374e1d09f1f68af5084c799d3f9f2bb4a07c410d Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Fri, 15 Jan 2021 16:35:24 +0100
Subject: [PATCH 31/74] get results from backend

---
 src/result/result-store.js             | 33 ++++++++++++++++++++++++++
 src/result/results-data-manager.js     | 29 ++++++++++++++++++++++
 src/scenario/scenarios-data-manager.js |  6 +++++
 3 files changed, 68 insertions(+)
 create mode 100644 src/result/result-store.js
 create mode 100644 src/result/results-data-manager.js

diff --git a/src/result/result-store.js b/src/result/result-store.js
new file mode 100644
index 0000000..fb6ab36
--- /dev/null
+++ b/src/result/result-store.js
@@ -0,0 +1,33 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+
+import ArrayStore from '../common/array-store';
+import ResultsDataManager from './results-data-manager';
+
+class ResultStore extends ArrayStore {
+  constructor() {
+    super('results', ResultsDataManager);
+  }
+
+  reduce(state, action) {
+    return super.reduce(state, action);
+  }
+
+}
+
+export default new ResultStore();
\ No newline at end of file
diff --git a/src/result/results-data-manager.js b/src/result/results-data-manager.js
new file mode 100644
index 0000000..b30c9c1
--- /dev/null
+++ b/src/result/results-data-manager.js
@@ -0,0 +1,29 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+
+import RestDataManager from '../common/data-managers/rest-data-manager';
+
+class ResultsDataManager extends RestDataManager{
+
+  constructor() {
+    super('result', '/results');
+  }
+
+}
+
+export default new ResultsDataManager()
\ No newline at end of file
diff --git a/src/scenario/scenarios-data-manager.js b/src/scenario/scenarios-data-manager.js
index 760493b..e440e92 100644
--- a/src/scenario/scenarios-data-manager.js
+++ b/src/scenario/scenarios-data-manager.js
@@ -108,6 +108,12 @@ class ScenariosDataManager extends RestDataManager {
         token: token,
         param: '?scenarioID=' + scenario.id,
       });
+
+      AppDispatcher.dispatch({
+        type: 'results/start-load',
+        token: token,
+        param: '?scenarioID=' + scenario.id
+      })
     }
   }
 }

From d8b320dc0e8260f24293a8d2022c7438809eb47d Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Fri, 15 Jan 2021 17:06:19 +0100
Subject: [PATCH 32/74] added result table

---
 src/scenario/scenario.js | 101 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 94 insertions(+), 7 deletions(-)

diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index c19cfaa..c5b90c3 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -36,6 +36,8 @@ import ImportDashboardDialog from "../dashboard/import-dashboard";
 import NewDashboardDialog from "../dashboard/new-dashboard";
 import EditDashboardDialog from '../dashboard/edit-dashboard';
 import EditFiles from '../file/edit-files'
+import NewResultDialog from '../result/new-result';
+import EditResultDialog from '../result/edit-result'
 
 import ICAction from '../ic/ic-action';
 import DeleteDialog from '../common/dialogs/delete-dialog';
@@ -43,13 +45,14 @@ import EditConfigDialog from "../componentconfig/edit-config";
 import EditSignalMapping from "../signal/edit-signal-mapping";
 import FileStore from "../file/file-store"
 import WidgetStore from "../widget/widget-store";
+import ResultStore from "../result/result-store"
 import { Redirect } from 'react-router-dom';
 import NotificationsDataManager from "../common/data-managers/notifications-data-manager";
 
 class Scenario extends React.Component {
 
   static getStores() {
-    return [ScenarioStore, ConfigStore, DashboardStore, ICStore, SignalStore, FileStore, WidgetStore];
+    return [ScenarioStore, ConfigStore, DashboardStore, ICStore, SignalStore, FileStore, WidgetStore, ResultStore];
   }
 
   static calculateState(prevState, props) {
@@ -68,7 +71,6 @@ class Scenario extends React.Component {
       });
     }
 
-
     // obtain all component configurations of a scenario
     let configs = ConfigStore.getState().filter(config => config.scenarioID === parseInt(props.match.params.scenario, 10));
     let editConfigModal = prevState.editConfigModal || false;
@@ -82,8 +84,11 @@ class Scenario extends React.Component {
       modalConfigIndex = index;
     }
 
+    let results = ResultStore.getState().filter(result => result.scenarioID === parseInt(props.match.params.scenario, 10)); 
+
     return {
       scenario,
+      results,
       sessionToken,
       configs,
       editConfigModal,
@@ -103,6 +108,11 @@ class Scenario extends React.Component {
       filesEditModal: prevState.filesEditModal || false,
       filesEditSaveState: prevState.filesEditSaveState || [],
 
+      editResultsModal: false,
+      modalResultsData: {},
+      modalResultsIndex: 0,
+      newResultModal: false,
+
       editOutputSignalsModal: prevState.editOutputSignalsModal || false,
       editInputSignalsModal: prevState.editInputSignalsModal || false,
 
@@ -375,6 +385,7 @@ class Scenario extends React.Component {
   closeNewDashboardModal(data) {
     this.setState({ newDashboardModal: false });
     if (data) {
+      // TODO: 'newDashboard' not used, check this
       let newDashboard = data;
       // add default grid value and scenarioID
       newDashboard["grid"] = 15;
@@ -495,11 +506,11 @@ class Scenario extends React.Component {
     // TODO do we need this if the dispatches happen in the dialog?
   }
 
-  signalsAutoConf(index){
+  signalsAutoConf(index) {
     let componentConfig = this.state.configs[index];
     // determine apiurl of infrastructure component
     let ic = this.state.ics.find(ic => ic.id === componentConfig.icID)
-    if(!ic.type.includes("villas-node")){
+    if (!ic.type.includes("villas-node")) {
       let message = "Cannot autoconfigure signals for IC type " + ic.type + " of category " + ic.category + ". This is only possible for gateway ICs of type 'VILLASnode'."
       console.warn(message);
 
@@ -516,8 +527,8 @@ class Scenario extends React.Component {
 
     AppDispatcher.dispatch({
       type: 'signals/start-autoconfig',
-      url: ic.apiurl+"/nodes",
-      socketname: splitWebsocketURL[splitWebsocketURL.length -1],
+      url: ic.apiurl + "/nodes",
+      socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
       token: this.state.sessionToken,
       configID: componentConfig.id
     });
@@ -525,7 +536,7 @@ class Scenario extends React.Component {
   }
 
   uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
       // eslint-disable-next-line
       var r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
       return v.toString(16);
@@ -554,6 +565,41 @@ class Scenario extends React.Component {
     return fileList;
   }
 
+  /* ##############################################
+  * Result modification methods
+  ############################################## */
+
+  closeNewResultModal(data) {
+    console.log(this.state.results);
+    console.log(data);
+    this.setState({ newResultModal: false });
+    if (data) {
+      data["scenarioID"] = this.state.scenario.id;
+      AppDispatcher.dispatch({
+        type: 'results/start-add',
+        data,
+        token: this.state.sessionToken,
+      });
+    }
+  }
+
+  closeEditResultsModal(data) {
+    console.log(data);
+    this.setState({ editResultsModal: false });
+
+    if (data) {
+
+    }
+  }
+
+  downloadData(index) {
+    console.log(index);
+  }
+
+  closeDeleteResultsModal(e) {
+
+  }
+
   startPintura(configIndex) {
     let config = this.state.configs[configIndex];
 
@@ -585,6 +631,7 @@ class Scenario extends React.Component {
     }
   }
 
+  
   /* ##############################################
   * Render method
   ############################################## */
@@ -613,6 +660,40 @@ class Scenario extends React.Component {
       return <h1>Loading Scenario...</h1>;
     }
 
+    let resulttable;
+    if (this.state.results && this.state.results.length > 0) {
+      resulttable = <div>
+        <h2 style={tableHeadingStyle}>Results</h2>
+        <div>
+          <Table data={this.state.results}>
+            <TableColumn title='Result No.' dataKey='id' />
+            <TableColumn title='Description' dataKey='description' />
+            <TableColumn title='Created at' dataKey='createdAt' />
+            <TableColumn title='Last update' dataKey='updatedAt' />
+            <TableColumn
+              title='Files/Data'
+              dataKey='resultFileIDs'
+              linkKey='filebuttons'
+              width='300'
+              onDownload={(index) => this.downloadData(index)}
+            />
+            <TableColumn
+              title='Options'
+              width='200'
+              editButton
+              downloadAllButton
+              deleteButton
+              onEdit={index => this.setState({ editResultsModal: true, modalResultsData: this.state.results[index], modalResultsIndex: index })}
+              onDownloadAll={(index) => this.downloadData(this.state.results[index])}
+              onDelete={(index) => this.setState({ deleteResultsModal: true, modalResultsData: this.state.results[index], modalResultsIndex: index })}
+            />
+          </Table>
+
+          <EditResultDialog show={this.state.editResultsModal} result={this.state.modalResultsData} onClose={data => this.closeEditResultsModal(data)} />
+          <DeleteDialog title="results" name={this.state.modalDashboardData.name} show={this.state.deleteResultsModal} onClose={(e) => this.closeDeleteResultsModal(e)} />
+        </div></div>
+    }
+
     return <div className='section'>
       <div className='section-buttons-group-right'>
         <OverlayTrigger key={0} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete files of scenario </Tooltip>} >
@@ -760,6 +841,12 @@ class Scenario extends React.Component {
 
       <DeleteDialog title="dashboard" name={this.state.modalDashboardData.name} show={this.state.deleteDashboardModal} onClose={(e) => this.closeDeleteDashboardModal(e)} />
 
+      {/*Result table*/}
+      {resulttable}
+      <div style={{ float: 'right' }}>
+        <Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /> Result</Button>
+      </div>
+      <NewResultDialog show={this.state.newResultModal} onClose={data => this.closeNewResultModal(data)} />
 
       {/*Scenario Users table*/}
       <h2 style={tableHeadingStyle}>Users sharing this scenario</h2>

From 00aa00dd1217ebc3d903d5dab18dbfd6edc2462b Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Fri, 15 Jan 2021 17:07:05 +0100
Subject: [PATCH 33/74] added result dialogs

---
 src/result/edit-result.js | 131 ++++++++++++++++++++++++++++++++++++++
 src/result/new-result.js  |  81 +++++++++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100644 src/result/edit-result.js
 create mode 100644 src/result/new-result.js

diff --git a/src/result/edit-result.js b/src/result/edit-result.js
new file mode 100644
index 0000000..d7acedc
--- /dev/null
+++ b/src/result/edit-result.js
@@ -0,0 +1,131 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React from 'react';
+import {FormGroup, FormControl, FormLabel, Col} from 'react-bootstrap';
+import Table from "../common/table";
+
+import Dialog from '../common/dialogs/dialog';
+import ParametersEditor from '../common/parameters-editor';
+
+class EditResultDialog extends React.Component {
+  valid = true;
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      configSnapshots: '',
+      description: '',
+      resultFileIDs: [],
+    };
+  }
+
+  onClose = canceled => {
+    if (canceled) {
+      if (this.props.onClose != null) {
+        this.props.onClose();
+      }
+      return;
+    }
+
+    if (this.valid && this.props.onClose != null) {
+      this.props.onClose(this.state);
+    }
+  };
+
+  handleChange = event => {
+    this.setState({ [event.target.id]: event.target.value });
+
+    let description = true;
+
+    if (this.state.description === '') {
+      description = false;
+    }
+
+    this.valid = description;
+
+  };
+
+  resetState = () => {
+    this.setState({
+      configSnapshots: this.props.configSnapshots,
+      description: this.props.configSnapshots,
+      resultFileIDs: this.props.resultFileIDs,
+    });
+  };
+
+  handleStartParametersChange = startParameters => {
+    this.setState({ startParameters });
+  };
+
+  // TODO: file reading necessary? or can it just be saved?
+  loadFile = event => {
+    // get file
+    const file = event.target.files[0];
+  
+    // create file reader
+    let reader = new FileReader();
+    let self = this;
+
+    reader.onload = event => {
+      const config = JSON.parse(event.target.result);
+
+      self.imported = true;
+      self.valid = true;
+      this.setState({filename: config.name, file: config });
+    };
+
+    reader.readAsBinaryString(file);
+  }
+
+  render() {
+    return <Dialog show={this.props.show} title={'Edit Result No. '+this.state.no} buttonTitle='Save' onClose={this.onClose} onReset={this.resetState} valid={true}>
+      <form>
+        <FormGroup as={Col} controlId='description'>
+          <FormLabel column={false}>Description</FormLabel>
+          <FormControl type='text' placeholder='Enter description' value={this.state.description} onChange={this.handleChange} />
+          <FormControl.Feedback />
+        </FormGroup>
+
+        
+
+        <FormGroup controlId='resultfile'>
+            <FormLabel>Add Result File</FormLabel>
+            <FormControl type='file' onChange={this.loadFile} />
+        </FormGroup>
+      
+      </form>
+    </Dialog>;
+  }
+}
+
+export default EditResultDialog;
+
+/*
+<Table data={this.props.files}>
+            <TableColumn title='Name' dataKey='name'/>
+            <TableColumn title='Size (bytes)' dataKey='size'/>
+            <TableColumn title='Type' dataKey='type'/>
+            <TableColumn
+              title=''
+              deleteButton
+              onDelete={(index) => this.deleteFile(index)}
+            />
+          </Table>
+
+          '*/
diff --git a/src/result/new-result.js b/src/result/new-result.js
new file mode 100644
index 0000000..9c2c5d9
--- /dev/null
+++ b/src/result/new-result.js
@@ -0,0 +1,81 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React from 'react';
+import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
+
+import Dialog from '../common/dialogs/dialog';
+
+class NewResultDialog extends React.Component {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+        ConfigSnapshots: '',
+        Description: '',
+        ResultFileIDs: [],
+    }
+  }
+
+  onClose(canceled) {
+      console.log("on close new result");
+    if (canceled === false) {
+      //if (this.valid) {
+        this.props.onClose(this.state);
+     // }
+    } else {
+      this.props.onClose();
+    }
+  }
+
+  handleChange(e) {
+      console.log("handle change, e:");
+      console.log(e);
+    this.setState({ [e.target.id]: e.target.value });
+  }
+
+  resetState() {
+    this.setState({ 
+        ConfigSnapshots: '',
+        Description: '',
+        ResultFileIDs: [],
+     });
+  }
+
+  render() {
+    return (
+      <Dialog show={this.props.show} title="New Result" buttonTitle="Add" onClose={(c) => this.onClose(c)} onReset={() => this.resetState()} valid={true}>
+        <form>
+          <FormGroup controlId="ConfigSnapshots">
+            <FormLabel>Config Snapshots</FormLabel>
+            <FormControl type="text" placeholder="Enter config snapshots" value={this.state.ConfigSnapshots} onChange={(e) => this.handleChange(e)} />
+            <FormControl.Feedback />
+          </FormGroup>
+
+          <FormGroup controlId="Description">
+            <FormLabel>Description</FormLabel>
+            <FormControl type="text" placeholder="Enter description" value={this.state.Description} onChange={(e) => this.handleChange(e)} />
+            <FormControl.Feedback />
+          </FormGroup>
+        </form>
+      </Dialog>
+    );
+  }
+}
+
+export default NewResultDialog;

From 58ad66285b74e4e1dd886f23201ae425b924d917 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Fri, 15 Jan 2021 18:57:44 +0100
Subject: [PATCH 34/74] added add/remove file button

---
 src/common/table.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/common/table.js b/src/common/table.js
index ed936e8..d0e974c 100644
--- a/src/common/table.js
+++ b/src/common/table.js
@@ -114,11 +114,6 @@ class CustomTable extends Component {
         <Button variant='table-control-button' onClick={() => child.props.onEdit(index)} disabled={disable || child.props.onEdit == null}><Icon icon='edit' /></Button></OverlayTrigger>);
     }
 
-    if (child.props.deleteButton) {
-      cell.push(<OverlayTrigger key={1} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"delete"}`}> Delete </Tooltip>} >
-        <Button variant='table-control-button' onClick={() => child.props.onDelete(index)} disabled={child.props.onDelete == null}><Icon icon='trash' /></Button></OverlayTrigger>);
-    }
-
     if (child.props.checkbox) {
       const checkboxKey = child.props.checkboxKey;
 
@@ -126,20 +121,30 @@ class CustomTable extends Component {
     }
 
     if (child.props.exportButton) {
-      cell.push(<OverlayTrigger key={2} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"export"}`}> Export </Tooltip>} >
+      cell.push(<OverlayTrigger key={1} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"export"}`}> Export </Tooltip>} >
         <Button variant='table-control-button' onClick={() => child.props.onExport(index)} disabled={child.props.onExport == null}><Icon icon='download' /></Button></OverlayTrigger>);
     }
 
     if (child.props.duplicateButton) {
-      cell.push(<OverlayTrigger key={3} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"duplicate"}`}> Duplicate </Tooltip>} >
+      cell.push(<OverlayTrigger key={2} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"duplicate"}`}> Duplicate </Tooltip>} >
         <Button variant='table-control-button' onClick={() => child.props.onDuplicate(index)} disabled={child.props.onDuplicate == null}><Icon icon='copy' /></Button></OverlayTrigger>);
     }
 
+    if (child.props.addRemoveFilesButton) {
+      cell.push(<OverlayTrigger key={3} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"export"}`}>Add/remove File(s)</Tooltip>} >
+        <Button variant='table-control-button' onClick={() => child.props.onAddRemove(index)} disabled={child.props.onAddRemove == null}><Icon icon='file' /></Button></OverlayTrigger>);
+    }
+
     if (child.props.downloadAllButton) {
       cell.push(<OverlayTrigger key={4} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"export"}`}>Download All Files</Tooltip>} >
         <Button variant='table-control-button' onClick={() => child.props.onDownloadAll(index)} disabled={child.props.onDownloadAll == null}><Icon icon='file-download' /></Button></OverlayTrigger>);
     }
 
+    if (child.props.deleteButton) {
+      cell.push(<OverlayTrigger key={5} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"delete"}`}> Delete </Tooltip>} >
+        <Button variant='table-control-button' onClick={() => child.props.onDelete(index)} disabled={child.props.onDelete == null}><Icon icon='trash' /></Button></OverlayTrigger>);
+    }
+
     return cell;
   } // addCell
 

From e31c512c2ddd19bac78bc17f972ef933051de1e0 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Fri, 15 Jan 2021 18:59:18 +0100
Subject: [PATCH 35/74] delete result, changed result table

---
 src/scenario/scenario.js | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index c5b90c3..b89f5ef 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -39,6 +39,7 @@ import EditFiles from '../file/edit-files'
 import NewResultDialog from '../result/new-result';
 import EditResultDialog from '../result/edit-result'
 
+
 import ICAction from '../ic/ic-action';
 import DeleteDialog from '../common/dialogs/delete-dialog';
 import EditConfigDialog from "../componentconfig/edit-config";
@@ -112,6 +113,7 @@ class Scenario extends React.Component {
       modalResultsData: {},
       modalResultsIndex: 0,
       newResultModal: false,
+      editFilesModal: false,
 
       editOutputSignalsModal: prevState.editOutputSignalsModal || false,
       editInputSignalsModal: prevState.editInputSignalsModal || false,
@@ -596,8 +598,18 @@ class Scenario extends React.Component {
     console.log(index);
   }
 
-  closeDeleteResultsModal(e) {
+  closeDeleteResultsModal(confirmDelete) {
+    this.setState({ deleteResultsModal: false });
 
+    if (confirmDelete === false) {
+      return;
+    }
+
+    AppDispatcher.dispatch({
+      type: 'results/start-remove',
+      data: this.state.modalResultsData,
+      token: this.state.sessionToken,
+    });
   }
 
   startPintura(configIndex) {
@@ -662,9 +674,7 @@ class Scenario extends React.Component {
 
     let resulttable;
     if (this.state.results && this.state.results.length > 0) {
-      resulttable = <div>
-        <h2 style={tableHeadingStyle}>Results</h2>
-        <div>
+      resulttable = <div>     
           <Table data={this.state.results}>
             <TableColumn title='Result No.' dataKey='id' />
             <TableColumn title='Description' dataKey='description' />
@@ -679,19 +689,21 @@ class Scenario extends React.Component {
             />
             <TableColumn
               title='Options'
-              width='200'
+              width='300'
               editButton
+              addRemoveFilesButton
               downloadAllButton
               deleteButton
               onEdit={index => this.setState({ editResultsModal: true, modalResultsData: this.state.results[index], modalResultsIndex: index })}
+              onAddRemove={(index) => this.setState({ editFilesModal: true, modalResultsData: this.state.results[index], modalResultsIndex: index})}
               onDownloadAll={(index) => this.downloadData(this.state.results[index])}
               onDelete={(index) => this.setState({ deleteResultsModal: true, modalResultsData: this.state.results[index], modalResultsIndex: index })}
             />
           </Table>
 
           <EditResultDialog show={this.state.editResultsModal} result={this.state.modalResultsData} onClose={data => this.closeEditResultsModal(data)} />
-          <DeleteDialog title="results" name={this.state.modalDashboardData.name} show={this.state.deleteResultsModal} onClose={(e) => this.closeDeleteResultsModal(e)} />
-        </div></div>
+          <DeleteDialog title="result" name={this.state.modalResultsData.id} show={this.state.deleteResultsModal} onClose={(e) => this.closeDeleteResultsModal(e)} />
+        </div>
     }
 
     return <div className='section'>
@@ -842,10 +854,18 @@ class Scenario extends React.Component {
       <DeleteDialog title="dashboard" name={this.state.modalDashboardData.name} show={this.state.deleteDashboardModal} onClose={(e) => this.closeDeleteDashboardModal(e)} />
 
       {/*Result table*/}
+      <div>
+        <h2 style={tableHeadingStyle}>Results
+        <Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
+        </h2>
+        
+      </div>
       {resulttable}
+      {/*
       <div style={{ float: 'right' }}>
         <Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /> Result</Button>
       </div>
+      */}
       <NewResultDialog show={this.state.newResultModal} onClose={data => this.closeNewResultModal(data)} />
 
       {/*Scenario Users table*/}

From 2b5f5568c842fa6f0c458c5b6e4ba8315f03ac4f Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Fri, 15 Jan 2021 19:17:02 +0100
Subject: [PATCH 36/74] minor changes

---
 src/result/edit-result.js | 15 ++++-----------
 src/result/new-result.js  |  4 ----
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/result/edit-result.js b/src/result/edit-result.js
index d7acedc..2b2fac6 100644
--- a/src/result/edit-result.js
+++ b/src/result/edit-result.js
@@ -32,6 +32,7 @@ class EditResultDialog extends React.Component {
       configSnapshots: '',
       description: '',
       resultFileIDs: [],
+      id:0,
     };
   }
 
@@ -50,22 +51,14 @@ class EditResultDialog extends React.Component {
 
   handleChange = event => {
     this.setState({ [event.target.id]: event.target.value });
-
-    let description = true;
-
-    if (this.state.description === '') {
-      description = false;
-    }
-
-    this.valid = description;
-
   };
 
   resetState = () => {
     this.setState({
       configSnapshots: this.props.configSnapshots,
-      description: this.props.configSnapshots,
+      description: this.props.description,
       resultFileIDs: this.props.resultFileIDs,
+      id: this.props.id,
     });
   };
 
@@ -94,7 +87,7 @@ class EditResultDialog extends React.Component {
   }
 
   render() {
-    return <Dialog show={this.props.show} title={'Edit Result No. '+this.state.no} buttonTitle='Save' onClose={this.onClose} onReset={this.resetState} valid={true}>
+    return <Dialog show={this.props.show} title={'Edit Result No. '+this.state.id} buttonTitle='Save' onClose={this.onClose} onReset={this.resetState} valid={true}>
       <form>
         <FormGroup as={Col} controlId='description'>
           <FormLabel column={false}>Description</FormLabel>
diff --git a/src/result/new-result.js b/src/result/new-result.js
index 9c2c5d9..d07f94e 100644
--- a/src/result/new-result.js
+++ b/src/result/new-result.js
@@ -35,17 +35,13 @@ class NewResultDialog extends React.Component {
   onClose(canceled) {
       console.log("on close new result");
     if (canceled === false) {
-      //if (this.valid) {
         this.props.onClose(this.state);
-     // }
     } else {
       this.props.onClose();
     }
   }
 
   handleChange(e) {
-      console.log("handle change, e:");
-      console.log(e);
     this.setState({ [e.target.id]: e.target.value });
   }
 

From 3e74e0886164ff0d5dbec70001b23ddd475280ff Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 17 Jan 2021 16:06:13 +0100
Subject: [PATCH 37/74] Reformat IC status list

---
 src/ic/ic-dialog.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 68276e7..33cb9e5 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -63,6 +63,11 @@ class ICDialog extends React.Component {
     if(typeof this.props.icGraph !== "undefined") {
       objectURL = this.props.icGraph.objectURL
     }
+
+    let spanStyle = {
+      display: 'inline-block', 
+      width: '130px'
+    }
     
     return (
       <Dialog
@@ -82,7 +87,7 @@ class ICDialog extends React.Component {
             typeof icStatus !== "undefined" && Object.keys(icStatus).map(statusKey => (
               typeof icStatus[statusKey] === 'object' ?
               (<div key={statusKey}>
-                <Button variant="light" onClick={() => this.showFurtherInfo(statusKey)}  >{statusKey}
+                <Button variant="light" style={{backgroundColor: '#ffffff', borderColor: '#ffffff'}} onClick={() => this.showFurtherInfo(statusKey)}  >{statusKey}
                 <Icon icon='chevron-down' style={{color: '#007bff'}}/></Button>
                   <Collapse isOpened={this.state[statusKey]} >
                     {
@@ -94,19 +99,19 @@ class ICDialog extends React.Component {
                             <Collapse isOpened={this.state[key]} >
 
                               {Object.keys(icStatus[statusKey][key]).map(index => (
-                                <div key={index}>{index + ": " + icStatus[statusKey][key][index]}</div>
+                                <div key={index}> <span style={spanStyle}>{index + ":"}</span>{icStatus[statusKey][key][index]}</div>
                               ))}
                             </Collapse>
                           </div>)
                           :
-                          (<div key={key}>{key + ": " + icStatus[statusKey][key]}</div>)
+                          (<div key={key}> <span style={spanStyle}>{key + ":"}</span>{icStatus[statusKey][key]}</div>)
                       ))
                     }
                   </Collapse>
 
               </div>) 
               :
-              (<div key={statusKey}>{statusKey + ": " + icStatus[statusKey]}</div>)
+              (<div key={statusKey}> <span style={spanStyle }>{statusKey + ":"}</span>{icStatus[statusKey]}</div>)
             ))
           }
           </Col>

From 8edeb4b04c4dc0a64517d1a2612566f848439572 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 17 Jan 2021 18:47:08 +0100
Subject: [PATCH 38/74] edit state of IC according to received state #265

---
 src/ic/ic-data-data-manager.js | 12 +++++++++++-
 src/ic/ic-status-store.js      |  2 +-
 src/ic/ic-store.js             |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/ic/ic-data-data-manager.js b/src/ic/ic-data-data-manager.js
index b26675c..087b294 100644
--- a/src/ic/ic-data-data-manager.js
+++ b/src/ic/ic-data-data-manager.js
@@ -44,15 +44,25 @@ class IcDataDataManager {
     }
   }
 
-  getStatus(url,socketname,token,icid){
+  getStatus(url,socketname,token,icid,ic){
     RestAPI.get(url, null).then(response => {
+      let tempIC = ic;
+      tempIC.state = response.state;
       AppDispatcher.dispatch({
         type: 'ic-status/status-received',
         data: response,
         token: token,
         socketname: socketname,
         icid: icid,
+        ic: ic
       });
+      if(!ic.managedexternally){  
+        AppDispatcher.dispatch({
+          type: 'ics/start-edit',
+          data: tempIC,
+          token: token,
+        });
+      }
     }).catch(error => {
       AppDispatcher.dispatch({
         type: 'ic-status/status-error',
diff --git a/src/ic/ic-status-store.js b/src/ic/ic-status-store.js
index 62d6d08..36526c6 100644
--- a/src/ic/ic-status-store.js
+++ b/src/ic/ic-status-store.js
@@ -28,7 +28,7 @@ class ICStatusStore extends ArrayStore {
     switch(action.type) {
 
       case 'ic-status/get-status':
-        ICDataDataManager.getStatus(action.url, action.socketname, action.token, action.icid);
+        ICDataDataManager.getStatus(action.url, action.socketname, action.token, action.icid, action.ic);
         return super.reduce(state, action);
 
       case 'ic-status/status-received':
diff --git a/src/ic/ic-store.js b/src/ic/ic-store.js
index 78e90ac..acc6c1e 100644
--- a/src/ic/ic-store.js
+++ b/src/ic/ic-store.js
@@ -38,6 +38,7 @@ class InfrastructureComponentStore extends ArrayStore {
               socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
               token: action.token,
               icid: ic.id,
+              ic: ic
             });
   
             AppDispatcher.dispatch({

From 8edec65fadfec2cd0180b494d2ef575b7841769e Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 18 Jan 2021 14:33:46 +0100
Subject: [PATCH 39/74] round when unix time stamp in IC action message

---
 src/scenario/scenario.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index b89f5ef..d0f90fe 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -85,7 +85,7 @@ class Scenario extends React.Component {
       modalConfigIndex = index;
     }
 
-    let results = ResultStore.getState().filter(result => result.scenarioID === parseInt(props.match.params.scenario, 10)); 
+    let results = ResultStore.getState().filter(result => result.scenarioID === parseInt(props.match.params.scenario, 10));
 
     return {
       scenario,
@@ -359,7 +359,7 @@ class Scenario extends React.Component {
       }
 
       // Unix time stamp + delay
-      action.data.when = Date.now() / 1000.0 + delay
+      action.data.when = Math.round(Date.now() / 1000.0 + delay)
 
       console.log("Sending action: ", action.data)
 
@@ -643,7 +643,7 @@ class Scenario extends React.Component {
     }
   }
 
-  
+
   /* ##############################################
   * Render method
   ############################################## */
@@ -674,7 +674,7 @@ class Scenario extends React.Component {
 
     let resulttable;
     if (this.state.results && this.state.results.length > 0) {
-      resulttable = <div>     
+      resulttable = <div>
           <Table data={this.state.results}>
             <TableColumn title='Result No.' dataKey='id' />
             <TableColumn title='Description' dataKey='description' />
@@ -858,7 +858,7 @@ class Scenario extends React.Component {
         <h2 style={tableHeadingStyle}>Results
         <Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
         </h2>
-        
+
       </div>
       {resulttable}
       {/*

From 1d976940168c3453cc8355f5125f85046c39e472 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Tue, 19 Jan 2021 17:57:45 +0100
Subject: [PATCH 40/74] add result file, simplify timestamp

---
 src/result/edit-result.js          | 90 ++++++++++++++++++++----------
 src/result/result-store.js         | 77 ++++++++++++++++++++++++-
 src/result/results-data-manager.js | 64 ++++++++++++++++++++-
 src/scenario/scenario.js           | 11 ++--
 4 files changed, 206 insertions(+), 36 deletions(-)

diff --git a/src/result/edit-result.js b/src/result/edit-result.js
index 2b2fac6..c956c06 100644
--- a/src/result/edit-result.js
+++ b/src/result/edit-result.js
@@ -16,7 +16,9 @@
  ******************************************************************************/
 
 import React from 'react';
-import {FormGroup, FormControl, FormLabel, Col} from 'react-bootstrap';
+import {FormGroup, FormControl, FormLabel, Col, Button, ProgressBar} from 'react-bootstrap';
+import AppDispatcher from "../common/app-dispatcher";
+
 import Table from "../common/table";
 
 import Dialog from '../common/dialogs/dialog';
@@ -29,10 +31,10 @@ class EditResultDialog extends React.Component {
     super(props);
 
     this.state = {
-      configSnapshots: '',
+      id: 0,
       description: '',
-      resultFileIDs: [],
-      id:0,
+      uploadFile: null,
+      uploadProgress: 0,
     };
   }
 
@@ -55,10 +57,9 @@ class EditResultDialog extends React.Component {
 
   resetState = () => {
     this.setState({
-      configSnapshots: this.props.configSnapshots,
-      description: this.props.description,
-      resultFileIDs: this.props.resultFileIDs,
-      id: this.props.id,
+      id: this.props.result.id,
+      description: this.props.result.description,
+      result: this.props.result,
     });
   };
 
@@ -66,28 +67,46 @@ class EditResultDialog extends React.Component {
     this.setState({ startParameters });
   };
 
-  // TODO: file reading necessary? or can it just be saved?
-  loadFile = event => {
-    // get file
-    const file = event.target.files[0];
-  
-    // create file reader
-    let reader = new FileReader();
-    let self = this;
+  selectUploadFile(event) {
+    this.setState({ uploadFile: event.target.files[0] });
+  };
 
-    reader.onload = event => {
-      const config = JSON.parse(event.target.result);
+  startFileUpload(){
+    // upload file
+    const formData = new FormData();
+    formData.append("file", this.state.uploadFile);
+    //console.log("formData: ");
+    //console.log(formData);
 
-      self.imported = true;
-      self.valid = true;
-      this.setState({filename: config.name, file: config });
-    };
+    AppDispatcher.dispatch({
+      type: 'resultfiles/start-upload',
+      data: formData,
+      resultID: this.state.id,
+      token: this.props.sessionToken,
+      progressCallback: this.updateUploadProgress,
+      finishedCallback: this.clearProgress,
+      scenarioID: this.props.scenarioID,
+    });
 
-    reader.readAsBinaryString(file);
-  }
+    this.setState({ uploadFile: null });
+  };
+
+  clearProgress = (newFileID) => {
+    this.setState({ uploadProgress: 0 });
+  };
+
+  updateUploadProgress = (event) => {
+    this.setState({ uploadProgress: parseInt(event.percent.toFixed(), 10) });
+  };
 
   render() {
-    return <Dialog show={this.props.show} title={'Edit Result No. '+this.state.id} buttonTitle='Save' onClose={this.onClose} onReset={this.resetState} valid={true}>
+    return <Dialog show={this.props.show}
+                  title={'Edit Result No. '+this.state.id}
+                  buttonTitle='Save'
+                  onClose={this.onClose}
+                  onReset={this.resetState}
+                  valid={true}>
+
       <form>
         <FormGroup as={Col} controlId='description'>
           <FormLabel column={false}>Description</FormLabel>
@@ -95,12 +114,27 @@ class EditResultDialog extends React.Component {
           <FormControl.Feedback />
         </FormGroup>
 
-        
-
         <FormGroup controlId='resultfile'>
             <FormLabel>Add Result File</FormLabel>
-            <FormControl type='file' onChange={this.loadFile} />
+            <FormControl type='file' onChange={(event) => this.selectUploadFile(event)} />
         </FormGroup>
+
+          <FormGroup as={Col} >
+            <Button
+              disabled={this.state.uploadFile === null}
+              onClick={() => this.startFileUpload()}>
+              Upload
+            </Button>
+          </FormGroup>
+
+          <FormGroup as={Col} >
+            <ProgressBar
+              striped={true}
+              animated={true}
+              now={this.state.uploadProgress}
+              label={this.state.uploadProgress + '%'}
+            />
+          </FormGroup>
       
       </form>
     </Dialog>;
diff --git a/src/result/result-store.js b/src/result/result-store.js
index fb6ab36..15958cf 100644
--- a/src/result/result-store.js
+++ b/src/result/result-store.js
@@ -24,8 +24,83 @@ class ResultStore extends ArrayStore {
     super('results', ResultsDataManager);
   }
 
+  saveFile(state, action){
+
+    let fileID = parseInt(action.id)
+    state.forEach((element, index, array) => {
+         if (element.id === fileID) {
+           // save blob object
+           array[index]["data"] = new Blob([action.data.data], {type: action.data.type});
+           // update file type
+           array[index]["type"] = action.data.type;
+
+           if (array[index]["objectURL"] !== ''){
+             // free memory of previously generated object URL
+             URL.revokeObjectURL(array[index]["objectURL"]);
+           }
+           // create an object URL for the file
+           array[index]["objectURL"] = URL.createObjectURL(array[index]["data"])
+        }
+    });
+
+    // announce change to listeners
+    this.__emitChange();
+    return state
+  }
+
+  simplify(timestamp) {
+    let parts = timestamp.split("T");
+    let datestr = parts[0];
+    let time = parts[1].split(".");
+
+    return datestr + ', ' + time[0];;
+  }
+
+  simplifyTimestamps(data) {
+    data.forEach((result) => {
+      result.createdAt = this.simplify(result.createdAt);
+      result.updatedAt = this.simplify(result.updatedAt);
+    });
+  }
+
   reduce(state, action) {
-    return super.reduce(state, action);
+    switch (action.type) {
+      case 'results/loaded':
+        this.simplifyTimestamps(action.data);
+        return super.reduce(state, action);
+
+      case 'resultfiles/start-download':
+        ResultsDataManager.download(action)
+        return state
+
+      case 'resultfiles/start-upload':
+        ResultsDataManager.upload(action.data, action.resultID, action.token, action.progressCallback, action.finishedCallback, action.scenarioID);
+        return state;
+
+      case 'resultfiles/uploaded':
+        return state;
+
+      case 'resultfiles/upload-error':
+        console.log(action.error);
+        return state;
+
+      case 'resultfiles/downloaded':
+        // in this case a file is contained in the response (no JSON)
+        return this.saveFile(state, action);
+
+      case 'resultfiles/start-edit':
+        ResultsDataManager.update(action.data, action.token, action.id);
+        return state;
+
+      case 'resultfiles/edited':
+          return this.updateElements(state, [action.data]);
+
+      case 'resultfiles/edit-error':
+        return state;
+
+      default:
+        return super.reduce(state, action);
+    }
   }
 
 }
diff --git a/src/result/results-data-manager.js b/src/result/results-data-manager.js
index b30c9c1..6720b3d 100644
--- a/src/result/results-data-manager.js
+++ b/src/result/results-data-manager.js
@@ -15,8 +15,9 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-
 import RestDataManager from '../common/data-managers/rest-data-manager';
+import RestAPI from '../common/api/rest-api';
+import AppDispatcher from '../common/app-dispatcher';
 
 class ResultsDataManager extends RestDataManager{
 
@@ -24,6 +25,65 @@ class ResultsDataManager extends RestDataManager{
     super('result', '/results');
   }
 
+  upload(file, resultID, token = null, progressCallback = null, finishedCallback = null, scenarioID) {
+    RestAPI.upload(this.makeURL(this.url + '/' + resultID + '/file') , file, token, progressCallback, scenarioID).then(response => {
+
+      AppDispatcher.dispatch({
+        type: 'resultfiles/uploaded',
+      });
+
+      // Trigger a files reload
+      AppDispatcher.dispatch({
+        type: 'results/start-load',
+        param: '?scenarioID=' + scenarioID,
+        token: token
+      });
+
+      if (finishedCallback) {
+        finishedCallback(response.result.id);
+      }
+    }).catch(error => {
+      AppDispatcher.dispatch({
+        type: 'resultfiles/upload-error',
+        error
+      });
+    });
+  }
+
+  download(action){
+    RestAPI.download(this.makeURL(this.url), action.token, action.data).then(response => {
+      AppDispatcher.dispatch({
+        type: 'resultfiles/downloaded',
+        data: response,
+        id: action.data,
+        token: action.token
+      });
+
+    }).catch(error => {
+      AppDispatcher.dispatch({
+        type: 'resultfiles/load-error',
+        error: error
+      });
+    });
+  }
+
+  /* only update file ids
+  update(file, token, id) {
+
+    RestAPI.put(this.makeURL(this.url + '/' + id), file, token).then(response => {
+        AppDispatcher.dispatch({
+          type: 'resultfiles/edited',
+          data: response[this.type]
+        });
+      }).catch(error => {
+        AppDispatcher.dispatch({
+          type: 'resultfiles/edit-error',
+          error: error
+        });
+      });
+    }
+  }*/
+
 }
 
-export default new ResultsDataManager()
\ No newline at end of file
+export default new ResultsDataManager();
\ No newline at end of file
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index b89f5ef..806e4ee 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -572,8 +572,6 @@ class Scenario extends React.Component {
   ############################################## */
 
   closeNewResultModal(data) {
-    console.log(this.state.results);
-    console.log(data);
     this.setState({ newResultModal: false });
     if (data) {
       data["scenarioID"] = this.state.scenario.id;
@@ -691,17 +689,20 @@ class Scenario extends React.Component {
               title='Options'
               width='300'
               editButton
-              addRemoveFilesButton
               downloadAllButton
               deleteButton
               onEdit={index => this.setState({ editResultsModal: true, modalResultsData: this.state.results[index], modalResultsIndex: index })}
-              onAddRemove={(index) => this.setState({ editFilesModal: true, modalResultsData: this.state.results[index], modalResultsIndex: index})}
               onDownloadAll={(index) => this.downloadData(this.state.results[index])}
               onDelete={(index) => this.setState({ deleteResultsModal: true, modalResultsData: this.state.results[index], modalResultsIndex: index })}
             />
           </Table>
 
-          <EditResultDialog show={this.state.editResultsModal} result={this.state.modalResultsData} onClose={data => this.closeEditResultsModal(data)} />
+          <EditResultDialog
+            sessionToken={this.state.sessionToken}
+            show={this.state.editResultsModal} 
+            result={this.state.modalResultsData}
+            scenarioID={this.state.scenario.id}
+            onClose={data => this.closeEditResultsModal(data)} />
           <DeleteDialog title="result" name={this.state.modalResultsData.id} show={this.state.deleteResultsModal} onClose={(e) => this.closeDeleteResultsModal(e)} />
         </div>
     }

From 95f8161c755a20a25f9f3b305911bc66d6c3218a Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Wed, 20 Jan 2021 14:10:34 +0100
Subject: [PATCH 41/74] simplify timestamp after adding result

---
 src/result/result-store.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/result/result-store.js b/src/result/result-store.js
index 15958cf..3437d7e 100644
--- a/src/result/result-store.js
+++ b/src/result/result-store.js
@@ -69,6 +69,10 @@ class ResultStore extends ArrayStore {
         this.simplifyTimestamps(action.data);
         return super.reduce(state, action);
 
+      case 'results/added':
+        this.simplifyTimestamps([action.data]);
+        return super.reduce(state, action);
+
       case 'resultfiles/start-download':
         ResultsDataManager.download(action)
         return state

From 0bc990faf4553636815d2838f5d05d25b488ac65 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 22 Jan 2021 11:30:04 +0100
Subject: [PATCH 42/74] treat case where upload progress is not known

---
 src/file/edit-files.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/file/edit-files.js b/src/file/edit-files.js
index 8cc3421..af5d251 100644
--- a/src/file/edit-files.js
+++ b/src/file/edit-files.js
@@ -40,7 +40,7 @@ class EditFilesDialog extends React.Component {
   }
 
   onClose() {
-    
+
     this.props.onClose();
   }
 
@@ -66,7 +66,12 @@ class EditFilesDialog extends React.Component {
   };
 
   updateUploadProgress = (event) => {
-    this.setState({ uploadProgress: parseInt(event.percent.toFixed(), 10) });
+    if (event.hasOwnProperty("percent")){
+      this.setState({ uploadProgress: parseInt(event.percent.toFixed(), 10) });
+    } else {
+      this.setState({ uploadProgress: 0 });
+    }
+
   };
 
   clearProgress = (newFileID) => {
@@ -83,7 +88,7 @@ class EditFilesDialog extends React.Component {
   };
 
   closeEditModal(){
-   
+
   this.setState({editModal: false});
   }
 
@@ -167,7 +172,7 @@ class EditFilesDialog extends React.Component {
          </div>
       </Dialog>
 
-      
+
     );
   }
 }

From a6d25617c1b02fdcbd544ab15e863a19aa037b17 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 22 Jan 2021 11:33:01 +0100
Subject: [PATCH 43/74] CI: use branch name instead of commit to tag images,
 deactivate kaniko cache

---
 .gitlab-ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d892544..e8ae18b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
   GIT_SUBMODULE_STRATEGY: normal
-  DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
+  DOCKER_TAG: ${CI_COMMIT_BRANCH}
   DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}
 
 cache:
@@ -42,8 +42,5 @@ deploy:
       --dockerfile ${CI_PROJECT_DIR}/Dockerfile
       --destination ${DOCKER_IMAGE}:${DOCKER_TAG}
       --snapshotMode=redo
-      --cache=true
-      --cache-ttl=12h
-  only:
-   refs:
-     - master
+  dependencies:
+    - build

From ddc9da537c64dda5d307bae38904116b79e9eefb Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Fri, 22 Jan 2021 18:22:25 +0100
Subject: [PATCH 44/74] Use JsonView to display status #265

---
 src/ic/ic-dialog.js       | 99 +++++++++++++++------------------------
 src/ic/ic-status-store.js |  3 --
 2 files changed, 39 insertions(+), 63 deletions(-)

diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 33cb9e5..bdd4488 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import {Button, Row, Col} from 'react-bootstrap';
 import Dialog from '../common/dialogs/dialog';
-import {Collapse} from 'react-collapse';
 import Icon from "../common/icon";
 import ConfirmCommand from './confirm-command';
+import JsonView from 'react-json-view';
 
 
 
@@ -72,76 +72,55 @@ class ICDialog extends React.Component {
     return (
       <Dialog
         show={this.props.show}
-        title="Status and Controls"
+        title={this.props.ic.name}
         buttonTitle="Close"
         onClose={(c) => this.onClose(c)}
         valid={true}
         size='xl'
-        blendOutCancel = {true}
+        blendOutCancel={true}
       >
         <form>
-        <Row>
-        <Col>
-          <h5>Status:</h5>
-          {
-            typeof icStatus !== "undefined" && Object.keys(icStatus).map(statusKey => (
-              typeof icStatus[statusKey] === 'object' ?
-              (<div key={statusKey}>
-                <Button variant="light" style={{backgroundColor: '#ffffff', borderColor: '#ffffff'}} onClick={() => this.showFurtherInfo(statusKey)}  >{statusKey}
-                <Icon icon='chevron-down' style={{color: '#007bff'}}/></Button>
-                  <Collapse isOpened={this.state[statusKey]} >
-                    {
-                      Object.keys(icStatus[statusKey]).map(key => (
-                        typeof icStatus[statusKey][key] === 'object' ?
-                          (<div key={key}>
-                            <Button variant="light" onClick={() => this.showFurtherInfo(key)}  >{key}
-                              <Icon icon='chevron-down' style={{ color: '#007bff' }} /></Button>
-                            <Collapse isOpened={this.state[key]} >
+          <Row>
+            <Col>
+              <h5>Status:</h5>
 
-                              {Object.keys(icStatus[statusKey][key]).map(index => (
-                                <div key={index}> <span style={spanStyle}>{index + ":"}</span>{icStatus[statusKey][key][index]}</div>
-                              ))}
-                            </Collapse>
-                          </div>)
-                          :
-                          (<div key={key}> <span style={spanStyle}>{key + ":"}</span>{icStatus[statusKey][key]}</div>)
-                      ))
-                    }
-                  </Collapse>
+              <JsonView
+                src={icStatus}
+                name={false}
+                displayDataTypes={false}
+                displayObjectSize={false}
+                enableClipboard={false}
+                collapsed={true}
+              />
 
-              </div>) 
-              :
-              (<div key={statusKey}> <span style={spanStyle }>{statusKey + ":"}</span>{icStatus[statusKey]}</div>)
-            ))
-          }
-          </Col>
-          
-          <Col>
-          <h5>Graph:</h5>
-          <div>
-            {objectURL !== '' ? (
-              <img onError={(e) => this.graphError(e)} alt={"Error"} src={objectURL} />
-            ) : (
-                <img alt="Error" />
-              )}
-          </div>
-        
-        {this.props.userRole === "Admin"? (
-        <div>
-        <h5>Controls:</h5>
-        <div>
-        <Button style={{ margin: '5px' }} size='lg' onClick={() => this.setState({ confirmCommand: true, command: 'restart' })}>Restart</Button>
-        <Button style={{ margin: '5px' }} size='lg' onClick={() => this.setState({ confirmCommand: true, command: 'shutdown' })}>Shutdown</Button>
-        </div>
-        </div> )
-        : (<div></div>) }
+            </Col>
 
-        <ConfirmCommand show={this.state.confirmCommand} command={this.state.command} name={this.props.ic.name} onClose={c => this.closeConfirmModal(c)} />
-        </Col>
-        </Row>
+            <Col>
+              <h5>Graph:</h5>
+              <div>
+                {objectURL !== '' ? (
+                  <img onError={(e) => this.graphError(e)} alt={"Error"} src={objectURL} />
+                ) : (
+                    <img alt="Error" />
+                  )}
+              </div>
+
+              {this.props.userRole === "Admin" ? (
+                <div>
+                  <h5>Controls:</h5>
+                  <div>
+                    <Button style={{ margin: '5px' }} size='lg' onClick={() => this.setState({ confirmCommand: true, command: 'restart' })}>Restart</Button>
+                    <Button style={{ margin: '5px' }} size='lg' onClick={() => this.setState({ confirmCommand: true, command: 'shutdown' })}>Shutdown</Button>
+                  </div>
+                </div>)
+                : (<div></div>)}
+
+              <ConfirmCommand show={this.state.confirmCommand} command={this.state.command} name={this.props.ic.name} onClose={c => this.closeConfirmModal(c)} />
+            </Col>
+          </Row>
         </form>
       </Dialog>
-      
+
     );
   }
 }
diff --git a/src/ic/ic-status-store.js b/src/ic/ic-status-store.js
index 36526c6..4895a8d 100644
--- a/src/ic/ic-status-store.js
+++ b/src/ic/ic-status-store.js
@@ -35,9 +35,6 @@ class ICStatusStore extends ArrayStore {
         let tempData = action.data;
         tempData.icID = action.icid;
 
-        // TODO: edit state (e.g. running) of IC according to received state (only for ICs that are NOT managed externally)
-        // TODO: playback state info to backend using start-edit dispatch for IC
-
         return this.updateElements(state, [tempData]);
 
       case 'ic-status/status-error':

From 1ae816d629d877f3512fe1a1724964455e22ddd5 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Fri, 22 Jan 2021 19:09:58 +0100
Subject: [PATCH 45/74] remove, download result files

---
 src/result/edit-result.js          | 60 +++++++++++++++++++-----------
 src/result/new-result.js           |  8 +---
 src/result/result-store.js         |  5 ++-
 src/result/results-data-manager.js | 15 ++++++--
 src/scenario/scenario.js           | 54 +++++++++++++++++++++++++--
 5 files changed, 103 insertions(+), 39 deletions(-)

diff --git a/src/result/edit-result.js b/src/result/edit-result.js
index c956c06..d1fa784 100644
--- a/src/result/edit-result.js
+++ b/src/result/edit-result.js
@@ -18,11 +18,13 @@
 import React from 'react';
 import {FormGroup, FormControl, FormLabel, Col, Button, ProgressBar} from 'react-bootstrap';
 import AppDispatcher from "../common/app-dispatcher";
+import FileStore from "../file/file-store"
+
 
 import Table from "../common/table";
+import TableColumn from "../common/table-column";
 
 import Dialog from '../common/dialogs/dialog';
-import ParametersEditor from '../common/parameters-editor';
 
 class EditResultDialog extends React.Component {
   valid = true;
@@ -35,6 +37,9 @@ class EditResultDialog extends React.Component {
       description: '',
       uploadFile: null,
       uploadProgress: 0,
+      fileIDs: [],
+      files: null,
+      resultChanged: false,
     };
   }
 
@@ -60,6 +65,8 @@ class EditResultDialog extends React.Component {
       id: this.props.result.id,
       description: this.props.result.description,
       result: this.props.result,
+      fileIDs: this.props.result.resultFileIDs,
+      files: FileStore.getState().filter(file => this.props.result.resultFileIDs.includes(file.id)),
     });
   };
 
@@ -72,11 +79,8 @@ class EditResultDialog extends React.Component {
   };
 
   startFileUpload(){
-    // upload file
     const formData = new FormData();
     formData.append("file", this.state.uploadFile);
-    //console.log("formData: ");
-    //console.log(formData);
 
     AppDispatcher.dispatch({
       type: 'resultfiles/start-upload',
@@ -99,21 +103,47 @@ class EditResultDialog extends React.Component {
     this.setState({ uploadProgress: parseInt(event.percent.toFixed(), 10) });
   };
 
+  deleteFile(index){
+    let file = this.state.files[index]
+    AppDispatcher.dispatch({
+      type: 'files/start-remove',
+      data: file,
+      token: this.props.sessionToken
+    });
+  }
+
   render() {
+    if (this.props.show) {
+    }
     return <Dialog show={this.props.show}
                   title={'Edit Result No. '+this.state.id}
                   buttonTitle='Save'
                   onClose={this.onClose}
                   onReset={this.resetState}
-                  valid={true}>
+                  valid={true}
+                  size = 'lg'>
 
-      <form>
+
+      <div>
         <FormGroup as={Col} controlId='description'>
           <FormLabel column={false}>Description</FormLabel>
           <FormControl type='text' placeholder='Enter description' value={this.state.description} onChange={this.handleChange} />
           <FormControl.Feedback />
         </FormGroup>
 
+        <Table data={this.state.files}>
+            <TableColumn title='ID' dataKey='id'/>
+            <TableColumn title='Name' dataKey='name'/>
+            <TableColumn title='Size (bytes)' dataKey='size'/>
+            <TableColumn title='Type' dataKey='type'/>
+            <TableColumn
+              title=''
+              deleteButton
+              onDelete={(index) => this.deleteFile(index)}
+            />
+          </Table>
+
+
         <FormGroup controlId='resultfile'>
             <FormLabel>Add Result File</FormLabel>
             <FormControl type='file' onChange={(event) => this.selectUploadFile(event)} />
@@ -136,23 +166,9 @@ class EditResultDialog extends React.Component {
             />
           </FormGroup>
       
-      </form>
+      </div>
     </Dialog>;
   }
 }
 
-export default EditResultDialog;
-
-/*
-<Table data={this.props.files}>
-            <TableColumn title='Name' dataKey='name'/>
-            <TableColumn title='Size (bytes)' dataKey='size'/>
-            <TableColumn title='Type' dataKey='type'/>
-            <TableColumn
-              title=''
-              deleteButton
-              onDelete={(index) => this.deleteFile(index)}
-            />
-          </Table>
-
-          '*/
+export default EditResultDialog;
\ No newline at end of file
diff --git a/src/result/new-result.js b/src/result/new-result.js
index d07f94e..11023a1 100644
--- a/src/result/new-result.js
+++ b/src/result/new-result.js
@@ -56,13 +56,7 @@ class NewResultDialog extends React.Component {
   render() {
     return (
       <Dialog show={this.props.show} title="New Result" buttonTitle="Add" onClose={(c) => this.onClose(c)} onReset={() => this.resetState()} valid={true}>
-        <form>
-          <FormGroup controlId="ConfigSnapshots">
-            <FormLabel>Config Snapshots</FormLabel>
-            <FormControl type="text" placeholder="Enter config snapshots" value={this.state.ConfigSnapshots} onChange={(e) => this.handleChange(e)} />
-            <FormControl.Feedback />
-          </FormGroup>
-
+        <form>      
           <FormGroup controlId="Description">
             <FormLabel>Description</FormLabel>
             <FormControl type="text" placeholder="Enter description" value={this.state.Description} onChange={(e) => this.handleChange(e)} />
diff --git a/src/result/result-store.js b/src/result/result-store.js
index 3437d7e..f59edb4 100644
--- a/src/result/result-store.js
+++ b/src/result/result-store.js
@@ -18,6 +18,7 @@
 
 import ArrayStore from '../common/array-store';
 import ResultsDataManager from './results-data-manager';
+import FilesDataManager from '../file/files-data-manager'
 
 class ResultStore extends ArrayStore {
   constructor() {
@@ -74,11 +75,11 @@ class ResultStore extends ArrayStore {
         return super.reduce(state, action);
 
       case 'resultfiles/start-download':
-        ResultsDataManager.download(action)
+        //FilesDataManager.download(action)
         return state
 
       case 'resultfiles/start-upload':
-        ResultsDataManager.upload(action.data, action.resultID, action.token, action.progressCallback, action.finishedCallback, action.scenarioID);
+        ResultsDataManager.uploadFile(action.data, action.resultID, action.token, action.progressCallback, action.finishedCallback, action.scenarioID);
         return state;
 
       case 'resultfiles/uploaded':
diff --git a/src/result/results-data-manager.js b/src/result/results-data-manager.js
index 6720b3d..bae49da 100644
--- a/src/result/results-data-manager.js
+++ b/src/result/results-data-manager.js
@@ -25,16 +25,23 @@ class ResultsDataManager extends RestDataManager{
     super('result', '/results');
   }
 
-  upload(file, resultID, token = null, progressCallback = null, finishedCallback = null, scenarioID) {
+  uploadFile(file, resultID, token = null, progressCallback = null, finishedCallback = null, scenarioID) {
     RestAPI.upload(this.makeURL(this.url + '/' + resultID + '/file') , file, token, progressCallback, scenarioID).then(response => {
 
       AppDispatcher.dispatch({
-        type: 'resultfiles/uploaded',
+        type: 'files/uploaded',
+      });
+
+      // Trigger a results reload
+      AppDispatcher.dispatch({
+        type: 'results/start-load',
+        param: '?scenarioID=' + scenarioID,
+        token: token
       });
 
       // Trigger a files reload
       AppDispatcher.dispatch({
-        type: 'results/start-load',
+        type: 'files/start-load',
         param: '?scenarioID=' + scenarioID,
         token: token
       });
@@ -44,7 +51,7 @@ class ResultsDataManager extends RestDataManager{
       }
     }).catch(error => {
       AppDispatcher.dispatch({
-        type: 'resultfiles/upload-error',
+        type: 'files/upload-error',
         error
       });
     });
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index 5b3f3e6..217d98e 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -50,6 +50,8 @@ import ResultStore from "../result/result-store"
 import { Redirect } from 'react-router-dom';
 import NotificationsDataManager from "../common/data-managers/notifications-data-manager";
 
+var JSZip = require("jszip");
+
 class Scenario extends React.Component {
 
   static getStores() {
@@ -114,6 +116,7 @@ class Scenario extends React.Component {
       modalResultsIndex: 0,
       newResultModal: false,
       editFilesModal: false,
+      filesToDownload: [],
 
       editOutputSignalsModal: prevState.editOutputSignalsModal || false,
       editInputSignalsModal: prevState.editInputSignalsModal || false,
@@ -154,6 +157,33 @@ class Scenario extends React.Component {
     });
   }
 
+  componentDidUpdate(prevProps, prevState) {
+    // check whether file data has been loaded
+    if (this.state.filesToDownload.length > 0  ) { // todo: for download all - wait until data for all has arrived
+      console.log(this.state.files);
+      if (this.state.filesToDownload.length === 1) {
+        let fileToDownload = FileStore.getState().filter(file => file.id === this.state.filesToDownload[0])
+        if (fileToDownload.length === 1 && fileToDownload[0].data) {
+          const blob = new Blob([fileToDownload[0].data], {type: fileToDownload[0].type});
+          FileSaver.saveAs(blob, fileToDownload[0].name);
+          this.setState({ filesToDownload: [] });
+        }
+      } else { // zip and save several files
+        let filesToDownload = FileStore.getState().filter(file => this.state.filesToDownload.includes(file.id) && file.data);
+        if (filesToDownload.length === this.state.filesToDownload.length) { // all requested files have been loaded
+          var zip = new JSZip();
+          filesToDownload.forEach(file => {
+            zip.file(file.name, file.data);
+          });
+          zip.generateAsync({type: "blob"}).then(function(content) {
+            saveAs(content, "results.zip");
+          });
+          this.setState({ filesToDownload: [] });
+        }
+      }
+    }
+  }
+
   /* ##############################################
   * User modification methods
   ############################################## */
@@ -592,8 +622,24 @@ class Scenario extends React.Component {
     }
   }
 
-  downloadData(index) {
-    console.log(index);
+  downloadResultData(param) {
+    let toDownload = [];
+
+    if (typeof(param) === 'object') {
+      toDownload = param.resultFileIDs;
+    } else {
+      toDownload.push(param);
+    }
+
+    toDownload.forEach(fileid => {
+      AppDispatcher.dispatch({
+        type: 'files/start-download',
+        data: fileid,
+        token: this.state.sessionToken
+      });
+    });
+
+    this.setState({ filesToDownload: toDownload });
   }
 
   closeDeleteResultsModal(confirmDelete) {
@@ -683,7 +729,7 @@ class Scenario extends React.Component {
               dataKey='resultFileIDs'
               linkKey='filebuttons'
               width='300'
-              onDownload={(index) => this.downloadData(index)}
+              onDownload={(index) => this.downloadResultData(index)}
             />
             <TableColumn
               title='Options'
@@ -692,7 +738,7 @@ class Scenario extends React.Component {
               downloadAllButton
               deleteButton
               onEdit={index => this.setState({ editResultsModal: true, modalResultsData: this.state.results[index], modalResultsIndex: index })}
-              onDownloadAll={(index) => this.downloadData(this.state.results[index])}
+              onDownloadAll={(index) => this.downloadResultData(this.state.results[index])}
               onDelete={(index) => this.setState({ deleteResultsModal: true, modalResultsData: this.state.results[index], modalResultsIndex: index })}
             />
           </Table>

From 0405ec82da263e64485f119a48d46790be770bb1 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 24 Jan 2021 16:43:19 +0100
Subject: [PATCH 46/74] make graph downloadable #265

---
 src/ic/ic-dialog.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index bdd4488..591db53 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -4,7 +4,7 @@ import Dialog from '../common/dialogs/dialog';
 import Icon from "../common/icon";
 import ConfirmCommand from './confirm-command';
 import JsonView from 'react-json-view';
-
+import FileSaver from 'file-saver';
 
 
 class ICDialog extends React.Component {
@@ -53,6 +53,10 @@ class ICDialog extends React.Component {
     this.setState({confirmCommand: false, command: ''});
   }
 
+  downloadGraph(url){
+    FileSaver.saveAs(url, this.props.ic.name + ".svg");    
+}
+
   
   render() {
 
@@ -63,11 +67,6 @@ class ICDialog extends React.Component {
     if(typeof this.props.icGraph !== "undefined") {
       objectURL = this.props.icGraph.objectURL
     }
-
-    let spanStyle = {
-      display: 'inline-block', 
-      width: '130px'
-    }
     
     return (
       <Dialog
@@ -96,6 +95,9 @@ class ICDialog extends React.Component {
             </Col>
 
             <Col>
+              <div className='section-buttons-group-right'>
+                <Button style={{ margin: '5px' }} size='sm' onClick={() => this.downloadGraph(objectURL)}><Icon icon="download" /></Button>
+              </div>
               <h5>Graph:</h5>
               <div>
                 {objectURL !== '' ? (

From bfed3e231bac38f4aae3797762949ac733ce0b35 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 25 Jan 2021 10:30:46 +0100
Subject: [PATCH 47/74] fix bug in outdated computation; show no icon if IC is
 not managed via AMQP

---
 src/ic/ics.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ic/ics.js b/src/ic/ics.js
index a1e494c..b96cf89 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -75,10 +75,10 @@ class InfrastructureComponents extends Component {
         return a.stateUpdatedAt < b.stateUpdatedAt;
       }
     });
-    
+
      const icStatus = ICStatusStore.getState();
      const icGraph = ICGraphStore.getState();
-     
+
     return {
       sessionToken: localStorage.getItem("token"),
       ics: ics,
@@ -99,11 +99,11 @@ class InfrastructureComponents extends Component {
       type: 'ics/start-load',
       token: this.state.sessionToken,
     });
-    
+
    // Start timer for periodic refresh
     this.timer = window.setInterval(() => this.refresh(), 10000);
   }
-  
+
   componentWillUnmount() {
     window.clearInterval(this.timer);
   }
@@ -228,12 +228,12 @@ class InfrastructureComponents extends Component {
   }
 
   static isICOutdated(component) {
-    if (!component.stateUpdatedAt)
+    if (!component.stateUpdateAt)
       return true;
 
     const fiveMinutes = 5 * 60 * 1000;
 
-    return Date.now() - new Date(component.stateUpdatedAt) > fiveMinutes;
+    return Date.now() - new Date(component.stateUpdateAt) > fiveMinutes;
   }
 
   stateLabelStyle(state, component){
@@ -312,7 +312,7 @@ class InfrastructureComponents extends Component {
     if(managedExternally){
       return <Icon icon='check' />
     } else {
-      return <Icon icon='times' />
+      return ""
     }
 
   }
@@ -328,7 +328,7 @@ class InfrastructureComponents extends Component {
 
   modifyNameColumn(name){
     let ic = this.state.ics.find(ic => ic.name === name);
-  
+
     if(ic.type === "villas-node" || ic.type === "villas-relay"){
       return <Button variant="link" onClick={() => this.openICStatus(ic)}>{name}</Button>    }
     else{
@@ -337,17 +337,17 @@ class InfrastructureComponents extends Component {
   }
 
   openICStatus(ic){
-    
+
     let index = this.state.ics.indexOf(ic);
     let icStatus = this.state.icStatus.find(status => status.icID === ic.id);
     let icGraph = this.state.icGraph.find(graph => graph.icID === ic.id);
-  
+
     this.setState({ icModal: true, modalIC: ic, modalICStatus: icStatus, modalICGraph: icGraph, modalIndex: index })
   }
 
   sendControlCommand(command,ic){
     let splitWebsocketURL = ic.websocketurl.split("/");
-    
+
     if(command === "restart"){
       AppDispatcher.dispatch({
         type: 'ic-status/restart',

From 314bf53b23655b3f6b3267d027c63f65b0d9c4d1 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 25 Jan 2021 11:34:39 +0100
Subject: [PATCH 48/74] send token in query string for file download, omit auth
 header

---
 src/common/api/rest-api.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/common/api/rest-api.js b/src/common/api/rest-api.js
index 4e554c7..f40064e 100644
--- a/src/common/api/rest-api.js
+++ b/src/common/api/rest-api.js
@@ -41,7 +41,8 @@ let prevURL = null;
 class RestAPI {
   get(url, token) {
     return new Promise(function (resolve, reject) {
-      var req = request.get(url);
+
+      let req = request.get(url);
 
       if (token != null) {
         req.set('Authorization', "Bearer " + token);
@@ -61,7 +62,7 @@ class RestAPI {
 
   post(url, body, token) {
     return new Promise(function (resolve, reject) {
-      var req = request.post(url).send(body).timeout({ response: 5000 }); // Simple response start timeout (3s)
+      let req = request.post(url).send(body).timeout({ response: 5000 }); // Simple response start timeout (3s)
 
       if (token != null) {
         req.set('Authorization', "Bearer " + token);
@@ -82,7 +83,7 @@ class RestAPI {
 
   delete(url, token) {
     return new Promise(function (resolve, reject) {
-      var req = request.delete(url);
+      let req = request.delete(url);
 
       if (token != null) {
         req.set('Authorization', "Bearer " + token);
@@ -101,7 +102,7 @@ class RestAPI {
 
   put(url, body, token) {
     return new Promise(function (resolve, reject) {
-      var req = request.put(url).send(body);
+      let req = request.put(url).send(body);
 
       if (token != null) {
         req.set('Authorization', "Bearer " + token);
@@ -140,11 +141,14 @@ class RestAPI {
 
   download(url, token, fileID) {
     return new Promise(function (resolve, reject) {
-      let req = request.get(url + "/" + fileID).buffer(true).responseType("blob")
-      // use blob response type and buffer
-      if (token != null) {
-        req.set('Authorization', "Bearer " + token);
+
+      let completeURL = url + "/" + fileID;
+      if (token != null){
+        completeURL = completeURL + "?token=" + action.token
       }
+      let req = request.get(completeURL).buffer(true).responseType("blob")
+      // use blob response type and buffer
+      // Do not use auth header for file download
 
       req.end(function (error, res) {
         if (error !== null || res.status !== 200) {
@@ -161,7 +165,7 @@ class RestAPI {
 
   apiDownload(url, token) {
     return new Promise(function (resolve, reject) {
-      var req = request.get(url).buffer(true).responseType("blob");
+      let req = request.get(url).buffer(true).responseType("blob");
 
       if (token != null) {
         req.set('Authorization', "Bearer " + token);

From 011159b1cc247da1d6873ec3f8e16f6a34b28127 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 25 Jan 2021 11:57:44 +0100
Subject: [PATCH 49/74] add time zone format to moment of update #264

---
 src/ic/ics.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ic/ics.js b/src/ic/ics.js
index b96cf89..9868231 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -302,7 +302,7 @@ class InfrastructureComponents extends Component {
   }
 
   stateUpdateModifier(updatedAt) {
-    let dateFormat = 'DD MMM YYYY HH:mm:ss';
+    let dateFormat = 'ddd, DD MMM YYYY HH:mm:ss zz';
     let dateTime = moment(updatedAt, dateFormat);
     return dateTime.fromNow()
   }

From 5903bcc83256c8fc9783881722a313dae242da44 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 25 Jan 2021 12:33:37 +0100
Subject: [PATCH 50/74] request VILLASnode status only if APIurl exists; make
 API url editable

---
 src/ic/edit-ic.js              | 16 ++++++++--------
 src/ic/ic-data-data-manager.js |  6 +++---
 src/ic/ic-store.js             |  3 ++-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/ic/edit-ic.js b/src/ic/edit-ic.js
index 7ce6d5d..0c8403e 100644
--- a/src/ic/edit-ic.js
+++ b/src/ic/edit-ic.js
@@ -50,13 +50,13 @@ class EditICDialog extends React.Component {
           data.name = this.state.name;
         }
 
-        if (this.state.websocketurl != null && this.state.websocketurl !== "" && this.state.websocketurl !== "http://" && this.state.websocketurl !== this.props.ic.websocketurl) {
-          data.websocketurl = this.state.websocketurl;
-        }
 
-        if (this.state.apiurl != null && this.state.apiurl !== "" && this.state.apiurl !== "http://" && this.state.apiurl !== this.props.ic.apiurl) {
-          data.apiurl = this.state.apiurl;
-        }
+        data.websocketurl = this.state.websocketurl;
+
+
+
+        data.apiurl = this.state.apiurl;
+
 
         if (this.state.location != null && this.state.location !== this.props.ic.location) {
           data.location = this.state.location;
@@ -175,12 +175,12 @@ class EditICDialog extends React.Component {
           </FormGroup>
           <FormGroup controlId="websocketurl">
             <FormLabel column={false}>Websocket URL</FormLabel>
-            <FormControl type="text" placeholder={this.props.ic.websocketurl} value={this.state.websocketurl || 'http://' } onChange={(e) => this.handleChange(e)} />
+            <FormControl type="text" placeholder={this.props.ic.websocketurl} value={this.state.websocketurl} onChange={(e) => this.handleChange(e)} />
             <FormControl.Feedback />
           </FormGroup>
           <FormGroup controlId="apiurl">
             <FormLabel column={false}>API URL</FormLabel>
-            <FormControl type="text" placeholder={this.props.ic.apiurl} value={this.state.apiurl || 'http://' } onChange={(e) => this.handleChange(e)} />
+            <FormControl type="text" placeholder={this.props.ic.apiurl} value={this.state.apiurl} onChange={(e) => this.handleChange(e)} />
             <FormControl.Feedback />
           </FormGroup>
           <FormGroup controlId="location">
diff --git a/src/ic/ic-data-data-manager.js b/src/ic/ic-data-data-manager.js
index 087b294..6bfb421 100644
--- a/src/ic/ic-data-data-manager.js
+++ b/src/ic/ic-data-data-manager.js
@@ -46,8 +46,6 @@ class IcDataDataManager {
 
   getStatus(url,socketname,token,icid,ic){
     RestAPI.get(url, null).then(response => {
-      let tempIC = ic;
-      tempIC.state = response.state;
       AppDispatcher.dispatch({
         type: 'ic-status/status-received',
         data: response,
@@ -56,7 +54,9 @@ class IcDataDataManager {
         icid: icid,
         ic: ic
       });
-      if(!ic.managedexternally){  
+      if(!ic.managedexternally){
+        let tempIC = ic;
+        tempIC.state = response.state;
         AppDispatcher.dispatch({
           type: 'ics/start-edit',
           data: tempIC,
diff --git a/src/ic/ic-store.js b/src/ic/ic-store.js
index 7210477..5a77642 100644
--- a/src/ic/ic-store.js
+++ b/src/ic/ic-store.js
@@ -31,7 +31,8 @@ class InfrastructureComponentStore extends ArrayStore {
     switch(action.type) {
       case 'ics/loaded':
         action.data.forEach(ic => {
-          if (ic.type === "villas-node" || ic.type === "villas-relay") {
+          if ((ic.type === "villas-node" || ic.type === "villas-relay")
+            && ic.apiurl !== '' && ic.apiurl !== undefined && ic.apiurl !== null) {
             let splitWebsocketURL = ic.websocketurl.split("/");
             AppDispatcher.dispatch({
               type: 'ic-status/get-status',

From 88bc504d0d9bc18348df761fcf685399a3219517 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 25 Jan 2021 12:44:26 +0100
Subject: [PATCH 51/74] perform VILLASnode status and graph query in refresh
 method for ICs

---
 src/ic/ic-store.js | 22 ----------------------
 src/ic/ics.js      | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/ic/ic-store.js b/src/ic/ic-store.js
index 5a77642..21d84ea 100644
--- a/src/ic/ic-store.js
+++ b/src/ic/ic-store.js
@@ -30,28 +30,6 @@ class InfrastructureComponentStore extends ArrayStore {
   reduce(state, action) {
     switch(action.type) {
       case 'ics/loaded':
-        action.data.forEach(ic => {
-          if ((ic.type === "villas-node" || ic.type === "villas-relay")
-            && ic.apiurl !== '' && ic.apiurl !== undefined && ic.apiurl !== null) {
-            let splitWebsocketURL = ic.websocketurl.split("/");
-            AppDispatcher.dispatch({
-              type: 'ic-status/get-status',
-              url: ic.apiurl + "/status",
-              socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
-              token: action.token,
-              icid: ic.id,
-              ic: ic
-            });
-
-            AppDispatcher.dispatch({
-              type: 'ic-graph/get-graph',
-              url: ic.apiurl + "/graph.svg",
-              socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
-              token: action.token,
-              icid: ic.id,
-            });
-          }
-        })
 
         return super.reduce(state, action);
 
diff --git a/src/ic/ics.js b/src/ic/ics.js
index 9868231..5c8c6fb 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -119,6 +119,30 @@ class InfrastructureComponents extends Component {
         token: this.state.sessionToken,
       });
 
+      // get status and graph of VILLASnode and VILLASrelay ICs
+      this.state.ics.forEach(ic => {
+        if ((ic.type === "villas-node" || ic.type === "villas-relay")
+          && ic.apiurl !== '' && ic.apiurl !== undefined && ic.apiurl !== null) {
+          let splitWebsocketURL = ic.websocketurl.split("/");
+          AppDispatcher.dispatch({
+            type: 'ic-status/get-status',
+            url: ic.apiurl + "/status",
+            socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
+            token: this.state.sessionToken,
+            icid: ic.id,
+            ic: ic
+          });
+
+          AppDispatcher.dispatch({
+            type: 'ic-graph/get-graph',
+            url: ic.apiurl + "/graph.svg",
+            socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
+            token: this.state.sessionToken,
+            icid: ic.id,
+          });
+        }
+      })
+
     }
   }
 

From 855e0199a25a0b011aa12664b725f0dd1f0593c6 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 25 Jan 2021 13:53:01 +0100
Subject: [PATCH 52/74] fix a typo in download funtion of API

---
 src/common/api/rest-api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/api/rest-api.js b/src/common/api/rest-api.js
index f40064e..b33c36f 100644
--- a/src/common/api/rest-api.js
+++ b/src/common/api/rest-api.js
@@ -144,7 +144,7 @@ class RestAPI {
 
       let completeURL = url + "/" + fileID;
       if (token != null){
-        completeURL = completeURL + "?token=" + action.token
+        completeURL = completeURL + "?token=" + token
       }
       let req = request.get(completeURL).buffer(true).responseType("blob")
       // use blob response type and buffer

From aa9b8906dd081cde23d7842da3f60c1b84a51d91 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 25 Jan 2021 14:42:09 +0100
Subject: [PATCH 53/74] fix for time formatting #264

---
 src/ic/ics.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/ic/ics.js b/src/ic/ics.js
index 5c8c6fb..44b2563 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -76,14 +76,11 @@ class InfrastructureComponents extends Component {
       }
     });
 
-     const icStatus = ICStatusStore.getState();
-     const icGraph = ICGraphStore.getState();
-
     return {
       sessionToken: localStorage.getItem("token"),
       ics: ics,
-      icStatus: icStatus,
-      icGraph: icGraph,
+      icStatus: ICStatusStore.getState(),
+      icGraph: ICGraphStore.getState(),
       modalIC: {},
       modalICStatus: {},
       modalICGraph: {},
@@ -326,7 +323,7 @@ class InfrastructureComponents extends Component {
   }
 
   stateUpdateModifier(updatedAt) {
-    let dateFormat = 'ddd, DD MMM YYYY HH:mm:ss zz';
+    let dateFormat = 'ddd, DD MMM YYYY HH:mm:ss ZZ';
     let dateTime = moment(updatedAt, dateFormat);
     return dateTime.fromNow()
   }
@@ -460,7 +457,15 @@ class InfrastructureComponents extends Component {
         <NewICDialog show={this.state.newModal} onClose={data => this.closeNewModal(data)} />
         <EditICDialog show={this.state.editModal} onClose={data => this.closeEditModal(data)} ic={this.state.modalIC} />
         <ImportICDialog show={this.state.importModal} onClose={data => this.closeImportModal(data)} />
-        <ICDialog show={this.state.icModal} onClose={data => this.closeICModal(data)} ic={this.state.modalIC} token={this.state.sessionToken} userRole={this.state.currentUser.role} icStatus={this.state.modalICStatus} icGraph={this.state.modalICGraph} sendControlCommand={(command, ic) => this.sendControlCommand(command, ic)}/>
+        <ICDialog
+          show={this.state.icModal}
+          onClose={data => this.closeICModal(data)}
+          ic={this.state.modalIC}
+          token={this.state.sessionToken}
+          userRole={this.state.currentUser.role}
+          icStatus={this.state.modalICStatus}
+          icGraph={this.state.modalICGraph}
+          sendControlCommand={(command, ic) => this.sendControlCommand(command, ic)}/>
 
         <DeleteDialog title="infrastructure-component" name={this.state.modalIC.name || 'Unknown'} show={this.state.deleteModal} onClose={(e) => this.closeDeleteModal(e)} />
       </div>

From 39af80297924cbd09b1bcc12ef143661f352d26b Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 25 Jan 2021 15:37:02 +0100
Subject: [PATCH 54/74] revoke objectURL of graphs instead of creating a new
 one

---
 src/ic/ic-graph-store.js | 43 ++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/ic/ic-graph-store.js b/src/ic/ic-graph-store.js
index cb44812..7a4a05c 100644
--- a/src/ic/ic-graph-store.js
+++ b/src/ic/ic-graph-store.js
@@ -25,19 +25,46 @@ class ICGraphStore extends ArrayStore {
 
   saveGraph(state, action){
 
-    let icID = parseInt(action.icid);    
-    const dublicate = state.some(element => element.icID === icID);
-    if(dublicate){
-        return state
-    }
     let icGraph = {};
-    icGraph["icID"] = icID;
+    icGraph["icID"] = action.icid;
     icGraph["data"] = new Blob([action.data.data], {type: action.data.type});
     icGraph["type"] = action.data.type;
     icGraph["objectURL"] = URL.createObjectURL(icGraph["data"]);
-    
+
+    let newElements = [icGraph]
+
+    // search for existing element to update
+    state.forEach((element, index, array) => {
+      newElements = newElements.filter((updateElement, newIndex) => {
+        if (element.icID === updateElement.icID) {
+          console.log("Updating graph:", icGraph.icID)
+          // update each property
+          for (var key in updateElement) {
+            if (updateElement.hasOwnProperty(key) && key === "objectURL") {
+              URL.revokeObjectURL(array[index][key]);
+              console.log("revoked objectURL", array[index][key])
+            } else if (updateElement.hasOwnProperty(key)){
+              array[index][key] = updateElement[key];
+            }
+
+          }
+
+          // remove updated element from update list
+          return false;
+        }
+
+        return true;
+      });
+    });
+
+    // all elements still in the list will just be added
+    state = state.concat(newElements);
+
+    // announce change to listeners
     this.__emitChange();
-    return this.updateElements(state, [icGraph]);
+
+    return state;
+
   }
 
   reduce(state, action) {

From 1311806b96ee0a1b7943f2f1d1d5408bcf251758 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 25 Jan 2021 15:40:01 +0100
Subject: [PATCH 55/74] remove debug output

---
 src/ic/ic-graph-store.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ic/ic-graph-store.js b/src/ic/ic-graph-store.js
index 7a4a05c..1f3d27a 100644
--- a/src/ic/ic-graph-store.js
+++ b/src/ic/ic-graph-store.js
@@ -37,12 +37,10 @@ class ICGraphStore extends ArrayStore {
     state.forEach((element, index, array) => {
       newElements = newElements.filter((updateElement, newIndex) => {
         if (element.icID === updateElement.icID) {
-          console.log("Updating graph:", icGraph.icID)
           // update each property
           for (var key in updateElement) {
             if (updateElement.hasOwnProperty(key) && key === "objectURL") {
               URL.revokeObjectURL(array[index][key]);
-              console.log("revoked objectURL", array[index][key])
             } else if (updateElement.hasOwnProperty(key)){
               array[index][key] = updateElement[key];
             }

From 0d96b11eae240290e336ac157a02fdb76b480003 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Tue, 26 Jan 2021 11:38:34 +0100
Subject: [PATCH 56/74] add PUBLIC_URL again #57

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 3f833df..47e21e6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="shortcut icon" type=image/x-icon href="favicon.ico">
+    <link rel="shortcut icon" type=image/x-icon href="%PUBLIC_URL%/favicon.ico">
     <!--
       Notice the use of %PUBLIC_URL% in the tag above.
       It will be replaced with the URL of the `public` folder during the build.

From 98e9e867573e21f37c3a806196bc27cbfbefd6ec Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Tue, 26 Jan 2021 12:43:57 +0100
Subject: [PATCH 57/74] simplify graph handling #265

---
 src/ic/ic-data-data-manager.js | 17 -------
 src/ic/ic-dialog.js            | 39 +++++++--------
 src/ic/ic-graph-store.js       | 87 ----------------------------------
 src/ic/ics.js                  | 19 ++------
 4 files changed, 20 insertions(+), 142 deletions(-)
 delete mode 100644 src/ic/ic-graph-store.js

diff --git a/src/ic/ic-data-data-manager.js b/src/ic/ic-data-data-manager.js
index 6bfb421..065d21c 100644
--- a/src/ic/ic-data-data-manager.js
+++ b/src/ic/ic-data-data-manager.js
@@ -71,23 +71,6 @@ class IcDataDataManager {
     })
   }
 
-  getGraph(url,socketname,token,icid){
-    RestAPI.apiDownload(url, null).then(response => {
-      AppDispatcher.dispatch({
-        type: 'ic-graph/graph-received',
-        data: response,
-        token: token,
-        socketname: socketname,
-        icid: icid,
-      });
-    }).catch(error => {
-      AppDispatcher.dispatch({
-        type: 'ic-graph/graph-error',
-        error: error
-      })
-    })
-  }
-
   restart(url,socketname,token){
     RestAPI.post(url, null).then(response => {
       AppDispatcher.dispatch({
diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 591db53..c7b4551 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -3,7 +3,7 @@ import {Button, Row, Col} from 'react-bootstrap';
 import Dialog from '../common/dialogs/dialog';
 import Icon from "../common/icon";
 import ConfirmCommand from './confirm-command';
-import JsonView from 'react-json-view';
+import ReactJson from 'react-json-view';
 import FileSaver from 'file-saver';
 
 
@@ -33,7 +33,7 @@ class ICDialog extends React.Component {
   }
 
   handleChange(e) {
-    
+
   }
 
   showFurtherInfo(key){
@@ -41,10 +41,6 @@ class ICDialog extends React.Component {
     this.setState({[key]: !this.state[key]});
   }
 
-  graphError(e){
-    console.log("graph error");
-  }
-
   closeConfirmModal(canceled){
     if(!canceled){
       this.props.sendControlCommand(this.state.command,this.props.ic);
@@ -53,21 +49,24 @@ class ICDialog extends React.Component {
     this.setState({confirmCommand: false, command: ''});
   }
 
-  downloadGraph(url){
-    FileSaver.saveAs(url, this.props.ic.name + ".svg");    
-}
+  async downloadGraph(url) {
+
+    let blob = await fetch(url).then(r => r.blob())
+    FileSaver.saveAs(blob, this.props.ic.name + ".svg");
+  }
+
 
-  
   render() {
 
     let icStatus = this.state.icStatus;
     delete icStatus['icID'];
 
-    let objectURL=''
-    if(typeof this.props.icGraph !== "undefined") {
-      objectURL = this.props.icGraph.objectURL
+    let graphURL = ""
+    if (this.props.ic.apiurl !== ""){
+      graphURL = this.props.ic.apiurl + "/graph.svg"
     }
-    
+
+
     return (
       <Dialog
         show={this.props.show}
@@ -83,28 +82,24 @@ class ICDialog extends React.Component {
             <Col>
               <h5>Status:</h5>
 
-              <JsonView
+              <ReactJson
                 src={icStatus}
                 name={false}
                 displayDataTypes={false}
                 displayObjectSize={false}
                 enableClipboard={false}
-                collapsed={true}
+                collapsed={1}
               />
 
             </Col>
 
             <Col>
               <div className='section-buttons-group-right'>
-                <Button style={{ margin: '5px' }} size='sm' onClick={() => this.downloadGraph(objectURL)}><Icon icon="download" /></Button>
+                <Button style={{ margin: '5px' }} size='sm' onClick={() => this.downloadGraph(graphURL)}><Icon icon="download" /></Button>
               </div>
               <h5>Graph:</h5>
               <div>
-                {objectURL !== '' ? (
-                  <img onError={(e) => this.graphError(e)} alt={"Error"} src={objectURL} />
-                ) : (
-                    <img alt="Error" />
-                  )}
+                  <img alt={"Graph image download failed and/or incorrect image URL"} src={graphURL} />
               </div>
 
               {this.props.userRole === "Admin" ? (
diff --git a/src/ic/ic-graph-store.js b/src/ic/ic-graph-store.js
deleted file mode 100644
index 1f3d27a..0000000
--- a/src/ic/ic-graph-store.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import ArrayStore from '../common/array-store';
-import ICDataDataManager from './ic-data-data-manager';
-
-class ICGraphStore extends ArrayStore {
-  constructor() {
-    super('ic-graph', ICDataDataManager);
-  }
-
-  saveGraph(state, action){
-
-    let icGraph = {};
-    icGraph["icID"] = action.icid;
-    icGraph["data"] = new Blob([action.data.data], {type: action.data.type});
-    icGraph["type"] = action.data.type;
-    icGraph["objectURL"] = URL.createObjectURL(icGraph["data"]);
-
-    let newElements = [icGraph]
-
-    // search for existing element to update
-    state.forEach((element, index, array) => {
-      newElements = newElements.filter((updateElement, newIndex) => {
-        if (element.icID === updateElement.icID) {
-          // update each property
-          for (var key in updateElement) {
-            if (updateElement.hasOwnProperty(key) && key === "objectURL") {
-              URL.revokeObjectURL(array[index][key]);
-            } else if (updateElement.hasOwnProperty(key)){
-              array[index][key] = updateElement[key];
-            }
-
-          }
-
-          // remove updated element from update list
-          return false;
-        }
-
-        return true;
-      });
-    });
-
-    // all elements still in the list will just be added
-    state = state.concat(newElements);
-
-    // announce change to listeners
-    this.__emitChange();
-
-    return state;
-
-  }
-
-  reduce(state, action) {
-    switch(action.type) {
-
-      case 'ic-graph/get-graph':
-        ICDataDataManager.getGraph(action.url, action.socketname, action.token, action.icid);
-        return super.reduce(state, action);
-
-      case 'ic-graph/graph-received':
-        return this.saveGraph(state, action);
-
-      case 'ic-graph/graph-error':
-        return super.reduce(state, action);
-
-      default:
-        return super.reduce(state, action);
-    }
-  }
-}
-
-export default new ICGraphStore();
diff --git a/src/ic/ics.js b/src/ic/ics.js
index 44b2563..4c80853 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -25,7 +25,6 @@ import moment from 'moment'
 import AppDispatcher from '../common/app-dispatcher';
 import InfrastructureComponentStore from './ic-store';
 import ICStatusStore from './ic-status-store';
-import ICGraphStore from './ic-graph-store';
 
 import Icon from '../common/icon';
 import Table from '../common/table';
@@ -40,7 +39,7 @@ import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class InfrastructureComponents extends Component {
   static getStores() {
-    return [ InfrastructureComponentStore, ICStatusStore, ICGraphStore ];
+    return [ InfrastructureComponentStore, ICStatusStore];
   }
 
   static statePrio(state) {
@@ -80,10 +79,8 @@ class InfrastructureComponents extends Component {
       sessionToken: localStorage.getItem("token"),
       ics: ics,
       icStatus: ICStatusStore.getState(),
-      icGraph: ICGraphStore.getState(),
       modalIC: {},
       modalICStatus: {},
-      modalICGraph: {},
       deleteModal: false,
       icModal: false,
       selectedICs: [],
@@ -116,7 +113,7 @@ class InfrastructureComponents extends Component {
         token: this.state.sessionToken,
       });
 
-      // get status and graph of VILLASnode and VILLASrelay ICs
+      // get status of VILLASnode and VILLASrelay ICs
       this.state.ics.forEach(ic => {
         if ((ic.type === "villas-node" || ic.type === "villas-relay")
           && ic.apiurl !== '' && ic.apiurl !== undefined && ic.apiurl !== null) {
@@ -129,14 +126,6 @@ class InfrastructureComponents extends Component {
             icid: ic.id,
             ic: ic
           });
-
-          AppDispatcher.dispatch({
-            type: 'ic-graph/get-graph',
-            url: ic.apiurl + "/graph.svg",
-            socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
-            token: this.state.sessionToken,
-            icid: ic.id,
-          });
         }
       })
 
@@ -361,9 +350,8 @@ class InfrastructureComponents extends Component {
 
     let index = this.state.ics.indexOf(ic);
     let icStatus = this.state.icStatus.find(status => status.icID === ic.id);
-    let icGraph = this.state.icGraph.find(graph => graph.icID === ic.id);
 
-    this.setState({ icModal: true, modalIC: ic, modalICStatus: icStatus, modalICGraph: icGraph, modalIndex: index })
+    this.setState({ icModal: true, modalIC: ic, modalICStatus: icStatus, modalIndex: index })
   }
 
   sendControlCommand(command,ic){
@@ -464,7 +452,6 @@ class InfrastructureComponents extends Component {
           token={this.state.sessionToken}
           userRole={this.state.currentUser.role}
           icStatus={this.state.modalICStatus}
-          icGraph={this.state.modalICGraph}
           sendControlCommand={(command, ic) => this.sendControlCommand(command, ic)}/>
 
         <DeleteDialog title="infrastructure-component" name={this.state.modalIC.name || 'Unknown'} show={this.state.deleteModal} onClose={(e) => this.closeDeleteModal(e)} />

From ab679f4b116dcc2e1fda782720776c11b4d64d6c Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 26 Jan 2021 16:37:22 +0100
Subject: [PATCH 58/74] move and consolidate documentation with main VILLAS
 documentation repo

---
 README.md           | 32 +++---------------
 doc/Production.md   | 82 ---------------------------------------------
 doc/Requirements.md | 12 -------
 doc/Structure.md    | 79 -------------------------------------------
 doc/development.md  | 70 --------------------------------------
 5 files changed, 4 insertions(+), 271 deletions(-)
 delete mode 100644 doc/Production.md
 delete mode 100644 doc/Requirements.md
 delete mode 100644 doc/Structure.md
 delete mode 100644 doc/development.md

diff --git a/README.md b/README.md
index 3f86801..0a9db6e 100644
--- a/README.md
+++ b/README.md
@@ -2,39 +2,15 @@
 [![pipeline status](https://git.rwth-aachen.de/acs/public/villas/web/badges/master/pipeline.svg)](https://git.rwth-aachen.de/acs/public/villas/web/-/commits/master) 
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
-This is VILLASweb, the website to configure real-time co-simulations and display simulation real-time data in the web browser.
-The term **frontend** refers to this project, the actual website.
-The frontend connects to **two** backends: [VILLASweb-backend-go](https://git.rwth-aachen.de/acs/public/villas/web-backend-go) and [VILLASnode](https://git.rwth-aachen.de/acs/public/villas/node).
-VILLASnode provides actual simulation data via websockets. VILLASweb-backend-go provides any other data such as user accounts, infrastructure components and configurations, dashboards etc.
-For more information on the backends see their repositories.
+VILLASweb is a tool to configure real-time co-simulations and display simulation real-time data in the web browser.
+
 
-## Frameworks
-The frontend is build upon [ReactJS](https://facebook.github.io/react/) and [Flux](https://facebook.github.io/flux/).
-React is responsible for rendering the UI and Flux for handling the data and communication with the backends. For more information also have a look at REACT.md
-Additional libraries are used, for a complete list see the file `package.json`.
 
-## Data model
-![Datamodel](src/img/datamodel.png)
 
-## Quick start
-```bash
-$ git clone --recursive https://git.rwth-aachen.de/acs/public/villas/web.git
-$ cd web
-$ npm install
-$ npm start
-```
-We recommend to start the VILLASweb-backend-go before the frontend.
-If you want to use test data (including some test users), you can start the backend with the parameter `-mode=test`.
-Please check the repository of the VILLASweb-backend-go to find information on the test user login names and passwords.
-The testing mode is NOT intended for production deployments.
 
 ## Documentation
 
-More details on the setup and usage of VILLASweb is available here:
-- [Requirements](doc/Requirements.md)
-- [Structure and datamodel](doc/Structure.md)
-- [Development setup](doc/development.md)
-- [Production setup](doc/Production.md)
+More details on the setup and usage of VILLASweb is available [in the VILLAS documentation](https://villas.fein-aachen.org/doc/web.html).
 
 ## Copyright
 
@@ -70,7 +46,7 @@ For other licensing options please consult [Prof. Antonello Monti](mailto:amonti
 
 [![EONERC ACS Logo](doc/pictures/eonerc_logo.png)](http://www.acs.eonerc.rwth-aachen.de)
 
- - Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+ - Steffen Vogel <svogel2@eonerc.rwth-aachen.de>
  - Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
 
 [Institute for Automation of Complex Power Systems (ACS)](http://www.acs.eonerc.rwth-aachen.de)  
diff --git a/doc/Production.md b/doc/Production.md
deleted file mode 100644
index 5d55ba0..0000000
--- a/doc/Production.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# Production Setup {#web-production}
-
-## Setting up VILLASweb for production
-
-For development setup instructions see @ref web-development.
-The production setup is based on docker. 
-Clone the [frontend](https://git.rwth-aachen.de/acs/public/villas/web) and [backend](https://git.rwth-aachen.de/acs/public/villas/web-backend-go) repositories on your computer and build the Docker images for both:
-
-### Frontend
- - `cd VILLASweb`
- - `docker build -t villasweb-frontend .`
- 
-### Backend
- - `cd ..\VILLASweb-backend-go`
- - `docker build -t villasweb-backend .`
-
-### WIP Docker compose and/or Kubernetes
-Run the production docker-compose file:
- - `docker-compose -f docker-compose-production.yml up -d`
-
-
-## Configure VILLASnode to get data into VILLASweb
-
-### Install VILLASnode
-
-See: @ref node-installation
-
-### Create a VILLASnode demo data source
-
-1. Create a new empty configuration file with the following contents and save it as `webdemo.conf`:
-
-> WIP this example configuration requires revision!
-```
-nodes = {
-    sine = {
-        type = "signal"
-        
-        signal = "mixed"
-        values = 5
-        rate = 25
-        frequency = 5
-    }
- 
-    web = {
-        type = "websocket"
-
-        destinations = [
-                "TODO"
-        ]
-    }
- }
- 
- paths = (
-    {
-        in = "sine"
-        out = "web"
-    }
- )
-```
-
-The node `sine` is a software signal generator for 5 signals.
-The node `web` is the websocket interface to stream the data generated by the `sine` node to the browser.
-
-> Note: If you do not want to use your local system as the destination for the websocket node,
->change the option `destinations` of the `web` node to the destination of your production environment, for example `https://my.production.environment/ws/webdemo`.
-
-### Start the VILLASnode gateway
-
-Run the following command on your system:
-
-```bash
-villas node webdemo.conf
-```
-> Note: Change the path to the configuration file accordingly. The `villas` command will only work if VILLASnode is installed on your system.
-
-### Visualize real-time data in VILLASweb Dashboards
-1. Use the VILLASweb frontend to create a new infrastructure component for the VILLASnode gateway from above (Admin user required).
-2. Set the `websocketurl` parameter of the component to the target you used as the `web.destinations` parameter in the configuration from above.
-3. Create a new scenario in VILLASweb and within that scenario create a new component configuration that uses the infrastructure component you created under 2.
-4. WIP: Use the signal auto-configure function to retrieve the signal configuration of the VILLASnode automatically. 
-5. Create a new dashboard with widgets of your choice and link these widgets to the signals received from the infrastructure component.
-6. Enjoy what you see.
diff --git a/doc/Requirements.md b/doc/Requirements.md
deleted file mode 100644
index 2ec0efe..0000000
--- a/doc/Requirements.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Requirements {#web-requirements}
-
-## Services and tools required for development
- - [NodeJS with npm](https://nodejs.org/en/): Runs VILLASweb frontend
- - [Go](https://golang.org/): Runs VILLASweb backend
- - [PostgreSQL database](https://www.postgresql.org/) (min version 11): Backend database
- - [swag](https://github.com/swaggo/swag): For automated API documentation creation
- - [Docker](https://www.docker.com/): Container management system
-
-## Additional requirements for productive use
-  - [NGinX](https://www.nginx.com/): Webserver and reverse proxy for backends
- 
diff --git a/doc/Structure.md b/doc/Structure.md
deleted file mode 100644
index 4399f0c..0000000
--- a/doc/Structure.md
+++ /dev/null
@@ -1,79 +0,0 @@
-# VILLASweb data structure {#web-datastructure}
-
-This document describes how data (scenarios, infrastructure components, users etc., not only live data) is structured in VILLASweb.
-
-## Data model
-
-![Datamodel](../src/img/datamodel.png)
-
-VILLASweb features the following data classes:
-
- - Users
- - Infrastructure Components
- - Scenarios
-    * Component Configurations and Signals
-    * Dashboards and Widgets
-    * Files 
-
-### Users
-- You need a username and a password to authenticate in VILLASweb
-- There exist three categories of users: Guest, User, and Admin
-- Guests have only read access and cannot modify anything
-- Users are normal users, they have access to their scenarios, can see available infrastructure components, and modify their accounts (except for their role)
-- Admin users have full access to everything, they are the only users that can create new users or change the role of existing users. Only admin users can add or modify infrastructure components. 
-
-### Infrastructure Components
-- Components of research infrastructure
-- Category: for example simulator, gateway, amplifier, database, etc.
-- Type: for example RTDS, OpalRT, VILLASnode, Cassandra
-- Can only be added/ modified by admin users
-
-### Scenarios
-- A collection of component configurations, dashboards, and files for a specific experiment
-- Users can have access to multiple scenarios
-- Users can be added to and removed from scenarios
-
-### Component Configurations and Signals
-- Configure an infrastructure component for the use in a specific scenario
-- Input signals: Signals that can be modified in VILLASweb
-- Output signals: Signals that can be visualized on dashboards of VILLASweb
-- Parameters: Additional configuration parameters of the infrastructure component
-- Signals are the actual live data that is displayed or modified through VILLASweb dashboards 
-
-### Dashboards and Widgets
-- Visualize ongoing experiments in real-time
-- Interact with ongoing experiments in real-time
-- Use widgets to design the dashboard according to the needs
-
-### Files
-- Files can be added to scenarios optionally
-- Can be images, model files, CIM xml files
-- Can be used in widgets or component configurations 
-
-## Setup strategy
-
-The easiest way to start from scratch is the following (assuming the infrastructure components are already configured by an admin user, see below):
-
-1. Create a new scenario.
-2. Create and configure a new component configuration and link it with an available infrastructure component.
-3. Configure the input and output signals of the component configuration according to the signals provided by the selected infrastructure component. The number of signals and their order (index starting at 1) must match.
-4. Create a new dashboard and add widgets as desired. Configure the widgets by right-clicking to open the edit menu
-5. If needed, files can be added to the scenario and used by component configurations or widgets (models, images, CIM-files, etc.)
-6. For collaboration with other users, users can be added to a scenario
-
-### Setup of infrastructure components
-
-In the "Infrastructure Components" menu point admin users can create and edit components to be used in experiments. Normal uses can view the available components, but not edit them.
-The components are global at any time and are shared among all users of VILLASweb. 
-
-To create a new infrastructure component, you need to provide:
-- Name
-- Category (see above for examples)
-- Type (see above for examples)
-- Location
-- Host (network address of the component)
-
-At the moment, you need to know the input and output signals of the infrastructure component a priori to be able to create compatible component configurations by hand.
-An auto-detection mechanism for signals is planned for future releases.
-
-> Hint: At least one infrastructure component is required to receive data in VILLASweb.
diff --git a/doc/development.md b/doc/development.md
deleted file mode 100644
index 5b29595..0000000
--- a/doc/development.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Development {#web-development}
-
-- @subpage web-datastructure
-
-In order to get started with VILLASweb, you might also want to check our our [demo project](https://git.rwth-aachen.de/acs/public/villas/Demo) which is simple to setup using Docker Compose.
-
-## Frontend
-
-### Description
-
-The website itself based on the [React JavaScript framework](https://reactjs.org/) and the [Flux library](https://facebook.github.io/flux/).
-
-### Required
-
- - [NodeJS with npm](https://nodejs.org/en/)
-
-### Setup
-
- - `git clone git@git.rwth-aachen.de/acs/public/villas/web.git` to copy the project on your computer
- - `cd VILLASweb`
- - `npm install`
-
-### Running
-
- - `npm start`
-
-This runs the development server for the website on your local computer at port 3000.
-The backend must be running to make the website work. 
-Type `http://localhost:3000/` in the address field of your browser to open the website.
-
-## Backend
-
-### Description
-
-The backend of VILLASweb uses the programming language Go and a PostgreSQL database.
-
-### Required
-
- - [Go](https://golang.org/) (min version 1.11)
- - [PostgreSQL database](https://www.postgresql.org/) (min version 11)
- - [swag](https://github.com/swaggo/swag)
-
-### Setup and Running
-
- - `git clone git@git.rwth-aachen.de/acs/public/villas/web-backend-go.git` to copy the project on your computer
- - `cd VILLASweb-backend-go`
- - `go mod tidy`
- - `go run start.go [params]`
- 
-To obtain a list of available parameters use `go run start.go --help`.
-To run the tests use `go test $(go list ./... ) -p 1` in the top-level folder of the repo.
-
-Running the backend will only work if the PostgreSQL database is setup properly. Otherwise, you will get error messages.
-
-### Auto-generate the API documentation
-
-The documentation of the VILLASweb API in the OpenAPI format can be auto-generated from the source code documentation using the tool swag.
-To do this run the following in the top-level folder of the repo:
-
-- `go mod tidy`
-- `go install github.com/swaggo/swag/cmd/swag`
-- `swag init -p pascalcase -g "start.go" -o "./doc/api/"`
-
-The `.yaml` and `.json` files in OpenAPI swagger format are created in the output folder `doc/api`.
-
-### PostgreSQL database setup
-
-Please check the [Readme file in the backend repository](https://git.rwth-aachen.de/acs/public/villas/web-backend-go) for some useful hints on the local setup of the PostreSQL database.
- 
-

From 935bf3894f57552dda37d46349f0ecf7e865f0af Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Tue, 26 Jan 2021 17:28:03 +0100
Subject: [PATCH 59/74] show ICstatus props in JSONview #265

---
 src/ic/ic-dialog.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index c7b4551..1601bee 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -16,18 +16,9 @@ class ICDialog extends React.Component {
     this.state = {
       confirmCommand: false,
       command: '',
-      icStatus: {}
     };
   }
 
-  static getDerivedStateFromProps(props, state){
-    if(typeof props.icStatus !== 'undefined'){
-      return {icStatus: props.icStatus}
-    } else {
-      return {}
-    }
-  }
-
   onClose(canceled) {
     this.props.onClose();
   }
@@ -58,9 +49,6 @@ class ICDialog extends React.Component {
 
   render() {
 
-    let icStatus = this.state.icStatus;
-    delete icStatus['icID'];
-
     let graphURL = ""
     if (this.props.ic.apiurl !== ""){
       graphURL = this.props.ic.apiurl + "/graph.svg"
@@ -83,7 +71,7 @@ class ICDialog extends React.Component {
               <h5>Status:</h5>
 
               <ReactJson
-                src={icStatus}
+                src={this.props.icStatus}
                 name={false}
                 displayDataTypes={false}
                 displayObjectSize={false}

From 910db7534bad3110341f4f928a4aa90f26354955 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Thu, 28 Jan 2021 11:16:17 +0100
Subject: [PATCH 60/74] use raw status info from IC data model instead of
 status store

---
 src/ic/ic-data-data-manager.js | 61 --------------------------
 src/ic/ic-dialog.js            |  2 +-
 src/ic/ic-status-store.js      | 72 -------------------------------
 src/ic/ic-store.js             | 45 ++++++++++++++++++++
 src/ic/ics-data-manager.js     | 78 +++++++++++++++++++++++++++-------
 src/ic/ics.js                  | 21 +++------
 6 files changed, 113 insertions(+), 166 deletions(-)
 delete mode 100644 src/ic/ic-status-store.js

diff --git a/src/ic/ic-data-data-manager.js b/src/ic/ic-data-data-manager.js
index 065d21c..ba2225e 100644
--- a/src/ic/ic-data-data-manager.js
+++ b/src/ic/ic-data-data-manager.js
@@ -44,67 +44,6 @@ class IcDataDataManager {
     }
   }
 
-  getStatus(url,socketname,token,icid,ic){
-    RestAPI.get(url, null).then(response => {
-      AppDispatcher.dispatch({
-        type: 'ic-status/status-received',
-        data: response,
-        token: token,
-        socketname: socketname,
-        icid: icid,
-        ic: ic
-      });
-      if(!ic.managedexternally){
-        let tempIC = ic;
-        tempIC.state = response.state;
-        AppDispatcher.dispatch({
-          type: 'ics/start-edit',
-          data: tempIC,
-          token: token,
-        });
-      }
-    }).catch(error => {
-      AppDispatcher.dispatch({
-        type: 'ic-status/status-error',
-        error: error
-      })
-    })
-  }
-
-  restart(url,socketname,token){
-    RestAPI.post(url, null).then(response => {
-      AppDispatcher.dispatch({
-        type: 'ic-status/restart-successful',
-        data: response,
-        token: token,
-        socketname: socketname,
-      });
-    }).catch(error => {
-      AppDispatcher.dispatch({
-        type: 'ic-status/restart-error',
-        error: error
-      })
-    })
-  }
-
-  shutdown(url,socketname,token){
-    RestAPI.post(url, null).then(response => {
-      AppDispatcher.dispatch({
-        type: 'ic-status/shutdown-successful',
-        data: response,
-        token: token,
-        socketname: socketname,
-      });
-    }).catch(error => {
-      AppDispatcher.dispatch({
-        type: 'ic-status/shutdown-error',
-        error: error
-      })
-    })
-  }
-
-
-
   closeAll() {
     // close every open socket
     for (var identifier in this._sockets) {
diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 1601bee..b73af0b 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -71,7 +71,7 @@ class ICDialog extends React.Component {
               <h5>Status:</h5>
 
               <ReactJson
-                src={this.props.icStatus}
+                src={this.props.ic.statusupdateraw}
                 name={false}
                 displayDataTypes={false}
                 displayObjectSize={false}
diff --git a/src/ic/ic-status-store.js b/src/ic/ic-status-store.js
deleted file mode 100644
index 4895a8d..0000000
--- a/src/ic/ic-status-store.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import ArrayStore from '../common/array-store';
-import ICDataDataManager from './ic-data-data-manager';
-
-class ICStatusStore extends ArrayStore {
-  constructor() {
-    super('ic-status', ICDataDataManager);
-  }
-
-
-  reduce(state, action) {
-    switch(action.type) {
-
-      case 'ic-status/get-status':
-        ICDataDataManager.getStatus(action.url, action.socketname, action.token, action.icid, action.ic);
-        return super.reduce(state, action);
-
-      case 'ic-status/status-received':
-        let tempData = action.data;
-        tempData.icID = action.icid;
-
-        return this.updateElements(state, [tempData]);
-
-      case 'ic-status/status-error':
-        console.log("status error");
-        return state;
-
-      case 'ic-status/restart':
-        ICDataDataManager.restart(action.url, action.socketname, action.token);
-        return state;
-
-      case 'ic-status/restart-successful':
-        return state;
-
-      case 'ic-status/restart-error':
-        console.log("restart error");
-        return state;
-
-      case 'ic-status/shutdown':
-        ICDataDataManager.shutdown(action.url, action.socketname, action.token);
-        return state;
-
-      case 'ic-status/shutdown-successful':
-        return state;
-
-      case 'ic-status/shutdown-error':
-        console.log("shutdown error");
-        return state;
-
-      default:
-        return super.reduce(state, action);
-    }
-  }
-}
-
-export default new ICStatusStore();
diff --git a/src/ic/ic-store.js b/src/ic/ic-store.js
index 21d84ea..15da1e9 100644
--- a/src/ic/ic-store.js
+++ b/src/ic/ic-store.js
@@ -76,6 +76,51 @@ class InfrastructureComponentStore extends ArrayStore {
         console.log(action.error);
         return state;
 
+      case 'ics/get-status':
+        ICsDataManager.getStatus(action.url, action.token, action.ic);
+        return super.reduce(state, action);
+
+      case 'ics/received-status':
+        let tempIC = action.ic;
+        if(!tempIC.managedexternally){
+          tempIC.state = response.state;
+          tempIC.statusupdateraw = response
+          AppDispatcher.dispatch({
+            type: 'ics/start-edit',
+            data: tempIC,
+            token: token,
+          });
+        }
+        return super.reduce(state, action);
+
+      case 'ics/status-error':
+        console.log("status error:", action.error);
+        return super.reduce(state, action);
+
+      case 'ics/restart':
+        ICsDataManager.restart(action.url, action.token);
+        return super.reduce(state, action);
+
+      case 'ics/restart-successful':
+        console.log("restart response:", action.data);
+        return super.reduce(state, action);
+
+      case 'ics/restart-error':
+        console.log("restart error:", action.error);
+        return super.reduce(state, action);
+
+      case 'ics/shutdown':
+        ICsDataManager.shutdown(action.url, action.token);
+        return super.reduce(state, action);
+
+      case 'ics/shutdown-successful':
+        console.log("shutdown response:", action.data);
+        return super.reduce(state, action);
+
+      case 'ics/shutdown-error':
+        console.log("shutdown error:", action.error);
+        return super.reduce(state, action);
+
       default:
         return super.reduce(state, action);
     }
diff --git a/src/ic/ics-data-manager.js b/src/ic/ics-data-manager.js
index 89455c3..e4c9e44 100644
--- a/src/ic/ics-data-manager.js
+++ b/src/ic/ics-data-manager.js
@@ -20,23 +20,69 @@ import RestAPI from '../common/api/rest-api';
 import AppDispatcher from '../common/app-dispatcher';
 
 class IcsDataManager extends RestDataManager {
-    constructor() {
-        super('ic', '/ic');
-    }
+  constructor() {
+      super('ic', '/ic');
+  }
 
-    doActions(ic, action, token = null) {
-        RestAPI.post(this.makeURL(this.url + '/' + ic.id + '/action'), action, token).then(response => {
-            AppDispatcher.dispatch({
-                type: 'ics/action-started',
-                data: response
-            });
-        }).catch(error => {
-            AppDispatcher.dispatch({
-                type: 'ics/action-error',
-                error
-            });
-        });
-    }
+  doActions(ic, action, token = null) {
+      RestAPI.post(this.makeURL(this.url + '/' + ic.id + '/action'), action, token).then(response => {
+          AppDispatcher.dispatch({
+              type: 'ics/action-started',
+              data: response
+          });
+      }).catch(error => {
+          AppDispatcher.dispatch({
+              type: 'ics/action-error',
+              error
+          });
+      });
+  }
+
+  getStatus(url,token,ic){
+    RestAPI.get(url, null).then(response => {
+      AppDispatcher.dispatch({
+        type: 'ics/status-received',
+        data: response,
+        token: token,
+        ic: ic
+      });
+    }).catch(error => {
+      AppDispatcher.dispatch({
+        type: 'ics/status-error',
+        error: error
+      })
+    })
+  }
+
+  restart(url,token){
+    RestAPI.post(url, null).then(response => {
+      AppDispatcher.dispatch({
+        type: 'ics/restart-successful',
+        data: response,
+        token: token,
+      });
+    }).catch(error => {
+      AppDispatcher.dispatch({
+        type: 'ics/restart-error',
+        error: error
+      })
+    })
+  }
+
+  shutdown(url,token){
+    RestAPI.post(url, null).then(response => {
+      AppDispatcher.dispatch({
+        type: 'ics/shutdown-successful',
+        data: response,
+        token: token,
+      });
+    }).catch(error => {
+      AppDispatcher.dispatch({
+        type: 'ics/shutdown-error',
+        error: error
+      })
+    })
+  }
 }
 
 export default new IcsDataManager();
diff --git a/src/ic/ics.js b/src/ic/ics.js
index 4c80853..fc0e206 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -24,7 +24,6 @@ import moment from 'moment'
 
 import AppDispatcher from '../common/app-dispatcher';
 import InfrastructureComponentStore from './ic-store';
-import ICStatusStore from './ic-status-store';
 
 import Icon from '../common/icon';
 import Table from '../common/table';
@@ -39,7 +38,7 @@ import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class InfrastructureComponents extends Component {
   static getStores() {
-    return [ InfrastructureComponentStore, ICStatusStore];
+    return [ InfrastructureComponentStore];
   }
 
   static statePrio(state) {
@@ -78,9 +77,7 @@ class InfrastructureComponents extends Component {
     return {
       sessionToken: localStorage.getItem("token"),
       ics: ics,
-      icStatus: ICStatusStore.getState(),
       modalIC: {},
-      modalICStatus: {},
       deleteModal: false,
       icModal: false,
       selectedICs: [],
@@ -117,13 +114,10 @@ class InfrastructureComponents extends Component {
       this.state.ics.forEach(ic => {
         if ((ic.type === "villas-node" || ic.type === "villas-relay")
           && ic.apiurl !== '' && ic.apiurl !== undefined && ic.apiurl !== null) {
-          let splitWebsocketURL = ic.websocketurl.split("/");
           AppDispatcher.dispatch({
-            type: 'ic-status/get-status',
+            type: 'ics/get-status',
             url: ic.apiurl + "/status",
-            socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
             token: this.state.sessionToken,
-            icid: ic.id,
             ic: ic
           });
         }
@@ -349,26 +343,22 @@ class InfrastructureComponents extends Component {
   openICStatus(ic){
 
     let index = this.state.ics.indexOf(ic);
-    let icStatus = this.state.icStatus.find(status => status.icID === ic.id);
 
-    this.setState({ icModal: true, modalIC: ic, modalICStatus: icStatus, modalIndex: index })
+    this.setState({ icModal: true, modalIC: ic, modalIndex: index })
   }
 
   sendControlCommand(command,ic){
-    let splitWebsocketURL = ic.websocketurl.split("/");
 
     if(command === "restart"){
       AppDispatcher.dispatch({
-        type: 'ic-status/restart',
+        type: 'ics/restart',
         url: ic.apiurl + "/restart",
-        socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
         token: this.state.sessionToken,
       });
     }else if(command === "shutdown"){
       AppDispatcher.dispatch({
-        type: 'ic-status/shutdown',
+        type: 'ics/shutdown',
         url: ic.apiurl + "/shutdown",
-        socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
         token: this.state.sessionToken,
       });
     }
@@ -451,7 +441,6 @@ class InfrastructureComponents extends Component {
           ic={this.state.modalIC}
           token={this.state.sessionToken}
           userRole={this.state.currentUser.role}
-          icStatus={this.state.modalICStatus}
           sendControlCommand={(command, ic) => this.sendControlCommand(command, ic)}/>
 
         <DeleteDialog title="infrastructure-component" name={this.state.modalIC.name || 'Unknown'} show={this.state.deleteModal} onClose={(e) => this.closeDeleteModal(e)} />

From b6b6629f2e1a46992e1bb05e58bc6f69c7fe5eb2 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Thu, 28 Jan 2021 12:33:58 +0100
Subject: [PATCH 61/74] fix ic store typos

---
 src/ic/ic-store.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ic/ic-store.js b/src/ic/ic-store.js
index 15da1e9..d9ae16e 100644
--- a/src/ic/ic-store.js
+++ b/src/ic/ic-store.js
@@ -80,15 +80,15 @@ class InfrastructureComponentStore extends ArrayStore {
         ICsDataManager.getStatus(action.url, action.token, action.ic);
         return super.reduce(state, action);
 
-      case 'ics/received-status':
+      case 'ics/status-received':
         let tempIC = action.ic;
         if(!tempIC.managedexternally){
-          tempIC.state = response.state;
-          tempIC.statusupdateraw = response
+          tempIC.state = action.data.state;
+          tempIC.statusupdateraw = action.data;
           AppDispatcher.dispatch({
             type: 'ics/start-edit',
             data: tempIC,
-            token: token,
+            token: action.token,
           });
         }
         return super.reduce(state, action);

From 5e30e17d899b146b377bb322708033305e8ce163 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Thu, 28 Jan 2021 14:27:31 +0100
Subject: [PATCH 62/74] show uuid in IC dialog

---
 src/ic/ic-dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 1601bee..bb4888f 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -58,7 +58,7 @@ class ICDialog extends React.Component {
     return (
       <Dialog
         show={this.props.show}
-        title={this.props.ic.name}
+        title={this.props.ic.name + " ( " + this.props.ic.uuid + " )"}
         buttonTitle="Close"
         onClose={(c) => this.onClose(c)}
         valid={true}

From 747f47b2af5abe8c2b73e191207b1891e542a858 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Thu, 28 Jan 2021 14:28:41 +0100
Subject: [PATCH 63/74] only request VILLASnode status if not managed
 externally

---
 src/ic/ics.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ic/ics.js b/src/ic/ics.js
index 4c80853..fdc1a6f 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -115,8 +115,8 @@ class InfrastructureComponents extends Component {
 
       // get status of VILLASnode and VILLASrelay ICs
       this.state.ics.forEach(ic => {
-        if ((ic.type === "villas-node" || ic.type === "villas-relay")
-          && ic.apiurl !== '' && ic.apiurl !== undefined && ic.apiurl !== null) {
+        if ((ic.type === "villas-node" || ic.type === "villas-relay" )
+          && ic.apiurl !== '' && ic.apiurl !== undefined && ic.apiurl !== null && !ic.managedexternally) {
           let splitWebsocketURL = ic.websocketurl.split("/");
           AppDispatcher.dispatch({
             type: 'ic-status/get-status',

From ea90b34520e84c254fc4392a53b93c595dc8982b Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Thu, 28 Jan 2021 14:31:53 +0100
Subject: [PATCH 64/74] enable IC dialog window for any managed externally IC

---
 src/ic/ics.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ic/ics.js b/src/ic/ics.js
index fdc1a6f..82aabdb 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -339,7 +339,7 @@ class InfrastructureComponents extends Component {
   modifyNameColumn(name){
     let ic = this.state.ics.find(ic => ic.name === name);
 
-    if(ic.type === "villas-node" || ic.type === "villas-relay"){
+    if(ic.type === "villas-node" || ic.type === "villas-relay" || ic.managedexternally){
       return <Button variant="link" onClick={() => this.openICStatus(ic)}>{name}</Button>    }
     else{
       return <span>{name}</span>

From fd58ab00e2196e15e812c62cde892c876d749419 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Thu, 28 Jan 2021 14:36:42 +0100
Subject: [PATCH 65/74] restrict right part of IC dialog to villasnodes

---
 src/ic/ic-dialog.js | 46 ++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 02d469c..6e79fac 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -81,27 +81,35 @@ class ICDialog extends React.Component {
 
             </Col>
 
-            <Col>
-              <div className='section-buttons-group-right'>
-                <Button style={{ margin: '5px' }} size='sm' onClick={() => this.downloadGraph(graphURL)}><Icon icon="download" /></Button>
-              </div>
-              <h5>Graph:</h5>
-              <div>
-                  <img alt={"Graph image download failed and/or incorrect image URL"} src={graphURL} />
-              </div>
-
-              {this.props.userRole === "Admin" ? (
+            {this.props.ic.type === "villas-node" || this.props.ic.type === "villas-relay" ? (
+              <Col>
+                <div className='section-buttons-group-right'>
+                  <Button style={{margin: '5px'}} size='sm' onClick={() => this.downloadGraph(graphURL)}><Icon
+                    icon="download"/></Button>
+                </div>
+                <h5>Graph:</h5>
                 <div>
-                  <h5>Controls:</h5>
-                  <div>
-                    <Button style={{ margin: '5px' }} size='lg' onClick={() => this.setState({ confirmCommand: true, command: 'restart' })}>Restart</Button>
-                    <Button style={{ margin: '5px' }} size='lg' onClick={() => this.setState({ confirmCommand: true, command: 'shutdown' })}>Shutdown</Button>
-                  </div>
-                </div>)
-                : (<div></div>)}
+                  <img alt={"Graph image download failed and/or incorrect image URL"} src={graphURL}/>
+                </div>
 
-              <ConfirmCommand show={this.state.confirmCommand} command={this.state.command} name={this.props.ic.name} onClose={c => this.closeConfirmModal(c)} />
-            </Col>
+                {this.props.userRole === "Admin" ? (
+                    <div>
+                      <h5>Controls:</h5>
+                      <div>
+                        <Button style={{margin: '5px'}} size='lg'
+                                onClick={() => this.setState({confirmCommand: true, command: 'restart'})}>Restart</Button>
+                        <Button style={{margin: '5px'}} size='lg' onClick={() => this.setState({
+                          confirmCommand: true,
+                          command: 'shutdown'
+                        })}>Shutdown</Button>
+                      </div>
+                    </div>)
+                  : (<div/>)}
+
+                <ConfirmCommand show={this.state.confirmCommand} command={this.state.command} name={this.props.ic.name}
+                                onClose={c => this.closeConfirmModal(c)}/>
+              </Col>
+            ): (<div/>)}
           </Row>
         </form>
       </Dialog>

From 89051b2dd0031245ab8626332d7e0d998db1ed07 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Thu, 28 Jan 2021 15:15:23 +0100
Subject: [PATCH 66/74] clean up code for handover, #271

---
 src/result/edit-result.js          | 57 +++++++++++++-----------------
 src/result/new-result.js           |  1 -
 src/result/result-store.js         | 25 -------------
 src/result/results-data-manager.js | 34 ------------------
 src/scenario/scenario.js           | 22 ++++++------
 5 files changed, 36 insertions(+), 103 deletions(-)

diff --git a/src/result/edit-result.js b/src/result/edit-result.js
index d1fa784..4833251 100644
--- a/src/result/edit-result.js
+++ b/src/result/edit-result.js
@@ -37,22 +37,15 @@ class EditResultDialog extends React.Component {
       description: '',
       uploadFile: null,
       uploadProgress: 0,
-      fileIDs: [],
       files: null,
-      resultChanged: false,
+      result: null,
+      resultExists: false,
     };
   }
 
-  onClose = canceled => {
-    if (canceled) {
-      if (this.props.onClose != null) {
-        this.props.onClose();
-      }
-      return;
-    }
-
-    if (this.valid && this.props.onClose != null) {
-      this.props.onClose(this.state);
+  onClose() {
+    if (this.props.onClose != null) {
+      this.props.onClose();
     }
   };
 
@@ -60,19 +53,20 @@ class EditResultDialog extends React.Component {
     this.setState({ [event.target.id]: event.target.value });
   };
 
-  resetState = () => {
-    this.setState({
-      id: this.props.result.id,
-      description: this.props.result.description,
-      result: this.props.result,
-      fileIDs: this.props.result.resultFileIDs,
-      files: FileStore.getState().filter(file => this.props.result.resultFileIDs.includes(file.id)),
-    });
-  };
-
-  handleStartParametersChange = startParameters => {
-    this.setState({ startParameters });
-  };
+  componentDidUpdate(prevProps, prevState) {
+    if (this.state.resultExists && this.props.files != prevProps.files) {
+      this.setState({files: FileStore.getState().filter(file => this.state.result.resultFileIDs.includes(file.id))});
+    }
+    if (this.props.result != prevProps.result && Object.keys(this.props.result).length != 0) {
+      this.setState({
+        id: this.props.result.id,
+        description: this.props.result.description,
+        result: this.props.result,
+        resultExists: true,
+        files: FileStore.getState().filter(file => this.props.result.resultFileIDs.includes(file.id)),
+      })
+    }
+  }
 
   selectUploadFile(event) {
     this.setState({ uploadFile: event.target.files[0] });
@@ -104,7 +98,7 @@ class EditResultDialog extends React.Component {
   };
 
   deleteFile(index){
-    let file = this.state.files[index]
+    let file = this.state.files[index];
     AppDispatcher.dispatch({
       type: 'files/start-remove',
       data: file,
@@ -113,13 +107,12 @@ class EditResultDialog extends React.Component {
   }
 
   render() {
-    if (this.props.show) {
-    }
+
     return <Dialog show={this.props.show}
                   title={'Edit Result No. '+this.state.id}
-                  buttonTitle='Save'
-                  onClose={this.onClose}
-                  onReset={this.resetState}
+                  buttonTitle='Close'
+                  onClose={() => this.onClose()}
+                  blendOutCancel = {true}
                   valid={true}
                   size = 'lg'>
 
@@ -141,7 +134,7 @@ class EditResultDialog extends React.Component {
               deleteButton
               onDelete={(index) => this.deleteFile(index)}
             />
-          </Table>
+        </Table>
 
 
         <FormGroup controlId='resultfile'>
diff --git a/src/result/new-result.js b/src/result/new-result.js
index 11023a1..73d5e85 100644
--- a/src/result/new-result.js
+++ b/src/result/new-result.js
@@ -33,7 +33,6 @@ class NewResultDialog extends React.Component {
   }
 
   onClose(canceled) {
-      console.log("on close new result");
     if (canceled === false) {
         this.props.onClose(this.state);
     } else {
diff --git a/src/result/result-store.js b/src/result/result-store.js
index f59edb4..d824b1e 100644
--- a/src/result/result-store.js
+++ b/src/result/result-store.js
@@ -74,35 +74,10 @@ class ResultStore extends ArrayStore {
         this.simplifyTimestamps([action.data]);
         return super.reduce(state, action);
 
-      case 'resultfiles/start-download':
-        //FilesDataManager.download(action)
-        return state
-
       case 'resultfiles/start-upload':
         ResultsDataManager.uploadFile(action.data, action.resultID, action.token, action.progressCallback, action.finishedCallback, action.scenarioID);
         return state;
 
-      case 'resultfiles/uploaded':
-        return state;
-
-      case 'resultfiles/upload-error':
-        console.log(action.error);
-        return state;
-
-      case 'resultfiles/downloaded':
-        // in this case a file is contained in the response (no JSON)
-        return this.saveFile(state, action);
-
-      case 'resultfiles/start-edit':
-        ResultsDataManager.update(action.data, action.token, action.id);
-        return state;
-
-      case 'resultfiles/edited':
-          return this.updateElements(state, [action.data]);
-
-      case 'resultfiles/edit-error':
-        return state;
-
       default:
         return super.reduce(state, action);
     }
diff --git a/src/result/results-data-manager.js b/src/result/results-data-manager.js
index bae49da..5c7e2e0 100644
--- a/src/result/results-data-manager.js
+++ b/src/result/results-data-manager.js
@@ -57,40 +57,6 @@ class ResultsDataManager extends RestDataManager{
     });
   }
 
-  download(action){
-    RestAPI.download(this.makeURL(this.url), action.token, action.data).then(response => {
-      AppDispatcher.dispatch({
-        type: 'resultfiles/downloaded',
-        data: response,
-        id: action.data,
-        token: action.token
-      });
-
-    }).catch(error => {
-      AppDispatcher.dispatch({
-        type: 'resultfiles/load-error',
-        error: error
-      });
-    });
-  }
-
-  /* only update file ids
-  update(file, token, id) {
-
-    RestAPI.put(this.makeURL(this.url + '/' + id), file, token).then(response => {
-        AppDispatcher.dispatch({
-          type: 'resultfiles/edited',
-          data: response[this.type]
-        });
-      }).catch(error => {
-        AppDispatcher.dispatch({
-          type: 'resultfiles/edit-error',
-          error: error
-        });
-      });
-    }
-  }*/
-
 }
 
 export default new ResultsDataManager();
\ No newline at end of file
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index 217d98e..56bdd96 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -111,11 +111,10 @@ class Scenario extends React.Component {
       filesEditModal: prevState.filesEditModal || false,
       filesEditSaveState: prevState.filesEditSaveState || [],
 
-      editResultsModal: false,
+      editResultsModal: prevState.editResultsModal || false,
       modalResultsData: {},
       modalResultsIndex: 0,
       newResultModal: false,
-      editFilesModal: false,
       filesToDownload: [],
 
       editOutputSignalsModal: prevState.editOutputSignalsModal || false,
@@ -159,8 +158,7 @@ class Scenario extends React.Component {
 
   componentDidUpdate(prevProps, prevState) {
     // check whether file data has been loaded
-    if (this.state.filesToDownload.length > 0  ) { // todo: for download all - wait until data for all has arrived
-      console.log(this.state.files);
+    if (this.state.filesToDownload.length > 0  ) {
       if (this.state.filesToDownload.length === 1) {
         let fileToDownload = FileStore.getState().filter(file => file.id === this.state.filesToDownload[0])
         if (fileToDownload.length === 1 && fileToDownload[0].data) {
@@ -613,13 +611,14 @@ class Scenario extends React.Component {
     }
   }
 
-  closeEditResultsModal(data) {
-    console.log(data);
+  closeEditResultsModal() {
     this.setState({ editResultsModal: false });
 
-    if (data) {
-
-    }
+    AppDispatcher.dispatch({
+      type: 'results/start-load',
+      token: this.state.sessionToken,
+      param: '?scenarioID=' + this.state.scenario.id
+    })
   }
 
   downloadResultData(param) {
@@ -745,10 +744,11 @@ class Scenario extends React.Component {
 
           <EditResultDialog
             sessionToken={this.state.sessionToken}
-            show={this.state.editResultsModal} 
+            show={this.state.editResultsModal}
+            files={this.state.files}
             result={this.state.modalResultsData}
             scenarioID={this.state.scenario.id}
-            onClose={data => this.closeEditResultsModal(data)} />
+            onClose={this.closeEditResultsModal.bind(this)} />
           <DeleteDialog title="result" name={this.state.modalResultsData.id} show={this.state.deleteResultsModal} onClose={(e) => this.closeDeleteResultsModal(e)} />
         </div>
     }

From ba4b3c556ee10e2be792570674f4533cc3482cb5 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Thu, 28 Jan 2021 19:30:19 +0100
Subject: [PATCH 67/74] changed add and impport buttons for tables

---
 src/scenario/scenario.js  | 34 ++++++++++------------------------
 src/scenario/scenarios.js | 12 ++++--------
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index 56bdd96..569e73c 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -775,7 +775,10 @@ class Scenario extends React.Component {
 
 
       {/*Component Configurations table*/}
-      <h2 style={tableHeadingStyle}>Component Configurations</h2>
+      <h2 style={tableHeadingStyle}>Component Configurations
+        <Button onClick={() => this.addConfig()} style={buttonStyle}><Icon icon="plus" /></Button>
+        <Button onClick={() => this.setState({ importConfigModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+      </h2>
       <Table data={this.state.configs}>
         <TableColumn checkbox onChecked={(index, event) => this.onConfigChecked(index, event)} width='30' />
         <TableColumn title='Name' dataKey='name' />
@@ -832,11 +835,6 @@ class Scenario extends React.Component {
           ]} />
       </div>
 
-      <div style={{ float: 'right' }}>
-        <Button onClick={() => this.addConfig()} style={buttonStyle}><Icon icon="plus" /> Component Configuration</Button>
-        <Button onClick={() => this.setState({ importConfigModal: true })} style={buttonStyle}><Icon icon="upload" /> Import</Button>
-      </div>
-
       <div style={{ clear: 'both' }} />
 
       <EditConfigDialog
@@ -869,7 +867,10 @@ class Scenario extends React.Component {
       />
 
       {/*Dashboard table*/}
-      <h2 style={tableHeadingStyle}>Dashboards</h2>
+      <h2 style={tableHeadingStyle}>Dashboards
+        <Button onClick={() => this.setState({ newDashboardModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
+        <Button onClick={() => this.setState({ importDashboardModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+      </h2>
       <Table data={this.state.dashboards}>
         <TableColumn title='Name' dataKey='name' link='/dashboards/' linkKey='id' />
         <TableColumn title='Grid' dataKey='grid' />
@@ -887,13 +888,6 @@ class Scenario extends React.Component {
         />
       </Table>
 
-      <div style={{ float: 'right' }}>
-        <Button onClick={() => this.setState({ newDashboardModal: true })} style={buttonStyle}><Icon icon="plus" /> Dashboard</Button>
-        <Button onClick={() => this.setState({ importDashboardModal: true })} style={buttonStyle}><Icon icon="upload" /> Import</Button>
-      </div>
-
-      <div style={{ clear: 'both' }} />
-
       <NewDashboardDialog show={this.state.newDashboardModal} onClose={data => this.closeNewDashboardModal(data)} />
       <EditDashboardDialog show={this.state.dashboardEditModal} dashboard={this.state.modalDashboardData} onClose={data => this.closeEditDashboardModal(data)} />
       <ImportDashboardDialog show={this.state.importDashboardModal} onClose={data => this.closeImportDashboardModal(data)} />
@@ -901,18 +895,10 @@ class Scenario extends React.Component {
       <DeleteDialog title="dashboard" name={this.state.modalDashboardData.name} show={this.state.deleteDashboardModal} onClose={(e) => this.closeDeleteDashboardModal(e)} />
 
       {/*Result table*/}
-      <div>
-        <h2 style={tableHeadingStyle}>Results
+      <h2 style={tableHeadingStyle}>Results
         <Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
-        </h2>
-
-      </div>
+      </h2>
       {resulttable}
-      {/*
-      <div style={{ float: 'right' }}>
-        <Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /> Result</Button>
-      </div>
-      */}
       <NewResultDialog show={this.state.newResultModal} onClose={data => this.closeNewResultModal(data)} />
 
       {/*Scenario Users table*/}
diff --git a/src/scenario/scenarios.js b/src/scenario/scenarios.js
index d176d0f..fb56da6 100644
--- a/src/scenario/scenarios.js
+++ b/src/scenario/scenarios.js
@@ -241,7 +241,10 @@ class Scenarios extends Component {
 
     return (
       <div className='section'>
-        <h1>Scenarios</h1>
+        <h1>Scenarios
+          <Button onClick={() => this.setState({ newModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
+          <Button onClick={() => this.setState({ importModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+        </h1>
 
         <Table data={this.state.scenarios}>
           <TableColumn title='Name' dataKey='name' link='/scenarios/' linkKey='id' />
@@ -260,13 +263,6 @@ class Scenarios extends Component {
           />
         </Table>
 
-        <div style={{ float: 'right' }}>
-          <Button onClick={() => this.setState({ newModal: true })} style={buttonStyle}><Icon icon="plus" /> Scenario</Button>
-          <Button onClick={() => this.setState({ importModal: true })} style={buttonStyle}><Icon icon="upload" /> Import</Button>
-        </div>
-
-        <div style={{ clear: 'both' }} />
-
         <NewScenarioDialog show={this.state.newModal} onClose={(data) => this.closeNewModal(data)} />
         <EditScenarioDialog show={this.state.editModal} onClose={(data) => this.closeEditModal(data)} scenario={this.state.modalScenario} />
         <ImportScenarioDialog show={this.state.importModal} onClose={data => this.closeImportModal(data)} nodes={this.state.nodes} />

From 104679b50f82387f51bf7f6b44831da5fc51cb7a Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Thu, 28 Jan 2021 19:30:19 +0100
Subject: [PATCH 68/74] changed add and impport buttons for tables, #282

---
 src/scenario/scenario.js  | 34 ++++++++++------------------------
 src/scenario/scenarios.js | 12 ++++--------
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index 56bdd96..569e73c 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -775,7 +775,10 @@ class Scenario extends React.Component {
 
 
       {/*Component Configurations table*/}
-      <h2 style={tableHeadingStyle}>Component Configurations</h2>
+      <h2 style={tableHeadingStyle}>Component Configurations
+        <Button onClick={() => this.addConfig()} style={buttonStyle}><Icon icon="plus" /></Button>
+        <Button onClick={() => this.setState({ importConfigModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+      </h2>
       <Table data={this.state.configs}>
         <TableColumn checkbox onChecked={(index, event) => this.onConfigChecked(index, event)} width='30' />
         <TableColumn title='Name' dataKey='name' />
@@ -832,11 +835,6 @@ class Scenario extends React.Component {
           ]} />
       </div>
 
-      <div style={{ float: 'right' }}>
-        <Button onClick={() => this.addConfig()} style={buttonStyle}><Icon icon="plus" /> Component Configuration</Button>
-        <Button onClick={() => this.setState({ importConfigModal: true })} style={buttonStyle}><Icon icon="upload" /> Import</Button>
-      </div>
-
       <div style={{ clear: 'both' }} />
 
       <EditConfigDialog
@@ -869,7 +867,10 @@ class Scenario extends React.Component {
       />
 
       {/*Dashboard table*/}
-      <h2 style={tableHeadingStyle}>Dashboards</h2>
+      <h2 style={tableHeadingStyle}>Dashboards
+        <Button onClick={() => this.setState({ newDashboardModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
+        <Button onClick={() => this.setState({ importDashboardModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+      </h2>
       <Table data={this.state.dashboards}>
         <TableColumn title='Name' dataKey='name' link='/dashboards/' linkKey='id' />
         <TableColumn title='Grid' dataKey='grid' />
@@ -887,13 +888,6 @@ class Scenario extends React.Component {
         />
       </Table>
 
-      <div style={{ float: 'right' }}>
-        <Button onClick={() => this.setState({ newDashboardModal: true })} style={buttonStyle}><Icon icon="plus" /> Dashboard</Button>
-        <Button onClick={() => this.setState({ importDashboardModal: true })} style={buttonStyle}><Icon icon="upload" /> Import</Button>
-      </div>
-
-      <div style={{ clear: 'both' }} />
-
       <NewDashboardDialog show={this.state.newDashboardModal} onClose={data => this.closeNewDashboardModal(data)} />
       <EditDashboardDialog show={this.state.dashboardEditModal} dashboard={this.state.modalDashboardData} onClose={data => this.closeEditDashboardModal(data)} />
       <ImportDashboardDialog show={this.state.importDashboardModal} onClose={data => this.closeImportDashboardModal(data)} />
@@ -901,18 +895,10 @@ class Scenario extends React.Component {
       <DeleteDialog title="dashboard" name={this.state.modalDashboardData.name} show={this.state.deleteDashboardModal} onClose={(e) => this.closeDeleteDashboardModal(e)} />
 
       {/*Result table*/}
-      <div>
-        <h2 style={tableHeadingStyle}>Results
+      <h2 style={tableHeadingStyle}>Results
         <Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
-        </h2>
-
-      </div>
+      </h2>
       {resulttable}
-      {/*
-      <div style={{ float: 'right' }}>
-        <Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /> Result</Button>
-      </div>
-      */}
       <NewResultDialog show={this.state.newResultModal} onClose={data => this.closeNewResultModal(data)} />
 
       {/*Scenario Users table*/}
diff --git a/src/scenario/scenarios.js b/src/scenario/scenarios.js
index d176d0f..fb56da6 100644
--- a/src/scenario/scenarios.js
+++ b/src/scenario/scenarios.js
@@ -241,7 +241,10 @@ class Scenarios extends Component {
 
     return (
       <div className='section'>
-        <h1>Scenarios</h1>
+        <h1>Scenarios
+          <Button onClick={() => this.setState({ newModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
+          <Button onClick={() => this.setState({ importModal: true })} style={buttonStyle}><Icon icon="upload" /></Button>
+        </h1>
 
         <Table data={this.state.scenarios}>
           <TableColumn title='Name' dataKey='name' link='/scenarios/' linkKey='id' />
@@ -260,13 +263,6 @@ class Scenarios extends Component {
           />
         </Table>
 
-        <div style={{ float: 'right' }}>
-          <Button onClick={() => this.setState({ newModal: true })} style={buttonStyle}><Icon icon="plus" /> Scenario</Button>
-          <Button onClick={() => this.setState({ importModal: true })} style={buttonStyle}><Icon icon="upload" /> Import</Button>
-        </div>
-
-        <div style={{ clear: 'both' }} />
-
         <NewScenarioDialog show={this.state.newModal} onClose={(data) => this.closeNewModal(data)} />
         <EditScenarioDialog show={this.state.editModal} onClose={(data) => this.closeEditModal(data)} scenario={this.state.modalScenario} />
         <ImportScenarioDialog show={this.state.importModal} onClose={data => this.closeImportModal(data)} nodes={this.state.nodes} />

From f5825f2fa153f572ff05e039fc627c44fab1ac53 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 29 Jan 2021 09:40:23 +0100
Subject: [PATCH 69/74] add notification for internal server error

---
 src/common/api/rest-api.js                        | 9 ++++++---
 src/common/data-managers/notifications-factory.js | 8 ++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/common/api/rest-api.js b/src/common/api/rest-api.js
index b33c36f..c35c0d3 100644
--- a/src/common/api/rest-api.js
+++ b/src/common/api/rest-api.js
@@ -26,10 +26,13 @@ import NotificationsFactory from "../data-managers/notifications-factory";
 function isNetworkError(err, url) {
   let result = false;
 
-  // If not status nor response fields, it is a network error. TODO: Handle timeouts
-  if (err.status == null || err.status === 500 || err.response == null) {
-    result = true;
 
+  if (err.status === 500 && err.response != null){
+    let notification = NotificationsFactory.INTERNAL_SERVER_ERROR(err.response)
+    NotificationsDataManager.addNotification(notification);
+  } else if (err.status == null || err.status === 500 || err.response == null) {
+    // If not status nor response fields, it is a network error. TODO: Handle timeouts
+    result = true;
     let notification = err.timeout? NotificationsFactory.REQUEST_TIMEOUT : NotificationsFactory.SERVER_NOT_REACHABLE(url);
     NotificationsDataManager.addNotification(notification);
   }
diff --git a/src/common/data-managers/notifications-factory.js b/src/common/data-managers/notifications-factory.js
index 7b4867b..ece1e8b 100644
--- a/src/common/data-managers/notifications-factory.js
+++ b/src/common/data-managers/notifications-factory.js
@@ -42,6 +42,14 @@ class NotificationsFactory {
     };
   }
 
+  static INTERNAL_SERVER_ERROR(response) {
+    return {
+      title: 'Internal server error',
+      message: response.message,
+      level: 'error'
+    };
+  }
+
   static ADD_ERROR(message) {
     return {
       title: "Add Error",

From 116d3de3fa3907d66c146df94b331ffaec50eedf Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 29 Jan 2021 10:05:51 +0100
Subject: [PATCH 70/74] backwards compatibility of plot legend

---
 src/widget/widget-plot/plot-legend.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/widget/widget-plot/plot-legend.js b/src/widget/widget-plot/plot-legend.js
index 1ada30d..4dd7459 100644
--- a/src/widget/widget-plot/plot-legend.js
+++ b/src/widget/widget-plot/plot-legend.js
@@ -20,7 +20,7 @@ import { scaleOrdinal} from 'd3-scale';
 import {schemeCategory10} from 'd3-scale-chromatic'
 
 function Legend(props){
- 
+
   const signal = props.sig;
   const hasScalingFactor = (signal.scalingFactor !== 1);
 
@@ -52,10 +52,15 @@ class PlotLegend extends React.Component {
 
     return <div className="plot-legend">
       <ul>
-        {
+        { this.props.lineColors !== undefined && this.props.lineColors != null ? (
           this.props.signals.map( signal =>
              <Legend key={signal.id} sig={signal} lineColor={this.props.lineColors[signal.id]}/>
-        )}
+        )) : (
+          this.props.signals.map( signal =>
+            <Legend key={signal.id} sig={signal} lineColor={"undefined"}/>
+          ))
+        }
+
       </ul>
     </div>;
   }

From 57084222c113f8bb20b7031bc3a2d391282f1645 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 29 Jan 2021 10:41:35 +0100
Subject: [PATCH 71/74] backwards compatibility of plot

---
 src/widget/widget-plot/plot.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/widget/widget-plot/plot.js b/src/widget/widget-plot/plot.js
index 1677915..6f314fe 100644
--- a/src/widget/widget-plot/plot.js
+++ b/src/widget/widget-plot/plot.js
@@ -207,6 +207,11 @@ class Plot extends React.Component {
 
     const lines = this.state.data.map((values, index) => {
       let signalID = this.props.signalIDs[index];
+
+      if(this.props.lineColors === undefined || this.props.lineColors === null){
+        this.props.lineColors = [] // for backwards compatibility
+      }
+
       if (typeof this.props.lineColors[signalID] === "undefined") {
         this.props.lineColors[signalID] = newLineColor(signalID);
       }

From 549670ce9d059fc2e18f89961837372150c30ffc Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 29 Jan 2021 11:36:58 +0100
Subject: [PATCH 72/74] backwards compatibility of edit plot widget colors

---
 .../edit-widget-plot-colors-control.js        | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/widget/edit-widget/edit-widget-plot-colors-control.js b/src/widget/edit-widget/edit-widget-plot-colors-control.js
index 567e84f..a612277 100644
--- a/src/widget/edit-widget/edit-widget-plot-colors-control.js
+++ b/src/widget/edit-widget/edit-widget-plot-colors-control.js
@@ -19,6 +19,8 @@ import React, { Component } from 'react';
 import { FormGroup, OverlayTrigger, Tooltip , FormLabel, Button } from 'react-bootstrap';
 import ColorPicker from './color-picker'
 import Icon from "../../common/icon";
+import {scaleOrdinal} from "d3-scale";
+import {schemeCategory10} from "d3-scale-chromatic";
 
 // schemeCategory20 no longer available in d3
 
@@ -36,8 +38,20 @@ class EditWidgetPlotColorsControl extends Component {
   }
 
   static getDerivedStateFromProps(props, state){
+
+    let widget = props.widget;
+    if(widget.customProperties.lineColors === undefined || widget.customProperties.lineColors === null){
+      // for backwards compatibility with old plots
+      widget.customProperties.lineColors = []
+
+      const newLineColor = scaleOrdinal(schemeCategory10);
+      for (let signalID of widget.signalIDs){
+        widget.customProperties.lineColors.push(newLineColor(signalID))
+      }
+    }
+
     return {
-      widget: props.widget
+      widget: widget
     };
   }
 
@@ -62,9 +76,9 @@ class EditWidgetPlotColorsControl extends Component {
           this.setState({selectedIndex: null});
         }
   }
-  
+
   render() {
-   
+
     return (
       <FormGroup>
         <FormLabel>Line Colors</FormLabel>
@@ -81,7 +95,7 @@ class EditWidgetPlotColorsControl extends Component {
                         }
 
                         let signal = this.props.signals.find(signal => signal.id === signalID);
-                      
+
                         return (<OverlayTrigger key={idx} placement={'bottom'} overlay={<Tooltip id={'tooltip-${"signal name"}'}>{signal.name}</Tooltip>}>
                           <Button
                             style={style} key={idx} onClick={i => this.editLineColor(signalID)} ><Icon icon="pen" /></Button>

From 79f14a5262fdef87828b6711cdb98e8a03c27eff Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sat, 30 Jan 2021 17:15:35 +0100
Subject: [PATCH 73/74] Time Offset Widget: user can blend in/out name of IC

---
 src/widget/edit-widget/edit-widget-control-creator.js | 3 ++-
 src/widget/widget-factory.js                          | 1 +
 src/widget/widgets/time-offset.js                     | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/widget/edit-widget/edit-widget-control-creator.js b/src/widget/edit-widget/edit-widget-control-creator.js
index 5617d26..d2ee3fc 100644
--- a/src/widget/edit-widget/edit-widget-control-creator.js
+++ b/src/widget/edit-widget/edit-widget-control-creator.js
@@ -170,7 +170,8 @@ export default function CreateControls(widgetType = null, widget = null, session
                 <EditWidgetNumberControl key={1} widget={widget} controlId={'customProperties.threshold_yellow'} label={'Threshold yellow'} defaultValue={0} handleChange={(e) => handleChange(e)} />,
                 <EditWidgetNumberControl key={2} widget={widget} controlId={'customProperties.threshold_red'} label={'Threshold red'} defaultValue={0} handleChange={(e) => handleChange(e)} />,
                 <EditWidgetCheckboxControl key={3} widget={widget} controlId={'customProperties.horizontal'} input text="Horizontal" handleChange={e => handleChange(e)} />,
-                <EditWidgetCheckboxControl key={4} widget={widget} controlId={'customProperties.showOffset'} input text="showOffset" handleChange={e => handleChange(e)} />,
+                <EditWidgetCheckboxControl key={4} widget={widget} controlId={'customProperties.showName'} input text="showName" handleChange={e => handleChange(e)} />,
+                <EditWidgetCheckboxControl key={5} widget={widget} controlId={'customProperties.showOffset'} input text="showOffset" handleChange={e => handleChange(e)} />,
             );
             break;
 
diff --git a/src/widget/widget-factory.js b/src/widget/widget-factory.js
index 4bb4aaf..f3c804e 100644
--- a/src/widget/widget-factory.js
+++ b/src/widget/widget-factory.js
@@ -209,6 +209,7 @@ class WidgetFactory {
                 widget.customProperties.horizontal = true;
                 widget.customProperties.showOffset = true;
                 widget.customProperties.lockAspect = true;
+                widget.customProperties.showName = true;
                 break;
 
             default:
diff --git a/src/widget/widgets/time-offset.js b/src/widget/widgets/time-offset.js
index 6c6569b..3682da8 100644
--- a/src/widget/widgets/time-offset.js
+++ b/src/widget/widgets/time-offset.js
@@ -71,7 +71,10 @@ class WidgetTimeOffset extends Component {
       <div className="time-offset">
       {this.props.widget.customProperties.icID !== -1 ? 
       (<span></span>) : (<span>no IC</span>)
-      }  
+      }
+      {this.props.widget.customProperties.icID !== -1 && this.props.widget.customProperties.showName ? 
+      (<span>{this.state.icName}</span>) : (<span></span>)
+      }    
       <OverlayTrigger key={0} placement={'left'} overlay={<Tooltip id={`tooltip-${"traffic-light"}`}>
       {this.props.widget.customProperties.icID !== -1 ? 
       (<span>{this.state.icName}<br></br>Offset: {this.state.timeOffset + "s"}</span>) 

From d2461a225ef1939e2761a6345a21b223ded93262 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sat, 30 Jan 2021 18:41:25 +0100
Subject: [PATCH 74/74] Time Offset Widget: widget changes size continuously
 during resizing

---
 src/styles/widgets.css       | 2 ++
 src/widget/widget-factory.js | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/styles/widgets.css b/src/styles/widgets.css
index 06032c2..6f91c0e 100644
--- a/src/styles/widgets.css
+++ b/src/styles/widgets.css
@@ -398,6 +398,8 @@ div[class*="-widget"] label {
 
 /* Begin time offset widget */
 .time-offset {
+    width: 100%;
+    height: 100%;
     display: flex;
     align-items: center;
     justify-content: space-around;
diff --git a/src/widget/widget-factory.js b/src/widget/widget-factory.js
index f3c804e..ed04630 100644
--- a/src/widget/widget-factory.js
+++ b/src/widget/widget-factory.js
@@ -168,6 +168,7 @@ class WidgetFactory {
                 widget.customProperties.valueMin = 0;
                 widget.customProperties.valueMax = 1;
                 widget.customProperties.valueUseMinMax = false;
+                widget.customProperties.lockAspect = true;
                 break;
             case 'Box':
                 widget.minWidth = 50;