adapt alphabetical sorting into existing sort service

ls1intum · Jul 20, 2023 · bd113ac · bd113ac
1 parent a947dc3
commit bd113ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/main/webapp/app/lecture/lecture.component.ts b/src/main/webapp/app/lecture/lecture.component.ts
@@ -121,14 +121,7 @@ export class LectureComponent implements OnInit {
     }
 
     sortRows() {
-        //Sort alphabetically for title and description
-        if (this.predicate === 'title')
-            this.filteredLectures = this.filteredLectures.sort((a: Lecture, b: Lecture) => (this.ascending ? a.title!.localeCompare(b.title!) : b.title!.localeCompare(a.title!)));
-        else if (this.predicate === 'description')
-            this.filteredLectures.sort((a: Lecture, b: Lecture) =>
-                this.ascending ? (a.description || '').localeCompare(b.description || '') : (b.description || '').localeCompare(a.description || ''),
-            );
-        else this.sortService.sortByProperty(this.filteredLectures, this.predicate, this.ascending);
+        this.sortService.sortByProperty(this.filteredLectures, this.predicate, this.ascending);
     }
 
     private loadAll() {

diff --git a/src/main/webapp/app/shared/service/sort.service.ts b/src/main/webapp/app/shared/service/sort.service.ts
@@ -87,7 +87,9 @@ export class SortService {
     }
 
     private static compareBasic(valueA: any, valueB: any) {
-        if (valueA === valueB) {
+        if (typeof valueA === 'string' && typeof valueB === 'string') {
+            return valueA.localeCompare(valueB);
+        } else if (valueA === valueB) {
             return 0;
         } else {
             return valueA < valueB ? -1 : 1;