Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Feature/saved objects info #92

Merged
merged 13 commits into from
Nov 10, 2020
Prev Previous commit
Next Next commit
Toggle 'Added!' text by comparion between current and previous metada…
…ta objects state
  • Loading branch information
saulipurhonen committed Nov 9, 2020
commit d5783677b337c8bb97b5daa353d3036798c80d1b
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//@flow
import React, { useEffect, useState } from "react"
import React, { useEffect, useState, useRef } from "react"

import IconButton from "@material-ui/core/IconButton"
import List from "@material-ui/core/List"
Expand Down Expand Up @@ -45,7 +45,6 @@ const useStyles = makeStyles(theme => ({
const ToggleMessage = ({ delay, children }: { delay: number, children: any }) => {
const classes = useStyles()
const [visible, setVisible] = useState(true)

useEffect(() => {
setTimeout(() => {
setVisible(false)
Expand All @@ -59,12 +58,17 @@ const ToggleMessage = ({ delay, children }: { delay: number, children: any }) =>
* List objects by submission type. Enables deletion of objects
*/
const WizardSavedObjectsList = ({ submissionType, submissions }: { submissionType: string, submissions: any }) => {
const ref = useRef()
useEffect(() => {
ref.current = submissions
})
const classes = useStyles()
const dispatch = useDispatch()
const objectType = useSelector(state => state.objectType)
const handleObjectDelete = objectId => {
dispatch(deleteObjectFromFolder(objectId, objectType))
}
const newObject = submissions.filter(x => !ref.current?.includes(x))
return (
<div className={classes.objectList}>
<h3 className={classes.header}>Submitted {submissionType} items</h3>
Expand All @@ -74,7 +78,9 @@ const WizardSavedObjectsList = ({ submissionType, submissions }: { submissionTyp
<ListItem key={submission.accessionId} className={classes.objectListItems}>
<ListItemText primary={submission.accessionId} />
<ListItemSecondaryAction>
{submission.new && <ToggleMessage delay={5000}>Added!</ToggleMessage>}
{newObject.length === 1 && newObject[0]?.accessionId === submission.accessionId && (
<ToggleMessage delay={5000}>Added!</ToggleMessage>
)}
<IconButton
onClick={() => {
handleObjectDelete(submission.accessionId)
Expand Down