generator-jhipster 8.5.0 → 8.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -4
- package/dist/cli/commands.mjs +2 -0
- package/dist/cli/download.mjs +1 -1
- package/dist/cli/environment-builder.mjs +8 -7
- package/dist/cli/program.mjs +16 -15
- package/dist/cli/utils.mjs +1 -2
- package/dist/generators/angular/cleanup.js +0 -1
- package/dist/generators/angular/entity-files-angular.js +6 -7
- package/dist/generators/angular/files-angular.js +2 -2
- package/dist/generators/angular/generator.js +27 -9
- package/dist/generators/angular/resources/package.json +25 -23
- package/dist/generators/angular/support/path-utils.js +0 -1
- package/dist/generators/angular/templates/eslint.config.js.jhi.angular.ejs +141 -0
- package/dist/generators/angular/templates/jest.conf.js.ejs +4 -2
- package/dist/generators/angular/templates/package.json.ejs +5 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs +9 -9
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +18 -19
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +6 -8
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs +17 -14
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs +9 -12
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs +7 -3
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +13 -11
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +6 -5
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +42 -49
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +4 -6
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs +42 -37
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs +9 -16
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.model.ts.ejs +6 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/session.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs +16 -13
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +3 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/admin.routes.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +8 -10
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.model.ts.ejs +3 -9
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.html.ejs +10 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +44 -40
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +9 -11
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +4 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs +15 -17
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +7 -6
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.ts.ejs +10 -10
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.service.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +18 -21
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +42 -42
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +60 -56
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +24 -24
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +85 -83
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +85 -61
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs +91 -98
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +34 -27
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +42 -41
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +10 -11
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs +8 -7
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +9 -11
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +13 -13
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +13 -16
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +17 -13
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +6 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs +8 -11
- package/dist/generators/angular/templates/src/main/webapp/app/app-page-title-strategy.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/app.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs +8 -6
- package/dist/generators/angular/templates/src/main/webapp/app/app.routes.ts.ejs +3 -8
- package/dist/generators/angular/templates/src/main/webapp/app/config/navigation.constants.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/config/translation.config.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/config/uib-pagination.config.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +13 -9
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/auth-jwt.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/auth.interceptor.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs +31 -31
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/alert.service.ts.ejs +6 -6
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.ts.ejs +5 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs +2 -3
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/parse-links.service.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.routes.ts.ejs +5 -10
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.spec.ts.ejs +3 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs +18 -18
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.spec.ts.ejs +2 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs +2 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.spec.ts.ejs +5 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +8 -7
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs +2 -3
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.route.ts.ejs +3 -5
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +22 -29
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +5 -4
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs +8 -9
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile-info.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +6 -6
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs +15 -17
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.model.ts.ejs +5 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.html.ejs +8 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.html.ejs +8 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +7 -9
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs +10 -7
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs +18 -18
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs +7 -5
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs +6 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs +10 -10
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs +9 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/content/scss/global.scss.ejs +5 -4
- package/dist/generators/angular/templates/src/main/webapp/main.ts.ejs +1 -1
- package/dist/generators/angular/templates/webpack/environment.js.ejs +1 -1
- package/dist/generators/angular/templates/webpack/proxy.conf.js.ejs +1 -2
- package/dist/generators/angular/templates/webpack/webpack.custom.js.ejs +14 -10
- package/dist/generators/angular/templates/webpack/webpack.microfrontend.js.ejs +1 -1
- package/dist/generators/app/generator.js +3 -21
- package/dist/generators/base/command.js +1 -0
- package/dist/generators/base/generator.js +17 -15
- package/dist/generators/base/internal/blueprint.js +1 -1
- package/dist/generators/base/internal/command.js +13 -0
- package/dist/generators/base/internal/index.js +1 -0
- package/dist/generators/base/shared-data.js +74 -2
- package/dist/generators/base/support/config.js +1 -3
- package/dist/generators/base/support/configuration-helpers/options.js +0 -1
- package/dist/generators/base/support/contents.js +0 -2
- package/dist/generators/base/support/faker.js +1 -5
- package/dist/generators/base/support/index.js +1 -1
- package/dist/generators/base/support/jhipster7-context.js +180 -56
- package/dist/generators/base/support/namespace.js +0 -1
- package/dist/generators/base/support/path.js +0 -1
- package/dist/generators/base/support/string.js +2 -2
- package/dist/generators/base/support/write-files.js +0 -1
- package/dist/generators/base-application/generator.js +3 -4
- package/dist/generators/base-application/priorities.js +1 -1
- package/dist/generators/base-application/support/debug.js +0 -1
- package/dist/generators/base-application/support/doc.js +0 -1
- package/dist/generators/base-application/support/entities.js +1 -2
- package/dist/generators/base-application/support/entity.js +0 -1
- package/dist/generators/base-application/support/enum.js +0 -2
- package/dist/generators/base-application/support/field-utils.js +0 -1
- package/dist/generators/base-application/support/prepare-entity.js +5 -5
- package/dist/generators/base-application/support/prepare-field.js +3 -4
- package/dist/generators/base-application/support/prepare-relationship.js +2 -2
- package/dist/generators/base-application/support/relationship.js +1 -1
- package/dist/generators/base-application/support/update-application-entities-transform.js +1 -1
- package/dist/generators/base-core/generator.js +209 -80
- package/dist/generators/base-workspaces/generator.js +2 -2
- package/dist/generators/base-workspaces/internal/deployments.js +1 -1
- package/dist/generators/base-workspaces/internal/docker-prompts.js +2 -2
- package/dist/generators/base-workspaces/priorities.js +1 -1
- package/dist/generators/bootstrap/generator.js +4 -7
- package/dist/generators/bootstrap/support/eslint-transform.js +18 -10
- package/dist/generators/bootstrap/support/eslint-worker.js +14 -24
- package/dist/generators/bootstrap/support/java-unused-imports-transform.js +0 -1
- package/dist/generators/bootstrap/support/multi-step-transform/index.js +0 -1
- package/dist/generators/bootstrap/support/multi-step-transform/template-file.js +6 -1
- package/dist/generators/bootstrap/support/prettier-support.js +16 -11
- package/dist/generators/bootstrap/support/prettier-worker.js +3 -3
- package/dist/generators/bootstrap-application/generator.js +8 -10
- package/dist/generators/bootstrap-application-base/generator.js +5 -6
- package/dist/generators/bootstrap-application-base/utils.js +0 -1
- package/dist/generators/bootstrap-application-client/generator.js +5 -1
- package/dist/generators/bootstrap-application-server/generator.js +1 -1
- package/dist/generators/ci-cd/command.js +2 -2
- package/dist/generators/ci-cd/generator.js +5 -17
- package/dist/generators/ci-cd/index.js +1 -0
- package/dist/generators/ci-cd/templates/docker-registry.yml.ejs +0 -1
- package/dist/generators/ci-cd/templates/jenkins/jenkins.yml.ejs +0 -1
- package/dist/generators/client/files-common.js +1 -4
- package/dist/generators/client/generator.js +7 -25
- package/dist/generators/client/generators/common/generator.js +0 -32
- package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs +1 -1
- package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs +1 -1
- package/dist/generators/client/needle-api/needle-client-vue.js +1 -1
- package/dist/generators/client/prompts.js +1 -1
- package/dist/generators/client/resources/package.json +7 -7
- package/dist/generators/client/support/entity-definition.js +1 -1
- package/dist/generators/client/support/files.js +1 -1
- package/dist/generators/client/support/filter-entities.js +1 -1
- package/dist/generators/client/support/template-utils.js +1 -1
- package/dist/generators/client/support/update-languages.js +0 -1
- package/dist/generators/client/templates/README.md.jhi.client.ejs +29 -20
- package/dist/generators/client/templates/src/main/webapp/index.html.ejs +23 -7
- package/dist/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs +6 -5
- package/dist/generators/client/templates/webpack/webpack.microfrontend.js.jhi.ejs +1 -1
- package/dist/generators/common/command.js +1 -13
- package/dist/generators/common/files.js +1 -14
- package/dist/generators/common/generator.js +23 -75
- package/dist/generators/common/resources/package.json +2 -4
- package/dist/generators/common/templates/{.editorconfig.ejs → .editorconfig.jhi.ejs} +3 -4
- package/dist/generators/cucumber/files.js +19 -1
- package/dist/generators/cucumber/generator.js +18 -18
- package/dist/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberIT.java.ejs +1 -5
- package/dist/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberTestContextConfiguration.java.ejs +1 -3
- package/dist/generators/cypress/files.js +4 -1
- package/dist/generators/cypress/generator.js +7 -8
- package/dist/generators/cypress/index.js +0 -1
- package/dist/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs +40 -0
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs +3 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +4 -2
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/account.ts.ejs +1 -0
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +0 -3
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +0 -3
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +1 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs +0 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs +2 -2
- package/dist/generators/docker/files.js +6 -1
- package/dist/generators/docker/generator.js +2 -3
- package/dist/generators/docker/templates/docker/grafana/provisioning/datasources/datasource.yml.ejs +4 -4
- package/dist/generators/docker/templates/docker/keycloak.yml.ejs +2 -1
- package/dist/generators/docker/templates/docker/mariadb.yml.ejs +1 -1
- package/dist/generators/docker/templates/docker/monitoring.yml.ejs +1 -1
- package/dist/generators/docker/templates/docker/mysql.yml.ejs +1 -2
- package/dist/generators/docker/templates/docker/prometheus/prometheus.yml.ejs +1 -1
- package/dist/generators/docker/templates/docker/realm-config/keycloak-health-check.sh +2 -2
- package/dist/generators/docker/templates/docker/sonar.yml.ejs +1 -1
- package/dist/generators/{init/templates/.eslintignore.jhi.ejs → docker/templates/eslint.config.js.jhi.docker.ejs} +3 -3
- package/dist/generators/docker-compose/files.js +0 -1
- package/dist/generators/docker-compose/generator.js +12 -16
- package/dist/generators/docker-compose/templates/docker-compose.yml.ejs +1 -0
- package/dist/generators/docker-compose/templates/realm-config/keycloak-health-check.sh +2 -2
- package/dist/generators/entities/generator.js +0 -3
- package/dist/generators/entity/generator.js +1 -5
- package/dist/generators/entity/prompts.js +1 -1
- package/dist/generators/entity/support/index.js +0 -1
- package/dist/generators/export-jdl/generator.js +0 -1
- package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizationHeaderUtil.java.ejs +4 -4
- package/dist/generators/gatling/entity-files.js +18 -0
- package/dist/generators/gatling/files.js +19 -1
- package/dist/generators/gatling/generator.js +0 -1
- package/dist/generators/gatling/templates/src/test/java/gatling/simulations/_entityClass_GatlingTest.java.ejs +12 -12
- package/dist/generators/generate-blueprint/files.js +6 -3
- package/dist/generators/generate-blueprint/generator.js +22 -18
- package/dist/generators/generate-blueprint/resources/package.json +3 -1
- package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs +0 -3
- package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/generator.mjs.ejs +2 -6
- package/dist/generators/generate-blueprint/templates/.github/workflows/build-cache.yml.ejs +39 -0
- package/dist/generators/generate-blueprint/templates/.github/workflows/samples.yml.ejs +105 -0
- package/dist/generators/generate-blueprint/templates/.prettierignore.jhi.blueprint.ejs +1 -1
- package/dist/generators/{init/templates/.lintstagedrc.cjs.ejs → generate-blueprint/templates/eslint.config.js.jhi.blueprint.ejs} +6 -3
- package/dist/generators/generator-constants.js +3 -2
- package/dist/generators/git/command.js +14 -3
- package/dist/generators/git/files.js +0 -1
- package/dist/generators/git/generator.js +36 -18
- package/dist/generators/gradle/generator.js +20 -30
- package/dist/generators/gradle/generators/jib/templates/buildSrc/src/main/groovy/jhipster.docker-conventions.gradle.ejs +3 -0
- package/dist/generators/gradle/internal/needles.js +38 -25
- package/dist/generators/gradle/support/dependabot-gradle.js +0 -1
- package/dist/generators/gradle/templates/gradle/wrapper/gradle-wrapper.properties +1 -1
- package/dist/generators/heroku/generator.js +2 -3
- package/dist/generators/heroku/templates.js +0 -1
- package/dist/generators/info/generator.js +7 -3
- package/dist/generators/info/support/extract-info.js +60 -0
- package/dist/generators/info/support/index.js +1 -0
- package/dist/generators/init/command.js +2 -27
- package/dist/generators/init/config.js +0 -2
- package/dist/generators/init/files.js +3 -39
- package/dist/generators/init/generator.js +7 -71
- package/dist/generators/init/resources/.node-version +1 -1
- package/dist/generators/init/templates/.editorconfig.jhi.ejs +1 -1
- package/dist/generators/java/generator.js +1 -10
- package/dist/generators/java/generators/bootstrap/generator.js +40 -27
- package/dist/generators/java/generators/bootstrap/templates/.editorconfig.jhi.java.ejs +3 -0
- package/dist/generators/java/generators/build-tool/command.js +2 -2
- package/dist/generators/java/generators/build-tool/generator.js +19 -24
- package/dist/generators/java/generators/code-quality/generator.js +0 -32
- package/dist/generators/java/generators/domain/generator.js +2 -11
- package/dist/generators/java/generators/domain/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs +2 -2
- package/dist/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Asserts.java.ejs +7 -0
- package/dist/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs +0 -1
- package/dist/generators/java/generators/jib/generator.js +0 -32
- package/dist/generators/java/generators/node/generator.js +0 -32
- package/dist/generators/java/generators/node/templates/npmw +1 -5
- package/dist/generators/java/generators/openapi-generator/README.md +7 -0
- package/dist/generators/java/generators/openapi-generator/command.js +14 -0
- package/dist/generators/java/generators/openapi-generator/generator.js +130 -0
- package/dist/generators/{init/constants.js → java/generators/openapi-generator/index.js} +2 -3
- package/dist/generators/java/generators/openapi-generator/templates/README.md.jhi.openapi-generator.ejs +48 -0
- package/dist/generators/{server/templates/gradle/swagger.gradle.ejs → java/generators/openapi-generator/templates/buildSrc/src/main/groovy/jhipster.openapi-generator-conventions.gradle.ejs} +3 -5
- package/dist/generators/java/support/add-java-annotation.js +1 -1
- package/dist/generators/java/support/checks/index.js +0 -1
- package/dist/generators/java/support/files.js +2 -2
- package/dist/generators/java/support/key-store.js +1 -2
- package/dist/generators/javascript/generators/bootstrap/command.js +23 -0
- package/dist/generators/javascript/generators/bootstrap/generator.js +82 -0
- package/dist/generators/javascript/generators/bootstrap/index.js +20 -0
- package/dist/generators/{common/templates/.prettierignore.jhi.ejs → javascript/generators/bootstrap/templates/package.json.ejs} +7 -6
- package/dist/generators/javascript/generators/eslint/command.js +11 -0
- package/dist/generators/javascript/generators/eslint/generator.js +84 -0
- package/dist/generators/javascript/generators/eslint/index.js +20 -0
- package/dist/generators/javascript/generators/eslint/support/index.js +1 -0
- package/dist/generators/javascript/generators/eslint/support/tasks.js +31 -0
- package/dist/generators/javascript/generators/eslint/templates/eslint.config.js.jhi.ejs +59 -0
- package/dist/generators/javascript/generators/husky/command.js +13 -0
- package/dist/generators/javascript/generators/husky/generator.js +75 -0
- package/dist/generators/javascript/generators/husky/index.js +20 -0
- package/dist/generators/javascript/generators/husky/templates/.husky/pre-commit.ejs +1 -0
- package/dist/generators/{common → javascript/generators/husky}/templates/.lintstagedrc.cjs.ejs +1 -1
- package/dist/generators/javascript/generators/prettier/command.js +43 -0
- package/dist/generators/javascript/generators/prettier/generator.js +127 -0
- package/dist/generators/javascript/generators/prettier/index.js +20 -0
- package/dist/generators/{init → javascript/generators/prettier}/templates/.prettierrc.yml.jhi.ejs +2 -4
- package/dist/generators/javascript/resources/package.json +8 -0
- package/dist/generators/jdl/generator.js +9 -12
- package/dist/generators/kubernetes/files.js +1 -1
- package/dist/generators/kubernetes/generator.js +5 -6
- package/dist/generators/kubernetes/kubernetes-base.js +2 -2
- package/dist/generators/kubernetes/kubernetes-constants.js +1 -1
- package/dist/generators/kubernetes/prompts.js +2 -2
- package/dist/generators/kubernetes/templates/db/mysql.yml.ejs +1 -0
- package/dist/generators/kubernetes-helm/generator.js +4 -5
- package/dist/generators/kubernetes-knative/files.js +0 -1
- package/dist/generators/kubernetes-knative/generator.js +8 -9
- package/dist/generators/languages/files.js +0 -1
- package/dist/generators/languages/generator.js +6 -9
- package/dist/generators/languages/support/load-config.js +1 -1
- package/dist/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs +12 -12
- package/dist/generators/liquibase/files.js +0 -1
- package/dist/generators/liquibase/generator.js +9 -17
- package/dist/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs +4 -5
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +1 -1
- package/dist/generators/maven/command.js +16 -0
- package/dist/generators/maven/generator.js +25 -4
- package/dist/generators/maven/generators/code-quality/generator.js +0 -32
- package/dist/generators/maven/generators/frontend-plugin/generator.js +0 -32
- package/dist/generators/maven/generators/jib/generator.js +21 -34
- package/dist/generators/maven/index.js +1 -0
- package/dist/generators/maven/internal/pom-sort.js +144 -0
- package/dist/generators/maven/internal/xml-store.js +12 -10
- package/dist/generators/maven/support/dependabot-maven.js +3 -2
- package/dist/generators/maven/support/index.js +1 -0
- package/dist/generators/maven/support/pom-file-sort.js +28 -0
- package/dist/generators/maven/support/pom-store.js +8 -94
- package/dist/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +1 -1
- package/dist/generators/project-name/command.js +0 -18
- package/dist/generators/project-name/generator.js +3 -7
- package/dist/generators/project-name/support/index.js +0 -1
- package/dist/generators/react/application/entities/index.js +0 -1
- package/dist/generators/react/entity-files-react.js +7 -7
- package/dist/generators/react/files-react.js +5 -4
- package/dist/generators/react/generator.js +29 -12
- package/dist/generators/react/resources/package.json +27 -26
- package/dist/generators/react/templates/eslint.config.js.jhi.react.ejs +101 -0
- package/dist/generators/react/templates/jest.conf.js.ejs +37 -38
- package/dist/generators/react/templates/package.json.ejs +4 -3
- package/dist/generators/react/templates/postcss.config.js.ejs +1 -3
- package/dist/generators/react/templates/src/main/webapp/app/_bootstrap-variables.scss.ejs +11 -11
- package/dist/generators/react/templates/src/main/webapp/app/app.scss.ejs +68 -66
- package/dist/generators/react/templates/src/main/webapp/app/app.tsx.ejs +12 -3
- package/dist/generators/react/templates/src/main/webapp/app/config/axios-interceptor.spec.ts.ejs +3 -4
- package/dist/generators/react/templates/src/main/webapp/app/config/axios-interceptor.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/config/constants.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/config/error-middleware.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.spec.ts.ejs +5 -5
- package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs +3 -2
- package/dist/generators/react/templates/src/main/webapp/app/config/store.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/config/translation.ts.ejs +4 -0
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/index.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/activate/activate.reducer.spec.ts.ejs +1 -5
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/activate/activate.reducer.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/activate/activate.tsx.ejs +3 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password/password.reducer.spec.ts.ejs +6 -10
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password/password.reducer.ts.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs +36 -34
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.ejs +4 -5
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.spec.ts.ejs +5 -8
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.tsx.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/sessions/sessions.reducer.ts.ejs +7 -13
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/sessions/sessions.tsx.ejs +34 -25
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.spec.ts.ejs +6 -9
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs +25 -25
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs +23 -15
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/docs/docs.scss.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/docs/docs.tsx.ejs +6 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/health/health-modal.tsx.ejs +9 -4
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/health/health.tsx.ejs +11 -6
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/index.tsx.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/logs/logs.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +3 -10
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-delete-dialog.tsx.ejs +10 -4
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs +14 -11
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.reducer.spec.ts.ejs +30 -47
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.reducer.ts.ejs +11 -23
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +31 -23
- package/dist/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs +15 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/login/login-redirect.tsx.ejs +4 -0
- package/dist/generators/react/templates/src/main/webapp/app/modules/login/logout.tsx.ejs +5 -3
- package/dist/generators/react/templates/src/main/webapp/app/routes.tsx.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/setup-tests.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/DurationFormat.tsx.ejs +8 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.spec.tsx.ejs +7 -9
- package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary.spec.tsx.ejs +1 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary.tsx.ejs +7 -7
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs +4 -5
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.scss.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs +5 -6
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.tsx.ejs +0 -9
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/account.spec.tsx.ejs +3 -5
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/account.tsx.ejs +29 -6
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/locale.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +9 -9
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/menu-item.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/password/password-strength-bar.tsx.ejs +8 -15
- package/dist/generators/react/templates/src/main/webapp/app/shared/model/user.model.ts.ejs +1 -2
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/application-profile.spec.ts.ejs +9 -10
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/application-profile.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs +14 -17
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.ts.ejs +8 -4
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/locale.spec.ts.ejs +42 -25
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/locale.ts.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs +7 -8
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/user-management.spec.ts.ejs +4 -6
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/user-management.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/date-utils.ts.ejs +2 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/entity-utils.spec.ts.ejs +10 -12
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/entity-utils.ts.ejs +4 -2
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/url-utils.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/typings.d.ts.ejs +2 -2
- package/dist/generators/react/templates/webpack/environment.js.ejs +2 -2
- package/dist/generators/react/templates/webpack/utils.js.ejs +2 -2
- package/dist/generators/react/templates/webpack/webpack.common.js.ejs +8 -11
- package/dist/generators/react/templates/webpack/webpack.dev.js.ejs +0 -1
- package/dist/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs +0 -5
- package/dist/generators/server/generator.js +11 -39
- package/dist/generators/server/jdl/application-definition.js +1 -1
- package/dist/generators/server/resources/Dockerfile +16 -16
- package/dist/generators/server/resources/gradle/libs.versions.toml +16 -12
- package/dist/generators/server/resources/pom.xml +14 -20
- package/dist/generators/server/support/config.js +1 -1
- package/dist/generators/server/support/database.js +1 -1
- package/dist/generators/server/support/prepare-entity.js +1 -1
- package/dist/generators/server/support/prepare-field.js +2 -2
- package/dist/generators/server/support/relationship.js +0 -1
- package/dist/generators/server/support/spring-factories.js +0 -1
- package/dist/generators/server/support/string.js +0 -1
- package/dist/generators/server/support/templates/field-values.js +1 -1
- package/dist/generators/spring-boot/cleanup.js +5 -2
- package/dist/generators/spring-boot/command.js +1 -1
- package/dist/generators/spring-boot/entity-cleanup.js +0 -1
- package/dist/generators/spring-boot/entity-files.js +2 -2
- package/dist/generators/spring-boot/files.js +7 -11
- package/dist/generators/spring-boot/generator.js +28 -49
- package/dist/generators/spring-boot/prompts.js +1 -1
- package/dist/generators/spring-boot/resources/spring-boot-dependencies.pom +138 -241
- package/dist/generators/{server → spring-boot}/templates/README.md.jhi.spring-boot.ejs +0 -30
- package/dist/generators/spring-boot/templates/_global_partials_entity_/save_template.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/build.gradle.ejs +1 -10
- package/dist/generators/{server → spring-boot}/templates/gradle/profile_dev.gradle.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/gradle/profile_prod.gradle.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/gradle.properties.ejs +0 -6
- package/dist/generators/{server → spring-boot}/templates/pom.xml.ejs +5 -108
- package/dist/generators/{server → spring-boot}/templates/settings.gradle.ejs +10 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/Application.java.ejs +27 -17
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_stream_template.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs +5 -5
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_filtered_template.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_template.ejs +2 -2
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs +13 -10
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs +37 -36
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs +4 -4
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.java.ejs +11 -11
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/PublicUserResource.java.ejs +3 -3
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs +37 -16
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/_entityClass_Resource.java.ejs +7 -7
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs +16 -16
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs +2 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs +17 -16
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/Constants.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +23 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +59 -34
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs +5 -5
- package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SpringDocConfiguration.java.ejs +40 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/WebConfigurer.java.ejs +6 -6
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs +2 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs +3 -5
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs +23 -28
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/SecurityUtils.java.ejs +12 -13
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs +3 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs +9 -8
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/MailService.java.ejs +22 -13
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs +11 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs +8 -5
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs +5 -7
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs +33 -41
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs +9 -22
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs +12 -22
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs +2 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs +16 -21
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs +3 -5
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs +7 -7
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs +7 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs +17 -17
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs +6 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-dev.yml.ejs +4 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-prod.yml.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application.yml.ejs +8 -10
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/bootstrap-prod.yml.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/bootstrap.yml.ejs +2 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/error.html.ejs +4 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/activationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/creationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs +5 -1
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/PublicUserResourceIT.java.ejs +1 -11
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs +7 -12
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +35 -23
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs +2 -6
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs +11 -17
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs +2 -0
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs +13 -40
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs +10 -6
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs +21 -25
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs +3 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs +3 -2
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs +7 -12
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/service/MailServiceIT.java.ejs +5 -3
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs +4 -12
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs +1 -0
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs +34 -38
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs +20 -13
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs +4 -4
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs +4 -4
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs +3 -5
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs +2 -2
- package/dist/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +212 -0
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs +4 -3
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/config/bootstrap.yml.ejs +12 -12
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/activationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/creationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs +1 -1
- package/dist/generators/spring-cache/files.js +19 -1
- package/dist/generators/spring-cache/generator.js +11 -10
- package/dist/generators/spring-cache/internal/dependencies.js +0 -1
- package/dist/generators/spring-cache/resources/gradle/libs.versions.toml +3 -3
- package/dist/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs +20 -19
- package/dist/generators/spring-cache/templates/src/test/java/_package_/config/RedisTestContainer.java.ejs +2 -2
- package/dist/generators/spring-cloud/generators/gateway/command.js +5 -0
- package/dist/generators/spring-cloud/generators/gateway/generator.js +21 -37
- package/dist/generators/spring-cloud/generators/gateway/templates/src/main/java/_package_/web/rest/GatewayResource_imperative.java.ejs +126 -0
- package/dist/generators/spring-cloud-stream/generators/kafka/files.js +1 -1
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaConsumer_imperative.java.ejs +5 -5
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaConsumer_reactive.java.ejs +2 -2
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/web/rest/KafkaResource_imperative.java.ejs +2 -2
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/web/rest/KafkaResource_reactive.java.ejs +3 -3
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/test/java/_package_/config/KafkaTestContainer.java.ejs +2 -2
- package/dist/generators/spring-cloud-stream/generators/pulsar/files.js +1 -1
- package/dist/generators/spring-cloud-stream/generators/pulsar/templates/src/test/java/_package_/config/PulsarTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-cassandra/files.js +1 -1
- package/dist/generators/spring-data-cassandra/generator.js +1 -1
- package/dist/generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-couchbase/files.js +1 -1
- package/dist/generators/spring-data-couchbase/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs +2 -2
- package/dist/generators/spring-data-couchbase/templates/src/test/java/_package_/config/CouchbaseTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-elasticsearch/generator.js +1 -1
- package/dist/generators/spring-data-elasticsearch/templates/src/test/java/_package_/config/ElasticsearchTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-mongodb/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs +0 -3
- package/dist/generators/spring-data-mongodb/templates/src/test/java/_package_/config/MongoDbTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-neo4j/entity-files.js +18 -0
- package/dist/generators/spring-data-neo4j/files.js +1 -1
- package/dist/generators/spring-data-neo4j/generator.js +14 -13
- package/dist/generators/spring-data-neo4j/templates/src/main/java/_package_/config/DatabaseConfiguration.java_neo4j.ejs +18 -2
- package/dist/generators/spring-data-neo4j/templates/src/test/java/_package_/config/Neo4jTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/files.js +2 -2
- package/dist/generators/spring-data-relational/generator.js +35 -51
- package/dist/generators/spring-data-relational/internal/dependencies.js +0 -1
- package/dist/generators/spring-data-relational/support/application-properties.js +1 -1
- package/dist/generators/spring-data-relational/support/database-data.js +1 -1
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs +35 -28
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/UserSqlHelper_reactive.java.ejs +1 -0
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/ColumnConverter_reactive.java.ejs +0 -2
- package/dist/generators/spring-data-relational/templates/src/main/resources/.h2.server.properties.ejs +1 -1
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MariadbTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MsSqlTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MysqlTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/PostgreSqlTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainer.java.ejs +0 -1
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs +1 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/repository/timezone/DateTimeWrapperRepository.java.ejs +1 -3
- package/dist/generators/spring-websocket/files.js +18 -0
- package/dist/generators/spring-websocket/templates/src/main/java/_package_/web/websocket/ActivityService.java.ejs +2 -2
- package/dist/generators/upgrade/generator.js +2 -5
- package/dist/generators/vue/entity-files-vue.js +7 -7
- package/dist/generators/vue/files-vue.js +3 -3
- package/dist/generators/vue/generator.js +28 -12
- package/dist/generators/vue/resources/package.json +29 -30
- package/dist/generators/vue/support/translate-vue.js +1 -1
- package/dist/generators/vue/templates/.postcssrc.js.ejs +2 -2
- package/dist/generators/vue/templates/eslint.config.js.jhi.vue.ejs +74 -0
- package/dist/generators/vue/templates/package.json.ejs +5 -5
- package/dist/generators/vue/templates/src/main/webapp/app/account/account.service.spec.ts.ejs +3 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/account.service.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/activate/activate.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.component.spec.ts.ejs +13 -12
- package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs +122 -77
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.spec.ts.ejs +35 -25
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.ts.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs +11 -7
- package/dist/generators/vue/templates/src/main/webapp/app/account/login.service.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/login.service.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.vue.ejs +211 -143
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.component.spec.ts.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.vue.ejs +101 -72
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.component.spec.ts.ejs +35 -35
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.vue.ejs +69 -44
- package/dist/generators/vue/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +6 -6
- package/dist/generators/vue/templates/src/main/webapp/app/account/sessions/sessions.vue.ejs +38 -36
- package/dist/generators/vue/templates/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +6 -7
- package/dist/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs +91 -34
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +4 -4
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +9 -9
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.vue.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/admin/docs/docs.vue.ejs +11 -3
- package/dist/generators/vue/templates/src/main/webapp/app/admin/gateway/gateway.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health-modal.component.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +56 -56
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.service.ts.ejs +7 -8
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.vue.ejs +3 -4
- package/dist/generators/vue/templates/src/main/webapp/app/admin/logs/logs.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/logs/logs.vue.ejs +8 -8
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics-modal.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics-modal.vue.ejs +6 -6
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +171 -173
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +4 -4
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.service.ts.ejs +0 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.vue.ejs +58 -48
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs +2 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-edit.vue.ejs +77 -38
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-view.vue.ejs +2 -3
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management.vue.ejs +20 -23
- package/dist/generators/vue/templates/src/main/webapp/app/core/error/error.vue.ejs +3 -5
- package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.vue.ejs +8 -6
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-footer/jhi-footer.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +6 -8
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +22 -23
- package/dist/generators/vue/templates/src/main/webapp/app/core/ribbon/ribbon.component.ts.ejs +1 -3
- package/dist/generators/vue/templates/src/main/webapp/app/core/ribbon/ribbon.vue.ejs +30 -30
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.vue.ejs +4 -4
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.vue.ejs +12 -12
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.vue.ejs +14 -14
- package/dist/generators/vue/templates/src/main/webapp/app/entities/entities-menu.component.ts.ejs +4 -1
- package/dist/generators/vue/templates/src/main/webapp/app/main.ts.ejs +9 -5
- package/dist/generators/vue/templates/src/main/webapp/app/router/admin.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/alert/alert.service.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/shared/computables/arrays.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/config/axios-interceptor.spec.ts.ejs +30 -30
- package/dist/generators/vue/templates/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/shared/config/config.ts.ejs +9 -12
- package/dist/generators/vue/templates/src/main/webapp/app/shared/data/data-utils.service.spec.ts.ejs +15 -11
- package/dist/generators/vue/templates/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +5 -5
- package/dist/generators/vue/templates/src/main/webapp/app/shared/jhi-item-count.vue.ejs +1 -3
- package/dist/generators/vue/templates/src/main/webapp/app/shared/model/user.model.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/security/authority.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/sort/jhi-sort-indicator.vue.ejs +2 -3
- package/dist/generators/vue/templates/src/main/webapp/app/shared/sort/sorts.spec.ts.ejs +0 -1
- package/dist/generators/vue/templates/src/main/webapp/app/test-setup.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/content/scss/global.scss.ejs +94 -94
- package/dist/generators/vue/templates/vite.config.mts.ejs +4 -2
- package/dist/generators/vue/templates/webpack/config.js.ejs +4 -6
- package/dist/generators/vue/templates/webpack/vue.utils.js.ejs +3 -7
- package/dist/generators/vue/templates/webpack/webpack.common.js.ejs +1 -1
- package/dist/generators/vue/templates/webpack/webpack.dev.js.ejs +8 -9
- package/dist/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs +0 -6
- package/dist/generators/vue/templates/webpack/webpack.prod.js.ejs +17 -18
- package/dist/generators/workspaces/generator.js +25 -5
- package/dist/generators/workspaces/support/applications-lookup.js +31 -0
- package/dist/generators/workspaces/support/index.js +19 -0
- package/dist/generators/workspaces/templates/.prettierignore.jhi.workspaces.ejs +26 -0
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js +1 -1
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js +1 -1
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-option-converter.js +1 -1
- package/dist/jdl/converters/json-to-jdl-converter.js +4 -4
- package/dist/jdl/converters/json-to-jdl-entity-converter.js +1 -1
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/application-converter.js +1 -1
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/option-converter.js +1 -1
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +1 -3
- package/dist/jdl/exporters/jhipster-entity-exporter.js +1 -1
- package/dist/jdl/jhipster/application-options.js +1 -1
- package/dist/jdl/jhipster/default-application-options.js +1 -1
- package/dist/jdl/jhipster/field-types.js +2 -2
- package/dist/jdl/jhipster/reserved-keywords.js +2 -2
- package/dist/jdl/linters/entity-linter.js +1 -1
- package/dist/jdl/linters/relationship-linter.js +1 -1
- package/dist/jdl/linters/rule.js +1 -1
- package/dist/jdl/linters/rules.js +1 -1
- package/dist/jdl/models/index.js +0 -1
- package/dist/jdl/models/jdl-binary-option.js +1 -1
- package/dist/jdl/models/jdl-deployment.js +1 -1
- package/dist/jdl/models/jdl-object.js +1 -1
- package/dist/jdl/models/jdl-unary-option.js +1 -1
- package/dist/jdl/models/list-jdl-application-configuration-option.js +1 -1
- package/dist/jdl/parsing/exports.js +2 -2
- package/dist/jdl/parsing/jdl-ast-builder-visitor.js +2 -2
- package/dist/jdl/parsing/lexer/application-tokens.js +2 -2
- package/dist/jdl/parsing/lexer/lexer.js +1 -1
- package/dist/jdl/parsing/lexer/option-tokens.js +1 -1
- package/dist/jdl/parsing/lexer/token-creator.js +1 -1
- package/dist/jdl/parsing/self-checks/parsing-system-checker.js +1 -2
- package/dist/jdl/parsing/validator.js +1 -1
- package/dist/jdl/readers/json-reader.js +2 -3
- package/dist/jdl/utils/file-utils.js +1 -1
- package/dist/jdl/utils/objects/logger.js +8 -9
- package/dist/jdl/validators/deployment-validator.js +1 -1
- package/dist/jdl/validators/entity-validator.js +1 -1
- package/dist/jdl/validators/enum-validator.js +1 -1
- package/dist/jdl/validators/jdl-with-application-validator.js +1 -1
- package/dist/jdl/validators/jdl-without-application-validator.js +2 -2
- package/dist/jdl/validators/relationship-validator.js +1 -1
- package/dist/jdl/validators/validation-validator.js +1 -1
- package/dist/lib/eslint/base.js +46 -0
- package/dist/lib/eslint/index.js +4 -0
- package/dist/lib/eslint/recommended.js +23 -0
- package/dist/lib/index.js +0 -1
- package/dist/lib/internal/config-def.js +2 -4
- package/dist/testing/github.js +32 -0
- package/dist/testing/helpers.js +33 -10
- package/dist/testing/index.js +2 -0
- package/dist/testing/sample-config.js +31 -0
- package/dist/testing/support/client-samples.js +1 -2
- package/dist/testing/support/matrix-utils.js +22 -10
- package/dist/testing/support/server-samples.js +2 -3
- package/dist/types/cli/commands.d.mts +2 -0
- package/dist/types/cli/environment-builder.d.mts +1 -0
- package/dist/types/generators/base/api.d.ts +36 -14
- package/dist/types/generators/base/generator.d.ts +1 -1
- package/dist/types/generators/base/internal/command.d.ts +2 -0
- package/dist/types/generators/base/internal/index.d.ts +1 -0
- package/dist/types/generators/base/shared-data.d.ts +10 -1
- package/dist/types/generators/base/support/config.d.ts +2 -2
- package/dist/types/generators/base/support/index.d.ts +1 -1
- package/dist/types/generators/base/support/jhipster7-context.d.ts +495 -1
- package/dist/types/generators/base/support/logger.d.ts +1 -1
- package/dist/types/generators/base/types.d.ts +12 -0
- package/dist/types/generators/base-application/application-options.d.ts +1 -1
- package/dist/types/generators/base-application/generator.d.ts +3 -3
- package/dist/types/generators/base-application/support/relationship.d.ts +1 -1
- package/dist/types/generators/base-application/support/task-type-inference.d.ts +1 -1
- package/dist/types/generators/base-application/tasks.d.ts +3 -3
- package/dist/types/generators/base-application/types/entity.d.ts +5 -0
- package/dist/types/generators/base-application/types.d.ts +15 -0
- package/dist/types/generators/base-core/generator.d.ts +10 -2
- package/dist/types/generators/bootstrap/support/eslint-transform.d.ts +20 -2
- package/dist/types/generators/bootstrap/support/eslint-worker.d.ts +6 -2
- package/dist/types/generators/bootstrap/support/multi-step-transform/template-file-fs.d.ts +1 -1
- package/dist/types/generators/bootstrap/support/prettier-support.d.ts +20 -5
- package/dist/types/generators/client/support/files.d.ts +3 -1
- package/dist/types/generators/client/types.d.ts +3 -1
- package/dist/types/generators/generator-constants.d.ts +1 -1
- package/dist/types/generators/gradle/types.d.ts +6 -5
- package/dist/types/generators/info/support/extract-info.d.ts +14 -0
- package/dist/types/generators/info/support/index.d.ts +1 -0
- package/dist/types/generators/java/types.d.ts +22 -0
- package/dist/types/generators/javascript/types.d.ts +12 -0
- package/dist/types/generators/languages/support/detect-language.d.ts +1 -1
- package/dist/types/generators/languages/support/languages.d.ts +4 -4
- package/dist/types/generators/languages/types.d.ts +1 -1
- package/dist/types/generators/maven/internal/pom-sort.d.ts +2 -0
- package/dist/types/generators/maven/internal/xml-store.d.ts +6 -3
- package/dist/types/generators/maven/support/index.d.ts +1 -0
- package/dist/types/generators/maven/support/pom-file-sort.d.ts +25 -0
- package/dist/types/generators/maven/support/pom-store.d.ts +5 -2
- package/dist/types/generators/maven/types.d.ts +1 -0
- package/dist/types/generators/server/types.d.ts +11 -3
- package/dist/types/generators/spring-cloud/generators/gateway/types.d.ts +2 -1
- package/dist/types/generators/workspaces/support/applications-lookup.d.ts +1 -0
- package/dist/types/generators/workspaces/support/index.d.ts +19 -0
- package/dist/types/jdl/converters/json-to-jdl-converter.d.ts +1 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/application-converter.d.ts +1 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.d.ts +1 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/option-converter.d.ts +1 -1
- package/dist/types/jdl/converters/types.d.ts +1 -1
- package/dist/types/jdl/exporters/types.d.ts +1 -1
- package/dist/types/jdl/models/jdl-application-configuration-factory.d.ts +1 -1
- package/dist/types/jdl/models/jdl-application.d.ts +1 -1
- package/dist/types/jdl/models/jdl-enum.d.ts +1 -1
- package/dist/types/jdl/models/jdl-relationship.d.ts +1 -1
- package/dist/types/jdl/parsing/exports.d.ts +2 -2
- package/dist/types/jdl/utils/objects/logger.d.ts +6 -19
- package/dist/types/jdl/validators/deployment-validator.d.ts +1 -1
- package/dist/types/jdl/validators/relationship-validator.d.ts +1 -1
- package/dist/types/lib/eslint/base.d.ts +8 -0
- package/dist/types/lib/eslint/index.d.ts +15 -0
- package/dist/types/lib/eslint/recommended.d.ts +3 -0
- package/dist/types/testing/github.d.ts +11 -0
- package/dist/types/testing/helpers.d.ts +17 -2
- package/dist/types/testing/index.d.ts +2 -0
- package/dist/types/testing/sample-config.d.ts +4 -0
- package/dist/types/testing/support/matrix-utils.d.ts +21 -1
- package/package.json +49 -40
- package/dist/generators/angular/templates/.eslintrc.json.ejs +0 -123
- package/dist/generators/client/templates/.eslintignore.ejs +0 -28
- package/dist/generators/common/templates/.husky/pre-commit.ejs +0 -9
- package/dist/generators/common/templates/.prettierrc.ejs +0 -24
- package/dist/generators/cypress/templates/src/test/javascript/cypress/.eslintrc.json.ejs +0 -20
- package/dist/generators/generate-blueprint/templates/.eslintrc.json.ejs +0 -35
- package/dist/generators/init/resources/package.json +0 -6
- package/dist/generators/init/templates/.husky/pre-commit +0 -4
- package/dist/generators/init/templates/package.json.ejs +0 -34
- package/dist/generators/react/templates/.eslintrc.json.ejs +0 -109
- package/dist/generators/server/templates/src/main/java/_package_/security/oauth2/JwtGrantedAuthorityConverter.java.ejs +0 -40
- package/dist/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +0 -161
- package/dist/generators/spring-cloud/generators/gateway/templates/src/main/java/_package_/web/filter/ModifyServersOpenApiFilter.java.ejs +0 -179
- package/dist/generators/spring-cloud/generators/gateway/templates/src/test/java/_package_/web/filter/ModifyServersOpenApiFilterTest.java.ejs +0 -150
- package/dist/generators/vue/templates/.eslintrc.cjs.ejs +0 -58
- package/dist/generators/{server → java/generators/openapi-generator}/templates/src/main/resources/swagger/api.yml.ejs +0 -0
- package/dist/generators/{init → javascript/generators/prettier}/templates/.prettierignore.jhi.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/.devcontainer/Dockerfile.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/.devcontainer/devcontainer.json.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/gradle/war.gradle.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/gradle/zipkin.gradle.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/micro_services_architecture.md +0 -0
- package/dist/generators/{server → spring-boot}/templates/package.json.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/ApplicationWebXml.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/domain/PersistentToken.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/domain/User.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs +1 -1
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner-no-color.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner_react.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner_vue.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-tls.yml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/i18n/messages.properties.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/logback-spring.xml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/static/index_microservices.html.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/IntegrationTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/config/application.yml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/i18n/messages_en.properties.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/junit-platform.properties.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/logback.xml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/testEmail.html.ejs +0 -0
- /package/dist/generators/spring-cloud/generators/gateway/templates/src/main/java/_package_/web/rest/{GatewayResource.java.ejs → GatewayResource_reactive.java.ejs} +0 -0
|
@@ -38,7 +38,7 @@ describe('User Management Detail Component', () => {
|
|
|
38
38
|
[
|
|
39
39
|
{
|
|
40
40
|
path: '**',
|
|
41
|
-
|
|
41
|
+
loadComponent: () => import('./user-management-detail.component'),
|
|
42
42
|
resolve: {
|
|
43
43
|
user: () => of({
|
|
44
44
|
id: <%- tsKeyId %>,
|
|
@@ -80,7 +80,7 @@ describe('User Management Detail Component', () => {
|
|
|
80
80
|
langKey: 'en',
|
|
81
81
|
authorities: [Authority.USER],
|
|
82
82
|
createdBy: 'admin',
|
|
83
|
-
})
|
|
83
|
+
}),
|
|
84
84
|
);
|
|
85
85
|
});
|
|
86
86
|
});
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
|
|
23
23
|
<div class="d-flex justify-content-end">
|
|
24
24
|
<button class="btn btn-info me-2" (click)="loadAll()" [disabled]="isLoading()">
|
|
25
|
-
<fa-icon icon="sync" [
|
|
25
|
+
<fa-icon icon="sync" [animation]="isLoading() ? 'spin' : undefined"></fa-icon>
|
|
26
26
|
<span>__jhiTranslateTag__('userManagement.home.refreshListLabel')</span>
|
|
27
27
|
</button>
|
|
28
28
|
<button class="btn btn-primary jh-create-entity" [routerLink]="['./new']">
|
|
@@ -22,8 +22,7 @@ _%>
|
|
|
22
22
|
jest.mock('app/core/auth/account.service');
|
|
23
23
|
|
|
24
24
|
import { ComponentFixture, TestBed, waitForAsync, inject, fakeAsync, tick } from '@angular/core/testing';
|
|
25
|
-
import { HttpHeaders, HttpResponse } from '@angular/common/http';
|
|
26
|
-
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
|
25
|
+
import { provideHttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
|
|
27
26
|
import { ActivatedRoute } from '@angular/router';
|
|
28
27
|
import { of } from 'rxjs';
|
|
29
28
|
|
|
@@ -46,19 +45,17 @@ describe('User Management Component', () => {
|
|
|
46
45
|
page: '1',
|
|
47
46
|
size: '1',
|
|
48
47
|
sort: 'id,desc',
|
|
49
|
-
})
|
|
48
|
+
}),
|
|
50
49
|
);
|
|
51
50
|
|
|
52
|
-
beforeEach(
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
providers: [{ provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService],
|
|
57
|
-
})
|
|
58
|
-
.overrideTemplate(UserManagementComponent, '')
|
|
59
|
-
.compileComponents();
|
|
51
|
+
beforeEach(waitForAsync(() => {
|
|
52
|
+
TestBed.configureTestingModule({
|
|
53
|
+
imports: [UserManagementComponent],
|
|
54
|
+
providers: [provideHttpClient(), { provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService],
|
|
60
55
|
})
|
|
61
|
-
|
|
56
|
+
.overrideTemplate(UserManagementComponent, '')
|
|
57
|
+
.compileComponents();
|
|
58
|
+
}));
|
|
62
59
|
|
|
63
60
|
beforeEach(() => {
|
|
64
61
|
fixture = TestBed.createComponent(UserManagementComponent);
|
|
@@ -79,8 +76,8 @@ describe('User Management Component', () => {
|
|
|
79
76
|
new HttpResponse({
|
|
80
77
|
body: [new User(<%- tsKeyId %>)],
|
|
81
78
|
headers,
|
|
82
|
-
})
|
|
83
|
-
)
|
|
79
|
+
}),
|
|
80
|
+
),
|
|
84
81
|
);
|
|
85
82
|
|
|
86
83
|
// WHEN
|
|
@@ -106,8 +103,8 @@ describe('User Management Component', () => {
|
|
|
106
103
|
new HttpResponse({
|
|
107
104
|
body: [user],
|
|
108
105
|
headers,
|
|
109
|
-
})
|
|
110
|
-
)
|
|
106
|
+
}),
|
|
107
|
+
),
|
|
111
108
|
);
|
|
112
109
|
jest.spyOn(service, 'update').mockReturnValue(of(user));
|
|
113
110
|
|
|
@@ -130,7 +130,7 @@ export default class UserManagementComponent implements OnInit {
|
|
|
130
130
|
combineLatest([this.activatedRoute.data, this.activatedRoute.queryParamMap]).subscribe(([data, params]) => {
|
|
131
131
|
const page = params.get('page');
|
|
132
132
|
this.page = +(page ?? 1);
|
|
133
|
-
this.sortState.set(this.sortService.parseSortParam(params.get(SORT) ?? data
|
|
133
|
+
this.sortState.set(this.sortService.parseSortParam(params.get(SORT) ?? data.defaultSort));
|
|
134
134
|
this.loadAll();
|
|
135
135
|
});
|
|
136
136
|
}
|
|
@@ -20,8 +20,8 @@
|
|
|
20
20
|
const tsKeyId = this.generateTestEntityId(user.primaryKey.type);
|
|
21
21
|
_%>
|
|
22
22
|
import { TestBed } from '@angular/core/testing';
|
|
23
|
-
import { HttpErrorResponse } from '@angular/common/http';
|
|
24
|
-
import {
|
|
23
|
+
import { provideHttpClient, HttpErrorResponse } from '@angular/common/http';
|
|
24
|
+
import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
|
|
25
25
|
|
|
26
26
|
<%_ if (generateBuiltInAuthorityEntity) { _%>
|
|
27
27
|
import { Authority } from 'app/config/authority.constants';
|
|
@@ -36,7 +36,7 @@ describe('User Service', () => {
|
|
|
36
36
|
|
|
37
37
|
beforeEach(() => {
|
|
38
38
|
TestBed.configureTestingModule({
|
|
39
|
-
|
|
39
|
+
providers: [provideHttpClient(), provideHttpClientTesting()],
|
|
40
40
|
});
|
|
41
41
|
|
|
42
42
|
service = TestBed.inject(UserManagementService);
|
|
@@ -78,7 +78,7 @@ describe('User Service', () => {
|
|
|
78
78
|
let expectedResult = 0;
|
|
79
79
|
|
|
80
80
|
service.find('user').subscribe({
|
|
81
|
-
error: (error: HttpErrorResponse) => expectedResult = error.status
|
|
81
|
+
error: (error: HttpErrorResponse) => (expectedResult = error.status),
|
|
82
82
|
});
|
|
83
83
|
|
|
84
84
|
const req = httpMock.expectOne({ method: 'GET' });
|
|
@@ -62,7 +62,7 @@ export class UserManagementService {
|
|
|
62
62
|
authorities(): Observable<string[]> {
|
|
63
63
|
<%_ if (generateBuiltInAuthorityEntity) { _%>
|
|
64
64
|
return this.http
|
|
65
|
-
.get<
|
|
65
|
+
.get<{ name: string }[]>(this.applicationConfigService.getEndpointFor('api/authorities'))
|
|
66
66
|
.pipe(map(authorities => authorities.map(a => a.name)));
|
|
67
67
|
<%_ } else { _%>
|
|
68
68
|
return of([Authority.ADMIN, Authority.USER]);
|
|
@@ -32,19 +32,20 @@
|
|
|
32
32
|
<label class="form-label" for="field_login">__jhiTranslateTag__('userManagement.login')</label>
|
|
33
33
|
<input type="text" id="field_login" class="form-control" name="login" formControlName="login" />
|
|
34
34
|
|
|
35
|
-
@
|
|
35
|
+
@let loginRef = editForm.get('login')!;
|
|
36
|
+
@if (loginRef.invalid && (loginRef.dirty || loginRef.touched)) {
|
|
36
37
|
<div>
|
|
37
|
-
@if (
|
|
38
|
+
@if (loginRef?.errors?.required) {
|
|
38
39
|
<small class="form-text text-danger"
|
|
39
40
|
>__jhiTranslateTag__('entity.validation.required')</small>
|
|
40
41
|
}
|
|
41
42
|
|
|
42
|
-
@if (
|
|
43
|
+
@if (loginRef?.errors?.maxlength) {
|
|
43
44
|
<small class="form-text text-danger"
|
|
44
45
|
>__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
|
|
45
46
|
}
|
|
46
47
|
|
|
47
|
-
@if (
|
|
48
|
+
@if (loginRef?.errors?.pattern) {
|
|
48
49
|
<small class="form-text text-danger"
|
|
49
50
|
>__jhiTranslateTag__('entity.validation.patternLogin')</small>
|
|
50
51
|
}
|
|
@@ -56,9 +57,10 @@
|
|
|
56
57
|
<label class="form-label" for="field_firstName">__jhiTranslateTag__('userManagement.firstName')</label>
|
|
57
58
|
<input type="text" id="field_firstName" class="form-control" name="firstName" formControlName="firstName" />
|
|
58
59
|
|
|
59
|
-
@
|
|
60
|
+
@let firstNameRef = editForm.get('firstName')!;
|
|
61
|
+
@if (firstNameRef.invalid && (firstNameRef.dirty || firstNameRef.touched)) {
|
|
60
62
|
<div>
|
|
61
|
-
@if (
|
|
63
|
+
@if (firstNameRef?.errors?.maxlength) {
|
|
62
64
|
<small class="form-text text-danger"
|
|
63
65
|
>__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
|
|
64
66
|
}
|
|
@@ -70,9 +72,10 @@
|
|
|
70
72
|
<label class="form-label" for="field_lastName">__jhiTranslateTag__('userManagement.lastName')</label>
|
|
71
73
|
<input type="text" id="field_lastName" class="form-control" name="lastName" formControlName="lastName" />
|
|
72
74
|
|
|
73
|
-
@
|
|
75
|
+
@let lastNameRef = editForm.get('lastName')!;
|
|
76
|
+
@if (lastNameRef.invalid && (lastNameRef.dirty || lastNameRef.touched)) {
|
|
74
77
|
<div>
|
|
75
|
-
@if (
|
|
78
|
+
@if (lastNameRef?.errors?.maxlength) {
|
|
76
79
|
<small class="form-text text-danger"
|
|
77
80
|
>__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
|
|
78
81
|
}
|
|
@@ -84,24 +87,25 @@
|
|
|
84
87
|
<label class="form-label" for="field_email">__jhiTranslateTag__('userManagement.email')</label>
|
|
85
88
|
<input type="email" id="field_email" class="form-control" name="email" formControlName="email" />
|
|
86
89
|
|
|
87
|
-
@
|
|
90
|
+
@let emailRef = editForm.get('email')!;
|
|
91
|
+
@if (emailRef.invalid && (emailRef.dirty || emailRef.touched)) {
|
|
88
92
|
<div>
|
|
89
|
-
@if (
|
|
93
|
+
@if (emailRef?.errors?.required) {
|
|
90
94
|
<small class="form-text text-danger"
|
|
91
95
|
>__jhiTranslateTag__('entity.validation.required')</small>
|
|
92
96
|
}
|
|
93
97
|
|
|
94
|
-
@if (
|
|
98
|
+
@if (emailRef?.errors?.maxlength) {
|
|
95
99
|
<small class="form-text text-danger"
|
|
96
100
|
>__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 100 })</small>
|
|
97
101
|
}
|
|
98
102
|
|
|
99
|
-
@if (
|
|
103
|
+
@if (emailRef?.errors?.minlength) {
|
|
100
104
|
<small class="form-text text-danger"
|
|
101
105
|
>__jhiTranslateValidationTag__('entity.validation.minlength', { "min": 5 })</small>
|
|
102
106
|
}
|
|
103
107
|
|
|
104
|
-
@if (
|
|
108
|
+
@if (emailRef?.errors?.email) {
|
|
105
109
|
<small class="form-text text-danger"
|
|
106
110
|
>__jhiTranslateTag__('global.messages.validate.email.invalid')</small>
|
|
107
111
|
}
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
const tsKeyId = this.generateTestEntityId(user.primaryKey.type);
|
|
21
21
|
_%>
|
|
22
22
|
import { ComponentFixture, TestBed, waitForAsync, inject, fakeAsync, tick } from '@angular/core/testing';
|
|
23
|
-
import {
|
|
23
|
+
import { provideHttpClient } from '@angular/common/http';
|
|
24
24
|
import { FormBuilder } from '@angular/forms';
|
|
25
25
|
import { ActivatedRoute } from '@angular/router';
|
|
26
26
|
import { of } from 'rxjs';
|
|
@@ -38,8 +38,9 @@ describe('User Management Update Component', () => {
|
|
|
38
38
|
|
|
39
39
|
beforeEach(waitForAsync(() => {
|
|
40
40
|
TestBed.configureTestingModule({
|
|
41
|
-
imports: [
|
|
41
|
+
imports: [UserManagementUpdateComponent],
|
|
42
42
|
providers: [
|
|
43
|
+
provideHttpClient(),
|
|
43
44
|
FormBuilder,
|
|
44
45
|
{
|
|
45
46
|
provide: ActivatedRoute,
|
|
@@ -72,7 +73,7 @@ describe('User Management Update Component', () => {
|
|
|
72
73
|
// THEN
|
|
73
74
|
expect(service.authorities).toHaveBeenCalled();
|
|
74
75
|
expect(comp.authorities()).toEqual(['USER']);
|
|
75
|
-
})
|
|
76
|
+
}),
|
|
76
77
|
));
|
|
77
78
|
});
|
|
78
79
|
|
|
@@ -91,7 +92,7 @@ describe('User Management Update Component', () => {
|
|
|
91
92
|
// THEN
|
|
92
93
|
expect(service.update).toHaveBeenCalledWith(expect.objectContaining(entity));
|
|
93
94
|
expect(comp.isSaving()).toEqual(false);
|
|
94
|
-
})
|
|
95
|
+
}),
|
|
95
96
|
));
|
|
96
97
|
|
|
97
98
|
it('Should call create service on save for new user', inject(
|
|
@@ -109,7 +110,7 @@ describe('User Management Update Component', () => {
|
|
|
109
110
|
expect(comp.editForm.getRawValue().id).toBeNull();
|
|
110
111
|
expect(service.create).toHaveBeenCalledWith(expect.objectContaining(entity));
|
|
111
112
|
expect(comp.isSaving()).toEqual(false);
|
|
112
|
-
})
|
|
113
|
+
}),
|
|
113
114
|
));
|
|
114
115
|
});
|
|
115
116
|
});
|
|
@@ -84,7 +84,7 @@ export default class UserManagementUpdateComponent implements OnInit {
|
|
|
84
84
|
this.editForm.reset(newUser);
|
|
85
85
|
}
|
|
86
86
|
});
|
|
87
|
-
this.userService.authorities().subscribe(authorities =>
|
|
87
|
+
this.userService.authorities().subscribe(authorities => this.authorities.set(authorities));
|
|
88
88
|
}
|
|
89
89
|
|
|
90
90
|
previousState(): void {
|
|
@@ -22,11 +22,8 @@ import { of } from 'rxjs';
|
|
|
22
22
|
|
|
23
23
|
import { IUser } from './user-management.model';
|
|
24
24
|
import { UserManagementService } from './service/user-management.service';
|
|
25
|
-
import UserManagementComponent from './list/user-management.component';
|
|
26
|
-
import UserManagementDetailComponent from './detail/user-management-detail.component';
|
|
27
|
-
import UserManagementUpdateComponent from './update/user-management-update.component';
|
|
28
25
|
|
|
29
|
-
export const
|
|
26
|
+
export const userManagementResolve: ResolveFn<IUser | null> = (route: ActivatedRouteSnapshot) => {
|
|
30
27
|
const login = route.paramMap.get('login');
|
|
31
28
|
if (login) {
|
|
32
29
|
return inject(UserManagementService).find(login);
|
|
@@ -37,30 +34,30 @@ export const UserManagementResolve: ResolveFn<IUser | null> = (route: ActivatedR
|
|
|
37
34
|
const userManagementRoute: Routes = [
|
|
38
35
|
{
|
|
39
36
|
path: '',
|
|
40
|
-
|
|
37
|
+
loadComponent: () => import('./list/user-management.component'),
|
|
41
38
|
data: {
|
|
42
39
|
defaultSort: 'id,asc',
|
|
43
40
|
},
|
|
44
41
|
},
|
|
45
42
|
{
|
|
46
43
|
path: ':login/view',
|
|
47
|
-
|
|
44
|
+
loadComponent: () => import('./detail/user-management-detail.component'),
|
|
48
45
|
resolve: {
|
|
49
|
-
user:
|
|
46
|
+
user: userManagementResolve,
|
|
50
47
|
},
|
|
51
48
|
},
|
|
52
49
|
{
|
|
53
50
|
path: 'new',
|
|
54
|
-
|
|
51
|
+
loadComponent: () => import('./update/user-management-update.component'),
|
|
55
52
|
resolve: {
|
|
56
|
-
user:
|
|
53
|
+
user: userManagementResolve,
|
|
57
54
|
},
|
|
58
55
|
},
|
|
59
56
|
{
|
|
60
57
|
path: ':login/edit',
|
|
61
|
-
|
|
58
|
+
loadComponent: () => import('./update/user-management-update.component'),
|
|
62
59
|
resolve: {
|
|
63
|
-
user:
|
|
60
|
+
user: userManagementResolve,
|
|
64
61
|
},
|
|
65
62
|
},
|
|
66
63
|
];
|
package/dist/generators/angular/templates/src/main/webapp/app/app-page-title-strategy.ts.ejs
CHANGED
|
@@ -25,7 +25,7 @@ import { TranslateService } from "@ngx-translate/core";
|
|
|
25
25
|
@Injectable()
|
|
26
26
|
export class AppPageTitleStrategy extends TitleStrategy {
|
|
27
27
|
<%_ if (enableTranslation) { _%>
|
|
28
|
-
private translateService = inject(TranslateService);
|
|
28
|
+
private readonly translateService = inject(TranslateService);
|
|
29
29
|
<%_ } _%>
|
|
30
30
|
|
|
31
31
|
override updateTitle(routerState: RouterStateSnapshot): void {
|
|
@@ -23,7 +23,6 @@ import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
|
|
|
23
23
|
import { NgbDatepickerConfig } from '@ng-bootstrap/ng-bootstrap';
|
|
24
24
|
import { provideRouter } from '@angular/router';
|
|
25
25
|
import { registerLocaleData } from '@angular/common';
|
|
26
|
-
import { HttpClientModule } from '@angular/common/http';
|
|
27
26
|
import locale from '@angular/common/locales/<%= angularLocaleId %>';
|
|
28
27
|
import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
|
|
29
28
|
import dayjs from 'dayjs/esm';
|
|
@@ -20,7 +20,7 @@ import { ApplicationConfig, LOCALE_ID, importProvidersFrom, inject } from '@angu
|
|
|
20
20
|
import { BrowserModule, Title } from '@angular/platform-browser';
|
|
21
21
|
import { Router, RouterFeatures, TitleStrategy, provideRouter, withComponentInputBinding, withDebugTracing, withNavigationErrorHandler, NavigationError } from '@angular/router';
|
|
22
22
|
import { ServiceWorkerModule } from '@angular/service-worker';
|
|
23
|
-
import {
|
|
23
|
+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
|
|
24
24
|
|
|
25
25
|
import { NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap';
|
|
26
26
|
|
|
@@ -36,19 +36,21 @@ import routes from './app.routes';
|
|
|
36
36
|
import { NgbDateDayjsAdapter } from './config/datepicker-adapter';
|
|
37
37
|
import { AppPageTitleStrategy } from './app-page-title-strategy';
|
|
38
38
|
|
|
39
|
-
const routerFeatures:
|
|
39
|
+
const routerFeatures: RouterFeatures[] = [
|
|
40
|
+
withComponentInputBinding(),
|
|
40
41
|
withNavigationErrorHandler((e: NavigationError) => {
|
|
41
42
|
const router = inject(Router);
|
|
42
43
|
if (e.error.status === 403) {
|
|
43
|
-
router.navigate(['/accessdenied'])
|
|
44
|
+
router.navigate(['/accessdenied']);
|
|
44
45
|
} else if (e.error.status === 404) {
|
|
45
|
-
router.navigate(['/404'])
|
|
46
|
+
router.navigate(['/404']);
|
|
46
47
|
} else if (e.error.status === 401) {
|
|
47
48
|
router.navigate(['/login']);
|
|
48
49
|
} else {
|
|
49
50
|
router.navigate(['/error']);
|
|
50
51
|
}
|
|
51
|
-
})
|
|
52
|
+
}),
|
|
53
|
+
];
|
|
52
54
|
if (DEBUG_INFO_ENABLED) {
|
|
53
55
|
routerFeatures.push(withDebugTracing());
|
|
54
56
|
}
|
|
@@ -62,7 +64,7 @@ export const appConfig: ApplicationConfig = {
|
|
|
62
64
|
<%_ if (enableTranslation) { _%>
|
|
63
65
|
importProvidersFrom(TranslationModule),
|
|
64
66
|
<%_ } _%>
|
|
65
|
-
|
|
67
|
+
provideHttpClient(withInterceptorsFromDi()),
|
|
66
68
|
Title,
|
|
67
69
|
{ provide: LOCALE_ID, useValue: '<%= angularLocaleId %>' },
|
|
68
70
|
{ provide: NgbDateAdapter, useClass: NgbDateDayjsAdapter },
|
|
@@ -22,11 +22,6 @@ import { Routes } from '@angular/router';
|
|
|
22
22
|
import { errorRoute } from './layouts/error/error.route';
|
|
23
23
|
import { Authority } from 'app/config/authority.constants';
|
|
24
24
|
|
|
25
|
-
import HomeComponent from './home/home.component';
|
|
26
|
-
import NavbarComponent from './layouts/navbar/navbar.component';
|
|
27
|
-
<%_ if (!authenticationTypeOauth2) { _%>
|
|
28
|
-
import LoginComponent from './login/login.component';
|
|
29
|
-
<%_ } _%>
|
|
30
25
|
<%_ if (applicationTypeGateway && microfrontend) { _%>
|
|
31
26
|
import { loadEntityRoutes } from './core/microfrontend';
|
|
32
27
|
<%_ } _%>
|
|
@@ -36,12 +31,12 @@ import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'
|
|
|
36
31
|
const routes: Routes = [
|
|
37
32
|
{
|
|
38
33
|
path: '',
|
|
39
|
-
|
|
34
|
+
loadComponent: () => import('./home/home.component'),
|
|
40
35
|
title: 'home.title',
|
|
41
36
|
},
|
|
42
37
|
{
|
|
43
38
|
path: '',
|
|
44
|
-
|
|
39
|
+
loadComponent: () => import('./layouts/navbar/navbar.component'),
|
|
45
40
|
outlet: 'navbar',
|
|
46
41
|
},
|
|
47
42
|
<%_ if (!applicationTypeMicroservice) { _%>
|
|
@@ -63,7 +58,7 @@ const routes: Routes = [
|
|
|
63
58
|
<%_ if (!authenticationTypeOauth2) { _%>
|
|
64
59
|
{
|
|
65
60
|
path: 'login',
|
|
66
|
-
|
|
61
|
+
loadComponent: () => import('./login/login.component'),
|
|
67
62
|
title: 'login.title',
|
|
68
63
|
},
|
|
69
64
|
<%_ } _%>
|
package/dist/generators/angular/templates/src/main/webapp/app/config/navigation.constants.ts.ejs
CHANGED
|
@@ -19,5 +19,5 @@
|
|
|
19
19
|
export const ASC = 'asc';
|
|
20
20
|
export const DESC = 'desc';
|
|
21
21
|
export const SORT = 'sort';
|
|
22
|
-
export const ITEM_DELETED_EVENT = 'deleted'
|
|
23
|
-
export const DEFAULT_SORT_DATA = 'defaultSort'
|
|
22
|
+
export const ITEM_DELETED_EVENT = 'deleted';
|
|
23
|
+
export const DEFAULT_SORT_DATA = 'defaultSort';
|
package/dist/generators/angular/templates/src/main/webapp/app/config/translation.config.ts.ejs
CHANGED
|
@@ -24,7 +24,7 @@ export const translationNotFoundMessage = 'translation-not-found';
|
|
|
24
24
|
|
|
25
25
|
export class MissingTranslationHandlerImpl implements MissingTranslationHandler {
|
|
26
26
|
handle(params: MissingTranslationHandlerParams): string {
|
|
27
|
-
const key = params
|
|
27
|
+
const { key } = params;
|
|
28
28
|
return `${translationNotFoundMessage}[${key}]`;
|
|
29
29
|
}
|
|
30
30
|
}
|
package/dist/generators/angular/templates/src/main/webapp/app/config/uib-pagination.config.ts.ejs
CHANGED
|
@@ -23,7 +23,7 @@ import { ITEMS_PER_PAGE } from 'app/config/pagination.constants';
|
|
|
23
23
|
|
|
24
24
|
@Injectable({ providedIn: 'root' })
|
|
25
25
|
export class PaginationConfig {
|
|
26
|
-
private config = inject(NgbPaginationConfig);
|
|
26
|
+
private readonly config = inject(NgbPaginationConfig);
|
|
27
27
|
constructor() {
|
|
28
28
|
this.config.boundaryLinks = true;
|
|
29
29
|
this.config.maxSize = 5;
|
package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.spec.ts.ejs
CHANGED
|
@@ -19,7 +19,8 @@
|
|
|
19
19
|
jest.mock('app/core/auth/state-storage.service');
|
|
20
20
|
|
|
21
21
|
import { Router } from '@angular/router';
|
|
22
|
-
import {
|
|
22
|
+
import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
|
|
23
|
+
import { provideHttpClient } from '@angular/common/http';
|
|
23
24
|
import { TestBed } from '@angular/core/testing';
|
|
24
25
|
<%_ if (enableTranslation) { _%>
|
|
25
26
|
import { TranslateModule, TranslateService } from '@ngx-translate/core';
|
|
@@ -48,6 +49,8 @@ function accountWithAuthorities(authorities: string[]): Account {
|
|
|
48
49
|
};
|
|
49
50
|
}
|
|
50
51
|
|
|
52
|
+
const mockFn = (value: string | null): jest.Mock<string | null> => jest.fn(() => value);
|
|
53
|
+
|
|
51
54
|
describe('Account Service', () => {
|
|
52
55
|
let service: AccountService;
|
|
53
56
|
<%_ if (generateUserManagement) { _%>
|
|
@@ -62,13 +65,14 @@ describe('Account Service', () => {
|
|
|
62
65
|
|
|
63
66
|
beforeEach(() => {
|
|
64
67
|
TestBed.configureTestingModule({
|
|
68
|
+
<%_ if (enableTranslation) { _%>
|
|
65
69
|
imports: [
|
|
66
|
-
HttpClientTestingModule,
|
|
67
|
-
<%_ if (enableTranslation) { _%>
|
|
68
70
|
TranslateModule.forRoot(),
|
|
69
|
-
<%_ } _%>
|
|
70
71
|
],
|
|
72
|
+
<%_ } _%>
|
|
71
73
|
providers: [
|
|
74
|
+
provideHttpClient(),
|
|
75
|
+
provideHttpClientTesting(),
|
|
72
76
|
StateStorageService,
|
|
73
77
|
],
|
|
74
78
|
});
|
|
@@ -172,7 +176,7 @@ describe('save', () => {
|
|
|
172
176
|
describe('should change the language on authentication if necessary', () => {
|
|
173
177
|
it('should change language if user has not changed language manually', () => {
|
|
174
178
|
// GIVEN
|
|
175
|
-
mockStorageService.getLocale =
|
|
179
|
+
mockStorageService.getLocale = mockFn(null);
|
|
176
180
|
|
|
177
181
|
// WHEN
|
|
178
182
|
service.identity().subscribe();
|
|
@@ -184,7 +188,7 @@ describe('save', () => {
|
|
|
184
188
|
|
|
185
189
|
it('should not change language if user has changed language manually', () => {
|
|
186
190
|
// GIVEN
|
|
187
|
-
mockStorageService.getLocale =
|
|
191
|
+
mockStorageService.getLocale = mockFn('sessionLang');
|
|
188
192
|
|
|
189
193
|
// WHEN
|
|
190
194
|
service.identity().subscribe();
|
|
@@ -199,7 +203,7 @@ describe('save', () => {
|
|
|
199
203
|
describe('navigateToStoredUrl', () => {
|
|
200
204
|
it('should navigate to the previous stored url post successful authentication', () => {
|
|
201
205
|
// GIVEN
|
|
202
|
-
mockStorageService.getUrl =
|
|
206
|
+
mockStorageService.getUrl = mockFn('admin/users?page=0');
|
|
203
207
|
|
|
204
208
|
// WHEN
|
|
205
209
|
service.identity().subscribe();
|
|
@@ -214,7 +218,7 @@ describe('save', () => {
|
|
|
214
218
|
it('should not navigate to the previous stored url when authentication fails', () => {
|
|
215
219
|
// WHEN
|
|
216
220
|
service.identity().subscribe();
|
|
217
|
-
httpMock.expectOne({ method: 'GET' }).error(new
|
|
221
|
+
httpMock.expectOne({ method: 'GET' }).error(new ProgressEvent(''));
|
|
218
222
|
|
|
219
223
|
// THEN
|
|
220
224
|
expect(mockStorageService.getUrl).not.toHaveBeenCalled();
|
|
@@ -224,7 +228,7 @@ describe('save', () => {
|
|
|
224
228
|
|
|
225
229
|
it('should not navigate to the previous stored url when no such url exists post successful authentication', () => {
|
|
226
230
|
// GIVEN
|
|
227
|
-
mockStorageService.getUrl =
|
|
231
|
+
mockStorageService.getUrl = mockFn(null);
|
|
228
232
|
|
|
229
233
|
// WHEN
|
|
230
234
|
service.identity().subscribe();
|
package/dist/generators/angular/templates/src/main/webapp/app/core/auth/auth-jwt.service.spec.ts.ejs
CHANGED
|
@@ -17,7 +17,8 @@
|
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
19
|
import { TestBed } from '@angular/core/testing';
|
|
20
|
-
import {
|
|
20
|
+
import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
|
|
21
|
+
import { provideHttpClient } from '@angular/common/http';
|
|
21
22
|
import { AuthServerProvider } from 'app/core/auth/auth-jwt.service';
|
|
22
23
|
import { StateStorageService } from './state-storage.service';
|
|
23
24
|
|
|
@@ -28,7 +29,7 @@ describe('Auth JWT', () => {
|
|
|
28
29
|
|
|
29
30
|
beforeEach(() => {
|
|
30
31
|
TestBed.configureTestingModule({
|
|
31
|
-
|
|
32
|
+
providers: [provideHttpClient(), provideHttpClientTesting()],
|
|
32
33
|
});
|
|
33
34
|
|
|
34
35
|
mockStorageService = TestBed.inject(StateStorageService);
|
|
@@ -36,7 +36,7 @@ export const UserRouteAccessService: CanActivateFn = (next: ActivatedRouteSnapsh
|
|
|
36
36
|
return accountService.identity().pipe(
|
|
37
37
|
map(account => {
|
|
38
38
|
if (account) {
|
|
39
|
-
const authorities = next.data
|
|
39
|
+
const { authorities } = next.data;
|
|
40
40
|
|
|
41
41
|
if (!authorities || authorities.length === 0 || accountService.hasAnyAuthority(authorities)) {
|
|
42
42
|
return true;
|
|
@@ -56,6 +56,6 @@ export const UserRouteAccessService: CanActivateFn = (next: ActivatedRouteSnapsh
|
|
|
56
56
|
loginService.login();
|
|
57
57
|
<%_ } _%>
|
|
58
58
|
return false;
|
|
59
|
-
})
|
|
59
|
+
}),
|
|
60
60
|
);
|
|
61
61
|
};
|
|
@@ -27,9 +27,9 @@ import { StateStorageService } from 'app/core/auth/state-storage.service';
|
|
|
27
27
|
|
|
28
28
|
@Injectable()
|
|
29
29
|
export class AuthExpiredInterceptor implements HttpInterceptor {
|
|
30
|
-
private loginService = inject(LoginService);
|
|
31
|
-
private stateStorageService = inject(StateStorageService);
|
|
32
|
-
private router = inject(Router);
|
|
30
|
+
private readonly loginService = inject(LoginService);
|
|
31
|
+
private readonly stateStorageService = inject(StateStorageService);
|
|
32
|
+
private readonly router = inject(Router);
|
|
33
33
|
|
|
34
34
|
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
|
|
35
35
|
return next.handle(request).pipe(
|
|
@@ -51,7 +51,7 @@ export class AuthExpiredInterceptor implements HttpInterceptor {
|
|
|
51
51
|
<%_ } _%>
|
|
52
52
|
}
|
|
53
53
|
},
|
|
54
|
-
})
|
|
54
|
+
}),
|
|
55
55
|
);
|
|
56
56
|
}
|
|
57
57
|
}
|
|
@@ -25,8 +25,8 @@ import { ApplicationConfigService } from '../config/application-config.service';
|
|
|
25
25
|
|
|
26
26
|
@Injectable()
|
|
27
27
|
export class AuthInterceptor implements HttpInterceptor {
|
|
28
|
-
private stateStorageService = inject(StateStorageService);
|
|
29
|
-
private applicationConfigService = inject(ApplicationConfigService);
|
|
28
|
+
private readonly stateStorageService = inject(StateStorageService);
|
|
29
|
+
private readonly applicationConfigService = inject(ApplicationConfigService);
|
|
30
30
|
|
|
31
31
|
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
|
|
32
32
|
const serverApiUrl = this.applicationConfigService.getEndpointFor('');
|
|
@@ -25,7 +25,7 @@ import { EventManager, EventWithContent } from 'app/core/util/event-manager.serv
|
|
|
25
25
|
|
|
26
26
|
@Injectable()
|
|
27
27
|
export class ErrorHandlerInterceptor implements HttpInterceptor {
|
|
28
|
-
private eventManager = inject(EventManager);
|
|
28
|
+
private readonly eventManager = inject(EventManager);
|
|
29
29
|
|
|
30
30
|
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
|
|
31
31
|
return next.handle(request).pipe(
|
|
@@ -35,7 +35,7 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
|
|
|
35
35
|
this.eventManager.broadcast(new EventWithContent('<%= frontendAppName %>.httpError', err));
|
|
36
36
|
}
|
|
37
37
|
},
|
|
38
|
-
})
|
|
38
|
+
}),
|
|
39
39
|
);
|
|
40
40
|
}
|
|
41
41
|
}
|