generator-jhipster 7.3.0 → 7.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (340) hide show
  1. package/cli/import-jdl.js +3 -2
  2. package/cli/jhipster-command.js +2 -2
  3. package/cli/program.js +32 -29
  4. package/generators/app/index.js +46 -27
  5. package/generators/aws/index.js +8 -8
  6. package/generators/aws/lib/eb.js +1 -1
  7. package/generators/azure-app-service/index.js +16 -9
  8. package/generators/azure-app-service/templates/github/workflows/azure-app-service.yml.ejs +2 -2
  9. package/generators/azure-spring-cloud/index.js +16 -9
  10. package/generators/azure-spring-cloud/templates/github/workflows/azure-spring-cloud.yml.ejs +2 -2
  11. package/generators/bootstrap/index.js +57 -62
  12. package/generators/ci-cd/index.js +11 -8
  13. package/generators/ci-cd/templates/github-actions.yml.ejs +1 -1
  14. package/generators/ci-cd/templates/travis.yml.ejs +9 -4
  15. package/generators/cleanup.js +27 -171
  16. package/generators/client/files-angular.js +12 -1
  17. package/generators/client/files-common.js +6 -2
  18. package/generators/client/files-react.js +13 -2
  19. package/generators/client/files-vue.js +59 -7
  20. package/generators/client/index.js +46 -32
  21. package/generators/client/needle-api/needle-client-angular.js +1 -1
  22. package/generators/client/needle-api/needle-client-vue.js +57 -7
  23. package/generators/client/templates/angular/.eslintrc.json.ejs +1 -0
  24. package/generators/client/templates/angular/angular.json.ejs +5 -0
  25. package/generators/client/templates/angular/jest.conf.js.ejs +2 -0
  26. package/generators/client/templates/angular/package.json +29 -29
  27. package/generators/client/templates/angular/package.json.ejs +3 -1
  28. package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +52 -54
  29. package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.ts.ejs +4 -4
  30. package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs +65 -0
  31. package/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +35 -37
  32. package/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +1 -1
  33. package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs +78 -80
  34. package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.ts.ejs +4 -4
  35. package/generators/client/templates/angular/src/main/webapp/app/account/password/password.service.spec.ts.ejs +41 -0
  36. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +73 -75
  37. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +4 -4
  38. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts.ejs +62 -0
  39. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +44 -46
  40. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs +61 -0
  41. package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs +122 -123
  42. package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs +1 -1
  43. package/generators/client/templates/angular/src/main/webapp/app/account/register/register.service.spec.ts.ejs +66 -0
  44. package/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +75 -77
  45. package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +80 -80
  46. package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +48 -50
  47. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +45 -47
  48. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs +4 -4
  49. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +66 -0
  50. package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs +99 -101
  51. package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +61 -63
  52. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +2 -2
  53. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +28 -30
  54. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +35 -37
  55. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +40 -42
  56. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +89 -91
  57. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +4 -4
  58. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +81 -83
  59. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs +8 -8
  60. package/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs +14 -3
  61. package/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs +8 -29
  62. package/generators/client/templates/angular/src/main/webapp/app/config/datepicker-adapter.ts.ejs +1 -1
  63. package/generators/client/templates/angular/src/main/webapp/app/config/dayjs.ts.ejs +4 -4
  64. package/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +14 -9
  65. package/generators/client/templates/angular/src/main/webapp/app/core/tracker/tracker.service.ts.ejs +6 -6
  66. package/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.ejs +1 -1
  67. package/generators/client/templates/angular/src/main/webapp/app/entities/entity-navbar-items.ts.ejs +29 -0
  68. package/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs +106 -98
  69. package/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +166 -168
  70. package/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs +1 -1
  71. package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +20 -0
  72. package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +74 -70
  73. package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +41 -2
  74. package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs +27 -29
  75. package/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs +114 -115
  76. package/generators/client/templates/angular/src/main/webapp/app/login/login.component.ts.ejs +4 -4
  77. package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs +132 -134
  78. package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +29 -31
  79. package/generators/client/templates/angular/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs +4 -4
  80. package/generators/client/templates/angular/src/main/webapp/app/shared/date/duration.pipe.ts.ejs +1 -1
  81. package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs +1 -1
  82. package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs +1 -1
  83. package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs +1 -1
  84. package/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs +1 -1
  85. package/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs +6 -6
  86. package/generators/client/templates/angular/src/main/webapp/app/shared/language/translation.module.ts.ejs +83 -0
  87. package/generators/client/templates/angular/src/main/webapp/declarations.d.ts.ejs +16 -2
  88. package/generators/client/templates/angular/tsconfig.json.ejs +2 -0
  89. package/generators/client/templates/angular/tsconfig.spec.json.ejs +0 -1
  90. package/generators/client/templates/angular/webpack/proxy.conf.js.ejs +0 -2
  91. package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +0 -16
  92. package/generators/client/templates/angular/webpack/webpack.microfrontend.js.ejs +12 -5
  93. package/generators/client/templates/common/package.json +6 -6
  94. package/generators/client/templates/common/src/main/webapp/robots.txt.ejs +0 -1
  95. package/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs +86 -56
  96. package/generators/client/templates/common/webpack/webpack.microfrontend.js.jhi.ejs +56 -0
  97. package/generators/client/templates/react/.eslintrc.json.ejs +1 -0
  98. package/generators/client/templates/react/package.json +54 -53
  99. package/generators/client/templates/react/package.json.ejs +6 -1
  100. package/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +0 -3
  101. package/generators/client/templates/react/src/main/webapp/app/config/axios-interceptor.spec.ts.ejs +3 -2
  102. package/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs +2 -2
  103. package/generators/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +2 -2
  104. package/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs +2 -2
  105. package/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +6 -6
  106. package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +8 -8
  107. package/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs +1 -1
  108. package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.scss.ejs +9 -0
  109. package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs +2 -2
  110. package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs +3 -3
  111. package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +7 -7
  112. package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +1 -1
  113. package/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs +1 -1
  114. package/generators/client/templates/react/webpack/webpack.dev.js.ejs +17 -3
  115. package/generators/client/templates/react/webpack/webpack.prod.js.ejs +13 -1
  116. package/generators/client/templates/vue/.eslintrc.js.ejs +8 -5
  117. package/generators/client/templates/vue/package.json +40 -49
  118. package/generators/client/templates/vue/package.json.ejs +13 -17
  119. package/generators/client/templates/vue/src/main/webapp/app/account/account.service.ts.ejs +23 -12
  120. package/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.vue.ejs +7 -1
  121. package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.vue.ejs +1 -1
  122. package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +1 -1
  123. package/generators/client/templates/vue/src/main/webapp/app/constants.ts.ejs +16 -6
  124. package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +27 -8
  125. package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +6 -0
  126. package/generators/client/templates/vue/src/main/webapp/app/declarations.d.ts.ejs +41 -0
  127. package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.component.ts.ejs +34 -0
  128. package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.vue.ejs +13 -0
  129. package/generators/client/templates/vue/src/main/webapp/app/entities/entities.component.ts.ejs +20 -0
  130. package/generators/client/templates/vue/src/main/webapp/app/entities/entities.vue.ejs +5 -0
  131. package/generators/client/templates/vue/src/main/webapp/app/entities/user/{user.oauth2.service.ts.ejs → user.service.ts.ejs} +1 -1
  132. package/generators/client/templates/vue/{webpack/utils.js.ejs → src/main/webapp/app/index.ts.ejs} +1 -12
  133. package/generators/client/templates/vue/src/main/webapp/app/locale/translation.service.ts.ejs +26 -9
  134. package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +20 -18
  135. package/generators/client/templates/vue/src/main/webapp/app/router/entities.ts.ejs +45 -3
  136. package/generators/client/templates/vue/src/main/webapp/app/router/index.ts.ejs +19 -3
  137. package/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +0 -2
  138. package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +3 -1
  139. package/generators/client/templates/vue/src/main/webapp/app/shims-vue.d.ts.ejs +17 -3
  140. package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs +25 -10
  141. package/generators/client/templates/vue/src/test/javascript/spec/app/account/login-form/login-form.component.spec.ts.ejs +2 -2
  142. package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs +6 -4
  143. package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs +4 -2
  144. package/generators/client/templates/vue/src/test/javascript/spec/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs +10 -4
  145. package/generators/client/templates/vue/src/test/javascript/spec/app/entities/entities-menu.spec.ts.ejs +52 -0
  146. package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.component.ts.ejs +4 -0
  147. package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.vue.ejs +7 -0
  148. package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-router.ts.ejs +1 -0
  149. package/generators/client/templates/vue/src/test/javascript/spec/app/shared/config/axios-interceptor.spec.ts.ejs +0 -1
  150. package/generators/client/templates/vue/tsconfig.json.ejs +6 -10
  151. package/generators/client/templates/vue/tsconfig.spec.json.ejs +37 -0
  152. package/generators/client/templates/vue/webpack/config.js.ejs +50 -0
  153. package/generators/client/templates/vue/webpack/vue.utils.js.ejs +33 -32
  154. package/generators/client/templates/vue/webpack/webpack.common.js.ejs +150 -126
  155. package/generators/client/templates/vue/webpack/webpack.dev.js.ejs +19 -76
  156. package/generators/client/templates/vue/webpack/webpack.microfrontend.js.jhi.vue.ejs +77 -0
  157. package/generators/client/templates/vue/webpack/webpack.prod.js.ejs +5 -41
  158. package/generators/cloudfoundry/index.js +9 -9
  159. package/generators/common/index.js +12 -10
  160. package/generators/common/templates/.prettierrc.ejs +1 -1
  161. package/generators/common/templates/README.md.jhi.ejs +19 -0
  162. package/generators/common/templates/package.json +4 -4
  163. package/generators/cypress/index.js +12 -9
  164. package/generators/cypress/templates/cypress.json.ejs +16 -2
  165. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/login-page.spec.ts.ejs +3 -14
  166. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/password-page.spec.ts.ejs +33 -39
  167. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/register-page.spec.ts.ejs +52 -62
  168. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/reset-password-page.spec.ts.ejs +2 -10
  169. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/settings-page.spec.ts.ejs +25 -34
  170. package/generators/cypress/templates/src/test/javascript/cypress/integration/administration/administration.spec.ts.ejs +1 -22
  171. package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +4 -4
  172. package/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +67 -7
  173. package/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +4 -4
  174. package/generators/cypress/templates/src/test/javascript/cypress/support/index.ts.ejs +1 -6
  175. package/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +1 -1
  176. package/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs +8 -8
  177. package/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs +0 -9
  178. package/generators/database-changelog/index.js +33 -22
  179. package/generators/database-changelog-liquibase/index.js +12 -8
  180. package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +1 -1
  181. package/generators/docker-compose/index.js +11 -12
  182. package/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +1 -1
  183. package/generators/entities/index.js +35 -26
  184. package/generators/entities-client/index.js +10 -7
  185. package/generators/entity/index.js +81 -32
  186. package/generators/entity-client/files.js +7 -16
  187. package/generators/entity-client/index.js +22 -12
  188. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs +42 -44
  189. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs +1 -1
  190. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs +58 -60
  191. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs +1 -35
  192. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.model.ts.ejs +1 -1
  193. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs +4 -4
  194. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs +110 -112
  195. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs +9 -2
  196. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs +8 -8
  197. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs +8 -8
  198. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs +8 -8
  199. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs +15 -6
  200. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs +1 -1
  201. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.spec.ts.ejs +1 -1
  202. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.ts.ejs +1 -1
  203. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs +203 -198
  204. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +5 -5
  205. package/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs +1 -1
  206. package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +264 -127
  207. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +17 -14
  208. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.ejs +5 -4
  209. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +11 -13
  210. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs +32 -25
  211. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.vue.ejs +6 -9
  212. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.component.ts.ejs +2 -1
  213. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.ejs +1 -1
  214. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.service.ts.ejs +2 -6
  215. package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs +10 -7
  216. package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs +5 -1
  217. package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs +1 -1
  218. package/generators/entity-i18n/index.js +7 -4
  219. package/generators/entity-server/files.js +14 -0
  220. package/generators/entity-server/index.js +12 -8
  221. package/generators/entity-server/templates/src/main/java/package/common/get_all_template.ejs +2 -2
  222. package/generators/entity-server/templates/src/main/java/package/common/search_template.ejs +1 -1
  223. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +9 -8
  224. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +16 -29
  225. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +3 -3
  226. package/generators/entity-server/templates/src/main/java/package/repository/EntitySqlHelper_reactive.java.ejs +46 -0
  227. package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +1 -1
  228. package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +18 -2
  229. package/generators/entity-server/templates/src/main/java/package/repository/search/SortToFieldSortBuilderConverter.java.ejs +24 -0
  230. package/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs +8 -6
  231. package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +5 -1
  232. package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +41 -43
  233. package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +3 -3
  234. package/generators/gae/index.js +10 -10
  235. package/generators/generator-base-blueprint.js +14 -46
  236. package/generators/generator-base-private.js +44 -23
  237. package/generators/generator-base.js +58 -18
  238. package/generators/generator-constants.js +30 -23
  239. package/generators/generator-transforms.js +39 -27
  240. package/generators/heroku/index.js +14 -33
  241. package/generators/init/constants.cjs +1 -1
  242. package/generators/java/constants.cjs +1 -1
  243. package/generators/kubernetes/files.js +3 -0
  244. package/generators/kubernetes/index.js +10 -10
  245. package/generators/kubernetes/templates/db/couchbase.yml.ejs +1 -1
  246. package/generators/kubernetes/templates/deployment.yml.ejs +8 -3
  247. package/generators/kubernetes/templates/istio/destination-rule.yml.ejs +1 -1
  248. package/generators/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs +5 -2
  249. package/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs +5 -2
  250. package/generators/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs +10 -8
  251. package/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs +5 -2
  252. package/generators/kubernetes/templates/istio/gateway.yml.ejs +7 -5
  253. package/generators/kubernetes/templates/secret/couchbase-secret.yml.ejs +9 -0
  254. package/generators/kubernetes-base.js +1 -0
  255. package/generators/kubernetes-helm/files.js +3 -8
  256. package/generators/kubernetes-helm/index.js +10 -10
  257. package/generators/kubernetes-helm/templates/README-KUBERNETES-HELM.md.ejs +0 -1
  258. package/generators/kubernetes-helm/templates/app/Chart.yml.ejs +5 -0
  259. package/generators/kubernetes-helm/templates/app/helpers.tpl.ejs +0 -11
  260. package/generators/kubernetes-helm/templates/app/requirements.yml.ejs +5 -0
  261. package/generators/kubernetes-helm/templates/app/values.yml.ejs +68 -5
  262. package/generators/kubernetes-helm/templates/csvc/Chart.yml.ejs +1 -1
  263. package/generators/kubernetes-helm/templates/csvc/requirements.yml.ejs +1 -1
  264. package/generators/kubernetes-knative/index.js +10 -10
  265. package/generators/kubernetes-knative/templates/istio/gateway.yml.ejs +6 -4
  266. package/generators/kubernetes-knative/templates/service.yml.ejs +1 -1
  267. package/generators/languages/index.js +13 -13
  268. package/generators/languages/templates/src/main/webapp/i18n/vi/login.json +1 -1
  269. package/generators/openapi-client/index.js +13 -10
  270. package/generators/openshift/index.js +10 -11
  271. package/generators/openshift/templates/deployment.yml.ejs +1 -1
  272. package/generators/page/index.js +12 -10
  273. package/generators/server/__snapshots__/generator.spec.mjs.snap +28 -15
  274. package/generators/server/cleanup.js +151 -0
  275. package/generators/server/files-sql.js +52 -0
  276. package/generators/server/files.js +31 -14
  277. package/generators/server/index.js +86 -33
  278. package/generators/server/templates/build.gradle.ejs +231 -189
  279. package/generators/server/templates/gradle.properties.ejs +12 -12
  280. package/generators/server/templates/npmw +8 -6
  281. package/generators/server/templates/npmw.cmd +13 -8
  282. package/generators/server/templates/pom.xml.ejs +425 -217
  283. package/generators/server/templates/sql/reactive/src/main/java/package/repository/UserSqlHelper.java.ejs +48 -0
  284. package/generators/server/templates/src/main/docker/app.yml.ejs +1 -1
  285. package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs +2 -2
  286. package/generators/server/templates/src/main/java/package/config/LocaleConfiguration.java.ejs +3 -2
  287. package/generators/server/templates/src/main/java/package/config/OpenApiConfiguration.java.ejs +17 -54
  288. package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +5 -5
  289. package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +4 -6
  290. package/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +0 -3
  291. package/generators/server/templates/src/main/java/package/config/neo4j/Neo4jMigrations.java.ejs +19 -9
  292. package/generators/server/templates/src/main/java/package/management/SecurityMetersService.java.ejs +68 -0
  293. package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs +2 -2
  294. package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +0 -25
  295. package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +31 -4
  296. package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +23 -11
  297. package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +16 -8
  298. package/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs +6 -6
  299. package/generators/server/templates/src/main/java/package/web/filter/ModifyServersOpenApiFilter.java.ejs +3 -2
  300. package/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs +1 -1
  301. package/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs +2 -2
  302. package/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs +2 -2
  303. package/generators/server/templates/src/main/resources/config/application.yml.ejs +22 -8
  304. package/generators/server/templates/src/main/resources/logback-spring.xml.ejs +1 -2
  305. package/generators/server/templates/src/main/resources/static/microservices_index.html.ejs +1 -1
  306. package/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs +2 -6
  307. package/generators/server/templates/src/test/java/package/cucumber/CucumberTestContextConfiguration.java.ejs +2 -3
  308. package/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs +41 -6
  309. package/generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs +113 -0
  310. package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +6 -1
  311. package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderSecurityMetersTests.java.ejs +198 -0
  312. package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.ejs +13 -3
  313. package/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs +17 -3
  314. package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +63 -0
  315. package/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs +1 -1
  316. package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +2 -3
  317. package/generators/server/templates/src/test/java/package/web/rest/ClientForwardControllerTest.java.ejs +9 -0
  318. package/generators/server/templates/src/test/resources/junit-platform.properties.ejs +2 -0
  319. package/generators/server/templates/src/test/resources/logback.xml.ejs +1 -1
  320. package/generators/server/templates/src/test/{features → resources/package/features}/gitkeep +0 -0
  321. package/generators/server/templates/src/test/{features → resources/package/features}/user/user.feature.ejs +0 -0
  322. package/generators/spring-controller/index.js +9 -7
  323. package/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs +1 -1
  324. package/generators/spring-service/index.js +10 -7
  325. package/generators/upgrade/index.js +4 -5
  326. package/generators/utils.js +2 -2
  327. package/generators/workspaces/index.js +16 -7
  328. package/jdl/jhipster/default-application-options.js +9 -7
  329. package/package.json +22 -22
  330. package/utils/entity.js +17 -4
  331. package/utils/field.js +11 -1
  332. package/utils/multi-step-transform/index.js +8 -8
  333. package/generators/client/templates/react/.npmrc.ejs +0 -1
  334. package/generators/client/templates/vue/webpack/dev.env.js.ejs +0 -17
  335. package/generators/client/templates/vue/webpack/env.js.ejs +0 -67
  336. package/generators/client/templates/vue/webpack/loader.conf.js.ejs +0 -20
  337. package/generators/client/templates/vue/webpack/prod.env.js.ejs +0 -15
  338. package/generators/server/templates/src/main/java/package/config/apidocs/GatewaySwaggerResourcesProvider.java.ejs +0 -91
  339. package/generators/server/templates/src/test/java/package/config/apidocs/GatewaySwaggerResourcesProviderTest.java.ejs +0 -79
  340. package/generators/server/templates/src/test/resources/cucumber.properties.ejs +0 -1
