From 781a01eef1918d04195a9bc12bba33dd7fc6d685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Eorkell=20M=C3=A1ni=20=C3=9Eorkelsson?= Date: Wed, 14 Aug 2024 09:22:36 +0000 Subject: [PATCH] chore: concising --- .../src/lib/dto/GenericLicenseError.dto.ts | 4 ++-- .../src/lib/licenseService.service.ts | 4 ++-- .../v2/LicensesOverview/LicensesOverview.graphql | 4 ++-- .../licenses/src/utils/capitalize.ts | 14 +++----------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/libs/api/domains/license-service/src/lib/dto/GenericLicenseError.dto.ts b/libs/api/domains/license-service/src/lib/dto/GenericLicenseError.dto.ts index 061f2b6c872a..8684bf7b7bec 100644 --- a/libs/api/domains/license-service/src/lib/dto/GenericLicenseError.dto.ts +++ b/libs/api/domains/license-service/src/lib/dto/GenericLicenseError.dto.ts @@ -15,10 +15,10 @@ export class GenericLicenseError { provider?: GenericLicenseProvider @Field(() => Int, { nullable: true }) - errorCode?: number + code?: number @Field({ nullable: true }) - errorMessage?: string + message?: string @Field({ nullable: true }) extraData?: string diff --git a/libs/api/domains/license-service/src/lib/licenseService.service.ts b/libs/api/domains/license-service/src/lib/licenseService.service.ts index ba48cdc52efb..c6cd333d783e 100644 --- a/libs/api/domains/license-service/src/lib/licenseService.service.ts +++ b/libs/api/domains/license-service/src/lib/licenseService.service.ts @@ -167,8 +167,8 @@ export class LicenseService { status: GenericUserLicenseFetchStatus.Error, updated: new Date().getTime().toString(), }, - errorCode: licensesFetchResponse.error.code, - errorMessage: licensesFetchResponse.error.message, + code: licensesFetchResponse.error.code, + message: licensesFetchResponse.error.message, extraData: licensesFetchResponse.error.data, }, } diff --git a/libs/service-portal/licenses/src/screens/v2/LicensesOverview/LicensesOverview.graphql b/libs/service-portal/licenses/src/screens/v2/LicensesOverview/LicensesOverview.graphql index c8c74955e6b6..40ff107fa7a3 100644 --- a/libs/service-portal/licenses/src/screens/v2/LicensesOverview/LicensesOverview.graphql +++ b/libs/service-portal/licenses/src/screens/v2/LicensesOverview/LicensesOverview.graphql @@ -56,8 +56,8 @@ query GenericLicenseCollection( status updated } - errorCode - errorMessage + code + message extraData } } diff --git a/libs/service-portal/licenses/src/utils/capitalize.ts b/libs/service-portal/licenses/src/utils/capitalize.ts index 2bc170796769..65a77a3258dd 100644 --- a/libs/service-portal/licenses/src/utils/capitalize.ts +++ b/libs/service-portal/licenses/src/utils/capitalize.ts @@ -1,12 +1,4 @@ -export const capitalizeEveryWord = (s: string) => { - if (typeof s !== 'string') return '' +import capitalize from 'lodash/capitalize' - const arr = s.split(' ') - - const capitalized = arr.map( - (item) => item.charAt(0).toUpperCase() + item.slice(1).toLowerCase(), - ) - - const word = capitalized.join(' ') - return word -} +export const capitalizeEveryWord = (str: string): string => + str.split(' ').map(capitalize).join(' ')