Move custom changes to schematic generation

Author: sha4be

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

@@ -4,6 +4,10 @@
   align-items: center;
   max-width: unset;
 
+  .command-bar-number-of-items {
+    display: flex;
+  }
+
   mat-toolbar {
     overflow: hidden;
   }

libs/schematic/generators/ng-generate/components/shared/generators/language/files/__name@dasherize__.translation.json.template

@@ -164,6 +164,8 @@
     "export": "Export",
     "noLink": "No link",
     "toolbar": {
+        "item": "Item",
+        "item.plural": "Items",
         "sorted_tooltip": "Sort data by property",
         "sort_dir_tooltip": "Sort data direction",
         "sort_by": "Sorted by",

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

@@ -6,5 +6,4 @@
 <% } %>
 
 import {AbstractArrayNode, AbstractNode, And, Eq, Limit, Query, QueryStringifier, Sort} from 'rollun-ts-rql';
-// TODO check on working example
-// import {SortOptions} from "rollun-ts-rql/dist/nodes/Sort";
+import {SortOptions} from "rollun-ts-rql/dist/nodes/Sort";

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

@@ -30,14 +30,14 @@ private requestData() {
         const sortProperty = this.filterService.sortedProperty;
         const sortDirection = this.filterService.sortCard === SortCard.ASCENDING ? 1 : -1;
 
-        queryOption.setSort(new Sort({[sortProperty]: sortDirection}));
+        queryOption.setSort(new Sort(<SortOptions>{[sortProperty]: sortDirection}));
       }
     <% } else { %>
         if (this.sort.active) {
           const sortProperty = this.sort.active;
           const sortDirection = this.sort.direction === 'asc' ? 1 : -1;
 
-          queryOption.setSort(new Sort({[sortProperty]: sortDirection}));
+          queryOption.setSort(new Sort(<SortOptions>{[sortProperty]: sortDirection}));
         }
     <% } %>
 
@@ -87,6 +87,8 @@ private requestData() {
     this.requestSubscription = this.tableService.requestData(this.remoteAPI, {query: rqlStringTemp})
         .pipe(
             tap((response: Response<Entity>) => {
+                this.updateHighlightString();
+
                 this.dataLoadError = false;
                 this.totalItems =
                     response.totalItems !== null && response.totalItems !== undefined

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

@@ -32,7 +32,7 @@ import { MatTable, MatTableModule } from '@angular/material/table';
 
 <% if (options.hasFilters || options.hasSearchBar) { %>
     import {<%= options.filterServiceName %>} from './<%= cmpFileName %>-filter.service';
-    import {EsmfChipListComponent, EsmfTableCellComponent} from '@esmf/semantic-ui-schematic';
+    import {EsmfChipListComponent, EsmfTableCellComponent, FilterEnums} from '@esmf/semantic-ui-schematic';
 <% } %>
 
 <% if (options.addCommandBar) { %>
@@ -391,6 +391,10 @@ export class <%= classify(name) %>Component implements OnInit, AfterViewInit, Af
         this.applyFilters();
     }
 
+    public trackBy = (_index: number, item: Entity): string => {
+      return item.toString() + this.highlightString.join();
+    };
+
     rowClicked(row: any, $event: MouseEvent): boolean {
         if (this.highlightSelectedRow) {
             this.checkboxClicked(row);
@@ -542,9 +546,7 @@ export class <%= classify(name) %>Component implements OnInit, AfterViewInit, Af
 
              <% if (options.hasSearchBar) { %>
                  dataTemp = this.filterService.applyStringSearchFilter(dataTemp);
-                this.highlightString = this.filterService.activeFilters
-                    .filter(elem => elem.type === FilterEnums.Search && elem.filterValue !== undefined)
-                    .map(elem => elem.filterValue as string);
+                 this.updateHighlightString();
              <% } %>
 
              <% if (options.isDateQuickFilter) { %>
@@ -697,4 +699,12 @@ export class <%= classify(name) %>Component implements OnInit, AfterViewInit, Af
     private isAvailableDataColumn(column: <%= tableColumnsEnumName %>): boolean {
         return !(Array.isArray(this.hideColumns) && this.hideColumns.includes(column)) && !NON_DATA_COLUMNS.includes(column);
     }
+
+    private updateHighlightString(): void {
+      this.highlightString = this.filterService.activeFilters
+        .filter(({type, filterValue}) => type === FilterEnums.Search && !!filterValue)
+        .map(filter => {
+          return filter.filterValue;
+        });
+    }
 }