From c83e3c65fd5060c95d3eb9d9877709afa539420f Mon Sep 17 00:00:00 2001
From: Marcelo Shima <marceloshima@gmail.com>
Date: Wed, 31 Jan 2024 14:43:51 -0300
Subject: [PATCH] adjusts

---
 .../_entityFolder_/list/_entityFile_.component.ts.ejs  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs
index 10bf8855a327..bbd3cfcf43fa 100644
--- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs
+++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs
@@ -178,7 +178,7 @@ export class <%= componentName %> implements OnInit {
       if (query && <%= componentName %>.NOT_SORTABLE_FIELDS_AFTER_SEARCH.includes(this.predicate)) {
     <%_ if (notSortableFieldsAfterSearchFieldNames.includes(primaryKey.name)) { _%>
         this.predicate = '';
-    <%_ } else { _%>
+    <%_ } else if (primaryKey.typeLong && primaryKey.autoGenerate) { _%>
         this.predicate = '<%- primaryKey.name %>';
         this.ascending = true;
     <%_ } _%>
@@ -254,9 +254,12 @@ export class <%= componentName %> implements OnInit {
       this.page = +(page ?? 1);
 <%_ } _%>
       const sort = (params.get(SORT) ?? data[ DEFAULT_SORT_DATA ])?.split(',');
-      if (sort) {
+      if (sort && sort.length > 1) {
         this.predicate = sort[ 0 ];
         this.ascending = sort[ 1 ] === ASC;
+      } else {
+        this.predicate = '';
+        this.ascending = undefined;
       }
 <%_ if (jpaMetamodelFiltering && paginationPagination) { _%>
       this.filters.initializeFromParams(params);
@@ -396,11 +399,10 @@ export class <%= componentName %> implements OnInit {
     }
 
     protected getSortQueryParam(predicate = this.predicate, ascending = this.ascending): string[] {
-      const ascendingQueryParam = ascending ? ASC : DESC;
       if (predicate === '' || ascending === undefined) {
         return [];
       } else {
-        return [predicate + ',' + ascendingQueryParam];
+        return [`${predicate},${ascending ? ASC : DESC}`];
       }
     }
 }