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
package/generators/client/templates/vue/src/main/webapp/app/entities/entities.component.ts.ejs
ADDED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Component, Provide, Vue } from 'vue-property-decorator';
|
|
2
|
+
|
|
3
|
+
<%_ for (entity of this.localEntities.filter(entity => !entity.embedded)) { _%>
|
|
4
|
+
import <%= entity.entityAngularName %>Service from './<%= entity.entityFolderName %>/<%= entity.entityFileName %>.service';
|
|
5
|
+
<%_ } _%>
|
|
6
|
+
// jhipster-needle-add-entity-service-to-entities-component-import - JHipster will import entities services here
|
|
7
|
+
|
|
8
|
+
@Component
|
|
9
|
+
export default class Entities extends Vue {
|
|
10
|
+
<%_ for (entity of this.localEntities.filter(entity => !entity.embedded)) { _%>
|
|
11
|
+
@Provide('<%= entity.entityInstance %>Service') private <%= entity.entityInstance %>Service = () => new <%= entity.entityAngularName %>Service();
|
|
12
|
+
<%_ } _%>
|
|
13
|
+
// jhipster-needle-add-entity-service-to-entities-component - JHipster will import entities services here
|
|
14
|
+
}
|
package/generators/client/templates/vue/{webpack/utils.js.ejs → src/main/webapp/app/index.ts.ejs}
RENAMED
|
@@ -16,15 +16,4 @@
|
|
|
16
16
|
See the License for the specific language governing permissions and
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
module.exports = {
|
|
22
|
-
root
|
|
23
|
-
};
|
|
24
|
-
|
|
25
|
-
const _root = path.resolve(__dirname, '..');
|
|
26
|
-
|
|
27
|
-
function root(args) {
|
|
28
|
-
args = Array.prototype.slice.call(arguments, 0);
|
|
29
|
-
return path.join.apply(path, [_root].concat(args));
|
|
30
|
-
}
|
|
19
|
+
import('./main');
|
package/generators/client/templates/vue/src/main/webapp/app/locale/translation.service.ts.ejs
CHANGED
|
@@ -11,31 +11,48 @@ export default class TranslationService {
|
|
|
11
11
|
this.store = store;
|
|
12
12
|
this.i18n = i18n;
|
|
13
13
|
}
|
|
14
|
+
<%_ if (microfrontend) { _%>
|
|
15
|
+
|
|
16
|
+
public loadTranslations(appKey: string, urlPrefix: string, hash: string) {
|
|
17
|
+
const currentLanguage = this.store.getters.currentLanguage;
|
|
18
|
+
if (!this.i18n) return;
|
|
19
|
+
|
|
20
|
+
axios.get(`${urlPrefix}i18n/${currentLanguage}.json?_=${hash}`).then((res: any) => {
|
|
21
|
+
if (res.data) {
|
|
22
|
+
this.i18n.mergeLocaleMessage(currentLanguage, res.data);
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
<%_ } _%>
|
|
14
27
|
|
|
15
28
|
public refreshTranslation(newLanguage: string) {
|
|
16
29
|
let currentLanguage = this.store.getters.currentLanguage;
|
|
17
30
|
currentLanguage = newLanguage ? newLanguage : '<%= nativeLanguage %>';
|
|
18
31
|
if (this.i18n && !this.i18n.messages[currentLanguage]) {
|
|
19
32
|
this.i18n.setLocaleMessage(currentLanguage, {});
|
|
20
|
-
axios.get(`i18n/${currentLanguage}.json?_=${I18N_HASH}`).then((res) => {
|
|
33
|
+
axios.get(`i18n/${currentLanguage}.json?_=${I18N_HASH}`).then((res: any) => {
|
|
21
34
|
if (res.data) {
|
|
22
|
-
dayjs.locale(currentLanguage);
|
|
23
35
|
this.i18n.setLocaleMessage(currentLanguage, res.data);
|
|
24
|
-
this.
|
|
25
|
-
this.store.commit('currentLanguage', currentLanguage);
|
|
36
|
+
this.setLocale(currentLanguage);
|
|
26
37
|
}
|
|
27
38
|
});
|
|
28
39
|
} else if (this.i18n) {
|
|
29
|
-
|
|
30
|
-
this.i18n.locale = currentLanguage;
|
|
31
|
-
this.store.commit('currentLanguage', currentLanguage);
|
|
40
|
+
this.setLocale(currentLanguage);
|
|
32
41
|
}
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
private setLocale(lang: string) {
|
|
45
|
+
dayjs.locale(lang);
|
|
46
|
+
this.i18n.locale = lang;
|
|
47
|
+
this.store.commit('currentLanguage', lang);
|
|
48
|
+
axios.defaults.headers.common['Accept-Language'] = lang;
|
|
49
|
+
document.querySelector('html').setAttribute('lang', lang);
|
|
33
50
|
<%_ if (enableI18nRTL) { _%>
|
|
34
|
-
|
|
51
|
+
this.updatePageDirection(lang);
|
|
35
52
|
<%_ } _%>
|
|
36
53
|
}
|
|
37
|
-
|
|
38
54
|
<%_ if (enableI18nRTL) { _%>
|
|
55
|
+
|
|
39
56
|
private isRTL(lang: string): boolean {
|
|
40
57
|
const languages = this.store.getters.languages;
|
|
41
58
|
return languages[lang] && languages[lang].rtl;
|
|
@@ -5,7 +5,7 @@ import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
|
|
|
5
5
|
import App from './app.vue';
|
|
6
6
|
import Vue2Filters from 'vue2-filters';
|
|
7
7
|
import { ToastPlugin } from 'bootstrap-vue';
|
|
8
|
-
import router from './router';
|
|
8
|
+
import router<% if (applicationTypeGateway && microfrontend) { %>, { lazyRoutes }<% } %> from './router';
|
|
9
9
|
import * as config from './shared/config/config';
|
|
10
10
|
import * as bootstrapVueConfig from './shared/config/config-bootstrap-vue';
|
|
11
11
|
import JhiItemCountComponent from './shared/jhi-item-count.vue';
|
|
@@ -24,7 +24,9 @@ import UserManagementService from '@/admin/user-management/user-management.servi
|
|
|
24
24
|
<%_ } _%>
|
|
25
25
|
import LoginService from './account/login.service';
|
|
26
26
|
import AccountService from './account/account.service';
|
|
27
|
+
import AlertService from './shared/alert/alert.service';
|
|
27
28
|
|
|
29
|
+
import '../content/scss/global.scss';
|
|
28
30
|
import '../content/scss/vendor.scss';
|
|
29
31
|
<%_ if (enableTranslation) { _%>
|
|
30
32
|
import TranslationService from '@/locale/translation.service';
|
|
@@ -59,7 +61,7 @@ const i18n = config.initI18N(Vue);
|
|
|
59
61
|
const store = config.initVueXStore(Vue);
|
|
60
62
|
|
|
61
63
|
<%_ if (communicationSpringWebsocket) { _%>
|
|
62
|
-
const trackerService = new TrackerService(router);
|
|
64
|
+
const trackerService = new TrackerService(router<%_ if (authenticationTypeSession) { _%>, (<any>Vue).cookie<%_ } _%>);
|
|
63
65
|
<%_ } _%>
|
|
64
66
|
<%_ if (enableTranslation) { _%>
|
|
65
67
|
const translationService = new TranslationService(store, i18n);
|
|
@@ -67,13 +69,18 @@ const translationService = new TranslationService(store, i18n);
|
|
|
67
69
|
const loginService = new LoginService();
|
|
68
70
|
const accountService = new AccountService(store, <%_ if (enableTranslation) { _%>translationService, <%_ } _%><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>(<any>Vue).cookie, <%_ } _%><%_ if (communicationSpringWebsocket) { _%>trackerService, <%_ } _%>router);
|
|
69
71
|
|
|
70
|
-
router.beforeEach((to, from, next) => {
|
|
71
|
-
|
|
72
|
+
router.beforeEach(async (to, from, next) => {
|
|
72
73
|
if (!to.matched.length) {
|
|
73
|
-
|
|
74
|
-
|
|
74
|
+
<%_ if (applicationTypeGateway && microfrontend) { _%>
|
|
75
|
+
await lazyRoutes;
|
|
76
|
+
if (router.match(to.fullPath).matched.length > 0) {
|
|
77
|
+
next(to.fullPath);
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
75
80
|
|
|
76
|
-
|
|
81
|
+
<%_ } _%>
|
|
82
|
+
next('/not-found');
|
|
83
|
+
} else if (to.meta && to.meta.authorities && to.meta.authorities.length > 0) {
|
|
77
84
|
accountService.hasAnyAuthorityAndCheckAuth(to.meta.authorities).then(value => {
|
|
78
85
|
if (!value) {
|
|
79
86
|
sessionStorage.setItem('requested-url', to.fullPath);
|
|
@@ -120,9 +127,14 @@ new Vue({
|
|
|
120
127
|
translationService: () => translationService,
|
|
121
128
|
<%_ } _%>
|
|
122
129
|
// jhipster-needle-add-entity-service-to-main - JHipster will import entities services here
|
|
123
|
-
accountService: () => accountService
|
|
124
|
-
|
|
130
|
+
accountService: () => accountService,
|
|
131
|
+
alertService: () => new AlertService(),
|
|
132
|
+
<%_ if (applicationTypeMicroservice && microfrontend) { _%>
|
|
133
|
+
microfrontendI18n: false,
|
|
134
|
+
<%_ } _%>
|
|
125
135
|
},
|
|
126
|
-
<%_ if (enableTranslation) { _%>
|
|
127
|
-
|
|
136
|
+
<%_ if (enableTranslation) { _%>
|
|
137
|
+
i18n,
|
|
138
|
+
<%_ } _%>
|
|
139
|
+
store,
|
|
128
140
|
});
|
|
@@ -76,17 +76,17 @@ export default [
|
|
|
76
76
|
name: '<%= jhiPrefixCapitalized %>ConfigurationComponent',
|
|
77
77
|
component: <%= jhiPrefixCapitalized %>ConfigurationComponent,
|
|
78
78
|
meta: { authorities: [Authority.ADMIN] }
|
|
79
|
-
}
|
|
79
|
+
},
|
|
80
80
|
<%_ } _%>
|
|
81
|
-
<%_ if (applicationTypeGateway && serviceDiscoveryType) { _
|
|
81
|
+
<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
|
|
82
82
|
{
|
|
83
83
|
path: '/admin/gateway',
|
|
84
84
|
name: '<%= jhiPrefixCapitalized %>GatewayComponent',
|
|
85
85
|
component: <%= jhiPrefixCapitalized %>GatewayComponent,
|
|
86
86
|
meta: { authorities: [Authority.ADMIN] }
|
|
87
|
-
}
|
|
87
|
+
},
|
|
88
88
|
<%_ } _%>
|
|
89
|
-
<%_ if (communicationSpringWebsocket) { _
|
|
89
|
+
<%_ if (communicationSpringWebsocket) { _%>
|
|
90
90
|
{
|
|
91
91
|
path: '/admin/tracker',
|
|
92
92
|
name: '<%= jhiPrefixCapitalized %>TrackerComponent',
|
|
@@ -1,9 +1,51 @@
|
|
|
1
1
|
import {Authority} from "@/shared/security/authority";
|
|
2
2
|
/* tslint:disable */
|
|
3
3
|
// prettier-ignore
|
|
4
|
+
const Entities = () => import('@/entities/entities.vue');
|
|
4
5
|
|
|
6
|
+
<%_ for (entity of this.localEntities.filter(entity => !entity.embedded)) { _%>
|
|
7
|
+
const <%= entity.entityAngularName %> = () => import('@/entities/<%= entity.entityFolderName %>/<%= entity.entityFileName %>.vue');
|
|
8
|
+
<%_ if (!entity.readOnly) { _%>
|
|
9
|
+
const <%= entity.entityAngularName %>Update = () => import('@/entities/<%= entity.entityFolderName %>/<%= entity.entityFileName %>-update.vue');
|
|
10
|
+
<%_ } _%>
|
|
11
|
+
const <%= entity.entityAngularName %>Details = () => import('@/entities/<%= entity.entityFolderName %>/<%= entity.entityFileName %>-details.vue');
|
|
12
|
+
|
|
13
|
+
<%_ } _%>
|
|
5
14
|
// jhipster-needle-add-entity-to-router-import - JHipster will import entities to the router here
|
|
6
15
|
|
|
7
|
-
export default
|
|
8
|
-
|
|
9
|
-
|
|
16
|
+
export default
|
|
17
|
+
{
|
|
18
|
+
path: '/<%= applicationTypeMicroservice ? baseName.toLowerCase() : '' %>',
|
|
19
|
+
component: Entities,
|
|
20
|
+
children: [
|
|
21
|
+
<%_ for (entity of this.localEntities.filter(entity => !entity.embedded)) { _%>
|
|
22
|
+
{
|
|
23
|
+
path: '<%= entity.entityFileName %>',
|
|
24
|
+
name: '<%= entity.entityAngularName %>',
|
|
25
|
+
component: <%= entity.entityAngularName %>,
|
|
26
|
+
meta: { authorities: [Authority.USER] },
|
|
27
|
+
},
|
|
28
|
+
<%_ if (!entity.readOnly) { _%>
|
|
29
|
+
{
|
|
30
|
+
path: '<%= entity.entityFileName %>/new',
|
|
31
|
+
name: '<%= entity.entityAngularName %>Create',
|
|
32
|
+
component: <%= entity.entityAngularName %>Update,
|
|
33
|
+
meta: { authorities: [Authority.USER] },
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
path: '<%= entity.entityFileName %>/:<%= entity.entityInstance %>Id/edit',
|
|
37
|
+
name: '<%= entity.entityAngularName %>Edit',
|
|
38
|
+
component: <%= entity.entityAngularName %>Update,
|
|
39
|
+
meta: { authorities: [Authority.USER] },
|
|
40
|
+
},
|
|
41
|
+
<%_ } _%>
|
|
42
|
+
{
|
|
43
|
+
path: '<%= entity.entityFileName %>/:<%= entity.entityInstance %>Id/view',
|
|
44
|
+
name: '<%= entity.entityAngularName %>View',
|
|
45
|
+
component: <%= entity.entityAngularName %>Details,
|
|
46
|
+
meta: { authorities: [Authority.USER] },
|
|
47
|
+
},
|
|
48
|
+
<%_ } _%>
|
|
49
|
+
// jhipster-needle-add-entity-to-router - JHipster will add entities to the router here
|
|
50
|
+
],
|
|
51
|
+
};
|
|
@@ -5,7 +5,7 @@ Component.registerHooks([
|
|
|
5
5
|
'beforeRouteLeave',
|
|
6
6
|
'beforeRouteUpdate' // for vue-router 2.2+
|
|
7
7
|
])
|
|
8
|
-
import Router from 'vue-router';
|
|
8
|
+
import Router, { RouteConfig } from 'vue-router';
|
|
9
9
|
|
|
10
10
|
const Home = () => import('@/core/home/home.vue');
|
|
11
11
|
const Error = () => import('@/core/error/error.vue');
|
|
@@ -19,7 +19,7 @@ import pages from "@/router/pages";
|
|
|
19
19
|
Vue.use(Router);
|
|
20
20
|
|
|
21
21
|
// prettier-ignore
|
|
22
|
-
|
|
22
|
+
const router = new Router({
|
|
23
23
|
mode: 'history',
|
|
24
24
|
routes: [
|
|
25
25
|
{
|
|
@@ -43,7 +43,23 @@ export default new Router({
|
|
|
43
43
|
...account,
|
|
44
44
|
<%_ } _%>
|
|
45
45
|
...admin,
|
|
46
|
-
|
|
46
|
+
entities,
|
|
47
47
|
...pages
|
|
48
48
|
]
|
|
49
49
|
});
|
|
50
|
+
|
|
51
|
+
<%_ if (applicationTypeGateway && microfrontend) { _%>
|
|
52
|
+
export const lazyRoutes = Promise.all([
|
|
53
|
+
<%_ for (const remote of microfrontends) { _%>
|
|
54
|
+
import('@<%= remote.lowercaseBaseName %>/entities-router')
|
|
55
|
+
.then(<%= remote.lowercaseBaseName %>Router => {
|
|
56
|
+
router.addRoute(<%= remote.lowercaseBaseName %>Router.default as RouteConfig);
|
|
57
|
+
return <%= remote.lowercaseBaseName %>Router.default;
|
|
58
|
+
}).catch(() => {
|
|
59
|
+
console.log("Error loading <%= remote.lowercaseBaseName %> menus. Make sure it's up.");
|
|
60
|
+
}),
|
|
61
|
+
<%_ } _%>
|
|
62
|
+
]);
|
|
63
|
+
|
|
64
|
+
<%_ } _%>
|
|
65
|
+
export default router;
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import Vue from 'vue';
|
|
2
|
+
|
|
3
|
+
export default class AlertService {
|
|
4
|
+
public showError(instance: Vue, message: string, params?: any) {
|
|
5
|
+
<%_ if (enableTranslation) { _%>
|
|
6
|
+
const alertMessage = instance.$t(message, params);
|
|
7
|
+
<%_ } else {_%>
|
|
8
|
+
const alertMessage = message;
|
|
9
|
+
<%_ } _%>
|
|
10
|
+
instance.$root.$bvToast.toast(alertMessage.toString(), {
|
|
11
|
+
toaster: 'b-toaster-top-center',
|
|
12
|
+
title: 'Error',
|
|
13
|
+
variant: 'danger',
|
|
14
|
+
solid: true,
|
|
15
|
+
autoHideDelay: 5000,
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
public showHttpError(instance: Vue, httpErrorResponse: any) {
|
|
20
|
+
switch (httpErrorResponse.status) {
|
|
21
|
+
case 0:
|
|
22
|
+
this.showError(instance,<% if (enableTranslation) { %> 'error.server.not.reachable'<% } else { %> 'Server not reachable'<% } %>);
|
|
23
|
+
break;
|
|
24
|
+
|
|
25
|
+
case 400: {
|
|
26
|
+
const arr = Object.keys(httpErrorResponse.headers);
|
|
27
|
+
let errorHeader: string | null = null;
|
|
28
|
+
<%_ if (enableTranslation) { _%>
|
|
29
|
+
let entityKey: string | null = null;
|
|
30
|
+
<%_ } _%>
|
|
31
|
+
for (const entry of arr) {
|
|
32
|
+
if (entry.toLowerCase().endsWith('app-error')) {
|
|
33
|
+
errorHeader = httpErrorResponse.headers[entry];
|
|
34
|
+
<%_ if (enableTranslation) { _%>
|
|
35
|
+
} else if (entry.toLowerCase().endsWith('app-params')) {
|
|
36
|
+
entityKey = httpErrorResponse.headers[entry];
|
|
37
|
+
<%_ } _%>
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
if (errorHeader) {
|
|
41
|
+
<%_ if (enableTranslation) { _%>
|
|
42
|
+
const alertData = entityKey ? { entityName: instance.$t(`global.menu.entities.${entityKey}`) } : undefined;
|
|
43
|
+
<%_ } _%>
|
|
44
|
+
this.showError(instance, errorHeader<% if (enableTranslation) { %>, alertData<% } %>);
|
|
45
|
+
} else if (httpErrorResponse.data !== '' && httpErrorResponse.data.fieldErrors) {
|
|
46
|
+
this.showError(instance, <% if (enableTranslation) { %>httpErrorResponse.data.message<% } else { %>'Validation error'<% } %>);
|
|
47
|
+
} else {
|
|
48
|
+
this.showError(instance, httpErrorResponse.data.message);
|
|
49
|
+
}
|
|
50
|
+
break;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
case 404:
|
|
54
|
+
this.showError(instance, <% if (enableTranslation) { %>'error.http.404'<% } else { %>'Not found'<% } %>);
|
|
55
|
+
break;
|
|
56
|
+
|
|
57
|
+
default:
|
|
58
|
+
this.showError(instance, httpErrorResponse.data.message);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs
CHANGED
|
@@ -55,7 +55,9 @@ export default class JhiDataUtils extends Vue {
|
|
|
55
55
|
});
|
|
56
56
|
const objectURL = URL.createObjectURL(blob);
|
|
57
57
|
const win = window.open(objectURL);
|
|
58
|
-
|
|
58
|
+
if (win) {
|
|
59
|
+
win.onload = () => URL.revokeObjectURL(objectURL);
|
|
60
|
+
}
|
|
59
61
|
}
|
|
60
62
|
|
|
61
63
|
/**
|
|
@@ -1,7 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
<%#
|
|
2
|
+
Copyright 2013-2021 the original author or authors from the JHipster project.
|
|
3
3
|
|
|
4
|
-
|
|
4
|
+
This file is part of the JHipster project, see https://www.jhipster.tech/
|
|
5
|
+
for more information.
|
|
6
|
+
|
|
7
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
8
|
+
you may not use this file except in compliance with the License.
|
|
9
|
+
You may obtain a copy of the License at
|
|
10
|
+
|
|
11
|
+
https://www.apache.org/licenses/LICENSE-2.0
|
|
12
|
+
|
|
13
|
+
Unless required by applicable law or agreed to in writing, software
|
|
14
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
15
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
16
|
+
See the License for the specific language governing permissions and
|
|
17
|
+
limitations under the License.
|
|
18
|
+
-%>
|
|
5
19
|
declare module '*.vue' {
|
|
6
20
|
import Vue from 'vue';
|
|
7
21
|
export default Vue;
|
|
@@ -1,34 +1,49 @@
|
|
|
1
|
+
const { pathsToModuleNameMapper } = require('ts-jest/utils');
|
|
2
|
+
const config = require('../../../webpack/config');
|
|
3
|
+
const { compilerOptions: { paths = {}, baseUrl = './' } } = require('../../../tsconfig.json');
|
|
4
|
+
|
|
1
5
|
module.exports = {
|
|
6
|
+
rootDir: '../../../',
|
|
7
|
+
roots: ['<rootDir>', `<rootDir>/${baseUrl}`, `<rootDir>/<%= CLIENT_TEST_SRC_DIR %>spec/app/`],
|
|
8
|
+
preset: 'ts-jest',
|
|
2
9
|
testEnvironment: 'jsdom',
|
|
3
10
|
coverageDirectory: '<rootDir>/<%= BUILD_DIR %>test-results/',
|
|
4
11
|
coveragePathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/<%= CLIENT_TEST_SRC_DIR %>', '<rootDir>/<%= CLIENT_MAIN_SRC_DIR %>app/router', '.*.json'],
|
|
5
12
|
moduleFileExtensions: ['js', 'json', 'ts', 'vue'],
|
|
6
13
|
transform: {
|
|
7
|
-
'.*\\.(vue)$': 'vue-jest',
|
|
8
|
-
'^.+\\.tsx?$': 'ts-jest'
|
|
14
|
+
'.*\\.(vue)$': '<%= microfrontend ? '@vue/vue2-jest' : 'vue-jest' %>',
|
|
15
|
+
'^.+\\.tsx?$': 'ts-jest',
|
|
9
16
|
},
|
|
10
17
|
moduleNameMapper: {
|
|
11
|
-
'^@/(.*)$': '<rootDir>/<%= CLIENT_MAIN_SRC_DIR %>app/$1'
|
|
18
|
+
'^@/(.*)$': '<rootDir>/<%= CLIENT_MAIN_SRC_DIR %>app/$1',
|
|
19
|
+
...pathsToModuleNameMapper(paths, { prefix: `<rootDir>/${baseUrl}/` }),
|
|
20
|
+
<%_ if (applicationTypeGateway && microfrontend) { _%>
|
|
21
|
+
'^@(<%= microfrontends.map(remote => remote.lowercaseBaseName).join('|') %>)/(.*)$': '<rootDir>/<%= CLIENT_TEST_SRC_DIR %>spec/app/microfrontends/$2',
|
|
22
|
+
<%_ } _%>
|
|
12
23
|
},
|
|
13
24
|
reporters: [
|
|
14
25
|
'default',
|
|
15
|
-
[ 'jest-junit', { outputDirectory: './<%= BUILD_DIR %>test-results/', outputName: 'TESTS-results-jest.xml' } ]
|
|
26
|
+
[ 'jest-junit', { outputDirectory: './<%= BUILD_DIR %>test-results/', outputName: 'TESTS-results-jest.xml' } ],
|
|
16
27
|
],
|
|
17
28
|
testResultsProcessor: 'jest-sonar-reporter',
|
|
18
29
|
testMatch: ['<rootDir>/<%= CLIENT_TEST_SRC_DIR %>spec/**/@(*.)@(spec.ts)'],
|
|
19
30
|
snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
|
|
20
|
-
rootDir: '../../../',
|
|
21
|
-
<%_ if (enableTranslation) { _%>
|
|
22
31
|
globals: {
|
|
32
|
+
<%_ if (enableTranslation) { _%>
|
|
23
33
|
I18N_HASH: 'generated_hash',
|
|
24
|
-
},
|
|
25
34
|
<%_ } _%>
|
|
35
|
+
SERVER_API_URL: config.serverApiUrl,
|
|
36
|
+
VERSION: config.version,
|
|
37
|
+
'ts-jest': {
|
|
38
|
+
tsconfig: '<rootDir>/tsconfig.spec.json',
|
|
39
|
+
},
|
|
40
|
+
},
|
|
26
41
|
coverageThreshold: {
|
|
27
42
|
global: {
|
|
28
43
|
statements: 80,
|
|
29
44
|
branches: 60,
|
|
30
45
|
functions: 70,
|
|
31
|
-
lines: 80
|
|
32
|
-
}
|
|
33
|
-
}
|
|
46
|
+
lines: 80,
|
|
47
|
+
},
|
|
48
|
+
},
|
|
34
49
|
};
|
|
@@ -80,7 +80,7 @@ describe('Account Service test suite', () => {
|
|
|
80
80
|
|
|
81
81
|
it('should init service and check for authority after retrieving account but getAccount failed', async () => {
|
|
82
82
|
<%_ if (communicationSpringWebsocket) { _%>
|
|
83
|
-
const trackerService = new TrackerService(null);
|
|
83
|
+
const trackerService = new TrackerService(null<%_ if (authenticationTypeSession) { _%>,null<%_ } %>);
|
|
84
84
|
trackerService.connect = jest.fn();
|
|
85
85
|
<%_ } _%>
|
|
86
86
|
<%_ if (authenticationTypeJwt) { _%>
|
|
@@ -96,7 +96,7 @@ describe('Account Service test suite', () => {
|
|
|
96
96
|
|
|
97
97
|
it('should init service and check for authority after retrieving account', async () => {
|
|
98
98
|
<%_ if (communicationSpringWebsocket) { _%>
|
|
99
|
-
const trackerService = new TrackerService(null);
|
|
99
|
+
const trackerService = new TrackerService(null<%_ if (authenticationTypeSession) { _%>,null<%_ } %>);
|
|
100
100
|
trackerService.connect = jest.fn();
|
|
101
101
|
<%_ } _%>
|
|
102
102
|
<%_ if (authenticationTypeJwt) { _%>
|
|
@@ -2,7 +2,7 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils';
|
|
|
2
2
|
import axios from 'axios';
|
|
3
3
|
import sinon from 'sinon';
|
|
4
4
|
import AccountService from '@/account/account.service';
|
|
5
|
-
import
|
|
5
|
+
import VueRouter from 'vue-router';
|
|
6
6
|
<%_ if (enableTranslation) { _%>
|
|
7
7
|
import TranslationService from '@/locale/translation.service';
|
|
8
8
|
<%_ } _%>
|
|
@@ -50,7 +50,7 @@ describe('LoginForm Component', () => {
|
|
|
50
50
|
<%_ } _%>
|
|
51
51
|
localVue,
|
|
52
52
|
provide: {
|
|
53
|
-
accountService: () => new AccountService(store, <% if (enableTranslation) { %>new TranslationService(store, i18n), <% } %><% if (authenticationTypeSession) { %> { get: () => {} }, <% } %><% if (communicationSpringWebsocket) { %>new TrackerService(
|
|
53
|
+
accountService: () => new AccountService(store, <% if (enableTranslation) { %>new TranslationService(store, i18n), <% } %><% if (authenticationTypeSession) { %> { get: () => {} }, <% } %><% if (communicationSpringWebsocket) { %>new TrackerService(new VueRouter()<%_ if (authenticationTypeSession) { _%>,{ get: jest.fn()}<%_ } %>), <% } %>new VueRouter())
|
|
54
54
|
}
|
|
55
55
|
});
|
|
56
56
|
loginForm = wrapper.vm;
|
|
@@ -6,7 +6,7 @@ import { Observable, Observer } from 'rxjs';
|
|
|
6
6
|
|
|
7
7
|
import * as config from '@/shared/config/config';
|
|
8
8
|
import <%=jhiPrefixCapitalized%>Tracker from '@/admin/tracker/tracker.vue';
|
|
9
|
-
import <%=jhiPrefixCapitalized%>
|
|
9
|
+
import <%=jhiPrefixCapitalized%>TrackerComponent from '@/admin/tracker/tracker.component';
|
|
10
10
|
import TrackerService from '@/admin/tracker/tracker.service';
|
|
11
11
|
|
|
12
12
|
const localVue = createLocalVue();
|
|
@@ -25,14 +25,14 @@ const axiosStub = {
|
|
|
25
25
|
};
|
|
26
26
|
|
|
27
27
|
describe('<%=jhiPrefixCapitalized%>Tracker', () => {
|
|
28
|
-
let wrapper: Wrapper<<%=jhiPrefixCapitalized%>
|
|
29
|
-
let <%=jhiPrefix%>
|
|
28
|
+
let wrapper: Wrapper<<%=jhiPrefixCapitalized%>TrackerComponent>;
|
|
29
|
+
let <%=jhiPrefix%>TrackerView: <%=jhiPrefixCapitalized%>TrackerComponent;
|
|
30
30
|
|
|
31
31
|
beforeEach(() => {
|
|
32
32
|
axiosStub.get.resolves({ data: {} });
|
|
33
33
|
trackerServiceStub = sinon.createStubInstance<TrackerService>(TrackerService);
|
|
34
34
|
trackerServiceStub.receive = sinon.stub().callsFake(() => new Observable(observer => listenerObserver = observer));
|
|
35
|
-
wrapper = shallowMount<<%=jhiPrefixCapitalized%>
|
|
35
|
+
wrapper = shallowMount<<%=jhiPrefixCapitalized%>TrackerComponent>(<%=jhiPrefixCapitalized%>Tracker, {
|
|
36
36
|
store,
|
|
37
37
|
<%_ if (enableTranslation) { _%>
|
|
38
38
|
i18n,
|
|
@@ -42,7 +42,7 @@ describe('<%=jhiPrefixCapitalized%>Tracker', () => {
|
|
|
42
42
|
trackerService: () => trackerServiceStub
|
|
43
43
|
}
|
|
44
44
|
});
|
|
45
|
-
<%=jhiPrefix%>
|
|
45
|
+
<%=jhiPrefix%>TrackerView = wrapper.vm;
|
|
46
46
|
});
|
|
47
47
|
|
|
48
48
|
it('should subscribe', () => {
|
|
@@ -60,14 +60,14 @@ describe('<%=jhiPrefixCapitalized%>Tracker', () => {
|
|
|
60
60
|
it('should add new activity', () => {
|
|
61
61
|
// GIVEN
|
|
62
62
|
const activity1 = { page: 'login', sessionId: '123' };
|
|
63
|
-
<%=jhiPrefix%>
|
|
63
|
+
<%=jhiPrefix%>TrackerView.activities = [activity1];
|
|
64
64
|
|
|
65
65
|
// WHEN
|
|
66
66
|
const activity2 = { page: 'login', sessionId: '456' };
|
|
67
67
|
listenerObserver.next(activity2);
|
|
68
68
|
|
|
69
69
|
// THEN
|
|
70
|
-
expect(<%=jhiPrefix%>
|
|
70
|
+
expect(<%=jhiPrefix%>TrackerView.activities).toEqual([activity1, activity2]);
|
|
71
71
|
});
|
|
72
72
|
|
|
73
73
|
it('should not add logout activity', () => {
|
|
@@ -75,29 +75,29 @@ describe('<%=jhiPrefixCapitalized%>Tracker', () => {
|
|
|
75
75
|
listenerObserver.next({ page: 'logout', sessionId: '123' });
|
|
76
76
|
|
|
77
77
|
// THEN
|
|
78
|
-
expect(<%=jhiPrefix%>
|
|
78
|
+
expect(<%=jhiPrefix%>TrackerView.activities).toEqual([]);
|
|
79
79
|
});
|
|
80
80
|
|
|
81
81
|
it('should update user activity', () => {
|
|
82
82
|
// GIVEN
|
|
83
|
-
<%=jhiPrefix%>
|
|
83
|
+
<%=jhiPrefix%>TrackerView.activities = [{ page: 'login', sessionId: '123' }];
|
|
84
84
|
|
|
85
85
|
// WHEN
|
|
86
86
|
const activity = { page: 'login', sessionId: '123' };
|
|
87
87
|
listenerObserver.next(activity);
|
|
88
88
|
|
|
89
89
|
// THEN
|
|
90
|
-
expect(<%=jhiPrefix%>
|
|
90
|
+
expect(<%=jhiPrefix%>TrackerView.activities).toEqual([activity]);
|
|
91
91
|
});
|
|
92
92
|
|
|
93
93
|
it('should remove user activity', () => {
|
|
94
94
|
// GIVEN
|
|
95
|
-
<%=jhiPrefix%>
|
|
95
|
+
<%=jhiPrefix%>TrackerView.activities = [{ page: 'login', sessionId: '123' }];
|
|
96
96
|
|
|
97
97
|
// WHEN
|
|
98
98
|
listenerObserver.next({ page: 'logout', sessionId: '123' });
|
|
99
99
|
|
|
100
100
|
// THEN
|
|
101
|
-
expect(<%=jhiPrefix%>
|
|
101
|
+
expect(<%=jhiPrefix%>TrackerView.activities).toEqual([]);
|
|
102
102
|
});
|
|
103
103
|
});
|
|
@@ -9,7 +9,8 @@ describe('Tracker Service', () => {
|
|
|
9
9
|
beforeEach(() => {
|
|
10
10
|
routerStub = sinon.createStubInstance<VueRouter>(VueRouter);
|
|
11
11
|
routerStub.afterEach = sinon.spy();
|
|
12
|
-
|
|
12
|
+
|
|
13
|
+
trackerService = new TrackerService(routerStub<%_ if (authenticationTypeSession) { _%>,{ get: jest.fn()}<%_ } %>);
|
|
13
14
|
});
|
|
14
15
|
|
|
15
16
|
it('Should connetion and listener be initialized', () => {
|
|
@@ -11,9 +11,12 @@ import UserManagementEdit from '@/admin/user-management/user-management-edit.vue
|
|
|
11
11
|
import UserManagementEditClass from '@/admin/user-management/user-management-edit.component';
|
|
12
12
|
import UserManagementService from '@/admin/user-management/user-management.service';
|
|
13
13
|
import VueRouter from 'vue-router';
|
|
14
|
+
import { ToastPlugin } from 'bootstrap-vue';
|
|
15
|
+
import AlertService from '@/shared/alert/alert.service';
|
|
14
16
|
|
|
15
17
|
const localVue = createLocalVue();
|
|
16
18
|
localVue.use(VueRouter);
|
|
19
|
+
localVue.use(ToastPlugin);
|
|
17
20
|
|
|
18
21
|
config.initVueApp(localVue);
|
|
19
22
|
<%_ if (enableTranslation) { _%>
|
|
@@ -42,7 +45,8 @@ describe('UserManagementEdit Component', () => {
|
|
|
42
45
|
<%_ } _%>
|
|
43
46
|
localVue,
|
|
44
47
|
provide: {
|
|
45
|
-
userService: () => new UserManagementService()
|
|
48
|
+
userService: () => new UserManagementService(),
|
|
49
|
+
alertService: () => new AlertService(),
|
|
46
50
|
}
|
|
47
51
|
});
|
|
48
52
|
userManagementEdit = wrapper.vm;
|
|
@@ -11,6 +11,7 @@ import UserManagementView from '@/admin/user-management/user-management-view.vue
|
|
|
11
11
|
import UserManagementViewClass from '@/admin/user-management/user-management-view.component';
|
|
12
12
|
import UserManagementService from '@/admin/user-management/user-management.service';
|
|
13
13
|
import {Authority} from '@/shared/security/authority';
|
|
14
|
+
import AlertService from '@/shared/alert/alert.service';
|
|
14
15
|
|
|
15
16
|
const localVue = createLocalVue();
|
|
16
17
|
|
|
@@ -32,7 +33,7 @@ describe('UserManagementView Component', () => {
|
|
|
32
33
|
let userManagementView: UserManagementViewClass;
|
|
33
34
|
|
|
34
35
|
beforeEach(() => {
|
|
35
|
-
wrapper = shallowMount<UserManagementViewClass>(UserManagementView, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, provide: { userService: () => new UserManagementService() } });
|
|
36
|
+
wrapper = shallowMount<UserManagementViewClass>(UserManagementView, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, provide: { userService: () => new UserManagementService(), alertService: () => new AlertService(), } });
|
|
36
37
|
userManagementView = wrapper.vm;
|
|
37
38
|
});
|
|
38
39
|
|