Resolves #3220 - show heartbeat status in top bar

src/actions/heartbeat.ts

@@ -0,0 +1,14 @@
+import { HEARTBEAT_REQUEST, HEARTBEAT_RESPONSE } from "@src/constants";
+
+export function heartbeatRequest(): {
+  type: "HEARTBEAT_REQUEST";
+} {
+  return { type: HEARTBEAT_REQUEST };
+}
+
+export function heartbeatResponse(response: Record<string, any>): {
+  type: "HEARTBEAT_RESPONSE";
+  response: Record<string, any>;
+} {
+  return { type: HEARTBEAT_RESPONSE, response };
+}

src/actions/session.ts

@@ -1,4 +1,4 @@
-import { notifyError } from "./notifications";
+import { notifyError, notifySuccess } from "./notifications";
 import {
   SESSION_AUTHENTICATED,
   SESSION_AUTHENTICATION_FAILED,
@@ -17,7 +17,7 @@ import {
 } from "@src/constants";
 import type { ActionType, AuthData, ServerInfo } from "@src/types";
 
-type NavigationResult = ActionType<typeof notifyError> | { type: null };
+const AUTH_REDIRECT_RESULT = notifySuccess("Redirecting to auth provider...");
 
 export function sessionBusy(busy: boolean): {
   type: "SESSION_BUSY";
@@ -111,14 +111,17 @@ export function logout(): {
   return { type: SESSION_LOGOUT };
 }
 
-function navigateToFxA(server: string, redirect: string): NavigationResult {
+function navigateToFxA(server: string, redirect: string) {
   document.location.href = `${server}/fxa-oauth/login?redirect=${encodeURIComponent(
     redirect
   )}`;
-  return { type: null };
+  return AUTH_REDIRECT_RESULT;
 }
 
-function postToPortier(server: string, redirect: string): NavigationResult {
+function postToPortier(
+  server: string,
+  redirect: string
+): ActionType<typeof notifyError> {
   // Alter the AuthForm to make it posting Portier auth information to the
   // dedicated Kinto server endpoint. This is definitely one of the ugliest
   // part of this project, but it works :)
@@ -144,7 +147,7 @@ function postToPortier(server: string, redirect: string): NavigationResult {
     hiddenRedirect.setAttribute("value", redirect);
     form.appendChild(hiddenRedirect);
     form.submit();
-    return { type: null };
+    return AUTH_REDIRECT_RESULT;
   } catch (error) {
     return notifyError("Couldn't redirect to authentication endpoint.", error);
   }
@@ -153,7 +156,7 @@ function postToPortier(server: string, redirect: string): NavigationResult {
 export function navigateToOpenID(
   authFormData: any,
   provider: any
-): NavigationResult {
+): ActionType<typeof notifyError> {
   const { origin, pathname } = document.location;
   const { server } = authFormData;
   const strippedServer = server.replace(/\/$/, "");
@@ -162,16 +165,19 @@ export function navigateToOpenID(
   const payload = btoa(JSON.stringify(authFormData));
   const redirect = encodeURIComponent(`${origin}${pathname}#/auth/${payload}/`);
   document.location.href = `${strippedServer}/${strippedAuthPath}?callback=${redirect}&scope=openid email`;
-  return { type: null };
+  return AUTH_REDIRECT_RESULT;
 }
 
 /**
  * Massive side effect: this will navigate away from the current page to perform
  * authentication to a third-party service, like FxA.
  */
-export function navigateToExternalAuth(authFormData: any): NavigationResult {
+export function navigateToExternalAuth(
+  authFormData: any
+): ActionType<typeof notifyError> {
   const { origin, pathname } = document.location;
   const { server, authType } = authFormData;
+
   try {
     const payload = btoa(JSON.stringify(authFormData));
     const redirect = `${origin}${pathname}#/auth/${payload}/`;

src/components/SessionInfoBar.tsx

@@ -1,15 +1,35 @@
+import * as HeartbeatActions from "@src/actions/heartbeat";
 import * as SessionActions from "@src/actions/session";
 import { useAppDispatch, useAppSelector } from "@src/hooks/app";
-import * as React from "react";
-import { BoxArrowRight } from "react-bootstrap-icons";
-import { QuestionCircleFill } from "react-bootstrap-icons";
-import { Clipboard } from "react-bootstrap-icons";
+import React, { useEffect } from "react";
+import {
+  BoxArrowRight,
+  CircleFill,
+  Clipboard,
+  ExclamationCircleFill,
+  QuestionCircleFill,
+} from "react-bootstrap-icons";
 
 export function SessionInfoBar() {
-  const { url, project_name, project_docs, user } = useAppSelector(
-    store => store.session.serverInfo
+  const { heartbeat, url, project_name, project_docs, user } = useAppSelector(
+    store => {
+      return {
+        ...store.session.serverInfo,
+        heartbeat: store.heartbeat,
+      };
+    }
   );
   const dispatch = useAppDispatch();
+
+  const checkHeartbeat = async () => {
+    dispatch(HeartbeatActions.heartbeatRequest());
+    setTimeout(checkHeartbeat, 60000);
+  };
+
+  useEffect(() => {
+    checkHeartbeat();
+  }, []);
+
   return (
     <div className="session-info-bar" data-testid="sessionInfo-bar">
       <h1 className="kinto-admin-title">{project_name}</h1>
@@ -34,6 +54,19 @@ export function SessionInfoBar() {
         >
           <Clipboard className="icon" />
         </a>
+        <a href={`${url}__heartbeat__`} target="_blank">
+          {heartbeat.success !== false ? (
+            <CircleFill
+              color="green"
+              title="Server heartbeat status is healthy"
+            />
+          ) : (
+            <ExclamationCircleFill
+              color="red"
+              title="Server heartbeat status IS NOT healthy"
+            />
+          )}
+        </a>
         <a
           href={project_docs}
           target="_blank"

src/constants.ts

@@ -45,6 +45,9 @@ export const GROUP_HISTORY_REQUEST = "GROUP_HISTORY_REQUEST";
 export const GROUP_HISTORY_NEXT_REQUEST = "GROUP_HISTORY_NEXT_REQUEST";
 export const GROUP_HISTORY_SUCCESS = "GROUP_HISTORY_SUCCESS";
 
+export const HEARTBEAT_REQUEST = "HEARTBEAT_REQUEST";
+export const HEARTBEAT_RESPONSE = "HEARTBEAT_RESPONSE";
+
 export const NOTIFICATION_ADDED = "NOTIFICATION_ADDED";
 export const NOTIFICATION_REMOVED = "NOTIFICATION_REMOVED";
 export const NOTIFICATION_CLEAR = "NOTIFICATION_CLEAR";

src/reducers/heartbeat.ts

@@ -0,0 +1,21 @@
+import { HEARTBEAT_RESPONSE } from "@src/constants";
+import { HeartbeatState } from "@src/types";
+
+const INITIAL_STATE: HeartbeatState = {
+  success: true,
+  response: {},
+};
+
+export default function servers(
+  state: HeartbeatState = INITIAL_STATE,
+  action: any
+): HeartbeatState {
+  switch (action.type) {
+    case HEARTBEAT_RESPONSE: {
+      return action.response;
+    }
+    default: {
+      return state;
+    }
+  }
+}

src/reducers/index.ts

@@ -1,6 +1,7 @@
 import bucket from "./bucket";
 import collection from "./collection";
 import group from "./group";
+import heartbeat from "./heartbeat";
 import notifications from "./notifications";
 import record from "./record";
 import servers from "./servers";
@@ -17,6 +18,7 @@ export default function createRootReducer(routerReducer: Reducer<RouterState>) {
     bucket,
     collection,
     group,
+    heartbeat,
     record,
     notifications,
     servers,

src/sagas/heartbeat.ts

@@ -0,0 +1,39 @@
+import * as actions from "@src/actions/heartbeat";
+import { getClient } from "@src/client";
+import { ActionType, GetStateFn, SagaGen } from "@src/types";
+import { call, put } from "redux-saga/effects";
+
+export function* heartbeatRequest(
+  getState: GetStateFn,
+  action: ActionType<typeof actions.heartbeatRequest>
+): SagaGen {
+  const response = yield call(queryHeartbeat);
+  yield put(actions.heartbeatResponse(response));
+}
+
+async function queryHeartbeat(): Promise<Record<string, any>> {
+  const client = getClient();
+
+  try {
+    const response: Record<string, any> = await client.execute({
+      path: "/__heartbeat__",
+      headers: undefined,
+    });
+    let success = true;
+    for (let prop in response) {
+      if (response[prop] === false) {
+        success = false;
+        break;
+      }
+    }
+    return {
+      success,
+      response,
+    };
+  } catch (ex) {
+    return {
+      success: false,
+      details: ex,
+    };
+  }
+}

src/sagas/index.ts

@@ -1,6 +1,7 @@
 import * as bucketSagas from "./bucket";
 import * as collectionSagas from "./collection";
 import * as groupSagas from "./group";
+import * as heartbeatSagas from "./heartbeat";
 import * as recordSagas from "./record";
 import * as routeSagas from "./route";
 import * as sessionSagas from "./session";
@@ -143,6 +144,8 @@ export default function* rootSaga(getState: GetStateFn): SagaGen {
       signoffSagas.handleApproveChanges,
       getState
     ),
+    // heartbeat
+    takeEvery(c.HEARTBEAT_REQUEST, heartbeatSagas.heartbeatRequest, getState),
   ];
 
   yield all(sagas);

src/types.ts

@@ -529,3 +529,8 @@ export type DestinationInfo = {
   bid: string;
   cid: string;
 };
+
+export type HeartbeatState = {
+  success: boolean;
+  response: Record<string, any>;
+};

test/components/SessionInfoBar_test.tsx

@@ -0,0 +1,62 @@
+import { setClient } from "@src/client";
+import { SessionInfoBar } from "@src/components/SessionInfoBar";
+import { renderWithProvider } from "@test/testUtils";
+import { screen, waitFor } from "@testing-library/react";
+
+describe("SessionInfoBar component", () => {
+  const client = {
+    execute: vi.fn(),
+  };
+  const healthyStr = "Server heartbeat status is healthy";
+  const unhealthyStr = "Server heartbeat status IS NOT healthy";
+
+  beforeAll(() => {
+    setClient(client);
+  });
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  it("Should show green server status by default and render user/server info as expected", async () => {
+    client.execute.mockResolvedValue({});
+    renderWithProvider(<SessionInfoBar />);
+    await waitFor(() => new Promise(resolve => setTimeout(resolve, 100))); // debounce wait
+    expect(screen.getByTitle(healthyStr)).toBeDefined();
+
+    expect(screen.getByTitle("Copy authentication header")).toBeDefined();
+    expect(screen.getByText("Documentation")).toBeDefined();
+    expect(screen.getByText("Logout")).toBeDefined();
+    expect(screen.getByText("Anonymous")).toBeDefined();
+  });
+
+  it("Should show green server status when heartbeat returns all true checks", async () => {
+    client.execute.mockResolvedValue({
+      foo: true,
+      bar: true,
+    });
+    renderWithProvider(<SessionInfoBar />);
+    await waitFor(() => new Promise(resolve => setTimeout(resolve, 100))); // debounce wait
+    expect(screen.getByTitle(healthyStr)).toBeDefined();
+  });
+
+  it("Should show failed server status when heartbeat returns any false checks", async () => {
+    client.execute.mockResolvedValue({
+      foo: false,
+      bar: true,
+    });
+    renderWithProvider(<SessionInfoBar />);
+    await waitFor(() => new Promise(resolve => setTimeout(resolve, 100))); // debounce wait
+    expect(client.execute).toHaveBeenCalled();
+    expect(screen.getByTitle(unhealthyStr)).toBeDefined();
+  });
+
+  it("Should show failed server status when heartbeat check throws an error", async () => {
+    client.execute.mockImplementation(() => {
+      throw new Error("Test error");
+    });
+    renderWithProvider(<SessionInfoBar />);
+    await waitFor(() => new Promise(resolve => setTimeout(resolve, 100))); // debounce wait
+    expect(screen.getByTitle(unhealthyStr)).toBeDefined();
+  });
+});