Skip to content

Add files existence and length check so validation is run later #3647

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.

Sign up for GitHub

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

Merged
bjester merged 3 commits into from
Sep 16, 2022
Merged

Add files existence and length check so validation is run later #3647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08bbbff
Add files existance and length check so validation is run after files…
marcellamaki Sep 16, 2022
d8b8ffa
Add condition for no files
marcellamaki Sep 16, 2022
055a248
Remove test, revert changes
marcellamaki Sep 16, 2022
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
12 changes: 7 additions & 5 deletions contentcuration/contentcuration/frontend/shared/utils/validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,11 +373,13 @@ export function getNodeDetailsErrors(node) {
* @returns {Array} An array of error codes.
*/
export function getNodeFilesErrors(files) {
let errors = files.filter(f => f.error).map(f => f.error);
let validPrimaryFiles = files.filter(f => !f.error && !f.preset.supplementary);

if (!validPrimaryFiles.length) {
errors.push(ValidationErrors.NO_VALID_PRIMARY_FILES);
let errors = [];
if (files && files.length > 0) {
errors = files.filter(f => f.error).map(f => f.error);
let validPrimaryFiles = files.filter(f => !f.error && !f.preset.supplementary);
if (!validPrimaryFiles.length) {
errors.push(ValidationErrors.NO_VALID_PRIMARY_FILES);
}
}
return errors;
}
Expand Down
4 changes: 0 additions & 4 deletions contentcuration/contentcuration/frontend/shared/utils/validation.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,10 +540,6 @@ describe('channelEdit utils', () => {
expect(isNodeComplete({ nodeDetails: invalidNodeDetails, files })).toBe(false);
});

it('returns false if there are no files', () => {
expect(isNodeComplete({ nodeDetails, files: [] })).toBe(false);
});

it('returns false if there is at least one invalid file', () => {
const invalidFile = { id: 'file-id', error: 'error' };
expect(isNodeComplete({ nodeDetails, files: [...files, invalidFile] })).toBe(false);
Expand Down