9563398918

Committed 18 Jun 2024 10:27AM UTC coverage: 97.548% (+0.001%) from 97.547%

Build # 9563398918

Build Type

Pull #418

github

Committed by

web-flow

Commit Message

Merge ab49fe091 into fa7497a34

Pull Request Pull Request #418: Feature/417 integrate file upload page with use cases

Run Details

793 of 828 branches covered (95.77%)

Branch coverage included in aggregate %.

38 of 40 new or added lines in 2 files covered. (95.0%)

3 existing lines in 1 file now uncovered.

2231 of 2272 relevant lines covered (98.2%)

3252.71 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

96.94

/src/sections/upload-dataset-files/UploadDatasetFiles.tsx

import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { FileRepository } from '../../files/domain/repositories/FileRepository'
import { useLoading } from '../loading/LoadingContext'
import { useDataset } from '../dataset/DatasetContext'
import { PageNotFound } from '../page-not-found/PageNotFound'
import { BreadcrumbsGenerator } from '../shared/hierarchy/BreadcrumbsGenerator'
import { FileUploader } from './FileUploader'
import { FileUploadState, FileUploadTools } from '../../files/domain/models/FileUploadState'
import { uploadFile } from '../../files/domain/useCases/uploadFile'
import { UploadedFiles } from './UploadedFiles'
import { addUploadedFile } from '../../files/domain/useCases/addUploadedFile'

interface UploadDatasetFilesProps {
  fileRepository: FileRepository
}

export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDatasetFilesProps) => {
  const { setIsLoading } = useLoading()
  const { dataset, isLoading } = useDataset()
  const { t } = useTranslation('uploadDatasetFiles')
  const [fileUploaderState, setState] = useState(FileUploadTools.createNewState([]))
  const [uploadingToCancelMap, setUploadingToCancelMap] = useState(new Map<string, () => void>())
  const [semaphore, setSemaphore] = useState(new Set<string>())

  const sleep = (delay: number) => new Promise((res) => setTimeout(res, delay))
  const limit = 6

  const acquireSemaphore = async (file: File) => {
    const key = FileUploadTools.key(file)
    setSemaphore((x) => (x.size >= limit ? x : x.add(key)))
    while (!semaphore.has(key)) {
      await sleep(500)
      setSemaphore((x) => (x.size >= limit ? x : x.add(key)))
    }
  }

  const releaseSemaphore = (file: File) => {
    setSemaphore((x) => {
      x.delete(FileUploadTools.key(file))
      return x
    })
  }

  const fileUploadFinished = (file: File) => {
    const key = FileUploadTools.key(file)
    setUploadingToCancelMap((x) => {
      x.delete(key)
      return x
    })
    releaseSemaphore(file)
  }

  const canUpload = (file: File) =>
    !uploadingToCancelMap.has(FileUploadTools.key(file)) &&
    !FileUploadTools.get(file, fileUploaderState).failed &&
    !FileUploadTools.get(file, fileUploaderState).done

  const uploadOneFile = (file: File) => {
    const key = FileUploadTools.key(file)
    if (!canUpload(file)) {
      return
    }
    setState(FileUploadTools.showProgressBar(file, fileUploaderState))
    const cancel = uploadFile(
      fileRepository,
      dataset?.persistentId as string,
      file,
      () => {
        setState(FileUploadTools.done(file, fileUploaderState))
        fileUploadFinished(file)
      },
      () => {
        setState(FileUploadTools.failed(file, fileUploaderState))
        fileUploadFinished(file)
      },
      (now) => setState(FileUploadTools.progress(file, now, fileUploaderState)),
      (storageId) => setState(FileUploadTools.storageId(file, storageId, fileUploaderState))
    )
    setUploadingToCancelMap((x) => x.set(key, cancel))
  }

  const upload = async (files: File[]) => {
    for (const file of files) {
      if (canUpload(file)) {
        await acquireSemaphore(file)
        uploadOneFile(file)
      }
    }
  }

  const cleanup = (file: File) => {
    const key = FileUploadTools.key(file)
    const cancel = uploadingToCancelMap.get(key)
    if (cancel) {
      cancel()
    }
    setUploadingToCancelMap((x) => {
      x.delete(key)
      return x
    })
    releaseSemaphore(file)
  }

  const cancelUpload = (file: File) => {
    cleanup(file)
    setState(FileUploadTools.removed(file, fileUploaderState))
  }

  const deleteFile = (fileUploadState: FileUploadState) => {
    setState((x) => {
      fileUploadState.removed = true
      return { state: x.state, uploaded: x.uploaded }
    })
  }

  const cleanFileState = (file: File) => {
    cleanup(file)
    setState(FileUploadTools.delete(file, fileUploaderState))
  }

  const cleanAllState = () => {
    setState((x) => {
      Array.from(x.state.values()).forEach((fileUploadState) => {
        fileUploadState.removed = true
      })
      return { state: x.state, uploaded: x.uploaded }
    })
  }

  const addFiles = (state: FileUploadState[]) => {
    setIsLoading(true)
    const done = () => setIsLoading(false)
    addUploadedFile(fileRepository, dataset?.persistentId as string, state, done)
    cleanAllState()
  }

  const saveDisabled = () =>
    Array.from(fileUploaderState.state.values()).some((x) => !(x.failed || x.done || x.removed))

  useEffect(() => {
    setIsLoading(isLoading)
  }, [isLoading, setIsLoading])

  if (isLoading) {
    return <p>Temporary Loading until having shape of skeleton</p>
  }

  return (
    <>
      {!dataset ? (
        <PageNotFound />
      ) : (
        <>
          <BreadcrumbsGenerator
            hierarchy={dataset.hierarchy}
            withActionItem
            actionItemText={t('breadcrumbActionItem')}
          />
          <article>
            <FileUploader
              upload={upload}
              cancelTitle={t('cancel')}
              info={t('info')}
              selectText={t('select')}
              fileUploaderState={fileUploaderState}
              cancelUpload={cancelUpload}
              cleanFileState={cleanFileState}
            />
            <UploadedFiles
              fileUploadState={fileUploaderState.uploaded}
              cancelTitle={'Delete'}
              saveDisabled={saveDisabled()}
              deleteFile={deleteFile}
              cleanup={cleanAllState}
              addFiles={addFiles}
            />
          </article>
        </>
      )}
    </>
  )
}

