All: Seperate allPossibleCategories to @joplin/lib #6754
Merged
Conversation
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
laurent22
reviewed
Aug 17, 2022
packages/generator-joplin/generators/app/templates/webpack.config.js
Outdated
Show resolved
Hide resolved
packages/generator-joplin/generators/app/templates/package_TEMPLATE.json
Outdated
Show resolved
Hide resolved
|
Ok I think it's good now. If you could fix the conflict we can merge. |
|
I‘ve fixed the conflict now. |
| @@ -73,7 +73,7 @@ function validateCategories(categories) { | |||
| if (!categories) return null; | |||
| if ((categories.length !== new Set(categories).size)) throw new Error('Repeated categories are not allowed'); | |||
| categories.forEach(category => { | |||
| if (!allPossibleCategories.includes(category)) throw new Error(`${category} is not a valid category. Please make sure that the category name is lowercase. Valid Categories are: \n${allPossibleCategories}\n`); | |||
| if (!allPossibleCategories.map(category => { return category.name; }).includes(category)) throw new Error(`${category} is not a valid category. Please make sure that the category name is lowercase. Valid Categories are: \n${allPossibleCategories}\n`); | |||
There was a problem hiding this comment.
Suggested change
| if (!allPossibleCategories.map(category => { return category.name; }).includes(category)) throw new Error(`${category} is not a valid category. Please make sure that the category name is lowercase. Valid Categories are: \n${allPossibleCategories}\n`); | |
| if (!allPossibleCategories.map(category => { return category.name; }).includes(category)) throw new Error(`${category} is not a valid category. Please make sure that the category name is lowercase. Valid categories are: \n${allPossibleCategories}\n`); |
There was a problem hiding this comment.
And also ${category.name} is not a valid category.
There was a problem hiding this comment.
I fixed these typo now.
|
Any update here @Retr0ve? There's not much code but so many mistakes |
Retr0ve
force-pushed
the
dev-category
branch
from
827c220
to
3d3b870
Compare
|
Thx for checking. I've updated the code. |
laurent22
reviewed
Sep 6, 2022
| @@ -73,7 +73,7 @@ function validateCategories(categories) { | |||
| if (!categories) return null; | |||
| if ((categories.length !== new Set(categories).size)) throw new Error('Repeated categories are not allowed'); | |||
| categories.forEach(category => { | |||
| if (!allPossibleCategories.includes(category)) throw new Error(`${category} is not a valid category. Please make sure that the category name is lowercase. Valid Categories are: \n${allPossibleCategories}\n`); | |||
| if (!allPossibleCategories.map(category => { return category.name; }).includes(category)) throw new Error(`${category.name} is not a valid category. Please make sure that the category name is lowercase. Valid categories are: \n${allPossibleCategories}\n`); | |||
There was a problem hiding this comment.
throw new Error(`${category.name}
In fact it should be "category" here, not "category.name", isn't it? It doesn't look like you have tested or even read your code at all. I made a mistake by suggesting this change, but you need to be responsible for what you're doing and not rely on reviewers.
There was a problem hiding this comment.
tested and fixed now
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
To better maintain the plugin categories, I separate allPossibleCategories variable from webpack script to a json file under @joplin/lib.