Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { displayString } from './string-formatter';
name: 'htDisplayString'
})
export class DisplayStringPipe implements PipeTransform {
public transform(value: unknown): string {
return displayString(value);
public transform(value: unknown, defaultValueOnEmpty: string = '-'): string {
return displayString(value, defaultValueOnEmpty);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@ describe('String formatter', () => {
expect(displayString(false)).toBe('false');
});

test('can convert to display string with default empty value', () => {
// tslint:disable-next-line: no-null-keyword
expect(displayString(null, 'none')).toBe('none');
expect(displayString('null', 'none')).toBe('none');
expect(displayString(undefined, 'none')).toBe('none');
expect(displayString('', 'none')).toBe('');
expect(displayString('value', 'none')).toBe('value');
expect(displayString(15, 'none')).toBe('15');
expect(displayString({}, 'none')).toBe('Object');
expect(displayString([undefined], 'none')).toBe('[none]');
expect(displayString(() => 'hi', 'none')).toBe('Function');
expect(displayString(Symbol('test symbol'), 'none')).toBe('Symbol(test symbol)');
expect(displayString(false, 'none')).toBe('false');
});

test('creates string array correctly from comma separated list', () => {
expect(getStringsFromCommaSeparatedList('first,second, third ')).toEqual(
expect.arrayContaining(['first', 'second', 'third'])
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
export const displayString = (provided?: unknown): string => {
export const displayString = (provided?: unknown, defaultValueOnEmpty: string = '-'): string => {
if (provided === null || provided === 'null') {
return '-';
return defaultValueOnEmpty;
}

switch (typeof provided) {
case 'object':
return Array.isArray(provided) ? `[${provided.map(displayString).join(', ')}]` : 'Object';
return Array.isArray(provided)
? `[${provided.map(value => displayString(value, defaultValueOnEmpty)).join(', ')}]`
: 'Object';
case 'undefined':
return '-';
return defaultValueOnEmpty;
case 'function':
return 'Function';
case 'string':
Expand Down