paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-09 09:58:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix: frontend validation of number fields fails upon save (#5646)

Browse Source
This commit is contained in:
shamoon 2024-02-03 13:22:12 -08:00 committed by GitHub
parent 6b34f592df
commit 45e2b7f814
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src-ui/src/app/components/common/input/number/number.component.spec.ts
View File

@ -47,22 +47,25 @@ describe('NumberComponent', () => {
expect(component.value).toEqual(1002) expect(component.value).toEqual(1002)
}) })
it('should support float & monetary values', () => { it('should support float, monetary values & scientific notation', () => {
component.writeValue(11.13) const mockFn = jest.fn()
expect(component.value).toEqual(11) component.registerOnChange(mockFn)
component.step = 1
component.onChange(11.13)
expect(mockFn).toHaveBeenCalledWith(11)
component.onChange(1.23456789e8)
expect(mockFn).toHaveBeenCalledWith(123456789)
component.step = 0.01
component.onChange(11.1)
expect(mockFn).toHaveBeenCalledWith('11.10')
})
it('should display monetary values fixed to 2 decimals', () => {
component.step = 0.01 component.step = 0.01
component.writeValue(11.1) component.writeValue(11.1)
expect(component.value).toEqual('11.10') expect(component.value).toEqual('11.10')
component.step = 0.1
component.writeValue(12.3456)
expect(component.value).toEqual(12.3456)
// float (step = .1) doesn't force 2 decimals
component.writeValue(11.1)
expect(component.value).toEqual(11.1)
})
it('should support scientific notation', () => {
component.writeValue(1.23456789e8)
expect(component.value).toEqual(123456789)
}) })
}) })

13
src-ui/src/app/components/common/input/number/number.component.ts
View File

@ -36,9 +36,18 @@ export class NumberComponent extends AbstractInputComponent<number> {
}) })
} }
registerOnChange(fn: any): void {
this.onChange = (newValue: any) => {
// number validation
if (this.step === 1 && newValue?.toString().indexOf('e') === -1)
newValue = parseInt(newValue, 10)
if (this.step === 0.01) newValue = parseFloat(newValue).toFixed(2)
fn(newValue)
}
}
writeValue(newValue: any): void { writeValue(newValue: any): void {
if (this.step === 1 && newValue?.toString().indexOf('e') === -1) // Allow monetary values to be displayed with 2 decimals
newValue = parseInt(newValue, 10)
if (this.step === 0.01) newValue = parseFloat(newValue).toFixed(2) if (this.step === 0.01) newValue = parseFloat(newValue).toFixed(2)
super.writeValue(newValue) super.writeValue(newValue)
} }