Skip to content
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

modify invalid slug errors and add test #113

Merged
merged 2 commits into from
Oct 20, 2020
Merged

modify invalid slug errors and add test #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02cad21
modify invalid slug errors and add test
ddhar28 Oct 15, 2020
6296872
update package version
ddhar28 Oct 20, 2020
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
20 changes: 10 additions & 10 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 3 additions & 11 deletions client/src/migrator/validator-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function formErrorFile(errorAggregations) {
}

function parseResult (result) {
const { dataType, total, successful, failed, additionalProperties, type, required, enum: wrongEnumValue, minLength, maxLength, exceptions, minItems, uniqueKey, invalidURL, invalidSlug, invalidTimestamp, oldTimestamp, invalidEmail, authorNamesMismatch, pattern, invalidHeroImage} = result
const { dataType, total, successful, failed, additionalProperties, type, required, enum: wrongEnumValue, minLength, maxLength, exceptions, minItems, uniqueKey, invalidURL, invalidTimestamp, oldTimestamp, invalidEmail, authorNamesMismatch, pattern, invalidHeroImage} = result
const finalResult = {}
finalResult.errors = []
finalResult.warnings = []
Expand All @@ -93,7 +93,7 @@ function parseResult (result) {
return finalResult
}

const errorFileLink = formErrorFile({ exceptions, type, required, wrongEnumValue, minLength, maxLength, minItems, uniqueKey, invalidURL, additionalProperties, invalidSlug, invalidTimestamp, oldTimestamp, invalidEmail, authorNamesMismatch, pattern, invalidHeroImage })
const errorFileLink = formErrorFile({ exceptions, type, required, wrongEnumValue, minLength, maxLength, minItems, uniqueKey, invalidURL, additionalProperties, invalidTimestamp, oldTimestamp, invalidEmail, authorNamesMismatch, pattern, invalidHeroImage })
finalResult.errorFile = errorFileLink
const pluralKey = dataType === 'Story' ? `${dataType.toLowerCase().slice(0, 4)}ies` : `${dataType.toLowerCase()}s`
finalResult.dataType = pluralKey
Expand Down Expand Up @@ -187,7 +187,7 @@ function parseResult (result) {
pattern && pattern.forEach(error => {
const [key, stringPattern] = error.key.split(':')
finalResult.errors.push({
message: `Story has incorrect HTML string for property '${key}'.`,
message: `${dataType} has invalid string pattern for property '${key}'.`,
metadata: formErrorMetadata(dataType, error.ids)
})
})
Expand All @@ -208,14 +208,6 @@ function parseResult (result) {
})
})

invalidSlug && invalidSlug.forEach(error => {
const [key, value] = error.key.split(':')
finalResult.errors.push({
message: `${key} '${value}' is invalid.`,
metadata: formErrorMetadata(dataType, error.ids)
})
})

invalidEmail && invalidEmail.forEach(error => {
const [key, value] = error.key.split(':')
finalResult.errors.push({
Expand Down
Loading