EES-5544 Change data set import page accordions into a table #5459
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| @import '~govuk-frontend/dist/govuk/base'; | ||
|
|
||
| .table { | ||
| td { | ||
| padding-bottom: govuk-spacing(2); | ||
| padding-top: govuk-spacing(2); | ||
| vertical-align: middle; | ||
| } | ||
|
|
||
| .fileSize { | ||
| width: 5rem; | ||
| text-align: right; | ||
| } | ||
|
|
||
| .fileStatus { | ||
| max-width: 164px; | ||
| } | ||
|
|
||
| .actions { | ||
| margin-bottom: 0; | ||
| } | ||
|
Comment on lines
+10
to
+21
There was a problem hiding this comment. As we're using CSS modules, no need to nest these under the |
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,239 @@ | ||
| import Link from '@admin/components/Link'; | ||
| import DataFileDetailsTable from '@admin/pages/release/data/components/DataFileDetailsTable'; | ||
| import DataUploadCancelButton from '@admin/pages/release/data/components/DataUploadCancelButton'; | ||
| import ImporterStatus, { | ||
| terminalImportStatuses, | ||
| } from '@admin/pages/release/data/components/ImporterStatus'; | ||
| import { | ||
| releaseApiDataSetDetailsRoute, | ||
| releaseDataFileReplaceRoute, | ||
| ReleaseDataFileReplaceRouteParams, | ||
| releaseDataFileRoute, | ||
| ReleaseDataFileRouteParams, | ||
| ReleaseDataSetRouteParams, | ||
| } from '@admin/routes/releaseRoutes'; | ||
| import { | ||
| DataFile, | ||
| DataFileImportStatus, | ||
| } from '@admin/services/releaseDataFileService'; | ||
| import ButtonGroup from '@common/components/ButtonGroup'; | ||
| import ButtonText from '@common/components/ButtonText'; | ||
| import Modal from '@common/components/Modal'; | ||
| import ReorderableList from '@common/components/ReorderableList'; | ||
| import reorder from '@common/utils/reorder'; | ||
| import React, { useEffect, useState } from 'react'; | ||
| import { generatePath } from 'react-router'; | ||
| import styles from './DataFilesTable.module.scss'; | ||
|
|
||
| interface Props { | ||
| dataFiles: DataFile[]; | ||
| publicationId: string; | ||
| releaseId: string; | ||
| canUpdateRelease?: boolean; | ||
| isReordering: boolean; | ||
| onCancelReordering: () => void; | ||
| onConfirmReordering: (nextSeries: DataFile[]) => void; | ||
| onDeleteFile: (dataFile: DataFile) => Promise<void>; | ||
| onStatusChange: ( | ||
| dataFile: DataFile, | ||
| { totalRows, status }: DataFileImportStatus, | ||
| ) => Promise<void>; | ||
| } | ||
|
|
||
| const DataFilesTable = ({ | ||
|
There was a problem hiding this comment. Could change to use |
||
| dataFiles: initialDataFiles, | ||
| publicationId, | ||
| releaseId, | ||
| canUpdateRelease, | ||
| isReordering, | ||
| onCancelReordering, | ||
| onConfirmReordering, | ||
| onDeleteFile, | ||
| onStatusChange, | ||
| }: Props) => { | ||
| const [dataFiles, setDataFiles] = useState(initialDataFiles); | ||
|
|
||
| useEffect(() => { | ||
| setDataFiles(initialDataFiles); | ||
| }, [initialDataFiles]); | ||
|
|
||
| if (isReordering) { | ||
| return ( | ||
| <ReorderableList | ||
| heading="Reorder data files" | ||
| id="dataFiles" | ||
| list={dataFiles.map(({ id, title }) => ({ | ||
| id, | ||
| label: title, | ||
| }))} | ||
| onCancel={() => { | ||
| setDataFiles(initialDataFiles); | ||
| onCancelReordering(); | ||
| }} | ||
| onConfirm={() => onConfirmReordering(dataFiles)} | ||
| onMoveItem={({ prevIndex, nextIndex }) => { | ||
| const reordered = reorder(dataFiles, prevIndex, nextIndex); | ||
| setDataFiles(reordered); | ||
| }} | ||
| onReverse={() => { | ||
| setDataFiles(dataFiles.toReversed()); | ||
| }} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <table className={styles.table} data-testid="Data files table"> | ||
| <thead> | ||
| <tr> | ||
| <th scope="col">Subject title</th> | ||
|
There was a problem hiding this comment. We've moved away from referencing things as 'subject' quite a while (like years) ago but never got around to updating the data uploads page to reflect this. Would suggest that we change this to just 'Title' and also update other parts of the UI accordingly as well e.g. The upload form's title input field:
The details modal:
|
||
| <th scope="col">Size</th> | ||
| <th scope="col">Status</th> | ||
| <th scope="col">Actions</th> | ||
| </tr> | ||
| </thead> | ||
|
|
||
| <tbody> | ||
| {dataFiles.map(dataFile => ( | ||
| <tr key={dataFile.title}> | ||
| <td data-testid="Subject title">{dataFile.title}</td> | ||
|
There was a problem hiding this comment. Might be good to add a
It'd be nice to stop the action buttons wrapping e.g.
|
||
| <td data-testid="Data file size" className={styles.fileSize}> | ||
| {dataFile.fileSize.size.toLocaleString()} {dataFile.fileSize.unit} | ||
| </td> | ||
| <td data-testid="Status"> | ||
| <ImporterStatus | ||
| className={styles.fileStatus} | ||
| releaseId={releaseId} | ||
| dataFile={dataFile} | ||
| onStatusChange={onStatusChange} | ||
| /> | ||
| </td> | ||
|
Comment on lines
+103
to
+110
There was a problem hiding this comment. Currently looks a bit horrible when a data replacement is in progress as we get a horrible big blue box. Think we could get rid of the 'Data' part of the replacement label so we don't get wrapping over 3 lines:
|
||
| <td data-testid="Actions"> | ||
| <ButtonGroup className={styles.actions}> | ||
|
There was a problem hiding this comment. At smaller screen sizes, having the buttons in a row quickly breaks down:
We should style the group so that it moves into the column layout sooner:
|
||
| <Modal | ||
| showClose | ||
| title="Data file details" | ||
| triggerButton={<ButtonText>View details</ButtonText>} | ||
| > | ||
| <DataFileDetailsTable | ||
| dataFile={dataFile} | ||
| releaseId={releaseId} | ||
| onStatusChange={onStatusChange} | ||
| /> | ||
| </Modal> | ||
| {canUpdateRelease && | ||
| terminalImportStatuses.includes(dataFile.status) && ( | ||
| <> | ||
| {dataFile.status === 'COMPLETE' && ( | ||
| <> | ||
| <Link | ||
| to={generatePath<ReleaseDataFileRouteParams>( | ||
| releaseDataFileRoute.path, | ||
| { | ||
| publicationId, | ||
| releaseId, | ||
| fileId: dataFile.id, | ||
| }, | ||
| )} | ||
| > | ||
| Edit title | ||
|
There was a problem hiding this comment. At mobile, seems like the alignment of this isn't quite right:
Seems like we need to adjust the styling in |
||
| </Link> | ||
| {dataFile.publicApiDataSetId ? ( | ||
| <Modal | ||
| showClose | ||
| title="Cannot replace data" | ||
| triggerButton={ | ||
| <ButtonText>Replace data</ButtonText> | ||
|
There was a problem hiding this comment. At smaller screens the word 'Replace' breaks across multiple lines and it looks quite weird:
|
||
| } | ||
| > | ||
| <p> | ||
| This data file has an API data set linked to it. | ||
| Please remove the API data set before replacing | ||
| the data. | ||
| </p> | ||
| <p> | ||
| <Link | ||
| to={generatePath<ReleaseDataSetRouteParams>( | ||
| releaseApiDataSetDetailsRoute.path, | ||
| { | ||
| publicationId, | ||
| releaseId, | ||
| dataSetId: dataFile.publicApiDataSetId, | ||
| }, | ||
| )} | ||
| > | ||
| Go to API data set | ||
| </Link> | ||
| </p> | ||
| </Modal> | ||
| ) : ( | ||
| <Link | ||
| to={generatePath<ReleaseDataFileReplaceRouteParams>( | ||
| releaseDataFileReplaceRoute.path, | ||
| { | ||
| publicationId, | ||
| releaseId, | ||
| fileId: dataFile.id, | ||
| }, | ||
| )} | ||
| > | ||
| Replace data | ||
| </Link> | ||
| )} | ||
| </> | ||
| )} | ||
| {dataFile.publicApiDataSetId ? ( | ||
| <Modal | ||
| showClose | ||
| title="Cannot delete files" | ||
| triggerButton={ | ||
| <ButtonText className="govuk-!-margin-left-3"> | ||
| Delete files | ||
| </ButtonText> | ||
| } | ||
| > | ||
| <p> | ||
| This data file has an API data set linked to it. | ||
| Please remove the API data set before deleting. | ||
| </p> | ||
| <p> | ||
| <Link | ||
| to={generatePath<ReleaseDataSetRouteParams>( | ||
| releaseApiDataSetDetailsRoute.path, | ||
| { | ||
| publicationId, | ||
| releaseId, | ||
| dataSetId: dataFile.publicApiDataSetId, | ||
| }, | ||
| )} | ||
| > | ||
| Go to API data set | ||
| </Link> | ||
| </p> | ||
| </Modal> | ||
| ) : ( | ||
| <ButtonText | ||
| onClick={() => onDeleteFile(dataFile)} | ||
| variant="warning" | ||
| > | ||
| Delete files | ||
| </ButtonText> | ||
| )} | ||
| </> | ||
| )} | ||
| {dataFile.permissions.canCancelImport && ( | ||
| <DataUploadCancelButton | ||
| releaseId={releaseId} | ||
| fileId={dataFile.id} | ||
| /> | ||
| )} | ||
| </ButtonGroup> | ||
| </td> | ||
| </tr> | ||
| ))} | ||
| </tbody> | ||
| </table> | ||
| ); | ||
| }; | ||
|
|
||
| export default DataFilesTable; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure we need this padding?
The default
tdstyling already includes identical vertical padding so this seems redudnant.