diff --git a/src/assets/dataSubmissions/summary_banner.png b/src/assets/dataSubmissions/summary_banner.png index e032fbe3..36081e6e 100644 Binary files a/src/assets/dataSubmissions/summary_banner.png and b/src/assets/dataSubmissions/summary_banner.png differ diff --git a/src/components/DataSubmissions/DataSubmissionSummary.tsx b/src/components/DataSubmissions/DataSubmissionSummary.tsx index 9dc15919..d728f500 100644 --- a/src/components/DataSubmissions/DataSubmissionSummary.tsx +++ b/src/components/DataSubmissions/DataSubmissionSummary.tsx @@ -11,20 +11,13 @@ import SubmissionHeaderProperty, { StyledValue, } from "./SubmissionHeaderProperty"; import Tooltip from "./Tooltip"; -import summaryBannerSvg from "../../assets/dataSubmissions/summary_banner.png"; import { ReactComponent as EmailIconSvg } from "../../assets/icons/email_icon.svg"; import HistoryDialog from "../Shared/HistoryDialog"; import DataSubmissionIconMap from "./DataSubmissionIconMap"; const StyledSummaryWrapper = styled("div")(() => ({ - background: `url(${summaryBannerSvg})`, - backgroundSize: "cover", - backgroundRepeat: "no-repeat", - backgroundPosition: "top", borderRadius: "8px 8px 0px 0px", - borderBottom: "1px solid #6CACDA", textWrap: "nowrap", - // boxShadow: "0px 2px 35px 0px rgba(62, 87, 88, 0.35)", padding: "25px 21px 59px 48px", })); diff --git a/src/content/dataSubmissions/DataSubmission.tsx b/src/content/dataSubmissions/DataSubmission.tsx index d87169e2..1dee613b 100644 --- a/src/content/dataSubmissions/DataSubmission.tsx +++ b/src/content/dataSubmissions/DataSubmission.tsx @@ -16,6 +16,7 @@ import { } from "@mui/material"; import { isEqual } from "lodash"; import bannerSvg from "../../assets/dataSubmissions/dashboard_banner.svg"; +import summaryBannerSvg from "../../assets/dataSubmissions/summary_banner.png"; import LinkTab from "../../components/DataSubmissions/LinkTab"; import DataSubmissionUpload from "../../components/DataSubmissions/DataSubmissionUpload"; import { @@ -28,19 +29,11 @@ import { } from "../../graphql"; import DataSubmissionSummary from "../../components/DataSubmissions/DataSubmissionSummary"; import GenericAlert, { AlertState } from "../../components/GenericAlert"; -import PieChart from "../../components/DataSubmissions/PieChart"; import DataSubmissionBatchTable, { Column, FetchListing, TableMethods } from "../../components/DataSubmissions/DataSubmissionBatchTable"; import { FormatDate } from "../../utils"; import DataSubmissionActions from "./DataSubmissionActions"; import QualityControl from "./QualityControl"; -const dummyChartData = [ - { label: 'Group A', value: 12, color: "#DFC798" }, - { label: 'Group B', value: 28, color: "#137E87" }, - { label: 'Group C', value: 30, color: "#99A4E4" }, - { label: 'Group D', value: 30, color: "#CB2809" }, -]; - const StyledBanner = styled("div")(({ bannerSrc }: { bannerSrc: string }) => ({ background: `url(${bannerSrc})`, backgroundBlendMode: "luminosity, normal", @@ -101,20 +94,6 @@ const StyledCard = styled(Card)(() => ({ }, })); -const StyledChartArea = styled("div")(() => ({ - height: "253.42px", - display: "flex", - justifyContent: "center", - alignItems: "center", - overflow: "visible", - "& div": { - overflow: "visible", - margin: "0 auto", - marginLeft: "30px", - marginRight: "30px" - } -})); - const StyledMainContentArea = styled("div")(() => ({ borderRadius: 0, background: "#FFFFFF", @@ -160,21 +139,18 @@ const StyledWrapper = styled("div")({ background: "#FBFDFF", }); +const StyledCardContent = styled(CardContent)({ + background: `url(${summaryBannerSvg})`, + backgroundSize: "auto", + backgroundRepeat: "no-repeat", + backgroundPosition: "top", +}); + const StyledRejectedStatus = styled("div")(() => ({ color: "#E25C22", fontWeight: 600 })); -const StyledErrorCount = styled("div")(() => ({ - color: "#0D78C5", - fontFamily: "Inter", - fontSize: "16px", - fontStyle: "normal", - fontWeight: 600, - lineHeight: "25px", - textDecorationLine: "underline", -})); - const columns: Column[] = [ { label: "Upload Type", @@ -203,15 +179,7 @@ const columns: Column[] = [ default: true, minWidth: "240px" }, - { - label: "Error Count", - value: (data) => ( - - {data.errors?.length > 0 ? `${data.errors.length} ${data.errors.length === 1 ? "Error" : "Errors"}` : ""} - - ), - field: "errors", - }, + /* TODO: Error Count removed for MVP2-M2. Will be re-added in the future */ ]; const URLTabs = { @@ -361,7 +329,7 @@ const DataSubmission = () => { - + {error && ( Oops! An error occurred. @@ -370,102 +338,8 @@ const DataSubmission = () => { )} - - - - - - - - + + {/* TODO: Widgets removed for MVP2-M2. Will be re-added in the future */} { ) : } - +