generator-jhipster 7.6.0 → 7.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -4
- package/cli/commands.js +3 -0
- package/cli/environment-builder.js +53 -18
- package/cli/import-jdl.js +3 -0
- package/cli/index.mjs +20 -0
- package/cli/jhipster.js +19 -11
- package/cli/program.js +94 -38
- package/generators/app/esm.mjs +1 -3
- package/generators/app/index.js +11 -16
- package/generators/aws/esm.mjs +1 -3
- package/generators/azure-app-service/esm.mjs +1 -3
- package/generators/azure-spring-cloud/esm.mjs +1 -3
- package/generators/base/esm.mjs +1 -3
- package/generators/bootstrap/esm.mjs +1 -3
- package/generators/bootstrap/index.js +36 -86
- package/generators/bootstrap-application/esm.mjs +19 -0
- package/generators/bootstrap-application/generator.mjs +353 -0
- package/generators/bootstrap-application/index.mjs +19 -0
- package/generators/ci-cd/esm.mjs +1 -3
- package/generators/ci-cd/index.js +1 -1
- package/generators/ci-cd/prompts.js +1 -1
- package/generators/ci-cd/templates/github-actions.yml.ejs +6 -6
- package/generators/client/esm.mjs +5 -3
- package/generators/client/files-angular.js +9 -0
- package/generators/client/files-common.js +9 -9
- package/generators/client/files-react.js +25 -2
- package/generators/client/files-vue.js +7 -6
- package/generators/client/index.js +3 -2
- package/generators/client/needle-api/needle-client-react.js +11 -8
- package/generators/client/templates/angular/angular.json.ejs +2 -10
- package/generators/client/templates/angular/jest.conf.js.ejs +1 -1
- package/generators/client/templates/angular/package.json +29 -27
- package/generators/client/templates/angular/package.json.ejs +6 -2
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.html.ejs +7 -7
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +3 -3
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.html.ejs +10 -10
- package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs +8 -8
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs +6 -6
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs +51 -49
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +16 -16
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +32 -32
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +18 -18
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +12 -12
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +8 -8
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +11 -11
- package/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +4 -2
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs +0 -6
- package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs +0 -6
- package/generators/client/templates/angular/src/main/webapp/app/login/login.component.html.ejs +3 -3
- package/generators/client/templates/angular/src/main/webapp/content/scss/_bootstrap-variables.scss.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/content/scss/global.scss.ejs +29 -0
- package/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs +0 -4
- package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +31 -1
- package/generators/client/templates/common/package.json +7 -6
- package/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs +1 -7
- package/generators/client/templates/common/webpack/webpack.microfrontend.js.jhi.ejs +2 -3
- package/generators/client/templates/react/.eslintrc.json.ejs +1 -1
- package/generators/client/templates/react/jest.conf.js.ejs +1 -1
- package/generators/client/templates/react/package.json +44 -45
- package/generators/client/templates/react/package.json.ejs +1 -0
- package/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/config/store.ts.ejs +53 -6
- package/generators/client/templates/react/src/main/webapp/app/config/translation-middleware.ts.ejs +58 -0
- package/generators/client/templates/react/src/main/webapp/app/entities/menu.tsx.ejs +45 -0
- package/generators/client/templates/react/src/main/webapp/app/entities/reducers.ts.ejs +25 -0
- package/generators/client/templates/react/src/main/webapp/app/entities/routes.tsx.ejs +47 -0
- package/generators/client/templates/react/src/main/webapp/app/index.tsx.ejs +7 -7
- package/generators/client/templates/react/src/main/webapp/app/main.tsx.ejs +19 -0
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/logs/logs.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +2 -1
- package/generators/client/templates/react/src/main/webapp/app/modules/login/login-modal.tsx.ejs +5 -1
- package/generators/client/templates/react/src/main/webapp/app/routes.tsx.ejs +24 -7
- package/generators/client/templates/react/src/main/webapp/app/shared/error/error-loading.tsx.ejs +15 -0
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/entities.tsx.ejs +34 -6
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/index.ts.ejs +9 -2
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.spec.ts.ejs +9 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.ts.ejs +21 -5
- package/generators/client/templates/react/src/main/webapp/app/typings.d.ts.ejs +15 -0
- package/generators/client/templates/react/src/main/webapp/microfrontends/entities-menu.tsx.ejs +3 -0
- package/generators/client/templates/react/src/main/webapp/microfrontends/entities-routes.tsx.ejs +3 -0
- package/generators/client/templates/react/tsconfig.json.ejs +3 -3
- package/generators/client/templates/react/tsconfig.test.json.ejs +9 -1
- package/generators/client/templates/react/webpack/webpack.common.js.ejs +6 -13
- package/generators/client/templates/react/webpack/webpack.dev.js.ejs +7 -8
- package/generators/client/templates/react/webpack/webpack.microfrontend.js.jhi.react.ejs +99 -0
- package/generators/client/templates/react/webpack/webpack.prod.js.ejs +31 -21
- package/generators/client/templates/vue/package.json +30 -31
- package/generators/client/templates/vue/package.json.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +4 -3
- package/generators/client/templates/vue/src/main/webapp/app/entities/user/user.service.ts.ejs +0 -0
- package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +29 -1
- package/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +2 -2
- package/generators/client/templates/vue/src/main/webapp/app/shared/config/config.ts.ejs +0 -4
- package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +1 -1
- package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs +2 -2
- package/generators/client/templates/vue/tsconfig.json.ejs +0 -3
- package/generators/client/templates/vue/webpack/webpack.common.js.ejs +6 -2
- package/generators/cloudfoundry/esm.mjs +1 -3
- package/generators/common/esm.mjs +2 -3
- package/generators/common/files.js +1 -2
- package/generators/common/index.js +6 -0
- package/generators/common/templates/.husky/{pre-commit → pre-commit.ejs} +4 -0
- package/generators/common/templates/README.md.jhi.ejs +3 -1
- package/generators/common/templates/package.json +4 -4
- package/generators/common/templates/sonar-project.properties.ejs +1 -1
- package/generators/cypress/esm.mjs +2 -3
- package/generators/cypress/files.js +2 -1
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/settings-page.spec.ts.ejs +18 -14
- package/generators/database-changelog/esm.mjs +1 -3
- package/generators/database-changelog/index.js +1 -1
- package/generators/database-changelog-liquibase/esm.mjs +2 -3
- package/generators/docker-compose/esm.mjs +1 -3
- package/generators/docker-compose/index.js +9 -5
- package/generators/entities/esm.mjs +1 -3
- package/generators/entities/index.js +2 -2
- package/generators/entities-client/esm.mjs +1 -3
- package/generators/entity/esm.mjs +1 -3
- package/generators/entity/index.js +39 -28
- package/generators/entity/prompts.js +4 -1
- package/generators/entity-client/esm.mjs +2 -3
- package/generators/entity-client/index.js +8 -0
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs +2 -2
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs +20 -21
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs +14 -16
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +3 -3
- package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +2 -1
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs +3 -3
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs +5 -4
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-reducer.spec.ts.ejs +1 -1
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +20 -19
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.ejs +2 -2
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +21 -20
- package/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs +1 -1
- package/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs +1 -1
- package/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs +1 -1
- package/generators/entity-i18n/esm.mjs +2 -3
- package/generators/entity-i18n/templates/i18n/entity_fr.json.ejs +1 -1
- package/generators/entity-server/esm.mjs +2 -3
- package/generators/entity-server/files-couchbase.js +23 -2
- package/generators/entity-server/files.js +40 -6
- package/generators/entity-server/index.js +27 -2
- package/generators/entity-server/templates/couchbase/src/main/java/package/domain/Entity.java.jhi.spring_data_couchbase.ejs +11 -13
- package/generators/entity-server/templates/couchbase/src/main/java/package/repository/EntityRepository.java.ejs +30 -43
- package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.fts.ejs +5 -6
- package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.n1ql.ejs +5 -0
- package/generators/entity-server/templates/partials/it_patch_update.partial.java.ejs +2 -2
- package/generators/entity-server/templates/partials/save_template.ejs +1 -1
- package/generators/entity-server/templates/partials/update_template.ejs +77 -0
- package/generators/entity-server/templates/reactive/partials/save_template.ejs +1 -1
- package/generators/entity-server/templates/reactive/partials/update_template.ejs +41 -0
- package/generators/entity-server/templates/src/main/java/package/common/get_all_template.ejs +5 -5
- package/generators/entity-server/templates/src/main/java/package/common/get_template.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs +17 -8
- package/generators/entity-server/templates/src/main/java/package/common/patch_template.ejs +5 -5
- package/generators/entity-server/templates/src/main/java/package/common/search_stream_template.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/common/search_template.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +4 -3
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.javax_lifecycle_events.ejs +31 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_persistable.ejs +54 -0
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_reactive.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/domain/EntityCallback.java.ejs +43 -0
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +36 -23
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +24 -28
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationships.java.ejs +37 -0
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationshipsImpl.java.ejs +91 -0
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +17 -25
- package/generators/entity-server/templates/src/main/java/package/repository/EntitySqlHelper_reactive.java.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +3 -3
- package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +12 -27
- package/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs +10 -2
- package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs +8 -6
- package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs +21 -5
- package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +61 -90
- package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +6 -4
- package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +33 -20
- package/generators/export-jdl/esm.mjs +1 -3
- package/generators/gae/esm.mjs +1 -3
- package/generators/generate-blueprint/constants.mjs +146 -0
- package/generators/generate-blueprint/esm.mjs +19 -0
- package/generators/generate-blueprint/files.mjs +81 -0
- package/generators/generate-blueprint/generator.mjs +363 -0
- package/generators/generate-blueprint/index.mjs +20 -0
- package/generators/generate-blueprint/templates/.eslintrc.json.ejs +41 -0
- package/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs +32 -0
- package/generators/generate-blueprint/templates/.mocharc.cjs.ejs +29 -0
- package/generators/{server/templates/couchbase/src/main/java/package/config/couchbase/package-info.java.ejs → generate-blueprint/templates/.prettierignore.jhi.blueprint.ejs} +4 -7
- package/generators/generate-blueprint/templates/README.md.ejs +75 -0
- package/generators/generate-blueprint/templates/cli/cli.mjs.ejs +35 -0
- package/generators/generate-blueprint/templates/cli/commands.cjs.ejs +25 -0
- package/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs +98 -0
- package/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs +42 -0
- package/generators/generate-blueprint/templates/generators/generator/index.mjs.ejs +19 -0
- package/generators/generate-blueprint/templates/generators/generator/templates/template-file.ejs +0 -0
- package/generators/generate-blueprint/templates/test/utils.mjs.ejs +17 -0
- package/generators/generator-base-blueprint.js +29 -0
- package/generators/generator-base-docker.js +1 -0
- package/generators/generator-base-entities.cjs +368 -0
- package/generators/generator-base-private.js +1 -1
- package/generators/generator-base.js +157 -23
- package/generators/generator-constants.js +22 -20
- package/generators/generator-list.js +2 -0
- package/generators/generator-transforms.js +0 -1
- package/generators/gradle/constants.cjs +1 -1
- package/generators/gradle/esm.mjs +19 -0
- package/generators/heroku/esm.mjs +1 -3
- package/generators/info/esm.mjs +1 -3
- package/generators/init/esm.mjs +19 -0
- package/generators/init/files.cjs +9 -3
- package/generators/init/index.cjs +5 -0
- package/generators/init/templates/.gitignore.jhi.ejs +5 -0
- package/generators/init/templates/{.lintstagedrc.js.ejs → .lintstagedrc.cjs.ejs} +0 -0
- package/generators/java/esm.mjs +19 -0
- package/generators/java/index.cjs +58 -2
- package/generators/kubernetes/esm.mjs +1 -3
- package/generators/kubernetes-helm/esm.mjs +1 -3
- package/generators/kubernetes-knative/esm.mjs +1 -3
- package/generators/languages/esm.mjs +2 -3
- package/generators/languages/templates/src/test/resources/i18n/messages_fr.properties.ejs +4 -1
- package/generators/maven/esm.mjs +19 -0
- package/generators/maven/files.cjs +0 -1
- package/generators/maven/templates/.mvn/wrapper/maven-wrapper.jar +0 -0
- package/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +18 -2
- package/generators/maven/templates/mvnw +13 -7
- package/generators/maven/templates/mvnw.cmd +19 -13
- package/generators/maven/templates/pom.xml.jhi.ejs +1 -1
- package/generators/openapi-client/esm.mjs +1 -3
- package/generators/openapi-client/index.js +11 -4
- package/generators/openshift/esm.mjs +1 -3
- package/generators/page/esm.mjs +1 -3
- package/generators/project-name/esm.mjs +19 -0
- package/generators/server/cleanup.js +19 -3
- package/generators/server/esm.mjs +2 -2
- package/generators/server/files-couchbase.js +28 -31
- package/generators/server/files.js +115 -18
- package/generators/server/index.js +23 -17
- package/generators/server/needle-api/needle-server-gradle.js +38 -0
- package/generators/server/needle-api/needle-server-maven.js +1 -1
- package/generators/server/templates/.mvn/jvm.config +1 -0
- package/generators/server/templates/.mvn/wrapper/maven-wrapper.jar +0 -0
- package/generators/server/templates/.mvn/wrapper/maven-wrapper.properties +18 -2
- package/generators/server/templates/build.gradle.ejs +7 -5
- package/generators/server/templates/couchbase/src/main/java/package/repository/CouchbaseSearchRepository.java.ejs +91 -0
- package/generators/server/templates/couchbase/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs +47 -45
- package/generators/server/templates/couchbase/src/main/java/package/repository/PersistentTokenRepository_couchbase.java.ejs +2 -2
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_ADMIN.json.ejs +3 -0
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_USER.json.ejs +3 -0
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__admin.json.ejs → user/admin.json.ejs} +2 -2
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__user.json.ejs → user/user.json.ejs} +2 -2
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.2__create_indexes.n1ql.ejs +34 -0
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0__create_collections.n1ql.ejs +8 -0
- package/generators/server/templates/couchbase/src/test/java/package/CouchbaseTestContainerExtension.java.ejs +4 -3
- package/generators/server/templates/couchbase/src/test/java/package/repository/{JHipsterCouchbaseRepositoryTest.java.ejs → CouchbaseSearchRepositoryTest.java.ejs} +2 -2
- package/generators/server/templates/devcontainer/Dockerfile.ejs +25 -0
- package/generators/server/templates/devcontainer/devcontainer.json.ejs +64 -0
- package/generators/server/templates/gradle/profile_prod.gradle.ejs +4 -0
- package/generators/server/templates/gradle/wrapper/gradle-wrapper.jar +0 -0
- package/generators/server/templates/gradle.properties.ejs +8 -8
- package/generators/server/templates/mvnw +13 -7
- package/generators/server/templates/mvnw.cmd +19 -13
- package/generators/server/templates/npmw +14 -5
- package/generators/server/templates/pom.xml.ejs +65 -58
- package/generators/server/templates/settings.gradle.ejs +6 -4
- package/generators/server/templates/src/main/docker/app.yml.ejs +4 -6
- package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs +2 -1
- package/generators/server/templates/src/main/docker/mysql.yml.ejs +1 -0
- package/generators/server/templates/src/main/docker/zipkin.yml.ejs +25 -0
- package/generators/server/templates/src/main/java/package/config/AsyncConfiguration.java.ejs +6 -0
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs +26 -16
- package/generators/{client/templates/react/src/main/webapp/app/entities/index.tsx.ejs → server/templates/src/main/java/package/config/KafkaSseConsumer.java.ejs} +8 -14
- package/generators/server/templates/src/main/java/package/config/KafkaSseProducer.java.ejs +30 -0
- package/generators/server/templates/src/main/java/package/config/LocaleConfiguration_reactive.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +12 -10
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +2 -1
- package/generators/server/templates/src/main/java/package/domain/Authority.java.ejs +11 -0
- package/generators/server/templates/src/main/java/package/domain/PersistentToken.java.ejs +6 -6
- package/generators/server/templates/src/main/java/package/domain/User.java.ejs +9 -7
- package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs +1 -11
- package/generators/server/templates/src/main/java/package/repository/EntityManager.java.ejs +48 -38
- package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +48 -72
- package/generators/server/templates/src/main/java/package/security/jwt/JWTFilter.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +8 -6
- package/generators/server/templates/src/main/java/package/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs +0 -1
- package/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs +60 -108
- package/generators/server/templates/src/main/java/package/web/rest/KafkaResource_reactive.java.ejs +74 -0
- package/generators/server/templates/src/main/java/package/web/rest/LogoutResource_reactive.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs +2 -2
- package/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +8 -0
- package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +6 -0
- package/generators/server/templates/src/main/resources/config/application.yml.ejs +28 -22
- package/generators/server/templates/src/test/java/package/CassandraKeyspaceIT.java.ejs +3 -4
- package/generators/server/templates/src/test/java/package/IntegrationTest.java.ejs +12 -4
- package/generators/server/templates/src/test/java/package/TechnicalStructureTest.java.ejs +18 -15
- package/generators/server/templates/src/test/java/package/config/CassandraTestContainer.java.ejs +122 -0
- package/generators/server/templates/src/test/java/package/config/EmbeddedCassandra.java.ejs +11 -0
- package/generators/server/templates/src/test/java/package/config/EmbeddedKafka.java.ejs +11 -0
- package/generators/server/templates/src/test/java/package/config/EmbeddedMongo.java.ejs +11 -0
- package/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs +2 -0
- package/generators/server/templates/src/test/java/package/config/KafkaTestContainer.java.ejs +38 -0
- package/generators/server/templates/src/test/java/package/config/MongoDbTestContainer.java.ejs +67 -0
- package/generators/server/templates/src/test/java/package/config/TestContainersSpringContextCustomizerFactory.java.ejs +114 -0
- package/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs +3 -10
- package/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs +8 -0
- package/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs +17 -3
- package/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs +1 -4
- package/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest_reactive.java.ejs +1 -1
- package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +5 -5
- package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +1 -1
- package/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs +2 -4
- package/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs +1 -4
- package/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs +1 -1
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +15 -8
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs +1 -4
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs +1 -4
- package/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs +52 -123
- package/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT_reactive.java.ejs +99 -0
- package/generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs +7 -10
- package/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs +1 -6
- package/generators/server/templates/src/test/java/package/web/rest/UserJWTControllerIT.java.ejs +1 -4
- package/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs +42 -47
- package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT.java.ejs +1 -4
- package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +2 -5
- package/generators/server/templates/src/test/resources/META-INF/spring.factories.ejs +1 -1
- package/generators/server/templates/src/test/resources/config/application.yml.ejs +21 -20
- package/generators/server/templates/src/test/resources/testcontainers.properties.ejs +1 -0
- package/generators/spring-boot/esm.mjs +19 -0
- package/generators/spring-controller/esm.mjs +1 -3
- package/generators/spring-service/esm.mjs +1 -3
- package/generators/upgrade/esm.mjs +1 -3
- package/generators/upgrade-config/esm.mjs +1 -3
- package/generators/workspaces/esm.mjs +1 -3
- package/generators/workspaces/index.js +2 -1
- package/lib/constants/logo.cjs +30 -0
- package/lib/constants/priorities.cjs +216 -2
- package/lib/constants/priorities.mjs +29 -1
- package/lib/index.mjs +6 -0
- package/lib/support/mixin.cjs +5 -1
- package/lib/support/shared-data.cjs +34 -1
- package/package.json +33 -29
- package/utils/entity.js +21 -2
- package/utils/faker.js +3 -3
- package/utils/field.js +69 -52
- package/utils/relationship.js +15 -4
- package/utils/user.js +109 -0
- package/generators/app/generator.spec.mjs +0 -47
- package/generators/aws/generator.spec.mjs +0 -47
- package/generators/azure-app-service/generator.spec.mjs +0 -47
- package/generators/azure-spring-cloud/generator.spec.mjs +0 -47
- package/generators/base/generator.spec.mjs +0 -44
- package/generators/bootstrap/generator.spec.mjs +0 -44
- package/generators/ci-cd/generator.spec.mjs +0 -47
- package/generators/client/__workflow/devserver-angular.json +0 -13
- package/generators/client/__workflow/devserver-react.json +0 -13
- package/generators/client/__workflow/devserver-vue.json +0 -13
- package/generators/client/generator.spec.mjs +0 -47
- package/generators/cloudfoundry/generator.spec.mjs +0 -47
- package/generators/common/generator.spec.mjs +0 -47
- package/generators/cypress/generator.spec.mjs +0 -47
- package/generators/database-changelog/generator.spec.mjs +0 -47
- package/generators/database-changelog-liquibase/generator.spec.mjs +0 -47
- package/generators/docker-compose/generator.spec.mjs +0 -44
- package/generators/entities/generator.spec.mjs +0 -47
- package/generators/entities-client/generator.spec.mjs +0 -47
- package/generators/entity/generator.spec.mjs +0 -47
- package/generators/entity-client/generator.spec.mjs +0 -47
- package/generators/entity-i18n/generator.spec.mjs +0 -47
- package/generators/entity-server/generator.spec.mjs +0 -47
- package/generators/entity-server/templates/src/main/java/package/repository/search/SortToFieldSortBuilderConverter.java.ejs +0 -24
- package/generators/export-jdl/generator.spec.mjs +0 -44
- package/generators/gae/generator.spec.mjs +0 -47
- package/generators/gradle/__snapshots__/generator.spec.cjs.snap +0 -59
- package/generators/gradle/generator.spec.cjs +0 -71
- package/generators/heroku/generator.spec.mjs +0 -47
- package/generators/info/generator.spec.mjs +0 -44
- package/generators/init/__snapshots__/generator.spec.cjs.snap +0 -65
- package/generators/init/generator.spec.cjs +0 -112
- package/generators/java/__snapshots__/generator.spec.cjs.snap +0 -118
- package/generators/java/generator.spec.cjs +0 -87
- package/generators/kubernetes/generator.spec.mjs +0 -44
- package/generators/kubernetes-helm/generator.spec.mjs +0 -44
- package/generators/kubernetes-knative/generator.spec.mjs +0 -44
- package/generators/languages/generator.spec.mjs +0 -47
- package/generators/maven/__snapshots__/generator.spec.cjs.snap +0 -53
- package/generators/maven/generator.spec.cjs +0 -78
- package/generators/maven/templates/.mvn/wrapper/MavenWrapperDownloader.java +0 -117
- package/generators/openapi-client/generator.spec.mjs +0 -47
- package/generators/openshift/generator.spec.mjs +0 -44
- package/generators/page/generator.spec.mjs +0 -47
- package/generators/project-name/generator.spec.cjs +0 -43
- package/generators/server/__snapshots__/generator.spec.mjs.snap +0 -1931
- package/generators/server/generator.spec.mjs +0 -52
- package/generators/server/templates/.mvn/wrapper/MavenWrapperDownloader.java +0 -117
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactory.java.ejs +0 -83
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactoryBean.java.ejs +0 -40
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryQuery.java.ejs +0 -44
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlQueryCreator.java.ejs +0 -162
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlRepositoryQueryExecutor.java.ejs +0 -104
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json.ejs +0 -3
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json.ejs +0 -3
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0__create_indexes.n1ql.ejs +0 -19
- package/generators/server/templates/src/main/java/package/config/KafkaProperties.java.ejs +0 -68
- package/generators/server/templates/src/test/java/package/AbstractCassandraTest.java.ejs +0 -125
- package/generators/server/templates/src/test/java/package/MongoDbTestContainerExtension.java.ejs +0 -37
- package/generators/server/templates/src/test/java/package/TestContainersSpringContextCustomizerFactory.java.ejs +0 -24
- package/generators/spring-boot/__snapshots__/generator.spec.cjs.snap +0 -80
- package/generators/spring-boot/generator.spec.cjs +0 -64
- package/generators/spring-controller/generator.spec.mjs +0 -47
- package/generators/spring-service/generator.spec.mjs +0 -47
- package/generators/upgrade/generator.spec.mjs +0 -44
- package/generators/upgrade-config/generator.spec.mjs +0 -44
- package/generators/workspaces/generator.spec.mjs +0 -47
|
@@ -51,8 +51,8 @@ describe('HealthComponent', () => {
|
|
|
51
51
|
it('should get badge class', () => {
|
|
52
52
|
const upBadgeClass = comp.getBadgeClass('UP');
|
|
53
53
|
const downBadgeClass = comp.getBadgeClass('DOWN');
|
|
54
|
-
expect(upBadgeClass).toEqual('
|
|
55
|
-
expect(downBadgeClass).toEqual('
|
|
54
|
+
expect(upBadgeClass).toEqual('bg-success');
|
|
55
|
+
expect(downBadgeClass).toEqual('bg-danger');
|
|
56
56
|
});
|
|
57
57
|
});
|
|
58
58
|
|
package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs
CHANGED
|
@@ -39,9 +39,9 @@ export class HealthComponent implements OnInit {
|
|
|
39
39
|
|
|
40
40
|
getBadgeClass(statusState: HealthStatus): string {
|
|
41
41
|
if (statusState === 'UP') {
|
|
42
|
-
return '
|
|
42
|
+
return 'bg-success';
|
|
43
43
|
}
|
|
44
|
-
return '
|
|
44
|
+
return 'bg-danger';
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
refresh(): void {
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
<%_ } _%>
|
|
26
26
|
</h4>
|
|
27
27
|
|
|
28
|
-
<button aria-label="Close" data-dismiss="modal" class="close" type="button" (click)="dismiss()">
|
|
28
|
+
<button aria-label="Close" data-dismiss="modal" class="btn-close" type="button" (click)="dismiss()">
|
|
29
29
|
<span aria-hidden="true">×</span>
|
|
30
30
|
</button>
|
|
31
31
|
</div>
|
|
@@ -38,14 +38,14 @@
|
|
|
38
38
|
<table class="table table-striped" aria-describedby="showHealthLabel">
|
|
39
39
|
<thead>
|
|
40
40
|
<tr>
|
|
41
|
-
<th scope="col" class="text-
|
|
42
|
-
<th scope="col" class="text-
|
|
41
|
+
<th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.name">Name</th>
|
|
42
|
+
<th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.value">Value</th>
|
|
43
43
|
</tr>
|
|
44
44
|
</thead>
|
|
45
45
|
<tbody>
|
|
46
46
|
<tr *ngFor="let healthDetail of health.value.details! | keyvalue">
|
|
47
|
-
<td class="text-
|
|
48
|
-
<td class="text-
|
|
47
|
+
<td class="text-start">{{ healthDetail.key }}</td>
|
|
48
|
+
<td class="text-start">{{ readableValue(healthDetail.value) }}</td>
|
|
49
49
|
</tr>
|
|
50
50
|
</tbody>
|
|
51
51
|
</table>
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
</div>
|
|
55
55
|
|
|
56
56
|
<div class="modal-footer">
|
|
57
|
-
<button data-dismiss="modal" class="btn btn-secondary float-
|
|
57
|
+
<button data-dismiss="modal" class="btn btn-secondary float-start" type="button" (click)="dismiss()">Done</button>
|
|
58
58
|
</div>
|
package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs
CHANGED
|
@@ -32,59 +32,61 @@
|
|
|
32
32
|
</tr>
|
|
33
33
|
</thead>
|
|
34
34
|
|
|
35
|
-
<
|
|
36
|
-
<
|
|
37
|
-
<
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
<
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
35
|
+
<tbody>
|
|
36
|
+
<tr *ngFor="let logger of filteredAndOrderedLoggers">
|
|
37
|
+
<td>
|
|
38
|
+
<small>{{ logger.name | slice: 0:140 }}</small>
|
|
39
|
+
</td>
|
|
40
|
+
<td>
|
|
41
|
+
<button
|
|
42
|
+
(click)="changeLevel(logger.name, 'TRACE')"
|
|
43
|
+
[ngClass]="logger.level === 'TRACE' ? 'btn-primary' : 'btn-light'"
|
|
44
|
+
class="btn btn-sm"
|
|
45
|
+
>
|
|
46
|
+
TRACE
|
|
47
|
+
</button>
|
|
47
48
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
49
|
+
<button
|
|
50
|
+
(click)="changeLevel(logger.name, 'DEBUG')"
|
|
51
|
+
[ngClass]="logger.level === 'DEBUG' ? 'btn-success' : 'btn-light'"
|
|
52
|
+
class="btn btn-sm"
|
|
53
|
+
>
|
|
54
|
+
DEBUG
|
|
55
|
+
</button>
|
|
55
56
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
57
|
+
<button
|
|
58
|
+
(click)="changeLevel(logger.name, 'INFO')"
|
|
59
|
+
[ngClass]="logger.level === 'INFO' ? 'btn-info' : 'btn-light'"
|
|
60
|
+
class="btn btn-sm"
|
|
61
|
+
>
|
|
62
|
+
INFO
|
|
63
|
+
</button>
|
|
63
64
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
65
|
+
<button
|
|
66
|
+
(click)="changeLevel(logger.name, 'WARN')"
|
|
67
|
+
[ngClass]="logger.level === 'WARN' ? 'btn-warning' : 'btn-light'"
|
|
68
|
+
class="btn btn-sm"
|
|
69
|
+
>
|
|
70
|
+
WARN
|
|
71
|
+
</button>
|
|
71
72
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
73
|
+
<button
|
|
74
|
+
(click)="changeLevel(logger.name, 'ERROR')"
|
|
75
|
+
[ngClass]="logger.level === 'ERROR' ? 'btn-danger' : 'btn-light'"
|
|
76
|
+
class="btn btn-sm"
|
|
77
|
+
>
|
|
78
|
+
ERROR
|
|
79
|
+
</button>
|
|
79
80
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
81
|
+
<button
|
|
82
|
+
(click)="changeLevel(logger.name, 'OFF')"
|
|
83
|
+
[ngClass]="logger.level === 'OFF' ? 'btn-secondary' : 'btn-light'"
|
|
84
|
+
class="btn btn-sm"
|
|
85
|
+
>
|
|
86
|
+
OFF
|
|
87
|
+
</button>
|
|
88
|
+
</td>
|
|
89
|
+
</tr>
|
|
90
|
+
</tbody>
|
|
89
91
|
</table>
|
|
90
92
|
</div>
|
|
@@ -23,32 +23,32 @@
|
|
|
23
23
|
<thead>
|
|
24
24
|
<tr>
|
|
25
25
|
<th scope="col" <%= jhiPrefix %>Translate="metrics.cache.cachename">Cache name</th>
|
|
26
|
-
<th scope="col" class="text-
|
|
27
|
-
<th scope="col" class="text-
|
|
28
|
-
<th scope="col" class="text-
|
|
29
|
-
<th scope="col" class="text-
|
|
30
|
-
<th scope="col" class="text-
|
|
31
|
-
<th scope="col" class="text-
|
|
32
|
-
<th scope="col" class="text-
|
|
33
|
-
<th scope="col" class="text-
|
|
26
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hits">Cache Hits</th>
|
|
27
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.misses">Cache Misses</th>
|
|
28
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.gets">Cache Gets</th>
|
|
29
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.puts">Cache Puts</th>
|
|
30
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.removals">Cache Removals</th>
|
|
31
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.evictions">Cache Evictions</th>
|
|
32
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hitPercent">Cache Hit %</th>
|
|
33
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.missPercent">Cache Miss %</th>
|
|
34
34
|
</tr>
|
|
35
35
|
</thead>
|
|
36
36
|
<tbody>
|
|
37
37
|
<tr *ngFor="let entry of cacheMetrics | keyvalue">
|
|
38
38
|
<td>{{ entry.key }}</td>
|
|
39
|
-
<td class="text-
|
|
40
|
-
<td class="text-
|
|
41
|
-
<td class="text-
|
|
42
|
-
<td class="text-
|
|
43
|
-
<td class="text-
|
|
44
|
-
<td class="text-
|
|
45
|
-
<td class="text-
|
|
39
|
+
<td class="text-end">{{ entry.value['cache.gets.hit'] }}</td>
|
|
40
|
+
<td class="text-end">{{ entry.value['cache.gets.miss'] }}</td>
|
|
41
|
+
<td class="text-end">{{ entry.value['cache.gets.hit'] + entry.value['cache.gets.miss'] }}</td>
|
|
42
|
+
<td class="text-end">{{ entry.value['cache.puts'] }}</td>
|
|
43
|
+
<td class="text-end">{{ entry.value['cache.removals'] }}</td>
|
|
44
|
+
<td class="text-end">{{ entry.value['cache.evictions'] }}</td>
|
|
45
|
+
<td class="text-end">
|
|
46
46
|
{{
|
|
47
47
|
filterNaN((100 * entry.value['cache.gets.hit']) / (entry.value['cache.gets.hit'] + entry.value['cache.gets.miss']))
|
|
48
48
|
| number: '1.0-4'
|
|
49
49
|
}}
|
|
50
50
|
</td>
|
|
51
|
-
<td class="text-
|
|
51
|
+
<td class="text-end">
|
|
52
52
|
{{
|
|
53
53
|
filterNaN((100 * entry.value['cache.gets.miss']) / (entry.value['cache.gets.hit'] + entry.value['cache.gets.miss']))
|
|
54
54
|
| number: '1.0-4'
|
|
@@ -26,49 +26,49 @@
|
|
|
26
26
|
<span <%= jhiPrefix %>Translate="metrics.datasource.usage">Connection Pool Usage</span> (active: {{ datasourceMetrics.active.value }},
|
|
27
27
|
min: {{ datasourceMetrics.min.value }}, max: {{ datasourceMetrics.max.value }}, idle: {{ datasourceMetrics.idle.value }})
|
|
28
28
|
</th>
|
|
29
|
-
<th scope="col" class="text-
|
|
30
|
-
<th scope="col" class="text-
|
|
31
|
-
<th scope="col" class="text-
|
|
32
|
-
<th scope="col" class="text-
|
|
33
|
-
<th scope="col" class="text-
|
|
34
|
-
<th scope="col" class="text-
|
|
35
|
-
<th scope="col" class="text-
|
|
36
|
-
<th scope="col" class="text-
|
|
29
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.count">Count</th>
|
|
30
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.mean">Mean</th>
|
|
31
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.min">Min</th>
|
|
32
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p50">p50</th>
|
|
33
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p75">p75</th>
|
|
34
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p95">p95</th>
|
|
35
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p99">p99</th>
|
|
36
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.max">Max</th>
|
|
37
37
|
</tr>
|
|
38
38
|
</thead>
|
|
39
39
|
<tbody>
|
|
40
40
|
<tr>
|
|
41
41
|
<td>Acquire</td>
|
|
42
|
-
<td class="text-
|
|
43
|
-
<td class="text-
|
|
44
|
-
<td class="text-
|
|
45
|
-
<td class="text-
|
|
46
|
-
<td class="text-
|
|
47
|
-
<td class="text-
|
|
48
|
-
<td class="text-
|
|
49
|
-
<td class="text-
|
|
42
|
+
<td class="text-end">{{ datasourceMetrics.acquire.count }}</td>
|
|
43
|
+
<td class="text-end">{{ filterNaN(datasourceMetrics.acquire.mean) | number: '1.0-2' }}</td>
|
|
44
|
+
<td class="text-end">{{ datasourceMetrics.acquire['0.0'] | number: '1.0-3' }}</td>
|
|
45
|
+
<td class="text-end">{{ datasourceMetrics.acquire['0.5'] | number: '1.0-3' }}</td>
|
|
46
|
+
<td class="text-end">{{ datasourceMetrics.acquire['0.75'] | number: '1.0-3' }}</td>
|
|
47
|
+
<td class="text-end">{{ datasourceMetrics.acquire['0.95'] | number: '1.0-3' }}</td>
|
|
48
|
+
<td class="text-end">{{ datasourceMetrics.acquire['0.99'] | number: '1.0-3' }}</td>
|
|
49
|
+
<td class="text-end">{{ filterNaN(datasourceMetrics.acquire.max) | number: '1.0-2' }}</td>
|
|
50
50
|
</tr>
|
|
51
51
|
<tr>
|
|
52
52
|
<td>Creation</td>
|
|
53
|
-
<td class="text-
|
|
54
|
-
<td class="text-
|
|
55
|
-
<td class="text-
|
|
56
|
-
<td class="text-
|
|
57
|
-
<td class="text-
|
|
58
|
-
<td class="text-
|
|
59
|
-
<td class="text-
|
|
60
|
-
<td class="text-
|
|
53
|
+
<td class="text-end">{{ datasourceMetrics.creation.count }}</td>
|
|
54
|
+
<td class="text-end">{{ filterNaN(datasourceMetrics.creation.mean) | number: '1.0-2' }}</td>
|
|
55
|
+
<td class="text-end">{{ datasourceMetrics.creation['0.0'] | number: '1.0-3' }}</td>
|
|
56
|
+
<td class="text-end">{{ datasourceMetrics.creation['0.5'] | number: '1.0-3' }}</td>
|
|
57
|
+
<td class="text-end">{{ datasourceMetrics.creation['0.75'] | number: '1.0-3' }}</td>
|
|
58
|
+
<td class="text-end">{{ datasourceMetrics.creation['0.95'] | number: '1.0-3' }}</td>
|
|
59
|
+
<td class="text-end">{{ datasourceMetrics.creation['0.99'] | number: '1.0-3' }}</td>
|
|
60
|
+
<td class="text-end">{{ filterNaN(datasourceMetrics.creation.max) | number: '1.0-2' }}</td>
|
|
61
61
|
</tr>
|
|
62
62
|
<tr>
|
|
63
63
|
<td>Usage</td>
|
|
64
|
-
<td class="text-
|
|
65
|
-
<td class="text-
|
|
66
|
-
<td class="text-
|
|
67
|
-
<td class="text-
|
|
68
|
-
<td class="text-
|
|
69
|
-
<td class="text-
|
|
70
|
-
<td class="text-
|
|
71
|
-
<td class="text-
|
|
64
|
+
<td class="text-end">{{ datasourceMetrics.usage.count }}</td>
|
|
65
|
+
<td class="text-end">{{ filterNaN(datasourceMetrics.usage.mean) | number: '1.0-2' }}</td>
|
|
66
|
+
<td class="text-end">{{ datasourceMetrics.usage['0.0'] | number: '1.0-3' }}</td>
|
|
67
|
+
<td class="text-end">{{ datasourceMetrics.usage['0.5'] | number: '1.0-3' }}</td>
|
|
68
|
+
<td class="text-end">{{ datasourceMetrics.usage['0.75'] | number: '1.0-3' }}</td>
|
|
69
|
+
<td class="text-end">{{ datasourceMetrics.usage['0.95'] | number: '1.0-3' }}</td>
|
|
70
|
+
<td class="text-end">{{ datasourceMetrics.usage['0.99'] | number: '1.0-3' }}</td>
|
|
71
|
+
<td class="text-end">{{ filterNaN(datasourceMetrics.usage.max) | number: '1.0-2' }}</td>
|
|
72
72
|
</tr>
|
|
73
73
|
</tbody>
|
|
74
74
|
</table>
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
<tr>
|
|
25
25
|
<th scope="col">Method</th>
|
|
26
26
|
<th scope="col">Endpoint url</th>
|
|
27
|
-
<th scope="col" class="text-
|
|
28
|
-
<th scope="col" class="text-
|
|
27
|
+
<th scope="col" class="text-end">Count</th>
|
|
28
|
+
<th scope="col" class="text-end">Mean</th>
|
|
29
29
|
</tr>
|
|
30
30
|
</thead>
|
|
31
31
|
<tbody>
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
<tr *ngFor="let method of entry.value | keyvalue">
|
|
34
34
|
<td>{{ method.key }}</td>
|
|
35
35
|
<td>{{ entry.key }}</td>
|
|
36
|
-
<td class="text-
|
|
37
|
-
<td class="text-
|
|
36
|
+
<td class="text-end">{{ method.value!.count }}</td>
|
|
37
|
+
<td class="text-end">{{ method.value!.mean | number: '1.0-3' }}</td>
|
|
38
38
|
</tr>
|
|
39
39
|
</ng-container>
|
|
40
40
|
</tbody>
|
|
@@ -69,11 +69,11 @@
|
|
|
69
69
|
<div id="garbageCollectorMetrics" class="col-md-4">
|
|
70
70
|
<div class="row" *ngIf="garbageCollectorMetrics">
|
|
71
71
|
<div class="col-md-9">Classes loaded</div>
|
|
72
|
-
<div class="col-md-3 text-
|
|
72
|
+
<div class="col-md-3 text-end">{{ garbageCollectorMetrics.classesLoaded }}</div>
|
|
73
73
|
</div>
|
|
74
74
|
<div class="row" *ngIf="garbageCollectorMetrics">
|
|
75
75
|
<div class="col-md-9">Classes unloaded</div>
|
|
76
|
-
<div class="col-md-3 text-
|
|
76
|
+
<div class="col-md-3 text-end">{{ garbageCollectorMetrics.classesUnloaded }}</div>
|
|
77
77
|
</div>
|
|
78
78
|
</div>
|
|
79
79
|
|
|
@@ -82,27 +82,27 @@
|
|
|
82
82
|
<thead>
|
|
83
83
|
<tr>
|
|
84
84
|
<th scope="col"></th>
|
|
85
|
-
<th scope="col" class="text-
|
|
86
|
-
<th scope="col" class="text-
|
|
87
|
-
<th scope="col" class="text-
|
|
88
|
-
<th scope="col" class="text-
|
|
89
|
-
<th scope="col" class="text-
|
|
90
|
-
<th scope="col" class="text-
|
|
91
|
-
<th scope="col" class="text-
|
|
92
|
-
<th scope="col" class="text-
|
|
85
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.count">Count</th>
|
|
86
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.mean">Mean</th>
|
|
87
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.min">Min</th>
|
|
88
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p50">p50</th>
|
|
89
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p75">p75</th>
|
|
90
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p95">p95</th>
|
|
91
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p99">p99</th>
|
|
92
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.max">Max</th>
|
|
93
93
|
</tr>
|
|
94
94
|
</thead>
|
|
95
95
|
<tbody>
|
|
96
96
|
<tr>
|
|
97
97
|
<td>jvm.gc.pause</td>
|
|
98
|
-
<td class="text-
|
|
99
|
-
<td class="text-
|
|
100
|
-
<td class="text-
|
|
101
|
-
<td class="text-
|
|
102
|
-
<td class="text-
|
|
103
|
-
<td class="text-
|
|
104
|
-
<td class="text-
|
|
105
|
-
<td class="text-
|
|
98
|
+
<td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause'].count }}</td>
|
|
99
|
+
<td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause'].mean | number: '1.0-3' }}</td>
|
|
100
|
+
<td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause']['0.0'] | number: '1.0-3' }}</td>
|
|
101
|
+
<td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause']['0.5'] | number: '1.0-3' }}</td>
|
|
102
|
+
<td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause']['0.75'] | number: '1.0-3' }}</td>
|
|
103
|
+
<td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause']['0.95'] | number: '1.0-3' }}</td>
|
|
104
|
+
<td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause']['0.99'] | number: '1.0-3' }}</td>
|
|
105
|
+
<td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause'].max | number: '1.0-3' }}</td>
|
|
106
106
|
</tr>
|
|
107
107
|
</tbody>
|
|
108
108
|
</table>
|
|
@@ -19,34 +19,34 @@
|
|
|
19
19
|
<div class="modal-header">
|
|
20
20
|
<h4 class="modal-title" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.title">Threads dump</h4>
|
|
21
21
|
|
|
22
|
-
<button type="button" class="close" (click)="dismiss()">×</button>
|
|
22
|
+
<button type="button" class="btn-close" (click)="dismiss()">×</button>
|
|
23
23
|
</div>
|
|
24
24
|
|
|
25
25
|
<div class="modal-body">
|
|
26
26
|
<div class="mb-3">
|
|
27
|
-
<span class="badge
|
|
27
|
+
<span class="badge bg-primary hand" (click)="threadStateFilter = undefined">
|
|
28
28
|
<fa-icon *ngIf="threadStateFilter === undefined" icon="check"></fa-icon>
|
|
29
|
-
All <span class="badge
|
|
29
|
+
All <span class="badge rounded-pill bg-default">{{ threadDumpAll }}</span>
|
|
30
30
|
</span>
|
|
31
31
|
|
|
32
|
-
<span class="badge
|
|
32
|
+
<span class="badge bg-success hand" (click)="threadStateFilter = ThreadState.Runnable">
|
|
33
33
|
<fa-icon *ngIf="threadStateFilter === ThreadState.Runnable" icon="check"></fa-icon>
|
|
34
|
-
Runnable <span class="badge
|
|
34
|
+
Runnable <span class="badge rounded-pill bg-default">{{ threadDumpRunnable }}</span>
|
|
35
35
|
</span>
|
|
36
36
|
|
|
37
|
-
<span class="badge
|
|
37
|
+
<span class="badge bg-info hand" (click)="threadStateFilter = ThreadState.Waiting">
|
|
38
38
|
<fa-icon *ngIf="threadStateFilter === ThreadState.Waiting" icon="check"></fa-icon>
|
|
39
|
-
Waiting <span class="badge
|
|
39
|
+
Waiting <span class="badge rounded-pill bg-default">{{ threadDumpWaiting }}</span>
|
|
40
40
|
</span>
|
|
41
41
|
|
|
42
|
-
<span class="badge
|
|
42
|
+
<span class="badge bg-warning hand" (click)="threadStateFilter = ThreadState.TimedWaiting">
|
|
43
43
|
<fa-icon *ngIf="threadStateFilter === ThreadState.TimedWaiting" icon="check"></fa-icon>
|
|
44
|
-
Timed Waiting <span class="badge
|
|
44
|
+
Timed Waiting <span class="badge rounded-pill bg-default">{{ threadDumpTimedWaiting }}</span>
|
|
45
45
|
</span>
|
|
46
46
|
|
|
47
|
-
<span class="badge
|
|
47
|
+
<span class="badge bg-danger hand" (click)="threadStateFilter = ThreadState.Blocked">
|
|
48
48
|
<fa-icon *ngIf="threadStateFilter === ThreadState.Blocked" icon="check"></fa-icon>
|
|
49
|
-
Blocked <span class="badge
|
|
49
|
+
Blocked <span class="badge rounded-pill bg-default">{{ threadDumpBlocked }}</span>
|
|
50
50
|
</span>
|
|
51
51
|
</div>
|
|
52
52
|
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
</div>
|
|
97
97
|
</div>
|
|
98
98
|
<div class="modal-footer">
|
|
99
|
-
<button type="button" class="btn btn-secondary float-
|
|
99
|
+
<button type="button" class="btn btn-secondary float-start" data-dismiss="modal" (click)="dismiss()">Done</button>
|
|
100
100
|
</div>
|
|
@@ -56,13 +56,13 @@ export class MetricsModalThreadsComponent implements OnInit {
|
|
|
56
56
|
|
|
57
57
|
getBadgeClass(threadState: ThreadState): string {
|
|
58
58
|
if (threadState === ThreadState.Runnable) {
|
|
59
|
-
return '
|
|
59
|
+
return 'bg-success';
|
|
60
60
|
} else if (threadState === ThreadState.Waiting) {
|
|
61
|
-
return '
|
|
61
|
+
return 'bg-info';
|
|
62
62
|
} else if (threadState === ThreadState.TimedWaiting) {
|
|
63
|
-
return '
|
|
63
|
+
return 'bg-warning';
|
|
64
64
|
} else if (threadState === ThreadState.Blocked) {
|
|
65
|
-
return '
|
|
65
|
+
return 'bg-danger';
|
|
66
66
|
}
|
|
67
67
|
return '';
|
|
68
68
|
}
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
<tr>
|
|
24
24
|
<th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.http.table.code">Code</th>
|
|
25
25
|
<th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.http.table.count">Count</th>
|
|
26
|
-
<th scope="col" class="text-
|
|
27
|
-
<th scope="col" class="text-
|
|
26
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.jvm.http.table.mean">Mean</th>
|
|
27
|
+
<th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.jvm.http.table.max">Max</th>
|
|
28
28
|
</tr>
|
|
29
29
|
</thead>
|
|
30
30
|
<tbody>
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
<span>{{ entry.value.count }}</span>
|
|
36
36
|
</ngb-progressbar>
|
|
37
37
|
</td>
|
|
38
|
-
<td class="text-
|
|
38
|
+
<td class="text-end">
|
|
39
39
|
{{ filterNaN(entry.value.mean) | number: '1.0-2' }}
|
|
40
40
|
</td>
|
|
41
|
-
<td class="text-
|
|
41
|
+
<td class="text-end">{{ entry.value.max | number: '1.0-2' }}</td>
|
|
42
42
|
</tr>
|
|
43
43
|
</tbody>
|
|
44
44
|
</table>
|
|
@@ -21,17 +21,17 @@
|
|
|
21
21
|
<ng-container *ngIf="!updating && systemMetrics">
|
|
22
22
|
<div class="row">
|
|
23
23
|
<div class="col-md-4">Uptime</div>
|
|
24
|
-
<div class="col-md-8 text-
|
|
24
|
+
<div class="col-md-8 text-end">{{ convertMillisecondsToDuration(systemMetrics['process.uptime']) }}</div>
|
|
25
25
|
</div>
|
|
26
26
|
|
|
27
27
|
<div class="row">
|
|
28
28
|
<div class="col-md-4">Start time</div>
|
|
29
|
-
<div class="col-md-8 text-
|
|
29
|
+
<div class="col-md-8 text-end">{{ systemMetrics['process.start.time'] | date: 'full' }}</div>
|
|
30
30
|
</div>
|
|
31
31
|
|
|
32
32
|
<div class="row">
|
|
33
33
|
<div class="col-md-9">Process CPU usage</div>
|
|
34
|
-
<div class="col-md-3 text-
|
|
34
|
+
<div class="col-md-3 text-end">{{ 100 * systemMetrics['process.cpu.usage'] | number: '1.0-2' }} %</div>
|
|
35
35
|
</div>
|
|
36
36
|
|
|
37
37
|
<ngb-progressbar [value]="100 * systemMetrics['process.cpu.usage']" [striped]="true" [animated]="false" type="success">
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
|
|
41
41
|
<div class="row">
|
|
42
42
|
<div class="col-md-9">System CPU usage</div>
|
|
43
|
-
<div class="col-md-3 text-
|
|
43
|
+
<div class="col-md-3 text-end">{{ 100 * systemMetrics['system.cpu.usage'] | number: '1.0-2' }} %</div>
|
|
44
44
|
</div>
|
|
45
45
|
|
|
46
46
|
<ngb-progressbar [value]="100 * systemMetrics['system.cpu.usage']" [striped]="true" [animated]="false" type="success">
|
|
@@ -49,21 +49,21 @@
|
|
|
49
49
|
|
|
50
50
|
<div class="row">
|
|
51
51
|
<div class="col-md-9">System CPU count</div>
|
|
52
|
-
<div class="col-md-3 text-
|
|
52
|
+
<div class="col-md-3 text-end">{{ systemMetrics['system.cpu.count'] }}</div>
|
|
53
53
|
</div>
|
|
54
54
|
|
|
55
55
|
<div class="row">
|
|
56
56
|
<div class="col-md-9">System 1m Load average</div>
|
|
57
|
-
<div class="col-md-3 text-
|
|
57
|
+
<div class="col-md-3 text-end">{{ systemMetrics['system.load.average.1m'] | number: '1.0-2' }}</div>
|
|
58
58
|
</div>
|
|
59
59
|
|
|
60
60
|
<div class="row">
|
|
61
61
|
<div class="col-md-9">Process files max</div>
|
|
62
|
-
<div class="col-md-3 text-
|
|
62
|
+
<div class="col-md-3 text-end">{{ systemMetrics['process.files.max'] | number: '1.0-0' }}</div>
|
|
63
63
|
</div>
|
|
64
64
|
|
|
65
65
|
<div class="row">
|
|
66
66
|
<div class="col-md-9">Process files open</div>
|
|
67
|
-
<div class="col-md-3 text-
|
|
67
|
+
<div class="col-md-3 text-end">{{ systemMetrics['process.files.open'] | number: '1.0-0' }}</div>
|
|
68
68
|
</div>
|
|
69
69
|
</ng-container>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
<h2>
|
|
21
21
|
<span id="metrics-page-heading" <%= jhiPrefix %>Translate="metrics.title" data-cy="metricsPageHeading">Application Metrics</span>
|
|
22
22
|
|
|
23
|
-
<button class="btn btn-primary float-
|
|
23
|
+
<button class="btn btn-primary float-end" (click)="refresh()">
|
|
24
24
|
<fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="metrics.refresh.button">Refresh</span>
|
|
25
25
|
</button>
|
|
26
26
|
</h2>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
<div class="modal-header">
|
|
21
21
|
<h4 class="modal-title" <%= jhiPrefix %>Translate="entity.delete.title">Confirm delete operation</h4>
|
|
22
22
|
|
|
23
|
-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" (click)="cancel()">×</button>
|
|
23
|
+
<button type="button" class="btn-close" data-dismiss="modal" aria-hidden="true" (click)="cancel()">×</button>
|
|
24
24
|
</div>
|
|
25
25
|
|
|
26
26
|
<div class="modal-body">
|
|
@@ -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
|
-
<div class="
|
|
19
|
+
<div class="d-flex justify-content-center">
|
|
20
20
|
<div class="col-8">
|
|
21
21
|
<div *ngIf="user">
|
|
22
22
|
<h2>
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
<dt><span <%= jhiPrefix %>Translate="userManagement.login">Login</span></dt>
|
|
28
28
|
<dd>
|
|
29
29
|
<span>{{ user.login }}</span>
|
|
30
|
-
<span *ngIf="user.activated" class="badge
|
|
31
|
-
<span *ngIf="!user.activated" class="badge
|
|
30
|
+
<span *ngIf="user.activated" class="badge bg-success" <%= jhiPrefix %>Translate="userManagement.activated">Activated</span>
|
|
31
|
+
<span *ngIf="!user.activated" class="badge bg-danger" <%= jhiPrefix %>Translate="userManagement.deactivated">Deactivated</span>
|
|
32
32
|
</dd>
|
|
33
33
|
|
|
34
34
|
<dt><span <%= jhiPrefix %>Translate="userManagement.firstName">First Name</span></dt>
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
<dd>
|
|
62
62
|
<ul class="list-unstyled">
|
|
63
63
|
<li *ngFor="let authority of user.authorities">
|
|
64
|
-
<span class="badge
|
|
64
|
+
<span class="badge bg-info">{{ authority }}</span>
|
|
65
65
|
</li>
|
|
66
66
|
</ul>
|
|
67
67
|
</dd>
|