fix: messages not showing on popups

flanksource · Apr 8, 2022 · 0f2e352 · 0f2e352
1 parent de33f0b
commit 0f2e352
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/api/axios.js b/src/api/axios.js
@@ -11,14 +11,6 @@ export const IncidentCommander = axios.create({
   }
 });
 
-IncidentCommander.interceptors.response.use(
-  (response) => response,
-  (error) => {
-    toastError(error.response.data.message);
-    return Promise.reject(error);
-  }
-);
-
 export const Logs = axios.create({
   baseURL: "/apm/search",
   headers: {
@@ -45,3 +37,13 @@ export const Config = axios.create({
     "Content-Type": "application/json"
   }
 });
+
+for (const client of [IncidentCommander, Logs, CanaryChecker, Config]) {
+  client.interceptors.response.use(
+    (response) => response,
+    (error) => {
+      toastError(error.response.data.message);
+      return Promise.reject(error);
+    }
+  );
+}
diff --git a/src/api/services/topology.js b/src/api/services/topology.js
@@ -69,4 +69,7 @@ export const getTopology = async (params) => {
   });
 };
 
-export const getCanaries = async () => resolve(CanaryChecker.get("/api"));
+export const getCanaries = async (params) => {
+  const query = stringify(params);
+  return CanaryChecker.get(`/api?${query}`);
+};
diff --git a/src/components/Canary/minimal.js b/src/components/Canary/minimal.js
@@ -7,6 +7,7 @@ import { CanaryCards } from "./card";
 import { CanaryTable } from "./table";
 import mixins from "../../utils/mixins.module.css";
 import { getParamsFromURL } from "./utils";
+import { getCanaries } from "../../api/services/topology";
 
 export function MinimalCanary({
   checks,
@@ -28,7 +29,12 @@ export function MinimalCanary({
   const [selectedCheck, setSelectedCheck] = useState(null);
 
   const handleCheckSelect = (check) => {
-    setSelectedCheck(check);
+    getCanaries({ check: check.id, includeMessages: true }).then((results) => {
+      if (results == null || results.data.checks.length === 0) {
+        return;
+      }
+      setSelectedCheck(results.data.checks[0]);
+    });
   };
 
   return (