chore: updated findable-ui to latest v20.0.0 (#511) (#515)

--------- Co-authored-by: Fran McDade <[email protected]>
clevercanary · Jan 6, 2025 · 4d719f4 · 4d719f4
1 parent 9d2a0a9
commit 4d719f4
Show file tree

Hide file tree

Showing 24 changed files with 263 additions and 113 deletions.
diff --git a/app/components/Forms/components/CellxGeneInProgress/cellxgeneInProgress.tsx b/app/components/Forms/components/CellxGeneInProgress/cellxgeneInProgress.tsx
@@ -1,17 +1,14 @@
 import { ButtonPrimary } from "@databiosphere/findable-ui/lib/components/common/Button/components/ButtonPrimary/buttonPrimary";
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useToken } from "@databiosphere/findable-ui/lib/hooks/authentication/token/useToken";
 import { TextField } from "@mui/material";
 import { useCallback, useRef, useState } from "react";
 import {
   TASK_STATUS,
   TaskStatusesUpdatedByDOIResult,
-} from "../../../../../app/apis/catalog/hca-atlas-tracker/common/entities";
-import { METHOD } from "../../../../../app/common/entities";
-import {
-  fetchResource,
-  isFetchStatusOk,
-} from "../../../../../app/common/utils";
-import { FormResponseErrors } from "../../../../../app/hooks/useForm/common/entities";
+} from "../../../../apis/catalog/hca-atlas-tracker/common/entities";
+import { METHOD } from "../../../../common/entities";
+import { fetchResource, isFetchStatusOk } from "../../../../common/utils";
+import { FormResponseErrors } from "../../../../hooks/useForm/common/entities";
 
 export const CellxGeneInProgressForm = (): JSX.Element => {
   const [isDisabled, setIsDisabled] = useState(false);
@@ -21,7 +18,7 @@ export const CellxGeneInProgressForm = (): JSX.Element => {
 
   const textareaRef = useRef<HTMLTextAreaElement>();
 
-  const { token } = useAuthentication();
+  const { token } = useToken();
 
   const onSave = useCallback(() => {
     (async (): Promise<void> => {

diff --git a/app/components/Forms/components/IntegrationLeadsFromAtlases/integrationLeadsFromAtlases.tsx b/app/components/Forms/components/IntegrationLeadsFromAtlases/integrationLeadsFromAtlases.tsx
@@ -1,19 +1,16 @@
 import { ButtonPrimary } from "@databiosphere/findable-ui/lib/components/common/Button/components/ButtonPrimary/buttonPrimary";
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useToken } from "@databiosphere/findable-ui/lib/hooks/authentication/token/useToken";
 import { useCallback, useState } from "react";
-import { METHOD } from "../../../../../app/common/entities";
-import {
-  fetchResource,
-  isFetchStatusOk,
-} from "../../../../../app/common/utils";
-import { FormResponseErrors } from "../../../../../app/hooks/useForm/common/entities";
+import { METHOD } from "../../../../common/entities";
+import { fetchResource, isFetchStatusOk } from "../../../../common/utils";
+import { FormResponseErrors } from "../../../../hooks/useForm/common/entities";
 
 export const IntegrationLeadsFromAtlasesForm = (): JSX.Element => {
   const [isDisabled, setIsDisabled] = useState(false);
   const [responseErrors, setResponseErrors] = useState<FormResponseErrors>();
   const [didUpdate, setDidUpdate] = useState(false);
 
-  const { token } = useAuthentication();
+  const { token } = useToken();
 
   const onSave = useCallback(() => {
     (async (): Promise<void> => {

diff --git a/app/components/Forms/components/Refresh/refresh.tsx b/app/components/Forms/components/Refresh/refresh.tsx
@@ -1,15 +1,15 @@
 import { ButtonPrimary } from "@databiosphere/findable-ui/lib/components/common/Button/components/ButtonPrimary/buttonPrimary";
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useToken } from "@databiosphere/findable-ui/lib/hooks/authentication/token/useToken";
 import { useCallback, useEffect, useState } from "react";
-import { METHOD } from "../../../../../app/common/entities";
-import { fetchResource } from "../../../../../app/common/utils";
-import { FormResponseErrors } from "../../../../../app/hooks/useForm/common/entities";
+import { METHOD } from "../../../../common/entities";
+import { fetchResource } from "../../../../common/utils";
+import { FormResponseErrors } from "../../../../hooks/useForm/common/entities";
 import {
   REFRESH_ACTIVITY,
   REFRESH_OUTCOME,
   RefreshServicesStatuses,
   RefreshStatus,
-} from "../../../../../app/services/common/entities";
+} from "../../../../services/common/entities";
 
 export const RefreshForm = (): JSX.Element => {
   const [statusIsDisabled, setStatusIsDisabled] = useState(false);
@@ -22,7 +22,7 @@ export const RefreshForm = (): JSX.Element => {
     useState<FormResponseErrors>();
   const [refreshStarted, setRefreshStarted] = useState(false);
 
-  const { token } = useAuthentication();
+  const { token } = useToken();
 
   const onReloadStatus = useCallback(() => {
     doApiRequest(

diff --git a/app/hooks/useDeleteData.ts b/app/hooks/useDeleteData.ts
@@ -1,4 +1,4 @@
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useToken } from "@databiosphere/findable-ui/lib/hooks/authentication/token/useToken";
 import { useCallback } from "react";
 import { METHOD } from "../common/entities";
 import { fetchResource, isFetchStatusOk } from "../common/utils";
@@ -13,7 +13,7 @@ export const useDeleteData = <T>(
   method = METHOD.DELETE,
   options?: OnDeleteOptions
 ): UseDeleteData<T> => {
-  const { token } = useAuthentication();
+  const { token } = useToken();
 
   const onDelete = useCallback(
     async (payload?: T): Promise<void> => {

diff --git a/app/hooks/useFetchData.ts b/app/hooks/useFetchData.ts
@@ -1,5 +1,5 @@
+import { useToken } from "@databiosphere/findable-ui/lib/hooks/authentication/token/useToken";
 import { useAsync } from "@databiosphere/findable-ui/lib/hooks/useAsync";
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
 import { useCallback, useEffect } from "react";
 import { METHOD } from "../common/entities";
 import { fetchResource, isFetchStatusOk } from "../common/utils";
@@ -14,7 +14,7 @@ export const useFetchData = <D>(
   method: METHOD,
   shouldFetch = true
 ): UseFetchData<D> => {
-  const { token } = useAuthentication();
+  const { token } = useToken();
   const { data, isSuccess, run } = useAsync<D>();
 
   const fetchData = useCallback(async (): Promise<D> => {

diff --git a/app/hooks/useFetchSourceStudiesSourceDatasets.ts b/app/hooks/useFetchSourceStudiesSourceDatasets.ts
@@ -1,4 +1,4 @@
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useToken } from "@databiosphere/findable-ui/lib/hooks/authentication/token/useToken";
 import { useCallback, useEffect, useState } from "react";
 import { API } from "../apis/catalog/hca-atlas-tracker/common/api";
 import {
@@ -13,7 +13,7 @@ import { useFetchData } from "./useFetchData";
 export const useFetchSourceStudiesSourceDatasets = (
   pathParameter: PathParameter
 ): HCAAtlasTrackerSourceDataset[] | undefined => {
-  const { token } = useAuthentication();
+  const { token } = useToken();
   const [sourceStudiesSourceDatasets, setSourceStudiesSourceDatasets] =
     useState<HCAAtlasTrackerSourceDataset[]>();
   const { data: sourceStudies } = useFetchData<

diff --git a/app/hooks/useForm/useForm.ts b/app/hooks/useForm/useForm.ts
@@ -1,4 +1,4 @@
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useToken } from "@databiosphere/findable-ui/lib/hooks/authentication/token/useToken";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import {
@@ -41,7 +41,7 @@ export const useForm = <T extends FieldValues, R = undefined>(
   mapApiValues: MapApiValuesFn<T> = (p): unknown => p,
   options: CustomUseFormOptions<T> = {}
 ): UseForm<T, R> => {
-  const { token } = useAuthentication();
+  const { token } = useToken();
   const values = useMemo(
     () => schema.cast(mapSchemaValues?.(apiData)),
     [apiData, mapSchemaValues, schema]

diff --git a/app/hooks/useFormManager/useFormManager.ts b/app/hooks/useFormManager/useFormManager.ts
@@ -1,4 +1,4 @@
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useAuth } from "@databiosphere/findable-ui/lib/providers/authentication/auth/hook";
 import Router from "next/router";
 import { useCallback, useEffect, useState } from "react";
 import { FieldValues } from "react-hook-form";
@@ -34,7 +34,9 @@ export const useFormManager = <T extends FieldValues, R = undefined>(
   } = {},
   isDirty = formMethod?.formState.isDirty ?? false
 ): UseFormManager => {
-  const { isAuthenticated } = useAuthentication();
+  const {
+    authState: { isAuthenticated },
+  } = useAuth();
   const { user } = useAuthorization();
   const { canEdit } = useUserHasEditAuthorization();
   const [pathRoute, setPathRoute] =

diff --git a/app/providers/authorization.tsx b/app/providers/authorization.tsx
@@ -1,5 +1,5 @@
 import { Main as DXMain } from "@databiosphere/findable-ui/lib/components/Layout/components/Main/main";
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useAuth } from "@databiosphere/findable-ui/lib/providers/authentication/auth/hook";
 import { createContext, ReactNode, useEffect } from "react";
 import {
   HCAAtlasTrackerActiveUser,
@@ -21,7 +21,9 @@ interface Props {
 }
 
 export function AuthorizationProvider({ children }: Props): JSX.Element {
-  const { isAuthenticated } = useAuthentication();
+  const {
+    authState: { isAuthenticated },
+  } = useAuth();
   const user = useFetchActiveUser();
   const { disabled, role } = user || {};
   const isAuthorized = isUserAuthorized(role, disabled);
@@ -33,7 +35,9 @@ export function AuthorizationProvider({ children }: Props): JSX.Element {
   }, [role, disabled]);
 
   return (
-    <AuthorizationContext.Provider value={{ user }}>
+    <AuthorizationContext.Provider
+      value={{ user: isAuthenticated ? user : undefined }} // TODO(cc) - we should reset / clear user when not authenticated see useFetchActiveUser.
+    >
       {shouldRenderComponents(isAuthenticated, isAuthorized) ? (
         children
       ) : (

diff --git a/app/services/__mocks__/user-profile.ts b/app/services/__mocks__/user-profile.ts
diff --git a/app/services/user-profile.ts b/app/services/user-profile.ts
@@ -1,11 +1,13 @@
-import { getAuthenticationRequestOptions } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/common/utils";
-import { UserProfile } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useFetchGoogleProfile";
+import { UserProfile as BaseUserProfile } from "@databiosphere/findable-ui/lib/providers/authentication/authentication/types";
+import { getAuthenticationRequestOptions } from "@databiosphere/findable-ui/lib/providers/authentication/terra/hooks/common/utils";
 import ky from "ky";
 
 const ENDPOINT = "https://www.googleapis.com/oauth2/v3/userinfo";
 
 const userProfilesCache = new Map<string, UserProfile>();
 
+export type UserProfile = BaseUserProfile & { email_verified: boolean };
+
 export async function getProvidedUserProfile(
   authorization: string | undefined
 ): Promise<UserProfile | null> {

diff --git a/app/views/CellxGeneInProgressView/cellxgeneInProgressView.tsx b/app/views/CellxGeneInProgressView/cellxgeneInProgressView.tsx
@@ -1,13 +1,15 @@
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useAuth } from "@databiosphere/findable-ui/lib/providers/authentication/auth/hook";
 import { ContentView } from "@databiosphere/findable-ui/lib/views/ContentView/contentView";
-import { AccessPrompt } from "../../../app/components/common/Form/components/FormManager/components/AccessPrompt/accessPrompt";
-import { Divider } from "../../../app/components/Detail/components/TrackerForm/components/Divider/divider.styles";
-import { CellxGeneInProgressForm } from "../../../app/components/Forms/components/CellxGeneInProgress/cellxgeneInProgress";
-import { Content } from "../../../app/components/Layout/components/Content/content";
-import { LAYOUT_STYLE_NO_CONTRAST_DEFAULT } from "../../../app/content/common/constants";
+import { AccessPrompt } from "../../components/common/Form/components/FormManager/components/AccessPrompt/accessPrompt";
+import { Divider } from "../../components/Detail/components/TrackerForm/components/Divider/divider.styles";
+import { CellxGeneInProgressForm } from "../../components/Forms/components/CellxGeneInProgress/cellxgeneInProgress";
+import { Content } from "../../components/Layout/components/Content/content";
+import { LAYOUT_STYLE_NO_CONTRAST_DEFAULT } from "../../content/common/constants";
 
 export const CellxGeneInProgressView = (): JSX.Element => {
-  const { isAuthenticated } = useAuthentication();
+  const {
+    authState: { isAuthenticated },
+  } = useAuth();
   return (
     <ContentView
       content={

diff --git a/app/views/IntegrationLeadsFromAtlasesView/integrationLeadsFromAtlasesView.tsx b/app/views/IntegrationLeadsFromAtlasesView/integrationLeadsFromAtlasesView.tsx
@@ -1,13 +1,15 @@
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useAuth } from "@databiosphere/findable-ui/lib/providers/authentication/auth/hook";
 import { ContentView } from "@databiosphere/findable-ui/lib/views/ContentView/contentView";
-import { AccessPrompt } from "../../../app/components/common/Form/components/FormManager/components/AccessPrompt/accessPrompt";
-import { Divider } from "../../../app/components/Detail/components/TrackerForm/components/Divider/divider.styles";
-import { IntegrationLeadsFromAtlasesForm } from "../../../app/components/Forms/components/IntegrationLeadsFromAtlases/integrationLeadsFromAtlases";
-import { Content } from "../../../app/components/Layout/components/Content/content";
-import { LAYOUT_STYLE_NO_CONTRAST_DEFAULT } from "../../../app/content/common/constants";
+import { AccessPrompt } from "../../components/common/Form/components/FormManager/components/AccessPrompt/accessPrompt";
+import { Divider } from "../../components/Detail/components/TrackerForm/components/Divider/divider.styles";
+import { IntegrationLeadsFromAtlasesForm } from "../../components/Forms/components/IntegrationLeadsFromAtlases/integrationLeadsFromAtlases";
+import { Content } from "../../components/Layout/components/Content/content";
+import { LAYOUT_STYLE_NO_CONTRAST_DEFAULT } from "../../content/common/constants";
 
 export const IntegrationLeadsFromAtlasesView = (): JSX.Element => {
-  const { isAuthenticated } = useAuthentication();
+  const {
+    authState: { isAuthenticated },
+  } = useAuth();
   return (
     <ContentView
       content={

diff --git a/app/views/RefreshView/refreshView.tsx b/app/views/RefreshView/refreshView.tsx
@@ -1,13 +1,15 @@
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useAuth } from "@databiosphere/findable-ui/lib/providers/authentication/auth/hook";
 import { ContentView } from "@databiosphere/findable-ui/lib/views/ContentView/contentView";
-import { AccessPrompt } from "../../../app/components/common/Form/components/FormManager/components/AccessPrompt/accessPrompt";
-import { Divider } from "../../../app/components/Detail/components/TrackerForm/components/Divider/divider.styles";
-import { RefreshForm } from "../../../app/components/Forms/components/Refresh/refresh";
-import { Content } from "../../../app/components/Layout/components/Content/content";
-import { LAYOUT_STYLE_NO_CONTRAST_DEFAULT } from "../../../app/content/common/constants";
+import { AccessPrompt } from "../../components/common/Form/components/FormManager/components/AccessPrompt/accessPrompt";
+import { Divider } from "../../components/Detail/components/TrackerForm/components/Divider/divider.styles";
+import { RefreshForm } from "../../components/Forms/components/Refresh/refresh";
+import { Content } from "../../components/Layout/components/Content/content";
+import { LAYOUT_STYLE_NO_CONTRAST_DEFAULT } from "../../content/common/constants";
 
 export const RefreshView = (): JSX.Element => {
-  const { isAuthenticated } = useAuthentication();
+  const {
+    authState: { isAuthenticated },
+  } = useAuth();
   return (
     <ContentView
       content={

diff --git a/app/views/SourceDatasetsView/hooks/useSetLinkedAtlasSourceDatasets.ts b/app/views/SourceDatasetsView/hooks/useSetLinkedAtlasSourceDatasets.ts
@@ -1,4 +1,4 @@
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useToken } from "@databiosphere/findable-ui/lib/hooks/authentication/token/useToken";
 import { useCallback } from "react";
 import { API } from "../../../apis/catalog/hca-atlas-tracker/common/api";
 import { METHOD, PathParameter } from "../../../common/entities";
@@ -16,7 +16,7 @@ export interface UseSetLinkedAtlasSourceDatasets {
 export const useSetLinkedAtlasSourceDatasets = (
   pathParameter: PathParameter
 ): UseSetLinkedAtlasSourceDatasets => {
-  const { token } = useAuthentication();
+  const { token } = useToken();
 
   const onSetLinked = useCallback(
     async (sourceDatasetId: string, linked: boolean): Promise<void> => {

diff --git a/app/views/SourceStudyView/hooks/useDeleteSourceStudy.ts b/app/views/SourceStudyView/hooks/useDeleteSourceStudy.ts
@@ -1,4 +1,4 @@
-import { useAuthentication } from "@databiosphere/findable-ui/lib/hooks/useAuthentication/useAuthentication";
+import { useToken } from "@databiosphere/findable-ui/lib/hooks/authentication/token/useToken";
 import Router from "next/router";
 import { useCallback } from "react";
 import { API } from "../../../apis/catalog/hca-atlas-tracker/common/api";
@@ -18,7 +18,7 @@ export interface UseDeleteSourceStudy {
 export const useDeleteSourceStudy = (
   pathParameter: PathParameter
 ): UseDeleteSourceStudy => {
-  const { token } = useAuthentication();
+  const { token } = useToken();
 
   const onDelete = useCallback(async (): Promise<void> => {
     const res = await fetchResource(