generator-jhipster 8.2.1 → 8.3.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/dist/cli/environment-builder.mjs +3 -3
- package/dist/cli/jhipster-command.mjs +1 -2
- package/dist/cli/jhipster.cjs +0 -0
- package/dist/generators/angular/command.js +5 -0
- package/dist/generators/angular/generator.js +36 -9
- package/dist/generators/angular/index.js +1 -0
- package/dist/generators/angular/needle-api/needle-client-angular.js +3 -3
- package/dist/generators/angular/resources/package.json +13 -10
- package/dist/generators/angular/support/index.js +0 -1
- package/dist/generators/angular/support/translate-angular.js +142 -8
- package/dist/generators/angular/templates/package.json.ejs +0 -10
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs +4 -4
- 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/password/password-strength-bar/password-strength-bar.component.html.ejs +1 -1
- 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 +18 -26
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +18 -25
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +10 -15
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs +31 -46
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.html.ejs +7 -8
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs +20 -31
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.html.ejs +7 -12
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.model.ts.ejs +9 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs +5 -9
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +12 -12
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +36 -36
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +33 -33
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +8 -8
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +8 -8
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +13 -13
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.html.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.component.html.ejs +6 -6
- package/dist/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.component.ts.ejs +2 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +26 -26
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +16 -18
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +1 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +20 -34
- package/dist/generators/angular/templates/src/main/webapp/app/app.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +0 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/tracker/tracker.service.ts.ejs +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs +25 -25
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs +14 -14
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.spec.ts.ejs +0 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs +1 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +17 -24
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs +0 -2
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs +14 -15
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.spec.ts.ejs +1 -5
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/footer/footer.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +11 -18
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +21 -21
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +0 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +11 -12
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs +1 -2
- 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/shared/filter/filter.component.html.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.ts.ejs +1 -1
- package/dist/generators/app/generator.js +4 -4
- package/dist/generators/base/generator.js +21 -2
- package/dist/generators/base/shared-data.js +1 -2
- package/dist/generators/base/support/basename.js +1 -2
- package/dist/generators/base/support/needles.js +3 -5
- package/dist/generators/base/support/string.js +2 -2
- package/dist/generators/base-application/generator.js +4 -4
- package/dist/generators/base-application/support/entity.js +1 -2
- package/dist/generators/base-application/support/enum.js +2 -2
- package/dist/generators/base-application/support/prepare-entity.js +1 -1
- package/dist/generators/base-application/support/prepare-field.js +5 -6
- package/dist/generators/base-application/support/relationship.js +1 -2
- package/dist/generators/base-application/support/task-type-inference.js +6 -0
- package/dist/generators/base-core/generator.js +83 -14
- package/dist/generators/base-workspaces/internal/deployments.js +2 -2
- package/dist/generators/base-workspaces/internal/docker-dependencies.js +2 -2
- package/dist/generators/bootstrap/generator.js +4 -5
- package/dist/generators/bootstrap/internal/transform-utils.js +4 -0
- package/dist/generators/bootstrap/support/eslint-transform.js +2 -1
- package/dist/generators/bootstrap/support/java-unused-imports-transform.js +2 -1
- package/dist/generators/bootstrap/support/prettier-worker.js +2 -4
- package/dist/generators/bootstrap-application/generator.js +3 -4
- package/dist/generators/bootstrap-application-base/generator.js +4 -5
- package/dist/generators/bootstrap-application-base/utils.js +3 -3
- package/dist/generators/bootstrap-application-client/generator.js +2 -3
- package/dist/generators/bootstrap-application-server/generator.js +21 -15
- package/dist/generators/bootstrap-workspaces/generator.js +1 -2
- package/dist/generators/ci-cd/command.js +1 -2
- package/dist/generators/ci-cd/generator.js +3 -3
- package/dist/generators/client/command.js +1 -2
- package/dist/generators/client/generator.js +12 -12
- package/dist/generators/client/needle-api/needle-client-vue.js +2 -2
- package/dist/generators/client/resources/package.json +4 -4
- package/dist/generators/client/templates/src/main/webapp/index.html.ejs +1 -1
- package/dist/generators/common/generator.js +5 -5
- package/dist/generators/common/resources/package.json +1 -1
- package/dist/generators/cucumber/generator.js +17 -10
- package/dist/generators/cucumber/templates/buildSrc/src/main/groovy/jhipster.cucumber-conventions.gradle.ejs +1 -5
- package/dist/generators/cypress/generator.js +2 -3
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/administration/administration.cy.ts.ejs +10 -0
- package/dist/generators/docker/generator.js +4 -6
- package/dist/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs +0 -32
- package/dist/generators/docker/utils.js +2 -3
- package/dist/generators/docker-compose/generator.js +4 -5
- package/dist/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +0 -32
- package/dist/generators/entities/generator.js +4 -4
- package/dist/generators/entity/generator.js +10 -9
- package/dist/generators/entity/prompts.js +12 -12
- package/dist/generators/feign-client/generator.js +3 -4
- package/dist/generators/gatling/generator.js +2 -3
- package/dist/generators/generate-blueprint/files.js +1 -0
- package/dist/generators/generate-blueprint/generator.js +3 -4
- package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs +3 -2
- package/dist/generators/generate-blueprint/templates/generators/generator/command.mjs.ejs +19 -1
- package/dist/generators/generate-blueprint/templates/vitest.test-setup.ts.ejs +6 -0
- package/dist/generators/generator-constants.js +5 -2
- package/dist/generators/git/generator.js +3 -5
- package/dist/generators/gradle/command.js +32 -0
- package/dist/generators/gradle/constants.js +0 -1
- package/dist/generators/gradle/files.js +2 -8
- package/dist/generators/gradle/generator.js +85 -13
- package/dist/generators/gradle/generators/code-quality/generator.js +86 -0
- package/dist/generators/{java/cleanup.js → gradle/generators/code-quality/index.js} +1 -5
- package/dist/generators/gradle/generators/jib/generator.js +64 -0
- package/dist/generators/gradle/generators/jib/index.js +19 -0
- package/dist/generators/gradle/generators/node-gradle/generator.js +64 -0
- package/dist/generators/gradle/generators/node-gradle/index.js +19 -0
- package/dist/generators/gradle/generators/node-gradle/templates/buildSrc/src/main/groovy/jhipster.node-gradle-conventions.gradle.ejs +101 -0
- package/dist/generators/gradle/index.js +1 -0
- package/dist/generators/gradle/internal/needles.js +9 -3
- package/dist/generators/gradle/templates/buildSrc/build.gradle.ejs +3 -2
- package/dist/generators/gradle/templates/buildSrc/gradle/libs.versions.toml.ejs +8 -1
- package/dist/generators/gradle/templates/gradle/wrapper/{gradle-wrapper.properties.ejs → gradle-wrapper.properties} +1 -1
- package/dist/generators/heroku/generator.js +3 -3
- package/dist/generators/init/generator.js +3 -4
- package/dist/generators/init/resources/.node-version +1 -0
- package/dist/generators/java/command.js +2 -38
- package/dist/generators/java/generator.js +5 -260
- package/dist/generators/java/generators/bootstrap/command.js +35 -0
- package/dist/generators/java/generators/bootstrap/generator.js +178 -0
- package/dist/generators/java/generators/bootstrap/index.js +20 -0
- package/dist/generators/java/generators/build-tool/command.js +42 -0
- package/dist/generators/java/generators/build-tool/generator.js +143 -0
- package/dist/generators/java/generators/build-tool/index.js +20 -0
- package/dist/generators/java/generators/code-quality/command.js +5 -0
- package/dist/generators/java/generators/code-quality/generator.js +91 -0
- package/dist/generators/java/generators/code-quality/index.js +20 -0
- package/dist/generators/java/generators/domain/command.js +30 -0
- package/dist/generators/java/{entity-files.js → generators/domain/entity-files.js} +1 -1
- package/dist/generators/java/generators/domain/generator.js +153 -0
- package/dist/generators/java/generators/domain/index.js +20 -0
- package/dist/generators/java/generators/jib/command.js +5 -0
- package/dist/generators/java/generators/jib/generator.js +97 -0
- package/dist/generators/java/generators/jib/index.js +20 -0
- package/dist/generators/{server → java/generators/jib}/templates/src/main/docker/jib/entrypoint.sh.ejs +2 -0
- package/dist/generators/java/generators/node/command.js +5 -0
- package/dist/generators/java/generators/node/generator.js +97 -0
- package/dist/generators/java/generators/node/index.js +20 -0
- package/dist/generators/java/support/index.js +1 -0
- package/dist/generators/jdl/generator.js +6 -9
- package/dist/generators/kubernetes/generator.js +1 -1
- package/dist/generators/kubernetes/kubernetes-base.js +3 -3
- package/dist/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs +0 -32
- package/dist/generators/kubernetes-helm/generator.js +1 -1
- package/dist/generators/kubernetes-knative/generator.js +1 -1
- package/dist/generators/languages/entity-files.js +3 -2
- package/dist/generators/languages/generator.js +7 -10
- package/dist/generators/languages/support/translate.js +34 -9
- package/dist/generators/languages/translation-data.js +4 -5
- package/dist/generators/liquibase/generator.js +68 -25
- package/dist/generators/liquibase/support/maven-plugin.js +6 -0
- package/dist/generators/liquibase/templates/gradle/liquibase.gradle.ejs +3 -6
- package/dist/generators/maven/generator.js +14 -6
- package/dist/generators/maven/generators/code-quality/command.js +5 -0
- package/dist/generators/maven/generators/code-quality/generator.js +268 -0
- package/dist/generators/maven/generators/code-quality/index.js +20 -0
- package/dist/generators/maven/generators/frontend-plugin/command.js +5 -0
- package/dist/generators/maven/generators/frontend-plugin/generator.js +295 -0
- package/dist/generators/maven/generators/frontend-plugin/index.js +20 -0
- package/dist/generators/maven/generators/jib/command.js +5 -0
- package/dist/generators/maven/generators/jib/generator.js +136 -0
- package/dist/generators/maven/generators/jib/index.js +20 -0
- package/dist/generators/maven/internal/xml-store.js +1 -2
- package/dist/generators/maven/support/dependabot-maven.js +12 -2
- package/dist/generators/maven/support/pom-store.js +1 -2
- package/dist/generators/project-name/generator.js +9 -11
- package/dist/generators/react/generator.js +25 -6
- package/dist/generators/react/needle-api/needle-client-react.js +2 -2
- package/dist/generators/react/resources/package.json +18 -15
- package/dist/generators/react/templates/package.json.ejs +1 -7
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/tracker/tracker.tsx.ejs +2 -2
- package/dist/generators/server/command.js +2 -34
- package/dist/generators/server/generator.js +20 -154
- package/dist/generators/server/jdl/application-definition.js +1 -2
- package/dist/generators/server/prompts.js +4 -46
- package/dist/generators/server/resources/Dockerfile +7 -7
- package/dist/generators/server/resources/build.gradle +1 -0
- package/dist/generators/server/resources/gradle/libs.versions.toml +25 -7
- package/dist/generators/server/resources/pom.xml +4 -22
- package/dist/generators/server/support/prepare-field.js +1 -2
- package/dist/generators/server/templates/build.gradle.ejs +29 -143
- package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs +1 -1
- package/dist/generators/server/templates/gradle.properties.ejs +0 -7
- package/dist/generators/server/templates/pom.xml.ejs +23 -444
- package/dist/generators/server/templates/settings.gradle.ejs +0 -4
- package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +15 -3
- package/dist/generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs +4 -1
- package/dist/generators/server/templates/src/main/resources/config/application.yml.ejs +15 -4
- package/dist/generators/server/templates/src/test/java/_package_/IntegrationTest.java.ejs +0 -2
- package/dist/generators/server/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs +71 -46
- package/dist/generators/server/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs +0 -3
- package/dist/generators/server/templates/src/test/resources/config/application.yml.ejs +1 -1
- package/dist/generators/spring-boot/command.js +31 -2
- package/dist/generators/spring-boot/entity-files.js +2 -2
- package/dist/generators/spring-boot/files.js +3 -38
- package/dist/generators/spring-boot/generator.js +98 -37
- package/dist/generators/spring-boot/resources/spring-boot-dependencies.pom +105 -105
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +2 -2
- package/dist/generators/spring-cache/generator.js +11 -6
- package/dist/generators/spring-cache/internal/dependencies.js +5 -0
- package/dist/generators/spring-cache/resources/build.gradle +1 -0
- package/dist/generators/spring-cache/resources/gradle/libs.versions.toml +15 -0
- package/dist/generators/spring-cache/templates/src/test/java/_package_/config/RedisTestContainersSpringContextCustomizerFactory.java.ejs +29 -13
- package/dist/generators/spring-cloud/generators/gateway/command.js +5 -0
- package/dist/generators/spring-cloud/generators/gateway/generator.js +146 -0
- package/dist/generators/spring-cloud/generators/gateway/index.js +20 -0
- package/dist/generators/spring-cloud-stream/generator.js +2 -3
- package/dist/generators/spring-cloud-stream/generators/kafka/generator.js +2 -2
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/test/java/_package_/config/KafkaTestContainersSpringContextCustomizerFactory.java.ejs +28 -12
- package/dist/generators/spring-cloud-stream/generators/pulsar/generator.js +2 -2
- package/dist/generators/spring-cloud-stream/generators/pulsar/templates/src/test/java/_package_/config/PulsarTestContainersSpringContextCustomizerFactory.java.ejs +33 -17
- package/dist/generators/spring-data-cassandra/generator.js +5 -6
- package/dist/generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainersSpringContextCustomizerFactory.java.ejs +33 -17
- package/dist/generators/spring-data-couchbase/generator.js +3 -4
- package/dist/generators/spring-data-elasticsearch/generator.js +3 -5
- package/dist/generators/spring-data-mongodb/generator.js +5 -5
- package/dist/generators/spring-data-neo4j/generator.js +11 -5
- package/dist/generators/spring-data-neo4j/templates/src/test/java/_package_/config/Neo4jTestContainersSpringContextCustomizerFactory.java.ejs +32 -16
- package/dist/generators/spring-data-relational/generator.js +6 -7
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs +47 -32
- package/dist/generators/spring-websocket/generator.js +2 -3
- package/dist/generators/statistics.js +2 -2
- package/dist/generators/upgrade/generator.js +4 -3
- package/dist/generators/vue/generator.js +4 -4
- package/dist/generators/vue/resources/package.json +18 -15
- package/dist/generators/vue/templates/package.json.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/account/account.service.spec.ts.ejs +1 -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/admin/tracker/tracker.service.ts.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/admin/tracker/tracker.vue.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/main.ts.ejs +4 -3
- package/dist/generators/vue/templates/vite.config.mts.ejs +6 -0
- package/dist/generators/workspaces/generator.js +5 -4
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js +2 -2
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js +3 -3
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +2 -2
- package/dist/jdl/jdl-importer.js +1 -2
- package/dist/jdl/jhipster/default-application-options.js +1 -1
- package/dist/jdl/jhipster/field-types.js +2 -2
- package/dist/jdl/jhipster/relationship-types.js +1 -2
- package/dist/jdl/models/jdl-deployment.js +1 -2
- package/dist/jdl/parsing/api.js +2 -2
- package/dist/jdl/parsing/lexer/token-creator.js +1 -2
- package/dist/jdl/parsing/self-checks/parsing-system-checker.js +13 -13
- package/dist/jdl/parsing/validator.js +5 -5
- package/dist/testing/get-generator.js +1 -1
- package/dist/testing/helpers.js +34 -9
- package/dist/types/generators/angular/support/index.d.ts +0 -1
- package/dist/types/generators/angular/support/translate-angular.d.ts +7 -4
- package/dist/types/generators/app/support/config.d.ts +1 -1
- package/dist/types/generators/base/api.d.ts +7 -0
- package/dist/types/generators/base/generator.d.ts +1 -1
- package/dist/types/generators/base-application/generator.d.ts +4 -4
- package/dist/types/generators/base-application/support/task-type-inference.d.ts +3 -0
- package/dist/types/generators/base-application/support/update-application-entities-transform.d.ts +1 -1
- package/dist/types/generators/base-core/generator.d.ts +33 -1
- package/dist/types/generators/bootstrap/internal/transform-utils.d.ts +1 -0
- package/dist/types/generators/bootstrap/support/java-unused-imports-transform.d.ts +1 -1
- package/dist/types/generators/bootstrap-application-base/support/export-jdl-transform.d.ts +2 -2
- package/dist/types/generators/docker/utils.d.ts +7 -0
- package/dist/types/generators/generator-constants.d.ts +2 -20
- package/dist/types/generators/gradle/types.d.ts +21 -7
- package/dist/types/generators/java/support/index.d.ts +1 -0
- package/dist/types/generators/java/types.d.ts +37 -22
- package/dist/types/generators/languages/support/translate.d.ts +29 -0
- package/dist/types/generators/maven/support/dependabot-maven.d.ts +17 -1
- package/dist/types/generators/project-name/support/name-resolver.d.ts +1 -1
- package/dist/types/generators/server/types.d.ts +2 -0
- package/dist/types/jdl/converters/jdl-to-json/jdl-to-json-field-converter.d.ts +0 -18
- package/dist/types/testing/helpers.d.ts +6 -0
- package/dist/types/testing/support/matrix-utils.d.ts +1 -1
- package/package.json +15 -27
- package/dist/generators/java/files.js +0 -20
- /package/dist/generators/{server → gradle/generators/code-quality}/templates/buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle.ejs +0 -0
- /package/dist/generators/{server → gradle/generators/jib}/templates/buildSrc/src/main/groovy/jhipster.docker-conventions.gradle.ejs +0 -0
- /package/dist/generators/java/{templates → generators/bootstrap/templates}/src/main/java/_package_/GeneratedByJHipster.java.ejs +0 -0
- /package/dist/generators/{server → java/generators/code-quality}/templates/checkstyle.xml.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/_global_partials_entity_/field_validators.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jackson_identity_info.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_validation.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/main/java/_package_/_entityPackage_/domain/enumeration/_enumName_.java.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/test/java/_package_/_entityPackage_/domain/_persistClass_Asserts.java.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/test/java/_package_/_entityPackage_/domain/_persistClass_TestSamples.java.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/test/java/_package_/domain/AssertUtils.java.ejs +0 -0
- /package/dist/generators/{server → java/generators/node}/templates/npmw +0 -0
- /package/dist/generators/{server → java/generators/node}/templates/npmw.cmd +0 -0
- /package/dist/generators/{server → spring-cloud/generators/gateway}/templates/src/main/java/_package_/security/jwt/JWTRelayGatewayFilterFactory.java.ejs +0 -0
- /package/dist/generators/{server → spring-cloud/generators/gateway}/templates/src/main/java/_package_/web/filter/ModifyServersOpenApiFilter.java.ejs +0 -0
- /package/dist/generators/{server → spring-cloud/generators/gateway}/templates/src/main/java/_package_/web/rest/GatewayResource.java.ejs +0 -0
- /package/dist/generators/{server → spring-cloud/generators/gateway}/templates/src/main/java/_package_/web/rest/vm/RouteVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-cloud/generators/gateway}/templates/src/test/java/_package_/web/filter/ModifyServersOpenApiFilterTest.java.ejs +0 -0
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
@if (user) {
|
|
20
20
|
<form name="deleteForm" (ngSubmit)="confirmDelete(user.login!)">
|
|
21
21
|
<div class="modal-header">
|
|
22
|
-
<h4 class="modal-title"
|
|
22
|
+
<h4 class="modal-title">__jhiTranslateTag__('entity.delete.title')</h4>
|
|
23
23
|
|
|
24
24
|
<span class="btn btn-close" data-dismiss="modal" aria-hidden="true" (click)="cancel()"></span>
|
|
25
25
|
</div>
|
|
@@ -27,16 +27,16 @@
|
|
|
27
27
|
<div class="modal-body">
|
|
28
28
|
<<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
|
|
29
29
|
|
|
30
|
-
<p
|
|
30
|
+
<p>__jhiTranslateTag__('userManagement.delete.question', { "login": "user.login" })</p>
|
|
31
31
|
</div>
|
|
32
32
|
|
|
33
33
|
<div class="modal-footer">
|
|
34
34
|
<button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="cancel()">
|
|
35
|
-
<fa-icon icon="ban"></fa-icon> <span
|
|
35
|
+
<fa-icon icon="ban"></fa-icon> <span>__jhiTranslateTag__('entity.action.cancel')</span>
|
|
36
36
|
</button>
|
|
37
37
|
|
|
38
38
|
<button type="submit" class="btn btn-danger">
|
|
39
|
-
<fa-icon icon="times"></fa-icon> <span
|
|
39
|
+
<fa-icon icon="times"></fa-icon> <span>__jhiTranslateTag__('entity.action.delete')</span>
|
|
40
40
|
</button>
|
|
41
41
|
</div>
|
|
42
42
|
</form>
|
|
@@ -18,53 +18,53 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
<div class="d-flex justify-content-center">
|
|
20
20
|
<div class="col-8">
|
|
21
|
-
@if (user) {
|
|
21
|
+
@if (user()) {
|
|
22
22
|
<div>
|
|
23
23
|
<h2>
|
|
24
|
-
<span
|
|
24
|
+
<span>__jhiTranslateTag__('userManagement.detail.title')</span> [<strong>{{ user()!.login }}</strong>]
|
|
25
25
|
</h2>
|
|
26
26
|
|
|
27
27
|
<dl class="row-md jh-entity-details">
|
|
28
|
-
<dt><span
|
|
28
|
+
<dt><span>__jhiTranslateTag__('userManagement.login')</span></dt>
|
|
29
29
|
<dd>
|
|
30
|
-
<span>{{ user
|
|
31
|
-
@if (user
|
|
32
|
-
<span class="badge bg-success"
|
|
30
|
+
<span>{{ user()!.login }}</span>
|
|
31
|
+
@if (user()!.activated) {
|
|
32
|
+
<span class="badge bg-success">__jhiTranslateTag__('userManagement.activated')</span>
|
|
33
33
|
} @else {
|
|
34
|
-
<span class="badge bg-danger"
|
|
34
|
+
<span class="badge bg-danger">__jhiTranslateTag__('userManagement.deactivated')</span>
|
|
35
35
|
}
|
|
36
36
|
</dd>
|
|
37
37
|
|
|
38
|
-
<dt><span
|
|
39
|
-
<dd>{{ user
|
|
38
|
+
<dt><span>__jhiTranslateTag__('userManagement.firstName')</span></dt>
|
|
39
|
+
<dd>{{ user()!.firstName }}</dd>
|
|
40
40
|
|
|
41
|
-
<dt><span
|
|
42
|
-
<dd>{{ user
|
|
41
|
+
<dt><span>__jhiTranslateTag__('userManagement.lastName')</span></dt>
|
|
42
|
+
<dd>{{ user()!.lastName }}</dd>
|
|
43
43
|
|
|
44
|
-
<dt><span
|
|
45
|
-
<dd>{{ user
|
|
44
|
+
<dt><span>__jhiTranslateTag__('userManagement.email')</span></dt>
|
|
45
|
+
<dd>{{ user()!.email }}</dd>
|
|
46
46
|
<%_ if (enableTranslation) { _%>
|
|
47
47
|
|
|
48
|
-
<dt><span
|
|
49
|
-
<dd>{{ user
|
|
48
|
+
<dt><span>__jhiTranslateTag__('userManagement.langKey')</span></dt>
|
|
49
|
+
<dd>{{ user()!.langKey }}</dd>
|
|
50
50
|
<%_ } _%>
|
|
51
51
|
|
|
52
|
-
<dt><span
|
|
53
|
-
<dd>{{ user
|
|
52
|
+
<dt><span>__jhiTranslateTag__('userManagement.createdBy')</span></dt>
|
|
53
|
+
<dd>{{ user()!.createdBy }}</dd>
|
|
54
54
|
|
|
55
|
-
<dt><span
|
|
56
|
-
<dd>{{ user
|
|
55
|
+
<dt><span>__jhiTranslateTag__('userManagement.createdDate')</span></dt>
|
|
56
|
+
<dd>{{ user()!.createdDate | date: 'dd/MM/yy HH:mm' }}</dd>
|
|
57
57
|
|
|
58
|
-
<dt><span
|
|
59
|
-
<dd>{{ user
|
|
58
|
+
<dt><span>__jhiTranslateTag__('userManagement.lastModifiedBy')</span></dt>
|
|
59
|
+
<dd>{{ user()!.lastModifiedBy }}</dd>
|
|
60
60
|
|
|
61
|
-
<dt><span
|
|
62
|
-
<dd>{{ user
|
|
61
|
+
<dt><span>__jhiTranslateTag__('userManagement.lastModifiedDate')</span></dt>
|
|
62
|
+
<dd>{{ user()!.lastModifiedDate | date: 'dd/MM/yy HH:mm' }}</dd>
|
|
63
63
|
|
|
64
|
-
<dt><span
|
|
64
|
+
<dt><span>__jhiTranslateTag__('userManagement.profiles')</span></dt>
|
|
65
65
|
<dd>
|
|
66
66
|
<ul class="list-unstyled">
|
|
67
|
-
@for (authority of user
|
|
67
|
+
@for (authority of user()!.authorities; track $index) {
|
|
68
68
|
<li>
|
|
69
69
|
<span class="badge bg-info">{{ authority }}</span>
|
|
70
70
|
</li>
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
</dl>
|
|
75
75
|
|
|
76
76
|
<button type="submit" routerLink="../../" class="btn btn-info">
|
|
77
|
-
<fa-icon icon="arrow-left"></fa-icon> <span
|
|
77
|
+
<fa-icon icon="arrow-left"></fa-icon> <span>__jhiTranslateTag__('entity.action.back')</span>
|
|
78
78
|
</button>
|
|
79
79
|
</div>
|
|
80
80
|
}
|
|
@@ -21,7 +21,7 @@ const tsKeyId = this.generateTestEntityId(user.primaryKey.type);
|
|
|
21
21
|
_%>
|
|
22
22
|
import { TestBed } from '@angular/core/testing';
|
|
23
23
|
import { provideRouter, withComponentInputBinding } from '@angular/router';
|
|
24
|
-
import { RouterTestingHarness
|
|
24
|
+
import { RouterTestingHarness } from '@angular/router/testing';
|
|
25
25
|
import { of } from 'rxjs';
|
|
26
26
|
|
|
27
27
|
import { Authority } from 'app/config/authority.constants';
|
|
@@ -32,7 +32,7 @@ import UserManagementDetailComponent from './user-management-detail.component';
|
|
|
32
32
|
describe('User Management Detail Component', () => {
|
|
33
33
|
beforeEach(async () => {
|
|
34
34
|
await TestBed.configureTestingModule({
|
|
35
|
-
imports: [UserManagementDetailComponent
|
|
35
|
+
imports: [UserManagementDetailComponent],
|
|
36
36
|
providers: [
|
|
37
37
|
provideRouter(
|
|
38
38
|
[
|
|
@@ -69,7 +69,7 @@ describe('User Management Detail Component', () => {
|
|
|
69
69
|
const instance = await harness.navigateByUrl('/', UserManagementDetailComponent);
|
|
70
70
|
|
|
71
71
|
// THEN
|
|
72
|
-
expect(instance.user).toEqual(
|
|
72
|
+
expect(instance.user()).toEqual(
|
|
73
73
|
expect.objectContaining({
|
|
74
74
|
id: <%- tsKeyId %>,
|
|
75
75
|
login: 'user',
|
|
@@ -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 { Component,
|
|
19
|
+
import { Component, input } from '@angular/core';
|
|
20
20
|
import { RouterModule } from '@angular/router';
|
|
21
21
|
import SharedModule from 'app/shared/shared.module';
|
|
22
22
|
|
|
@@ -29,5 +29,5 @@ import { User } from '../user-management.model';
|
|
|
29
29
|
imports: [RouterModule, SharedModule],
|
|
30
30
|
})
|
|
31
31
|
export default class UserManagementDetailComponent {
|
|
32
|
-
|
|
32
|
+
user = input<User | null>(null);
|
|
33
33
|
}
|
|
@@ -18,15 +18,15 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
<div>
|
|
20
20
|
<h2>
|
|
21
|
-
<span id="user-management-page-heading"
|
|
21
|
+
<span id="user-management-page-heading" data-cy="userManagementPageHeading">__jhiTranslateTag__('userManagement.home.title')</span>
|
|
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
25
|
<fa-icon icon="sync" [spin]="isLoading()"></fa-icon>
|
|
26
|
-
<span
|
|
26
|
+
<span>__jhiTranslateTag__('userManagement.home.refreshListLabel')</span>
|
|
27
27
|
</button>
|
|
28
28
|
<button class="btn btn-primary jh-create-entity" [routerLink]="['./new']">
|
|
29
|
-
<fa-icon icon="plus"></fa-icon> <span
|
|
29
|
+
<fa-icon icon="plus"></fa-icon> <span>__jhiTranslateTag__('userManagement.home.createLabel')</span>
|
|
30
30
|
</button>
|
|
31
31
|
</div>
|
|
32
32
|
</h2>
|
|
@@ -41,30 +41,30 @@
|
|
|
41
41
|
<thead>
|
|
42
42
|
<tr<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>Sort [sortState]="sortState" (sortChange)="transition($event)"<% } %>>
|
|
43
43
|
<th scope="col"<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>SortBy="id"<% } %>>
|
|
44
|
-
<span
|
|
44
|
+
<span>__jhiTranslateTag__('global.field.id')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
|
|
45
45
|
</th>
|
|
46
46
|
<th scope="col"<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>SortBy="login"<% } %>>
|
|
47
|
-
<span
|
|
47
|
+
<span>__jhiTranslateTag__('userManagement.login')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
|
|
48
48
|
</th>
|
|
49
49
|
<th scope="col"<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>SortBy="email"<% } %>>
|
|
50
|
-
<span
|
|
50
|
+
<span>__jhiTranslateTag__('userManagement.email')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
|
|
51
51
|
</th>
|
|
52
52
|
<th scope="col"></th>
|
|
53
53
|
<%_ if (enableTranslation) { _%>
|
|
54
54
|
<th scope="col"<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>SortBy="langKey"<% } %>>
|
|
55
|
-
<span
|
|
55
|
+
<span>__jhiTranslateTag__('userManagement.langKey')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
|
|
56
56
|
</th>
|
|
57
57
|
<%_ } _%>
|
|
58
|
-
<th scope="col"><span
|
|
58
|
+
<th scope="col"><span>__jhiTranslateTag__('userManagement.profiles')</span></th>
|
|
59
59
|
<%_ if (!databaseTypeCassandra) { _%>
|
|
60
60
|
<th scope="col" <%= jhiPrefix %>SortBy="createdDate">
|
|
61
|
-
<span
|
|
61
|
+
<span>__jhiTranslateTag__('userManagement.createdDate')</span> <fa-icon icon="sort"></fa-icon>
|
|
62
62
|
</th>
|
|
63
63
|
<th scope="col" <%= jhiPrefix %>SortBy="lastModifiedBy">
|
|
64
|
-
<span
|
|
64
|
+
<span>__jhiTranslateTag__('userManagement.lastModifiedBy')</span> <fa-icon icon="sort"></fa-icon>
|
|
65
65
|
</th>
|
|
66
66
|
<th scope="col" <%= jhiPrefix %>SortBy="lastModifiedDate">
|
|
67
|
-
<span
|
|
67
|
+
<span>__jhiTranslateTag__('userManagement.lastModifiedDate')</span> <fa-icon icon="sort"></fa-icon>
|
|
68
68
|
</th>
|
|
69
69
|
<%_ } _%>
|
|
70
70
|
<th scope="col"></th>
|
|
@@ -82,14 +82,12 @@
|
|
|
82
82
|
@if (!user.activated) {
|
|
83
83
|
<button class="btn btn-danger btn-sm"
|
|
84
84
|
(click)="setActive(user, true)"
|
|
85
|
-
|
|
86
|
-
>__jhiTransformTranslate__('userManagement.deactivated')</button>
|
|
85
|
+
>__jhiTranslateTag__('userManagement.deactivated')</button>
|
|
87
86
|
} @else {
|
|
88
87
|
<button class="btn btn-success btn-sm"
|
|
89
88
|
(click)="setActive(user, false)"
|
|
90
89
|
[disabled]="!currentAccount() || currentAccount()?.login === user.login"
|
|
91
|
-
|
|
92
|
-
>__jhiTransformTranslate__('userManagement.activated')</button>
|
|
90
|
+
>__jhiTranslateTag__('userManagement.activated')</button>
|
|
93
91
|
}
|
|
94
92
|
</td>
|
|
95
93
|
<%_ if (enableTranslation) { _%>
|
|
@@ -111,12 +109,12 @@
|
|
|
111
109
|
<div class="btn-group">
|
|
112
110
|
<button type="submit" [routerLink]="['./', user.login, 'view']" class="btn btn-info btn-sm">
|
|
113
111
|
<fa-icon icon="eye"></fa-icon>
|
|
114
|
-
<span class="d-none d-md-inline"
|
|
112
|
+
<span class="d-none d-md-inline">__jhiTranslateTag__('entity.action.view')</span>
|
|
115
113
|
</button>
|
|
116
114
|
|
|
117
115
|
<button type="submit" [routerLink]="['./', user.login, 'edit']" queryParamsHandling="merge" class="btn btn-primary btn-sm">
|
|
118
116
|
<fa-icon icon="pencil-alt"></fa-icon>
|
|
119
|
-
<span class="d-none d-md-inline"
|
|
117
|
+
<span class="d-none d-md-inline">__jhiTranslateTag__('entity.action.edit')</span>
|
|
120
118
|
</button>
|
|
121
119
|
|
|
122
120
|
<button
|
|
@@ -126,7 +124,7 @@
|
|
|
126
124
|
[disabled]="!currentAccount() || currentAccount()?.login === user.login"
|
|
127
125
|
>
|
|
128
126
|
<fa-icon icon="times"></fa-icon>
|
|
129
|
-
<span class="d-none d-md-inline"
|
|
127
|
+
<span class="d-none d-md-inline">__jhiTranslateTag__('entity.action.delete')</span>
|
|
130
128
|
</button>
|
|
131
129
|
</div>
|
|
132
130
|
</td>
|
|
@@ -25,7 +25,6 @@ import { ComponentFixture, TestBed, waitForAsync, inject, fakeAsync, tick } from
|
|
|
25
25
|
import { HttpHeaders, HttpResponse } from '@angular/common/http';
|
|
26
26
|
import { HttpClientTestingModule } from '@angular/common/http/testing';
|
|
27
27
|
import { ActivatedRoute } from '@angular/router';
|
|
28
|
-
import { RouterTestingModule } from '@angular/router/testing';
|
|
29
28
|
import { of } from 'rxjs';
|
|
30
29
|
|
|
31
30
|
import { UserManagementService } from '../service/user-management.service';
|
|
@@ -53,7 +52,7 @@ describe('User Management Component', () => {
|
|
|
53
52
|
beforeEach(
|
|
54
53
|
waitForAsync(() => {
|
|
55
54
|
TestBed.configureTestingModule({
|
|
56
|
-
imports: [HttpClientTestingModule,
|
|
55
|
+
imports: [HttpClientTestingModule, UserManagementComponent],
|
|
57
56
|
providers: [{ provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService],
|
|
58
57
|
})
|
|
59
58
|
.overrideTemplate(UserManagementComponent, '')
|
|
@@ -19,105 +19,91 @@
|
|
|
19
19
|
<div class="d-flex justify-content-center">
|
|
20
20
|
<div class="col-8">
|
|
21
21
|
<form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
|
|
22
|
-
<h2 id="myUserLabel"
|
|
22
|
+
<h2 id="myUserLabel">__jhiTranslateTag__('userManagement.home.createOrEditLabel')</h2>
|
|
23
23
|
|
|
24
24
|
<<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
|
|
25
25
|
|
|
26
26
|
<div class="mb-3" [hidden]="!editForm.value.id">
|
|
27
|
-
<label class="form-label" for="field_id"
|
|
27
|
+
<label class="form-label" for="field_id">__jhiTranslateTag__('global.field.id')</label>
|
|
28
28
|
<input type="text" id="field_id" class="form-control" name="id" formControlName="id" readonly />
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
<div class="mb-3">
|
|
32
|
-
<label class="form-label" for="field_login"
|
|
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
|
@if (editForm.get('login')!.invalid && (editForm.get('login')!.dirty || editForm.get('login')!.touched)) {
|
|
36
36
|
<div>
|
|
37
37
|
@if (editForm.get('login')?.errors?.required) {
|
|
38
38
|
<small class="form-text text-danger"
|
|
39
|
-
|
|
40
|
-
>__jhiTransformTranslate__('entity.validation.required')</small>
|
|
39
|
+
>__jhiTranslateTag__('entity.validation.required')</small>
|
|
41
40
|
}
|
|
42
41
|
|
|
43
42
|
@if (editForm.get('login')?.errors?.maxlength) {
|
|
44
43
|
<small class="form-text text-danger"
|
|
45
|
-
|
|
46
|
-
[translateValues]="{ max: 50 }"
|
|
47
|
-
>__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })</small>
|
|
44
|
+
>__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
|
|
48
45
|
}
|
|
49
46
|
|
|
50
47
|
@if (editForm.get('login')?.errors?.pattern) {
|
|
51
48
|
<small class="form-text text-danger"
|
|
52
|
-
|
|
53
|
-
>__jhiTransformTranslate__('entity.validation.patternLogin')</small>
|
|
49
|
+
>__jhiTranslateTag__('entity.validation.patternLogin')</small>
|
|
54
50
|
}
|
|
55
51
|
</div>
|
|
56
52
|
}
|
|
57
53
|
</div>
|
|
58
54
|
|
|
59
55
|
<div class="mb-3">
|
|
60
|
-
<label class="form-label" for="field_firstName"
|
|
56
|
+
<label class="form-label" for="field_firstName">__jhiTranslateTag__('userManagement.firstName')</label>
|
|
61
57
|
<input type="text" id="field_firstName" class="form-control" name="firstName" formControlName="firstName" />
|
|
62
58
|
|
|
63
59
|
@if (editForm.get('firstName')!.invalid && (editForm.get('firstName')!.dirty || editForm.get('firstName')!.touched)) {
|
|
64
60
|
<div>
|
|
65
61
|
@if (editForm.get('firstName')?.errors?.maxlength) {
|
|
66
62
|
<small class="form-text text-danger"
|
|
67
|
-
|
|
68
|
-
[translateValues]="{ max: 50 }"
|
|
69
|
-
>__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })</small>
|
|
63
|
+
>__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
|
|
70
64
|
}
|
|
71
65
|
</div>
|
|
72
66
|
}
|
|
73
67
|
</div>
|
|
74
68
|
|
|
75
69
|
<div class="mb-3">
|
|
76
|
-
<label class="form-label" for="field_lastName"
|
|
70
|
+
<label class="form-label" for="field_lastName">__jhiTranslateTag__('userManagement.lastName')</label>
|
|
77
71
|
<input type="text" id="field_lastName" class="form-control" name="lastName" formControlName="lastName" />
|
|
78
72
|
|
|
79
73
|
@if (editForm.get('lastName')!.invalid && (editForm.get('lastName')!.dirty || editForm.get('lastName')!.touched)) {
|
|
80
74
|
<div>
|
|
81
75
|
@if (editForm.get('lastName')?.errors?.maxlength) {
|
|
82
76
|
<small class="form-text text-danger"
|
|
83
|
-
|
|
84
|
-
[translateValues]="{ max: 50 }"
|
|
85
|
-
>__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })</small>
|
|
77
|
+
>__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
|
|
86
78
|
}
|
|
87
79
|
</div>
|
|
88
80
|
}
|
|
89
81
|
</div>
|
|
90
82
|
|
|
91
83
|
<div class="mb-3">
|
|
92
|
-
<label class="form-label" for="field_email"
|
|
84
|
+
<label class="form-label" for="field_email">__jhiTranslateTag__('userManagement.email')</label>
|
|
93
85
|
<input type="email" id="field_email" class="form-control" name="email" formControlName="email" />
|
|
94
86
|
|
|
95
87
|
@if (editForm.get('email')!.invalid && (editForm.get('email')!.dirty || editForm.get('email')!.touched)) {
|
|
96
88
|
<div>
|
|
97
89
|
@if (editForm.get('email')?.errors?.required) {
|
|
98
90
|
<small class="form-text text-danger"
|
|
99
|
-
|
|
100
|
-
>__jhiTransformTranslate__('entity.validation.required')</small>
|
|
91
|
+
>__jhiTranslateTag__('entity.validation.required')</small>
|
|
101
92
|
}
|
|
102
93
|
|
|
103
94
|
@if (editForm.get('email')?.errors?.maxlength) {
|
|
104
95
|
<small class="form-text text-danger"
|
|
105
|
-
|
|
106
|
-
[translateValues]="{ max: 100 }"
|
|
107
|
-
>__jhiTransformTranslate__('entity.validation.maxlength', { "max": 100 })</small>
|
|
96
|
+
>__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 100 })</small>
|
|
108
97
|
}
|
|
109
98
|
|
|
110
99
|
@if (editForm.get('email')?.errors?.minlength) {
|
|
111
100
|
<small class="form-text text-danger"
|
|
112
|
-
|
|
113
|
-
[translateValues]="{ min: 5 }"
|
|
114
|
-
>__jhiTransformTranslate__('entity.validation.minlength', { "min": 5 })</small>
|
|
101
|
+
>__jhiTranslateValidationTag__('entity.validation.minlength', { "min": 5 })</small>
|
|
115
102
|
}
|
|
116
103
|
|
|
117
104
|
@if (editForm.get('email')?.errors?.email) {
|
|
118
105
|
<small class="form-text text-danger"
|
|
119
|
-
|
|
120
|
-
>__jhiTransformTranslate__('global.messages.validate.email.invalid')</small>
|
|
106
|
+
>__jhiTranslateTag__('global.messages.validate.email.invalid')</small>
|
|
121
107
|
}
|
|
122
108
|
</div>
|
|
123
109
|
}
|
|
@@ -133,14 +119,14 @@
|
|
|
133
119
|
name="activated"
|
|
134
120
|
formControlName="activated"
|
|
135
121
|
/>
|
|
136
|
-
<span
|
|
122
|
+
<span>__jhiTranslateTag__('userManagement.activated')</span>
|
|
137
123
|
</label>
|
|
138
124
|
</div>
|
|
139
125
|
<%_ if (enableTranslation) { _%>
|
|
140
126
|
|
|
141
127
|
@if (languages && languages.length > 0) {
|
|
142
128
|
<div class="mb-3">
|
|
143
|
-
<label class="form-label" for="langKey"
|
|
129
|
+
<label class="form-label" for="langKey">__jhiTranslateTag__('userManagement.langKey')</label>
|
|
144
130
|
<select class="form-control" id="langKey" name="langKey" formControlName="langKey">
|
|
145
131
|
@for (language of languages; track $index) {
|
|
146
132
|
<option [value]="language">{{ language | findLanguageFromKey }}</option>
|
|
@@ -151,7 +137,7 @@
|
|
|
151
137
|
<%_ } _%>
|
|
152
138
|
|
|
153
139
|
<div class="mb-3">
|
|
154
|
-
<label class="form-label" for="field_authority"
|
|
140
|
+
<label class="form-label" for="field_authority">__jhiTranslateTag__('userManagement.profiles')</label>
|
|
155
141
|
<select class="form-control" id="field_authority" multiple name="authority" formControlName="authorities">
|
|
156
142
|
@for (authority of authorities(); track $index) {
|
|
157
143
|
<option [value]="authority">{{ authority }}</option>
|
|
@@ -159,11 +145,11 @@
|
|
|
159
145
|
</select>
|
|
160
146
|
</div>
|
|
161
147
|
<button type="button" class="btn btn-secondary" (click)="previousState()">
|
|
162
|
-
<fa-icon icon="ban"></fa-icon> <span
|
|
148
|
+
<fa-icon icon="ban"></fa-icon> <span>__jhiTranslateTag__('entity.action.cancel')</span>
|
|
163
149
|
</button>
|
|
164
150
|
|
|
165
151
|
<button type="submit" [disabled]="editForm.invalid || isSaving()" class="btn btn-primary">
|
|
166
|
-
<fa-icon icon="save"></fa-icon> <span
|
|
152
|
+
<fa-icon icon="save"></fa-icon> <span>__jhiTranslateTag__('entity.action.save')</span>
|
|
167
153
|
</button>
|
|
168
154
|
</form>
|
|
169
155
|
</div>
|
|
@@ -41,8 +41,8 @@ import { TrackerService } from './core/tracker/tracker.service';
|
|
|
41
41
|
<%_ } _%>
|
|
42
42
|
|
|
43
43
|
@Component({
|
|
44
|
-
selector: '<%= jhiPrefixDashed %>-app',
|
|
45
44
|
standalone: true,
|
|
45
|
+
selector: '<%= jhiPrefixDashed %>-app',
|
|
46
46
|
template: '<<%= jhiPrefixDashed %>-main></<%= jhiPrefixDashed %>-main>',
|
|
47
47
|
imports: [
|
|
48
48
|
MainComponent,
|
package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.spec.ts.ejs
CHANGED
|
@@ -19,7 +19,6 @@
|
|
|
19
19
|
jest.mock('app/core/auth/state-storage.service');
|
|
20
20
|
|
|
21
21
|
import { Router } from '@angular/router';
|
|
22
|
-
import { RouterTestingModule } from '@angular/router/testing';
|
|
23
22
|
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
|
|
24
23
|
import { TestBed } from '@angular/core/testing';
|
|
25
24
|
<%_ if (enableTranslation) { _%>
|
|
@@ -65,7 +64,6 @@ describe('Account Service', () => {
|
|
|
65
64
|
TestBed.configureTestingModule({
|
|
66
65
|
imports: [
|
|
67
66
|
HttpClientTestingModule,
|
|
68
|
-
RouterTestingModule.withRoutes([]),
|
|
69
67
|
<%_ if (enableTranslation) { _%>
|
|
70
68
|
TranslateModule.forRoot(),
|
|
71
69
|
<%_ } _%>
|
package/dist/generators/angular/templates/src/main/webapp/app/core/tracker/tracker.service.ts.ejs
CHANGED
|
@@ -95,6 +95,13 @@ export class TrackerService {
|
|
|
95
95
|
);
|
|
96
96
|
}
|
|
97
97
|
|
|
98
|
+
sendActivity(): void {
|
|
99
|
+
this.stomp.publish({
|
|
100
|
+
destination: DESTINATION_ACTIVITY,
|
|
101
|
+
body: JSON.stringify({ page: this.router.routerState.snapshot.url }),
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
|
|
98
105
|
private connect(): void {
|
|
99
106
|
this.updateCredentials();
|
|
100
107
|
return this.stomp.activate();
|
|
@@ -131,11 +138,4 @@ export class TrackerService {
|
|
|
131
138
|
<%_ } _%>
|
|
132
139
|
});
|
|
133
140
|
}
|
|
134
|
-
|
|
135
|
-
private sendActivity(): void {
|
|
136
|
-
this.stomp.publish({
|
|
137
|
-
destination: DESTINATION_ACTIVITY,
|
|
138
|
-
body: JSON.stringify({ page: this.router.routerState.snapshot.url }),
|
|
139
|
-
});
|
|
140
|
-
}
|
|
141
141
|
}
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
@if (<%= entityInstance %>) {
|
|
20
20
|
<form name="deleteForm" (ngSubmit)="confirmDelete(<%= entityInstance %>.<%= primaryKey.name %>!)">
|
|
21
21
|
<div class="modal-header">
|
|
22
|
-
<h4 class="modal-title" data-cy="<%= entityInstance %>DeleteDialogHeading"
|
|
22
|
+
<h4 class="modal-title" data-cy="<%= entityInstance %>DeleteDialogHeading">__jhiTranslateTag__('entity.delete.title')</h4>
|
|
23
23
|
|
|
24
24
|
<span class="btn btn-close" data-dismiss="modal" aria-hidden="true"
|
|
25
25
|
(click)="cancel()"></span>
|
|
@@ -27,16 +27,16 @@
|
|
|
27
27
|
|
|
28
28
|
<div class="modal-body">
|
|
29
29
|
<<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
|
|
30
|
-
<p id="<%= jhiPrefixDashed %>-delete-<%= entityInstance %>-heading"
|
|
30
|
+
<p id="<%= jhiPrefixDashed %>-delete-<%= entityInstance %>-heading">__jhiTranslateTag__('<%- i18nKeyPrefix %>.delete.question', { "id": "<%- entityInstance%>.<%- primaryKey.name%>" })</p>
|
|
31
31
|
</div>
|
|
32
32
|
|
|
33
33
|
<div class="modal-footer">
|
|
34
34
|
<button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="cancel()">
|
|
35
|
-
<fa-icon icon="ban"></fa-icon> <span
|
|
35
|
+
<fa-icon icon="ban"></fa-icon> <span>__jhiTranslateTag__('entity.action.cancel')</span>
|
|
36
36
|
</button>
|
|
37
37
|
|
|
38
38
|
<button id="<%= jhiPrefixDashed %>-confirm-delete-<%= entityInstance %>" data-cy="entityConfirmDeleteButton" type="submit" class="btn btn-danger">
|
|
39
|
-
<fa-icon icon="times"></fa-icon> <span
|
|
39
|
+
<fa-icon icon="times"></fa-icon> <span>__jhiTranslateTag__('entity.action.delete')</span>
|
|
40
40
|
</button>
|
|
41
41
|
</div>
|
|
42
42
|
</form>
|