@@ -25,6 +25,7 @@ const { GATEWAY } = require('../../jdl/jhipster/application-types');
25
25
  const { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, VUE_DIR } = constants;
26
26
 
27
27
  module.exports = {
28
+ cleanup,
28
29
  writeFiles,
29
30
  customizeFiles,
30
31
  };
@@ -35,17 +36,14 @@ const vueFiles = {
35
36
  templates: [
36
37
  'package.json',
37
38
  'tsconfig.json',
39
+ 'tsconfig.spec.json',
38
40
  '.postcssrc.js',
39
41
  '.eslintrc.js',
40
- 'webpack/env.js',
41
- 'webpack/dev.env.js',
42
- 'webpack/prod.env.js',
42
+ 'webpack/config.js',
43
43
  'webpack/webpack.common.js',
44
44
  'webpack/webpack.dev.js',
45
45
  'webpack/webpack.prod.js',
46
46
  'webpack/vue.utils.js',
47
- 'webpack/loader.conf.js',
48
- 'webpack/utils.js',
49
47
  ],
50
48
  },
51
49
  {
@@ -53,6 +51,43 @@ const vueFiles = {
53
51
  templates: ['tsconfig.e2e.json'],
54
52
  },
55
53
  ],
54
+ entities: [
55
+ {
56
+ path: VUE_DIR,
57
+ templates: [
58
+ 'entities/entities.component.ts',
59
+ 'entities/entities.vue',
60
+ 'entities/entities-menu.component.ts',
61
+ 'entities/entities-menu.vue',
62
+ 'router/entities.ts',
63
+ ],
64
+ },
65
+ ],
66
+ microfrontend: [
67
+ {
68
+ condition: generator => generator.microfrontend,
69
+ templates: ['webpack/webpack.microfrontend.js.jhi.vue'],
70
+ },
71
+ {
72
+ condition: generator => generator.microfrontend,
73
+ path: VUE_DIR,
74
+ templates: ['index.ts'],
75
+ },
76
+ {
77
+ condition: generator => generator.microfrontend,
78
+ path: CLIENT_TEST_SRC_DIR,
79
+ templates: [
80
+ 'spec/app/microfrontends/entities-menu.component.ts',
81
+ 'spec/app/microfrontends/entities-menu.vue',
82
+ 'spec/app/microfrontends/entities-router.ts',
83
+ ],
84
+ },
85
+ {
86
+ condition: generator => generator.applicationTypeMicroservice,
87
+ path: CLIENT_TEST_SRC_DIR,
88
+ templates: ['spec/app/entities/entities-menu.spec.ts'],
89
+ },
90
+ ],
56
91
  sass: [
57
92
  {
58
93
  path: CLIENT_MAIN_SRC_DIR,
@@ -67,6 +102,7 @@ const vueFiles = {
67
102
  'app.component.ts',
68
103
  'shims-vue.d.ts',
69
104
  'constants.ts',
105
+ 'declarations.d.ts',
70
106
  'main.ts',
71
107
  'shared/alert/alert.service.ts',
72
108
  'shared/config/axios-interceptor.ts',
@@ -77,7 +113,6 @@ const vueFiles = {
77
113
  'shared/security/authority.ts',
78
114
  'router/index.ts',
79
115
  'router/admin.ts',
80
- 'router/entities.ts',
81
116
  'router/pages.ts',
82
117
  ],
83
118
  },
@@ -213,7 +248,7 @@ const vueFiles = {
213
248
  {
214
249
  condition: generator => !generator.skipUserManagement || generator.authenticationType === OAUTH2,
215
250
  path: VUE_DIR,
216
- templates: ['entities/user/user.oauth2.service.ts'],
251
+ templates: ['entities/user/user.service.ts'],
217
252
  },
218
253
  ],
219
254
  clientTestConfig: [
@@ -323,6 +358,22 @@ const vueFiles = {
323
358
  ],
324
359
  };
325
360
 
361
+ function cleanup() {
362
+ if (!this.clientFrameworkVue) return;
363
+
364
+ if (this.isJhipsterVersionLessThan('7.3.1')) {
365
+ this.removeFile('webpack/env.js');
366
+ this.removeFile('webpack/dev.env.js');
367
+ this.removeFile('webpack/prod.env.js');
368
+ this.removeFile('webpack/utils.js');
369
+ this.removeFile('webpack/loader.conf.js');
370
+ }
371
+
372
+ if (this.isJhipsterVersionLessThan('7.4.2')) {
373
+ this.removeFile(`${VUE_DIR}entities/user/user.oauth2.service.ts`);
374
+ }
375
+ }
376
+
326
377
  function writeFiles() {
327
378
  // write Vue files
328
379
  return this.writeFilesToDisk(vueFiles, 'vue');
@@ -338,6 +389,7 @@ function customizeFiles() {
338
389
  'app/core/jhi-navbar/jhi-navbar.vue',
339
390
  'app/core/ribbon/ribbon.vue',
340
391
  'app/shared/jhi-item-count.vue',
392
+ 'app/entities/entities-menu.vue',
341
393
  ]);
342
394
  if (this.withAdminUi) {
343
395
  utils.vueReplaceTranslation(this, [
@@ -22,8 +22,8 @@ const _ = require('lodash');
22
22
  const BaseBlueprintGenerator = require('../generator-base-blueprint');
23
23
  const prompts = require('./prompts');
24
24
  const writeAngularFiles = require('./files-angular').writeFiles;
25
- const writeReactFiles = require('./files-react').writeFiles;
26
- const { writeFiles: writeVueFiles, customizeFiles: customizeVueFiles } = require('./files-vue');
25
+ const { cleanup: cleanupReact, writeFiles: writeReactFiles } = require('./files-react');
26
+ const { cleanup: cleanupVue, writeFiles: writeVueFiles, customizeFiles: customizeVueFiles } = require('./files-vue');
27
27
  const writeCommonFiles = require('./files-common').writeFiles;
28
28
  const { clientI18nFiles } = require('../languages/files');
29
29
 
@@ -44,8 +44,6 @@ const { CommonDBTypes } = require('../../jdl/jhipster/field-types');
44
44
  const TYPE_STRING = CommonDBTypes.STRING;
45
45
  const TYPE_UUID = CommonDBTypes.UUID;
46
46
 
47
- let useBlueprints;
48
-
49
47
  module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
50
48
  constructor(args, options, features) {
51
49
  super(args, options, { unique: 'namespace', ...features });
@@ -76,8 +74,12 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
76
74
  this.loadRuntimeOptions();
77
75
 
78
76
  this.existingProject = !!this.jhipsterConfig.clientFramework;
77
+ }
79
78
 
80
- useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_CLIENT);
79
+ async _postConstruct() {
80
+ if (!this.fromBlueprint) {
81
+ await this.composeWithBlueprints(GENERATOR_CLIENT);
82
+ }
81
83
  }
82
84
 
83
85
  // Public API method used by the getter and also by Blueprints
@@ -108,7 +110,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
108
110
  }
109
111
 
110
112
  get initializing() {
111
- if (useBlueprints) return;
113
+ if (this.delegateToBlueprint) return {};
112
114
  return this._initializing();
113
115
  }
114
116
 
@@ -124,7 +126,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
124
126
  }
125
127
 
126
128
  get prompting() {
127
- if (useBlueprints) return;
129
+ if (this.delegateToBlueprint) return {};
128
130
  return this._prompting();
129
131
  }
130
132
 
@@ -160,32 +162,32 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
160
162
  }
161
163
 
162
164
  get configuring() {
163
- if (useBlueprints) return;
165
+ if (this.delegateToBlueprint) return {};
164
166
  return this._configuring();
165
167
  }
166
168
 
167
169
  // Public API method used by the getter and also by Blueprints
168
170
  _composing() {
169
171
  return {
170
- composeCommon() {
171
- this.composeWithJHipster(GENERATOR_COMMON, true);
172
+ async composeCommon() {
173
+ await this.composeWithJHipster(GENERATOR_COMMON, true);
172
174
  },
173
- composeCypress() {
175
+ async composeCypress() {
174
176
  const testFrameworks = this.jhipsterConfig.testFrameworks;
175
177
  if (!Array.isArray(testFrameworks) || !testFrameworks.includes(CYPRESS)) return;
176
- this.composeWithJHipster(GENERATOR_CYPRESS, { existingProject: this.existingProject }, true);
178
+ await this.composeWithJHipster(GENERATOR_CYPRESS, { existingProject: this.existingProject }, true);
177
179
  },
178
- composeLanguages() {
180
+ async composeLanguages() {
179
181
  // We don't expose client/server to cli, composing with languages is used for test purposes.
180
182
  if (this.jhipsterConfig.enableTranslation === false) return;
181
183
 
182
- this.composeWithJHipster(GENERATOR_LANGUAGES, true);
184
+ await this.composeWithJHipster(GENERATOR_LANGUAGES, true);
183
185
  },
184
186
  };
185
187
  }
186
188
 
187
189
  get composing() {
188
- if (useBlueprints) return;
190
+ if (this.delegateToBlueprint) return {};
189
191
  return this._composing();
190
192
  }
191
193
 
@@ -202,12 +204,6 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
202
204
  this.loadTranslationConfig();
203
205
  },
204
206
 
205
- checkMicrofrontend() {
206
- if (this.microfrontend && !this.clientFrameworkAngular) {
207
- throw new Error(`Microfrontend requires ${ANGULAR} client framework.`);
208
- }
209
- },
210
-
211
207
  validateSkipServer() {
212
208
  if (
213
209
  this.jhipsterConfig.skipServer &&
@@ -243,7 +239,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
243
239
  }
244
240
 
245
241
  get loading() {
246
- if (useBlueprints) return;
242
+ if (this.delegateToBlueprint) return {};
247
243
  return this._loading();
248
244
  }
249
245
 
@@ -283,7 +279,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
283
279
  }
284
280
 
285
281
  get preparing() {
286
- if (useBlueprints) return;
282
+ if (this.delegateToBlueprint) return {};
287
283
  return this._preparing();
288
284
  }
289
285
 
@@ -300,6 +296,14 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
300
296
  this.userPrimaryKeyTypeUUID = this.user.primaryKey.type === TYPE_UUID;
301
297
  },
302
298
 
299
+ loadEntities() {
300
+ if (!this.configOptions.sharedEntities) {
301
+ this.localEntities = [];
302
+ return;
303
+ }
304
+ this.localEntities = Object.values(this.configOptions.sharedEntities).filter(entity => !entity.builtIn && !entity.skipClient);
305
+ },
306
+
303
307
  insight() {
304
308
  statistics.sendSubGenEvent('generator', GENERATOR_CLIENT, {
305
309
  app: {
@@ -314,29 +318,32 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
314
318
  }
315
319
 
316
320
  get default() {
317
- if (useBlueprints) return;
321
+ if (this.delegateToBlueprint) return {};
318
322
  return this._default();
319
323
  }
320
324
 
321
325
  // Public API method used by the getter and also by Blueprints
322
326
  _writing() {
323
327
  return {
328
+ cleanupReact,
329
+ cleanupVue,
330
+
324
331
  write() {
325
332
  if (this.skipClient) return;
326
333
  switch (this.clientFramework) {
327
334
  case ANGULAR:
328
- return writeAngularFiles.call(this, useBlueprints);
335
+ return writeAngularFiles.call(this);
329
336
  case REACT:
330
- return writeReactFiles.call(this, useBlueprints);
337
+ return writeReactFiles.call(this);
331
338
  case VUE:
332
- return writeVueFiles.call(this, useBlueprints);
339
+ return writeVueFiles.call(this);
333
340
  default:
334
341
  // do nothing by default
335
342
  }
336
343
  },
337
344
  writeCommonFiles() {
338
345
  if (this.skipClient) return;
339
- return writeCommonFiles.call(this, useBlueprints);
346
+ return writeCommonFiles.call(this);
340
347
  },
341
348
 
342
349
  ...super._missingPostWriting(),
@@ -344,7 +351,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
344
351
  }
345
352
 
346
353
  get writing() {
347
- if (useBlueprints) return;
354
+ if (this.delegateToBlueprint) return {};
348
355
  return this._writing();
349
356
  }
350
357
 
@@ -383,13 +390,20 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
383
390
 
384
391
  microfrontend() {
385
392
  if (!this.microfrontend) return;
386
- this.addWebpackConfig("require('./webpack.microfrontend')(config, options, targetOptions)");
393
+ if (this.clientFrameworkAngular) {
394
+ const conditional = this.applicationTypeMicroservice ? "targetOptions.target === 'serve' ? {} : " : '';
395
+ this.addWebpackConfig(`${conditional}require('./webpack.microfrontend')(config, options, targetOptions)`);
396
+ } else if (this.clientFrameworkVue) {
397
+ this.addWebpackConfig("require('./webpack.microfrontend')({ serve: options.env.WEBPACK_SERVE })");
398
+ } else {
399
+ throw new Error(`Client framework ${this.clientFramework} doesn't support microfrontends`);
400
+ }
387
401
  },
388
402
  };
389
403
  }
390
404
 
391
405
  get postWriting() {
392
- if (useBlueprints) return;
406
+ if (this.delegateToBlueprint) return {};
393
407
  return this._postWriting();
394
408
  }
395
409
 
@@ -411,7 +425,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
411
425
  }
412
426
 
413
427
  get end() {
414
- if (useBlueprints) return;
428
+ if (this.delegateToBlueprint) return {};
415
429
  return this._end();
416
430
  }
417
431
 
@@ -236,7 +236,7 @@ module.exports = class extends needleClientBase {
236
236
 
237
237
  if (!isSpecificEntityAlreadyGenerated) {
238
238
  const modulePath =
239
- this.generator.jhipsterConfig.microfrontend && this.generator.jhipsterConfig.applicationType === 'gateway' && microserviceName
239
+ this.generator.microfrontend && this.generator.applicationTypeGateway && microserviceName
240
240
  ? `${microserviceName}/${entityFileName}`
241
241
  : `./${entityFolderName}/${entityFileName}.module`;
242
242
  const moduleName = microserviceName
@@ -24,7 +24,17 @@ const needleClientBase = require('./needle-client');
24
24
  module.exports = class extends needleClientBase {
25
25
  addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue = _.startCase(routerName)) {
26
26
  const errorMessage = `${chalk.yellow('Reference to ') + routerName} ${chalk.yellow('not added to menu.\n')}`;
27
- const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/core/jhi-navbar/jhi-navbar.vue`;
27
+ const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/entities/entities-menu.vue`;
28
+
29
+ const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(
30
+ filePath,
31
+ `<b-dropdown-item to="/${routerName}">`,
32
+ this.generator
33
+ );
34
+ if (isSpecificEntityAlreadyGenerated) {
35
+ return;
36
+ }
37
+
28
38
  const menuI18nTitle = enableTranslation ? ` v-text="$t('global.menu.entities.${entityTranslationKeyMenu}')"` : '';
29
39
  const entityEntry =
30
40
  // prettier-ignore
@@ -41,6 +51,16 @@ module.exports = class extends needleClientBase {
41
51
  addEntityToRouterImport(entityName, fileName, folderName, readOnly) {
42
52
  const errorMessage = `${chalk.yellow('Reference to entity ') + entityName} ${chalk.yellow('not added to router entities import.\n')}`;
43
53
  const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/router/entities.ts`;
54
+
55
+ const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(
56
+ filePath,
57
+ `import('@/entities/${folderName}/${fileName}.vue');`,
58
+ this.generator
59
+ );
60
+ if (isSpecificEntityAlreadyGenerated) {
61
+ return;
62
+ }
63
+
44
64
  let entityEntry;
45
65
  if (!readOnly) {
46
66
  // prettier-ignore
@@ -70,8 +90,7 @@ module.exports = class extends needleClientBase {
70
90
  const errorMessage = `${chalk.yellow('Reference to entity ') + entityName} ${chalk.yellow('not added to router entities.\n')}`;
71
91
  const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/router/entities.ts`;
72
92
 
73
- const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(filePath, `path: '/${entityFileName}'`, this.generator);
74
-
93
+ const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(filePath, `path: '${entityFileName}'`, this.generator);
75
94
  if (isSpecificEntityAlreadyGenerated) {
76
95
  return;
77
96
  }
@@ -81,25 +100,25 @@ module.exports = class extends needleClientBase {
81
100
  // prettier-ignore
82
101
  entityEntry = this.generator.stripMargin(
83
102
  `|{
84
- | path: '/${entityFileName}',
103
+ | path: '${entityFileName}',
85
104
  | name: '${entityName}',
86
105
  | component: ${entityName},
87
106
  | meta: { authorities: [Authority.USER] }
88
107
  | },
89
108
  | {
90
- | path: '/${entityFileName}/new',
109
+ | path: '${entityFileName}/new',
91
110
  | name: '${entityName}Create',
92
111
  | component: ${entityName}Update,
93
112
  | meta: { authorities: [Authority.USER] }
94
113
  | },
95
114
  | {
96
- | path: '/${entityFileName}/:${entityInstance}Id/edit',
115
+ | path: '${entityFileName}/:${entityInstance}Id/edit',
97
116
  | name: '${entityName}Edit',
98
117
  | component: ${entityName}Update,
99
118
  | meta: { authorities: [Authority.USER] }
100
119
  | },
101
120
  | {
102
- | path: '/${entityFileName}/:${entityInstance}Id/view',
121
+ | path: '${entityFileName}/:${entityInstance}Id/view',
103
122
  | name: '${entityName}View',
104
123
  | component: ${entityName}Details,
105
124
  | meta: { authorities: [Authority.USER] }
@@ -124,6 +143,7 @@ module.exports = class extends needleClientBase {
124
143
  }
125
144
 
126
145
  const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-add-entity-to-router', entityEntry);
146
+ rewriteFileModel.prettierAware = true;
127
147
  this.addBlockContentToFile(rewriteFileModel, errorMessage);
128
148
  }
129
149
 
@@ -152,4 +172,34 @@ module.exports = class extends needleClientBase {
152
172
  const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-add-entity-service-to-main', entityEntry);
153
173
  this.addBlockContentToFile(rewriteFileModel, errorMessage);
154
174
  }
175
+
176
+ addEntityServiceToEntitiesComponentImport(entityName, entityClass, entityFileName, entityFolderName) {
177
+ const errorMessage = `${chalk.yellow('Reference to entity ') + entityClass} ${chalk.yellow(
178
+ 'not added to import in entities component.\n'
179
+ )}`;
180
+ const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/entities/entities.component.ts`;
181
+
182
+ // prettier-ignore
183
+ const entityEntry = `import ${entityName}Service from './${entityFolderName}/${entityFileName}.service';`;
184
+
185
+ const rewriteFileModel = this.generateFileModel(
186
+ filePath,
187
+ 'jhipster-needle-add-entity-service-to-entities-component-import',
188
+ entityEntry
189
+ );
190
+ this.addBlockContentToFile(rewriteFileModel, errorMessage);
191
+ }
192
+
193
+ addEntityServiceToEntitiesComponent(entityInstance, entityName) {
194
+ const errorMessage = `${chalk.yellow('Reference to entity ') + entityName} ${chalk.yellow(
195
+ 'not added to service in entities component.\n'
196
+ )}`;
197
+ const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/entities/entities.component.ts`;
198
+
199
+ // prettier-ignore
200
+ const entityEntry = `@Provide('${entityInstance}Service') private ${entityInstance}Service = () => new ${entityName}Service();`;
201
+
202
+ const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-add-entity-service-to-entities-component', entityEntry);
203
+ this.addBlockContentToFile(rewriteFileModel, errorMessage);
204
+ }
155
205
  };
@@ -92,6 +92,7 @@
92
92
  "@typescript-eslint/no-parameter-properties": ["warn", { "allows": ["public", "private", "protected"] }],
93
93
  "@typescript-eslint/no-shadow": ["error"],
94
94
  "@typescript-eslint/no-unnecessary-condition": "error",
95
+ "@typescript-eslint/no-unsafe-argument": "off",
95
96
  "@typescript-eslint/no-unsafe-assignment": "off",
96
97
  "@typescript-eslint/no-unsafe-call": "off",
97
98
  "@typescript-eslint/no-unsafe-member-access": "off",
@@ -126,6 +126,11 @@
126
126
  },
127
127
  "defaultProject": "<%= dasherizedBaseName %>",
128
128
  "cli": {
129
+ "cache": {
130
+ "enabled": true,
131
+ "path": "./<%= BUILD_DIR %>",
132
+ "environment": "all"
133
+ },
129
134
  "packageManager": "<%= clientPackageManager %>"
130
135
  }
131
136
  }
@@ -22,6 +22,8 @@ const { compilerOptions: { paths = {}, baseUrl = './' } } = require('./tsconfig.
22
22
  const environment = require('./webpack/environment');
23
23
 
24
24
  module.exports = {
25
+ transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$|dayjs/esm)'],
26
+ resolver: 'jest-preset-angular/build/resolvers/ng-jest-resolver.js',
25
27
  globals: {
26
28
  ...environment,
27
29
  },
@@ -1,48 +1,48 @@
1
1
  {
2
2
  "dependencies": {
3
- "@angular/common": "12.2.9",
4
- "bootstrap": "4.6.0",
5
- "@fortawesome/angular-fontawesome": "0.9.0",
3
+ "@angular/common": "13.1.1",
4
+ "bootstrap": "4.6.1",
5
+ "@fortawesome/angular-fontawesome": "0.10.1",
6
6
  "@fortawesome/fontawesome-svg-core": "1.2.36",
7
7
  "@fortawesome/free-solid-svg-icons": "5.15.4",
8
- "@ng-bootstrap/ng-bootstrap": "10.0.0",
9
- "@ngx-translate/core": "13.0.0",
10
- "@ngx-translate/http-loader": "6.0.0",
11
- "ngx-cookie-service": "12.0.3",
8
+ "@ng-bootstrap/ng-bootstrap": "11.0.0",
9
+ "@ngx-translate/core": "14.0.0",
10
+ "@ngx-translate/http-loader": "7.0.0",
11
+ "ngx-cookie-service": "13.1.2",
12
12
  "ngx-infinite-scroll": "10.0.1",
13
- "ngx-webstorage": "8.0.0",
14
- "rxjs": "6.6.7",
15
- "swagger-ui-dist": "3.52.3",
13
+ "ngx-webstorage": "9.0.0",
14
+ "rxjs": "7.5.1",
15
+ "swagger-ui-dist": "4.1.3",
16
16
  "tslib": "2.3.1",
17
17
  "zone.js": "0.11.4"
18
18
  },
19
19
  "devDependencies": {
20
- "@angular/cli": "12.2.9",
21
- "@angular-builders/custom-webpack": "12.1.3",
22
- "@angular-builders/jest": "12.1.2",
23
- "@angular-eslint/eslint-plugin": "12.5.0",
24
- "@types/node": "16.10.3",
25
- "@types/jest": "27.0.2",
26
- "@typescript-eslint/eslint-plugin": "4.33.0",
27
- "browser-sync": "2.27.5",
20
+ "@angular/cli": "13.1.2",
21
+ "@angular-builders/custom-webpack": "13.0.0",
22
+ "@angular-builders/jest": "13.0.2",
23
+ "@angular-eslint/eslint-plugin": "13.0.1",
24
+ "@types/node": "16.11.17",
25
+ "@types/jest": "27.4.0",
26
+ "@typescript-eslint/eslint-plugin": "5.8.1",
27
+ "browser-sync": "2.27.7",
28
28
  "browser-sync-webpack-plugin": "2.3.0",
29
- "copy-webpack-plugin": "9.0.1",
30
- "eslint": "7.32.0",
29
+ "copy-webpack-plugin": "10.2.0",
30
+ "eslint": "8.5.0",
31
31
  "eslint-config-prettier": "8.3.0",
32
- "eslint-webpack-plugin": "3.0.1",
32
+ "eslint-webpack-plugin": "3.1.1",
33
33
  "folder-hash": "4.0.1",
34
- "jest": "27.2.4",
35
- "jest-preset-angular": "10.0.1",
34
+ "jest": "27.4.5",
35
+ "jest-preset-angular": "11.0.1",
36
36
  "jest-date-mock": "1.0.8",
37
37
  "jest-junit": "13.0.0",
38
38
  "jest-sonar-reporter": "2.0.0",
39
- "merge-jsons-webpack-plugin": "1.0.21",
39
+ "merge-jsons-webpack-plugin": "2.0.1",
40
40
  "rimraf": "3.0.2",
41
- "ts-jest": "27.0.5",
42
- "typescript": "4.3.5",
43
- "webpack": "5.50.0",
44
- "webpack-bundle-analyzer": "4.4.2",
41
+ "ts-jest": "27.1.2",
42
+ "typescript": "4.5.4",
43
+ "webpack": "5.65.0",
44
+ "webpack-bundle-analyzer": "4.5.0",
45
45
  "webpack-merge": "5.8.0",
46
- "webpack-notifier": "1.14.0"
46
+ "webpack-notifier": "1.15.0"
47
47
  }
48
48
  }
@@ -125,11 +125,13 @@
125
125
  "rimraf": "<%= dependabotPackageJson.devDependencies['rimraf'] %>",
126
126
  "ts-jest": "<%= dependabotPackageJson.devDependencies['ts-jest'] %>",
127
127
  "typescript": "<%= dependabotPackageJson.devDependencies['typescript'] %>",
128
- "webpack": "<%= dependabotPackageJson.devDependencies['webpack'] %>",
129
128
  "webpack-bundle-analyzer": "<%= dependabotPackageJson.devDependencies['webpack-bundle-analyzer'] %>",
130
129
  "webpack-merge": "<%= dependabotPackageJson.devDependencies['webpack-merge'] %>",
131
130
  "webpack-notifier": "<%= dependabotPackageJson.devDependencies['webpack-notifier'] %>"
132
131
  },
132
+ "overrides": {
133
+ "webpack": "<%= dependabotPackageJson.devDependencies['webpack'] %>"
134
+ },
133
135
  "engines": {
134
136
  "node": ">=<%= NODE_VERSION %>"
135
137
  },