chore: fix sort unreliability (#715)

Co-authored-by: yannick-aneo <[email protected]>
aneoconsulting · Oct 18, 2023 · f8b24b2 · f8b24b2 · github-actions · Oct 18, 2023
1 parent 8ff7645
commit f8b24b2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/app/components/columns-modify-dialog.component.ts b/src/app/components/columns-modify-dialog.component.ts
@@ -86,13 +86,13 @@ export class ColumnsModifyDialogComponent<T extends object,O extends object> imp
    * Sort the columns alphabetically
    */
   availableColumns(): (keyof T | 'actions')[] {
-    const columns = this.data.availableColumns.filter(column => !column.toString().startsWith('options.')).sort() as (keyof T | 'actions')[];
+    const columns = this.data.availableColumns.filter(column => !column.toString().startsWith('options.')).sort((a, b) => a.toString().localeCompare(b.toString())) as (keyof T | 'actions')[];
 
     return columns;
   }
 
   availableOptionsColumns(): PrefixedOptions<O>[] {
-    const columns = this.data.availableColumns.filter(column => column.toString().startsWith('options.')).sort() as PrefixedOptions<O>[];
+    const columns = this.data.availableColumns.filter(column => column.toString().startsWith('options.')).sort((a, b) => a.toString().localeCompare(b.toString())) as PrefixedOptions<O>[];
 
     return columns;
   }

diff --git a/src/app/components/show-card-content.component.ts b/src/app/components/show-card-content.component.ts
@@ -87,7 +87,7 @@ export class ShowCardContentComponent<T extends object> implements OnChanges {
 
   ngOnChanges() {
     if (this.data) {
-      this.keys = Object.keys(this.data).sort();
+      this.keys = Object.keys(this.data).sort((a, b) => a.toString().localeCompare(b.toString()));
     }
   }
 

diff --git a/src/app/components/view-tasks-by-status-dialog.component.spec.ts b/src/app/components/view-tasks-by-status-dialog.component.spec.ts
@@ -51,7 +51,7 @@ describe('ViewTasksByStatusDialogComponent', () => {
   });
 
   it('should retrieve tasks keys with tasksStatuses', () => {
-    expect(component.tasksStatuses().sort()).toEqual([
+    expect(component.tasksStatuses().sort((a, b) => a.toString().localeCompare(b.toString()))).toEqual([
       TaskStatus.TASK_STATUS_UNSPECIFIED.toString(),
       TaskStatus.TASK_STATUS_DISPATCHED.toString(),
       TaskStatus.TASK_STATUS_CREATING.toString(),
@@ -64,7 +64,7 @@ describe('ViewTasksByStatusDialogComponent', () => {
       TaskStatus.TASK_STATUS_ERROR.toString(),
       TaskStatus.TASK_STATUS_TIMEOUT.toString(),
       TaskStatus.TASK_STATUS_RETRIED.toString()
-    ].sort());
+    ].sort((a, b) => a.toString().localeCompare(b.toString())));
   });
 
   it('should retrieve a label by its corresponding status', () => {

diff --git a/src/app/dashboard/services/dashboard-index.service.ts b/src/app/dashboard/services/dashboard-index.service.ts
@@ -16,8 +16,8 @@ export class DashboardIndexService {
 
   // TODO: move to TasksStatusesService
   statuses(): { value: string, name: string }[] {
-    const values = Object.values(this.#tasksStatusesService.statuses).sort();
-    const keys = Object.keys(this.#tasksStatusesService.statuses).sort();
+    const values = Object.values(this.#tasksStatusesService.statuses).sort((a, b) => a.toString().localeCompare(b.toString()));
+    const keys = Object.keys(this.#tasksStatusesService.statuses).sort((a, b) => a.toString().localeCompare(b.toString()));
     const sortedKeys = values.map((value) => {
       return keys.find((key) => {
         return this.#tasksStatusesService.statuses[Number(key) as TaskStatus] === value;

diff --git a/src/app/settings/index.component.ts b/src/app/settings/index.component.ts
@@ -455,6 +455,6 @@ export class IndexComponent implements OnInit {
   }
 
   #sortKeys(keys: Set<Key>): Set<Key> {
-    return new Set([...keys].sort());
+    return new Set([...keys].sort((a, b) => a.localeCompare(b)));
   }
 }
File	% Stmts	% Branch	% Funcs	% Lines	Uncovered Line #s
All files	88.7	79.7	79.62	88.87
applications/services	100	100	100	100
applications-filters.service.ts	100	100	100	100
components	91.93	94.11	81.25	93.51
actions-toolbar-group.component.ts	100	100	100	100
actions-toolbar.component.ts	100	100	100	100
auto-refresh-button.component.ts	100	100	100	100
auto-refresh-dialog.component.ts	100	100	100	100
columns-button.component.ts	100	100	100	100
columns-modify-dialog.component.ts	26.66	0	0	33.33	65–123
count-tasks-by-status.component.ts	100	50	100	100	48
page-header.component.ts	80	100	0	80	39
page-section-header.component.ts	80	100	0	80	31
page-section.component.ts	100	100	100	100
refresh-button.component.ts	100	100	100	100
share-url.component.ts	92.85	100	75	92.3	37
show-card-content.component.ts	100	100	100	100
spinner.component.ts	100	100	100	100
table-actions-toolbar.component.ts	100	100	100	100
view-tasks-by-status-dialog.component.ts	100	100	100	100
view-tasks-by-status.component.ts	100	100	100	100
components/filters	95	78.94	95.74	94.89
filters-chips.component.ts	100	100	100	100
filters-dialog-and.component.ts	100	100	100	100
filters-dialog-filter-field.component.ts	86.2	75.75	92.3	85.96	99–100, 132, 174, 198–202
filters-dialog-input.component.ts	92.85	63.63	87.5	92.59	73–74
filters-dialog-or.component.ts	100	100	100	100
filters-dialog.component.ts	100	100	100	100
filters-toolbar.component.ts	100	100	100	100
components/navigation	99.44	100	97.36	99.42
add-external-service-dialog.component.ts	100	100	100	100
edit-external-service-dialog.component.ts	100	100	100	100
form-external-service.component.ts	100	100	100	100
manage-external-services-dialog.component.ts	100	100	100	100
navigation.component.ts	98.14	100	88.88	98.11	215
theme-selector.component.ts	100	100	100	100
dashboard	100	100	100	100
index.component.ts	100	100	100	100
dashboard/components	68.1	38.88	45.67	68.24
add-line-dialog.component.ts	55.55	100	0	55.55	27–38
add-statuses-group-dialog.component.ts	45.45	100	0	45.45	29–45
edit-name-line-dialog.component.ts	50	100	0	50	31–46
edit-status-group-dialog.component.ts	41.66	100	0	41.66	30–47
form-name-line.component.ts	47.36	0	0	47.36	57–88
form-statuses-group.component.ts	22.5	0	0	22.5	82–159
line.component.ts	100	100	100	100
manage-groups-dialog.component.ts	100	100	100	100
reorganize-lines-dialog.component.ts	32.43	0	0	34.28	104–160
split-lines-dialog.component.ts	42.85	0	0	42.85	38–61
statuses-group-card.component.ts	100	100	100	100
dashboard/services	52.5	33.33	26.66	52.77
dashboard-index.service.ts	24	0	0	22.72	10–49
dashboard-storage.service.ts	100	100	100	100
services	98.36	95.41	95.6	98.23
auto-refresh.service.ts	100	100	100	100
date-handler.service.ts	100	100	100	100
default-config.service.ts	100	100	100	100
environment.service.ts	80	100	50	75	19
filters.service.ts	100	100	100	100
icons.service.ts	100	100	100	100
navigation.service.ts	100	80	100	100	109
notification.service.ts	100	100	100	100
query-params.service.ts	100	100	100	100
share-url.service.ts	100	100	100	100
storage.service.ts	98.03	100	100	97.95	95
table-storage.service.ts	50	0	0	42.85	11–31
table-url.service.ts	100	100	100	100
table.service.ts	100	100	100	100
tasks-by-status.service.ts	100	100	100	100
user-grpc.service.ts	100	100	100	100
user.service.ts	100	100	100	100
utils.service.ts	100	100	100	100
versions-grpc.service.ts	100	100	100	100
versions.service.ts	100	70	100	100	14, 25, 32
tasks/services	76.76	47.72	82.85	75.78
tasks-filters.service.ts	100	100	100	100
tasks-grpc.service.ts	23.33	0	0	20.68	13–151
tasks-index.service.ts	100	100	100	100
tasks-statuses.service.ts	100	100	100	100
tokens	100	100	100	100
filters.token.ts	100	100	100	100