generator-jhipster 8.7.3 → 8.8.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 +1 -1
- package/dist/cli/environment-builder.d.mts +1 -3
- package/dist/cli/jhipster-command.d.mts +2 -2
- package/dist/cli/program.mjs +2 -1
- package/dist/generators/angular/files-angular.d.ts +2 -0
- package/dist/generators/angular/files-angular.js +39 -4
- package/dist/generators/angular/generator.d.ts +14 -154
- package/dist/generators/angular/generator.js +98 -196
- package/dist/generators/angular/resources/package.json +26 -22
- package/dist/generators/angular/support/path-utils.d.ts +1 -0
- package/dist/generators/angular/support/path-utils.js +1 -0
- package/dist/generators/angular/support/translate-angular.d.ts +3 -2
- package/dist/generators/angular/support/translate-angular.js +2 -10
- package/dist/generators/angular/support/update-languages.d.ts +1 -1
- package/dist/generators/angular/support/update-languages.js +3 -1
- package/dist/generators/angular/templates/angular.json.ejs +7 -1
- package/dist/generators/angular/templates/angular.json.esbuild.ejs +160 -0
- package/dist/generators/angular/templates/build-plugins/define-esbuild.mjs.ejs +10 -0
- package/dist/generators/angular/templates/build-plugins/i18n-esbuild.mjs.ejs +49 -0
- package/dist/generators/angular/templates/eslint.config.js.jhi.angular.ejs +1 -7
- package/dist/generators/angular/templates/jest.conf.js.ejs +1 -2
- package/dist/generators/angular/templates/package.json.ejs +2 -19
- package/dist/generators/angular/templates/postcss.config.json.ejs +5 -0
- package/dist/generators/angular/templates/proxy.conf.json.ejs +27 -0
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.ts.ejs +1 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.ts.ejs +0 -1
- 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.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +0 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.ts.ejs +0 -1
- 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 +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +1 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs +0 -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/app.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/config/translation.config.ts.ejs +16 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.test-samples.ts.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.ts.ejs +13 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs +5 -7
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.spec.ts.ejs +4 -5
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs +27 -17
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.spec.ts.ejs +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs +12 -12
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.ts.ejs +1 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/entity-navbar-items.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/footer/footer.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +7 -5
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs +7 -11
- package/dist/generators/angular/templates/src/main/webapp/app/shared/date/duration.pipe.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.ts.ejs +4 -5
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.ts.ejs +5 -6
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/pagination/item-count.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs +5 -6
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs +4 -5
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs +1 -2
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.ts.ejs +8 -13
- package/dist/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/declarations.d.ts.ejs +5 -0
- package/dist/generators/angular/templates/src/main/webapp/{app/entities/_entityFolder_/list/pagination-template.ejs → environments/environment.development.ts.ejs} +4 -3
- package/dist/generators/angular/templates/src/main/webapp/environments/environment.ts.ejs +22 -0
- package/dist/generators/angular/templates/src/main/webapp/i18n/index.ts.ejs +14 -0
- package/dist/generators/angular/templates/webpack/environment.js.ejs +0 -1
- package/dist/generators/angular/templates/webpack/webpack.custom.js.ejs +2 -22
- package/dist/generators/angular/types-partial.d.ts +32 -0
- package/dist/generators/angular/types.d.ts +35 -1
- package/dist/generators/app/generator.d.ts +1 -0
- package/dist/generators/app/support/config.d.ts +2 -1
- package/dist/generators/base/shared-data.d.ts +12 -8
- package/dist/generators/base/shared-data.js +14 -4
- package/dist/generators/base/support/index.d.ts +4 -3
- package/dist/generators/base/support/index.js +4 -3
- package/dist/generators/base/support/jhipster7-context.d.ts +1 -1
- package/dist/generators/base/support/jhipster7-context.js +1 -1
- package/dist/generators/base/types.d.ts +8 -2
- package/dist/generators/base-application/generator.d.ts +98 -87
- package/dist/generators/base-application/support/prepare-entity.d.ts +6 -3
- package/dist/generators/base-application/support/prepare-entity.js +37 -40
- package/dist/generators/base-application/support/prepare-field.js +22 -23
- package/dist/generators/base-application/types.d.ts +8 -9
- package/dist/generators/base-core/generator.d.ts +5 -5
- package/dist/generators/base-core/generator.js +8 -7
- package/dist/generators/base-entity-changes/generator.d.ts +2 -4
- package/dist/generators/bootstrap/generator.d.ts +1 -0
- package/dist/generators/bootstrap/generator.js +2 -8
- package/dist/generators/bootstrap/support/eslint-worker.d.ts +1 -1
- package/dist/generators/bootstrap-application/generator.d.ts +1 -0
- package/dist/generators/bootstrap-application/generator.js +1 -1
- package/dist/generators/bootstrap-application-base/generator.d.ts +2 -1
- package/dist/generators/bootstrap-application-base/generator.js +10 -0
- package/dist/generators/bootstrap-application-base/utils.d.ts +4 -71
- package/dist/generators/bootstrap-application-base/utils.js +7 -6
- package/dist/generators/bootstrap-application-client/generator.d.ts +2 -1
- package/dist/generators/bootstrap-application-client/generator.js +16 -9
- package/dist/generators/bootstrap-application-server/generator.d.ts +2 -0
- package/dist/generators/bootstrap-application-server/generator.js +27 -5
- package/dist/generators/bootstrap-workspaces/generator.d.ts +1 -0
- package/dist/generators/ci-cd/generator.d.ts +1 -0
- package/dist/generators/ci-cd/templates/.gitlab-ci.yml.ejs +4 -6
- package/dist/generators/client/command.d.ts +15 -1
- package/dist/generators/client/command.js +15 -1
- package/dist/generators/client/files-common.js +1 -1
- package/dist/generators/client/generator.d.ts +2 -1
- package/dist/generators/client/generator.js +24 -11
- package/dist/generators/client/generators/common/generator.d.ts +1 -0
- package/dist/generators/client/prompts.d.ts +2 -2
- package/dist/generators/client/resources/package.json +5 -5
- package/dist/generators/client/support/config.js +4 -2
- package/dist/generators/client/support/entity-definition.d.ts +2 -5
- package/dist/generators/client/support/entity-definition.js +3 -8
- package/dist/generators/client/support/filter-entities.d.ts +5 -1
- package/dist/generators/client/support/filter-entities.js +4 -2
- package/dist/generators/client/support/prepare-entity.d.ts +20 -1
- package/dist/generators/client/support/prepare-entity.js +30 -19
- package/dist/generators/client/support/template-utils.d.ts +16 -12
- package/dist/generators/client/support/template-utils.js +45 -18
- package/dist/generators/client/support/update-languages.d.ts +4 -4
- package/dist/generators/client/types.d.ts +10 -3
- package/dist/generators/common/files.d.ts +1 -3
- package/dist/generators/common/files.js +3 -3
- package/dist/generators/common/generator.d.ts +2 -4
- package/dist/generators/common/generator.js +17 -15
- package/dist/generators/common/resources/package.json +2 -2
- package/dist/generators/common/templates/sonar-project.properties.ejs +21 -21
- package/dist/generators/cucumber/generator.d.ts +1 -0
- package/dist/generators/cypress/generator.d.ts +1 -0
- package/dist/generators/cypress/generator.js +12 -5
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/register-page.cy.ts.ejs +1 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs +4 -1
- package/dist/generators/docker/generator.d.ts +1 -0
- package/dist/generators/docker/generator.js +1 -1
- package/dist/generators/docker/templates/docker/couchbase.yml.ejs +2 -2
- package/dist/generators/docker/templates/docker/kafka.yml.ejs +8 -16
- package/dist/generators/docker/templates/docker/mysql.yml.ejs +2 -2
- package/dist/generators/docker-compose/generator.d.ts +1 -0
- package/dist/generators/docker-compose/generator.js +3 -0
- package/dist/generators/docker-compose/templates/README-DOCKER-COMPOSE.md.ejs +0 -1
- package/dist/generators/docker-compose/templates/docker-compose.yml.ejs +7 -9
- package/dist/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +1 -3
- package/dist/generators/entities/generator.d.ts +1 -0
- package/dist/generators/entity/generator.d.ts +1 -0
- package/dist/generators/export-jdl/generator.d.ts +1 -0
- package/dist/generators/feign-client/generator.d.ts +1 -0
- package/dist/generators/gatling/generator.d.ts +1 -0
- package/dist/generators/generate-blueprint/command.d.ts +15 -0
- package/dist/generators/generate-blueprint/command.js +15 -0
- package/dist/generators/generate-blueprint/constants.d.ts +2 -2
- package/dist/generators/generate-blueprint/constants.js +1 -2
- package/dist/generators/generate-blueprint/files.js +4 -1
- package/dist/generators/generate-blueprint/generator.d.ts +2 -0
- package/dist/generators/generate-blueprint/generator.js +5 -3
- package/dist/generators/generate-blueprint/resources/package.json +3 -3
- package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/command.mjs.ejs +10 -1
- package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs +64 -30
- package/dist/generators/{angular/templates/src/main/webapp/app/app.constants.ts.ejs → generate-blueprint/templates/.blueprint/github-build-matrix/command.mjs.ejs} +24 -8
- package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/generator.mjs.ejs +23 -7
- package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/generator.spec.mjs.ejs +24 -0
- package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/index.mjs.ejs +1 -0
- package/dist/generators/generate-blueprint/templates/.github/workflows/samples.yml.ejs +14 -8
- package/dist/generators/generate-blueprint/templates/.gitignore.jhi.blueprint.ejs +22 -0
- package/dist/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs +6 -7
- package/dist/generators/generate-blueprint/templates/vitest.config.ts.ejs +1 -0
- package/dist/generators/generate-blueprint/templates/vitest.test-setup.ts.ejs +7 -0
- package/dist/generators/generator-constants.d.ts +1 -1
- package/dist/generators/generator-constants.js +1 -1
- package/dist/generators/git/generator.d.ts +1 -0
- package/dist/generators/git/templates/.gitignore.jhi.ejs +2 -2
- package/dist/generators/gradle/command.d.ts +31 -20
- package/dist/generators/gradle/generator.d.ts +1 -0
- package/dist/generators/gradle/generators/code-quality/generator.d.ts +1 -0
- package/dist/generators/gradle/generators/jib/generator.d.ts +1 -0
- package/dist/generators/gradle/generators/node-gradle/generator.d.ts +1 -0
- package/dist/generators/gradle/generators/node-gradle/templates/buildSrc/src/main/groovy/jhipster.node-gradle-conventions.gradle.ejs +5 -54
- package/dist/generators/gradle/templates/gradle/wrapper/gradle-wrapper.properties +1 -1
- package/dist/generators/heroku/generator.d.ts +1 -0
- package/dist/generators/info/generator.d.ts +1 -0
- package/dist/generators/info/support/extract-info.d.ts +2 -0
- package/dist/generators/info/support/extract-info.js +25 -12
- package/dist/generators/info/support/index.d.ts +1 -0
- package/dist/generators/info/support/index.js +1 -0
- package/dist/generators/info/support/markdown-content.d.ts +6 -0
- package/dist/generators/info/support/markdown-content.js +14 -0
- package/dist/generators/init/generator.d.ts +1 -0
- package/dist/generators/init/resources/.node-version +1 -1
- package/dist/generators/java/generators/bootstrap/generator.d.ts +2 -0
- package/dist/generators/java/generators/bootstrap/generator.js +13 -0
- package/dist/generators/java/generators/build-tool/generator.d.ts +1 -0
- package/dist/generators/java/generators/code-quality/generator.d.ts +1 -0
- package/dist/generators/java/generators/domain/generator.d.ts +1 -0
- package/dist/generators/java/generators/domain/generator.js +1 -1
- package/dist/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs +1 -1
- package/dist/generators/java/generators/graalvm/generator.d.ts +3 -1
- package/dist/generators/java/generators/graalvm/generator.js +16 -2
- package/dist/generators/java/generators/graalvm/internal/constants.d.ts +1 -0
- package/dist/generators/java/generators/graalvm/internal/constants.js +2 -0
- package/dist/generators/java/generators/graalvm/internal/maven-definition.d.ts +2 -1
- package/dist/generators/java/generators/graalvm/internal/maven-definition.js +2 -1
- package/dist/generators/java/generators/graalvm/templates/gradle/native.gradle.ejs +5 -1
- package/dist/generators/java/generators/jib/generator.d.ts +1 -0
- package/dist/generators/java/generators/node/generator.d.ts +3 -1
- package/dist/generators/java/generators/node/generator.js +22 -1
- package/dist/generators/java/generators/node/templates/{npmw.cmd → npmw.cmd.ejs} +11 -11
- package/dist/generators/java/generators/node/templates/{npmw → npmw.ejs} +5 -2
- package/dist/generators/java/generators/openapi-generator/generator.d.ts +1 -0
- package/dist/generators/java/generators/server/command.d.ts +5 -0
- package/dist/generators/java/generators/server/command.js +5 -0
- package/dist/generators/java/generators/server/generator.d.ts +24 -0
- package/dist/generators/java/generators/server/generator.js +107 -0
- package/dist/generators/java/generators/server/index.d.ts +20 -0
- package/dist/generators/java/generators/server/index.js +20 -0
- package/dist/generators/java/types.d.ts +3 -0
- package/dist/generators/javascript/generators/bootstrap/generator.d.ts +3 -1
- package/dist/generators/javascript/generators/bootstrap/generator.js +18 -3
- package/dist/generators/javascript/generators/eslint/command.d.ts +12 -20
- package/dist/generators/javascript/generators/eslint/command.js +2 -0
- package/dist/generators/javascript/generators/eslint/generator.d.ts +1 -0
- package/dist/generators/javascript/generators/husky/generator.d.ts +1 -0
- package/dist/generators/javascript/generators/prettier/generator.d.ts +1 -0
- package/dist/generators/javascript/generators/prettier/generator.js +12 -2
- package/dist/generators/javascript/resources/package.json +2 -2
- package/dist/generators/javascript/types.d.ts +24 -9
- package/dist/generators/jdl/generator.d.ts +1 -0
- package/dist/generators/kubernetes/files.js +3 -0
- package/dist/generators/kubernetes/generator.d.ts +49 -0
- package/dist/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs +1 -3
- package/dist/generators/kubernetes/templates/messagebroker/kafka.yml.ejs +16 -55
- package/dist/generators/kubernetes-helm/generator.d.ts +42 -0
- package/dist/generators/kubernetes-helm/templates/csvc/helpers.tpl.ejs +1 -12
- package/dist/generators/kubernetes-helm/templates/csvc/values.yml.ejs +0 -7
- package/dist/generators/kubernetes-knative/generator.d.ts +27 -1
- package/dist/generators/languages/generator.d.ts +5 -6
- package/dist/generators/languages/generator.js +8 -8
- package/dist/generators/languages/prompts.js +8 -5
- package/dist/generators/languages/support/translate.d.ts +4 -3
- package/dist/generators/languages/support/translate.js +1 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/fr/user-management.json +1 -1
- package/dist/generators/liquibase/generator.d.ts +1 -0
- package/dist/generators/liquibase/generator.js +11 -10
- package/dist/generators/liquibase/support/relationship.d.ts +3 -2
- package/dist/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs +10 -9
- package/dist/generators/maven/generator.d.ts +1 -0
- package/dist/generators/maven/generators/code-quality/generator.d.ts +1 -0
- package/dist/generators/maven/generators/frontend-plugin/generator.d.ts +1 -0
- package/dist/generators/maven/generators/frontend-plugin/generator.js +5 -31
- package/dist/generators/maven/generators/jib/generator.d.ts +1 -0
- package/dist/generators/project-name/generator.d.ts +1 -0
- package/dist/generators/react/files-react.js +1 -6
- package/dist/generators/react/generator.d.ts +3 -4
- package/dist/generators/react/generator.js +21 -13
- package/dist/generators/react/resources/package.json +26 -25
- package/dist/generators/react/support/translate-react.d.ts +3 -2
- package/dist/generators/react/support/translate-react.js +2 -2
- package/dist/generators/react/support/update-languages.d.ts +1 -1
- package/dist/generators/react/templates/eslint.config.js.jhi.react.ejs +1 -0
- package/dist/generators/react/templates/jest.conf.js.ejs +1 -1
- package/dist/generators/react/templates/package.json.ejs +1 -2
- package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs +4 -4
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-reducer.spec.ts.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/index.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/entities/routes.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/index.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/index.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/index.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/routes.tsx.ejs +4 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.spec.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary-routes.tsx.ejs +2 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs +7 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/account.spec.tsx.ejs +1 -1
- package/dist/generators/react/templates/tsconfig.test.json.ejs +0 -5
- package/dist/generators/react/templates/webpack/webpack.dev.js.ejs +1 -1
- package/dist/generators/server/generator.d.ts +2 -34
- package/dist/generators/server/generator.js +4 -182
- package/dist/generators/server/resources/Dockerfile +13 -16
- package/dist/generators/server/resources/gradle/libs.versions.toml +8 -8
- package/dist/generators/server/resources/pom.xml +9 -9
- package/dist/generators/server/support/config.d.ts +2 -4
- package/dist/generators/server/support/config.js +0 -6
- package/dist/generators/server/support/prepare-entity.d.ts +2 -1
- package/dist/generators/server/support/prepare-entity.js +3 -2
- package/dist/generators/server/support/prepare-field.d.ts +2 -1
- package/dist/generators/server/support/prepare-field.js +2 -0
- package/dist/generators/server/support/prepare-relationship.d.ts +2 -1
- package/dist/generators/server/support/templates/field-values.d.ts +2 -1
- package/dist/generators/server/support/templates/field-values.js +4 -3
- package/dist/generators/server/support/update-languages.d.ts +9 -2
- package/dist/generators/server/types.d.ts +10 -0
- package/dist/generators/spring-boot/command.d.ts +8 -1
- package/dist/generators/spring-boot/command.js +13 -6
- package/dist/generators/spring-boot/generator.d.ts +2 -11
- package/dist/generators/spring-boot/generator.js +21 -20
- package/dist/generators/spring-boot/prompts.d.ts +2 -6
- package/dist/generators/spring-boot/prompts.js +25 -42
- package/dist/generators/spring-boot/resources/spring-boot-dependencies.pom +191 -252
- package/dist/generators/spring-boot/templates/README.md.jhi.spring-boot.ejs +1 -1
- package/dist/generators/spring-boot/templates/build.gradle.ejs +6 -1
- package/dist/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs +7 -48
- package/dist/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs +1 -1
- package/dist/generators/spring-boot/templates/package.json.ejs +1 -4
- package/dist/generators/spring-boot/templates/pom.xml.ejs +6 -2
- package/dist/generators/spring-boot/templates/settings.gradle.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs +7 -7
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs +10 -4
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/PublicUserResource.java.ejs +2 -0
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +14 -40
- package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +3 -24
- package/dist/generators/spring-boot/templates/src/main/java/_package_/service/MailService.java.ejs +8 -8
- package/dist/generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs +4 -4
- package/dist/generators/spring-boot/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs +4 -3
- package/dist/generators/spring-boot/templates/src/main/resources/config/application-dev.yml.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/main/resources/config/application-tls.yml.ejs +9 -1
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs +6 -6
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/criteria/_entityClass_CriteriaTest.java.ejs +5 -4
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs +2 -2
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs +19 -21
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +40 -21
- package/dist/generators/spring-boot/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs +3 -3
- package/dist/generators/spring-boot/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs +1 -0
- package/dist/generators/spring-boot/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs +2 -2
- package/dist/generators/spring-boot/templates/src/test/java/_package_/service/MailServiceIT.java.ejs +2 -2
- package/dist/generators/spring-boot/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs +2 -2
- package/dist/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs +19 -19
- package/dist/generators/spring-cache/generator.d.ts +1 -0
- package/dist/generators/spring-cache/generator.js +1 -3
- package/dist/generators/spring-cache/resources/gradle/libs.versions.toml +1 -1
- package/dist/generators/spring-cloud/generators/gateway/generator.d.ts +1 -0
- package/dist/generators/spring-cloud-stream/generator.d.ts +1 -0
- package/dist/generators/spring-cloud-stream/generators/kafka/generator.d.ts +1 -0
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaProducer.java.ejs +1 -1
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/test/java/_package_/config/KafkaTestContainer.java.ejs +2 -1
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/test/java/_package_/config/KafkaTestContainersSpringContextCustomizerFactory.java.ejs +1 -2
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/test/java/_package_/web/rest/KafkaResourceIT_imperative.java.ejs +1 -1
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/test/java/_package_/web/rest/KafkaResourceIT_reactive.java.ejs +1 -1
- package/dist/generators/spring-cloud-stream/generators/pulsar/generator.d.ts +1 -0
- package/dist/generators/spring-data-cassandra/generator.d.ts +1 -0
- package/dist/generators/spring-data-cassandra/generator.js +1 -1
- package/dist/generators/spring-data-couchbase/generator.d.ts +1 -0
- package/dist/generators/spring-data-couchbase/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs +1 -1
- package/dist/generators/spring-data-couchbase/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs +0 -21
- package/dist/generators/spring-data-couchbase/templates/src/main/java/_package_/repository/JHipsterCouchbaseRepository.java.ejs +1 -1
- package/dist/generators/spring-data-elasticsearch/generator.d.ts +1 -0
- package/dist/generators/spring-data-mongodb/generator.d.ts +1 -0
- package/dist/generators/spring-data-neo4j/generator.d.ts +1 -0
- package/dist/generators/spring-data-relational/generator.d.ts +2 -1
- package/dist/generators/spring-data-relational/generator.js +6 -4
- package/dist/generators/spring-data-relational/support/database-data.js +0 -3
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs +1 -2
- package/dist/generators/spring-websocket/generator.d.ts +1 -0
- package/dist/generators/upgrade/generator.d.ts +1 -0
- package/dist/generators/vue/files-vue.js +0 -9
- package/dist/generators/vue/generator.d.ts +4 -4
- package/dist/generators/vue/generator.js +47 -25
- package/dist/generators/vue/resources/package.json +28 -29
- package/dist/generators/vue/support/translate-vue.d.ts +4 -4
- package/dist/generators/vue/support/translate-vue.js +1 -1
- package/dist/generators/vue/support/update-languages.d.ts +1 -1
- package/dist/generators/vue/templates/package.json.ejs +0 -2
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-edit.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-view.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs +7 -0
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +3 -6
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.service.spec.ts.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.service.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/main.ts.ejs +15 -0
- package/dist/generators/vue/templates/src/main/webapp/app/router/index.ts.ejs +2 -6
- package/dist/generators/vue/templates/vite.config.mts.ejs +1 -1
- package/dist/generators/vue/templates/vitest.config.mts.ejs +0 -7
- package/dist/generators/vue/templates/webpack/webpack.dev.js.ejs +1 -1
- package/dist/generators/workspaces/generator.d.ts +1 -0
- package/dist/lib/command/converter.d.ts +2 -2
- package/dist/lib/command/load.js +8 -25
- package/dist/lib/command/types.d.ts +9 -7
- package/dist/lib/internal/config-def.js +2 -8
- package/dist/lib/jdl/core/models/jdl-application.d.ts +1 -1
- package/dist/lib/jhipster/default-application-options.d.ts +7 -4
- package/dist/lib/jhipster/default-application-options.js +11 -3
- package/dist/lib/testing/github-group.d.ts +1 -1
- package/dist/lib/testing/github-group.js +5 -3
- package/dist/lib/testing/github.d.ts +5 -1
- package/dist/lib/testing/github.js +18 -5
- package/dist/lib/testing/helpers.d.ts +14 -1
- package/dist/lib/testing/helpers.js +34 -2
- package/dist/lib/testing/sample-config.js +2 -2
- package/dist/lib/testing/support/entity-samples.d.ts +29 -29
- package/dist/lib/testing/support/entity-samples.js +2 -2
- package/dist/lib/types/application/application.d.ts +4 -2
- package/dist/lib/types/application/entity.d.ts +47 -9
- package/dist/lib/types/application/field.d.ts +11 -2
- package/dist/lib/types/application/property.d.ts +10 -0
- package/dist/lib/types/application/relationship.d.ts +5 -1
- package/dist/lib/types/application/tasks.d.ts +14 -4
- package/dist/lib/types/base/entity.d.ts +11 -1
- package/dist/lib/types/base/field.d.ts +6 -2
- package/dist/lib/types/base/property.d.ts +6 -0
- package/dist/lib/types/base/relationship.d.ts +3 -1
- package/dist/lib/types/base/translation.d.ts +1 -0
- package/dist/lib/utils/derived-property.d.ts +6 -0
- package/dist/lib/utils/derived-property.js +27 -0
- package/dist/lib/utils/object.d.ts +4 -4
- package/dist/lib/utils/yo-rc.d.ts +22 -13
- package/package.json +37 -37
- package/dist/generators/angular/types-export.d.ts +0 -1
- package/dist/generators/app/types-export.d.ts +0 -1
- package/dist/generators/base/types-export.d.ts +0 -4
- package/dist/generators/base-application/types-export.d.ts +0 -6
- package/dist/generators/base-core/types-export.d.ts +0 -1
- package/dist/generators/base-entity-changes/types-export.d.ts +0 -1
- package/dist/generators/bootstrap/types-export.d.ts +0 -1
- package/dist/generators/bootstrap-application/types-export.d.ts +0 -1
- package/dist/generators/bootstrap-application-base/types-export.d.ts +0 -1
- package/dist/generators/bootstrap-application-client/types-export.d.ts +0 -1
- package/dist/generators/bootstrap-application-server/types-export.d.ts +0 -1
- package/dist/generators/ci-cd/types-export.d.ts +0 -1
- package/dist/generators/client/types-export.d.ts +0 -1
- package/dist/generators/common/types-export.d.ts +0 -1
- package/dist/generators/cucumber/types-export.d.ts +0 -1
- package/dist/generators/cypress/types-export.d.ts +0 -1
- package/dist/generators/docker/types-export.d.ts +0 -1
- package/dist/generators/docker-compose/types-export.d.ts +0 -1
- package/dist/generators/entities/types-export.d.ts +0 -1
- package/dist/generators/entity/types-export.d.ts +0 -1
- package/dist/generators/export-jdl/types-export.d.ts +0 -1
- package/dist/generators/feign-client/types-export.d.ts +0 -1
- package/dist/generators/gatling/types-export.d.ts +0 -1
- package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/build-matrix.mjs.ejs +0 -22
- package/dist/generators/generate-blueprint/types-export.d.ts +0 -1
- package/dist/generators/git/types-export.d.ts +0 -1
- package/dist/generators/gradle/types-export.d.ts +0 -1
- package/dist/generators/heroku/types-export.d.ts +0 -1
- package/dist/generators/info/types-export.d.ts +0 -1
- package/dist/generators/init/types-export.d.ts +0 -1
- package/dist/generators/java/types-export.d.ts +0 -1
- package/dist/generators/jdl/types-export.d.ts +0 -1
- package/dist/generators/kubernetes/types-export.d.ts +0 -1
- package/dist/generators/kubernetes-helm/types-export.d.ts +0 -1
- package/dist/generators/kubernetes-knative/types-export.d.ts +0 -1
- package/dist/generators/languages/types-export.d.ts +0 -1
- package/dist/generators/liquibase/types-export.d.ts +0 -1
- package/dist/generators/maven/types-export.d.ts +0 -1
- package/dist/generators/project-name/types-export.d.ts +0 -1
- package/dist/generators/react/templates/src/main/webapp/microfrontends/entities-menu.tsx.ejs +0 -3
- package/dist/generators/react/templates/src/main/webapp/microfrontends/entities-routes.tsx.ejs +0 -3
- package/dist/generators/react/types-export.d.ts +0 -1
- package/dist/generators/server/types-export.d.ts +0 -1
- package/dist/generators/spring-boot/types-export.d.ts +0 -1
- package/dist/generators/spring-cache/types-export.d.ts +0 -1
- package/dist/generators/spring-cloud-stream/types-export.d.ts +0 -1
- package/dist/generators/spring-data-cassandra/types-export.d.ts +0 -1
- package/dist/generators/spring-data-couchbase/types-export.d.ts +0 -1
- package/dist/generators/spring-data-elasticsearch/types-export.d.ts +0 -1
- package/dist/generators/spring-data-mongodb/types-export.d.ts +0 -1
- package/dist/generators/spring-data-neo4j/types-export.d.ts +0 -1
- package/dist/generators/spring-data-relational/types-export.d.ts +0 -1
- package/dist/generators/spring-websocket/types-export.d.ts +0 -1
- package/dist/generators/upgrade/types-export.d.ts +0 -1
- package/dist/generators/vue/templates/src/main/webapp/microfrontends/entities-menu-test.vue.ejs +0 -7
- package/dist/generators/vue/templates/src/main/webapp/microfrontends/entities-menu.component-test.ts.ejs +0 -6
- package/dist/generators/vue/templates/src/main/webapp/microfrontends/entities-router-test.ts.ejs +0 -1
- package/dist/generators/vue/types-export.d.ts +0 -1
- package/dist/generators/workspaces/types-export.d.ts +0 -1
|
@@ -17,13 +17,13 @@
|
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
19
|
<%_
|
|
20
|
-
const tsKeyId =
|
|
20
|
+
const tsKeyId = primaryKey.tsSampleValues[0];
|
|
21
21
|
const allRelationshipsByEntityNeedingOptions = Object
|
|
22
22
|
.values(relationshipsByOtherEntity)
|
|
23
23
|
.map(relationships => relationships.filter(rel => rel.persistableRelationship && !rel.otherEntity.embedded))
|
|
24
24
|
.filter(relationships => relationships.length > 0);
|
|
25
|
-
const testEntityPrimaryKey0 =
|
|
26
|
-
const testEntityPrimaryKey1 =
|
|
25
|
+
const testEntityPrimaryKey0 = tsPrimaryKeySamples[0];
|
|
26
|
+
const testEntityPrimaryKey1 = tsPrimaryKeySamples[1];
|
|
27
27
|
_%>
|
|
28
28
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
|
29
29
|
import { provideHttpClient, HttpResponse } from '@angular/common/http';
|
|
@@ -95,14 +95,14 @@ describe('<%= entityAngularName %> Management Update Component', () => {
|
|
|
95
95
|
<%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
|
|
96
96
|
<%_ const reference = relationship.reference _%>
|
|
97
97
|
<%_ if (relationship.collection) { _%>
|
|
98
|
-
const <%= reference.name %> : I<%= otherEntity.entityAngularName %>[] = [<%-
|
|
98
|
+
const <%= reference.name %> : I<%= otherEntity.entityAngularName %>[] = [<%- otherEntity.tsPrimaryKeySamples[0] %>];
|
|
99
99
|
<%_ } else { _%>
|
|
100
|
-
const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%-
|
|
100
|
+
const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- otherEntity.tsPrimaryKeySamples[0] %>;
|
|
101
101
|
<%_ } _%>
|
|
102
102
|
<%= entityInstance %>.<%= reference.name %> = <%= reference.name %>;
|
|
103
103
|
<%_ } _%>
|
|
104
104
|
|
|
105
|
-
const <%= otherEntity.entityInstance %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%-
|
|
105
|
+
const <%= otherEntity.entityInstance %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%- otherEntity.tsPrimaryKeySamples[0] %>];
|
|
106
106
|
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= otherEntity.entityInstance %>Collection })));
|
|
107
107
|
const additional<%= otherEntity.entityAngularNamePlural %> = [
|
|
108
108
|
<%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
|
|
@@ -130,10 +130,10 @@ describe('<%= entityAngularName %> Management Update Component', () => {
|
|
|
130
130
|
<%_ const reference = relationship.reference _%>
|
|
131
131
|
it('Should call <%= reference.name %> query and add missing value', () => {
|
|
132
132
|
const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
|
|
133
|
-
const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%-
|
|
133
|
+
const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- otherEntity.tsPrimaryKeySamples[0] %>;
|
|
134
134
|
<%= entityInstance %>.<%= reference.name %> = <%= reference.name %>;
|
|
135
135
|
|
|
136
|
-
const <%= reference.name %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%-
|
|
136
|
+
const <%= reference.name %>Collection: I<%= otherEntity.entityAngularName %>[] = [<%- otherEntity.tsPrimaryKeySamples[0] %>];
|
|
137
137
|
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%= reference.name %>Collection })));
|
|
138
138
|
const expectedCollection: I<%= otherEntity.entityAngularName %>[] = [<%= reference.name %>, ...<%= reference.name %>Collection];
|
|
139
139
|
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'add<%= otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
|
|
@@ -153,7 +153,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
|
|
|
153
153
|
<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
|
|
154
154
|
<%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
|
|
155
155
|
<%_ const otherEntity = relationship.otherEntity _%>
|
|
156
|
-
const <%= relationship.relationshipName %>: I<%= otherEntity.entityAngularName %> = <%-
|
|
156
|
+
const <%= relationship.relationshipName %>: I<%= otherEntity.entityAngularName %> = <%- otherEntity.tsPrimaryKeySamples[0] %>;
|
|
157
157
|
<%= entityInstance %>.<%= relationship.reference.name %> = <%= relationship.collection ? `[${relationship.relationshipName}]` : relationship.relationshipName %>;
|
|
158
158
|
<%_ } _%>
|
|
159
159
|
<%_ } _%>
|
|
@@ -165,7 +165,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
|
|
|
165
165
|
<%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && rel.otherRelationship); _%>
|
|
166
166
|
<%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
|
|
167
167
|
<%_ const otherEntity = relationship.otherEntity _%>
|
|
168
|
-
expect(comp.<% if (!relationshipsWithCustomUniqueOptions.includes(relationship)) { %><%= otherEntity.entityInstancePlural %>Shared<% } else { %><%= relationship.relationshipFieldNamePlural %><% } %>Collection).
|
|
168
|
+
expect(comp.<% if (!relationshipsWithCustomUniqueOptions.includes(relationship)) { %><%= otherEntity.entityInstancePlural %>Shared<% } else { %><%= relationship.relationshipFieldNamePlural %><% } %>Collection).toContainEqual(<%= relationship.relationshipName %>);
|
|
169
169
|
<%_ } _%>
|
|
170
170
|
<%_ } _%>
|
|
171
171
|
expect(comp.<%= entityInstance %>).toEqual(<%= entityInstance %>);
|
|
@@ -254,8 +254,8 @@ _%>
|
|
|
254
254
|
_%>
|
|
255
255
|
describe('compare<%= otherEntity.entityAngularName %>', () => {
|
|
256
256
|
it('Should forward to <%= otherEntity.entityInstance %>Service', () => {
|
|
257
|
-
const entity = <%-
|
|
258
|
-
const entity2 = <%-
|
|
257
|
+
const entity = <%- otherEntity.tsPrimaryKeySamples[0] %>;
|
|
258
|
+
const entity2 = <%- otherEntity.tsPrimaryKeySamples[1] %>;
|
|
259
259
|
jest.spyOn(<%= otherEntity.entityInstance %>Service, 'compare<%= otherEntity.entityAngularName %>');
|
|
260
260
|
comp.compare<%= otherEntity.entityAngularName %>(entity, entity2);
|
|
261
261
|
expect(<%= otherEntity.entityInstance %>Service.compare<%= otherEntity.entityAngularName %>).toHaveBeenCalledWith(entity, entity2);
|
|
@@ -49,13 +49,12 @@ import { <%= uniqueRel.otherEntityAngularName %>Service } from 'app/entities/<%=
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
_%>
|
|
52
|
-
<%_ const enumImports =
|
|
52
|
+
<%_ const enumImports = generateEntityClientEnumImports(fields); _%>
|
|
53
53
|
<%_ enumImports.forEach( (importedPath, importedType) => { _%>
|
|
54
54
|
import { <%- importedType %> } from '<%- importedPath %>';
|
|
55
55
|
<%_ }); _%>
|
|
56
56
|
|
|
57
57
|
@Component({
|
|
58
|
-
standalone: true,
|
|
59
58
|
selector: '<%= jhiPrefixDashed %>-<%= entityFileName %>-update',
|
|
60
59
|
templateUrl: './<%= entityFileName %>-update.component.html',
|
|
61
60
|
imports: [SharedModule, FormsModule, ReactiveFormsModule],
|
package/dist/generators/angular/templates/src/main/webapp/app/entities/entity-navbar-items.ts.ejs
CHANGED
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
import NavbarItem from 'app/layouts/navbar/navbar-item.model';
|
|
20
20
|
|
|
21
21
|
export const EntityNavbarItems: NavbarItem[] = [
|
|
22
|
-
<%_ for (const entity of
|
|
22
|
+
<%_ for (const entity of angularEntities) { _%>
|
|
23
23
|
{
|
|
24
24
|
name: '<%= entity.entityAngularName %>',
|
|
25
25
|
route: '/<%= entity.entityPage %>',
|
|
@@ -36,7 +36,6 @@ import { AccountService } from 'app/core/auth/account.service';
|
|
|
36
36
|
import { Account } from 'app/core/auth/account.model';
|
|
37
37
|
|
|
38
38
|
@Component({
|
|
39
|
-
standalone: true,
|
|
40
39
|
selector: '<%= jhiPrefixDashed %>-home',
|
|
41
40
|
templateUrl: './home.component.html',
|
|
42
41
|
styleUrl: './home.component.scss',
|
package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.ts.ejs
CHANGED
|
@@ -25,7 +25,6 @@ import { TranslateService } from '@ngx-translate/core';
|
|
|
25
25
|
import SharedModule from 'app/shared/shared.module';
|
|
26
26
|
|
|
27
27
|
@Component({
|
|
28
|
-
standalone: true,
|
|
29
28
|
selector: '<%= jhiPrefixDashed %>-error',
|
|
30
29
|
templateUrl: './error.component.html',
|
|
31
30
|
imports: [SharedModule],
|
|
@@ -25,7 +25,7 @@ import { DOCUMENT } from '@angular/common';
|
|
|
25
25
|
import { Component, NgZone } from '@angular/core';
|
|
26
26
|
import { of } from 'rxjs';
|
|
27
27
|
<%_ if (enableTranslation) { _%>
|
|
28
|
-
import { TranslateModule, TranslateService, LangChangeEvent } from '@ngx-translate/core';
|
|
28
|
+
import { InterpolatableTranslationObject, TranslateModule, TranslateService, LangChangeEvent } from '@ngx-translate/core';
|
|
29
29
|
<%_ } _%>
|
|
30
30
|
|
|
31
31
|
import { AccountService } from 'app/core/auth/account.service';
|
|
@@ -100,7 +100,7 @@ describe('MainComponent', () => {
|
|
|
100
100
|
const parentRoutePageTitle = 'parentTitle';
|
|
101
101
|
const childRoutePageTitle = 'childTitle';
|
|
102
102
|
<%_ if (enableTranslation) { _%>
|
|
103
|
-
const langChangeEvent: LangChangeEvent = { lang: '<%= nativeLanguage %>', translations:
|
|
103
|
+
const langChangeEvent: LangChangeEvent = { lang: '<%= nativeLanguage %>', translations: {} as InterpolatableTranslationObject };
|
|
104
104
|
<%_ } _%>
|
|
105
105
|
|
|
106
106
|
beforeEach(() => {
|
|
@@ -271,7 +271,7 @@ describe('MainComponent', () => {
|
|
|
271
271
|
<%_ if (enableI18nRTL) { _%>
|
|
272
272
|
findLanguageFromKeyPipe.isRTL = jest.fn(() => false);
|
|
273
273
|
<%_ } _%>
|
|
274
|
-
translateService.onLangChange.emit({ lang: 'lang1', translations:
|
|
274
|
+
translateService.onLangChange.emit({ lang: 'lang1', translations: {} as InterpolatableTranslationObject });
|
|
275
275
|
|
|
276
276
|
// THEN
|
|
277
277
|
expect(document.querySelector('html')?.getAttribute('lang')).toEqual('lang1');
|
|
@@ -283,7 +283,7 @@ describe('MainComponent', () => {
|
|
|
283
283
|
<%_ if (enableI18nRTL) { _%>
|
|
284
284
|
findLanguageFromKeyPipe.isRTL = jest.fn(() => true);
|
|
285
285
|
<%_ } _%>
|
|
286
|
-
translateService.onLangChange.emit({ lang: 'lang2', translations:
|
|
286
|
+
translateService.onLangChange.emit({ lang: 'lang2', translations: {} as InterpolatableTranslationObject });
|
|
287
287
|
|
|
288
288
|
// THEN
|
|
289
289
|
expect(document.querySelector('html')?.getAttribute('lang')).toEqual('lang2');
|
|
@@ -295,5 +295,7 @@ describe('MainComponent', () => {
|
|
|
295
295
|
<%_ } _%>
|
|
296
296
|
});
|
|
297
297
|
|
|
298
|
-
@Component({
|
|
298
|
+
@Component({
|
|
299
|
+
template: '',
|
|
300
|
+
})
|
|
299
301
|
export class BlankComponent {}
|
package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs
CHANGED
|
@@ -32,7 +32,6 @@ import FooterComponent from '../footer/footer.component';
|
|
|
32
32
|
import PageRibbonComponent from '../profiles/page-ribbon.component';
|
|
33
33
|
|
|
34
34
|
@Component({
|
|
35
|
-
standalone: true,
|
|
36
35
|
selector: '<%= jhiPrefixDashed %>-main',
|
|
37
36
|
templateUrl: './main.component.html',
|
|
38
37
|
providers: [AppPageTitleStrategy],
|
|
@@ -20,7 +20,6 @@ import { Directive, OnInit, ElementRef, Renderer2, inject, input } from '@angula
|
|
|
20
20
|
import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
|
|
21
21
|
|
|
22
22
|
@Directive({
|
|
23
|
-
standalone: true,
|
|
24
23
|
selector: '[<%= jhiPrefix %>ActiveMenu]',
|
|
25
24
|
})
|
|
26
25
|
export default class ActiveMenuDirective implements OnInit {
|
package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs
CHANGED
|
@@ -25,7 +25,6 @@ import { TranslateService } from '@ngx-translate/core';
|
|
|
25
25
|
import { StateStorageService } from 'app/core/auth/state-storage.service';
|
|
26
26
|
import SharedModule from 'app/shared/shared.module';
|
|
27
27
|
import HasAnyAuthorityDirective from 'app/shared/auth/has-any-authority.directive'
|
|
28
|
-
import { VERSION } from 'app/app.constants';
|
|
29
28
|
<%_ if (enableTranslation) { _%>
|
|
30
29
|
import { LANGUAGES } from 'app/config/language.constants';
|
|
31
30
|
import ActiveMenuDirective from './active-menu.directive';
|
|
@@ -38,10 +37,10 @@ import { EntityNavbarItems } from 'app/entities/entity-navbar-items';
|
|
|
38
37
|
<% if (microfrontend && applicationTypeGateway) { %>
|
|
39
38
|
import { loadNavbarItems, loadTranslationModule } from 'app/core/microfrontend';
|
|
40
39
|
<%_ } _%>
|
|
40
|
+
import { environment } from 'environments/environment';
|
|
41
41
|
import NavbarItem from './navbar-item.model';
|
|
42
42
|
|
|
43
43
|
@Component({
|
|
44
|
-
standalone: true,
|
|
45
44
|
selector: '<%= jhiPrefixDashed %>-navbar',
|
|
46
45
|
templateUrl: './navbar.component.html',
|
|
47
46
|
styleUrl: './navbar.component.scss',
|
|
@@ -85,6 +84,7 @@ export default class NavbarComponent implements OnInit {
|
|
|
85
84
|
private readonly router = inject(Router);
|
|
86
85
|
|
|
87
86
|
constructor() {
|
|
87
|
+
const { VERSION } = environment;
|
|
88
88
|
if (VERSION) {
|
|
89
89
|
this.version = VERSION.toLowerCase().startsWith('v') ? VERSION : `v${VERSION}`;
|
|
90
90
|
}
|
|
@@ -25,7 +25,6 @@ import { LoginService } from 'app/login/login.service';
|
|
|
25
25
|
import { AccountService } from 'app/core/auth/account.service';
|
|
26
26
|
|
|
27
27
|
@Component({
|
|
28
|
-
standalone: true,
|
|
29
28
|
selector: '<%= jhiPrefixDashed %>-login',
|
|
30
29
|
imports: [SharedModule, FormsModule, ReactiveFormsModule, RouterModule],
|
|
31
30
|
templateUrl: './login.component.html',
|
|
@@ -30,7 +30,6 @@ import { Alert, AlertService } from 'app/core/util/alert.service';
|
|
|
30
30
|
import { EventManager, EventWithContent } from 'app/core/util/event-manager.service';
|
|
31
31
|
|
|
32
32
|
@Component({
|
|
33
|
-
standalone: true,
|
|
34
33
|
selector: '<%= jhiPrefixDashed %>-alert-error',
|
|
35
34
|
templateUrl: './alert-error.component.html',
|
|
36
35
|
imports: [CommonModule, NgbModule],
|
package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs
CHANGED
|
@@ -23,7 +23,6 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
|
|
23
23
|
import { AlertService, Alert } from 'app/core/util/alert.service';
|
|
24
24
|
|
|
25
25
|
@Component({
|
|
26
|
-
standalone: true,
|
|
27
26
|
selector: '<%= jhiPrefixDashed %>-alert',
|
|
28
27
|
templateUrl: './alert.component.html',
|
|
29
28
|
imports: [CommonModule, NgbModule],
|
|
@@ -31,6 +31,7 @@ import { Account } from 'app/core/auth/account.model';
|
|
|
31
31
|
import HasAnyAuthorityDirective from './has-any-authority.directive';
|
|
32
32
|
|
|
33
33
|
@Component({
|
|
34
|
+
imports: [HasAnyAuthorityDirective],
|
|
34
35
|
template: ` <div *<%= jhiPrefix %>HasAnyAuthority="'ROLE_ADMIN'" #content></div> `,
|
|
35
36
|
})
|
|
36
37
|
class TestHasAnyAuthorityDirectiveComponent {
|
|
@@ -43,8 +44,7 @@ describe('HasAnyAuthorityDirective tests', () => {
|
|
|
43
44
|
|
|
44
45
|
beforeEach(waitForAsync(() => {
|
|
45
46
|
TestBed.configureTestingModule({
|
|
46
|
-
imports: [
|
|
47
|
-
declarations: [TestHasAnyAuthorityDirectiveComponent],
|
|
47
|
+
imports: [TestHasAnyAuthorityDirectiveComponent<%_ if (enableTranslation) { _%>, TranslateModule.forRoot()<%_ } _%>],
|
|
48
48
|
providers: [provideHttpClient(), AccountService],
|
|
49
49
|
});
|
|
50
50
|
}));
|
|
@@ -32,7 +32,6 @@ import { AccountService } from 'app/core/auth/account.service';
|
|
|
32
32
|
* ```
|
|
33
33
|
*/
|
|
34
34
|
@Directive({
|
|
35
|
-
standalone: true,
|
|
36
35
|
selector: '[<%= jhiPrefix %>HasAnyAuthority]',
|
|
37
36
|
})
|
|
38
37
|
export default class HasAnyAuthorityDirective {
|
|
@@ -46,15 +45,12 @@ export default class HasAnyAuthorityDirective {
|
|
|
46
45
|
const currentAccount = accountService.trackCurrentAccount();
|
|
47
46
|
const hasPermission = computed(() => currentAccount()?.authorities && accountService.hasAnyAuthority(this.authorities()));
|
|
48
47
|
|
|
49
|
-
effect(
|
|
50
|
-
()
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
},
|
|
57
|
-
{ allowSignalWrites: true },
|
|
58
|
-
);
|
|
48
|
+
effect(() => {
|
|
49
|
+
if (hasPermission()) {
|
|
50
|
+
this.viewContainerRef.createEmbeddedView(this.templateRef);
|
|
51
|
+
} else {
|
|
52
|
+
this.viewContainerRef.clear();
|
|
53
|
+
}
|
|
54
|
+
});
|
|
59
55
|
}
|
|
60
56
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
@if (filters.hasAnyFilterSet()) {
|
|
1
|
+
@if (filters().hasAnyFilterSet()) {
|
|
2
2
|
<div class="filter-display">
|
|
3
3
|
<span>__jhiTranslateTag__('entity.filters.set')</span>
|
|
4
4
|
<button class="btn" (click)="clearAllFilters()" (keydown.enter)="clearAllFilters()">
|
|
5
5
|
<fa-icon icon="times" title="__jhiTranslatePipe__('entity.filters.clearAll')"></fa-icon>
|
|
6
6
|
</button>
|
|
7
7
|
<ul>
|
|
8
|
-
@for (filterOption of filters.filterOptions; track filterOption.name) {
|
|
8
|
+
@for (filterOption of filters().filterOptions; track filterOption.name) {
|
|
9
9
|
@for (value of filterOption.values; track value) {
|
|
10
10
|
<li>
|
|
11
11
|
<span>{{ filterOption.name }}:</span> {{ value }}
|
package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.ts.ejs
CHANGED
|
@@ -1,21 +1,20 @@
|
|
|
1
|
-
import { Component,
|
|
1
|
+
import { Component, input } from '@angular/core';
|
|
2
2
|
import { IFilterOptions } from './filter.model';
|
|
3
3
|
import SharedModule from '../shared.module';
|
|
4
4
|
|
|
5
5
|
@Component({
|
|
6
|
-
standalone: true,
|
|
7
6
|
selector: '<%= jhiPrefixDashed %>-filter',
|
|
8
7
|
imports: [SharedModule],
|
|
9
8
|
templateUrl: './filter.component.html',
|
|
10
9
|
})
|
|
11
10
|
export default class FilterComponent {
|
|
12
|
-
|
|
11
|
+
readonly filters = input.required<IFilterOptions>();
|
|
13
12
|
|
|
14
13
|
clearAllFilters(): void {
|
|
15
|
-
this.filters.clear();
|
|
14
|
+
this.filters().clear();
|
|
16
15
|
}
|
|
17
16
|
|
|
18
17
|
clearFilter(filterName: string, value: string): void {
|
|
19
|
-
this.filters.removeFilter(filterName, value);
|
|
18
|
+
this.filters().removeFilter(filterName, value);
|
|
20
19
|
}
|
|
21
20
|
}
|
|
@@ -23,6 +23,7 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core';
|
|
|
23
23
|
import TranslateDirective from './translate.directive';
|
|
24
24
|
|
|
25
25
|
@Component({
|
|
26
|
+
imports: [TranslateDirective],
|
|
26
27
|
template: ` <div <%= jhiPrefix %>Translate="test"></div> `,
|
|
27
28
|
})
|
|
28
29
|
class TestTranslateDirectiveComponent {}
|
|
@@ -33,8 +34,7 @@ describe('TranslateDirective Tests', () => {
|
|
|
33
34
|
|
|
34
35
|
beforeEach(waitForAsync(() => {
|
|
35
36
|
TestBed.configureTestingModule({
|
|
36
|
-
imports: [TranslateModule.forRoot(),
|
|
37
|
-
declarations: [TestTranslateDirectiveComponent],
|
|
37
|
+
imports: [TranslateModule.forRoot(), TestTranslateDirectiveComponent],
|
|
38
38
|
});
|
|
39
39
|
}));
|
|
40
40
|
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
See the License for the specific language governing permissions and
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
|
-
import { inject,
|
|
19
|
+
import { inject, input, Directive, ElementRef, OnChanges, OnInit, OnDestroy } from '@angular/core';
|
|
20
20
|
import { TranslateService } from '@ngx-translate/core';
|
|
21
21
|
import { Subject } from 'rxjs';
|
|
22
22
|
import { takeUntil } from 'rxjs/operators';
|
|
@@ -27,12 +27,11 @@ import { translationNotFoundMessage } from 'app/config/translation.config';
|
|
|
27
27
|
* A wrapper directive on top of the translate pipe as the inbuilt translate directive from ngx-translate is too verbose and buggy
|
|
28
28
|
*/
|
|
29
29
|
@Directive({
|
|
30
|
-
standalone: true,
|
|
31
30
|
selector: '[<%= jhiPrefix %>Translate]',
|
|
32
31
|
})
|
|
33
32
|
export default class TranslateDirective implements OnChanges, OnInit, OnDestroy {
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
readonly <%= jhiPrefix %>Translate = input.required<string>();
|
|
34
|
+
readonly translateValues = input<Record<string, unknown>>();
|
|
36
35
|
|
|
37
36
|
private readonly directiveDestroyed = new Subject();
|
|
38
37
|
|
|
@@ -59,13 +58,13 @@ export default class TranslateDirective implements OnChanges, OnInit, OnDestroy
|
|
|
59
58
|
|
|
60
59
|
private getTranslation(): void {
|
|
61
60
|
this.translateService
|
|
62
|
-
.get(this.<%= jhiPrefix %>Translate, this.translateValues)
|
|
61
|
+
.get(this.<%= jhiPrefix %>Translate(), this.translateValues())
|
|
63
62
|
.pipe(takeUntil(this.directiveDestroyed))
|
|
64
63
|
.subscribe({
|
|
65
64
|
next: value => {
|
|
66
65
|
this.el.nativeElement.innerHTML = value;
|
|
67
66
|
},
|
|
68
|
-
error: () => `${translationNotFoundMessage}[${this.<%= jhiPrefix %>Translate}]`
|
|
67
|
+
error: () => `${translationNotFoundMessage}[${this.<%= jhiPrefix %>Translate()}]`
|
|
69
68
|
});
|
|
70
69
|
}
|
|
71
70
|
}
|
|
@@ -76,7 +76,7 @@ export class TranslationModule {
|
|
|
76
76
|
|
|
77
77
|
constructor() {
|
|
78
78
|
this.translateService.setDefaultLang('<%= nativeLanguage %>');
|
|
79
|
-
// if user have changed language and navigates away from the application and back to the application then use previously
|
|
79
|
+
// if user have changed language and navigates away from the application and back to the application then use previously chosen language
|
|
80
80
|
const langKey = this.stateStorageService.getLocale() ?? '<%= nativeLanguage %>';
|
|
81
81
|
this.translateService.use(langKey);
|
|
82
82
|
}
|
|
@@ -25,7 +25,6 @@ import TranslateDirective from '../language/translate.directive';
|
|
|
25
25
|
* A component that will take care of item count statistics of a pagination.
|
|
26
26
|
*/
|
|
27
27
|
@Component({
|
|
28
|
-
standalone: true,
|
|
29
28
|
selector: '<%= jhiPrefixDashed %>-item-count',
|
|
30
29
|
template: `
|
|
31
30
|
<%_ if (enableTranslation) { _%>
|
|
@@ -27,12 +27,11 @@ import { SortDirective } from './sort.directive';
|
|
|
27
27
|
import { SortState, sortStateSignal } from './sort-state';
|
|
28
28
|
|
|
29
29
|
@Component({
|
|
30
|
-
standalone: true,
|
|
31
30
|
imports: [SortDirective, SortByDirective, FaIconComponent],
|
|
32
31
|
template: `
|
|
33
32
|
<table>
|
|
34
33
|
<thead>
|
|
35
|
-
<tr <%= jhiPrefix %>Sort [sortState]="sortState" (sortChange)="transition($event)">
|
|
34
|
+
<tr <%= jhiPrefix %>Sort [(sortState)]="sortState" (sortChange)="transition($event)">
|
|
36
35
|
<th <%= jhiPrefix %>SortBy="name">
|
|
37
36
|
ID
|
|
38
37
|
<fa-icon [icon]="'sort'"></fa-icon>
|
|
@@ -78,7 +77,7 @@ describe('Directive: SortByDirective', () => {
|
|
|
78
77
|
fixture.detectChanges();
|
|
79
78
|
|
|
80
79
|
// THEN
|
|
81
|
-
expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
|
|
80
|
+
expect(sortByDirective.<%= jhiPrefix %>SortBy()).toEqual('name');
|
|
82
81
|
expect(sortByDirective.iconComponent()?.icon).toEqual(faSort.iconName);
|
|
83
82
|
});
|
|
84
83
|
|
|
@@ -91,7 +90,7 @@ describe('Directive: SortByDirective', () => {
|
|
|
91
90
|
fixture.detectChanges();
|
|
92
91
|
|
|
93
92
|
// THEN
|
|
94
|
-
expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
|
|
93
|
+
expect(sortByDirective.<%= jhiPrefix %>SortBy()).toEqual('name');
|
|
95
94
|
expect(sortByDirective.iconComponent()?.icon).toEqual(faSortUp.iconName);
|
|
96
95
|
});
|
|
97
96
|
|
|
@@ -104,7 +103,7 @@ describe('Directive: SortByDirective', () => {
|
|
|
104
103
|
fixture.detectChanges();
|
|
105
104
|
|
|
106
105
|
// THEN
|
|
107
|
-
expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
|
|
106
|
+
expect(sortByDirective.<%= jhiPrefix %>SortBy()).toEqual('name');
|
|
108
107
|
expect(sortByDirective.iconComponent()?.icon).toEqual(faSortDown.iconName);
|
|
109
108
|
});
|
|
110
109
|
|
|
@@ -117,7 +116,7 @@ describe('Directive: SortByDirective', () => {
|
|
|
117
116
|
fixture.detectChanges();
|
|
118
117
|
|
|
119
118
|
// THEN
|
|
120
|
-
expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
|
|
119
|
+
expect(sortByDirective.<%= jhiPrefix %>SortBy()).toEqual('name');
|
|
121
120
|
expect(sortByDirective.iconComponent()?.icon).toEqual(faSort.iconName);
|
|
122
121
|
});
|
|
123
122
|
|
package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs
CHANGED
|
@@ -16,18 +16,17 @@
|
|
|
16
16
|
See the License for the specific language governing permissions and
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
|
-
import { Directive, HostListener,
|
|
19
|
+
import { Directive, HostListener, contentChild, effect, inject, input } from '@angular/core';
|
|
20
20
|
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
|
|
21
21
|
import { faSort, faSortDown, faSortUp, IconDefinition } from '@fortawesome/free-solid-svg-icons';
|
|
22
22
|
|
|
23
23
|
import { SortDirective } from './sort.directive';
|
|
24
24
|
|
|
25
25
|
@Directive({
|
|
26
|
-
standalone: true,
|
|
27
26
|
selector: '[<%= jhiPrefix %>SortBy]',
|
|
28
27
|
})
|
|
29
28
|
export class SortByDirective {
|
|
30
|
-
|
|
29
|
+
readonly <%= jhiPrefix %>SortBy = input.required<string>();
|
|
31
30
|
|
|
32
31
|
iconComponent = contentChild(FaIconComponent);
|
|
33
32
|
|
|
@@ -42,7 +41,7 @@ export class SortByDirective {
|
|
|
42
41
|
if (this.iconComponent()) {
|
|
43
42
|
let icon: IconDefinition = this.sortIcon;
|
|
44
43
|
const { predicate, order } = this.sort.sortState();
|
|
45
|
-
if (predicate === this.<%= jhiPrefix %>SortBy && order !== undefined) {
|
|
44
|
+
if (predicate === this.<%= jhiPrefix %>SortBy() && order !== undefined) {
|
|
46
45
|
icon = order === 'asc' ? this.sortAscIcon : this.sortDescIcon;
|
|
47
46
|
}
|
|
48
47
|
this.iconComponent()!.icon = icon.iconName;
|
|
@@ -54,7 +53,7 @@ export class SortByDirective {
|
|
|
54
53
|
@HostListener('click')
|
|
55
54
|
onClick(): void {
|
|
56
55
|
if (this.iconComponent()) {
|
|
57
|
-
this.sort.sort(this.<%= jhiPrefix %>SortBy);
|
|
56
|
+
this.sort.sort(this.<%= jhiPrefix %>SortBy());
|
|
58
57
|
}
|
|
59
58
|
}
|
|
60
59
|
}
|
package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs
CHANGED
|
@@ -24,12 +24,11 @@ import { SortDirective } from './sort.directive';
|
|
|
24
24
|
import { SortState, sortStateSignal } from './sort-state';
|
|
25
25
|
|
|
26
26
|
@Component({
|
|
27
|
-
standalone: true,
|
|
28
27
|
imports: [SortDirective],
|
|
29
28
|
template: `
|
|
30
29
|
<table>
|
|
31
30
|
<thead>
|
|
32
|
-
<tr <%= jhiPrefix %>Sort [sortState]="sortState" (sortChange)="transition($event)"></tr>
|
|
31
|
+
<tr <%= jhiPrefix %>Sort [(sortState)]="sortState" (sortChange)="transition($event)"></tr>
|
|
33
32
|
</thead>
|
|
34
33
|
</table>
|
|
35
34
|
`,
|
package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.ts.ejs
CHANGED
|
@@ -16,27 +16,22 @@
|
|
|
16
16
|
See the License for the specific language governing permissions and
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
|
-
import { Directive,
|
|
20
|
-
import { SortOrder, SortState
|
|
21
|
-
|
|
22
|
-
export interface SortChangeDirective<T> {
|
|
23
|
-
sortChange: EventEmitter<SortState>;
|
|
24
|
-
|
|
25
|
-
sort(field: T): void;
|
|
26
|
-
}
|
|
19
|
+
import { Directive, model, output } from '@angular/core';
|
|
20
|
+
import { SortOrder, SortState } from './sort-state';
|
|
27
21
|
|
|
28
22
|
@Directive({
|
|
29
|
-
standalone: true,
|
|
30
23
|
selector: '[<%= jhiPrefix %>Sort]',
|
|
31
24
|
})
|
|
32
|
-
export class SortDirective
|
|
33
|
-
|
|
25
|
+
export class SortDirective {
|
|
26
|
+
readonly sortState = model.required<SortState>();
|
|
34
27
|
|
|
35
|
-
|
|
28
|
+
readonly sortChange = output<SortState>();
|
|
36
29
|
|
|
37
30
|
sort(field: string): void {
|
|
38
31
|
const { predicate, order } = this.sortState();
|
|
39
32
|
const toggle = (): SortOrder => (order === 'asc' ? 'desc' : 'asc');
|
|
40
|
-
|
|
33
|
+
const newSortState = { predicate: field, order: field !== predicate ? 'asc' : toggle() };
|
|
34
|
+
this.sortState.update(() => newSortState);
|
|
35
|
+
this.sortChange.emit(newSortState);
|
|
41
36
|
}
|
|
42
37
|
}
|
|
@@ -21,10 +21,10 @@ import { bootstrapApplication } from '@angular/platform-browser';
|
|
|
21
21
|
import { appConfig } from './app/app.config';
|
|
22
22
|
import AppComponent from './app/app.component';
|
|
23
23
|
|
|
24
|
-
import {
|
|
24
|
+
import { environment } from './environments/environment';
|
|
25
25
|
|
|
26
26
|
// disable debug data on prod profile to improve performance
|
|
27
|
-
if (!DEBUG_INFO_ENABLED) {
|
|
27
|
+
if (!environment.DEBUG_INFO_ENABLED) {
|
|
28
28
|
enableProdMode();
|
|
29
29
|
}
|
|
30
30
|
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
// These constants are injected via webpack DefinePlugin variables.
|
|
2
|
+
// You can add more variables in webpack.common.js or in profile specific webpack.<dev|prod>.js files.
|
|
3
|
+
// If you change the values in the webpack config files, you need to re run webpack to update the application
|
|
4
|
+
|
|
5
|
+
declare const __VERSION__: string;
|
|
1
6
|
declare const SERVER_API_URL: string;
|
|
2
7
|
<%_ if (enableTranslation) { _%>
|
|
3
8
|
declare const I18N_HASH: string;
|