-
Notifications
You must be signed in to change notification settings - Fork 87
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.
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
add custom validation #707
Merged
AllanOXDi
merged 2 commits into
learningequality:develop
from
AllanOXDi:Custom-validations
Aug 1, 2024
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
---|---|---|
|
@@ -72,6 +72,30 @@ | |
|
||
import BaseCard from './BaseCard.vue'; | ||
|
||
const Layouts = { | ||
HORIZONTAL: 'horizontal', | ||
VERTICAL: 'vertical', | ||
}; | ||
|
||
const Thumbnail_Displays = { | ||
NONE: 'none', | ||
SMALL: 'small', | ||
LARGE: 'large', | ||
}; | ||
|
||
function cardValidator(allowedValues, propName) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Neat :) |
||
return function(value) { | ||
if (!Object.values(allowedValues).includes(value)) { | ||
throw new Error( | ||
`Invalid ${propName} value: '${value}'. Allowed values are: ${Object.values( | ||
allowedValues | ||
).join(', ')}` | ||
); | ||
} | ||
return true; | ||
}; | ||
} | ||
|
||
export default { | ||
name: 'KCard', | ||
components: { BaseCard }, | ||
|
@@ -110,15 +134,16 @@ | |
layout: { | ||
type: String, | ||
default: 'horizontal', | ||
validator: cardValidator(Layouts, 'layout'), | ||
}, | ||
/** | ||
* Controls how the thumbnail appears in the card. | ||
* Expected Options: 'none' (default), 'small', or 'large'. | ||
* */ | ||
thumbnailDisplay: { | ||
type: String, | ||
required: false, | ||
default: 'none', | ||
validator: cardValidator(Thumbnail_Displays, 'thumbnailDisplay'), | ||
}, | ||
/** | ||
* Sets the thumbnail path. | ||
|
@@ -160,13 +185,13 @@ | |
return this.stylesAndClasses.thumbnailStyles; | ||
}, | ||
/* | ||
Returns dynamic classes and few style-like data that CSS was cumbersome/impossible to use for ,or are in need of using theme, grouped by all possible combinations of layouts. | ||
Returns dynamic classes and few style-like data that CSS was cumbersome/impossible to use for ,or are in need of using theme, grouped by all possible combinations of layouts. | ||
|
||
New styles and classes are meant to be added to this single-source-of-truth object so | ||
that we can easily locate all styling being applied to a particular layout | ||
New styles and classes are meant to be added to this single-source-of-truth object so | ||
that we can easily locate all styling being applied to a particular layout | ||
|
||
Could be further simplified by using solely dynamic styles, but that would have detrimental effects on our auto RTL machinery and we would need to take care manually of more places. | ||
*/ | ||
Could be further simplified by using solely dynamic styles, but that would have detrimental effects on our auto RTL machinery and we would need to take care manually of more places. | ||
*/ | ||
stylesAndClasses() { | ||
/* In px. Needs to be the same as $spacer variable in styles part */ | ||
const SPACER = 24; | ||
|
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.
Seems like a merge conflict? I think this change should stay here.
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.
Yep! resolving it
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.
Fixed now!