generator-jhipster 7.2.0 → 7.4.1
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.
- package/cli/environment-builder.js +1 -0
- package/cli/import-jdl.js +3 -2
- package/cli/jdl.js +1 -0
- package/cli/jhipster-command.js +2 -2
- package/cli/program.js +32 -29
- package/generators/app/index.js +35 -26
- package/generators/aws/index.js +8 -8
- package/generators/aws/lib/eb.js +1 -1
- package/generators/azure-app-service/index.js +16 -9
- package/generators/azure-app-service/templates/github/workflows/azure-app-service.yml.ejs +2 -2
- package/generators/azure-spring-cloud/index.js +16 -9
- package/generators/azure-spring-cloud/templates/github/workflows/azure-spring-cloud.yml.ejs +2 -2
- package/generators/bootstrap/index.js +57 -61
- package/generators/ci-cd/index.js +11 -8
- package/generators/ci-cd/templates/github-actions.yml.ejs +1 -1
- package/generators/ci-cd/templates/travis.yml.ejs +9 -4
- package/generators/client/__workflow/devserver-angular.json +1 -1
- package/generators/client/__workflow/devserver-react.json +1 -1
- package/generators/client/__workflow/devserver-vue.json +1 -1
- package/generators/client/files-angular.js +6 -0
- package/generators/client/files-common.js +6 -2
- package/generators/client/files-react.js +13 -2
- package/generators/client/files-vue.js +56 -6
- package/generators/client/index.js +114 -32
- package/generators/client/needle-api/needle-client-angular.js +1 -1
- package/generators/client/needle-api/needle-client-vue.js +57 -7
- package/generators/client/templates/angular/.eslintrc.json.ejs +1 -0
- package/generators/client/templates/angular/package.json +19 -19
- package/generators/client/templates/angular/package.json.ejs +2 -1
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +52 -54
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs +65 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +35 -37
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs +78 -80
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.service.spec.ts.ejs +41 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +73 -75
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts.ejs +62 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +44 -46
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs +61 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs +116 -118
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.service.spec.ts.ejs +66 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +75 -77
- package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +74 -76
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +48 -50
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs +50 -52
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +45 -47
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +66 -0
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs +99 -101
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +61 -63
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs +19 -21
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +28 -30
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs +62 -64
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +35 -37
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +40 -42
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +87 -89
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs +41 -43
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +81 -83
- package/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs +3 -0
- package/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +178 -180
- package/generators/client/templates/angular/src/main/webapp/app/core/config/application-config.service.ts.ejs +9 -0
- package/generators/client/templates/angular/src/main/webapp/app/entities/user/user.service.spec.ts.ejs +87 -89
- package/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs +93 -95
- package/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +166 -168
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +66 -68
- package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs +27 -29
- package/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs +112 -114
- package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs +132 -134
- package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +29 -31
- package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +2 -3
- package/generators/client/templates/common/README.md.jhi.client.ejs +34 -0
- package/generators/client/templates/common/package.json +7 -7
- package/generators/client/templates/common/webpack/webpack.microfrontend.js.jhi.ejs +56 -0
- package/generators/client/templates/react/.eslintrc.json.ejs +1 -0
- package/generators/client/templates/react/package.json +57 -56
- package/generators/client/templates/react/package.json.ejs +5 -2
- package/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +6 -6
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +8 -8
- package/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs +3 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +7 -7
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +1 -1
- package/generators/client/templates/react/webpack/webpack.dev.js.ejs +17 -1
- package/generators/client/templates/react/webpack/webpack.prod.js.ejs +13 -1
- package/generators/client/templates/vue/.eslintrc.js.ejs +8 -5
- package/generators/client/templates/vue/package.json +40 -49
- package/generators/client/templates/vue/package.json.ejs +14 -18
- package/generators/client/templates/vue/src/main/webapp/app/account/account.service.ts.ejs +6 -5
- package/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.vue.ejs +7 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.vue.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/tracker/tracker.service.ts.ejs +5 -4
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs +9 -0
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-view.component.ts.ejs +5 -0
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +5 -0
- package/generators/client/templates/vue/src/main/webapp/app/constants.ts.ejs +16 -6
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +27 -8
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +6 -0
- package/generators/client/templates/vue/src/main/webapp/app/declarations.d.ts.ejs +41 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.component.ts.ejs +34 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.vue.ejs +13 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities.component.ts.ejs +14 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities.vue.ejs +5 -0
- package/generators/client/templates/vue/{webpack/utils.js.ejs → src/main/webapp/app/index.ts.ejs} +1 -12
- package/generators/client/templates/vue/src/main/webapp/app/locale/translation.service.ts.ejs +26 -9
- package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +23 -11
- package/generators/client/templates/vue/src/main/webapp/app/router/admin.ts.ejs +4 -4
- package/generators/client/templates/vue/src/main/webapp/app/router/entities.ts.ejs +45 -3
- package/generators/client/templates/vue/src/main/webapp/app/router/index.ts.ejs +19 -3
- package/generators/client/templates/vue/src/main/webapp/app/shared/alert/alert.service.ts.ejs +61 -0
- package/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +0 -2
- package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +3 -1
- package/generators/client/templates/vue/src/main/webapp/app/shims-vue.d.ts.ejs +17 -3
- package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs +25 -10
- package/generators/client/templates/vue/src/test/javascript/spec/app/account/account.service.spec.ts.ejs +2 -2
- package/generators/client/templates/vue/src/test/javascript/spec/app/account/login-form/login-form.component.spec.ts.ejs +2 -2
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.component.spec.ts.ejs +12 -12
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.service.spec.ts.ejs +2 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs +5 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs +2 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs +5 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs +10 -4
- package/generators/client/templates/vue/src/test/javascript/spec/app/entities/entities-menu.spec.ts.ejs +52 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.component.ts.ejs +4 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.vue.ejs +7 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-router.ts.ejs +1 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/shared/alert/alert.service.spec.ts.ejs +124 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/shared/config/axios-interceptor.spec.ts.ejs +0 -1
- package/generators/client/templates/vue/tsconfig.json.ejs +6 -10
- package/generators/client/templates/vue/tsconfig.spec.json.ejs +37 -0
- package/generators/client/templates/vue/webpack/config.js.ejs +50 -0
- package/generators/client/templates/vue/webpack/vue.utils.js.ejs +33 -32
- package/generators/client/templates/vue/webpack/webpack.common.js.ejs +152 -126
- package/generators/client/templates/vue/webpack/webpack.dev.js.ejs +19 -76
- package/generators/client/templates/vue/webpack/webpack.microfrontend.js.jhi.vue.ejs +77 -0
- package/generators/client/templates/vue/webpack/webpack.prod.js.ejs +5 -41
- package/generators/cloudfoundry/index.js +9 -9
- package/generators/common/index.js +12 -10
- package/generators/common/templates/.husky/pre-commit +1 -1
- package/generators/common/templates/.prettierrc.ejs +1 -1
- package/generators/common/templates/README.md.jhi.ejs +21 -0
- package/generators/common/templates/package.json +4 -4
- package/generators/cypress/index.js +12 -9
- package/generators/cypress/templates/cypress.json.ejs +9 -2
- package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +4 -4
- package/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +30 -2
- package/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +4 -4
- package/generators/cypress/templates/src/test/javascript/cypress/support/index.ts.ejs +1 -1
- package/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +1 -1
- package/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs +1 -1
- package/generators/database-changelog/index.js +33 -22
- package/generators/database-changelog-liquibase/index.js +12 -8
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +1 -1
- package/generators/docker-compose/index.js +11 -12
- package/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +13 -12
- package/generators/entities/index.js +35 -26
- package/generators/entities-client/index.js +10 -7
- package/generators/entity/index.js +49 -29
- package/generators/entity-client/files.js +7 -16
- package/generators/entity-client/index.js +74 -11
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs +42 -44
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs +58 -60
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs +105 -107
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs +8 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs +52 -54
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.spec.ts.ejs +173 -175
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs +2 -4
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs +193 -195
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +7 -0
- package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +269 -109
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs +5 -2
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +17 -14
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +11 -13
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-details.component.ts.ejs +5 -0
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs +23 -8
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.vue.ejs +6 -9
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.component.ts.ejs +9 -1
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.ejs +1 -1
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.service.ts.ejs +2 -6
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-details.component.spec.ts.ejs +2 -1
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs +8 -1
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs +8 -2
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs +1 -1
- package/generators/entity-i18n/index.js +7 -4
- package/generators/entity-server/files-couchbase.js +2 -2
- package/generators/entity-server/files.js +35 -30
- package/generators/entity-server/index.js +12 -8
- package/generators/entity-server/templates/couchbase/src/main/java/package/repository/EntityRepository.java.ejs +2 -2
- package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.fts.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +6 -2
- package/generators/entity-server/templates/src/main/java/package/domain/enumeration/Enum.java.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +17 -30
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +5 -5
- package/generators/entity-server/templates/src/main/java/package/repository/EntitySqlHelper_reactive.java.ejs +46 -0
- package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +3 -3
- package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs +8 -8
- package/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs +4 -4
- package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs +4 -4
- package/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs +7 -3
- package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs +8 -8
- package/generators/entity-server/templates/src/main/java/package/service/mapper/BaseEntityMapper.java.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +7 -3
- package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +51 -53
- package/generators/entity-server/templates/src/test/java/package/domain/EntityTest.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/service/dto/EntityDTOTest.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/service/mapper/EntityMapperTest.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +17 -14
- package/generators/gae/index.js +10 -10
- package/generators/generator-base-blueprint.js +14 -46
- package/generators/generator-base-private.js +42 -22
- package/generators/generator-base.js +57 -20
- package/generators/generator-constants.js +29 -21
- package/generators/generator-transforms.js +39 -27
- package/generators/heroku/index.js +27 -48
- package/generators/init/constants.cjs +1 -1
- package/generators/init/templates/.husky/pre-commit +1 -1
- package/generators/java/constants.cjs +1 -1
- package/generators/kubernetes/files.js +3 -0
- package/generators/kubernetes/index.js +10 -10
- package/generators/kubernetes/templates/db/couchbase.yml.ejs +1 -1
- package/generators/kubernetes/templates/deployment.yml.ejs +8 -3
- package/generators/kubernetes/templates/istio/destination-rule.yml.ejs +1 -1
- package/generators/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs +10 -8
- package/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway.yml.ejs +7 -5
- package/generators/kubernetes/templates/secret/couchbase-secret.yml.ejs +9 -0
- package/generators/kubernetes-base.js +1 -0
- package/generators/kubernetes-helm/files.js +3 -8
- package/generators/kubernetes-helm/index.js +10 -10
- package/generators/kubernetes-helm/templates/README-KUBERNETES-HELM.md.ejs +0 -1
- package/generators/kubernetes-helm/templates/app/Chart.yml.ejs +27 -0
- package/generators/kubernetes-helm/templates/app/helpers.tpl.ejs +0 -11
- package/generators/kubernetes-helm/templates/app/requirements.yml.ejs +7 -2
- package/generators/kubernetes-helm/templates/app/values.yml.ejs +68 -5
- package/generators/kubernetes-helm/templates/csvc/Chart.yml.ejs +17 -0
- package/generators/kubernetes-helm/templates/csvc/requirements.yml.ejs +2 -2
- package/generators/kubernetes-knative/index.js +10 -10
- package/generators/kubernetes-knative/templates/istio/gateway.yml.ejs +6 -4
- package/generators/kubernetes-knative/templates/service.yml.ejs +1 -1
- package/generators/languages/index.js +13 -13
- package/generators/languages/templates/src/main/webapp/i18n/hr/reset.json.ejs +1 -2
- package/generators/languages/templates/src/main/webapp/i18n/vi/login.json +1 -1
- package/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +1 -1
- package/generators/openapi-client/index.js +13 -10
- package/generators/openshift/index.js +10 -11
- package/generators/openshift/templates/deployment.yml.ejs +1 -1
- package/generators/page/index.js +12 -10
- package/generators/server/__snapshots__/generator.spec.mjs.snap +12 -0
- package/generators/server/files-sql.js +52 -0
- package/generators/server/files.js +15 -0
- package/generators/server/index.js +100 -33
- package/generators/server/needle-api/needle-server-cache.js +4 -6
- package/generators/server/templates/.mvn/wrapper/maven-wrapper.properties +1 -1
- package/generators/server/templates/build.gradle.ejs +17 -1
- package/generators/server/templates/gradle.properties.ejs +11 -11
- package/generators/server/templates/npmw +1 -1
- package/generators/server/templates/npmw.cmd +1 -1
- package/generators/server/templates/pom.xml.ejs +128 -9
- package/generators/server/templates/settings.gradle.ejs +9 -0
- package/generators/server/templates/sql/reactive/src/main/java/package/repository/UserSqlHelper.java.ejs +48 -0
- package/generators/server/templates/src/main/docker/app.yml.ejs +2 -1
- package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs +13 -12
- package/generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_cassandra.java.ejs +0 -6
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_sql.java.ejs +2 -2
- package/generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/config/LocaleConfiguration.java.ejs +0 -2
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +2 -5
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +9 -1
- package/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +0 -1
- package/generators/server/templates/src/main/java/package/management/SecurityMetersService.java.ejs +68 -0
- package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +0 -23
- package/generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.ejs +0 -2
- package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +29 -4
- package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +21 -9
- package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +13 -5
- package/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +1 -1
- package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +1 -1
- package/generators/server/templates/src/main/resources/config/application.yml.ejs +7 -7
- package/generators/server/templates/src/main/resources/static/microservices_index.html.ejs +1 -1
- package/generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs +113 -0
- package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +6 -1
- package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderSecurityMetersTests.java.ejs +198 -0
- package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.ejs +13 -3
- package/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs +16 -2
- package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +63 -0
- package/generators/spring-controller/index.js +9 -7
- package/generators/spring-service/index.js +10 -7
- package/generators/upgrade/index.js +4 -5
- package/generators/utils.js +2 -2
- package/generators/workspaces/index.js +16 -7
- package/jdl/jhipster/default-application-options.js +9 -7
- package/package.json +23 -23
- package/utils/entity.js +21 -4
- package/utils/field.js +12 -2
- package/utils/multi-step-transform/index.js +8 -8
- package/generators/client/templates/react/.npmrc.ejs +0 -1
- package/generators/client/templates/vue/webpack/dev.env.js.ejs +0 -17
- package/generators/client/templates/vue/webpack/env.js.ejs +0 -67
- package/generators/client/templates/vue/webpack/loader.conf.js.ejs +0 -20
- package/generators/client/templates/vue/webpack/prod.env.js.ejs +0 -15
|
@@ -50,240 +50,238 @@ import { <%= otherEntity.entityAngularName %>Service } from 'app/entities/<%= ot
|
|
|
50
50
|
|
|
51
51
|
import { <%= entityAngularName %>UpdateComponent } from './<%= entityFileName %>-update.component';
|
|
52
52
|
|
|
53
|
-
describe('Component
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
let <%= entityInstance %>Service: <%= entityAngularName %>Service;
|
|
53
|
+
describe('<%= entityAngularName %> Management Update Component', () => {
|
|
54
|
+
let comp: <%= entityAngularName %>UpdateComponent;
|
|
55
|
+
let fixture: ComponentFixture<<%= entityAngularName %>UpdateComponent>;
|
|
56
|
+
let activatedRoute: ActivatedRoute;
|
|
57
|
+
let <%= entityInstance %>Service: <%= entityAngularName %>Service;
|
|
59
58
|
<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions.filter(relationships => relationships[0].otherEntity.entityAngularName !== entityAngularName)) { _%>
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
<%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
|
|
60
|
+
let <%= otherEntity.entityInstance %>Service: <%= otherEntity.entityAngularName %>Service;
|
|
62
61
|
<%_ } _%>
|
|
63
62
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
63
|
+
beforeEach(() => {
|
|
64
|
+
TestBed.configureTestingModule({
|
|
65
|
+
imports: [HttpClientTestingModule],
|
|
66
|
+
declarations: [<%= entityAngularName %>UpdateComponent],
|
|
67
|
+
providers: [FormBuilder, ActivatedRoute],
|
|
68
|
+
})
|
|
69
|
+
.overrideTemplate(<%= entityAngularName %>UpdateComponent, '')
|
|
70
|
+
.compileComponents();
|
|
71
|
+
|
|
72
|
+
fixture = TestBed.createComponent(<%= entityAngularName %>UpdateComponent);
|
|
73
|
+
activatedRoute = TestBed.inject(ActivatedRoute);
|
|
74
|
+
<%= entityInstance %>Service = TestBed.inject(<%= entityAngularName %>Service);
|
|
76
75
|
<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions.filter(relationships => relationships[0].otherEntity.entityAngularName !== entityAngularName)) { _%>
|
|
77
|
-
|
|
78
|
-
|
|
76
|
+
<%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
|
|
77
|
+
<%= otherEntity.entityInstance %>Service = TestBed.inject(<%= otherEntity.entityAngularName %>Service);
|
|
79
78
|
<%_ } _%>
|
|
80
79
|
|
|
81
|
-
|
|
82
|
-
|
|
80
|
+
comp = fixture.componentInstance;
|
|
81
|
+
});
|
|
83
82
|
|
|
84
|
-
|
|
83
|
+
describe('ngOnInit', () => {
|
|
85
84
|
<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
<%_ } _%>
|
|
101
|
-
|
|
102
|
-
const <%= otherEntity.entityInstance %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
|
|
103
|
-
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= otherEntity.entityInstance %>Collection })));
|
|
104
|
-
const additional<%= otherEntity.entityAngularNamePlural %> = [
|
|
105
|
-
<%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
|
|
106
|
-
<%_ const reference = relationship.reference _%>
|
|
107
|
-
<% if (relationship.collection) { %>...<% } %><%= reference.name %>,
|
|
108
|
-
<%_ } _%>
|
|
109
|
-
];
|
|
110
|
-
const expectedCollection: I<%= otherEntity.entityAngularName %>[] = [...additional<%= otherEntity.entityAngularNamePlural %>, ...<%= otherEntity.entityInstance %>Collection];
|
|
111
|
-
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'add<%= otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
|
|
112
|
-
|
|
113
|
-
activatedRoute.data = of({ <%= entityInstance %> });
|
|
114
|
-
comp.ngOnInit();
|
|
115
|
-
|
|
116
|
-
expect(<%= otherEntity.entityInstance %>Service.query).toHaveBeenCalled();
|
|
117
|
-
expect(<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing).toHaveBeenCalledWith(<%= otherEntity.entityInstance %>Collection, ...additional<%= otherEntity.entityAngularNamePlural %>);
|
|
118
|
-
expect(comp.<%= otherEntity.entityInstancePlural %>SharedCollection).toEqual(expectedCollection);
|
|
119
|
-
});
|
|
120
|
-
|
|
85
|
+
<%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
|
|
86
|
+
<%_ const relationshipsWithCustomSharedOptions = relationshipsByEntityNeedingOptions.filter(rel => !relationshipsWithCustomUniqueOptions.includes(rel)); _%>
|
|
87
|
+
<%_ if (relationshipsWithCustomSharedOptions.length > 0) { _%>
|
|
88
|
+
<%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
|
|
89
|
+
it('Should call <%= otherEntity.entityAngularName %> query and add missing value', () => {
|
|
90
|
+
const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
|
|
91
|
+
<%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
|
|
92
|
+
<%_ const reference = relationship.reference _%>
|
|
93
|
+
<%_ if (relationship.collection) { _%>
|
|
94
|
+
const <%= reference.name %> : I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
|
|
95
|
+
<%_ } else { _%>
|
|
96
|
+
const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
|
|
97
|
+
<%_ } _%>
|
|
98
|
+
<%= entityInstance %>.<%= reference.name %> = <%= reference.name %>;
|
|
121
99
|
<%_ } _%>
|
|
122
|
-
<%_ for (const relationship of relationshipsWithCustomUniqueOptions) { %>
|
|
123
|
-
<%_ const otherEntity = relationship.otherEntity _%>
|
|
124
|
-
<%_ const reference = relationship.reference _%>
|
|
125
|
-
it('Should call <%= reference.name %> query and add missing value', () => {
|
|
126
|
-
const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
|
|
127
|
-
const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
|
|
128
|
-
<%= entityInstance %>.<%= reference.name %> = <%= reference.name %>;
|
|
129
|
-
|
|
130
|
-
const <%= reference.name %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
|
|
131
|
-
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= reference.name %>Collection })));
|
|
132
|
-
const expectedCollection: I<%= otherEntity.entityAngularName %>[] = [<%= reference.name %>, ...<%= reference.name %>Collection];
|
|
133
|
-
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'add<%= otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
|
|
134
|
-
|
|
135
|
-
activatedRoute.data = of({ <%= entityInstance %> });
|
|
136
|
-
comp.ngOnInit();
|
|
137
|
-
|
|
138
|
-
expect(<%= otherEntity.entityInstance %>Service.query).toHaveBeenCalled();
|
|
139
|
-
expect(<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing).toHaveBeenCalledWith(<%= reference.name %>Collection, <%= reference.name %>);
|
|
140
|
-
expect(comp.<%= relationship.relationshipFieldNamePlural %>Collection).toEqual(expectedCollection);
|
|
141
|
-
});
|
|
142
100
|
|
|
101
|
+
const <%= otherEntity.entityInstance %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
|
|
102
|
+
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= otherEntity.entityInstance %>Collection })));
|
|
103
|
+
const additional<%= otherEntity.entityAngularNamePlural %> = [
|
|
104
|
+
<%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
|
|
105
|
+
<%_ const reference = relationship.reference _%>
|
|
106
|
+
<% if (relationship.collection) { %>...<% } %><%= reference.name %>,
|
|
143
107
|
<%_ } _%>
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
|
|
148
|
-
<%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
|
|
149
|
-
<%_ const otherEntity = relationship.otherEntity _%>
|
|
150
|
-
const <%= relationship.reference.name %>: I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
|
|
151
|
-
<%= entityInstance %>.<%= relationship.reference.name %> = <%= relationship.collection ? `[${relationship.reference.name}]` : relationship.reference.name %>;
|
|
152
|
-
<%_ } _%>
|
|
153
|
-
<%_ } _%>
|
|
108
|
+
];
|
|
109
|
+
const expectedCollection: I<%= otherEntity.entityAngularName %>[] = [...additional<%= otherEntity.entityAngularNamePlural %>, ...<%= otherEntity.entityInstance %>Collection];
|
|
110
|
+
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'add<%= otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
|
|
154
111
|
|
|
155
112
|
activatedRoute.data = of({ <%= entityInstance %> });
|
|
156
113
|
comp.ngOnInit();
|
|
157
114
|
|
|
158
|
-
expect(
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
<%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
|
|
162
|
-
<%_ const otherEntity = relationship.otherEntity _%>
|
|
163
|
-
expect(comp.<% if (!relationshipsWithCustomUniqueOptions.includes(relationship)) { %><%= otherEntity.entityInstancePlural %>Shared<% } else { %><%= relationship.relationshipFieldNamePlural %><% } %>Collection).toContain(<%= relationship.reference.name %>);
|
|
164
|
-
<%_ } _%>
|
|
165
|
-
<%_ } _%>
|
|
166
|
-
});
|
|
115
|
+
expect(<%= otherEntity.entityInstance %>Service.query).toHaveBeenCalled();
|
|
116
|
+
expect(<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing).toHaveBeenCalledWith(<%= otherEntity.entityInstance %>Collection, ...additional<%= otherEntity.entityAngularNamePlural %>);
|
|
117
|
+
expect(comp.<%= otherEntity.entityInstancePlural %>SharedCollection).toEqual(expectedCollection);
|
|
167
118
|
});
|
|
168
119
|
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
comp.ngOnInit();
|
|
178
|
-
|
|
179
|
-
// WHEN
|
|
180
|
-
comp.save();
|
|
181
|
-
expect(comp.isSaving).toEqual(true);
|
|
182
|
-
saveSubject.next(new HttpResponse({ body: <%= entityInstance %> }));
|
|
183
|
-
saveSubject.complete();
|
|
120
|
+
<%_ } _%>
|
|
121
|
+
<%_ for (const relationship of relationshipsWithCustomUniqueOptions) { %>
|
|
122
|
+
<%_ const otherEntity = relationship.otherEntity _%>
|
|
123
|
+
<%_ const reference = relationship.reference _%>
|
|
124
|
+
it('Should call <%= reference.name %> query and add missing value', () => {
|
|
125
|
+
const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
|
|
126
|
+
const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
|
|
127
|
+
<%= entityInstance %>.<%= reference.name %> = <%= reference.name %>;
|
|
184
128
|
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
});
|
|
129
|
+
const <%= reference.name %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>];
|
|
130
|
+
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= reference.name %>Collection })));
|
|
131
|
+
const expectedCollection: I<%= otherEntity.entityAngularName %>[] = [<%= reference.name %>, ...<%= reference.name %>Collection];
|
|
132
|
+
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'add<%= otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
|
|
190
133
|
|
|
191
|
-
it('Should call create service on save for new entity', () => {
|
|
192
|
-
// GIVEN
|
|
193
|
-
const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
|
|
194
|
-
const <%= entityInstance %> = new <%= entityAngularName %>();
|
|
195
|
-
jest.spyOn(<%= entityInstance %>Service, 'create').mockReturnValue(saveSubject);
|
|
196
|
-
jest.spyOn(comp, 'previousState');
|
|
197
134
|
activatedRoute.data = of({ <%= entityInstance %> });
|
|
198
135
|
comp.ngOnInit();
|
|
199
136
|
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
expect(comp.
|
|
203
|
-
|
|
204
|
-
saveSubject.complete();
|
|
137
|
+
expect(<%= otherEntity.entityInstance %>Service.query).toHaveBeenCalled();
|
|
138
|
+
expect(<%= otherEntity.entityInstance %>Service.add<%= otherEntity.entityAngularName %>ToCollectionIfMissing).toHaveBeenCalledWith(<%= reference.name %>Collection, <%= reference.name %>);
|
|
139
|
+
expect(comp.<%= relationship.relationshipFieldNamePlural %>Collection).toEqual(expectedCollection);
|
|
140
|
+
});
|
|
205
141
|
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
142
|
+
<%_ } _%>
|
|
143
|
+
<%_ } _%>
|
|
144
|
+
it('Should update editForm', () => {
|
|
145
|
+
const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
|
|
146
|
+
<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
|
|
147
|
+
<%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
|
|
148
|
+
<%_ const otherEntity = relationship.otherEntity _%>
|
|
149
|
+
const <%= relationship.reference.name %>: I<%= otherEntity.entityAngularName %> = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey) %>;
|
|
150
|
+
<%= entityInstance %>.<%= relationship.reference.name %> = <%= relationship.collection ? `[${relationship.reference.name}]` : relationship.reference.name %>;
|
|
151
|
+
<%_ } _%>
|
|
152
|
+
<%_ } _%>
|
|
211
153
|
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
|
|
215
|
-
const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
|
|
216
|
-
jest.spyOn(<%= entityInstance %>Service, 'update').mockReturnValue(saveSubject);
|
|
217
|
-
jest.spyOn(comp, 'previousState');
|
|
218
|
-
activatedRoute.data = of({ <%= entityInstance %> });
|
|
219
|
-
comp.ngOnInit();
|
|
154
|
+
activatedRoute.data = of({ <%= entityInstance %> });
|
|
155
|
+
comp.ngOnInit();
|
|
220
156
|
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
157
|
+
expect(comp.editForm.value).toEqual(expect.objectContaining(<%= entityInstance %>));
|
|
158
|
+
<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
|
|
159
|
+
<%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
|
|
160
|
+
<%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
|
|
161
|
+
<%_ const otherEntity = relationship.otherEntity _%>
|
|
162
|
+
expect(comp.<% if (!relationshipsWithCustomUniqueOptions.includes(relationship)) { %><%= otherEntity.entityInstancePlural %>Shared<% } else { %><%= relationship.relationshipFieldNamePlural %><% } %>Collection).toContain(<%= relationship.reference.name %>);
|
|
163
|
+
<%_ } _%>
|
|
164
|
+
<%_ } _%>
|
|
165
|
+
});
|
|
166
|
+
});
|
|
225
167
|
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
168
|
+
describe('save', () => {
|
|
169
|
+
it('Should call update service on save for existing entity', () => {
|
|
170
|
+
// GIVEN
|
|
171
|
+
const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
|
|
172
|
+
const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
|
|
173
|
+
jest.spyOn(<%= entityInstance %>Service, 'update').mockReturnValue(saveSubject);
|
|
174
|
+
jest.spyOn(comp, 'previousState');
|
|
175
|
+
activatedRoute.data = of({ <%= entityInstance %> });
|
|
176
|
+
comp.ngOnInit();
|
|
177
|
+
|
|
178
|
+
// WHEN
|
|
179
|
+
comp.save();
|
|
180
|
+
expect(comp.isSaving).toEqual(true);
|
|
181
|
+
saveSubject.next(new HttpResponse({ body: <%= entityInstance %> }));
|
|
182
|
+
saveSubject.complete();
|
|
183
|
+
|
|
184
|
+
// THEN
|
|
185
|
+
expect(comp.previousState).toHaveBeenCalled();
|
|
186
|
+
expect(<%= entityInstance %>Service.update).toHaveBeenCalledWith(<%= entityInstance %>);
|
|
187
|
+
expect(comp.isSaving).toEqual(false);
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
it('Should call create service on save for new entity', () => {
|
|
191
|
+
// GIVEN
|
|
192
|
+
const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
|
|
193
|
+
const <%= entityInstance %> = new <%= entityAngularName %>();
|
|
194
|
+
jest.spyOn(<%= entityInstance %>Service, 'create').mockReturnValue(saveSubject);
|
|
195
|
+
jest.spyOn(comp, 'previousState');
|
|
196
|
+
activatedRoute.data = of({ <%= entityInstance %> });
|
|
197
|
+
comp.ngOnInit();
|
|
198
|
+
|
|
199
|
+
// WHEN
|
|
200
|
+
comp.save();
|
|
201
|
+
expect(comp.isSaving).toEqual(true);
|
|
202
|
+
saveSubject.next(new HttpResponse({ body: <%= entityInstance %> }));
|
|
203
|
+
saveSubject.complete();
|
|
204
|
+
|
|
205
|
+
// THEN
|
|
206
|
+
expect(<%= entityInstance %>Service.create).toHaveBeenCalledWith(<%= entityInstance %>);
|
|
207
|
+
expect(comp.isSaving).toEqual(false);
|
|
208
|
+
expect(comp.previousState).toHaveBeenCalled();
|
|
209
|
+
});
|
|
210
|
+
|
|
211
|
+
it('Should set isSaving to false on error', () => {
|
|
212
|
+
// GIVEN
|
|
213
|
+
const saveSubject = new Subject<HttpResponse<<%= entityAngularName %>>>();
|
|
214
|
+
const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
|
|
215
|
+
jest.spyOn(<%= entityInstance %>Service, 'update').mockReturnValue(saveSubject);
|
|
216
|
+
jest.spyOn(comp, 'previousState');
|
|
217
|
+
activatedRoute.data = of({ <%= entityInstance %> });
|
|
218
|
+
comp.ngOnInit();
|
|
219
|
+
|
|
220
|
+
// WHEN
|
|
221
|
+
comp.save();
|
|
222
|
+
expect(comp.isSaving).toEqual(true);
|
|
223
|
+
saveSubject.error('This is an error!');
|
|
224
|
+
|
|
225
|
+
// THEN
|
|
226
|
+
expect(<%= entityInstance %>Service.update).toHaveBeenCalledWith(<%= entityInstance %>);
|
|
227
|
+
expect(comp.isSaving).toEqual(false);
|
|
228
|
+
expect(comp.previousState).not.toHaveBeenCalled();
|
|
231
229
|
});
|
|
230
|
+
});
|
|
232
231
|
<%_ const trackedEntities = Object.values(differentRelationships).filter(arr => arr.some(rel => rel.reference.owned && rel.otherEntity.primaryKey)).map(arr => arr[0].reference);
|
|
233
232
|
if (trackedEntities.length > 0) {
|
|
234
233
|
_%>
|
|
235
234
|
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
});
|
|
235
|
+
describe('Tracking relationships identifiers', () => {
|
|
236
|
+
<%_ for (reference of trackedEntities) {
|
|
237
|
+
const otherEntity = reference.relationship.otherEntity;
|
|
238
|
+
_%>
|
|
239
|
+
describe('track<%= otherEntity.entityAngularName %>By<%= otherEntity.primaryKey.nameCapitalized %>', () => {
|
|
240
|
+
it('Should return tracked <%= otherEntity.entityAngularName %> primary key', () => {
|
|
241
|
+
const entity = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
|
|
242
|
+
const trackResult = comp.track<%= otherEntity.entityAngularName %>By<%= otherEntity.primaryKey.nameCapitalized %>(0, entity);
|
|
243
|
+
expect(trackResult).toEqual(entity.<%= otherEntity.primaryKey.name %>);
|
|
246
244
|
});
|
|
247
|
-
|
|
248
|
-
<%_ } _%>
|
|
249
245
|
});
|
|
246
|
+
|
|
247
|
+
<%_ } _%>
|
|
248
|
+
});
|
|
250
249
|
<%_ } _%>
|
|
251
250
|
<%_ const selectableEntities = Object.values(differentRelationships).filter(arr => arr.some(rel => rel.relationshipManyToMany && rel.reference.owned && rel.otherEntity.primaryKey)).map(arr => arr[0].reference);
|
|
252
|
-
|
|
251
|
+
if (selectableEntities.length > 0) {
|
|
253
252
|
_%>
|
|
254
253
|
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
});
|
|
265
|
-
|
|
266
|
-
it('Should return selected <%= otherEntity.entityAngularName %> for according option', () => {
|
|
267
|
-
const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
|
|
268
|
-
const selected = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
|
|
269
|
-
const selected2 = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
|
|
270
|
-
const result = comp.getSelected<%= otherEntity.entityAngularName %>(option, [selected2, selected]);
|
|
271
|
-
expect(result === selected).toEqual(true);
|
|
272
|
-
expect(result === selected2).toEqual(false);
|
|
273
|
-
expect(result === option).toEqual(false);
|
|
274
|
-
});
|
|
275
|
-
|
|
276
|
-
it('Should return option if this <%= otherEntity.entityAngularName %> is not selected', () => {
|
|
277
|
-
const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
|
|
278
|
-
const selected = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
|
|
279
|
-
const result = comp.getSelected<%= otherEntity.entityAngularName %>(option, [selected]);
|
|
280
|
-
expect(result === option).toEqual(true);
|
|
281
|
-
expect(result === selected).toEqual(false);
|
|
282
|
-
});
|
|
254
|
+
describe('Getting selected relationships', () => {
|
|
255
|
+
<%_ for (reference of selectableEntities) {
|
|
256
|
+
const otherEntity = reference.relationship.otherEntity;
|
|
257
|
+
_%>
|
|
258
|
+
describe('getSelected<%= otherEntity.entityAngularName %>', () => {
|
|
259
|
+
it('Should return option if no <%= otherEntity.entityAngularName %> is selected', () => {
|
|
260
|
+
const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
|
|
261
|
+
const result = comp.getSelected<%= otherEntity.entityAngularName %>(option);
|
|
262
|
+
expect(result === option).toEqual(true);
|
|
283
263
|
});
|
|
284
264
|
|
|
285
|
-
|
|
265
|
+
it('Should return selected <%= otherEntity.entityAngularName %> for according option', () => {
|
|
266
|
+
const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
|
|
267
|
+
const selected = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
|
|
268
|
+
const selected2 = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
|
|
269
|
+
const result = comp.getSelected<%= otherEntity.entityAngularName %>(option, [selected2, selected]);
|
|
270
|
+
expect(result === selected).toEqual(true);
|
|
271
|
+
expect(result === selected2).toEqual(false);
|
|
272
|
+
expect(result === option).toEqual(false);
|
|
273
|
+
});
|
|
274
|
+
|
|
275
|
+
it('Should return option if this <%= otherEntity.entityAngularName %> is not selected', () => {
|
|
276
|
+
const option = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 0) %>;
|
|
277
|
+
const selected = <%- generateTestEntityPrimaryKey(otherEntity.primaryKey, 1) %>;
|
|
278
|
+
const result = comp.getSelected<%= otherEntity.entityAngularName %>(option, [selected]);
|
|
279
|
+
expect(result === option).toEqual(true);
|
|
280
|
+
expect(result === selected).toEqual(false);
|
|
281
|
+
});
|
|
286
282
|
});
|
|
287
|
-
|
|
283
|
+
|
|
284
|
+
<%_ } _%>
|
|
288
285
|
});
|
|
286
|
+
<%_ } _%>
|
|
289
287
|
});
|
|
@@ -74,6 +74,10 @@ import { <%= uniqueRel.otherEntityAngularName %>Service } from 'app/entities/<%=
|
|
|
74
74
|
}
|
|
75
75
|
});
|
|
76
76
|
_%>
|
|
77
|
+
<%_ const enumImports = generateEntityClientEnumImports(fields); _%>
|
|
78
|
+
<%_ enumImports.forEach( (importedPath, importedType) => { _%>
|
|
79
|
+
import { <%- importedType %> } from '<%- importedPath %>';
|
|
80
|
+
<%_ }); _%>
|
|
77
81
|
|
|
78
82
|
@Component({
|
|
79
83
|
selector: '<%= jhiPrefixDashed %>-<%= entityFileName %>-update',
|
|
@@ -81,6 +85,9 @@ _%>
|
|
|
81
85
|
})
|
|
82
86
|
export class <%= entityAngularName %>UpdateComponent implements OnInit {
|
|
83
87
|
isSaving = false;
|
|
88
|
+
<%_ enumImports.forEach( (importedPath, importedType) => { _%>
|
|
89
|
+
<%- _.lowerFirst(importedType) %>Values = Object.keys(<%- importedType %>);
|
|
90
|
+
<%_ }); _%>
|
|
84
91
|
|
|
85
92
|
<%_ for (const relationshipsByEntityNeedingOptions of Object.values(differentRelationships).map(relationships => relationships.filter(rel => rel.ownerSide)).filter(relationships => relationships.length > 0)) { _%>
|
|
86
93
|
<%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && !rel.otherEntityUser); _%>
|