From 2a039150a824ede0bdac4d0a894eb6c283855aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chimanshu=E2=80=9D?= Date: Tue, 19 Jan 2021 06:01:57 +0530 Subject: [PATCH] Use API status for loading --- frontend/src/components/metrics/ServicesTable.tsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/metrics/ServicesTable.tsx b/frontend/src/components/metrics/ServicesTable.tsx index d2b4cf75db..de5b6b8908 100644 --- a/frontend/src/components/metrics/ServicesTable.tsx +++ b/frontend/src/components/metrics/ServicesTable.tsx @@ -1,4 +1,4 @@ -import React, { useEffect } from "react"; +import React, { useEffect, useState } from "react"; import { useLocation } from "react-router-dom"; import { NavLink } from "react-router-dom"; import { Spin, Table } from "antd"; @@ -80,16 +80,19 @@ const columns = [ const _ServicesTable = (props: ServicesTableProps) => { const search = useLocation().search; const time_interval = new URLSearchParams(search).get("time"); - + const [dataFetched, setDataFetched] = useState(false) useEffect(() => { /* @Note - Change this from action to thunk */ - props.getServicesList(props.globalTime); + props.getServicesList(props.globalTime).then(()=>{ + setDataFetched(true) + }).catch((e:string)=>{ + alert(e) + }); }, [props.globalTime]); - const isDataAvailable = props.servicesList.length > 1; - if(!isDataAvailable){ + if(!dataFetched){ return (