1	import { useEffect, useState } from 'react'
2	import { useTranslation } from 'react-i18next'
3	import { FileRepository } from '../../files/domain/repositories/FileRepository'
4	import { useLoading } from '../loading/LoadingContext'
5	import { useDataset } from '../dataset/DatasetContext'
6	import { PageNotFound } from '../page-not-found/PageNotFound'
7	import { BreadcrumbsGenerator } from '../shared/hierarchy/BreadcrumbsGenerator'
8	import { FileUploader } from './FileUploader'
9	import { FileUploadState, FileUploadTools } from '../../files/domain/models/FileUploadState'
10	import { uploadFile } from '../../files/domain/useCases/uploadFile'
11	import { UploadedFiles } from './UploadedFiles'
12	import { addUploadedFile } from '../../files/domain/useCases/addUploadedFile'
13
14	interface UploadDatasetFilesProps {
15	fileRepository: FileRepository
16	}
17
18	export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDatasetFilesProps) => {	703✔
19	const { setIsLoading } = useLoading()	703✔
20	const { dataset, isLoading } = useDataset()	703✔
21	const { t } = useTranslation('uploadDatasetFiles')	703✔
22	const [fileUploaderState, setState] = useState(FileUploadTools.createNewState([]))	688✔
23	const [uploadingToCancelMap, setUploadingToCancelMap] = useState(new Map<string, () => void>())	688✔
24	const [semaphore, setSemaphore] = useState(new Set<string>())	688✔
25
26	const sleep = (delay: number) => new Promise((res) => setTimeout(res, delay))	1,472✔
27	const limit = 6	688✔
28
29	const acquireSemaphore = async (file: File) => {	688✔
30	const key = FileUploadTools.key(file)	269✔
31	setSemaphore((x) => (x.size >= limit ? x : x.add(key)))	269✔
32	while (!semaphore.has(key)) {	269✔
33	await sleep(500)	1,472✔
34	setSemaphore((x) => (x.size >= limit ? x : x.add(key)))	1,335!
35	}
36	}
37
38	const releaseSemaphore = (file: File) => {	688✔
39	setSemaphore((x) => {	123✔
40	x.delete(FileUploadTools.key(file))	71✔
41	return x	71✔
42	})
43	}
44
45	const fileUploadFinished = (file: File) => {	688✔
46	const key = FileUploadTools.key(file)	87✔
47	setUploadingToCancelMap((x) => {	87✔
48	x.delete(key)	35✔
49	return x	35✔
50	})
51	releaseSemaphore(file)	87✔
52	}
53
54	const canUpload = (file: File) =>	688✔
55	!uploadingToCancelMap.has(FileUploadTools.key(file)) &&	2,230✔
56	!FileUploadTools.get(file, fileUploaderState).failed &&
57	!FileUploadTools.get(file, fileUploaderState).done
58
59	const uploadOneFile = (file: File) => {	688✔
60	const key = FileUploadTools.key(file)	132✔
61	if (!canUpload(file)) {	132!
NEW 62	return	×
63	}
64	setState(FileUploadTools.showProgressBar(file, fileUploaderState))	132✔
65	const cancel = uploadFile(	132✔
66	fileRepository,
67	dataset?.persistentId as string,
68	file,
69	() => {
70	setState(FileUploadTools.done(file, fileUploaderState))	70✔
71	fileUploadFinished(file)	70✔
72	},
73	() => {
74	setState(FileUploadTools.failed(file, fileUploaderState))	17✔
75	fileUploadFinished(file)	17✔
76	},
77	(now) => setState(FileUploadTools.progress(file, now, fileUploaderState)),	378✔
78	(storageId) => setState(FileUploadTools.storageId(file, storageId, fileUploaderState))	70✔
79	)
80	setUploadingToCancelMap((x) => x.set(key, cancel))	132✔
81	}
82
83	const upload = async (files: File[]) => {	688✔
84	for (const file of files) {	1,076✔
85	if (canUpload(file)) {	2,098✔
86	await acquireSemaphore(file)	269✔
87	uploadOneFile(file)	132✔
88	}
89	}
90	}
91
92	const cleanup = (file: File) => {	688✔
93	const key = FileUploadTools.key(file)	36✔
94	const cancel = uploadingToCancelMap.get(key)	36✔
95	if (cancel) {	36✔
96	cancel()	10✔
97	}
98	setUploadingToCancelMap((x) => {	36✔
99	x.delete(key)	36✔
100	return x	36✔
101	})
102	releaseSemaphore(file)	36✔
103	}
104
105	const cancelUpload = (file: File) => {	688✔
106	cleanup(file)	10✔
107	setState(FileUploadTools.removed(file, fileUploaderState))	10✔
108	}
109
110	const deleteFile = (fileUploadState: FileUploadState) => {	688✔
111	setState((x) => {	2✔
112	fileUploadState.removed = true	2✔
113	return { state: x.state, uploaded: x.uploaded }	2✔
114	})
115	}
116
117	const cleanFileState = (file: File) => {	688✔
118	cleanup(file)	26✔
119	setState(FileUploadTools.delete(file, fileUploaderState))	26✔
120	}
121
122	const cleanAllState = () => {	688✔
123	setState((x) => {	11✔
124	Array.from(x.state.values()).forEach((fileUploadState) => {	11✔
125	fileUploadState.removed = true	22✔
126	})
127	return { state: x.state, uploaded: x.uploaded }	11✔
128	})
129	}
130
131	const addFiles = (state: FileUploadState[]) => {	688✔
132	setIsLoading(true)	4✔
133	const done = () => setIsLoading(false)	4✔
134	addUploadedFile(fileRepository, dataset?.persistentId as string, state, done)	4✔
135	cleanAllState()	4✔
136	}
137
138	const saveDisabled = () =>	688✔
139	Array.from(fileUploaderState.state.values()).some((x) => !(x.failed \|\| x.done \|\| x.removed))	530✔
140
141	useEffect(() => {	688✔
142	setIsLoading(isLoading)	238✔
143	}, [isLoading, setIsLoading])
144
145	if (isLoading) {	688✔
146	return <p>Temporary Loading until having shape of skeleton</p>	119✔
147	}
148
149	return (	569✔
150	<>
151	{!dataset ? (	569✔
152	<PageNotFound />
153	) : (
154	<>
155	<BreadcrumbsGenerator
156	hierarchy={dataset.hierarchy}
157	withActionItem
158	actionItemText={t('breadcrumbActionItem')}
159	/>
160	<article>
161	<FileUploader
162	upload={upload}
163	cancelTitle={t('cancel')}
164	info={t('info')}
165	selectText={t('select')}
166	fileUploaderState={fileUploaderState}
167	cancelUpload={cancelUpload}
168	cleanFileState={cleanFileState}
169	/>
170	<UploadedFiles
171	fileUploadState={fileUploaderState.uploaded}
172	cancelTitle={'Delete'}
173	saveDisabled={saveDisabled()}
174	deleteFile={deleteFile}
175	cleanup={cleanAllState}
176	addFiles={addFiles}
177	/>
178	</article>
179	</>
180	)}
181	</>
182	)
183	}	15✔

IQSS / dataverse-frontend / 9563398918

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous