From ddd4b29f1f20918f0d015b750ab3b8927e0f33a3 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Mon, 31 Aug 2020 13:48:04 +0200
Subject: [PATCH] Improving user handling of ICs, use localStorage instead of
 LoginStore to get current user #259

---
 src/ic/ics.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/ic/ics.js b/src/ic/ics.js
index 8ab77a3..43101d2 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 LoginStore from '../user/login-store';
 
 import Icon from '../common/icon';
 import Table from '../common/table';
@@ -38,7 +37,7 @@ import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class InfrastructureComponents extends Component {
   static getStores() {
-    return [ LoginStore, InfrastructureComponentStore ];
+    return [ InfrastructureComponentStore ];
   }
 
   static statePrio(state) {
@@ -73,16 +72,14 @@ class InfrastructureComponents extends Component {
         return a.stateUpdatedAt < b.stateUpdatedAt;
       }
     });
-    const currentUser = LoginStore.getState().currentUser;
 
     return {
       sessionToken: localStorage.getItem("token"),
       ics: ics,
       modalIC: {},
       deleteModal: false,
-
       selectedICs: [],
-      currentUser: currentUser
+      currentUser: JSON.parse(localStorage.getItem("currentUser"))
     };
   }
 
@@ -284,7 +281,7 @@ class InfrastructureComponents extends Component {
           {/* <TableColumn title='Realm' dataKeys={['properties.realm', 'rawProperties.realm']} /> */}
           <TableColumn title='WebSocket Endpoint' dataKey='host' />
           <TableColumn title='Last Update' dataKey='stateUpdateAt' modifier={(stateUpdateAt) => this.stateUpdateModifier(stateUpdateAt)} />
-          {this.state.currentUser.role === "Admin" ? 
+          {this.state.currentUser.role === "Admin" ?
           <TableColumn
             width='200'
             editButton
@@ -293,13 +290,13 @@ class InfrastructureComponents extends Component {
             onEdit={index => this.setState({ editModal: true, modalIC: this.state.ics[index], modalIndex: index })}
             onExport={index => this.exportIC(index)}
             onDelete={index => this.setState({ deleteModal: true, modalIC: this.state.ics[index], modalIndex: index })}
-          /> 
+          />
           :
           <TableColumn
             width='100'
             exportButton
             onExport={index => this.exportIC(index)}
-          /> 
+          />
           }
         </Table>
         {this.state.currentUser.role === "Admin" ?