9796181691

Committed 04 Jul 2024 02:34PM UTC coverage: 97.527% (-0.05%) from 97.581%

Build # 9796181691

Build Type

push

github

Committed by

GermanSaracca

Commit Message

fix: file selection working correctly

Run Details

839 of 877 branches covered (95.67%)

Branch coverage included in aggregate %.

18 of 18 new or added lines in 2 files covered. (100.0%)

1 existing line in 1 file now uncovered.

2356 of 2399 relevant lines covered (98.21%)

10027.27 hits per line

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

93.33

/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 { FileUploadTools } from '../../files/domain/models/FileUploadState'
import { uploadFile } from '../../files/domain/useCases/uploadFile'

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 [uploadFinished, setUploadFinished] = useState(new Set<string>())
  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)
    setUploadFinished((x) => x.add(key))
    setUploadingToCancelMap((x) => {
      x.delete(key)
      return x
    })
    releaseSemaphore(file)
  }

  const uploadOneFile = (file: File) => {
    const key = FileUploadTools.key(file)
    if (uploadingToCancelMap.has(key) || uploadFinished.has(key)) {
      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))
    )
    setUploadingToCancelMap((x) => x.set(key, cancel))
  }

  const upload = async (files: File[]) => {
    for (const file of files) {
      const key = FileUploadTools.key(file)
      if (!uploadingToCancelMap.has(key) && !uploadFinished.has(key)) {
        await acquireSemaphore(file)
        uploadOneFile(file)
      }
    }
  }

  const cancelUpload = (file: File) => {
    const key = FileUploadTools.key(file)
    const cancel = uploadingToCancelMap.get(key)
    if (cancel) {
      cancel()
      releaseSemaphore(file)
    }
    setUploadingToCancelMap((x) => {
      x.delete(key)
      return x
    })
    setState(FileUploadTools.removed(file, fileUploaderState))
  }

  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}
            />
          </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 { FileUploadTools } from '../../files/domain/models/FileUploadState'
10	import { uploadFile } from '../../files/domain/useCases/uploadFile'
11
12	interface UploadDatasetFilesProps {
13	fileRepository: FileRepository
14	}
15
16	export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDatasetFilesProps) => {	456✔
17	const { setIsLoading } = useLoading()	456✔
18	const { dataset, isLoading } = useDataset()	456✔
19	const { t } = useTranslation('uploadDatasetFiles')	456✔
20	const [fileUploaderState, setState] = useState(FileUploadTools.createNewState([]))	444✔
21	const [uploadingToCancelMap, setUploadingToCancelMap] = useState(new Map<string, () => void>())	444✔
22	const [uploadFinished, setUploadFinished] = useState(new Set<string>())	444✔
23	const [semaphore, setSemaphore] = useState(new Set<string>())	444✔
24
25	const sleep = (delay: number) => new Promise((res) => setTimeout(res, delay))	444✔
26	const limit = 6	444✔
27
28	const acquireSemaphore = async (file: File) => {	444✔
29	const key = FileUploadTools.key(file)	104✔
30	setSemaphore((x) => (x.size >= limit ? x : x.add(key)))	104✔
31	while (!semaphore.has(key)) {	104✔
32	await sleep(500)	38✔
UNCOV 33	setSemaphore((x) => (x.size >= limit ? x : x.add(key)))	×
34	}
35	}
36
37	const releaseSemaphore = (file: File) => {	444✔
38	setSemaphore((x) => {	47✔
39	x.delete(FileUploadTools.key(file))	40✔
40	return x	40✔
41	})
42	}
43
44	const fileUploadFinished = (file: File) => {	444✔
45	const key = FileUploadTools.key(file)	40✔
46	setUploadFinished((x) => x.add(key))	40✔
47	setUploadingToCancelMap((x) => {	40✔
48	x.delete(key)	33✔
49	return x	33✔
50	})
51	releaseSemaphore(file)	40✔
52	}
53
54	const uploadOneFile = (file: File) => {	444✔
55	const key = FileUploadTools.key(file)	66✔
56	if (uploadingToCancelMap.has(key) \|\| uploadFinished.has(key)) {	66!
57	return	×
58	}
59	setState(FileUploadTools.showProgressBar(file, fileUploaderState))	66✔
60	const cancel = uploadFile(	66✔
61	fileRepository,
62	dataset?.persistentId as string,
63	file,
64	() => {
65	setState(FileUploadTools.done(file, fileUploaderState))	29✔
66	fileUploadFinished(file)	29✔
67	},
68	() => {
69	setState(FileUploadTools.failed(file, fileUploaderState))	11✔
70	fileUploadFinished(file)	11✔
71	},
72	(now) => setState(FileUploadTools.progress(file, now, fileUploaderState))	159✔
73	)
74	setUploadingToCancelMap((x) => x.set(key, cancel))	66✔
75	}
76
77	const upload = async (files: File[]) => {	444✔
78	for (const file of files) {	421✔
79	const key = FileUploadTools.key(file)	748✔
80	if (!uploadingToCancelMap.has(key) && !uploadFinished.has(key)) {	748✔
81	await acquireSemaphore(file)	104✔
82	uploadOneFile(file)	66✔
83	}
84	}
85	}
86
87	const cancelUpload = (file: File) => {	444✔
88	const key = FileUploadTools.key(file)	7✔
89	const cancel = uploadingToCancelMap.get(key)	7✔
90	if (cancel) {	7✔
91	cancel()	7✔
92	releaseSemaphore(file)	7✔
93	}
94	setUploadingToCancelMap((x) => {	7✔
95	x.delete(key)	7✔
96	return x	7✔
97	})
98	setState(FileUploadTools.removed(file, fileUploaderState))	7✔
99	}
100
101	useEffect(() => {	444✔
102	setIsLoading(isLoading)	154✔
103	}, [isLoading, setIsLoading])
104
105	if (isLoading) {	444✔
106	return <p>Temporary Loading until having shape of skeleton</p>	77✔
107	}
108
109	return (	367✔
110	<>
111	{!dataset ? (	367✔
112	<PageNotFound />
113	) : (
114	<>
115	<BreadcrumbsGenerator
116	hierarchy={dataset.hierarchy}
117	withActionItem
118	actionItemText={t('breadcrumbActionItem')}
119	/>
120	<article>
121	<FileUploader
122	upload={upload}
123	cancelTitle={t('cancel')}
124	info={t('info')}
125	selectText={t('select')}
126	fileUploaderState={fileUploaderState}
127	cancelUpload={cancelUpload}
128	/>
129	</article>
130	</>
131	)}
132	</>
133	)
134	}	12✔

IQSS / dataverse-frontend / 9796181691

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