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

Simplify addEntityToModule and document better addAdminRoute.pageTitle #13198

Merged
merged 1 commit into from
Dec 6, 2020

Conversation

kaidohallik
Copy link
Contributor

Follow up to #13194 - changes after review from @mshima


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

When you are still working on the PR, consider converting it to Draft (bellow reviewers) and adding skip-ci label, you can still see CI build result at your branch.

generators/generator-base.js Outdated Show resolved Hide resolved
@kaidohallik kaidohallik changed the title Simplify entity route page title logic in Angular Simplify addEntityToModule and document better addAdminRoute.pageTitle Dec 5, 2020
Copy link
Member

@mshima mshima left a comment

Choose a reason for hiding this comment

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

LGTM

@mshima mshima merged commit b96eac8 into jhipster:main Dec 6, 2020
@kaidohallik kaidohallik deleted the simplify-page-title-in-route branch December 6, 2020 06:47
@pascalgrimaud
Copy link
Member

@mshima @kaidohallik : all the JDL builds failed, with this stacktrace:

src/main/webapp/app/entities/entity-routing.module.ts:20:88 - error TS2339: Property 'ProductRoutingModule' does not exist on type 'typeof import("/home/runner/app/store/src/main/webapp/app/entities/crm/product/product-routing.module")'.

20         loadChildren: () => import('./crm/product/product-routing.module').then(m => m.ProductRoutingModule),
                                                                                          ~~~~~~~~~~~~~~~~~~~~
src/main/webapp/app/entities/entity-routing.module.ts:25:90 - error TS2339: Property 'CustomerRoutingModule' does not exist on type 'typeof import("/home/runner/app/store/src/main/webapp/app/entities/crm/customer/customer-routing.module")'.

25         loadChildren: () => import('./crm/customer/customer-routing.module').then(m => m.CustomerRoutingModule),

Can one of you have a look plz?
See:

@kaidohallik
Copy link
Contributor Author

microserviceName is missing from this in generator-base.js but is available in files.js (other variables are available in both places). So reverting partially this PR in the new PR shortly.

@mshima
Copy link
Member

mshima commented Dec 6, 2020

That's strange.
Not sure why this happened.

@kaidohallik
Copy link
Contributor Author

Now I checked one more time and problem is that the parameter name is microServiceName but variable in this is microserviceName and I used variable name from this with uppercase S.
Should I create new simplification PR where correct variable name microserviceName is used?

@kaidohallik
Copy link
Contributor Author

I'll create PR where I rename also all other microServiceName occurrences to microserviceName to avoid such issues in the future.

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.

None yet

3 participants