Merge pull request #48 from oslabs-beta/Issue#46

Issue#46
oslabs-beta · Sep 16, 2022 · a5a259b · a5a259b
2 parents 5925468 + 652bc73
commit a5a259b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/client/components/MetricsCard.tsx b/src/client/components/MetricsCard.tsx
@@ -31,6 +31,7 @@ const MetricsCard = ({
   if (query) {
     const { loading, data } = useQuery(query, { ...variables });
     value = loading ? "Loading..." : keySearch(data, searchingFor);
+    if (value === undefined) value = "This metric is not available.";
   }
 
   return (

diff --git a/src/client/components/RealTimeLineChart.tsx b/src/client/components/RealTimeLineChart.tsx
@@ -79,7 +79,7 @@ export default function RealTimeLineChart({
           };
           timeNow.current = new Date(variables.end);
           refetch({ ...variables }).then((result) => {
-            if (loaded.current) {
+            if (loaded.current && typeof data[resource] !== "undefined") {
               result.data[resource].forEach((series, index) => {
                 series[`${metric}`].forEach((point) => {
                   chart.data.datasets[index].data.push(point);

diff --git a/src/client/pages/Topics.tsx b/src/client/pages/Topics.tsx
@@ -158,11 +158,8 @@ const Topics = () => {
                   elevation={8}
                 >
                   <MetricsCard
-                    value={
-                      topicCardQuery.loading
-                        ? "Loading..."
-                        : topicCardQuery.data.cluster.underMinIsr.metric
-                    }
+                    query={TOPIC_PAGE_QUERY}
+                    searchingFor="metric"
                     title="Total Under Min ISR"
                     description="Should be zero."
                   />