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.

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

Entity blueprint: allow blueprints to create custom configs. #10163

Merged
merged 2 commits into from
Sep 20, 2019

Conversation

mshima
Copy link
Member

@mshima mshima commented Jul 31, 2019

Fixes #10162

  • Please make sure the below checklist is followed for Pull Requests.

  • Travis tests are green

  • Tests are added where necessary

  • Documentation is added/updated where necessary

  • Coding Rules & Commit Guidelines as per our CONTRIBUTING.md document are followed

@mshima mshima force-pushed the use_existing_data branch 2 times, most recently from d702234 to 5d0db8b Compare August 8, 2019 05:14
@mshima mshima changed the title Entity: Use existing data if already defined. Entity blueprint: allow blueprints to create custom configs. Aug 20, 2019
Copy link
Contributor

@pvliss pvliss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

generators/entity/index.js Outdated Show resolved Hide resolved
Copy link
Contributor

@murdos murdos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you resolve conflicts and handle my suggestions? Then we'll be ready to merge that.
Thanks!

test/blueprint/entity-blueprint.spec.js Outdated Show resolved Hide resolved
test/blueprint/entity-blueprint.spec.js Outdated Show resolved Hide resolved
@mshima
Copy link
Member Author

mshima commented Sep 20, 2019

@murdos done. Thanks.

@murdos
Copy link
Contributor

murdos commented Sep 20, 2019

@mshima You need to lint fix the unit test source file, build is failing because of that: https://travis-ci.org/jhipster/generator-jhipster/jobs/587294729

Make tests cases more precise by testing keys and values.

Co-Authored-By: Aurélien Mino <aurelien.mino@gmail.com>

lint fix
@murdos murdos merged commit 7a43da8 into jhipster:master Sep 20, 2019
@jdubois jdubois added this to the 6.3.1 milestone Sep 20, 2019
@mshima
Copy link
Member Author

mshima commented Sep 20, 2019

@murdos thanks.

@mshima mshima deleted the use_existing_data branch September 20, 2019 12:38
@murdos murdos removed their assignment Oct 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Entity module always override blueprint's custom config.
5 participants