#322 & Fixed a bug host tab in the Infrastructure page

snetsystems · Nov 12, 2021 · e8e7196 · e8e7196
1 parent d850f22
commit e8e7196
Show file tree

Hide file tree

Showing 8 changed files with 309 additions and 390 deletions.
diff --git a/frontend/src/hosts/components/CspHostsTable.tsx b/frontend/src/hosts/components/CspHostsTable.tsx
@@ -31,7 +31,7 @@ interface Instance {
 export interface Props {
   cloudHosts: CloudHost[]
   providerRegions: string[]
-  awsPageStatus: RemoteDataState
+  hostsPageStatus: RemoteDataState
   source: Source
   focusedInstance: Instance
   onClickTableRow: HostsPage['handleClickCspTableRow']
@@ -177,21 +177,18 @@ class CspHostsTable extends PureComponent<Props, State> {
   }
 
   private get CloudTableContents(): JSX.Element {
-    const {cloudHosts, awsPageStatus} = this.props
+    const {cloudHosts, hostsPageStatus} = this.props
     const {sortKey, sortDirection, searchTerm} = this.state
     const sortedHosts = this.getSortedHosts(
       cloudHosts,
       searchTerm,
       sortKey,
       sortDirection
     )
-    if (
-      awsPageStatus === RemoteDataState.Loading ||
-      awsPageStatus === RemoteDataState.NotStarted
-    ) {
+    if (hostsPageStatus === RemoteDataState.Loading) {
       return this.LoadingState
     }
-    if (awsPageStatus === RemoteDataState.Error) {
+    if (hostsPageStatus === RemoteDataState.Error) {
       return this.ErrorState
     }
     if (cloudHosts.length === 0) {

diff --git a/frontend/src/hosts/components/HostsTable.tsx b/frontend/src/hosts/components/HostsTable.tsx
@@ -175,10 +175,7 @@ class HostsTable extends PureComponent<Props, State> {
       sortKey,
       sortDirection
     )
-    if (
-      hostsPageStatus === RemoteDataState.Loading ||
-      hostsPageStatus === RemoteDataState.NotStarted
-    ) {
+    if (hostsPageStatus === RemoteDataState.Loading) {
       return this.LoadingState
     }
     if (hostsPageStatus === RemoteDataState.Error) {

diff --git a/frontend/src/hosts/components/graph.scss b/frontend/src/hosts/components/graph.scss
@@ -69,29 +69,6 @@
     }
   }
 
-  .time-series-status {
-    background-color: #bec2cc;
-    width: 12px;
-    height: 12px;
-    border-radius: 75px;
-    &.UsageIndacator {
-      background: #4ed8a0;
-    }
-
-    &.UsageIndacator--caution {
-      background: #ffb94a;
-    }
-
-    &.UsageIndacator--warning {
-      background: #ff8564;
-    }
-
-    &.UsageIndacator--danger {
-      background: red;
-    }
-    // margin: 0 auto;
-  }
-
   .vertex {
     &[btn-type='ipmi'] {
       display: flex;