Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/files-and-videos/files-page/CourseFilesTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
updateAssetOrder,
validateAssetFiles,
} from '@src/files-and-videos/files-page/data/thunks';
import { updateEditStatus, updateErrors } from '@src/files-and-videos/files-page/data/slice';
import FileInfoModalSidebar from '@src/files-and-videos/files-page/FileInfoModalSidebar';
import FileThumbnail from '@src/files-and-videos/files-page/FileThumbnail';
import FileValidationModal from '@src/files-and-videos/files-page/FileValidationModal';
Expand All @@ -22,6 +23,8 @@ import {
} from '@src/files-and-videos/generic';
import { useModels } from '@src/generic/model-store';
import { DeprecatedReduxState } from '@src/store';
import { RequestStatus } from '@src/data/constants';
import { UPLOAD_FILE_MAX_SIZE } from '@src/constants';
import { getFileSizeToClosestByte } from '@src/utils';
import React from 'react';
import { useDispatch, useSelector } from 'react-redux';
Expand Down Expand Up @@ -63,6 +66,18 @@ export const CourseFilesTable = () => {
const handleFileOrder = ({ newFileIdOrder }) => {
dispatch(updateAssetOrder(courseId, newFileIdOrder));
};
const maxFileSize = UPLOAD_FILE_MAX_SIZE;
const maxFileSizeInMB = Math.round(maxFileSize / (1024 * 1024));
const handleFileSizeError = (invalidFiles) => {
handleErrorReset({ errorType: 'add' });
dispatch(updateEditStatus({ editType: 'add', status: RequestStatus.FAILED }));
invalidFiles.forEach((file) => {
dispatch(updateErrors({
error: 'add',
message: `File ${file.name} exceeds maximum size of ${maxFileSizeInMB} MB.`,
}));
});
};

const thumbnailPreview = (props) => FileThumbnail(props);
const infoModalSidebar = (asset) => FileInfoModalSidebar({
Expand All @@ -81,7 +96,6 @@ export const CourseFilesTable = () => {
usageErrorMessages: errorMessages.usageMetrics,
fileType: 'file',
};
const maxFileSize = 1 * 1024 * 1024 * 1024;

const activeColumn = {
id: 'activeStatus',
Expand Down Expand Up @@ -176,6 +190,7 @@ export const CourseFilesTable = () => {
handleUsagePaths,
handleErrorReset,
handleFileOrder,
handleFileSizeError,
tableColumns,
maxFileSize,
thumbnailPreview,
Expand Down
25 changes: 22 additions & 3 deletions src/files-and-videos/generic/FileInput.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,33 @@ export const useFileInput = ({
onAddFile,
setSelectedRows,
setAddOpen,
maxFileSize,
onFileSizeError,
}) => {
const ref = React.useRef();
const click = () => ref.current.click();
const addFile = (e) => {
const { files } = e.target;
setSelectedRows([...files]);
onAddFile(Object.values(files));
setAddOpen();
const fileArray = Object.values(files);

if (maxFileSize) {
const validFiles = fileArray.filter(file => file.size <= maxFileSize);
const invalidFiles = fileArray.filter(file => file.size > maxFileSize);

if (invalidFiles.length > 0 && onFileSizeError) {
onFileSizeError(invalidFiles);
}

if (validFiles.length > 0) {
setSelectedRows(validFiles);
onAddFile(validFiles);
setAddOpen();
}
} else {
setSelectedRows(fileArray);
onAddFile(fileArray);
setAddOpen();
}
e.target.value = '';
};
return {
Expand Down
5 changes: 5 additions & 0 deletions src/files-and-videos/generic/FileTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const FileTable = ({
handleUsagePaths,
handleErrorReset,
handleFileOrder,
handleFileSizeError,
tableColumns,
maxFileSize,
thumbnailPreview,
Expand Down Expand Up @@ -133,6 +134,8 @@ const FileTable = ({
onAddFile: (uploads) => handleAddFile(uploads),
setSelectedRows,
setAddOpen,
maxFileSize,
onFileSizeError: handleFileSizeError,
});
const handleDropzoneAsset = ({ fileData, handleError }) => {
try {
Expand Down Expand Up @@ -384,6 +387,7 @@ FileTable.propTypes = {
handleLockFile: PropTypes.func,
handleErrorReset: PropTypes.func.isRequired,
handleFileOrder: PropTypes.func.isRequired,
handleFileSizeError: PropTypes.func,
tableColumns: PropTypes.arrayOf(PropTypes.shape({
Header: PropTypes.string,
accessor: PropTypes.string,
Expand All @@ -396,6 +400,7 @@ FileTable.propTypes = {
FileTable.defaultProps = {
files: null,
handleLockFile: () => {},
handleFileSizeError: () => {},
};

export default FileTable;
Loading