Fix: remove unneeded fragments

This commit is contained in:
Cesar 2020-12-29 14:23:35 +00:00 committed by Josh Harvey
parent 6b6d52d7b0
commit c7a01f840f
5 changed files with 493 additions and 412 deletions

View file

@ -240,6 +240,8 @@ const typeDefs = gql`
created: Date created: Date
age: Float age: Float
deviceTime: Date deviceTime: Date
}
type Rate { type Rate {
code: String code: String
name: String name: String

View file

@ -43,9 +43,8 @@ const RightSide = () => {
} }
return ( return (
<> <Grid item xs={6}>
<Grid item xs={6}> {/* <CollapsibleCard
{/* <CollapsibleCard
className={classes.alertsCard} className={classes.alertsCard}
state={alertsSize} state={alertsSize}
shrunkComponent={ shrunkComponent={
@ -64,26 +63,25 @@ const RightSide = () => {
size={alertsSize} size={alertsSize}
/> />
</CollapsibleCard> */} </CollapsibleCard> */}
<CollapsibleCard <CollapsibleCard
state={systemStatusSize} state={systemStatusSize}
shrunkComponent={ shrunkComponent={
<ShrunkCard <ShrunkCard
title={'System status'} title={'System status'}
buttonName={'Show machines'} buttonName={'Show machines'}
onUnshrink={onReset} onUnshrink={onReset}
/>
}>
<SystemStatus
onExpand={() => {
setSystemStatusSize(cardState.EXPANDED)
// setAlertsSize(cardState.SHRUNK)
}}
onReset={onReset}
size={systemStatusSize}
/> />
</CollapsibleCard> }>
</Grid> <SystemStatus
</> onExpand={() => {
setSystemStatusSize(cardState.EXPANDED)
// setAlertsSize(cardState.SHRUNK)
}}
onReset={onReset}
size={systemStatusSize}
/>
</CollapsibleCard>
</Grid>
) )
} }

View file

@ -155,19 +155,17 @@ const Transactions = ({ id }) => {
} }
return ( return (
<> <DataTable
<DataTable extraHeight={extraHeight}
extraHeight={extraHeight} onClick={handleClick}
onClick={handleClick} loading={loading || id === null}
loading={loading || id === null} emptyText="No transactions so far"
emptyText="No transactions so far" elements={elements}
elements={elements} // need to splice because back end query could return double NUM_LOG_RESULTS because it doesnt merge the txIn and the txOut results before applying the limit
// need to splice because back end query could return double NUM_LOG_RESULTS because it doesnt merge the txIn and the txOut results before applying the limit data={R.path(['transactions'])(txResponse)} // .splice(0,NUM_LOG_RESULTS)}
data={R.path(['transactions'])(txResponse)} // .splice(0,NUM_LOG_RESULTS)} Details={DetailsRow}
Details={DetailsRow} expandable
expandable />
/>
</>
) )
} }

833
package-lock.json generated

File diff suppressed because it is too large Load diff