Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

CRDCDH-579 Removed Error Count and Widgets for MVP2-M2 #201

Merged
merged 4 commits into from
Nov 8, 2023
Merged

CRDCDH-579 Removed Error Count and Widgets for MVP2-M2 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e49b75
Removed Pie chart widgets and Error Count from batch table in submiss…
Alejandro-Vega Nov 7, 2023
72037e7
Removed additional items missed
Alejandro-Vega Nov 7, 2023
a0f9d26
Fixed summary section being right above tabs. Changed banner to match…
Alejandro-Vega Nov 8, 2023
a45db46
Merge branch 'mvp-2' of https://github.com/CBIIT/crdc-datahub-ui into…
Alejandro-Vega Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/assets/dataSubmissions/summary_banner.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions src/components/DataSubmissions/DataSubmissionSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}));

Expand Down
152 changes: 13 additions & 139 deletions src/content/dataSubmissions/DataSubmission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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<Batch>[] = [
{
label: "Upload Type",
Expand Down Expand Up @@ -203,15 +179,7 @@ const columns: Column<Batch>[] = [
default: true,
minWidth: "240px"
},
{
label: "Error Count",
value: (data) => (
<StyledErrorCount>
{data.errors?.length > 0 ? `${data.errors.length} ${data.errors.length === 1 ? "Error" : "Errors"}` : ""}
</StyledErrorCount>
),
field: "errors",
},
/* TODO: Error Count removed for MVP2-M2. Will be re-added in the future */
];

const URLTabs = {
Expand Down Expand Up @@ -361,7 +329,7 @@ const DataSubmission = () => {
<StyledBanner bannerSrc={bannerSvg} />
<StyledBannerContentContainer maxWidth="xl">
<StyledCard>
<CardContent>
<StyledCardContent>
{error && (
<StyledAlert severity="error">
Oops! An error occurred.
Expand All @@ -370,102 +338,8 @@ const DataSubmission = () => {
</StyledAlert>
)}
<DataSubmissionSummary dataSubmission={dataSubmission} />
<StyledChartArea>
<Stack direction="row" justifyContent="center" sx={{ width: "960px", textAlign: "center" }}>
<PieChart
label="Study"
series={[
{
innerRadius: 40,
outerRadius: 55,
data: [{ label: "inner", value: 1, color: "#9FD1D6" }],
},
{
innerRadius: 55,
outerRadius: 75,
data: dummyChartData,
highlighted: { additionalRadius: 5 },
highlightScope: { faded: 'none', highlighted: 'item' },
},
]}
margin={{ right: 5 }}
width={150}
height={150}
legend={{ hidden: true }}
tooltip={{ trigger: 'none' }}
sx={{ rotate: "270deg", overflow: "visible" }}
/>
<PieChart
label="Study"
series={[
{
innerRadius: 40,
outerRadius: 55,
data: [{ label: "inner", value: 1, color: "#9FD1D6" }],
},
{
innerRadius: 55,
outerRadius: 75,
data: dummyChartData,
highlighted: { additionalRadius: 5 },
highlightScope: { faded: 'none', highlighted: 'item' },
},
]}
margin={{ right: 5 }}
width={150}
height={150}
legend={{ hidden: true }}
tooltip={{ trigger: 'none' }}
sx={{ rotate: "270deg", overflow: "visible" }}
/>
<PieChart
label="Study"
series={[
{
innerRadius: 40,
outerRadius: 55,
data: [{ label: "inner", value: 1, color: "#9FD1D6" }],
},
{
innerRadius: 55,
outerRadius: 75,
data: dummyChartData,
highlighted: { additionalRadius: 5 },
highlightScope: { faded: 'none', highlighted: 'item' },
},
]}
margin={{ right: 5 }}
width={150}
height={150}
legend={{ hidden: true }}
tooltip={{ trigger: 'none' }}
sx={{ rotate: "270deg", overflow: "visible" }}
/>
<PieChart
label="Study"
series={[
{
innerRadius: 40,
outerRadius: 55,
data: [{ label: "inner", value: 1, color: "#9FD1D6" }],
},
{
innerRadius: 55,
outerRadius: 75,
data: dummyChartData,
highlighted: { additionalRadius: 5 },
highlightScope: { faded: 'none', highlighted: 'item' },
},
]}
margin={{ right: 5 }}
width={150}
height={150}
legend={{ hidden: true }}
tooltip={{ trigger: 'none' }}
sx={{ rotate: "270deg", overflow: "visible" }}
/>
</Stack>
</StyledChartArea>

{/* TODO: Widgets removed for MVP2-M2. Will be re-added in the future */}

<StyledTabs value={isValidTab ? tab : URLTabs.DATA_UPLOAD}>
<LinkTab
Expand Down Expand Up @@ -501,7 +375,7 @@ const DataSubmission = () => {
</Stack>
) : <QualityControl submitterID={dataSubmission?.submitterID} />}
</StyledMainContentArea>
</CardContent>
</StyledCardContent>
<StyledCardActions isVisible={tab === URLTabs.DATA_UPLOAD}>
<DataSubmissionActions
submission={dataSubmission}
Expand Down