generator-jhipster 7.4.1 → 7.5.0

package/generators/app/index.js

@@ -250,15 +250,25 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
     });
 
     this.option('microfrontend', {
-      desc: 'Use experimental microfrontend support',
+      desc: 'Force generation of experimental microfrontend support',
       type: Boolean,
     });
 
+    this.option('test-frameworks', {
+      desc: 'Test frameworks to be generated',
+      type: Array,
+    });
+
     this.option('reactive', {
       desc: 'Generate a reactive backend',
       type: Boolean,
     });
 
+    this.option('enable-swagger-codegen', {
+      desc: 'API first development using OpenAPI-generator',
+      type: Boolean,
+    });
+
     // Just constructing help, stop here
     if (this.options.help) {
       return;

package/generators/cleanup.js

@@ -19,6 +19,7 @@
 
 const constants = require('./generator-constants');
 const { languageSnakeCase, languageToJavaLanguage } = require('./utils');
+const { cleanupOldServerFiles } = require('./server/cleanup');
 
 const { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, SERVER_MAIN_RES_DIR, ANGULAR_DIR, REACT_DIR, VUE_DIR, CLIENT_WEBPACK_DIR } = constants;
 
@@ -46,6 +47,15 @@ function cleanupOldFiles(generator) {
     generator.removeFile(`${ANGULAR_DIR}components/form/uib-pager.config.js`);
     generator.removeFile(`${ANGULAR_DIR}components/form/uib-pagination.config.js`);
   }
+  if (generator.isJhipsterVersionLessThan('3.11.0')) {
+    generator.removeFile(`${CLIENT_MAIN_SRC_DIR}app/layouts/navbar/active-link.directive.js`);
+  }
+  if (generator.isJhipsterVersionLessThan('4.11.1')) {
+    generator.removeFile(`${CLIENT_MAIN_SRC_DIR}app/app.main-aot.ts`);
+  }
+  if (generator.isJhipsterVersionLessThan('4.13.1')) {
+    generator.config.delete('hibernateCache');
+  }
   if (generator.isJhipsterVersionLessThan('5.0.0')) {
     generator.removeFile(`${ANGULAR_DIR}/app.route.ts`);
     generator.removeFile(`${ANGULAR_DIR}shared/auth/account.service.ts`);
@@ -77,6 +87,22 @@ function cleanupOldFiles(generator) {
     generator.removeFile(`${ANGULAR_DIR}admin/metrics/metrics-modal.component.ts`);
     generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/metrics/metrics-modal.component.spec.ts`);
   }
+  if (
+    generator.isJhipsterVersionLessThan('5.2.2') &&
+    generator.authenticationType === 'oauth2' &&
+    generator.applicationType === 'microservice'
+  ) {
+    generator.removeFolder(`${constants.DOCKER_DIR}realm-config`);
+    generator.removeFile(`${constants.DOCKER_DIR}keycloak.yml`);
+  }
+  if (generator.isJhipsterVersionLessThan('6.0.0')) {
+    generator.removeFolder(`${CLIENT_MAIN_SRC_DIR}app/shared/layout/header/menus`);
+    generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/app/shared/layout/header/menus`);
+  }
+  if (generator.isJhipsterVersionLessThan('6.1.0')) {
+    generator.config.delete('blueprint');
+    generator.config.delete('blueprintVersion');
+  }
   if (generator.isJhipsterVersionLessThan('6.3.0') && generator.jhipsterConfig.clientFramework === ANGULAR) {
     generator.removeFile(`${ANGULAR_DIR}account/index.ts`);
     generator.removeFile(`${ANGULAR_DIR}admin/index.ts`);
@@ -86,24 +112,19 @@ function cleanupOldFiles(generator) {
     generator.removeFile(`${ANGULAR_DIR}shared/index.ts`);
     generator.removeFile(`${ANGULAR_DIR}shared/shared-common.module.ts`);
   }
-
   if (generator.isJhipsterVersionLessThan('6.3.0') && generator.jhipsterConfig.clientFramework === REACT) {
     generator.removeFile('tslint.json');
   }
-
   if (generator.isJhipsterVersionLessThan('6.4.0') && generator.jhipsterConfig.clientFramework === ANGULAR) {
     generator.removeFile(`${ANGULAR_DIR}admin/admin.route.ts`);
     generator.removeFile(`${ANGULAR_DIR}admin/admin.module.ts`);
   }
-
   if (generator.isJhipsterVersionLessThan('6.6.1') && generator.jhipsterConfig.clientFramework === ANGULAR) {
     generator.removeFile(`${ANGULAR_DIR}core/language/language.helper.ts`);
   }
-
-  if (generator.isJhipsterVersionLessThan('6.8.0') && generator.jhipsterConfig.clientFramework === 'angularX') {
+  if (generator.isJhipsterVersionLessThan('6.8.0') && generator.jhipsterConfig.clientFramework === ANGULAR) {
     generator.removeFile(`${ANGULAR_DIR}tsconfig-aot.json`);
   }
-
   if (generator.isJhipsterVersionLessThan('7.0.0-beta.0') && generator.jhipsterConfig) {
     if (generator.jhipsterConfig.clientFramework === ANGULAR) {
       generator.removeFile(`${ANGULAR_DIR}account/password/password-strength-bar.component.ts`);
@@ -324,171 +345,6 @@ function cleanupOldFiles(generator) {
   }
 }
 
-/**
- * Removes server files that where generated in previous JHipster versions and therefore
- * need to be removed.
- *
- * @param {any} generator - reference to generator
- * @param {string} javaDir - Java directory
- * @param {string} testDir - Java tests directory
- * @param {string} mainResourceDir - Main resources directory
- * @param {string} testResourceDir - Test resources directory
- */
-function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir) {
-  if (generator.isJhipsterVersionLessThan('3.5.0')) {
-    generator.removeFile(`${javaDir}domain/util/JSR310DateTimeSerializer.java`);
-    generator.removeFile(`${javaDir}domain/util/JSR310LocalDateDeserializer.java`);
-  }
-  if (generator.isJhipsterVersionLessThan('3.6.0')) {
-    generator.removeFile(`${javaDir}config/HerokuDatabaseConfiguration.java`);
-  }
-  if (generator.isJhipsterVersionLessThan('3.10.0')) {
-    generator.removeFile(`${javaDir}config/CloudMongoDbConfiguration.java`);
-    generator.removeFile(`${javaDir}security/CustomAccessDeniedHandler.java`);
-    generator.removeFile(`${javaDir}web/filter/CsrfCookieGeneratorFilter.java`);
-  }
-  if (generator.isJhipsterVersionLessThan('3.11.0')) {
-    generator.removeFile(`${CLIENT_MAIN_SRC_DIR}app/layouts/navbar/active-link.directive.js`);
-  }
-  if (generator.isJhipsterVersionLessThan('3.12.0')) {
-    generator.removeFile(`${javaDir}config/hazelcast/HazelcastCacheRegionFactory.java`);
-    generator.removeFile(`${javaDir}config/hazelcast/package-info.java`);
-  }
-  if (generator.isJhipsterVersionLessThan('4.0.0')) {
-    generator.removeFile(`${javaDir}async/ExceptionHandlingAsyncTaskExecutor.java`);
-    generator.removeFile(`${javaDir}async/package-info.java`);
-    generator.removeFile(`${javaDir}config/jHipsterProperties.java`);
-    generator.removeFile(`${javaDir}config/LoadBalancedResourceDetails.java`);
-    generator.removeFile(`${javaDir}config/ElasticSearchConfiguration.java`);
-    generator.removeFile(`${javaDir}config/apidoc/package-info.java`);
-    generator.removeFile(`${javaDir}config/apidoc/PageableParameterBuilderPlugin.java`);
-    generator.removeFile(`${javaDir}config/apidoc/SwaggerConfiguration.java`);
-    generator.removeFile(`${javaDir}config/jcache/SpringCacheRegionFactory.java`);
-    generator.removeFile(`${javaDir}config/jcache/SpringCacheRegionFactory.java`);
-    generator.removeFile(`${javaDir}config/liquibase/AsyncSpringLiquibase.java`);
-    generator.removeFile(`${javaDir}config/liquibase/package-info.java`);
-    generator.removeFile(`${javaDir}config/locale/AngularCookieLocaleResolver.java`);
-    generator.removeFile(`${javaDir}config/locale/package-info.java`);
-    generator.removeFile(`${javaDir}domain/util/FixedH2Dialect.java`);
-    generator.removeFile(`${javaDir}domain/util/FixedPostgreSQL82Dialect`);
-    generator.removeFile(`${javaDir}domain/util/JSR310DateConverters.java`);
-    generator.removeFile(`${javaDir}domain/util/JSR310PersistenceConverters.java`);
-    generator.removeFile(`${javaDir}security/AjaxAuthenticationFailureHandler.java`);
-    generator.removeFile(`${javaDir}security/AjaxAuthenticationSuccessHandler.java`);
-    generator.removeFile(`${javaDir}security/AjaxLogoutSuccessHandler.java`);
-    generator.removeFile(`${javaDir}security/CustomPersistentRememberMeServices.java`);
-    generator.removeFile(`${javaDir}security/Http401UnauthorizedEntryPoint.java`);
-    generator.removeFile(`${javaDir}security/UserDetailsService.java`);
-    generator.removeFile(`${javaDir}web/filter/CachingHttpHeadersFilter.java`);
-    generator.removeFile(`${javaDir}web/filter/package-info.java`);
-  }
-  if (generator.isJhipsterVersionLessThan('4.3.0')) {
-    generator.removeFile(`${javaDir}gateway/ratelimiting/RateLimitingRepository.java`);
-    generator.removeFile(`${javaDir}config/cassandra/CustomZonedDateTimeCodec.java`);
-  }
-  if (generator.isJhipsterVersionLessThan('4.7.1')) {
-    generator.removeFile(`${javaDir}web/rest/errors/ErrorVM.java`);
-    generator.removeFile(`${javaDir}web/rest/errors/ParameterizedErrorVM.java`);
-  }
-  if (generator.isJhipsterVersionLessThan('4.11.1')) {
-    generator.removeFile(`${CLIENT_MAIN_SRC_DIR}app/app.main-aot.ts`);
-  }
-  if (generator.isJhipsterVersionLessThan('4.13.1')) {
-    generator.config.delete('hibernateCache');
-  }
-  if (generator.isJhipsterVersionLessThan('5.0.0')) {
-    generator.removeFile(`${javaDir}config/ThymeleafConfiguration.java`);
-    generator.removeFile(`${javaDir}web/rest/ProfileInfoResource.java`);
-    generator.removeFile(`${mainResourceDir}mails/activationEmail.html`);
-    generator.removeFile(`${mainResourceDir}mails/creationEmail.html`);
-    generator.removeFile(`${mainResourceDir}mails/passwordResetEmail.html`);
-    generator.removeFile(`${mainResourceDir}mails/socialRegistrationValidationEmail.html`);
-    generator.removeFile(`${testResourceDir}mail/testEmail.html`);
-    generator.removeFile(`${testDir}web/rest/ProfileInfoResourceIT.java`);
-    generator.removeFile('gradle/mapstruct.gradle');
-  }
-  if (generator.isJhipsterVersionLessThan('5.2.2')) {
-    generator.removeFile(`${javaDir}config/ElasticsearchConfiguration.java`);
-    generator.removeFile('gradle/liquibase.gradle');
-
-    if (generator.authenticationType === 'oauth2' && generator.applicationType === 'microservice') {
-      generator.removeFolder(`${constants.DOCKER_DIR}realm-config`);
-      generator.removeFile(`${constants.DOCKER_DIR}keycloak.yml`);
-    }
-  }
-  if (generator.isJhipsterVersionLessThan('5.8.0')) {
-    generator.removeFile(`${javaDir}config/MetricsConfiguration.java`);
-    if (generator.databaseType === 'cassandra') {
-      generator.removeFile(`${testResourceDir}cassandra-random-port.yml`);
-    }
-  }
-  if (generator.isJhipsterVersionLessThan('6.0.0')) {
-    generator.removeFile(`${javaDir}web/rest/errors/CustomParameterizedException.java`);
-    generator.removeFile(`${javaDir}web/rest/errors/InternalServerErrorException.java`);
-    generator.removeFile(`${javaDir}web/rest/util/PaginationUtil.java`);
-    generator.removeFile(`${javaDir}web/rest/util/HeaderUtil.java`);
-    generator.removeFile(`${testDir}web/rest/util/PaginationUtilUnitTest.java`);
-    generator.removeFile(`${javaDir}web/rest/vm/LoggerVM.java`);
-    generator.removeFile(`${javaDir}web/rest/LogsResource.java`);
-    generator.removeFile(`${testDir}web/rest/LogsResourceIT.java`);
-    generator.removeFile(`${javaDir}config/OAuth2Configuration.java`);
-    generator.removeFile(`${javaDir}security/OAuth2AuthenticationSuccessHandler.java`);
-
-    generator.removeFolder(`${CLIENT_MAIN_SRC_DIR}app/shared/layout/header/menus`);
-    generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/app/shared/layout/header/menus`);
-  }
-  if (generator.isJhipsterVersionLessThan('6.1.0')) {
-    generator.config.delete('blueprint');
-    generator.config.delete('blueprintVersion');
-  }
-  if (generator.isJhipsterVersionLessThan('6.5.2')) {
-    generator.removeFile(`${testDir}service/mapper/UserMapperIT.java`);
-    generator.removeFile(`${javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaConsumer.java`);
-    generator.removeFile(`${javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaProducer.java`);
-    generator.removeFile(`${testDir}web/rest/ClientForwardControllerIT.java`);
-  }
-  if (generator.isJhipsterVersionLessThan('6.6.1')) {
-    generator.removeFile(`${javaDir}web/rest/errors/EmailNotFoundException.java`);
-    generator.removeFile(`${javaDir}config/DefaultProfileUtil.java`);
-    generator.removeFolder(`${javaDir}service/util`);
-  }
-  if (generator.isJhipsterVersionLessThan('6.8.0')) {
-    generator.removeFile(`${javaDir}security/oauth2/JwtAuthorityExtractor.java`);
-  }
-  if (generator.isJhipsterVersionLessThan('6.8.1')) {
-    generator.removeFile(`${javaDir}config/ReactivePageableHandlerMethodArgumentResolver.java`);
-    generator.removeFile(`${javaDir}config/ReactiveSortHandlerMethodArgumentResolver.java`);
-  }
-  if (generator.isJhipsterVersionLessThan('7.0.0-beta.0')) {
-    generator.removeFile(`${javaDir}config/apidoc/SwaggerConfiguration.java`);
-    generator.removeFile(`${javaDir}config/audit/package-info.java`);
-    generator.removeFile(`${javaDir}config/audit/AuditEventConverter.java`);
-    generator.removeFile(`${javaDir}domain/PersistentAuditEvent.java`);
-    generator.removeFile(`${javaDir}repository/PersistenceAuditEventRepository.java`);
-    generator.removeFile(`${javaDir}repository/CustomAuditEventRepository.java`);
-    generator.removeFile(`${javaDir}service/AuditEventService.java`);
-    generator.removeFile(`${javaDir}web/rest/AuditResource.java`);
-    generator.removeFile(`${testDir}service/AuditEventServiceIT.java`);
-    generator.removeFile(`${testDir}web/rest/AuditResourceIT.java`);
-    generator.removeFile(`${testDir}repository/CustomAuditEventRepositoryIT.java`);
-
-    if (generator.databaseType === 'cassandra') {
-      generator.removeFile(`${javaDir}config/metrics/package-info.java`);
-      generator.removeFile(`${javaDir}config/metrics/CassandraHealthIndicator.java`);
-      generator.removeFile(`${javaDir}config/metrics/JHipsterHealthIndicatorConfiguration.java`);
-      generator.removeFile(`${javaDir}config/cassandra/package-info.java`);
-      generator.removeFile(`${javaDir}config/cassandra/CassandraConfiguration.java`);
-      generator.removeFile(`${testDir}config/CassandraConfigurationIT.java`);
-    }
-    if (generator.searchEngine === 'elasticsearch') {
-      generator.removeFile(`${testDir}config/ElasticsearchTestConfiguration.java`);
-    }
-  }
-  if (generator.isJhipsterVersionLessThan('7.0.0-beta.1')) {
-    generator.removeFile(`${javaDir}config/CloudDatabaseConfiguration.java`);
-  }
-}
-
 /**
  * Upgrade files.
  *

package/generators/client/files-angular.js

@@ -74,6 +74,7 @@ const files = {
       path: ANGULAR_DIR,
       templates: [
         // entities
+        'entities/entity-navbar-items.ts',
         'entities/entity-routing.module.ts',
         // home module
         'home/home.module.ts',
@@ -382,7 +383,11 @@ const files = {
     {
       condition: generator => generator.enableTranslation,
       path: ANGULAR_DIR,
-      templates: ['shared/language/find-language-from-key.pipe.ts', 'shared/language/translate.directive.ts'],
+      templates: [
+        'shared/language/translation.module.ts',
+        'shared/language/find-language-from-key.pipe.ts',
+        'shared/language/translate.directive.ts',
+      ],
     },
   ],
   angularAuthService: [

package/generators/client/files-vue.js

@@ -248,7 +248,7 @@ const vueFiles = {
     {
       condition: generator => !generator.skipUserManagement || generator.authenticationType === OAUTH2,
       path: VUE_DIR,
-      templates: ['entities/user/user.oauth2.service.ts'],
+      templates: ['entities/user/user.service.ts'],
     },
   ],
   clientTestConfig: [
@@ -368,6 +368,10 @@ function cleanup() {
     this.removeFile('webpack/utils.js');
     this.removeFile('webpack/loader.conf.js');
   }
+
+  if (this.isJhipsterVersionLessThan('7.4.2')) {
+    this.removeFile(`${VUE_DIR}entities/user/user.oauth2.service.ts`);
+  }
 }
 
 function writeFiles() {

package/generators/client/index.js

@@ -391,7 +391,8 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
       microfrontend() {
         if (!this.microfrontend) return;
         if (this.clientFrameworkAngular) {
-          this.addWebpackConfig("require('./webpack.microfrontend')(config, options, targetOptions)");
+          const conditional = this.applicationTypeMicroservice ? "targetOptions.target === 'serve' ? {} : " : '';
+          this.addWebpackConfig(`${conditional}require('./webpack.microfrontend')(config, options, targetOptions)`);
         } else if (this.clientFrameworkVue) {
           this.addWebpackConfig("require('./webpack.microfrontend')({ serve: options.env.WEBPACK_SERVE })");
         } else {

package/generators/client/templates/angular/angular.json.ejs

@@ -126,6 +126,11 @@
   },
   "defaultProject": "<%= dasherizedBaseName %>",
   "cli": {
+    "cache": {
+      "enabled": true,
+      "path": "./<%= BUILD_DIR %>",
+      "environment": "all"
+    },
     "packageManager": "<%= clientPackageManager %>"
   }
 }

package/generators/client/templates/angular/jest.conf.js.ejs

@@ -22,6 +22,8 @@ const { compilerOptions: { paths = {}, baseUrl = './' } } = require('./tsconfig.
 const environment = require('./webpack/environment');
 
 module.exports = {
+  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$|dayjs/esm)'],
+  resolver: 'jest-preset-angular/build/resolvers/ng-jest-resolver.js',
   globals: {
     ...environment,
   },

package/generators/client/templates/angular/package.json

@@ -1,48 +1,48 @@
 {
   "dependencies": {
-    "@angular/common": "12.2.12",
+    "@angular/common": "13.1.1",
     "bootstrap": "4.6.1",
-    "@fortawesome/angular-fontawesome": "0.9.0",
+    "@fortawesome/angular-fontawesome": "0.10.1",
     "@fortawesome/fontawesome-svg-core": "1.2.36",
     "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@ng-bootstrap/ng-bootstrap": "10.0.0",
-    "@ngx-translate/core": "13.0.0",
-    "@ngx-translate/http-loader": "6.0.0",
-    "ngx-cookie-service": "12.0.3",
+    "@ng-bootstrap/ng-bootstrap": "11.0.0",
+    "@ngx-translate/core": "14.0.0",
+    "@ngx-translate/http-loader": "7.0.0",
+    "ngx-cookie-service": "13.1.2",
     "ngx-infinite-scroll": "10.0.1",
-    "ngx-webstorage": "8.0.0",
-    "rxjs": "6.6.7",
-    "swagger-ui-dist": "4.1.2",
+    "ngx-webstorage": "9.0.0",
+    "rxjs": "7.5.1",
+    "swagger-ui-dist": "4.1.3",
     "tslib": "2.3.1",
     "zone.js": "0.11.4"
   },
   "devDependencies": {
-    "@angular/cli": "12.2.12",
-    "@angular-builders/custom-webpack": "12.1.3",
-    "@angular-builders/jest": "12.1.2",
-    "@angular-eslint/eslint-plugin": "12.7.0",
-    "@types/node": "16.11.11",
-    "@types/jest": "27.0.3",
-    "@typescript-eslint/eslint-plugin": "5.5.0",
+    "@angular/cli": "13.1.2",
+    "@angular-builders/custom-webpack": "13.0.0",
+    "@angular-builders/jest": "13.0.2",
+    "@angular-eslint/eslint-plugin": "13.0.1",
+    "@types/node": "16.11.17",
+    "@types/jest": "27.4.0",
+    "@typescript-eslint/eslint-plugin": "5.8.1",
     "browser-sync": "2.27.7",
     "browser-sync-webpack-plugin": "2.3.0",
-    "copy-webpack-plugin": "10.0.0",
-    "eslint": "7.32.0",
+    "copy-webpack-plugin": "10.2.0",
+    "eslint": "8.5.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-webpack-plugin": "3.1.1",
     "folder-hash": "4.0.1",
-    "jest": "27.4.3",
-    "jest-preset-angular": "10.1.0",
+    "jest": "27.4.5",
+    "jest-preset-angular": "11.0.1",
     "jest-date-mock": "1.0.8",
     "jest-junit": "13.0.0",
     "jest-sonar-reporter": "2.0.0",
     "merge-jsons-webpack-plugin": "2.0.1",
     "rimraf": "3.0.2",
-    "ts-jest": "27.0.7",
-    "typescript": "4.3.5",
-    "webpack": "5.50.0",
+    "ts-jest": "27.1.2",
+    "typescript": "4.5.4",
+    "webpack": "5.65.0",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-merge": "5.8.0",
-    "webpack-notifier": "1.14.1"
+    "webpack-notifier": "1.15.0"
   }
 }

package/generators/client/templates/angular/package.json.ejs

@@ -125,11 +125,13 @@
     "rimraf": "<%= dependabotPackageJson.devDependencies['rimraf'] %>",
     "ts-jest": "<%= dependabotPackageJson.devDependencies['ts-jest'] %>",
     "typescript": "<%= dependabotPackageJson.devDependencies['typescript'] %>",
-    "webpack": "<%= dependabotPackageJson.devDependencies['webpack'] %>",
     "webpack-bundle-analyzer": "<%= dependabotPackageJson.devDependencies['webpack-bundle-analyzer'] %>",
     "webpack-merge": "<%= dependabotPackageJson.devDependencies['webpack-merge'] %>",
     "webpack-notifier": "<%= dependabotPackageJson.devDependencies['webpack-notifier'] %>"
   },
+  "overrides": {
+    "webpack": "<%= dependabotPackageJson.devDependencies['webpack'] %>"
+  },
   "engines": {
     "node": ">=<%= NODE_VERSION %>"
   },

package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.ts.ejs

@@ -33,9 +33,9 @@ export class ActivateComponent implements OnInit {
   constructor(private activateService: ActivateService, private route: ActivatedRoute) {}
 
   ngOnInit(): void {
-    this.route.queryParams.pipe(mergeMap(params => this.activateService.get(params.key))).subscribe(
-      () => this.success = true,
-      () => this.error = true
-    );
+    this.route.queryParams.pipe(mergeMap(params => this.activateService.get(params.key))).subscribe({
+      next: () => this.success = true,
+      error: () => this.error = true
+    });
   }
 }

package/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs

@@ -33,7 +33,7 @@ export class PasswordStrengthBarComponent {
     const regex = /[$-/:-?{-~!"^_`[\]]/g; // "
     const lowerLetters = /[a-z]+/.test(p);
     const upperLetters = /[A-Z]+/.test(p);
-    const numbers = /[0-9]+/.test(p);
+    const numbers = /\d+/.test(p);
     const symbols = regex.test(p);
 
     const flags = [lowerLetters, upperLetters, numbers, symbols];

package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.ts.ejs

@@ -54,10 +54,10 @@ export class PasswordComponent implements OnInit {
     if (newPassword !== this.passwordForm.get(['confirmPassword'])!.value) {
       this.doNotMatch = true;
     } else {
-      this.passwordService.save(newPassword, this.passwordForm.get(['currentPassword'])!.value).subscribe(
-        () => this.success = true,
-        () => this.error = true
-      );
+      this.passwordService.save(newPassword, this.passwordForm.get(['currentPassword'])!.value).subscribe({
+        next: () => this.success = true,
+        error: () => this.error = true
+      });
     }
   }
 }

package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs

@@ -68,10 +68,10 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
     if (newPassword !== confirmPassword) {
       this.doNotMatch = true;
     } else {
-      this.passwordResetFinishService.save(this.key, newPassword).subscribe(
-        () => this.success = true,
-        () => this.error = true
-      );
+      this.passwordResetFinishService.save(this.key, newPassword).subscribe({
+        next: () => this.success = true,
+        error: () => this.error = true
+      });
     }
   }
 }

package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs

@@ -16,16 +16,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (enableTranslation) { _%>
-jest.mock('@ngx-translate/core');
-<%_ } _%>
-
 import { ComponentFixture, TestBed, waitForAsync, inject, tick, fakeAsync } from '@angular/core/testing';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormBuilder } from '@angular/forms';
 import { of, throwError } from 'rxjs';
 <%_ if (enableTranslation) { _%>
-import { TranslateService } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 <%_ } _%>
 
 import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from 'app/config/error.constants';
@@ -40,9 +36,14 @@ describe('RegisterComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
+        imports: [
+<%_ if (enableTranslation) { _%>
+          TranslateModule.forRoot(),
+<%_ } _%>
+          HttpClientTestingModule
+        ],
         declarations: [RegisterComponent],
-        providers: [FormBuilder<% if (enableTranslation) { %>, TranslateService<% } %>],
+        providers: [FormBuilder],
       })
         .overrideTemplate(RegisterComponent, '')
         .compileComponents();
@@ -67,10 +68,10 @@ describe('RegisterComponent', () => {
 
   it('should update success to true after creating an account', inject(
     [RegisterService<% if (enableTranslation) { %>, TranslateService<% } %>],
-    fakeAsync((service: RegisterService<% if (enableTranslation) { %>, mockLanguageService: TranslateService<% } %>) => {
+    fakeAsync((service: RegisterService<% if (enableTranslation) { %>, mockTranslateService: TranslateService<% } %>) => {
       jest.spyOn(service, 'save').mockReturnValue(of({}));
 <%_ if (enableTranslation) { _%>
-      mockLanguageService.currentLang = '<%= nativeLanguage %>';
+      mockTranslateService.currentLang = '<%= nativeLanguage %>';
 <%_ } _%>
       comp.registerForm.patchValue({
         password: 'password',

package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs

@@ -75,7 +75,7 @@ export class RegisterComponent implements AfterViewInit {
       const email = this.registerForm.get(['email'])!.value;
       this.registerService
         .save({ login, email, password, langKey: <% if (enableTranslation) { %>this.translateService.currentLang<% } else { %>'en'<% } %> })
-        .subscribe(() => (this.success = true), response => this.processError(response));
+        .subscribe({ next: () => (this.success = true), error: response => this.processError(response)});
     }
   }
 

package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs

@@ -16,9 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (enableTranslation) { _%>
-jest.mock('@ngx-translate/core');
-<%_ } _%>
 jest.mock('app/core/auth/account.service');
 
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
@@ -26,7 +23,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormBuilder } from '@angular/forms';
 import { throwError, of } from 'rxjs';
 <%_ if (enableTranslation) { _%>
-import { TranslateService } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { AccountService } from 'app/core/auth/account.service';
@@ -52,9 +49,14 @@ describe('SettingsComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
+        imports: [
+<%_ if (enableTranslation) { _%>
+          TranslateModule.forRoot(),
+<%_ } _%>
+          HttpClientTestingModule
+        ],
         declarations: [SettingsComponent],
-        providers: [FormBuilder<% if (enableTranslation) { %>, TranslateService<% } %>, AccountService],
+        providers: [FormBuilder, AccountService],
       })
         .overrideTemplate(SettingsComponent, '')
         .compileComponents();

package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs

@@ -45,14 +45,14 @@ export class HealthComponent implements OnInit {
   }
 
   refresh(): void {
-    this.healthService.checkHealth().subscribe(
-      health => (this.health = health),
-      (error: HttpErrorResponse) => {
+    this.healthService.checkHealth().subscribe({
+      next: health => (this.health = health),
+      error: (error: HttpErrorResponse) => {
         if (error.status === 503) {
           this.health = error.error;
         }
       }
-    );
+    });
   }
 
   showHealth(health: { key: string; value: HealthDetails }): void {

package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs

@@ -19,13 +19,13 @@
 <%_
 const tsKeyId = generateTestEntityId(user.primaryKey.type);
 _%>
-jest.mock('@angular/router');
 jest.mock('app/core/auth/account.service');
 
 import { ComponentFixture, TestBed, waitForAsync, inject, fakeAsync, tick } from '@angular/core/testing';
 import { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 
 import { UserManagementService } from '../service/user-management.service';
@@ -53,9 +53,9 @@ describe('User Management Component', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
+        imports: [HttpClientTestingModule, RouterTestingModule.withRoutes([])],
         declarations: [UserManagementComponent],
-        providers: [Router, { provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService],
+        providers: [{ provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService],
       })
         .overrideTemplate(UserManagementComponent, '')
         .compileComponents();