From 46642db53dc5dbfd60851503e44597cdf03371c3 Mon Sep 17 00:00:00 2001 From: NetPenguins Date: Wed, 2 Sep 2020 08:31:27 -0400 Subject: [PATCH] Updated ExpansionPanel to Accordion --- .../lib/ActionOutput/ActionOutput.tsx | 20 ++++++++-------- .../WorkflowRunDetails/WorkflowRunDetails.tsx | 20 ++++++++-------- .../lib/ActionOutput/ActionOutput.tsx | 20 ++++++++-------- .../src/components/JobStage/JobStage.tsx | 24 +++++++++---------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/plugins/circleci/src/pages/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx b/plugins/circleci/src/pages/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx index dd526c1b5f..bc64040d77 100644 --- a/plugins/circleci/src/pages/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx +++ b/plugins/circleci/src/pages/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx @@ -15,10 +15,10 @@ */ import React, { useEffect, useState, FC, Suspense } from 'react'; import { - ExpansionPanel, - ExpansionPanelSummary, + Accordion, + AccordionSummary, Typography, - ExpansionPanelDetails, + AccordionDetails, LinearProgress, } from '@material-ui/core'; import moment from 'moment'; @@ -29,7 +29,7 @@ import { BuildStepAction } from 'circleci-api'; const LazyLog = React.lazy(() => import('react-lazylog/build/LazyLog')); moment.relativeTimeThreshold('ss', 0); const useStyles = makeStyles({ - expansionPanelDetails: { + accordionDetails: { padding: 0, }, button: { @@ -66,11 +66,11 @@ export const ActionOutput: FC<{ ) .humanize(); return ( - - } aria-controls={`panel-${name}-content`} id={`panel-${name}-header`} @@ -81,8 +81,8 @@ export const ActionOutput: FC<{ {name} ({timeElapsed}) - - + + {messages.length === 0 ? ( 'Nothing here...' ) : ( @@ -92,7 +92,7 @@ export const ActionOutput: FC<{ )} - - + + ); }; diff --git a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx index a635eb9acb..0d1a0b6a50 100644 --- a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx +++ b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx @@ -26,10 +26,10 @@ import { TableRow, TableCell, ListItemText, - ExpansionPanel, - ExpansionPanelSummary, + Accordion, + AccordionSummary, Typography, - ExpansionPanelDetails, + AccordionDetails, TableContainer, Table, Paper, @@ -56,7 +56,7 @@ const useStyles = makeStyles(theme => ({ table: { padding: theme.spacing(1), }, - expansionPanelDetails: { + accordionDetails: { padding: 0, }, button: { @@ -113,11 +113,11 @@ const StepView = ({ step }: { step: Step }) => { const JobListItem = ({ job, className }: { job: Job; className: string }) => { const classes = useStyles(); return ( - - } aria-controls={`panel-${name}-content`} id={`panel-${name}-header`} @@ -128,8 +128,8 @@ const JobListItem = ({ job, className }: { job: Job; className: string }) => { {job.name} ({getElapsedTime(job.started_at, job.completed_at)}) - - + + {job.steps.map((step: Step) => ( @@ -137,7 +137,7 @@ const JobListItem = ({ job, className }: { job: Job; className: string }) => { ))}
-
+ {job.status === "queued" || job.status === "in_progress" ? { /> } -
+ ); }; diff --git a/plugins/jenkins/src/pages/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx b/plugins/jenkins/src/pages/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx index 1143121a98..5964a8dcbf 100644 --- a/plugins/jenkins/src/pages/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx +++ b/plugins/jenkins/src/pages/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx @@ -15,16 +15,16 @@ */ import React, { useEffect, FC } from 'react'; import { - ExpansionPanel, - ExpansionPanelSummary, + Accordion, + AccordionSummary, Typography, - ExpansionPanelDetails, + AccordionDetails, } from '@material-ui/core'; import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; import { makeStyles } from '@material-ui/core/styles'; const useStyles = makeStyles({ - expansionPanelDetails: { + accordionDetails: { padding: 0, }, button: { @@ -45,11 +45,11 @@ export const ActionOutput: FC<{ useEffect(() => {}, [url]); return ( - - } aria-controls={`panel-${name}-content`} id={`panel-${name}-header`} @@ -58,10 +58,10 @@ export const ActionOutput: FC<{ }} > {name} - - + + Nothing here... - - + + ); }; diff --git a/plugins/scaffolder/src/components/JobStage/JobStage.tsx b/plugins/scaffolder/src/components/JobStage/JobStage.tsx index 1e9adafb18..c8c7c79e26 100644 --- a/plugins/scaffolder/src/components/JobStage/JobStage.tsx +++ b/plugins/scaffolder/src/components/JobStage/JobStage.tsx @@ -15,9 +15,9 @@ */ import { Box, - ExpansionPanel, - ExpansionPanelDetails, - ExpansionPanelSummary, + Accordion, + AccordionDetails, + AccordionSummary, LinearProgress, Typography, } from '@material-ui/core'; @@ -32,7 +32,7 @@ const LazyLog = React.lazy(() => import('react-lazylog/build/LazyLog')); moment.relativeTimeThreshold('ss', 0); const useStyles = makeStyles(theme => ({ - expansionPanelDetails: { + accordionDetails: { padding: 0, }, button: { @@ -43,7 +43,7 @@ const useStyles = makeStyles(theme => ({ cardContent: { backgroundColor: theme.palette.background.default, }, - expansionPanel: { + accordion: { position: 'relative', '&:after': { pointerEvents: 'none', @@ -98,17 +98,17 @@ export const JobStage = ({ endedAt, startedAt, name, log, status }: Props) => { : null; return ( - ] ?? classes.neutral, )} expanded={expanded} onChange={(_, newState) => setExpanded(newState)} > - } aria-controls={`panel-${name}-content`} id={`panel-${name}-header`} @@ -119,8 +119,8 @@ export const JobStage = ({ endedAt, startedAt, name, log, status }: Props) => { {name} {timeElapsed && `(${timeElapsed})`} - - + + {log.length === 0 ? ( No logs available for this step ) : ( @@ -130,7 +130,7 @@ export const JobStage = ({ endedAt, startedAt, name, log, status }: Props) => { )} - - + + ); };