Fix various issues with Storage on the Console. Prevent refresh on St…

…atus view if server is unreachable.
heroiclabs · May 1, 2019 · 33a0e55 · 33a0e55
1 parent 56c495b
commit 33a0e55
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 27 deletions.
diff --git a/console/a_console-packr.go b/console/a_console-packr.go
diff --git a/console/ui/src/routes/status/index.tsx b/console/ui/src/routes/status/index.tsx
@@ -6,7 +6,7 @@ import {Dispatch} from 'redux';
 import {connect} from 'react-redux';
 import {ApplicationState, ConnectedReduxProps} from '../../store';
 import * as statusActions from '../../store/status/actions';
-import {StatusNodes} from '../../store/status/types';
+import {Node, StatusNodes} from '../../store/status/types';
 
 import Header from '../../components/header';
 import Sidebar from '../../components/sidebar';
@@ -71,6 +71,16 @@ class Status extends Component<Props, State> {
     const now = new Date();
     const t = now.valueOf();
 
+    if (data && data.nodes && data.nodes.length == 0) {
+      data.nodes.push({
+        name: "",
+        avg_latency_ms: NaN,
+        avg_rate_sec: NaN,
+        avg_input_kbs: NaN,
+        avg_output_kbs: NaN
+      } as Node);
+    }
+
     if (
       data &&
       data.nodes &&
@@ -209,6 +219,7 @@ class Status extends Component<Props, State> {
             pointRadius: 0,
             fill: false,
             lineTension: 0.2,
+            spanGaps: false,
             borderWidth: 2
           }))
         },

diff --git a/console/ui/src/routes/storage/index.tsx b/console/ui/src/routes/storage/index.tsx
@@ -156,7 +156,6 @@ class Storage extends Component<Props, State>
     {
       this.props.deleteManyRequest();
       (document.getElementById('user_id') as HTMLInputElement).value = '';
-      this.props.fetchManyRequest({});
     }
   }
 
@@ -166,9 +165,16 @@ class Storage extends Component<Props, State>
     event.preventDefault();
     if(confirm('Are you sure you want to delete this object?'))
     {
-      this.props.deleteRequest(object);
-      (document.getElementById('user_id') as HTMLInputElement).value = '';
-      this.props.fetchManyRequest({});
+      var user_id = (document.getElementById('user_id') as HTMLInputElement).value;
+
+      var request = {
+        filter: user_id,
+        user_id: object.user_id,
+        collection: object.collection,
+        key: object.key
+      } as StorageObjectRequest;
+
+      this.props.deleteRequest(request);
     }
   }
 

diff --git a/console/ui/src/store/status/sagas.ts b/console/ui/src/store/status/sagas.ts
@@ -19,7 +19,6 @@ function* handleFetch()
   }
   catch(err)
   {
-    console.error(err);
     if(err.status === 401)
     {
       localStorage.clear();
@@ -33,8 +32,7 @@ function* handleFetch()
     else if(err instanceof Error)
     {
       yield put(statusError(err.stack!));
-      localStorage.clear();
-      window.location.href = '/';
+      // don't punt to the login screen. Just leave be.
     }
     else
     {

diff --git a/console/ui/src/store/storage/actions.ts b/console/ui/src/store/storage/actions.ts
@@ -65,7 +65,7 @@ export const storageUpdateError = (message: string) => action(
 
 export const storageDeleteRequest = (data: StorageObjectRequest) => action(
   StorageActionTypes.DELETE_REQUEST,
-  data
+  data,
 );
 export const storageDeleteSuccess = () => action(
   StorageActionTypes.DELETE_SUCCESS

diff --git a/console/ui/src/store/storage/sagas.ts b/console/ui/src/store/storage/sagas.ts
@@ -71,6 +71,7 @@ function* handleDeleteMany()
     else
     {
       yield put(storageDeleteManySuccess());
+      yield handleFetchMany({type: '@@storage/FETCH_MANY_REQUEST', payload: {}});
     }
   }
   catch(err)
@@ -263,6 +264,7 @@ function* handleDelete({payload: data}: AnyAction)
     else
     {
       yield put(storageDeleteSuccess());
+      yield handleFetchMany({type: '@@storage/FETCH_MANY_REQUEST', payload: {user_id: data.filter} });
     }
   }
   catch(err)

diff --git a/console/ui/src/store/storage/types.ts b/console/ui/src/store/storage/types.ts
@@ -2,7 +2,8 @@ export interface StorageObjectRequest
 {
   collection?: string,
   key?: string,
-  user_id?: string
+  user_id?: string,
+  filter?: string
 }
 
 export interface StorageObject