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 @@ -57,17 +57,19 @@ export class BooleanFieldManagerForDto
};
}

protected override parseDefaultValue(defaultValue: string): boolean | null {
try {
return defaultValue === 'true' ? true : false;
}
catch (e) {
// console.log(`Could not set default value ${defaultValue} for field ${this.field.name} in model ${this.modelName}`);
protected override parseDefaultValue(defaultValue: boolean | string | null | undefined): boolean | null {
if (typeof defaultValue === 'boolean') return defaultValue;

if (typeof defaultValue === 'string') {
const normalizedDefaultValue = defaultValue.trim().toLowerCase();
if (normalizedDefaultValue === 'true') return true;
if (normalizedDefaultValue === 'false') return false;
}

return null;
}

protected override defaultValueInitializer(defaultValueConfig: string): DefaultValueInitializer | null {
protected override defaultValueInitializer(defaultValueConfig: boolean | string | null | undefined): DefaultValueInitializer | null {
const defaultValue = this.parseDefaultValue(defaultValueConfig) ?? false;
return {
value : defaultValue,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,24 @@ export class BooleanFieldManagerForEntity
return options;
}

protected override parseDefaultValue(defaultValue: string): boolean | null {
try {
return defaultValue === 'true' ? true : false;
}
catch (e) {
// console.log(`Could not set default value ${defaultValue} for field ${this.field.name} in model ${this.modelName}`);
protected override parseDefaultValue(defaultValue: boolean | string | null | undefined): boolean | null {
if (typeof defaultValue === 'boolean') return defaultValue;

if (typeof defaultValue === 'string') {
const normalizedDefaultValue = defaultValue.trim().toLowerCase();
if (normalizedDefaultValue === 'true') return true;
if (normalizedDefaultValue === 'false') return false;
}

return null;
}

protected override defaultValueInitializer(defaultValueConfig: string): DefaultValueInitializer | null {
protected override defaultValueInitializer(defaultValueConfig: boolean | string | null | undefined): DefaultValueInitializer | null {
const defaultValue = this.parseDefaultValue(defaultValueConfig) ?? false;
return {
value: defaultValue,
text: defaultValue.toString(),
expression: defaultValue ? ts.factory.createTrue() : ts.factory.createFalse()
};
}
}
}