Move custom changes to schematic generation. Part 2

Author: sha4be

libs/schematic/generators/ng-generate/components/shared/generators/components/command-bar/files/__name@dasherize__-command-bar.component.html.template

@@ -1,14 +1,14 @@
 <mat-toolbar data-test="toolbar" class="toolbar" #componentsContainer>
     <div *ngIf="isMultipleSelectionEnabled" data-test="toolbar-number-of-items" class="command-bar-number-of-items">{{ selection.selected.length > 0 ? (selection.selected.length + ' / ') : '' }}{{ totalItems }}</div>
     <% if (options.hasSearchBar) { %>
-        <mat-form-field data-test="search-form-field-<%= options.componentType %>" *ngIf="!isInCollapsedMenu('search-form-field-<%= options.componentType %>')" appearance="fill" #toolbarComp>
-          <mat-label data-test="search-label">{{ 'search' | transloco }}</mat-label>
+        <mat-form-field class="search-input" data-test="search-form-field-<%= options.componentType %>" *ngIf="!isInCollapsedMenu('search-form-field-<%= options.componentType %>')" appearance="fill" #toolbarComp>
           <input
             #searchInput
             data-test="search-input"
             matInput
             [formControl]="filterService.searchString"
             type="text"
+            placeholder="{{ 'search' | transloco }}"
             (keyup.enter)="triggerReloadFilter()"
             (focus)="searchFocused = true"
             (blur)="searchFocused = false"/>
@@ -36,8 +36,7 @@
         <% if (options.componentType === 'table' && options.hasSearchBar) { %>
             <ng-container *ngIf="hasAdvancedSearch">
               <mat-form-field data-test="form-field-select" *ngIf="!isInCollapsedMenu('form-field-select')"  appearance="fill" #toolbarComp>
-                <mat-label data-test="select-label">{{ 'advancedSearch' | transloco }}</mat-label>
-                <mat-select data-test="select" [formControl]="filterService.selectedStringColumn">
+                <mat-select data-test="select" [formControl]="filterService.selectedStringColumn" placeholder="{{ 'advancedSearch' | transloco }}">
                   <mat-option [value]="filterService.advancedSearchAllValue">{{ 'allTextFields' | transloco }}</mat-option>
                   <mat-option *ngFor="let searchField of filterService.stringColumns" [value]="searchField">
                     <span>{{ '<%= options.translationPath %>' + searchField + '.preferredName' | transloco }}</span>
@@ -243,8 +242,7 @@
         <% if (options.componentType === 'table' && options.hasSearchBar) { %>
             <ng-container *ngIf="hasAdvancedSearch">
               <mat-form-field data-test="form-field-select" id="form-field-select" *ngIf="!isInCollapsedMenu('form-field-select')"  appearance="fill" #toolbarComp>
-                <mat-label data-test="select-label">{{ 'advancedSearch' | transloco }}</mat-label>
-                <mat-select data-test="select" [formControl]="filterService.selectedStringColumn">
+                <mat-select data-test="select" [formControl]="filterService.selectedStringColumn" placeholder="{{ 'advancedSearch' | transloco }}">
                   <mat-option [value]="filterService.advancedSearchAllValue">{{ 'allTextFields' | transloco }}</mat-option>
                   <mat-option *ngFor="let searchField of filterService.stringColumns" [value]="searchField">
                     <span>{{ '<%= options.translationPath %>' + searchField + '.preferredName' | transloco }}</span>
@@ -261,8 +259,7 @@
     <ng-container *ngIf="hasAdvancedSearch">
       <div mat-menu-item  *ngIf="isInCollapsedMenu('form-field-select')">
         <mat-form-field data-test="form-field-select" id="form-field-select" appearance="fill">
-        <mat-label data-test="select-label">{{ 'advancedSearch' | transloco }}</mat-label>
-          <mat-select data-test="select" [formControl]="filterService.selectedStringColumn">
+          <mat-select data-test="select" [formControl]="filterService.selectedStringColumn" placeholder="{{ 'advancedSearch' | transloco }}">
             <mat-option [value]="filterService.advancedSearchAllValue">{{ 'allTextFields' | transloco }}</mat-option>
             <mat-option *ngFor="let searchField of filterService.stringColumns" [value]="searchField">
             <span>{{ '<%= options.translationPath %>' + searchField + '.preferredName' | transloco }}</span>

libs/schematic/generators/ng-generate/components/shared/methods/remote-handling/requestData.ts.template

@@ -45,9 +45,10 @@ private requestData() {
 
     if (this.customOptionsExtension) this.customOptionsExtension.apply(queryOption);
 
+    /*
     const additionalCondition = new Eq('local', <% if (options.chooseLanguageForSearch) { %>'<%= options.chooseLanguageForSearch.toUpperCase() %>'<% } else { %>'EN'<% } %>);
     queryFilter?.queryNode.subNodes.push(additionalCondition);
-
+    */
     const filterRQLQuery = queryFilter ? QueryStringifier.stringify(queryFilter) : '';
     const optionsRQLQuery = QueryStringifier.stringify(queryOption).replace(/&/g, ',');
 
@@ -60,24 +61,6 @@ private requestData() {
         rqlStringTemp = `${rqlStringTemp}${rqlStringTemp !== '' ? '&' : ''}option=${optionsRQLQuery}`;
     }
 
-    if (!(QueryStringifier as any)['superParseQueryNode']) {
-        (QueryStringifier as any)['superParseQueryNode'] = QueryStringifier['parseQueryNode'];
-    }
-
-    QueryStringifier['parseQueryNode'] = (node?: AbstractNode): string => {
-        let result = (QueryStringifier as any)['superParseQueryNode'](node);
-        if (node instanceof AbstractArrayNode) {
-            const arrayNode = <AbstractArrayNode>node;
-            const encodedValues = arrayNode.values.map(value => QueryStringifier['withType'](QueryStringifier['withEncoding'](value)));
-
-            // ensure outer brackets are not used. valid query ..in(<name>, "value1", "value2", ...)..
-            result = `${QueryStringifier['withEncoding'](arrayNode.name, {isField: true})}(${QueryStringifier['withEncoding'](arrayNode.field, {
-                isField: true,
-            })}, ${encodedValues.join(',')})`;
-        }
-        return result;
-    };
-
     this.rqlString = rqlStringTemp;
 
     if (this.requestSubscription && !this.requestSubscription.closed) {

libs/schematic/generators/ng-generate/components/table/generators/components/table/files/__name@dasherize__.component.ts.template

@@ -704,7 +704,7 @@ export class <%= classify(name) %>Component implements OnInit, AfterViewInit, Af
       this.highlightString = this.filterService.activeFilters
         .filter(({type, filterValue}) => type === FilterEnums.Search && !!filterValue)
         .map(filter => {
-          return filter.filterValue;
+          return filter.filterValue as string;
         });
     }
 }

libs/schematic/package.json

@@ -12,10 +12,12 @@
   "peerDependencies": {
     "@angular/common": "^20.3.0",
     "@angular/core": "^20.3.0",
+    "@angular/cdk": "^20.3.0",
     "@angular/forms": "^20.3.0",
     "@angular/material": "^20.2.0",
     "@jsverse/transloco": "^8.2.0",
-    "@jsverse/transloco-locale": "^8.2.0"
+    "@jsverse/transloco-locale": "^8.2.0",
+    "rollun-ts-rql": "^0.10.0"
   },
   "sideEffects": false,
   "nx-migrations": {

package.json

@@ -33,7 +33,8 @@
     "inquirer-search-list": "^1.2.6",
     "path": "^0.12.7",
     "rxjs": "~7.8.0",
-    "zone.js": "~0.15.0"
+    "zone.js": "~0.15.0",
+    "rollun-ts-rql": "^0.10.0"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~20.3.0",