From 36d91f6b8b9452e0a67b716ecadc1e291c6078e5 Mon Sep 17 00:00:00 2001 From: Fran McDade <18710366+frano-m@users.noreply.github.com> Date: Tue, 20 Oct 2026 15:57:51 +1000 Subject: [PATCH] refactor: replace findable button wrappers with mui button (#4994) Co-Authored-By: Claude Opus 5.5 (1M context) --- .../components/EntityDeprecated/entityDeprecated.tsx | 8 +++++--- .../components/EntityWithdrawn/entityWithdrawn.tsx | 8 +++++--- .../fileLocationArchivePreview.styles.ts | 4 ++-- .../fileLocationArchivePreview.tsx | 8 +++++++- .../Button/components/ButtonOutline/buttonOutline.tsx | 4 ++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/components/Detail/components/EntityGuard/components/EntityDeprecated/entityDeprecated.tsx b/app/components/Detail/components/EntityGuard/components/EntityDeprecated/entityDeprecated.tsx index 8c7484ac3..26cdd7718 100644 --- a/app/components/Detail/components/EntityGuard/components/EntityDeprecated/entityDeprecated.tsx +++ b/app/components/Detail/components/EntityGuard/components/EntityDeprecated/entityDeprecated.tsx @@ -1,4 +1,4 @@ -import { ButtonPrimary } from "@databiosphere/findable-ui/lib/components/common/Button/components/ButtonPrimary/buttonPrimary"; +import { BUTTON_PROPS } from "@databiosphere/findable-ui/lib/components/common/Button/constants"; import { AlertIcon } from "@databiosphere/findable-ui/lib/components/common/CustomIcon/components/AlertIcon/alertIcon"; import { SectionActions } from "@databiosphere/findable-ui/lib/components/common/Section/section.styles"; import { @@ -7,7 +7,7 @@ import { } from "@databiosphere/findable-ui/lib/components/common/StatusIcon/statusIcon"; import { Override } from "@databiosphere/findable-ui/lib/config/entities"; import { TYPOGRAPHY_PROPS } from "@databiosphere/findable-ui/lib/styles/common/mui/typography"; -import { Link as MLink, Typography } from "@mui/material"; +import { Button, Link as MLink, Typography } from "@mui/material"; import Link from "next/link"; import { useRouter } from "next/router"; import { JSX } from "react"; @@ -60,7 +60,9 @@ export const EntityDeprecated = ({ - To Homepage + diff --git a/app/components/Detail/components/EntityGuard/components/EntityWithdrawn/entityWithdrawn.tsx b/app/components/Detail/components/EntityGuard/components/EntityWithdrawn/entityWithdrawn.tsx index 91494faeb..07f550aaa 100644 --- a/app/components/Detail/components/EntityGuard/components/EntityWithdrawn/entityWithdrawn.tsx +++ b/app/components/Detail/components/EntityGuard/components/EntityWithdrawn/entityWithdrawn.tsx @@ -1,4 +1,4 @@ -import { ButtonPrimary } from "@databiosphere/findable-ui/lib/components/common/Button/components/ButtonPrimary/buttonPrimary"; +import { BUTTON_PROPS } from "@databiosphere/findable-ui/lib/components/common/Button/constants"; import { AlertIcon } from "@databiosphere/findable-ui/lib/components/common/CustomIcon/components/AlertIcon/alertIcon"; import { SectionActions } from "@databiosphere/findable-ui/lib/components/common/Section/section.styles"; import { @@ -8,7 +8,7 @@ import { import { ANCHOR_TARGET } from "@databiosphere/findable-ui/lib/components/Links/common/entities"; import { Override } from "@databiosphere/findable-ui/lib/config/entities"; import { TYPOGRAPHY_PROPS } from "@databiosphere/findable-ui/lib/styles/common/mui/typography"; -import { Link as MLink, Typography } from "@mui/material"; +import { Button, Link as MLink, Typography } from "@mui/material"; import Link from "next/link"; import { JSX } from "react"; import { Notice, Section, SectionContent } from "../../entityGuard.styles"; @@ -58,7 +58,9 @@ export const EntityWithdrawn = ({ - To Homepage + diff --git a/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.styles.ts b/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.styles.ts index 9a480843c..fb1c3249c 100644 --- a/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.styles.ts +++ b/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.styles.ts @@ -1,7 +1,7 @@ -import { ButtonTextPrimary } from "@databiosphere/findable-ui/lib/components/common/Button/components/ButtonTextPrimary/buttonTextPrimary"; import styled from "@emotion/styled"; +import { Button } from "@mui/material"; -export const FileLocationArchivePreviewButton = styled(ButtonTextPrimary)` +export const FileLocationArchivePreviewButton = styled(Button)` font-weight: 400; justify-self: flex-start; `; diff --git a/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.tsx b/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.tsx index 3380fdb5e..32ce123be 100644 --- a/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.tsx +++ b/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.tsx @@ -1,3 +1,4 @@ +import { BUTTON_PROPS } from "@databiosphere/findable-ui/lib/components/common/Button/constants"; import { JSX, useState } from "react"; import { ProjectMatrixView } from "../../../../../../viewModelBuilders/azul/hca-dcp/common/projectMatrixMapper/entities"; import { ArchivePreviewDialog } from "../ArchivePreviewDialog/archivePreviewDialog"; @@ -28,7 +29,12 @@ export const FileLocationArchivePreview = ({ const [loading, setLoading] = useState(false); return isArchivePreviewAvailable(projectMatrixView) ? ( <> - + setOpen(false)} open={open} diff --git a/app/components/common/Button/components/ButtonOutline/buttonOutline.tsx b/app/components/common/Button/components/ButtonOutline/buttonOutline.tsx index 37acc6340..9dcaacbcd 100644 --- a/app/components/common/Button/components/ButtonOutline/buttonOutline.tsx +++ b/app/components/common/Button/components/ButtonOutline/buttonOutline.tsx @@ -1,7 +1,7 @@ -import { ButtonProps as DXButtonProps } from "@databiosphere/findable-ui/lib/components/common/Button/button"; import { ButtonOutline as DXButtonOutline } from "@databiosphere/findable-ui/lib/components/common/Button/components/ButtonOutline/buttonOutline"; +import type { ButtonProps } from "@mui/material"; import { JSX } from "react"; -export const ButtonOutline = ({ ...props }: DXButtonProps): JSX.Element => { +export const ButtonOutline = ({ ...props }: ButtonProps): JSX.Element => { return ; };