@databiosphere/findable-ui 49.4.1 → 49.6.0

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "49.4.1"
+  ".": "49.6.0"
 }

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [49.6.0](https://github.com/DataBiosphere/findable-ui/compare/v49.5.0...v49.6.0) (2026-03-12)
+
+
+### Features
+
+* drop extracted mentions and mappings from chat response display ([#822](https://github.com/DataBiosphere/findable-ui/issues/822)) ([#823](https://github.com/DataBiosphere/findable-ui/issues/823)) ([a8a33e8](https://github.com/DataBiosphere/findable-ui/commit/a8a33e86a44f5707b15da60e585b8e25010e6d94))
+
+## [49.5.0](https://github.com/DataBiosphere/findable-ui/compare/v49.4.1...v49.5.0) (2026-03-12)
+
+
+### Features
+
+* migrate NIH account link check to ECM API [#819](https://github.com/DataBiosphere/findable-ui/issues/819) ([#820](https://github.com/DataBiosphere/findable-ui/issues/820)) ([34e5c2f](https://github.com/DataBiosphere/findable-ui/commit/34e5c2fcae9dfddb102ba03dce60658da7a4d4c7))
+* migrate NIH account link check to External Credentials Manager API [#819](https://github.com/DataBiosphere/findable-ui/issues/819) ([34e5c2f](https://github.com/DataBiosphere/findable-ui/commit/34e5c2fcae9dfddb102ba03dce60658da7a4d4c7))
+
 ## [49.4.1](https://github.com/DataBiosphere/findable-ui/compare/v49.4.0...v49.4.1) (2026-03-10)
 
 

package/lib/components/Export/components/ExportToTerra/components/TerraSetUpForm/components/FormStep/components/ConnectTerraToNIHAccount/connectTerraToNIHAccount.js

@@ -4,7 +4,7 @@ import { ANCHOR_TARGET, REL_ATTRIBUTE, } from "../../../../../../../../../Links/
 import { FormStep } from "../../formStep";
 export const ConnectTerraToNIHAccount = ({ active, completed, step, }) => {
     const onGotoTutorial = () => {
-        window.open("https://support.terra.bio/hc/en-us/articles/19124069598235-Access-controlled-data-files-by-linking-your-NIH-account-in-Terra", ANCHOR_TARGET.BLANK, REL_ATTRIBUTE.NO_OPENER_NO_REFERRER);
+        window.open("https://support.terra.bio/hc/en-us/articles/32634034451099-RAS-Integration-for-AnVIL-Data-Launching-3-25-26", ANCHOR_TARGET.BLANK, REL_ATTRIBUTE.NO_OPENER_NO_REFERRER);
     };
     return (_jsx(FormStep, { action: _jsx(ButtonPrimary, { onClick: onGotoTutorial, children: "Go to Tutorial" }), active: active, completed: completed, step: step, text: _jsx("p", { children: "Next, connect your Terra account to your NIH account by following the tutorial below." }), title: "Connect Terra to your NIH account" }));
 };

package/lib/components/Export/components/ExportToTerra/components/TerraSetUpForm/components/NIHAccountExpiryWarning/nihAccountExpiryWarning.js

@@ -6,31 +6,31 @@ import { FluidPaper } from "../../../../../../../common/Paper/paper.styles";
 import { Link } from "../../../../../../../Links/components/Link/link";
 export const NIHAccountExpiryWarning = () => {
     const expiryStatus = useAuthenticationNIHExpiry();
-    const { isReady, linkExpired, linkExpireTime, linkWillExpire } = expiryStatus || {};
+    const { expirationTimestamp, isReady, linkExpired, linkWillExpire } = expiryStatus || {};
     if (!isReady)
         return null;
-    return linkWillExpire || linkExpired ? (_jsx(Alert, { ...ALERT_PROPS.STANDARD_WARNING, component: FluidPaper, children: _jsxs("span", { children: [_jsx("span", { children: getExpiryMessage(linkExpired, linkExpireTime) }), " ", _jsxs("span", { children: ["Please", " ", _jsx(Link, { label: "renew your account", url: "https://support.terra.bio/hc/en-us/articles/19124069598235" }), " ", "link."] })] }) })) : null;
+    return linkWillExpire || linkExpired ? (_jsx(Alert, { ...ALERT_PROPS.STANDARD_WARNING, component: FluidPaper, children: _jsxs("span", { children: [_jsx("span", { children: getExpiryMessage(linkExpired, expirationTimestamp) }), " ", _jsxs("span", { children: ["Please", " ", _jsx(Link, { label: "renew your account", url: "https://support.terra.bio/hc/en-us/articles/32634034451099-RAS-Integration-for-AnVIL-Data-Launching-3-25-26" }), " ", "link."] })] }) })) : null;
 };
 /**
  * Calculates the remaining days until the link expires.
- * @param expireTime - Link expiration time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns remaining days until the link expires.
  */
-function getExpireTimeInDays(expireTime) {
-    if (!expireTime) {
+function getExpireTimeInDays(expirationTimestamp) {
+    if (!expirationTimestamp) {
         return 0;
     }
-    return Math.max(Math.ceil(expireTimeInSeconds(expireTime) / 60 / 60 / 24), 0);
+    return Math.max(Math.ceil(expireTimeInSeconds(expirationTimestamp) / 60 / 60 / 24), 0);
 }
 /**
  * Returns an expiration message indicating whether the provided link has already expired or is set to expire.
  * @param linkExpired - Link expired flag.
- * @param expireTime - Link expiration time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns expiration message.
  */
-function getExpiryMessage(linkExpired, expireTime) {
+function getExpiryMessage(linkExpired, expirationTimestamp) {
     if (linkExpired) {
         return "Your NIH account link has expired.";
     }
-    return `Your NIH account link will expire in ${getExpireTimeInDays(expireTime)} days.`;
+    return `Your NIH account link will expire in ${getExpireTimeInDays(expirationTimestamp)} days.`;
 }

package/lib/hooks/authentication/terra/useAuthenticationNIHExpiry.d.ts

@@ -1,7 +1,7 @@
 interface UseAuthenticationNIHExpiry {
+    expirationTimestamp?: string;
     isReady: boolean;
     linkExpired?: boolean;
-    linkExpireTime?: number;
     linkWillExpire?: boolean;
 }
 /**
@@ -11,8 +11,8 @@ interface UseAuthenticationNIHExpiry {
 export declare const useAuthenticationNIHExpiry: () => UseAuthenticationNIHExpiry;
 /**
  * Calculates the remaining time in seconds until the given expiration time.
- * @param expireTime - Expire time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns remaining time in seconds.
  */
-export declare function expireTimeInSeconds(expireTime: number): number;
+export declare function expireTimeInSeconds(expirationTimestamp: string): number;
 export {};

package/lib/hooks/authentication/terra/useAuthenticationNIHExpiry.js

@@ -8,42 +8,42 @@ const WARNING_WINDOW_SECONDS = 60 * 60 * 24 * 5; // 5 days.
 export const useAuthenticationNIHExpiry = () => {
     const { terraNIHProfileLoginStatus } = useTerraProfile();
     const { requestStatus, response } = terraNIHProfileLoginStatus;
-    const { linkExpireTime } = response || {};
+    const { expirationTimestamp } = response || {};
     const isReady = requestStatus === REQUEST_STATUS.COMPLETED;
-    const linkExpired = hasLinkedNIHAccountExpired(linkExpireTime);
-    const linkWillExpire = isLinkedNIHAccountWillExpire(linkExpireTime);
+    const linkExpired = hasLinkedNIHAccountExpired(expirationTimestamp);
+    const linkWillExpire = isLinkedNIHAccountWillExpire(expirationTimestamp);
     return {
+        expirationTimestamp,
         isReady,
-        linkExpireTime,
         linkExpired,
         linkWillExpire,
     };
 };
 /**
  * Calculates the remaining time in seconds until the given expiration time.
- * @param expireTime - Expire time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns remaining time in seconds.
  */
-export function expireTimeInSeconds(expireTime) {
-    return expireTime - Date.now() / 1000;
+export function expireTimeInSeconds(expirationTimestamp) {
+    return new Date(expirationTimestamp).getTime() / 1000 - Date.now() / 1000;
 }
 /**
  * Returns true if the linked NIH account has expired.
- * @param expireTime - Expire time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns true if the linked NIH account has expired.
  */
-function hasLinkedNIHAccountExpired(expireTime) {
-    if (!expireTime)
+function hasLinkedNIHAccountExpired(expirationTimestamp) {
+    if (!expirationTimestamp)
         return;
-    return expireTimeInSeconds(expireTime) < 0;
+    return expireTimeInSeconds(expirationTimestamp) < 0;
 }
 /**
  * Returns true if the linked NIH account will expire in less than a week.
- * @param expireTime - Expire time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns true if the linked NIH account will expire in less than a week.
  */
-function isLinkedNIHAccountWillExpire(expireTime) {
-    if (!expireTime)
+function isLinkedNIHAccountWillExpire(expirationTimestamp) {
+    if (!expirationTimestamp)
         return;
-    return expireTimeInSeconds(expireTime) < WARNING_WINDOW_SECONDS;
+    return expireTimeInSeconds(expirationTimestamp) < WARNING_WINDOW_SECONDS;
 }

package/lib/providers/authentication/terra/hooks/useFetchTerraNIHProfile.d.ts

@@ -1,13 +1,9 @@
 import { LoginStatus } from "./common/entities";
-interface DatasetPermission {
-    authorized: boolean;
-    name: string;
-}
 type Status = LoginStatus<TerraNIHResponse>;
 export interface TerraNIHResponse {
-    datasetPermissions: DatasetPermission[];
-    linkedNihUsername: string;
-    linkExpireTime: number;
+    authenticated?: boolean;
+    expirationTimestamp: string;
+    externalUserId: string;
 }
 /**
  * Returns Terra NIH login status from configured endpoint.

package/lib/providers/authentication/terra/hooks/useFetchTerraNIHProfile.js

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from "react";
 import { useAuthenticationConfig } from "../../../../hooks/authentication/config/useAuthenticationConfig";
 import { LOGIN_STATUS_FAILED, LOGIN_STATUS_NOT_STARTED, LOGIN_STATUS_PENDING, TERRA_SERVICE_ID, } from "./common/constants";
-import { REQUEST_STATUS, } from "./common/entities";
+import { REQUEST_STATUS } from "./common/entities";
 import { getAuthenticationRequestOptions, initLoginStatus, } from "./common/utils";
 import { getServiceEndpoint } from "./utils";
 const ENDPOINT_ID = "nihStatus";
@@ -22,19 +22,31 @@ export const useFetchTerraNIHProfile = (token) => {
         }
         setLoginStatus(LOGIN_STATUS_PENDING);
         fetch(endpoint, getAuthenticationRequestOptions(accessToken))
-            .then((response) => response.json())
             .then((response) => {
-            if (isResponseError(response)) {
-                setLoginStatus(LOGIN_STATUS_FAILED);
-            }
-            else {
+            if (response.status === 404) {
                 setLoginStatus((prevStatus) => ({
                     ...prevStatus,
-                    isSuccess: isResponseSuccess(response),
+                    isSuccess: false,
                     requestStatus: REQUEST_STATUS.COMPLETED,
-                    response,
+                    response: undefined,
                 }));
+                return;
             }
+            if (!response.ok) {
+                setLoginStatus(LOGIN_STATUS_FAILED);
+                return;
+            }
+            return response.json();
+        })
+            .then((response) => {
+            if (!response)
+                return;
+            setLoginStatus((prevStatus) => ({
+                ...prevStatus,
+                isSuccess: isResponseSuccess(response),
+                requestStatus: REQUEST_STATUS.COMPLETED,
+                response,
+            }));
         })
             .catch((err) => {
             console.log(err); // TODO handle error.
@@ -50,18 +62,10 @@ export const useFetchTerraNIHProfile = (token) => {
     return loginStatus;
 };
 /**
- * Returns true if response is an error response.
- * @param response - Response.
- * @returns true if response is an error response.
- */
-function isResponseError(response) {
-    return Boolean(response.statusCode);
-}
-/**
- * Returns true if the user accepted terms of service version is current.
+ * Returns true if the user has a linked external account.
  * @param response - Response.
  * @returns true if response is successful.
  */
 function isResponseSuccess(response) {
-    return Boolean(response.linkedNihUsername);
+    return Boolean(response.externalUserId);
 }

package/lib/views/ResearchView/assistant/components/Messages/components/AssistantMessage/assistantMessage.d.ts

@@ -4,6 +4,6 @@ import { AssistantMessageProps } from "./types";
  * Renders an assistant message.
  * @param props - Component props.
  * @param props.message - Assistant message.
- * @returns The assistant message element.
+ * @returns The assistant message element, or null if there is no message.
  */
-export declare const AssistantMessage: ({ message, }: AssistantMessageProps) => JSX.Element;
+export declare const AssistantMessage: ({ message, }: AssistantMessageProps) => JSX.Element | null;

package/lib/views/ResearchView/assistant/components/Messages/components/AssistantMessage/assistantMessage.js

@@ -1,15 +1,14 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Stack, Typography } from "@mui/material";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Typography } from "@mui/material";
 import { TYPOGRAPHY_PROPS } from "../../../../../../../styles/common/mui/typography";
-import { getMappings, getMentions } from "./utils";
 /**
  * Renders an assistant message.
  * @param props - Component props.
  * @param props.message - Assistant message.
- * @returns The assistant message element.
+ * @returns The assistant message element, or null if there is no message.
  */
 export const AssistantMessage = ({ message, }) => {
-    const mentions = getMentions(message);
-    const mappings = getMappings(message);
-    return (_jsxs(Stack, { gap: 2, useFlexGap: true, children: [message.response.message && (_jsx(Typography, { variant: TYPOGRAPHY_PROPS.VARIANT.BODY_400, children: message.response.message })), mentions && (_jsxs(Typography, { variant: TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_400, children: [_jsx(Typography, { color: TYPOGRAPHY_PROPS.COLOR.INK_LIGHT, variant: TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_500, children: "Extracted mentions:" }), " ", mentions] })), mappings && (_jsxs(Typography, { variant: TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_400, children: [_jsx(Typography, { color: TYPOGRAPHY_PROPS.COLOR.INK_LIGHT, variant: TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_500, children: "Extracted mappings:" }), " ", mappings] }))] }));
+    if (!message.response.message)
+        return null;
+    return (_jsx(Typography, { variant: TYPOGRAPHY_PROPS.VARIANT.BODY_400, children: message.response.message }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@databiosphere/findable-ui",
-  "version": "49.4.1",
+  "version": "49.6.0",
   "description": "",
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",

package/src/components/Export/components/ExportToTerra/components/TerraSetUpForm/components/FormStep/components/ConnectTerraToNIHAccount/connectTerraToNIHAccount.tsx

@@ -19,7 +19,7 @@ export const ConnectTerraToNIHAccount = ({
 }: ConnectTerraToNIHAccountProps): JSX.Element | null => {
   const onGotoTutorial = (): void => {
     window.open(
-      "https://support.terra.bio/hc/en-us/articles/19124069598235-Access-controlled-data-files-by-linking-your-NIH-account-in-Terra",
+      "https://support.terra.bio/hc/en-us/articles/32634034451099-RAS-Integration-for-AnVIL-Data-Launching-3-25-26",
       ANCHOR_TARGET.BLANK,
       REL_ATTRIBUTE.NO_OPENER_NO_REFERRER,
     );

package/src/components/Export/components/ExportToTerra/components/TerraSetUpForm/components/NIHAccountExpiryWarning/nihAccountExpiryWarning.tsx

@@ -10,7 +10,7 @@ import { Link } from "../../../../../../../Links/components/Link/link";
 
 export const NIHAccountExpiryWarning = (): JSX.Element | null => {
   const expiryStatus = useAuthenticationNIHExpiry();
-  const { isReady, linkExpired, linkExpireTime, linkWillExpire } =
+  const { expirationTimestamp, isReady, linkExpired, linkWillExpire } =
     expiryStatus || {};
 
   if (!isReady) return null;
@@ -18,12 +18,12 @@ export const NIHAccountExpiryWarning = (): JSX.Element | null => {
   return linkWillExpire || linkExpired ? (
     <Alert {...ALERT_PROPS.STANDARD_WARNING} component={FluidPaper}>
       <span>
-        <span>{getExpiryMessage(linkExpired, linkExpireTime)}</span>{" "}
+        <span>{getExpiryMessage(linkExpired, expirationTimestamp)}</span>{" "}
         <span>
           Please{" "}
           <Link
             label="renew your account"
-            url="https://support.terra.bio/hc/en-us/articles/19124069598235"
+            url="https://support.terra.bio/hc/en-us/articles/32634034451099-RAS-Integration-for-AnVIL-Data-Launching-3-25-26"
           />{" "}
           link.
         </span>
@@ -34,27 +34,33 @@ export const NIHAccountExpiryWarning = (): JSX.Element | null => {
 
 /**
  * Calculates the remaining days until the link expires.
- * @param expireTime - Link expiration time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns remaining days until the link expires.
  */
-function getExpireTimeInDays(expireTime?: number): number {
-  if (!expireTime) {
+function getExpireTimeInDays(expirationTimestamp?: string): number {
+  if (!expirationTimestamp) {
     return 0;
   }
-  return Math.max(Math.ceil(expireTimeInSeconds(expireTime) / 60 / 60 / 24), 0);
+  return Math.max(
+    Math.ceil(expireTimeInSeconds(expirationTimestamp) / 60 / 60 / 24),
+    0,
+  );
 }
 
 /**
  * Returns an expiration message indicating whether the provided link has already expired or is set to expire.
  * @param linkExpired - Link expired flag.
- * @param expireTime - Link expiration time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns expiration message.
  */
-function getExpiryMessage(linkExpired?: boolean, expireTime?: number): string {
+function getExpiryMessage(
+  linkExpired?: boolean,
+  expirationTimestamp?: string,
+): string {
   if (linkExpired) {
     return "Your NIH account link has expired.";
   }
   return `Your NIH account link will expire in ${getExpireTimeInDays(
-    expireTime,
+    expirationTimestamp,
   )} days.`;
 }

package/src/hooks/authentication/terra/useAuthenticationNIHExpiry.ts

@@ -4,9 +4,9 @@ import { REQUEST_STATUS } from "../../../providers/authentication/terra/hooks/co
 const WARNING_WINDOW_SECONDS = 60 * 60 * 24 * 5; // 5 days.
 
 interface UseAuthenticationNIHExpiry {
+  expirationTimestamp?: string;
   isReady: boolean;
   linkExpired?: boolean;
-  linkExpireTime?: number;
   linkWillExpire?: boolean;
 }
 
@@ -17,13 +17,13 @@ interface UseAuthenticationNIHExpiry {
 export const useAuthenticationNIHExpiry = (): UseAuthenticationNIHExpiry => {
   const { terraNIHProfileLoginStatus } = useTerraProfile();
   const { requestStatus, response } = terraNIHProfileLoginStatus;
-  const { linkExpireTime } = response || {};
+  const { expirationTimestamp } = response || {};
   const isReady = requestStatus === REQUEST_STATUS.COMPLETED;
-  const linkExpired = hasLinkedNIHAccountExpired(linkExpireTime);
-  const linkWillExpire = isLinkedNIHAccountWillExpire(linkExpireTime);
+  const linkExpired = hasLinkedNIHAccountExpired(expirationTimestamp);
+  const linkWillExpire = isLinkedNIHAccountWillExpire(expirationTimestamp);
   return {
+    expirationTimestamp,
     isReady,
-    linkExpireTime,
     linkExpired,
     linkWillExpire,
   };
@@ -31,31 +31,33 @@ export const useAuthenticationNIHExpiry = (): UseAuthenticationNIHExpiry => {
 
 /**
  * Calculates the remaining time in seconds until the given expiration time.
- * @param expireTime - Expire time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns remaining time in seconds.
  */
-export function expireTimeInSeconds(expireTime: number): number {
-  return expireTime - Date.now() / 1000;
+export function expireTimeInSeconds(expirationTimestamp: string): number {
+  return new Date(expirationTimestamp).getTime() / 1000 - Date.now() / 1000;
 }
 
 /**
  * Returns true if the linked NIH account has expired.
- * @param expireTime - Expire time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns true if the linked NIH account has expired.
  */
-function hasLinkedNIHAccountExpired(expireTime?: number): boolean | undefined {
-  if (!expireTime) return;
-  return expireTimeInSeconds(expireTime) < 0;
+function hasLinkedNIHAccountExpired(
+  expirationTimestamp?: string,
+): boolean | undefined {
+  if (!expirationTimestamp) return;
+  return expireTimeInSeconds(expirationTimestamp) < 0;
 }
 
 /**
  * Returns true if the linked NIH account will expire in less than a week.
- * @param expireTime - Expire time in seconds.
+ * @param expirationTimestamp - Expiration timestamp as an ISO 8601 date-time string.
  * @returns true if the linked NIH account will expire in less than a week.
  */
 function isLinkedNIHAccountWillExpire(
-  expireTime?: number,
+  expirationTimestamp?: string,
 ): boolean | undefined {
-  if (!expireTime) return;
-  return expireTimeInSeconds(expireTime) < WARNING_WINDOW_SECONDS;
+  if (!expirationTimestamp) return;
+  return expireTimeInSeconds(expirationTimestamp) < WARNING_WINDOW_SECONDS;
 }

package/src/providers/authentication/terra/hooks/useFetchTerraNIHProfile.ts

@@ -6,11 +6,7 @@ import {
   LOGIN_STATUS_PENDING,
   TERRA_SERVICE_ID,
 } from "./common/constants";
-import {
-  LoginResponseError,
-  LoginStatus,
-  REQUEST_STATUS,
-} from "./common/entities";
+import { LoginStatus, REQUEST_STATUS } from "./common/entities";
 import {
   getAuthenticationRequestOptions,
   initLoginStatus,
@@ -19,17 +15,12 @@ import { getServiceEndpoint } from "./utils";
 
 const ENDPOINT_ID = "nihStatus";
 
-interface DatasetPermission {
-  authorized: boolean;
-  name: string;
-}
-
 type Status = LoginStatus<TerraNIHResponse>;
 
 export interface TerraNIHResponse {
-  datasetPermissions: DatasetPermission[];
-  linkedNihUsername: string;
-  linkExpireTime: number;
+  authenticated?: boolean;
+  expirationTimestamp: string;
+  externalUserId: string;
 }
 
 /**
@@ -53,18 +44,30 @@ export const useFetchTerraNIHProfile = (token?: string): Status => {
       }
       setLoginStatus(LOGIN_STATUS_PENDING as Status);
       fetch(endpoint, getAuthenticationRequestOptions(accessToken))
-        .then((response) => response.json())
-        .then((response: LoginResponseError | TerraNIHResponse) => {
-          if (isResponseError(response)) {
-            setLoginStatus(LOGIN_STATUS_FAILED as Status);
-          } else {
+        .then((response) => {
+          if (response.status === 404) {
             setLoginStatus((prevStatus) => ({
               ...prevStatus,
-              isSuccess: isResponseSuccess(response),
+              isSuccess: false,
               requestStatus: REQUEST_STATUS.COMPLETED,
-              response,
+              response: undefined,
             }));
+            return;
+          }
+          if (!response.ok) {
+            setLoginStatus(LOGIN_STATUS_FAILED as Status);
+            return;
           }
+          return response.json();
+        })
+        .then((response?: TerraNIHResponse) => {
+          if (!response) return;
+          setLoginStatus((prevStatus) => ({
+            ...prevStatus,
+            isSuccess: isResponseSuccess(response),
+            requestStatus: REQUEST_STATUS.COMPLETED,
+            response,
+          }));
         })
         .catch((err) => {
           console.log(err); // TODO handle error.
@@ -84,21 +87,10 @@ export const useFetchTerraNIHProfile = (token?: string): Status => {
 };
 
 /**
- * Returns true if response is an error response.
- * @param response - Response.
- * @returns true if response is an error response.
- */
-function isResponseError(
-  response: TerraNIHResponse | LoginResponseError,
-): response is LoginResponseError {
-  return Boolean((response as LoginResponseError).statusCode);
-}
-
-/**
- * Returns true if the user accepted terms of service version is current.
+ * Returns true if the user has a linked external account.
  * @param response - Response.
  * @returns true if response is successful.
  */
 function isResponseSuccess(response: TerraNIHResponse): boolean {
-  return Boolean(response.linkedNihUsername);
+  return Boolean(response.externalUserId);
 }

package/src/views/ResearchView/assistant/components/Messages/components/AssistantMessage/assistantMessage.tsx

@@ -1,49 +1,21 @@
-import { Stack, Typography } from "@mui/material";
+import { Typography } from "@mui/material";
 import { JSX } from "react";
 import { AssistantMessageProps } from "./types";
 import { TYPOGRAPHY_PROPS } from "../../../../../../../styles/common/mui/typography";
-import { getMappings, getMentions } from "./utils";
 
 /**
  * Renders an assistant message.
  * @param props - Component props.
  * @param props.message - Assistant message.
- * @returns The assistant message element.
+ * @returns The assistant message element, or null if there is no message.
  */
 export const AssistantMessage = ({
   message,
-}: AssistantMessageProps): JSX.Element => {
-  const mentions = getMentions(message);
-  const mappings = getMappings(message);
+}: AssistantMessageProps): JSX.Element | null => {
+  if (!message.response.message) return null;
   return (
-    <Stack gap={2} useFlexGap>
-      {message.response.message && (
-        <Typography variant={TYPOGRAPHY_PROPS.VARIANT.BODY_400}>
-          {message.response.message}
-        </Typography>
-      )}
-      {mentions && (
-        <Typography variant={TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_400}>
-          <Typography
-            color={TYPOGRAPHY_PROPS.COLOR.INK_LIGHT}
-            variant={TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_500}
-          >
-            Extracted mentions:
-          </Typography>{" "}
-          {mentions}
-        </Typography>
-      )}
-      {mappings && (
-        <Typography variant={TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_400}>
-          <Typography
-            color={TYPOGRAPHY_PROPS.COLOR.INK_LIGHT}
-            variant={TYPOGRAPHY_PROPS.VARIANT.BODY_SMALL_500}
-          >
-            Extracted mappings:
-          </Typography>{" "}
-          {mappings}
-        </Typography>
-      )}
-    </Stack>
+    <Typography variant={TYPOGRAPHY_PROPS.VARIANT.BODY_400}>
+      {message.response.message}
+    </Typography>
   );
 };

package/lib/views/ResearchView/assistant/components/Messages/components/AssistantMessage/utils.d.ts

@@ -1,13 +0,0 @@
-import { AssistantMessage } from "../../../../../state/types";
-/**
- * Formats mention mappings from an assistant message as a readable string.
- * @param message - Assistant message containing response mentions.
- * @returns Formatted facet-value mappings separated by slashes, or empty string if no mentions.
- */
-export declare function getMappings(message: AssistantMessage): string;
-/**
- * Extracts original mention text from an assistant message.
- * @param message - Assistant message containing response mentions.
- * @returns Comma-separated original mention text, or empty string if no mentions.
- */
-export declare function getMentions(message: AssistantMessage): string;

package/lib/views/ResearchView/assistant/components/Messages/components/AssistantMessage/utils.js

@@ -1,25 +0,0 @@
-/**
- * Formats mention mappings from an assistant message as a readable string.
- * @param message - Assistant message containing response mentions.
- * @returns Formatted facet-value mappings separated by slashes, or empty string if no mentions.
- */
-export function getMappings(message) {
-    const mappings = message.response.query.mentions.reduce((acc, m) => {
-        const key = m.exclude ? `${m.facet} (exclude)` : m.facet;
-        acc[key] = [...(acc[key] || []), ...m.values];
-        return acc;
-    }, {});
-    return Object.entries(mappings)
-        .map(([facet, values]) => `${facet}: ${values.join(", ")}`)
-        .join(" / ");
-}
-/**
- * Extracts original mention text from an assistant message.
- * @param message - Assistant message containing response mentions.
- * @returns Comma-separated original mention text, or empty string if no mentions.
- */
-export function getMentions(message) {
-    return message.response.query.mentions
-        .map((mention) => mention.originalText)
-        .join(", ");
-}

package/src/views/ResearchView/assistant/components/Messages/components/AssistantMessage/utils.ts

@@ -1,31 +0,0 @@
-import { AssistantMessage } from "../../../../../state/types";
-
-/**
- * Formats mention mappings from an assistant message as a readable string.
- * @param message - Assistant message containing response mentions.
- * @returns Formatted facet-value mappings separated by slashes, or empty string if no mentions.
- */
-export function getMappings(message: AssistantMessage): string {
-  const mappings = message.response.query.mentions.reduce<
-    Record<string, string[]>
-  >((acc, m) => {
-    const key = m.exclude ? `${m.facet} (exclude)` : m.facet;
-    acc[key] = [...(acc[key] || []), ...m.values];
-    return acc;
-  }, {});
-
-  return Object.entries(mappings)
-    .map(([facet, values]) => `${facet}: ${values.join(", ")}`)
-    .join(" / ");
-}
-
-/**
- * Extracts original mention text from an assistant message.
- * @param message - Assistant message containing response mentions.
- * @returns Comma-separated original mention text, or empty string if no mentions.
- */
-export function getMentions(message: AssistantMessage): string {
-  return message.response.query.mentions
-    .map((mention) => mention.originalText)
-    .join(", ");
-}

package/tests/research.assistantMessageUtils.test.ts

@@ -1,149 +0,0 @@
-import {
-  getMappings,
-  getMentions,
-} from "../src/views/ResearchView/assistant/components/Messages/components/AssistantMessage/utils";
-import {
-  AssistantMessage,
-  MESSAGE_TYPE,
-} from "../src/views/ResearchView/state/types";
-
-/**
- * Creates a mock AssistantMessage with the given mentions.
- * @param mentions - Array of mention objects.
- * @returns A mock AssistantMessage.
- */
-function mockMessage(
-  mentions: AssistantMessage["response"]["query"]["mentions"],
-): AssistantMessage {
-  return {
-    createdAt: Date.now(),
-    response: {
-      intent: "auto",
-      message: null,
-      query: {
-        mentions,
-        message: null,
-      },
-      timing: {
-        lookupMs: 0,
-        pipelineMs: 0,
-        totalMs: 0,
-      },
-    },
-    type: MESSAGE_TYPE.ASSISTANT,
-  };
-}
-
-describe("getMappings", () => {
-  it("returns empty string for empty mentions", () => {
-    expect(getMappings(mockMessage([]))).toBe("");
-  });
-
-  it("formats a single mention", () => {
-    const message = mockMessage([
-      {
-        exclude: false,
-        facet: "disease",
-        originalText: "T2D",
-        values: ["T2D"],
-      },
-    ]);
-    expect(getMappings(message)).toBe("disease: T2D");
-  });
-
-  it("formats a mention with multiple values", () => {
-    const message = mockMessage([
-      {
-        exclude: false,
-        facet: "disease",
-        originalText: "cancer",
-        values: ["lung cancer", "breast cancer"],
-      },
-    ]);
-    expect(getMappings(message)).toBe("disease: lung cancer, breast cancer");
-  });
-
-  it("groups mentions by facet", () => {
-    const message = mockMessage([
-      {
-        exclude: false,
-        facet: "disease",
-        originalText: "T2D",
-        values: ["T2D"],
-      },
-      {
-        exclude: false,
-        facet: "disease",
-        originalText: "T1D",
-        values: ["T1D"],
-      },
-    ]);
-    expect(getMappings(message)).toBe("disease: T2D, T1D");
-  });
-
-  it("separates different facets with slashes", () => {
-    const message = mockMessage([
-      {
-        exclude: false,
-        facet: "disease",
-        originalText: "T2D",
-        values: ["T2D"],
-      },
-      {
-        exclude: false,
-        facet: "data_type",
-        originalText: "WGS",
-        values: ["WGS"],
-      },
-    ]);
-    expect(getMappings(message)).toBe("disease: T2D / data_type: WGS");
-  });
-
-  it("marks excluded facets", () => {
-    const message = mockMessage([
-      {
-        exclude: true,
-        facet: "disease",
-        originalText: "T2D",
-        values: ["T2D"],
-      },
-    ]);
-    expect(getMappings(message)).toBe("disease (exclude): T2D");
-  });
-});
-
-describe("getMentions", () => {
-  it("returns empty string for empty mentions", () => {
-    expect(getMentions(mockMessage([]))).toBe("");
-  });
-
-  it("returns original text for a single mention", () => {
-    const message = mockMessage([
-      {
-        exclude: false,
-        facet: "disease",
-        originalText: "T2D",
-        values: ["T2D"],
-      },
-    ]);
-    expect(getMentions(message)).toBe("T2D");
-  });
-
-  it("joins multiple mentions with commas", () => {
-    const message = mockMessage([
-      {
-        exclude: false,
-        facet: "disease",
-        originalText: "T2D",
-        values: ["T2D"],
-      },
-      {
-        exclude: false,
-        facet: "data_type",
-        originalText: "WGS",
-        values: ["WGS"],
-      },
-    ]);
-    expect(getMentions(message)).toBe("T2D, WGS");
-  });
-});