From 4ddb51ba553f7a59445449a6cce60ada976de98d Mon Sep 17 00:00:00 2001 From: _Bastler <_Bastler@bstly.de> Date: Wed, 6 Oct 2021 16:31:00 +0200 Subject: [PATCH] caseinsesitive compare --- src/app/pages/account/aliases/aliases.component.ts | 5 ++++- src/app/pages/account/domains/domains.component.ts | 5 ++++- src/app/ui/permissions/permissions.component.ts | 5 ++++- src/app/ui/profilefields/profilefields.component.ts | 6 ++++-- src/app/ui/quotas/quotas.component.ts | 5 ++++- src/app/ui/servicesgrid/servicesgrid.component.ts | 7 +++++-- src/app/ui/servicestable/servicestable.component.ts | 5 ++++- 7 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/app/pages/account/aliases/aliases.component.ts b/src/app/pages/account/aliases/aliases.component.ts index 698b7a9..45b8327 100644 --- a/src/app/pages/account/aliases/aliases.component.ts +++ b/src/app/pages/account/aliases/aliases.component.ts @@ -124,7 +124,10 @@ export class AliasesComponent implements OnInit { }); } - compare(a: number | string | String, b: number | string | String, isAsc: boolean) { + compare(a: number | string , b: number | string , isAsc: boolean) { + if (typeof a === 'string' && typeof b === 'string') { + return a.localeCompare(b,undefined, { sensitivity: 'accent' } ) * (isAsc ? 1 : -1); + } return (a < b ? -1 : 1) * (isAsc ? 1 : -1); } } diff --git a/src/app/pages/account/domains/domains.component.ts b/src/app/pages/account/domains/domains.component.ts index 2060639..5e32728 100644 --- a/src/app/pages/account/domains/domains.component.ts +++ b/src/app/pages/account/domains/domains.component.ts @@ -126,7 +126,10 @@ export class DomainsComponent implements OnInit { }); } - compare(a: number | string | String, b: number | string | String, isAsc: boolean) { + compare(a: number | string , b: number | string , isAsc: boolean) { + if (typeof a === 'string' && typeof b === 'string') { + return a.localeCompare(b,undefined, { sensitivity: 'accent' } ) * (isAsc ? 1 : -1); + } return (a < b ? -1 : 1) * (isAsc ? 1 : -1); } } diff --git a/src/app/ui/permissions/permissions.component.ts b/src/app/ui/permissions/permissions.component.ts index 99c295c..1b3acaf 100644 --- a/src/app/ui/permissions/permissions.component.ts +++ b/src/app/ui/permissions/permissions.component.ts @@ -37,7 +37,10 @@ export class PermissionsComponent implements OnInit { }); } - compare(a: number | string | String, b: number | string | String, isAsc: boolean) { + compare(a: number | string , b: number | string , isAsc: boolean) { + if (typeof a === 'string' && typeof b === 'string') { + return a.localeCompare(b,undefined, { sensitivity: 'accent' } ) * (isAsc ? 1 : -1); + } return (a < b ? -1 : 1) * (isAsc ? 1 : -1); } } diff --git a/src/app/ui/profilefields/profilefields.component.ts b/src/app/ui/profilefields/profilefields.component.ts index d38d45e..f94003e 100644 --- a/src/app/ui/profilefields/profilefields.component.ts +++ b/src/app/ui/profilefields/profilefields.component.ts @@ -70,11 +70,13 @@ export class ProfileFieldsComponent implements OnInit { }); } - compare(a: number | string | String, b: number | string | String, isAsc: boolean) { + compare(a: number | string , b: number | string , isAsc: boolean) { + if (typeof a === 'string' && typeof b === 'string') { + return a.localeCompare(b,undefined, { sensitivity: 'accent' } ) * (isAsc ? 1 : -1); + } return (a < b ? -1 : 1) * (isAsc ? 1 : -1); } - openEdit(profileField) { const resetProfileField = JSON.parse(JSON.stringify(profileField)); diff --git a/src/app/ui/quotas/quotas.component.ts b/src/app/ui/quotas/quotas.component.ts index dbed9f4..21223a7 100644 --- a/src/app/ui/quotas/quotas.component.ts +++ b/src/app/ui/quotas/quotas.component.ts @@ -35,7 +35,10 @@ export class QuotasComponent implements OnInit { }); } - compare(a: number | string | String, b: number | string | String, isAsc: boolean) { + compare(a: number | string , b: number | string , isAsc: boolean) { + if (typeof a === 'string' && typeof b === 'string') { + return a.localeCompare(b,undefined, { sensitivity: 'accent' } ) * (isAsc ? 1 : -1); + } return (a < b ? -1 : 1) * (isAsc ? 1 : -1); } diff --git a/src/app/ui/servicesgrid/servicesgrid.component.ts b/src/app/ui/servicesgrid/servicesgrid.component.ts index 93d6066..df55603 100644 --- a/src/app/ui/servicesgrid/servicesgrid.component.ts +++ b/src/app/ui/servicesgrid/servicesgrid.component.ts @@ -32,8 +32,11 @@ export class ServicesGridComponent implements OnInit { } }); } - - compare(a: number | string | String, b: number | string | String, isAsc: boolean) { + + compare(a: number | string , b: number | string , isAsc: boolean) { + if (typeof a === 'string' && typeof b === 'string') { + return a.localeCompare(b,undefined, { sensitivity: 'accent' } ) * (isAsc ? 1 : -1); + } return (a < b ? -1 : 1) * (isAsc ? 1 : -1); } } diff --git a/src/app/ui/servicestable/servicestable.component.ts b/src/app/ui/servicestable/servicestable.component.ts index 7c8ea4d..6fe0f96 100644 --- a/src/app/ui/servicestable/servicestable.component.ts +++ b/src/app/ui/servicestable/servicestable.component.ts @@ -34,7 +34,10 @@ export class ServicesTableComponent implements OnInit { }); } - compare(a: number | string | String, b: number | string | String, isAsc: boolean) { + compare(a: number | string , b: number | string , isAsc: boolean) { + if (typeof a === 'string' && typeof b === 'string') { + return a.localeCompare(b,undefined, { sensitivity: 'accent' } ) * (isAsc ? 1 : -1); + } return (a < b ? -1 : 1) * (isAsc ? 1 : -1); } }