generator-jhipster 8.0.0-rc.1 → 8.1.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 +71 -58
- package/dist/cli/environment-builder.mjs +14 -7
- package/dist/cli/jhipster-command.mjs +7 -3
- package/dist/cli/program.mjs +2 -2
- package/dist/generators/angular/cleanup.mjs +7 -0
- package/dist/generators/angular/files-angular.mjs +3 -4
- package/dist/generators/angular/generator.mjs +10 -22
- package/dist/generators/angular/needle-api/needle-client-angular.mjs +2 -8
- package/dist/generators/angular/resources/package.json +25 -24
- package/dist/generators/angular/support/translate-angular.mjs +2 -2
- package/dist/generators/angular/templates/README.md.jhi.client.angular.ejs +1 -1
- package/dist/generators/angular/templates/angular.json.ejs +3 -7
- package/dist/generators/angular/templates/package.json.ejs +4 -8
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs +6 -4
- 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 +39 -33
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +44 -36
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +24 -23
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs +74 -62
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.html.ejs +12 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs +54 -48
- package/dist/generators/angular/templates/src/main/webapp/app/admin/admin.routes.ts.ejs +74 -0
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +15 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +20 -7
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.html.ejs +10 -7
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs +9 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs +12 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +13 -7
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +6 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +3 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +13 -9
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +13 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +21 -7
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +6 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +3 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.html.ejs +16 -7
- package/dist/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.component.html.ejs +3 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +3 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +11 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +20 -11
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +48 -34
- package/dist/generators/angular/templates/src/main/webapp/app/app.component.ts.ejs +73 -0
- package/dist/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs +67 -0
- package/dist/generators/angular/templates/src/main/webapp/app/app.routes.ts.ejs +85 -0
- package/dist/generators/angular/templates/src/main/webapp/app/core/microfrontend/index.ts.ejs +5 -4
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs +12 -12
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.model.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs +3 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs +26 -14
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs +44 -35
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.ts.ejs +5 -12
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +55 -21
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.ts.ejs +10 -10
- package/dist/generators/angular/templates/src/main/webapp/app/entities/entity.routes.ts.ejs +25 -0
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs +21 -17
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +5 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs +5 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +97 -78
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs +6 -4
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.html.ejs +6 -2
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.html.ejs +6 -2
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs +11 -7
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/content/scss/global.scss.ejs +1 -1
- package/dist/generators/angular/templates/webpack/webpack.microfrontend.js.ejs +48 -126
- package/dist/generators/app/README.md +108 -0
- package/dist/generators/app/USAGE +3 -0
- package/dist/generators/app/command.mjs +3 -3
- package/dist/generators/app/generator.mjs +11 -0
- package/dist/generators/app/support/config.mjs +3 -3
- package/dist/generators/base/command.mjs +0 -11
- package/dist/generators/base/generator.mjs +0 -3
- package/dist/generators/base/support/config.mjs +6 -6
- package/dist/generators/base/support/jhipster7-context.mjs +3 -3
- package/dist/generators/base-application/generator.mjs +7 -8
- package/dist/generators/base-application/support/entities.mjs +2 -2
- package/dist/generators/base-application/support/enum.mjs +1 -1
- package/dist/generators/base-application/support/index.mjs +1 -0
- package/dist/generators/base-application/support/prepare-entity.mjs +14 -11
- package/dist/generators/base-application/support/prepare-field.mjs +11 -7
- package/dist/generators/base-application/support/prepare-relationship.mjs +16 -14
- package/dist/generators/base-application/support/update-application-entities-transform.mjs +52 -0
- package/dist/generators/base-core/generator.mjs +17 -4
- package/dist/generators/base-entity-changes/generator.mjs +1 -1
- package/dist/generators/base-workspaces/internal/docker-prompts.mjs +13 -12
- package/dist/generators/bootstrap/command.mjs +6 -0
- package/dist/generators/bootstrap/generator.mjs +84 -45
- package/dist/generators/bootstrap/support/auto-crlf-transform.mjs +34 -21
- package/dist/generators/bootstrap/support/eslint-transform.mjs +2 -5
- package/dist/generators/bootstrap/support/java-unused-imports-transform.mjs +2 -2
- package/dist/generators/bootstrap/support/multi-step-transform/index.mjs +17 -28
- package/dist/generators/bootstrap/support/multi-step-transform/template-file-fs.mjs +12 -6
- package/dist/generators/bootstrap/support/multi-step-transform/template-file.mjs +1 -0
- package/dist/generators/bootstrap/support/prettier-support.mjs +2 -2
- package/dist/generators/bootstrap-application/generator.mjs +10 -21
- package/dist/generators/bootstrap-application-base/command.mjs +30 -0
- package/dist/generators/bootstrap-application-base/generator.mjs +36 -11
- package/dist/generators/bootstrap-application-base/index.mjs +1 -0
- package/dist/generators/bootstrap-application-base/support/export-jdl-transform.mjs +61 -0
- package/dist/generators/bootstrap-application-base/support/import-jdl-transform.mjs +64 -0
- package/dist/generators/bootstrap-application-base/support/index.mjs +2 -0
- package/dist/generators/bootstrap-application-server/generator.mjs +2 -2
- package/dist/generators/client/command.mjs +2 -0
- package/dist/generators/client/resources/package.json +4 -4
- package/dist/generators/client/support/entity-definition.mjs +3 -3
- package/dist/generators/client/templates/README.md.jhi.client.ejs +2 -2
- package/dist/generators/client/templates/src/main/webapp/content/css/loading.css.ejs +1 -1
- package/dist/generators/client/templates/src/main/webapp/index.html.ejs +2 -2
- package/dist/generators/client/templates/webpack/webpack.microfrontend.js.jhi.ejs +14 -1
- package/dist/generators/common/command.mjs +2 -0
- package/dist/generators/common/files.mjs +1 -1
- package/dist/generators/common/generator.mjs +29 -7
- package/dist/generators/common/resources/package.json +4 -4
- package/dist/generators/common/templates/.lintstagedrc.cjs.ejs +21 -0
- package/dist/generators/common/templates/.prettierrc.ejs +1 -1
- package/dist/generators/common/templates/README.md.jhi.ejs +2 -0
- package/dist/generators/common/templates/sonar-project.properties.ejs +1 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/settings-page.cy.ts.ejs +3 -0
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs +0 -1
- package/dist/generators/docker/generator.mjs +1 -1
- package/dist/generators/docker/templates/docker/cassandra.yml.ejs +2 -2
- package/dist/generators/docker/templates/docker/keycloak.yml.ejs +1 -1
- package/dist/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs +4 -1
- package/dist/generators/docker-compose/generator.mjs +4 -11
- package/dist/generators/docker-compose/templates/docker-compose.yml.ejs +1 -1
- package/dist/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +4 -1
- package/dist/generators/entity/prompts.mjs +123 -306
- package/dist/generators/export-jdl/generator.mjs +1 -1
- package/dist/generators/feign-client/cleanup.mjs +12 -0
- package/dist/generators/feign-client/files.mjs +35 -0
- package/dist/generators/feign-client/generator.mjs +65 -0
- package/dist/generators/feign-client/index.mjs +19 -0
- package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizationHeaderUtil.java.ejs +174 -0
- package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizedFeignClient.java.ejs +72 -0
- package/dist/generators/feign-client/templates/src/main/java/_package_/client/OAuth2InterceptedFeignConfiguration.java.ejs +35 -0
- package/dist/generators/feign-client/templates/src/main/java/_package_/client/OAuthIdpTokenResponseDTO.java.ejs +161 -0
- package/dist/generators/feign-client/templates/src/main/java/_package_/client/TokenRelayRequestInterceptor.java.ejs +42 -0
- package/dist/generators/feign-client/templates/src/main/java/_package_/client/UserFeignClientInterceptor_jwt.java.ejs +36 -0
- package/dist/generators/feign-client/templates/src/main/java/_package_/config/FeignConfiguration.java.ejs +45 -0
- package/dist/generators/feign-client/templates/src/test/java/_package_/client/AuthorizationHeaderUtilTest.java.ejs +263 -0
- package/dist/generators/generate-blueprint/command.mjs +1 -1
- package/dist/generators/generate-blueprint/resources/package.json +1 -1
- package/dist/generators/generate-blueprint/templates/vitest.config.ts.ejs +1 -1
- package/dist/generators/generator-constants.mjs +11 -7
- package/dist/generators/generator-list.mjs +1 -0
- package/dist/generators/git/generator.mjs +3 -5
- package/dist/generators/gradle/constants.mjs +1 -1
- package/dist/generators/heroku/generator.mjs +318 -595
- package/dist/generators/heroku/templates/Procfile.ejs +1 -1
- package/dist/generators/heroku/templates/application-heroku.yml.ejs +0 -12
- package/dist/generators/info/generator.mjs +6 -4
- package/dist/generators/init/generator.mjs +2 -2
- package/dist/generators/java/command.mjs +6 -0
- package/dist/generators/java/entity-files.mjs +5 -1
- package/dist/generators/java/generator.mjs +15 -15
- package/dist/generators/java/support/package-info-transform.mjs +20 -6
- package/dist/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs +24 -28
- package/dist/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jackson_identity_info.ejs +30 -0
- package/dist/generators/java/templates/src/main/java/_package_/_entityPackage_/domain/enumeration/_enumName_.java.ejs +3 -3
- package/dist/generators/java/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs +86 -8
- package/dist/generators/java/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_TestSamples.java.ejs +85 -0
- package/dist/generators/jdl/generator.mjs +32 -28
- package/dist/generators/kubernetes/templates/ingress.yml.ejs +0 -1
- package/dist/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs +4 -1
- package/dist/generators/kubernetes/templates/keycloak/keycloak.yml.ejs +1 -1
- package/dist/generators/languages/command.mjs +5 -0
- package/dist/generators/languages/generator.mjs +44 -28
- package/dist/generators/languages/prompts.mjs +3 -1
- package/dist/generators/languages/support/translate.mjs +1 -1
- package/dist/generators/languages/templates/entity/i18n/entity_pt-br.json.ejs +1 -1
- package/dist/generators/languages/translation-data.mjs +8 -13
- package/dist/generators/liquibase/README.md +19 -0
- package/dist/generators/liquibase/generator.mjs +7 -3
- package/dist/generators/project-name/generator.mjs +14 -19
- package/dist/generators/project-name/support/name-resolver.mjs +35 -6
- package/dist/generators/react/generator.mjs +18 -10
- package/dist/generators/react/resources/package.json +30 -29
- package/dist/generators/react/templates/package.json.ejs +4 -5
- package/dist/generators/react/templates/src/main/webapp/app/config/icon-loader.ts.ejs +35 -33
- package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.spec.ts.ejs +4 -4
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-detail.tsx.ejs +1 -2
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs +19 -15
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.reducer.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.tsx.ejs +3 -8
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityModel_.model.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/routes.tsx.ejs +9 -2
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.scss.ejs +6 -5
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/entities.tsx.ejs +10 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/date-utils.ts.ejs +1 -1
- package/dist/generators/react/templates/tsconfig.test.json.ejs +1 -1
- package/dist/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs +13 -58
- package/dist/generators/server/cleanup.mjs +5 -0
- package/dist/generators/server/command.mjs +13 -2
- package/dist/generators/server/entity-files.mjs +3 -3
- package/dist/generators/server/files.mjs +2 -38
- package/dist/generators/server/generator.mjs +48 -23
- package/dist/generators/server/jdl/application-definition.mjs +5 -2
- package/dist/generators/server/options/feign-client.mjs +24 -0
- package/dist/generators/server/options/index.mjs +1 -0
- package/dist/generators/server/resources/Dockerfile +19 -19
- package/dist/generators/server/resources/gradle/libs.versions.toml +4 -4
- package/dist/generators/server/resources/pom.xml +18 -18
- package/dist/generators/server/support/config.mjs +5 -4
- package/dist/generators/server/support/prepare-entity.mjs +9 -6
- package/dist/generators/server/support/prepare-field.mjs +20 -0
- package/dist/generators/server/support/relationship.mjs +2 -1
- package/dist/generators/server/support/templates/field-values.mjs +5 -2
- package/dist/generators/server/templates/README.md.jhi.spring-boot.ejs +0 -1
- package/dist/generators/server/templates/build.gradle.ejs +1 -2
- package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs +3 -21
- package/dist/generators/server/templates/gradle/profile_prod.gradle.ejs +5 -15
- package/dist/generators/server/templates/package.json.ejs +0 -5
- package/dist/generators/server/templates/pom.xml.ejs +2 -12
- package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs +8 -8
- package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_template.ejs +4 -4
- package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs +1 -1
- package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs +2 -2
- package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs +2 -2
- package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/web/rest/_entityClass_Resource.java.ejs +14 -14
- package/dist/generators/server/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs +2 -1
- package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +21 -3
- package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +6 -1
- package/dist/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs +1 -5
- package/dist/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs +48 -6
- package/dist/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs +1 -1
- package/dist/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs +4 -13
- package/dist/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs +5 -11
- package/dist/generators/server/templates/src/main/java/_package_/web/rest/PublicUserResource.java.ejs +6 -7
- package/dist/generators/server/templates/src/main/java/_package_/web/rest/UserResource.java.ejs +6 -8
- package/dist/generators/server/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs +4 -7
- package/dist/generators/server/templates/src/main/resources/config/application.yml.ejs +8 -7
- package/dist/generators/server/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs +1 -1
- package/dist/generators/server/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +11 -11
- package/dist/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs +4 -4
- package/dist/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs +2 -2
- package/dist/generators/spring-cache/internal/dependencies.mjs +1 -1
- package/dist/generators/spring-cache/templates/gradle/cache.gradle.ejs +1 -1
- package/dist/generators/spring-cache/templates/src/main/java/_package_/config/CacheFactoryConfiguration.java.ejs +1 -1
- package/dist/generators/spring-cloud-stream/templates/src/main/java/_package_/web/rest/KafkaResource_imperative.java.ejs +1 -1
- package/dist/generators/spring-cloud-stream/templates/src/main/java/_package_/web/rest/KafkaResource_reactive.java.ejs +1 -1
- package/dist/generators/spring-cloud-stream/templates/src/test/java/_package_/web/rest/KafkaResourceIT_reactive.java.ejs +3 -0
- package/dist/generators/spring-data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.elastic_search.ejs +1 -1
- package/dist/generators/spring-data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/repository/search/_entityClass_SearchRepository.java.ejs +1 -3
- package/dist/generators/spring-data-elasticsearch/templates/src/main/java/_package_/repository/search/UserSearchRepository.java.ejs +4 -4
- package/dist/generators/spring-data-neo4j/generator.mjs +43 -1
- package/dist/generators/spring-data-neo4j/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_neo4j.ejs +3 -37
- package/dist/generators/spring-data-relational/README.md +7 -0
- package/dist/generators/spring-data-relational/generator.mjs +2 -1
- package/dist/generators/spring-data-relational/internal/dependencies.mjs +29 -8
- package/dist/generators/spring-data-relational/support/database-data.mjs +4 -0
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs +49 -8
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs +1 -1
- package/dist/generators/upgrade/generator.mjs +3 -3
- package/dist/generators/vue/generator.mjs +25 -16
- package/dist/generators/vue/resources/package.json +29 -28
- package/dist/generators/vue/templates/package.json.ejs +4 -5
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +10 -3
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +3 -4
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.vue.ejs +1 -2
- 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_-update.component.ts.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.vue.ejs +2 -15
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.service.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.vue.ejs +14 -7
- package/dist/generators/vue/templates/src/main/webapp/app/router/index.ts.ejs +8 -1
- package/dist/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs +19 -34
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js +1 -0
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-option-converter.js +2 -2
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js +1 -1
- package/dist/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.js +1 -1
- package/dist/jdl/converters/json-to-jdl-converter.js +1 -1
- package/dist/jdl/converters/json-to-jdl-entity-converter.js +1 -0
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/application-converter.js +1 -17
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.js +5 -0
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +0 -27
- package/dist/jdl/exporters/applications/jhipster-application-formatter.js +17 -1
- package/dist/jdl/exporters/config.js +11 -0
- package/dist/jdl/exporters/export-utils.js +2 -13
- package/dist/jdl/exporters/jhipster-entity-exporter.js +3 -2
- package/dist/jdl/index.js +1 -0
- package/dist/jdl/jdl-importer.js +6 -2
- package/dist/jdl/jhipster/default-application-options.js +1 -1
- package/dist/jdl/jhipster/field-types.js +1 -1
- package/dist/jdl/jhipster/json-entity.js +6 -0
- package/dist/jdl/models/jdl-application-configuration-factory.js +34 -2
- package/dist/jdl/models/jdl-application-configuration.js +6 -3
- package/dist/jdl/models/jdl-application-factory.js +2 -2
- package/dist/jdl/models/jdl-application.js +12 -3
- package/dist/jdl/models/jdl-entity.js +16 -1
- package/dist/jdl/models/jdl-field.js +13 -0
- package/dist/jdl/models/jdl-object.js +3 -3
- package/dist/jdl/models/jdl-relationship.js +23 -5
- package/dist/jdl/parsing/jdl-ast-builder-visitor.js +63 -7
- package/dist/jdl/parsing/jdl-parser.js +52 -6
- package/dist/jdl/parsing/lexer/application-tokens.js +2 -2
- package/dist/jdl/validators/entity-validator.js +4 -2
- package/dist/jdl/validators/enum-validator.js +4 -2
- package/dist/jdl/validators/jdl-with-application-validator.js +18 -8
- package/dist/jdl/validators/jdl-without-application-validator.js +30 -29
- package/dist/jdl/validators/validator.js +1 -1
- package/dist/testing/helpers.mjs +10 -3
- package/dist/types/cli/environment-builder.d.mts +2 -0
- package/dist/types/generators/angular/needle-api/needle-client-angular.d.mts +0 -1
- package/dist/types/generators/base/api.d.mts +12 -0
- package/dist/types/generators/base/support/config.d.mts +3 -3
- package/dist/types/generators/base/support/needles.d.mts +1 -1
- package/dist/types/generators/base-application/generator.d.mts +2 -2
- package/dist/types/generators/base-application/support/index.d.mts +1 -0
- package/dist/types/generators/base-application/support/prepare-entity.d.mts +6 -1
- package/dist/types/generators/base-application/support/update-application-entities-transform.d.mts +4 -0
- package/dist/types/generators/base-application/types/relationship.d.mts +4 -0
- package/dist/types/generators/base-core/generator.d.mts +7 -1
- package/dist/types/generators/bootstrap/support/auto-crlf-transform.d.mts +3 -2
- package/dist/types/generators/bootstrap/support/multi-step-transform/index.d.mts +3 -20
- package/dist/types/generators/bootstrap/support/multi-step-transform/template-file-fs.d.mts +15 -9
- package/dist/types/generators/bootstrap/support/multi-step-transform/template-file.d.mts +1 -0
- package/dist/types/generators/bootstrap-application-base/support/export-jdl-transform.d.mts +8 -0
- package/dist/types/generators/bootstrap-application-base/support/import-jdl-transform.d.mts +6 -0
- package/dist/types/generators/bootstrap-application-base/support/index.d.mts +2 -0
- package/dist/types/generators/client/support/entity-definition.d.mts +2 -2
- package/dist/types/generators/feign-client/types-export.d.ts +1 -0
- package/dist/types/generators/generator-constants.d.mts +52 -48
- package/dist/types/generators/generator-list.d.mts +1 -0
- package/dist/types/generators/java/support/package-info-transform.d.mts +1 -4
- package/dist/types/generators/project-name/support/name-resolver.d.mts +9 -1
- package/dist/types/generators/server/options/feign-client.d.mts +21 -0
- package/dist/types/generators/server/options/index.d.mts +1 -0
- package/dist/types/generators/server/support/templates/field-values.d.mts +1 -1
- package/dist/types/jdl/converters/json-to-jdl-converter.d.ts +1 -0
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/option-converter.d.ts +1 -1
- package/dist/types/jdl/exporters/config.d.ts +1 -0
- package/dist/types/jdl/index.d.ts +1 -0
- package/dist/types/jdl/jdl-importer.d.ts +1 -0
- package/dist/types/jdl/jhipster/json-entity.d.ts +2 -0
- package/dist/types/jdl/models/jdl-application-configuration-factory.d.ts +1 -0
- package/dist/types/jdl/models/jdl-application-configuration-option.d.ts +2 -2
- package/dist/types/jdl/models/jdl-application-configuration.d.ts +8 -6
- package/dist/types/jdl/models/jdl-application-factory.d.ts +1 -1
- package/dist/types/jdl/models/jdl-application.d.ts +8 -4
- package/dist/types/jdl/models/jdl-entity.d.ts +1 -0
- package/dist/types/jdl/models/jdl-object.d.ts +1 -1
- package/dist/types/jdl/models/jdl-relationship.d.ts +0 -18
- package/dist/types/jdl/models/list-jdl-application-configuration-option.d.ts +1 -1
- package/dist/types/jdl/parsing/jdl-ast-builder-visitor.d.ts +10 -0
- package/dist/types/jdl/parsing/jdl-parser.d.ts +3 -0
- package/dist/types/jdl/parsing/lexer/application-tokens.d.ts +1 -0
- package/dist/types/jdl/types/types.d.mts +2 -2
- package/dist/types/jdl/validators/entity-validator.d.ts +2 -2
- package/dist/types/jdl/validators/enum-validator.d.ts +2 -2
- package/dist/types/jdl/validators/validator.d.ts +4 -1
- package/package.json +41 -41
|
@@ -18,7 +18,8 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
<h3 id="endpointsRequestsMetrics">Endpoints requests (time in millisecond)</h3>
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
@if (!updating && endpointsRequestsMetrics) {
|
|
22
|
+
<div class="table-responsive">
|
|
22
23
|
<table class="table table-striped" aria-describedby="endpointsRequestsMetrics">
|
|
23
24
|
<thead>
|
|
24
25
|
<tr>
|
|
@@ -29,14 +30,17 @@
|
|
|
29
30
|
</tr>
|
|
30
31
|
</thead>
|
|
31
32
|
<tbody>
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
</
|
|
39
|
-
</
|
|
33
|
+
@for (entry of endpointsRequestsMetrics | keyvalue; track entry.key) {
|
|
34
|
+
@for (method of entry.value | keyvalue; track method.key) {
|
|
35
|
+
<tr>
|
|
36
|
+
<td>{{ method.key }}</td>
|
|
37
|
+
<td>{{ entry.key }}</td>
|
|
38
|
+
<td class="text-end">{{ method.value!.count }}</td>
|
|
39
|
+
<td class="text-end">{{ method.value!.mean | number: '1.0-3' }}</td>
|
|
40
|
+
</tr>
|
|
41
|
+
}
|
|
42
|
+
}
|
|
40
43
|
</tbody>
|
|
41
44
|
</table>
|
|
42
45
|
</div>
|
|
46
|
+
}
|
|
@@ -20,7 +20,8 @@
|
|
|
20
20
|
|
|
21
21
|
<div class="row">
|
|
22
22
|
<div class="col-md-4">
|
|
23
|
-
|
|
23
|
+
@if (garbageCollectorMetrics) {
|
|
24
|
+
<div>
|
|
24
25
|
<span>
|
|
25
26
|
GC Live Data Size/GC Max Data Size ({{ garbageCollectorMetrics['jvm.gc.live.data.size'] / 1048576 | number: '1.0-0' }}M /
|
|
26
27
|
{{ garbageCollectorMetrics['jvm.gc.max.data.size'] / 1048576 | number: '1.0-0' }}M)
|
|
@@ -40,10 +41,12 @@
|
|
|
40
41
|
</span>
|
|
41
42
|
</ngb-progressbar>
|
|
42
43
|
</div>
|
|
44
|
+
}
|
|
43
45
|
</div>
|
|
44
46
|
|
|
45
47
|
<div class="col-md-4">
|
|
46
|
-
|
|
48
|
+
@if (garbageCollectorMetrics) {
|
|
49
|
+
<div>
|
|
47
50
|
<span>
|
|
48
51
|
GC Memory Promoted/GC Memory Allocated ({{ garbageCollectorMetrics['jvm.gc.memory.promoted'] / 1048576 | number: '1.0-0' }}M /
|
|
49
52
|
{{ garbageCollectorMetrics['jvm.gc.memory.allocated'] / 1048576 | number: '1.0-0' }}M)
|
|
@@ -64,20 +67,24 @@
|
|
|
64
67
|
</span>
|
|
65
68
|
</ngb-progressbar>
|
|
66
69
|
</div>
|
|
70
|
+
}
|
|
67
71
|
</div>
|
|
68
72
|
|
|
69
73
|
<div id="garbageCollectorMetrics" class="col-md-4">
|
|
70
|
-
|
|
74
|
+
@if (garbageCollectorMetrics) {
|
|
75
|
+
<div class="row">
|
|
71
76
|
<div class="col-md-9">Classes loaded</div>
|
|
72
77
|
<div class="col-md-3 text-end">{{ garbageCollectorMetrics.classesLoaded }}</div>
|
|
73
78
|
</div>
|
|
74
|
-
<div class="row"
|
|
79
|
+
<div class="row">
|
|
75
80
|
<div class="col-md-9">Classes unloaded</div>
|
|
76
81
|
<div class="col-md-3 text-end">{{ garbageCollectorMetrics.classesUnloaded }}</div>
|
|
77
82
|
</div>
|
|
83
|
+
}
|
|
78
84
|
</div>
|
|
79
85
|
|
|
80
|
-
|
|
86
|
+
@if (!updating && garbageCollectorMetrics) {
|
|
87
|
+
<div class="table-responsive">
|
|
81
88
|
<table class="table table-striped" aria-describedby="garbageCollectorMetrics">
|
|
82
89
|
<thead>
|
|
83
90
|
<tr>
|
|
@@ -107,4 +114,5 @@
|
|
|
107
114
|
</tbody>
|
|
108
115
|
</table>
|
|
109
116
|
</div>
|
|
117
|
+
}
|
|
110
118
|
</div>
|
|
@@ -25,32 +25,43 @@
|
|
|
25
25
|
<div class="modal-body">
|
|
26
26
|
<div class="mb-3">
|
|
27
27
|
<span class="badge bg-primary hand" (click)="threadStateFilter = undefined">
|
|
28
|
-
|
|
28
|
+
@if (threadStateFilter === undefined) {
|
|
29
|
+
<fa-icon icon="check"></fa-icon>
|
|
30
|
+
}
|
|
29
31
|
All <span class="badge rounded-pill bg-default">{{ threadDumpAll }}</span>
|
|
30
32
|
</span>
|
|
31
33
|
|
|
32
34
|
<span class="badge bg-success hand" (click)="threadStateFilter = ThreadState.Runnable">
|
|
33
|
-
|
|
35
|
+
@if (threadStateFilter === ThreadState.Runnable) {
|
|
36
|
+
<fa-icon icon="check"></fa-icon>
|
|
37
|
+
}
|
|
34
38
|
Runnable <span class="badge rounded-pill bg-default">{{ threadDumpRunnable }}</span>
|
|
35
39
|
</span>
|
|
36
40
|
|
|
37
41
|
<span class="badge bg-info hand" (click)="threadStateFilter = ThreadState.Waiting">
|
|
38
|
-
|
|
42
|
+
@if (threadStateFilter === ThreadState.Waiting) {
|
|
43
|
+
<fa-icon icon="check"></fa-icon>
|
|
44
|
+
}
|
|
39
45
|
Waiting <span class="badge rounded-pill bg-default">{{ threadDumpWaiting }}</span>
|
|
40
46
|
</span>
|
|
41
47
|
|
|
42
48
|
<span class="badge bg-warning hand" (click)="threadStateFilter = ThreadState.TimedWaiting">
|
|
43
|
-
|
|
49
|
+
@if (threadStateFilter === ThreadState.TimedWaiting) {
|
|
50
|
+
<fa-icon icon="check"></fa-icon>
|
|
51
|
+
}
|
|
44
52
|
Timed Waiting <span class="badge rounded-pill bg-default">{{ threadDumpTimedWaiting }}</span>
|
|
45
53
|
</span>
|
|
46
54
|
|
|
47
55
|
<span class="badge bg-danger hand" (click)="threadStateFilter = ThreadState.Blocked">
|
|
48
|
-
|
|
56
|
+
@if (threadStateFilter === ThreadState.Blocked) {
|
|
57
|
+
<fa-icon icon="check"></fa-icon>
|
|
58
|
+
}
|
|
49
59
|
Blocked <span class="badge rounded-pill bg-default">{{ threadDumpBlocked }}</span>
|
|
50
60
|
</span>
|
|
51
61
|
</div>
|
|
52
62
|
|
|
53
|
-
|
|
63
|
+
@for (thread of getThreads(); track $index) {
|
|
64
|
+
<div class="pad">
|
|
54
65
|
<h6>
|
|
55
66
|
<span class="badge" [ngClass]="getBadgeClass(thread.threadState)">{{ thread.threadState }}</span>
|
|
56
67
|
|
|
@@ -64,10 +75,12 @@
|
|
|
64
75
|
|
|
65
76
|
<div class="card" [hidden]="!thread.showThreadDump">
|
|
66
77
|
<div class="card-body">
|
|
67
|
-
|
|
78
|
+
@for (st of thread.stackTrace; track $index) {
|
|
79
|
+
<div class="break">
|
|
68
80
|
<samp>{{ st.className }}.{{ st.methodName }}(<code>{{ st.fileName }}:{{ st.lineNumber }}</code>)</samp>
|
|
69
81
|
<span class="mt-1"></span>
|
|
70
82
|
</div>
|
|
83
|
+
}
|
|
71
84
|
</div>
|
|
72
85
|
</div>
|
|
73
86
|
<table class="table table-sm table-responsive">
|
|
@@ -94,6 +107,7 @@
|
|
|
94
107
|
</tbody>
|
|
95
108
|
</table>
|
|
96
109
|
</div>
|
|
110
|
+
}
|
|
97
111
|
</div>
|
|
98
112
|
<div class="modal-footer">
|
|
99
113
|
<button type="button" class="btn btn-secondary float-start" data-dismiss="modal" (click)="dismiss()">Done</button>
|
|
@@ -18,7 +18,8 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
<h3 id="requestMetrics" <%= jhiPrefix %>Translate="metrics.jvm.http.title">__jhiTransformTranslate__('metrics.jvm.http.title')</h3>
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
@if (!updating && requestMetrics) {
|
|
22
|
+
<table class="table table-striped" aria-describedby="requestMetrics">
|
|
22
23
|
<thead>
|
|
23
24
|
<tr>
|
|
24
25
|
<th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.http.table.code">__jhiTransformTranslate__('metrics.jvm.http.table.code')</th>
|
|
@@ -28,7 +29,8 @@
|
|
|
28
29
|
</tr>
|
|
29
30
|
</thead>
|
|
30
31
|
<tbody>
|
|
31
|
-
|
|
32
|
+
@for (entry of requestMetrics['percode'] | keyvalue; track entry.key) {
|
|
33
|
+
<tr>
|
|
32
34
|
<td>{{ entry.key }}</td>
|
|
33
35
|
<td>
|
|
34
36
|
<ngb-progressbar [max]="requestMetrics['all'].count" [value]="entry.value.count" [striped]="true" [animated]="false" type="success">
|
|
@@ -40,5 +42,7 @@
|
|
|
40
42
|
</td>
|
|
41
43
|
<td class="text-end">{{ entry.value.max | number: '1.0-2' }}</td>
|
|
42
44
|
</tr>
|
|
45
|
+
}
|
|
43
46
|
</tbody>
|
|
44
47
|
</table>
|
|
48
|
+
}
|
|
@@ -18,7 +18,8 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
<h4>System</h4>
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
@if (!updating && systemMetrics) {
|
|
22
|
+
<ng-container>
|
|
22
23
|
<div class="row">
|
|
23
24
|
<div class="col-md-4">Uptime</div>
|
|
24
25
|
<div class="col-md-8 text-end">{{ convertMillisecondsToDuration(systemMetrics['process.uptime']) }}</div>
|
|
@@ -67,3 +68,4 @@
|
|
|
67
68
|
<div class="col-md-3 text-end">{{ systemMetrics['process.files.open'] | number: '1.0-0' }}</div>
|
|
68
69
|
</div>
|
|
69
70
|
</ng-container>
|
|
71
|
+
}
|
|
@@ -27,43 +27,52 @@
|
|
|
27
27
|
|
|
28
28
|
<h3 <%= jhiPrefix %>Translate="metrics.jvm.title">__jhiTransformTranslate__('metrics.jvm.title')</h3>
|
|
29
29
|
|
|
30
|
-
|
|
30
|
+
@if (metrics && !updatingMetrics) {
|
|
31
|
+
<div class="row">
|
|
31
32
|
<<%= jhiPrefixDashed %>-jvm-memory class="col-md-4" [updating]="updatingMetrics" [jvmMemoryMetrics]="metrics.jvm"></<%= jhiPrefixDashed %>-jvm-memory>
|
|
32
33
|
|
|
33
34
|
<<%= jhiPrefixDashed %>-jvm-threads class="col-md-4" [threads]="threads"></<%= jhiPrefixDashed %>-jvm-threads>
|
|
34
35
|
|
|
35
36
|
<<%= jhiPrefixDashed %>-metrics-system class="col-md-4" [updating]="updatingMetrics" [systemMetrics]="metrics.processMetrics"></<%= jhiPrefixDashed %>-metrics-system>
|
|
36
37
|
</div>
|
|
38
|
+
}
|
|
37
39
|
|
|
40
|
+
@if (metrics && metricsKeyExists('garbageCollector')) {
|
|
38
41
|
<<%= jhiPrefixDashed %>-metrics-garbagecollector
|
|
39
|
-
*ngIf="metrics && metricsKeyExists('garbageCollector')"
|
|
40
42
|
[updating]="updatingMetrics"
|
|
41
43
|
[garbageCollectorMetrics]="metrics.garbageCollector"
|
|
42
44
|
></<%= jhiPrefixDashed %>-metrics-garbagecollector>
|
|
45
|
+
}
|
|
43
46
|
|
|
44
|
-
|
|
47
|
+
@if (updatingMetrics) {
|
|
48
|
+
<div class="well well-lg" <%= jhiPrefix %>Translate="metrics.updating">__jhiTransformTranslate__('metrics.updating')</div>
|
|
49
|
+
}
|
|
45
50
|
|
|
51
|
+
@if (metrics && metricsKeyExists('http.server.requests')) {
|
|
46
52
|
<<%= jhiPrefixDashed %>-metrics-request
|
|
47
|
-
*ngIf="metrics && metricsKeyExists('http.server.requests')"
|
|
48
53
|
[updating]="updatingMetrics"
|
|
49
54
|
[requestMetrics]="metrics['http.server.requests']"
|
|
50
55
|
></<%= jhiPrefixDashed %>-metrics-request>
|
|
56
|
+
}
|
|
51
57
|
|
|
58
|
+
@if (metrics && metricsKeyExists('services')) {
|
|
52
59
|
<<%= jhiPrefixDashed %>-metrics-endpoints-requests
|
|
53
|
-
*ngIf="metrics && metricsKeyExists('services')"
|
|
54
60
|
[updating]="updatingMetrics"
|
|
55
61
|
[endpointsRequestsMetrics]="metrics.services"
|
|
56
62
|
></<%= jhiPrefixDashed %>-metrics-endpoints-requests>
|
|
63
|
+
}
|
|
57
64
|
|
|
65
|
+
@if (metrics && metricsKeyExists('cache')) {
|
|
58
66
|
<<%= jhiPrefixDashed %>-metrics-cache
|
|
59
|
-
*ngIf="metrics && metricsKeyExists('cache')"
|
|
60
67
|
[updating]="updatingMetrics"
|
|
61
68
|
[cacheMetrics]="metrics.cache"
|
|
62
69
|
></<%= jhiPrefixDashed %>-metrics-cache>
|
|
70
|
+
}
|
|
63
71
|
|
|
72
|
+
@if (metrics && metricsKeyExistsAndObjectNotEmpty('databases')) {
|
|
64
73
|
<<%= jhiPrefixDashed %>-metrics-datasource
|
|
65
|
-
*ngIf="metrics && metricsKeyExistsAndObjectNotEmpty('databases')"
|
|
66
74
|
[updating]="updatingMetrics"
|
|
67
75
|
[datasourceMetrics]="metrics.databases"
|
|
68
76
|
></<%= jhiPrefixDashed %>-metrics-datasource>
|
|
77
|
+
}
|
|
69
78
|
</div>
|
|
@@ -31,12 +31,14 @@
|
|
|
31
31
|
</tr>
|
|
32
32
|
</thead>
|
|
33
33
|
<tbody>
|
|
34
|
-
|
|
34
|
+
@for (activity of activities; track $index) {
|
|
35
|
+
<tr>
|
|
35
36
|
<td>{{ activity.userLogin }}</td>
|
|
36
37
|
<td>{{ activity.ipAddress }}</td>
|
|
37
38
|
<td>{{ activity.page }}</td>
|
|
38
39
|
<td>{{ activity.time | date: 'yyyy-MM-dd HH:mm:ss' }}</td>
|
|
39
40
|
</tr>
|
|
41
|
+
}
|
|
40
42
|
</tbody>
|
|
41
43
|
</table>
|
|
42
44
|
</div>
|
|
@@ -16,7 +16,8 @@
|
|
|
16
16
|
See the License for the specific language governing permissions and
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
|
-
|
|
19
|
+
@if (user) {
|
|
20
|
+
<form name="deleteForm" (ngSubmit)="confirmDelete(user.login!)">
|
|
20
21
|
<div class="modal-header">
|
|
21
22
|
<h4 class="modal-title" <%= jhiPrefix %>Translate="entity.delete.title">__jhiTransformTranslate__('entity.delete.title')</h4>
|
|
22
23
|
|
|
@@ -39,3 +40,4 @@
|
|
|
39
40
|
</button>
|
|
40
41
|
</div>
|
|
41
42
|
</form>
|
|
43
|
+
}
|
|
@@ -18,7 +18,8 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
<div class="d-flex justify-content-center">
|
|
20
20
|
<div class="col-8">
|
|
21
|
-
|
|
21
|
+
@if (user) {
|
|
22
|
+
<div>
|
|
22
23
|
<h2>
|
|
23
24
|
<span <%= jhiPrefix %>Translate="userManagement.detail.title">__jhiTransformTranslate__('userManagement.detail.title')</span> [<strong>{{ user.login }}</strong>]
|
|
24
25
|
</h2>
|
|
@@ -27,8 +28,11 @@
|
|
|
27
28
|
<dt><span <%= jhiPrefix %>Translate="userManagement.login">__jhiTransformTranslate__('userManagement.login')</span></dt>
|
|
28
29
|
<dd>
|
|
29
30
|
<span>{{ user.login }}</span>
|
|
30
|
-
|
|
31
|
-
<span
|
|
31
|
+
@if (user.activated) {
|
|
32
|
+
<span class="badge bg-success" <%= jhiPrefix %>Translate="userManagement.activated">__jhiTransformTranslate__('userManagement.activated')</span>
|
|
33
|
+
} @else {
|
|
34
|
+
<span class="badge bg-danger" <%= jhiPrefix %>Translate="userManagement.deactivated">__jhiTransformTranslate__('userManagement.deactivated')</span>
|
|
35
|
+
}
|
|
32
36
|
</dd>
|
|
33
37
|
|
|
34
38
|
<dt><span <%= jhiPrefix %>Translate="userManagement.firstName">__jhiTransformTranslate__('userManagement.firstName')</span></dt>
|
|
@@ -60,9 +64,11 @@
|
|
|
60
64
|
<dt><span <%= jhiPrefix %>Translate="userManagement.profiles">__jhiTransformTranslate__('userManagement.profiles')</span></dt>
|
|
61
65
|
<dd>
|
|
62
66
|
<ul class="list-unstyled">
|
|
63
|
-
|
|
67
|
+
@for (authority of user.authorities; track $index) {
|
|
68
|
+
<li>
|
|
64
69
|
<span class="badge bg-info">{{ authority }}</span>
|
|
65
70
|
</li>
|
|
71
|
+
}
|
|
66
72
|
</ul>
|
|
67
73
|
</dd>
|
|
68
74
|
</dl>
|
|
@@ -71,5 +77,6 @@
|
|
|
71
77
|
<fa-icon icon="arrow-left"></fa-icon> <span <%= jhiPrefix %>Translate="entity.action.back">__jhiTransformTranslate__('entity.action.back')</span>
|
|
72
78
|
</button>
|
|
73
79
|
</div>
|
|
80
|
+
}
|
|
74
81
|
</div>
|
|
75
82
|
</div>
|
|
@@ -35,7 +35,8 @@
|
|
|
35
35
|
|
|
36
36
|
<<%= jhiPrefixDashed %>-alert></<%= jhiPrefixDashed %>-alert>
|
|
37
37
|
|
|
38
|
-
|
|
38
|
+
@if (users) {
|
|
39
|
+
<div class="table-responsive">
|
|
39
40
|
<table class="table table-striped" aria-describedby="user-management-page-heading">
|
|
40
41
|
<thead>
|
|
41
42
|
<tr<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>Sort [(predicate)]="predicate" [(ascending)]="ascending" (sortChange)="transition()"<% } %>>
|
|
@@ -69,35 +70,38 @@
|
|
|
69
70
|
<th scope="col"></th>
|
|
70
71
|
</tr>
|
|
71
72
|
</thead>
|
|
72
|
-
|
|
73
|
-
|
|
73
|
+
@if (users) {
|
|
74
|
+
<tbody>
|
|
75
|
+
@for (user of users; track trackIdentity) {
|
|
76
|
+
<tr>
|
|
74
77
|
<td>
|
|
75
78
|
<a [routerLink]="['./', user.login, 'view']">{{ user.id }}</a>
|
|
76
79
|
</td>
|
|
77
80
|
<td>{{ user.login }}</td>
|
|
78
81
|
<td>{{ user.email }}</td>
|
|
79
82
|
<td>
|
|
80
|
-
|
|
81
|
-
|
|
83
|
+
@if (!user.activated) {
|
|
84
|
+
<button class="btn btn-danger btn-sm"
|
|
82
85
|
(click)="setActive(user, true)"
|
|
83
|
-
*ngIf="!user.activated"
|
|
84
86
|
<%= jhiPrefix %>Translate="userManagement.deactivated"
|
|
85
87
|
>__jhiTransformTranslate__('userManagement.deactivated')</button>
|
|
86
|
-
|
|
87
|
-
|
|
88
|
+
} @else {
|
|
89
|
+
<button class="btn btn-success btn-sm"
|
|
88
90
|
(click)="setActive(user, false)"
|
|
89
|
-
*ngIf="user.activated"
|
|
90
91
|
[disabled]="!currentAccount || currentAccount.login === user.login"
|
|
91
92
|
<%= jhiPrefix %>Translate="userManagement.activated"
|
|
92
93
|
>__jhiTransformTranslate__('userManagement.activated')</button>
|
|
94
|
+
}
|
|
93
95
|
</td>
|
|
94
96
|
<%_ if (enableTranslation) { _%>
|
|
95
97
|
<td>{{ user.langKey }}</td>
|
|
96
98
|
<%_ } _%>
|
|
97
99
|
<td>
|
|
98
|
-
|
|
100
|
+
@for (authority of user.authorities; track $index) {
|
|
101
|
+
<div>
|
|
99
102
|
<span class="badge bg-info">{{ authority }}</span>
|
|
100
103
|
</div>
|
|
104
|
+
}
|
|
101
105
|
</td>
|
|
102
106
|
<%_ if (!databaseTypeCassandra) { _%>
|
|
103
107
|
<td>{{ user.createdDate | date: 'dd/MM/yy HH:mm' }}</td>
|
|
@@ -128,12 +132,16 @@
|
|
|
128
132
|
</div>
|
|
129
133
|
</td>
|
|
130
134
|
</tr>
|
|
135
|
+
}
|
|
131
136
|
</tbody>
|
|
137
|
+
}
|
|
132
138
|
</table>
|
|
133
139
|
</div>
|
|
140
|
+
}
|
|
134
141
|
<%_ if (!databaseTypeCassandra) { _%>
|
|
135
142
|
|
|
136
|
-
|
|
143
|
+
@if (users) {
|
|
144
|
+
<div>
|
|
137
145
|
<div class="d-flex justify-content-center">
|
|
138
146
|
<<%= jhiPrefixDashed %>-item-count [params]="{ page: page, totalItems: totalItems, itemsPerPage: itemsPerPage }"></<%= jhiPrefixDashed %>-item-count>
|
|
139
147
|
</div>
|
|
@@ -150,5 +158,6 @@
|
|
|
150
158
|
></ngb-pagination>
|
|
151
159
|
</div>
|
|
152
160
|
</div>
|
|
161
|
+
}
|
|
153
162
|
<%_ } _%>
|
|
154
163
|
</div>
|
|
@@ -32,87 +32,95 @@
|
|
|
32
32
|
<label class="form-label" <%= jhiPrefix %>Translate="userManagement.login">__jhiTransformTranslate__('userManagement.login')</label>
|
|
33
33
|
<input type="text" class="form-control" name="login" formControlName="login" />
|
|
34
34
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
35
|
+
@if (editForm.get('login')!.invalid && (editForm.get('login')!.dirty || editForm.get('login')!.touched)) {
|
|
36
|
+
<div>
|
|
37
|
+
@if (editForm.get('login')?.errors?.required) {
|
|
38
|
+
<small class="form-text text-danger"
|
|
39
39
|
<%= jhiPrefix %>Translate="entity.validation.required"
|
|
40
40
|
>__jhiTransformTranslate__('entity.validation.required')</small>
|
|
41
|
+
}
|
|
41
42
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
*ngIf="editForm.get('login')?.errors?.maxlength"
|
|
43
|
+
@if (editForm.get('login')?.errors?.maxlength) {
|
|
44
|
+
<small class="form-text text-danger"
|
|
45
45
|
<%= jhiPrefix %>Translate="entity.validation.maxlength"
|
|
46
46
|
[translateValues]="{ max: 50 }"
|
|
47
47
|
>__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })</small>
|
|
48
|
+
}
|
|
48
49
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
*ngIf="editForm.get('login')?.errors?.pattern"
|
|
50
|
+
@if (editForm.get('login')?.errors?.pattern) {
|
|
51
|
+
<small class="form-text text-danger"
|
|
52
52
|
<%= jhiPrefix %>Translate="entity.validation.patternLogin"
|
|
53
53
|
>__jhiTransformTranslate__('entity.validation.patternLogin')</small>
|
|
54
|
+
}
|
|
54
55
|
</div>
|
|
56
|
+
}
|
|
55
57
|
</div>
|
|
56
58
|
|
|
57
59
|
<div class="mb-3">
|
|
58
60
|
<label class="form-label" <%= jhiPrefix %>Translate="userManagement.firstName">__jhiTransformTranslate__('userManagement.firstName')</label>
|
|
59
61
|
<input type="text" class="form-control" name="firstName" formControlName="firstName" />
|
|
60
62
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
63
|
+
@if (editForm.get('firstName')!.invalid && (editForm.get('firstName')!.dirty || editForm.get('firstName')!.touched)) {
|
|
64
|
+
<div>
|
|
65
|
+
@if (editForm.get('firstName')?.errors?.maxlength) {
|
|
66
|
+
<small class="form-text text-danger"
|
|
65
67
|
<%= jhiPrefix %>Translate="entity.validation.maxlength"
|
|
66
68
|
[translateValues]="{ max: 50 }"
|
|
67
69
|
>__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })</small>
|
|
70
|
+
}
|
|
68
71
|
</div>
|
|
72
|
+
}
|
|
69
73
|
</div>
|
|
70
74
|
|
|
71
75
|
<div class="mb-3">
|
|
72
76
|
<label <%= jhiPrefix %>Translate="userManagement.lastName">__jhiTransformTranslate__('userManagement.lastName')</label>
|
|
73
77
|
<input type="text" class="form-control" name="lastName" formControlName="lastName" />
|
|
74
78
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
+
@if (editForm.get('lastName')!.invalid && (editForm.get('lastName')!.dirty || editForm.get('lastName')!.touched)) {
|
|
80
|
+
<div>
|
|
81
|
+
@if (editForm.get('lastName')?.errors?.maxlength) {
|
|
82
|
+
<small class="form-text text-danger"
|
|
79
83
|
<%= jhiPrefix %>Translate="entity.validation.maxlength"
|
|
80
84
|
[translateValues]="{ max: 50 }"
|
|
81
85
|
>__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })</small>
|
|
86
|
+
}
|
|
82
87
|
</div>
|
|
88
|
+
}
|
|
83
89
|
</div>
|
|
84
90
|
|
|
85
91
|
<div class="mb-3">
|
|
86
92
|
<label class="form-label" <%= jhiPrefix %>Translate="userManagement.email">__jhiTransformTranslate__('userManagement.email')</label>
|
|
87
93
|
<input type="email" class="form-control" name="email" formControlName="email" />
|
|
88
94
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
95
|
+
@if (editForm.get('email')!.invalid && (editForm.get('email')!.dirty || editForm.get('email')!.touched)) {
|
|
96
|
+
<div>
|
|
97
|
+
@if (editForm.get('email')?.errors?.required) {
|
|
98
|
+
<small class="form-text text-danger"
|
|
93
99
|
<%= jhiPrefix %>Translate="entity.validation.required"
|
|
94
100
|
>__jhiTransformTranslate__('entity.validation.required')</small>
|
|
101
|
+
}
|
|
95
102
|
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
*ngIf="editForm.get('email')?.errors?.maxlength"
|
|
103
|
+
@if (editForm.get('email')?.errors?.maxlength) {
|
|
104
|
+
<small class="form-text text-danger"
|
|
99
105
|
<%= jhiPrefix %>Translate="entity.validation.maxlength"
|
|
100
106
|
[translateValues]="{ max: 100 }"
|
|
101
107
|
>__jhiTransformTranslate__('entity.validation.maxlength', { "max": 100 })</small>
|
|
108
|
+
}
|
|
102
109
|
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
*ngIf="editForm.get('email')?.errors?.minlength"
|
|
110
|
+
@if (editForm.get('email')?.errors?.minlength) {
|
|
111
|
+
<small class="form-text text-danger"
|
|
106
112
|
<%= jhiPrefix %>Translate="entity.validation.minlength"
|
|
107
113
|
[translateValues]="{ min: 5 }"
|
|
108
114
|
>__jhiTransformTranslate__('entity.validation.minlength', { "min": 5 })</small>
|
|
115
|
+
}
|
|
109
116
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
*ngIf="editForm.get('email')?.errors?.email"
|
|
117
|
+
@if (editForm.get('email')?.errors?.email) {
|
|
118
|
+
<small class="form-text text-danger"
|
|
113
119
|
<%= jhiPrefix %>Translate="global.messages.validate.email.invalid"
|
|
114
120
|
>__jhiTransformTranslate__('global.messages.validate.email.invalid')</small>
|
|
121
|
+
}
|
|
115
122
|
</div>
|
|
123
|
+
}
|
|
116
124
|
</div>
|
|
117
125
|
|
|
118
126
|
<div class="form-check">
|
|
@@ -130,18 +138,24 @@
|
|
|
130
138
|
</div>
|
|
131
139
|
<%_ if (enableTranslation) { _%>
|
|
132
140
|
|
|
133
|
-
|
|
141
|
+
@if (languages && languages.length > 0) {
|
|
142
|
+
<div class="mb-3">
|
|
134
143
|
<label <%= jhiPrefix %>Translate="userManagement.langKey">__jhiTransformTranslate__('userManagement.langKey')</label>
|
|
135
144
|
<select class="form-control" id="langKey" name="langKey" formControlName="langKey">
|
|
136
|
-
|
|
145
|
+
@for (language of languages; track $index) {
|
|
146
|
+
<option [value]="language">{{ language | findLanguageFromKey }}</option>
|
|
147
|
+
}
|
|
137
148
|
</select>
|
|
138
149
|
</div>
|
|
150
|
+
}
|
|
139
151
|
<%_ } _%>
|
|
140
152
|
|
|
141
153
|
<div class="mb-3">
|
|
142
154
|
<label <%= jhiPrefix %>Translate="userManagement.profiles">__jhiTransformTranslate__('userManagement.profiles')</label>
|
|
143
155
|
<select class="form-control" multiple name="authority" formControlName="authorities">
|
|
144
|
-
|
|
156
|
+
@for (authority of authorities; track $index) {
|
|
157
|
+
<option [value]="authority">{{ authority }}</option>
|
|
158
|
+
}
|
|
145
159
|
</select>
|
|
146
160
|
</div>
|
|
147
161
|
<button type="button" class="btn btn-secondary" (click)="previousState()">
|