generator-jhipster 7.9.0 → 7.9.3

package/cli/environment-builder.js

@@ -20,6 +20,7 @@ const assert = require('assert');
 const chalk = require('chalk');
 const _ = require('lodash');
 const path = require('path');
+const { existsSync } = require('fs');
 const Environment = require('yeoman-environment');
 const { CLI_NAME, logger } = require('./utils');
 const { loadYoRc, packageNameToNamespace } = require('../generators/utils');
@@ -88,7 +89,7 @@ module.exports = class EnvironmentBuilder {
   }
 
   prepare({ blueprints, lookups } = {}) {
-    this._lookupJHipster()._loadBlueprints(blueprints)._lookups(lookups)._lookupBlueprints()._loadSharedOptions();
+    this._lookupJHipster()._lookupLocalBlueprint()._loadBlueprints(blueprints)._lookups(lookups)._lookupBlueprints()._loadSharedOptions();
     return this;
   }
 
@@ -125,6 +126,19 @@ module.exports = class EnvironmentBuilder {
     return this;
   }
 
+  _lookupLocalBlueprint() {
+    const localBlueprintPath = path.join(process.cwd(), '.blueprint');
+    if (existsSync(localBlueprintPath)) {
+      // Register jhipster generators.
+      const generators = this.env.lookup({ packagePaths: [localBlueprintPath], lookups: ['.'] });
+      if (generators.length > 0) {
+        this.env.alias(/^@jhipster\/jhipster-local(:(.*))?$/, '.blueprint$1');
+        this.env.sharedOptions.localBlueprint = true;
+      }
+    }
+    return this;
+  }
+
   _lookups(lookups = []) {
     lookups = [].concat(lookups);
     lookups.forEach(lookup => {

package/generators/app/index.js

@@ -301,6 +301,11 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
       type: Boolean,
     });
 
+    this.option('auto-crlf', {
+      desc: 'Detect line endings',
+      type: Boolean,
+    });
+
     // Just constructing help, stop here
     if (this.options.help) {
       return;
@@ -407,6 +412,12 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
             this.jhipsterConfig.clientFramework === CLIENT_FRAMEWORK_NO;
           this.jhipsterConfig.withAdminUi = false;
           this.jhipsterConfig.skipUserManagement = true;
+        } else {
+          this.jhipsterConfig.skipClient = this.jhipsterConfig.skipClient || this.jhipsterConfig.clientFramework === CLIENT_FRAMEWORK_NO;
+        }
+
+        if (this.jhipsterConfig.skipClient) {
+          this.jhipsterConfig.clientFramework = CLIENT_FRAMEWORK_NO;
         }
 
         // Set app defaults
@@ -441,7 +452,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
         if (!this.jhipsterConfig.skipServer) {
           await this.composeWithJHipster(GENERATOR_SERVER, true);
         }
-        if (!this.jhipsterConfig.skipClient) {
+        if (this.jhipsterConfig.clientFramework !== CLIENT_FRAMEWORK_NO) {
           await this.composeWithJHipster(GENERATOR_CLIENT, true);
         }
         if (!this.configOptions.skipI18n) {

package/generators/bootstrap/index.js

@@ -25,6 +25,9 @@ const {
   patternFilter,
   patternSpy,
 } = require('yeoman-environment/transform');
+const { transform } = require('p-transform');
+const { stat } = require('fs/promises');
+const { isBinaryFile } = require('isbinaryfile');
 
 const { hasState, setModifiedFileState } = State;
 
@@ -44,6 +47,7 @@ const { prepareFieldForTemplates } = require('../../utils/field');
 const { createUserEntity } = require('../../utils/user');
 const { OAUTH2 } = require('../../jdl/jhipster/authentication-types');
 const { CommonDBTypes } = require('../../jdl/jhipster/field-types');
+const { detectCrLf, normalizeLineEndings } = require('../utils');
 
 const { LONG: TYPE_LONG } = CommonDBTypes;
 
@@ -161,7 +165,7 @@ module.exports = class extends BaseGenerator {
    */
   async _commitSharedFs(stream = this.env.sharedFs.stream(), skipPrettier = this.options.skipPrettier) {
     const { skipYoResolve } = this.options;
-    const { withGeneratedFlag } = this.jhipsterConfig;
+    const { withGeneratedFlag, autoCrlf } = this.jhipsterConfig;
 
     // JDL writes directly to disk, set the file as modified so prettier will be applied
     const { upgradeCommand, ignoreErrors } = this.options;
@@ -199,6 +203,33 @@ module.exports = class extends BaseGenerator {
         file.conflicter = 'force';
       }, '**/.jhipster/*.json').name('jhipster:config-files:force');
 
+    const convertToCRLF = () =>
+      transform(async file => {
+        if (!file.contents) {
+          return file;
+        }
+        if (await isBinaryFile(file.contents)) {
+          return file;
+        }
+        const fstat = await stat(file.path);
+        if (!fstat.isFile()) {
+          return file;
+        }
+        const attributes = Object.fromEntries(
+          (await this.createGit().raw('check-attr', 'binary', 'eol', '--', file.path))
+            .split(/\r\n|\r|\n/)
+            .map(attr => attr.split(':'))
+            .map(([_file, attr, value]) => [attr, value])
+        );
+        if (attributes.binary === 'set' || attributes.eol === 'lf') {
+          return file;
+        }
+        if (attributes.eol === 'crlf' || (await detectCrLf(file.path))) {
+          file.contents = Buffer.from(normalizeLineEndings(file.contents.toString(), '\r\n'));
+        }
+        return file;
+      }, 'jhipster:crlf');
+
     const transformStreams = [
       // multi-step changes the file path, should be executed earlier in the pipeline
       new MultiStepTransform(),
@@ -207,6 +238,7 @@ module.exports = class extends BaseGenerator {
       createForceWriteConfigFiles(),
       ...(withGeneratedFlag ? [generatedAnnotationTransform(this)] : []),
       ...(skipPrettier ? [] : [createApplyPrettierTransform()]),
+      ...(autoCrlf ? [convertToCRLF()] : []),
       createConflicterCheckTransform(this.env.conflicter, conflicterStatus),
       createConflicterStatusTransform(),
     ];

package/generators/ci-cd/templates/circle.yml.ejs

@@ -19,21 +19,11 @@
 version: 2.1
 jobs:
     build:
-        docker:
-            - image: jhipster/jhipster:v<%= jhipsterVersion %>
+        machine:
+            image: ubuntu-2004:current
+        resource_class: large
         steps:
             - checkout
-            - setup_remote_docker:
-                version: 19.03.13
-            - run:
-                name: Install docker and docker-compose
-                command: |
-                    echo jhipster | sudo -S apt update
-                    echo jhipster | sudo -S apt install -y docker.io
-                    echo jhipster | sudo -S curl -Lo /usr/local/bin/docker-compose $(curl -s https://api.github.com/repos/docker/compose/releases/latest | grep "browser_download_url.*docker-compose-Linux" | cut -d ':' -f 2,3 | tr -d \" | tr -d ' ')
-                    echo jhipster | sudo -S chmod +x /usr/local/bin/docker-compose
-                    docker version
-                    docker-compose version
             # Download and cache dependencies
             - restore_cache:
                 keys:

package/generators/client/files-angular.js

@@ -270,7 +270,7 @@ const files = {
       ],
     },
     {
-      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType,
+      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryAny,
       path: ANGULAR_DIR,
       templates: [
         'admin/gateway/gateway.route.ts',

package/generators/client/files-react.js

@@ -76,7 +76,7 @@ const files = {
     {
       condition: generator => generator.enableTranslation,
       path: REACT_DIR,
-      templates: ['config/translation.ts', 'config/translation-middleware.ts'],
+      templates: ['config/translation.ts'],
     },
     {
       condition: generator => generator.websocket === SPRING_WEBSOCKET,
@@ -199,7 +199,7 @@ const files = {
       ],
     },
     {
-      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType,
+      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryAny,
       path: REACT_DIR,
       templates: ['modules/administration/gateway/gateway.tsx'],
     },
@@ -359,6 +359,9 @@ function cleanup() {
     this.removeFile(`${CLIENT_MAIN_SRC_DIR}app/shared/error/error-boundary-route.tsx`);
     this.removeFile(`${CLIENT_MAIN_SRC_DIR}app/shared/error/error-boundary-route.spec.tsx`);
   }
+  if (this.isJhipsterVersionLessThan('7.9.3')) {
+    this.removeFile(`${CLIENT_MAIN_SRC_DIR}app/config/translation-middleware.ts`);
+  }
 }
 
 function writeFiles() {

package/generators/client/files-vue.js

@@ -238,7 +238,7 @@ const vueFiles = {
       ],
     },
     {
-      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType,
+      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryAny,
       path: VUE_DIR,
       templates: ['admin/gateway/gateway.vue', 'admin/gateway/gateway.component.ts', 'admin/gateway/gateway.service.ts'],
     },
@@ -267,6 +267,7 @@ const vueFiles = {
         'spec/app/shared/alert/alert.service.spec.ts',
         'spec/app/shared/config/axios-interceptor.spec.ts',
         'spec/app/shared/data/data-utils.service.spec.ts',
+        'spec/app/shared/sort/sorts.spec.ts',
       ],
     },
     {
@@ -329,7 +330,7 @@ const vueFiles = {
       ],
     },
     {
-      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType,
+      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryAny,
       path: CLIENT_TEST_SRC_DIR,
       templates: ['spec/app/admin/gateway/gateway.component.spec.ts'],
     },

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

@@ -33,10 +33,13 @@ module.exports = {
   cacheDirectory: '<rootDir>/<%= BUILD_DIR %>jest-cache',
   coverageDirectory: '<rootDir>/<%= BUILD_DIR %>test-results/',
   moduleNameMapper: pathsToModuleNameMapper(paths, { prefix: `<rootDir>/${baseUrl}/` }),
-  reporters: ['default', ['jest-junit', { outputDirectory: '<rootDir>/<%= BUILD_DIR %>test-results/', outputName: 'TESTS-results-jest.xml' }]],
-  testResultsProcessor: 'jest-sonar-reporter',
+  reporters: [
+    'default',
+    ['jest-junit', { outputDirectory: '<rootDir>/<%= BUILD_DIR %>test-results/', outputName: 'TESTS-results-jest.xml' }],
+    ['jest-sonar', { outputDirectory: './<%= BUILD_DIR %>test-results/jest', outputName: 'TESTS-results-sonar.xml' }],
+  ],
   testMatch: ['<rootDir>/<%= CLIENT_MAIN_SRC_DIR %>app/**/@(*.)@(spec.ts)'],
   testEnvironmentOptions: {
-    url: 'http://localhost/',
+    url: 'https://jhipster.tech',
   },
 };

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

@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "@angular/common": "14.1.0",
+    "@angular/common": "14.2.0",
     "@fortawesome/angular-fontawesome": "0.11.1",
-    "@fortawesome/fontawesome-svg-core": "6.1.2",
-    "@fortawesome/free-solid-svg-icons": "6.1.2",
+    "@fortawesome/fontawesome-svg-core": "6.2.0",
+    "@fortawesome/free-solid-svg-icons": "6.2.0",
     "@ng-bootstrap/ng-bootstrap": "13.0.0",
     "@ngx-translate/core": "14.0.0",
     "@ngx-translate/http-loader": "7.0.0",
-    "@popperjs/core": "2.11.5",
+    "@popperjs/core": "2.11.6",
     "bootstrap": "5.2.0",
     "bootswatch": "5.2.0",
     "ngx-cookie-service": "14.0.1",
@@ -18,32 +18,32 @@
     "zone.js": "0.11.6"
   },
   "devDependencies": {
-    "@angular/cli": "14.1.0",
-    "@angular-builders/custom-webpack": "14.0.0",
-    "@angular-builders/jest": "14.0.0",
-    "@angular-eslint/eslint-plugin": "14.0.2",
-    "@types/node": "16.11.47",
-    "@types/jest": "28.1.6",
-    "@typescript-eslint/eslint-plugin": "5.31.0",
+    "@angular/cli": "14.2.1",
+    "@angular-builders/custom-webpack": "14.0.1",
+    "@angular-builders/jest": "14.0.1",
+    "@angular-eslint/eslint-plugin": "14.0.3",
+    "@types/node": "16.11.56",
+    "@types/jest": "28.1.8",
+    "@typescript-eslint/eslint-plugin": "5.36.1",
     "browser-sync": "2.27.10",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "11.0.0",
-    "eslint": "8.20.0",
+    "eslint": "8.23.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-webpack-plugin": "3.2.0",
     "folder-hash": "4.0.2",
     "jest": "28.1.3",
-    "jest-preset-angular": "12.2.0",
+    "jest-preset-angular": "12.2.2",
     "jest-date-mock": "1.0.8",
-    "jest-junit": "14.0.0",
-    "jest-sonar-reporter": "2.0.0",
+    "jest-junit": "14.0.1",
+    "jest-sonar": "0.2.12",
     "merge-jsons-webpack-plugin": "2.0.1",
     "postcss-rtlcss": "3.7.2",
     "rimraf": "3.0.2",
-    "ts-jest": "28.0.7",
-    "typescript": "4.7.4",
+    "ts-jest": "28.0.8",
+    "typescript": "4.8.2",
     "webpack": "5.74.0",
-    "webpack-bundle-analyzer": "4.5.0",
+    "webpack-bundle-analyzer": "4.6.1",
     "webpack-merge": "5.8.0",
     "webpack-notifier": "1.15.0"
   }

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

@@ -120,7 +120,7 @@
     "jest-preset-angular": "<%= dependabotPackageJson.devDependencies['jest-preset-angular'] %>",
     "jest-date-mock": "<%= dependabotPackageJson.devDependencies['jest-date-mock'] %>",
     "jest-junit": "<%= dependabotPackageJson.devDependencies['jest-junit'] %>",
-    "jest-sonar-reporter": "<%= dependabotPackageJson.devDependencies['jest-sonar-reporter'] %>",
+    "jest-sonar": "<%= dependabotPackageJson.devDependencies['jest-sonar'] %>",
     "prettier": "<%= dependabotPackageJson.devDependencies['prettier'] %>",
     "prettier-plugin-packagejson": "<%= dependabotPackageJson.devDependencies['prettier-plugin-packagejson'] %>",
 <%_ if (enableI18nRTL) { _%>
@@ -144,8 +144,8 @@
     "default_environment": "prod"
   },
   "scripts": {
-    "prettier:check": "prettier --check \"{,src/**/,webpack/}*.{<%= getPrettierExtensions() %>}\"",
-    "prettier:format": "prettier --write \"{,src/**/,webpack/}*.{<%= getPrettierExtensions() %>}\"",
+    "prettier:check": "prettier --check \"{,src/**/,webpack/,.blueprint/**/}*.{<%= getPrettierExtensions() %>}\"",
+    "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= getPrettierExtensions() %>}\"",
     "lint": "eslint . --ext .js,.ts",
     "lint:fix": "<%= clientPackageManager %> run lint -- --fix",
     "cleanup": "rimraf <%= DIST_DIR %>",
@@ -191,9 +191,5 @@
     "webapp:dev-ssl": "ng serve --ssl",
     "webapp:prod": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:prod",
     "webapp:test": "<%= clientPackageManager %> run test --"
-  },
-  "jestSonar": {
-    "reportPath": "<%= BUILD_DIR %>test-results/jest",
-    "reportFile": "TESTS-results-sonar.xml"
   }
 }

package/generators/client/templates/angular/src/main/webapp/app/admin/admin-routing.module.ts.ejs

@@ -55,7 +55,7 @@ import { RouterModule } from '@angular/router';
         loadChildren: () => import('./metrics/metrics.module').then(m => m.MetricsModule),
       },
       <%_ } _%>
-      <%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+      <%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
       {
         path: 'gateway',
         loadChildren: () => import('./gateway/gateway.module').then(m => m.GatewayModule),

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

@@ -22,7 +22,7 @@ export type HealthKey =
   <%_ if (messageBrokerKafka) { _%>
   | 'binders'
   <%_ } _%>
-  <%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
+  <%_ if (applicationTypeGateway || serviceDiscoveryAny) { _%>
   | 'discoveryComposite'
   | 'refreshScope'
   | 'clientConfigServer'

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

@@ -23,14 +23,17 @@ import { ActivatedRoute } from '@angular/router';
 <%_ if (enableTranslation) { _%>
 import { LANGUAGES } from 'app/config/language.constants';
 <%_ } _%>
-import { User } from '../user-management.model';
+import { IUser } from '../user-management.model';
 import { UserManagementService } from '../service/user-management.service';
 
-const initialUser: User = {
+const userTemplate = {} as IUser;
+
+const newUser: IUser = {
 <%_ if (enableTranslation) { _%>
   langKey: '<%= nativeLanguage %>',
 <%_ } _%>
-};
+  activated: true,
+} as IUser;
 
 @Component({
   selector: '<%= jhiPrefixDashed %>-user-mgmt-update',
@@ -44,8 +47,8 @@ export class UserManagementUpdateComponent implements OnInit {
   isSaving = false;
 
   editForm = new FormGroup({
-    id: new FormControl(initialUser.id),
-    login: new FormControl(initialUser.login, {
+    id: new FormControl(userTemplate.id),
+    login: new FormControl(userTemplate.login, {
       nonNullable: true,
       validators: [
         Validators.required,
@@ -54,17 +57,17 @@ export class UserManagementUpdateComponent implements OnInit {
         Validators.pattern('^[a-zA-Z0-9!$&*+=?^_`{|}~.-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$|^[_.@A-Za-z0-9-]+$'),
       ],
     }),
-    firstName: new FormControl(initialUser.firstName, { validators: [Validators.maxLength(50)] }),
-    lastName: new FormControl(initialUser.lastName, { validators: [Validators.maxLength(50)] }),
-    email: new FormControl(initialUser.email, {
+    firstName: new FormControl(userTemplate.firstName, { validators: [Validators.maxLength(50)] }),
+    lastName: new FormControl(userTemplate.lastName, { validators: [Validators.maxLength(50)] }),
+    email: new FormControl(userTemplate.email, {
       nonNullable: true,
       validators: [Validators.minLength(5), Validators.maxLength(254), Validators.email],
     }),
-    activated: new FormControl(initialUser.activated, { nonNullable: true }),
+    activated: new FormControl(userTemplate.activated, { nonNullable: true }),
 <%_ if (enableTranslation) { _%>
-    langKey: new FormControl(initialUser.langKey, { nonNullable: true }),
+    langKey: new FormControl(userTemplate.langKey, { nonNullable: true }),
 <%_ } _%>
-    authorities: new FormControl(initialUser.authorities, { nonNullable: true }),
+    authorities: new FormControl(userTemplate.authorities, { nonNullable: true }),
   });
 
   constructor(private userService: UserManagementService, private route: ActivatedRoute) {}
@@ -72,10 +75,9 @@ export class UserManagementUpdateComponent implements OnInit {
   ngOnInit(): void {
     this.route.data.subscribe(({ user }) => {
       if (user) {
-        if (user.id === undefined) {
-          user.activated = true;
-        }
-        this.editForm.patchValue(user);
+        this.editForm.reset(user);
+      } else {
+        this.editForm.reset(newUser);
       }
     });
     this.userService.authorities().subscribe(authorities => (this.authorities = authorities));

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

@@ -20,7 +20,7 @@
   const idType = getTypescriptKeyType(user.primaryKey.type);
 _%>
 export interface IUser {
-  id?: <%= idType %> | null;
+  id: <%= idType %> | null;
   login?: string;
   firstName?: string | null;
   lastName?: string | null;
@@ -36,7 +36,7 @@ export interface IUser {
 
 export class User implements IUser {
   constructor(
-    public id?: <%= idType %> | null,
+    public id: <%= idType %> | null,
     public login?: string,
     public firstName?: string | null,
     public lastName?: string | null,

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

@@ -20,22 +20,22 @@ import { Injectable } from '@angular/core';
 import { Resolve, ActivatedRouteSnapshot, Routes } from '@angular/router';
 import { Observable, of } from 'rxjs';
 
-import { User, IUser } from './user-management.model';
+import { IUser } from './user-management.model';
 import { UserManagementService } from './service/user-management.service';
 import { UserManagementComponent } from './list/user-management.component';
 import { UserManagementDetailComponent } from './detail/user-management-detail.component';
 import { UserManagementUpdateComponent } from './update/user-management-update.component';
 
 @Injectable({ providedIn: 'root' })
-export class UserManagementResolve implements Resolve<IUser> {
+export class UserManagementResolve implements Resolve<IUser | null> {
   constructor(private service: UserManagementService) {}
 
-  resolve(route: ActivatedRouteSnapshot): Observable<IUser> {
+  resolve(route: ActivatedRouteSnapshot): Observable<IUser | null> {
     const id = route.params['login'];
     if (id) {
       return this.service.find(id);
     }
-    return of(new User());
+    return of(null);
   }
 }
 

package/generators/client/templates/angular/src/main/webapp/app/core/request/request-util.ts.ejs

@@ -23,8 +23,10 @@ export const createRequestOption = (req?: any): HttpParams => {
 
   if (req) {
     Object.keys(req).forEach(key => {
-      if (key !== 'sort' && req[key] && req[key] !== '') {
-        options = options.set(key, req[key]);
+      if (key !== 'sort' && req[key]) {
+        for (const value of [].concat(req[key]).filter(v => v !== '')) {
+          options = options.append(key, value);
+        }
       }
     });
 

package/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.ts.ejs

@@ -142,6 +142,6 @@ export class DataUtils {
   }
 
   private formatAsBytes(size: number): string {
-    return size.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ' ') + ' bytes';
+    return size.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ' ') + ' bytes'; // NOSONAR
   }
 }

package/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.ejs

@@ -45,7 +45,7 @@ export class ParseLinks {
         throw new Error('section could not be split on ";"');
       }
 
-      const url: string = section[0].replace(/<(.*)>/, '$1').trim();
+      const url: string = section[0].replace(/<(.*)>/, '$1').trim(); // NOSONAR
       const queryString: { [key: string]: string | undefined } = {};
 
       url.replace(

package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs

@@ -99,7 +99,7 @@
           </span>
         </a>
         <ul class="dropdown-menu" ngbDropdownMenu aria-labelledby="admin-menu">
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
           <li>
             <a class="dropdown-item" routerLink="admin/gateway" routerLinkActive="active" (click)="collapseNavbar()">
               <fa-icon icon="road" [fixedWidth]="true"></fa-icon>

package/generators/client/templates/angular/src/main/webapp/app/shared/filter/filter.component.html.ejs

@@ -1,10 +1,12 @@
 <div class="filter-display" *ngIf="filters.hasAnyFilterSet()">
   <span <%= jhiPrefix %>Translate="entity.filters.set"><%- this._getClientTranslation('entity.filters.set') %></span>
-  <fa-icon icon="times" (click)="clearAllFilters()"  title="{{ 'entity.filters.clearAll' | translate }}"></fa-icon >
+  <fa-icon icon="times" (click)="clearAllFilters()" title="<% if (enableTranslation) { %>{{ 'entity.filters.clearAll' | translate }}<% } else { %><%- this._getClientTranslation('entity.filters.clearAll') %><% } %>"></fa-icon>
   <ul>
-    <li *ngFor="let filterOption of filters.filterOptions">
-      <span>{{ filterOption.name }}:</span> {{ filterOption.value }}
-      <fa-icon icon="times" (click)="clearFilter(filterOption.name)" title="{{ 'entity.filters.clear' | translate }}"></fa-icon>
-    </li>
+    <ng-container *ngFor="let filterOption of filters.filterOptions">
+      <li *ngFor="let value of filterOption.values">
+        <span>{{ filterOption.name }}:</span> {{ value }}
+        <fa-icon icon="times" (click)="clearFilter(filterOption.name, value)" title="<% if (enableTranslation) { %>{{ 'entity.filters.clear' | translate }}<% } else { %><%- this._getClientTranslation('entity.filters.clear') %><% } %>"></fa-icon>
+      </li>
+    </ng-container>
   </ul>
-</div>
+</div>

package/generators/client/templates/angular/src/main/webapp/app/shared/filter/filter.component.ts.ejs

@@ -1,23 +1,18 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
-import { IFilterableComponent, IFilterOptions } from './filter.model';
+import { Component, Input } from '@angular/core';
+import { IFilterOptions } from './filter.model';
 
 @Component({
   selector: '<%= jhiPrefixDashed %>-filter',
   templateUrl: './filter.component.html',
 })
-export class FilterComponent implements IFilterableComponent {
-  @Input()
-  filters!: IFilterOptions;
-
-  @Output() filterChange = new EventEmitter<IFilterOptions>();
+export class FilterComponent {
+  @Input() filters!: IFilterOptions;
 
   clearAllFilters(): void {
     this.filters.clear();
-    this.filterChange.emit();
   }
 
-  clearFilter(filterName: string): void {
-    this.filters.removeByName(filterName);
-    this.filterChange.emit();
+  clearFilter(filterName: string, value: string): void {
+    this.filters.removeFilter(filterName, value);
   }
 }