diff --git a/projects/common/src/utilities/formatters/enum/display-string-enum.pipe.ts b/projects/common/src/utilities/formatters/enum/display-string-enum.pipe.ts index 2afd022e0..17d27ccc9 100644 --- a/projects/common/src/utilities/formatters/enum/display-string-enum.pipe.ts +++ b/projects/common/src/utilities/formatters/enum/display-string-enum.pipe.ts @@ -5,7 +5,7 @@ import { displayStringEnum } from './display-string-enum'; name: 'htDisplayStringEnum' }) export class DisplayStringEnumPipe implements PipeTransform { - public transform(value: string): string { - return displayStringEnum(value); + public transform(value?: string, defaultValue: string = '-', separator: string = ' '): string { + return displayStringEnum(value, defaultValue, separator); } } diff --git a/projects/common/src/utilities/formatters/enum/display-string-enum.ts b/projects/common/src/utilities/formatters/enum/display-string-enum.ts index 7ffdb0c81..76c3c051a 100644 --- a/projects/common/src/utilities/formatters/enum/display-string-enum.ts +++ b/projects/common/src/utilities/formatters/enum/display-string-enum.ts @@ -1,13 +1,9 @@ -import { isNil, startCase } from 'lodash-es'; +import { capitalize, isNil, lowerCase } from 'lodash-es'; -export const displayStringEnum = (provided?: string): string => { +export const displayStringEnum = (provided?: string, defaultValue: string = '-', separator: string = ' '): string => { if (isNil(provided)) { - return '-'; + return defaultValue; } - // This removes dashes and underscores and gives all words initial caps - const startCased = startCase(provided); - - // We only want the first word capitalized. - return `${startCased[0]}${startCased.substr(1).toLowerCase()}`; + return capitalize(lowerCase(provided)).replace(' ', separator); };