generator-jhipster 7.6.0 → 7.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -3
- 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 +1 -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/prompts.js +1 -1
- package/generators/ci-cd/templates/github-actions.yml.ejs +2 -2
- package/generators/client/esm.mjs +5 -3
- package/generators/client/files-angular.js +9 -0
- package/generators/client/files-common.js +8 -7
- package/generators/client/files-vue.js +7 -6
- package/generators/client/index.js +2 -1
- package/generators/client/templates/angular/angular.json.ejs +1 -1
- package/generators/client/templates/angular/package.json +25 -22
- package/generators/client/templates/angular/package.json.ejs +5 -1
- 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/update/user-management-update.component.html.ejs +11 -11
- 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 +19 -0
- package/generators/client/templates/common/package.json +2 -2
- package/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs +1 -7
- package/generators/client/templates/react/package.json +33 -33
- package/generators/client/templates/vue/package.json +23 -23
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +3 -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/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 +3 -3
- 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/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 +11 -15
- package/generators/entity/prompts.js +4 -1
- package/generators/entity-client/esm.mjs +2 -3
- 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/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 +2 -2
- package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +1 -1
- 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 +1 -1
- 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-server/esm.mjs +2 -3
- package/generators/entity-server/files-couchbase.js +23 -2
- package/generators/entity-server/files.js +16 -2
- package/generators/entity-server/index.js +8 -1
- 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 +23 -59
- 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/src/main/java/package/common/get_all_template.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs +4 -4
- package/generators/entity-server/templates/src/main/java/package/common/patch_template.ejs +3 -3
- 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 +2 -2
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +31 -18
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +3 -3
- 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 +90 -0
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +3 -5
- package/generators/entity-server/templates/src/main/java/package/repository/search/{SortToFieldSortBuilderConverter.java.ejs → SortToSortBuilderListConverter.java.ejs} +4 -3
- 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 +1 -1
- package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +6 -6
- package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +5 -5
- 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.js +128 -23
- package/generators/generator-constants.js +18 -16
- package/generators/generator-list.js +2 -0
- 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/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/esm.mjs +2 -2
- package/generators/server/files-couchbase.js +28 -31
- package/generators/server/files.js +14 -1
- package/generators/server/index.js +13 -13
- package/generators/server/needle-api/needle-server-maven.js +1 -1
- 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 +43 -64
- 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/gradle/profile_prod.gradle.ejs +4 -0
- package/generators/server/templates/gradle.properties.ejs +6 -6
- package/generators/server/templates/npmw +14 -5
- package/generators/server/templates/pom.xml.ejs +47 -42
- package/generators/server/templates/src/main/docker/app.yml.ejs +4 -2
- package/generators/server/templates/src/main/docker/zipkin.yml.ejs +25 -0
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs +26 -16
- 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_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/UserRepository.java.ejs +48 -72
- 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/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 +2 -0
- package/generators/server/templates/src/test/java/package/IntegrationTest.java.ejs +3 -1
- package/generators/server/templates/src/test/java/package/TechnicalStructureTest.java.ejs +21 -15
- package/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs +2 -0
- 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/SecurityUtilsUnitTest_reactive.java.ejs +1 -1
- package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +1 -1
- 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 +13 -6
- 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/UserResourceIT.java.ejs +40 -42
- package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +1 -1
- 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/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 +27 -23
- package/utils/entity.js +19 -2
- package/utils/faker.js +3 -3
- package/utils/field.js +61 -49
- package/utils/relationship.js +5 -3
- 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/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/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/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/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
|
@@ -20,11 +20,7 @@ const constants = require('../generator-constants');
|
|
|
20
20
|
|
|
21
21
|
const { CLIENT_MAIN_SRC_DIR } = constants;
|
|
22
22
|
|
|
23
|
-
|
|
24
|
-
writeFiles,
|
|
25
|
-
};
|
|
26
|
-
|
|
27
|
-
const commonFiles = {
|
|
23
|
+
const files = {
|
|
28
24
|
common: [
|
|
29
25
|
{
|
|
30
26
|
templates: ['.eslintignore', 'README.md.jhi.client', `${CLIENT_MAIN_SRC_DIR}manifest.webapp`],
|
|
@@ -62,7 +58,7 @@ const commonFiles = {
|
|
|
62
58
|
],
|
|
63
59
|
},
|
|
64
60
|
{
|
|
65
|
-
condition: generator => generator.enableI18nRTL && !generator.clientFrameworkReact,
|
|
61
|
+
condition: generator => generator.enableI18nRTL && !generator.clientFrameworkReact && !generator.clientFrameworkAngular,
|
|
66
62
|
path: CLIENT_MAIN_SRC_DIR,
|
|
67
63
|
templates: ['content/scss/rtl.scss'],
|
|
68
64
|
},
|
|
@@ -81,5 +77,10 @@ const commonFiles = {
|
|
|
81
77
|
};
|
|
82
78
|
|
|
83
79
|
function writeFiles() {
|
|
84
|
-
return this.writeFilesToDisk(
|
|
80
|
+
return this.writeFilesToDisk(files, 'common');
|
|
85
81
|
}
|
|
82
|
+
|
|
83
|
+
module.exports = {
|
|
84
|
+
files,
|
|
85
|
+
writeFiles,
|
|
86
|
+
};
|
|
@@ -24,12 +24,6 @@ const { GATEWAY } = require('../../jdl/jhipster/application-types');
|
|
|
24
24
|
|
|
25
25
|
const { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, VUE_DIR } = constants;
|
|
26
26
|
|
|
27
|
-
module.exports = {
|
|
28
|
-
cleanup,
|
|
29
|
-
writeFiles,
|
|
30
|
-
customizeFiles,
|
|
31
|
-
};
|
|
32
|
-
|
|
33
27
|
const vueFiles = {
|
|
34
28
|
common: [
|
|
35
29
|
{
|
|
@@ -428,3 +422,10 @@ function customizeFiles() {
|
|
|
428
422
|
}
|
|
429
423
|
}
|
|
430
424
|
}
|
|
425
|
+
|
|
426
|
+
module.exports = {
|
|
427
|
+
files: vueFiles,
|
|
428
|
+
cleanup,
|
|
429
|
+
writeFiles,
|
|
430
|
+
customizeFiles,
|
|
431
|
+
};
|
|
@@ -35,7 +35,7 @@ const {
|
|
|
35
35
|
} = require('../../lib/constants/priorities.cjs').compat;
|
|
36
36
|
|
|
37
37
|
const prompts = require('./prompts');
|
|
38
|
-
const writeAngularFiles = require('./files-angular')
|
|
38
|
+
const { cleanup: cleanupAngular, writeFiles: writeAngularFiles } = require('./files-angular');
|
|
39
39
|
const { cleanup: cleanupReact, writeFiles: writeReactFiles } = require('./files-react');
|
|
40
40
|
const { cleanup: cleanupVue, writeFiles: writeVueFiles, customizeFiles: customizeVueFiles } = require('./files-vue');
|
|
41
41
|
const writeCommonFiles = require('./files-common').writeFiles;
|
|
@@ -341,6 +341,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
|
|
|
341
341
|
return {
|
|
342
342
|
cleanupReact,
|
|
343
343
|
cleanupVue,
|
|
344
|
+
cleanupAngular,
|
|
344
345
|
|
|
345
346
|
write() {
|
|
346
347
|
if (this.skipClient) return;
|
|
@@ -1,46 +1,49 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@angular/common": "13.
|
|
4
|
-
"bootstrap": "4.6.1",
|
|
3
|
+
"@angular/common": "13.2.4",
|
|
5
4
|
"@fortawesome/angular-fontawesome": "0.10.1",
|
|
6
|
-
"@fortawesome/fontawesome-svg-core": "1.
|
|
7
|
-
"@fortawesome/free-solid-svg-icons": "
|
|
8
|
-
"@ng-bootstrap/ng-bootstrap": "
|
|
5
|
+
"@fortawesome/fontawesome-svg-core": "1.3.0",
|
|
6
|
+
"@fortawesome/free-solid-svg-icons": "6.0.0",
|
|
7
|
+
"@ng-bootstrap/ng-bootstrap": "12.0.0",
|
|
9
8
|
"@ngx-translate/core": "14.0.0",
|
|
10
9
|
"@ngx-translate/http-loader": "7.0.0",
|
|
10
|
+
"@popperjs/core": "2.11.2",
|
|
11
|
+
"bootstrap": "5.1.3",
|
|
12
|
+
"bootswatch": "5.1.3",
|
|
11
13
|
"ngx-cookie-service": "13.1.2",
|
|
12
14
|
"ngx-infinite-scroll": "10.0.1",
|
|
13
15
|
"ngx-webstorage": "9.0.0",
|
|
14
|
-
"rxjs": "7.5.
|
|
15
|
-
"swagger-ui-dist": "4.2
|
|
16
|
+
"rxjs": "7.5.4",
|
|
17
|
+
"swagger-ui-dist": "4.5.2",
|
|
16
18
|
"tslib": "2.3.1",
|
|
17
19
|
"zone.js": "0.11.4"
|
|
18
20
|
},
|
|
19
21
|
"devDependencies": {
|
|
20
|
-
"@angular/cli": "13.
|
|
21
|
-
"@angular-builders/custom-webpack": "13.
|
|
22
|
-
"@angular-builders/jest": "13.0.
|
|
23
|
-
"@angular-eslint/eslint-plugin": "13.0
|
|
24
|
-
"@types/node": "16.11.
|
|
25
|
-
"@types/jest": "27.4.
|
|
26
|
-
"@typescript-eslint/eslint-plugin": "5.
|
|
22
|
+
"@angular/cli": "13.2.5",
|
|
23
|
+
"@angular-builders/custom-webpack": "13.1.0",
|
|
24
|
+
"@angular-builders/jest": "13.0.3",
|
|
25
|
+
"@angular-eslint/eslint-plugin": "13.1.0",
|
|
26
|
+
"@types/node": "16.11.26",
|
|
27
|
+
"@types/jest": "27.4.1",
|
|
28
|
+
"@typescript-eslint/eslint-plugin": "5.12.1",
|
|
27
29
|
"browser-sync": "2.27.7",
|
|
28
30
|
"browser-sync-webpack-plugin": "2.3.0",
|
|
29
|
-
"copy-webpack-plugin": "10.2.
|
|
30
|
-
"eslint": "8.
|
|
31
|
-
"eslint-config-prettier": "8.
|
|
31
|
+
"copy-webpack-plugin": "10.2.4",
|
|
32
|
+
"eslint": "8.9.0",
|
|
33
|
+
"eslint-config-prettier": "8.4.0",
|
|
32
34
|
"eslint-webpack-plugin": "3.1.1",
|
|
33
|
-
"folder-hash": "4.0.
|
|
34
|
-
"jest": "27.
|
|
35
|
-
"jest-preset-angular": "11.
|
|
35
|
+
"folder-hash": "4.0.2",
|
|
36
|
+
"jest": "27.5.1",
|
|
37
|
+
"jest-preset-angular": "11.1.1",
|
|
36
38
|
"jest-date-mock": "1.0.8",
|
|
37
39
|
"jest-junit": "13.0.0",
|
|
38
40
|
"jest-sonar-reporter": "2.0.0",
|
|
39
41
|
"merge-jsons-webpack-plugin": "2.0.1",
|
|
42
|
+
"postcss-rtlcss": "3.5.2",
|
|
40
43
|
"rimraf": "3.0.2",
|
|
41
44
|
"ts-jest": "27.1.3",
|
|
42
|
-
"typescript": "4.5.
|
|
43
|
-
"webpack": "5.
|
|
45
|
+
"typescript": "4.5.5",
|
|
46
|
+
"webpack": "5.69.1",
|
|
44
47
|
"webpack-bundle-analyzer": "4.5.0",
|
|
45
48
|
"webpack-merge": "5.8.0",
|
|
46
49
|
"webpack-notifier": "1.15.0"
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
<%_ } _%>
|
|
46
46
|
"bootstrap": "<%= dependabotPackageJson.dependencies.bootstrap %>",
|
|
47
47
|
<%_ if (!clientThemeNone) { _%>
|
|
48
|
-
"bootswatch": "<%= dependabotPackageJson.dependencies.
|
|
48
|
+
"bootswatch": "<%= dependabotPackageJson.dependencies.bootswatch %>",
|
|
49
49
|
<%_ } _%>
|
|
50
50
|
"dayjs": "<%= dependabotPackageJson.dependencies['dayjs'] %>",
|
|
51
51
|
<%_ if (authenticationTypeSession && websocket === 'spring-websocket') { _%>
|
|
@@ -53,6 +53,7 @@
|
|
|
53
53
|
<%_ } _%>
|
|
54
54
|
"ngx-infinite-scroll": "<%= dependabotPackageJson.dependencies['ngx-infinite-scroll'] %>",
|
|
55
55
|
"ngx-webstorage": "<%= dependabotPackageJson.dependencies['ngx-webstorage'] %>",
|
|
56
|
+
"@popperjs/core": "<%= dependabotPackageJson.dependencies['@popperjs/core'] %>",
|
|
56
57
|
"rxjs": "<%= dependabotPackageJson.dependencies['rxjs'] %>",
|
|
57
58
|
"swagger-ui-dist": "<%= dependabotPackageJson.dependencies['swagger-ui-dist'] %>",
|
|
58
59
|
<%_ if (websocket === 'spring-websocket') { _%>
|
|
@@ -122,6 +123,9 @@
|
|
|
122
123
|
"jest-sonar-reporter": "<%= dependabotPackageJson.devDependencies['jest-sonar-reporter'] %>",
|
|
123
124
|
"prettier": "<%= dependabotPackageJson.devDependencies['prettier'] %>",
|
|
124
125
|
"prettier-plugin-packagejson": "<%= dependabotPackageJson.devDependencies['prettier-plugin-packagejson'] %>",
|
|
126
|
+
<%_ if (enableI18nRTL) { _%>
|
|
127
|
+
"postcss-rtlcss": "<%= dependabotPackageJson.devDependencies['postcss-rtlcss'] %>",
|
|
128
|
+
<%_ } _%>
|
|
125
129
|
"rimraf": "<%= dependabotPackageJson.devDependencies['rimraf'] %>",
|
|
126
130
|
"ts-jest": "<%= dependabotPackageJson.devDependencies['ts-jest'] %>",
|
|
127
131
|
"typescript": "<%= dependabotPackageJson.devDependencies['typescript'] %>",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
19
|
<div>
|
|
20
|
-
<div class="
|
|
20
|
+
<div class="d-flex justify-content-center">
|
|
21
21
|
<div class="col-md-8" *ngIf="account$ | async as account">
|
|
22
22
|
<h2 <%= jhiPrefix %>Translate="password.title" [translateValues]="{ username: account.login }">
|
|
23
23
|
Password for [<strong>{{ account.login }}</strong>]
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
<form name="form" role="form" (ngSubmit)="changePassword()" [formGroup]="passwordForm">
|
|
39
|
-
<div class="
|
|
40
|
-
<label class="form-
|
|
39
|
+
<div class="mb-3">
|
|
40
|
+
<label class="form-label" for="currentPassword" <%= jhiPrefix %>Translate="global.form.currentpassword.label">Current password</label>
|
|
41
41
|
<input
|
|
42
42
|
type="password"
|
|
43
43
|
class="form-control"
|
|
@@ -64,8 +64,8 @@
|
|
|
64
64
|
</div>
|
|
65
65
|
</div>
|
|
66
66
|
|
|
67
|
-
<div class="
|
|
68
|
-
<label class="form-
|
|
67
|
+
<div class="mb-3">
|
|
68
|
+
<label class="form-label" for="newPassword" <%= jhiPrefix %>Translate="global.form.newpassword.label">New password</label>
|
|
69
69
|
<input
|
|
70
70
|
type="password"
|
|
71
71
|
class="form-control"
|
|
@@ -110,8 +110,8 @@
|
|
|
110
110
|
<<%= jhiPrefixDashed %>-password-strength-bar [passwordToCheck]="passwordForm.get('newPassword')!.value"></<%= jhiPrefixDashed %>-password-strength-bar>
|
|
111
111
|
</div>
|
|
112
112
|
|
|
113
|
-
<div class="
|
|
114
|
-
<label class="form-
|
|
113
|
+
<div class="mb-3">
|
|
114
|
+
<label class="form-label" for="confirmPassword" <%= jhiPrefix %>Translate="global.form.confirmpassword.label">New password confirmation</label>
|
|
115
115
|
<input
|
|
116
116
|
type="password"
|
|
117
117
|
class="form-control"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
19
|
<div>
|
|
20
|
-
<div class="
|
|
20
|
+
<div class="d-flex justify-content-center">
|
|
21
21
|
<div class="col-md-4">
|
|
22
22
|
<h1 <%= jhiPrefix %>Translate="reset.finish.title">Reset password</h1>
|
|
23
23
|
|
|
@@ -44,8 +44,8 @@
|
|
|
44
44
|
|
|
45
45
|
<div *ngIf="key && !success">
|
|
46
46
|
<form name="form" role="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
|
|
47
|
-
<div class="
|
|
48
|
-
<label class="form-
|
|
47
|
+
<div class="mb-3">
|
|
48
|
+
<label class="form-label" for="newPassword" <%= jhiPrefix %>Translate="global.form.newpassword.label">New password</label>
|
|
49
49
|
<input
|
|
50
50
|
type="password"
|
|
51
51
|
class="form-control"
|
|
@@ -91,8 +91,8 @@
|
|
|
91
91
|
<<%= jhiPrefixDashed %>-password-strength-bar [passwordToCheck]="passwordForm.get('newPassword')!.value"></<%= jhiPrefixDashed %>-password-strength-bar>
|
|
92
92
|
</div>
|
|
93
93
|
|
|
94
|
-
<div class="
|
|
95
|
-
<label class="form-
|
|
94
|
+
<div class="mb-3">
|
|
95
|
+
<label class="form-label" for="confirmPassword" <%= jhiPrefix %>Translate="global.form.confirmpassword.label">New password confirmation</label>
|
|
96
96
|
<input
|
|
97
97
|
type="password"
|
|
98
98
|
class="form-control"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
19
|
<div>
|
|
20
|
-
<div class="
|
|
20
|
+
<div class="d-flex justify-content-center">
|
|
21
21
|
<div class="col-md-8">
|
|
22
22
|
<h1 <%= jhiPrefix %>Translate="reset.request.title">Reset your password</h1>
|
|
23
23
|
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
</div>
|
|
33
33
|
|
|
34
34
|
<form *ngIf="!success" name="form" role="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
|
|
35
|
-
<div class="
|
|
36
|
-
<label class="form-
|
|
35
|
+
<div class="mb-3">
|
|
36
|
+
<label class="form-label" for="email" <%= jhiPrefix %>Translate="global.form.email.label">Email</label>
|
|
37
37
|
<input
|
|
38
38
|
type="email"
|
|
39
39
|
class="form-control"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
19
|
<div>
|
|
20
|
-
<div class="
|
|
20
|
+
<div class="d-flex justify-content-center">
|
|
21
21
|
<div class="col-md-8">
|
|
22
22
|
<h1 <%= jhiPrefix %>Translate="register.title" data-cy="registerTitle">Registration</h1>
|
|
23
23
|
|
|
@@ -43,11 +43,11 @@
|
|
|
43
43
|
</div>
|
|
44
44
|
</div>
|
|
45
45
|
|
|
46
|
-
<div class="
|
|
46
|
+
<div class="d-flex justify-content-center">
|
|
47
47
|
<div class="col-md-8">
|
|
48
48
|
<form name="form" role="form" (ngSubmit)="register()" [formGroup]="registerForm" *ngIf="!success">
|
|
49
|
-
<div class="
|
|
50
|
-
<label class="form-
|
|
49
|
+
<div class="mb-3">
|
|
50
|
+
<label class="form-label" for="login" <%= jhiPrefix %>Translate="global.form.username.label">Username</label>
|
|
51
51
|
<input
|
|
52
52
|
type="text"
|
|
53
53
|
class="form-control"
|
|
@@ -94,8 +94,8 @@
|
|
|
94
94
|
</div>
|
|
95
95
|
</div>
|
|
96
96
|
|
|
97
|
-
<div class="
|
|
98
|
-
<label class="form-
|
|
97
|
+
<div class="mb-3">
|
|
98
|
+
<label class="form-label" for="email" <%= jhiPrefix %>Translate="global.form.email.label">Email</label>
|
|
99
99
|
<input
|
|
100
100
|
type="email"
|
|
101
101
|
class="form-control"
|
|
@@ -141,8 +141,8 @@
|
|
|
141
141
|
</div>
|
|
142
142
|
</div>
|
|
143
143
|
|
|
144
|
-
<div class="
|
|
145
|
-
<label class="form-
|
|
144
|
+
<div class="mb-3">
|
|
145
|
+
<label class="form-label" for="password" <%= jhiPrefix %>Translate="global.form.newpassword.label">New password</label>
|
|
146
146
|
<input
|
|
147
147
|
type="password"
|
|
148
148
|
class="form-control"
|
|
@@ -187,8 +187,8 @@
|
|
|
187
187
|
<<%= jhiPrefixDashed %>-password-strength-bar [passwordToCheck]="registerForm.get('password')!.value"></<%= jhiPrefixDashed %>-password-strength-bar>
|
|
188
188
|
</div>
|
|
189
189
|
|
|
190
|
-
<div class="
|
|
191
|
-
<label class="form-
|
|
190
|
+
<div class="mb-3">
|
|
191
|
+
<label class="form-label" for="confirmPassword" <%= jhiPrefix %>Translate="global.form.confirmpassword.label">New password confirmation</label>
|
|
192
192
|
<input
|
|
193
193
|
type="password"
|
|
194
194
|
class="form-control"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
limitations under the License.
|
|
18
18
|
-%>
|
|
19
19
|
<div>
|
|
20
|
-
<div class="
|
|
20
|
+
<div class="d-flex justify-content-center">
|
|
21
21
|
<div class="col-md-8">
|
|
22
22
|
<h2 <%= jhiPrefix %>Translate="settings.title" [translateValues]="{ username: account.login }" *ngIf="account">
|
|
23
23
|
User settings for [<strong>{{ account.login }}</strong>]
|
|
@@ -30,8 +30,8 @@
|
|
|
30
30
|
<<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
|
|
31
31
|
|
|
32
32
|
<form name="form" role="form" (ngSubmit)="save()" [formGroup]="settingsForm" *ngIf="account" novalidate>
|
|
33
|
-
<div class="
|
|
34
|
-
<label class="form-
|
|
33
|
+
<div class="mb-3">
|
|
34
|
+
<label class="form-label" for="firstName" <%= jhiPrefix %>Translate="settings.form.firstname">First Name</label>
|
|
35
35
|
<input
|
|
36
36
|
type="text"
|
|
37
37
|
class="form-control"
|
|
@@ -74,8 +74,8 @@
|
|
|
74
74
|
</div>
|
|
75
75
|
</div>
|
|
76
76
|
|
|
77
|
-
<div class="
|
|
78
|
-
<label class="form-
|
|
77
|
+
<div class="mb-3">
|
|
78
|
+
<label class="form-label" for="lastName" <%= jhiPrefix %>Translate="settings.form.lastname">Last Name</label>
|
|
79
79
|
<input
|
|
80
80
|
type="text"
|
|
81
81
|
class="form-control"
|
|
@@ -118,8 +118,8 @@
|
|
|
118
118
|
</div>
|
|
119
119
|
</div>
|
|
120
120
|
|
|
121
|
-
<div class="
|
|
122
|
-
<label class="form-
|
|
121
|
+
<div class="mb-3">
|
|
122
|
+
<label class="form-label" for="email" <%= jhiPrefix %>Translate="global.form.email.label">Email</label>
|
|
123
123
|
<input
|
|
124
124
|
type="email"
|
|
125
125
|
class="form-control"
|
|
@@ -166,7 +166,7 @@
|
|
|
166
166
|
</div>
|
|
167
167
|
<%_ if (enableTranslation) { _%>
|
|
168
168
|
|
|
169
|
-
<div class="
|
|
169
|
+
<div class="mb-3" *ngIf="languages && languages.length > 0">
|
|
170
170
|
<label for="langKey" <%= jhiPrefix %>Translate="settings.form.language">Language</label>
|
|
171
171
|
<select class="form-control" id="langKey" name="langKey" formControlName="langKey" data-cy="langKey">
|
|
172
172
|
<option *ngFor="let language of languages" [value]="language">{{ language | findLanguageFromKey }}</option>
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
<div class="row" *ngFor="let property of bean.properties | keyvalue">
|
|
43
43
|
<div class="col-md-4">{{ property.key }}</div>
|
|
44
44
|
<div class="col-md-8">
|
|
45
|
-
<span class="float-
|
|
45
|
+
<span class="float-end bg-secondary break">{{ property.value | json }}</span>
|
|
46
46
|
</div>
|
|
47
47
|
</div>
|
|
48
48
|
</td>
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
<tr *ngFor="let property of propertySource.properties | keyvalue">
|
|
67
67
|
<td class="break">{{ property.key }}</td>
|
|
68
68
|
<td class="break">
|
|
69
|
-
<span class="float-
|
|
69
|
+
<span class="float-end bg-secondary break">{{ property.value.value }}</span>
|
|
70
70
|
</td>
|
|
71
71
|
</tr>
|
|
72
72
|
</tbody>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
<h2>
|
|
21
21
|
<span id="gateway-page-heading" <%= jhiPrefix %>Translate="gateway.title">Gateway</span>
|
|
22
22
|
|
|
23
|
-
<button class="btn btn-primary float-
|
|
23
|
+
<button class="btn btn-primary float-end" (click)="refresh()" (disabled)="updatingRoutes">
|
|
24
24
|
<fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="gateway.refresh.button">Refresh</span>
|
|
25
25
|
</button>
|
|
26
26
|
</h2>
|
|
@@ -50,13 +50,13 @@
|
|
|
50
50
|
<tr *ngFor="let instance of route.serviceInstances">
|
|
51
51
|
<td><a href="{{ instance.uri }}" target="_blank">{{ instance.uri }}</a></td>
|
|
52
52
|
<td>
|
|
53
|
-
<div *ngIf="instance.instanceInfo" class="badge
|
|
54
|
-
<div *ngIf="!instance.instanceInfo" class="badge
|
|
53
|
+
<div *ngIf="instance.instanceInfo" class="badge bg-{{ instance.instanceInfo.status === 'UP' ? 'success' : 'danger' }}">{{ instance.instanceInfo.status }}</div>
|
|
54
|
+
<div *ngIf="!instance.instanceInfo" class="badge bg-warning">?</div>
|
|
55
55
|
</td>
|
|
56
56
|
<td>
|
|
57
57
|
<span *ngFor="let entry of (instance.metadata | keyvalue )">
|
|
58
|
-
<span class="badge
|
|
59
|
-
<span class="badge
|
|
58
|
+
<span class="badge bg-default fw-normal">
|
|
59
|
+
<span class="badge rounded-pill bg-info fw-normal">{{ entry.key }}</span>
|
|
60
60
|
{{ entry.value }}
|
|
61
61
|
</span>
|
|
62
62
|
</span>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
<h2>
|
|
21
21
|
<span id="health-page-heading" <%= jhiPrefix %>Translate="health.title" data-cy="healthPageHeading">Health Checks</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="health.refresh.button">Refresh</span>
|
|
25
25
|
</button>
|
|
26
26
|
</h2>
|
|
@@ -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>
|