-
-
Notifications
You must be signed in to change notification settings - Fork 133
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Closes #397 - Add Integer Edit-mode Component
- Loading branch information
Showing
6 changed files
with
298 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
core/app/core/src/lib/fields/int/templates/edit/int.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <! -- | ||
| /** | ||
| * SuiteCRM is a customer relationship management program developed by SalesAgility Ltd. | ||
| * Copyright (C) 2023 SalesAgility Ltd. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it under | ||
| * the terms of the GNU Affero General Public License version 3 as published by the | ||
| * Free Software Foundation with the addition of the following permission added | ||
| * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK | ||
| * IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE | ||
| * WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| * FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more | ||
| * details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses. | ||
| * | ||
| * In accordance with Section 7(b) of the GNU Affero General Public License | ||
| * version 3, these Appropriate Legal Notices must retain the display of the | ||
| * "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably | ||
| * feasible for technical reasons, the Appropriate Legal Notices must display | ||
| * the words "Supercharged by SuiteCRM". | ||
| */ | ||
| --> | ||
|
|
||
| <input [class.is-invalid]="intValueFormControl.invalid && intValueFormControl.touched" | ||
| [formControl]="intValueFormControl" | ||
| [value]="intValue" | ||
| [ngClass]="klass" | ||
| type="number" | ||
| [min]="field?.definition?.metadata?.min" | ||
| [max]="field?.definition?.metadata?.max" | ||
| [step]="field?.definition?.metadata?.step ?? 1" | ||
| > |
116 changes: 116 additions & 0 deletions
116
core/app/core/src/lib/fields/int/templates/edit/int.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| /** | ||
| * SuiteCRM is a customer relationship management program developed by SalesAgility Ltd. | ||
| * Copyright (C) 2023 SalesAgility Ltd. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it under | ||
| * the terms of the GNU Affero General Public License version 3 as published by the | ||
| * Free Software Foundation with the addition of the following permission added | ||
| * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK | ||
| * IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE | ||
| * WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| * FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more | ||
| * details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * In accordance with Section 7(b) of the GNU Affero General Public License | ||
| * version 3, these Appropriate Legal Notices must retain the display of the | ||
| * "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably | ||
| * feasible for technical reasons, the Appropriate Legal Notices must display | ||
| * the words "Supercharged by SuiteCRM". | ||
| */ | ||
|
|
||
| import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; | ||
| import {IntEditFieldComponent} from './int.component'; | ||
| import {Component} from '@angular/core'; | ||
| import {BehaviorSubject, of} from 'rxjs'; | ||
| import {Field} from 'common'; | ||
| import {UserPreferenceMockStore} from '../../../../store/user-preference/user-preference.store.spec.mock'; | ||
| import {SystemConfigStore} from '../../../../store/system-config/system-config.store'; | ||
| import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; | ||
| import {CurrencyFormatter} from '../../../../services/formatters/currency/currency-formatter.service'; | ||
| import {FormControlUtils} from '../../../../services/record/field/form-control.utils'; | ||
| import {FormatNumberPipe} from '../../../../pipes/format-number/format-number.pipe'; | ||
| import {NumberFormatter} from '../../../../services/formatters/number/number-formatter.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'int-edit-field-test-host-component', | ||
| template: '<scrm-int-edit [field]="field"></scrm-int-edit>' | ||
| }) | ||
| class IntEditFieldTestHostComponent { | ||
| field: Field = { | ||
| type: 'int', | ||
| value: '10' | ||
| }; | ||
| } | ||
|
|
||
| describe('IntEditFieldComponent', () => { | ||
| let testHostComponent: IntEditFieldTestHostComponent; | ||
| let testHostFixture: ComponentFixture<IntEditFieldTestHostComponent>; | ||
|
|
||
| /* eslint-disable camelcase,@typescript-eslint/camelcase */ | ||
| const preferences = new BehaviorSubject({ | ||
| num_grp_sep: ',', | ||
| dec_sep: '.', | ||
| }); | ||
| const mockStore = new UserPreferenceMockStore(preferences); | ||
| const mockNumberFormatter = new NumberFormatter(mockStore, new FormControlUtils(), 'en-US'); | ||
| /* eslint-enable camelcase,@typescript-eslint/camelcase */ | ||
|
|
||
| beforeEach(waitForAsync(() => { | ||
| /* eslint-disable camelcase,@typescript-eslint/camelcase */ | ||
| TestBed.configureTestingModule({ | ||
| declarations: [ | ||
| IntEditFieldTestHostComponent, | ||
| IntEditFieldComponent, | ||
| FormatNumberPipe | ||
| ], | ||
| imports: [], | ||
| providers: [ | ||
| {provide: UserPreferenceStore, useValue: mockStore}, | ||
| { | ||
| provide: CurrencyFormatter, | ||
| useValue: new CurrencyFormatter(mockStore, mockNumberFormatter, 'en_us') | ||
| }, | ||
| { | ||
| provide: SystemConfigStore, useValue: { | ||
| configs$: of({ | ||
| default_number_grouping_seperator: { | ||
| id: '/docroot/api/system-configs/default_number_grouping_seperator', | ||
| _id: 'default_number_grouping_seperator', | ||
| value: ';', | ||
| items: [] | ||
| }, | ||
| default_decimal_seperator: { | ||
| id: '/docroot/api/system-configs/default_decimal_seperator', | ||
| _id: 'default_decimal_seperator', | ||
| value: ',', | ||
| items: [] | ||
| } | ||
| }) | ||
| } | ||
| }, | ||
| {provide: NumberFormatter, useValue: mockNumberFormatter} | ||
| ], | ||
| }).compileComponents(); | ||
| /* eslint-enable camelcase,@typescript-eslint/camelcase */ | ||
|
|
||
| testHostFixture = TestBed.createComponent(IntEditFieldTestHostComponent); | ||
| testHostComponent = testHostFixture.componentInstance; | ||
| testHostFixture.detectChanges(); | ||
| })); | ||
|
|
||
| it('should create', () => { | ||
| expect(testHostComponent).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('should have value', () => { | ||
|
|
||
| expect(testHostComponent).toBeTruthy(); | ||
| expect(testHostFixture.nativeElement.textContent).toContain(10); | ||
| }); | ||
| }); |
87 changes: 87 additions & 0 deletions
87
core/app/core/src/lib/fields/int/templates/edit/int.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /** | ||
| * SuiteCRM is a customer relationship management program developed by SalesAgility Ltd. | ||
| * Copyright (C) 2023 SalesAgility Ltd. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it under | ||
| * the terms of the GNU Affero General Public License version 3 as published by the | ||
| * Free Software Foundation with the addition of the following permission added | ||
| * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK | ||
| * IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE | ||
| * WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| * FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more | ||
| * details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * In accordance with Section 7(b) of the GNU Affero General Public License | ||
| * version 3, these Appropriate Legal Notices must retain the display of the | ||
| * "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably | ||
| * feasible for technical reasons, the Appropriate Legal Notices must display | ||
| * the words "Supercharged by SuiteCRM". | ||
| */ | ||
|
|
||
| import { isEqual } from 'lodash-es'; | ||
| import {Component} from '@angular/core'; | ||
| import {FormControl} from '@angular/forms'; | ||
| import {BaseNumberComponent} from '../../../base/base-number.component'; | ||
| import {SystemConfigStore} from '../../../../store/system-config/system-config.store'; | ||
| import {DataTypeFormatter} from '../../../../services/formatters/data-type.formatter.service'; | ||
| import {UserPreferenceStore} from '../../../../store/user-preference/user-preference.store'; | ||
| import {FieldLogicManager} from '../../../field-logic/field-logic.manager'; | ||
| import {FieldLogicDisplayManager} from '../../../field-logic-display/field-logic-display.manager'; | ||
|
|
||
| @Component({ | ||
| selector: 'scrm-int-edit', | ||
| templateUrl: './int.component.html', | ||
| styleUrls: [] | ||
| }) | ||
| export class IntEditFieldComponent extends BaseNumberComponent { | ||
| public intValue = 0; | ||
| public intValueFormControl: FormControl = new FormControl(this.intValue); | ||
|
|
||
| constructor( | ||
| protected userPreferences: UserPreferenceStore, | ||
| protected systemConfig: SystemConfigStore, | ||
| protected typeFormatter: DataTypeFormatter, | ||
| protected logic: FieldLogicManager, | ||
| protected logicDisplay: FieldLogicDisplayManager, | ||
| ) { | ||
| super(userPreferences, systemConfig, typeFormatter, logic, logicDisplay); | ||
| } | ||
|
|
||
| ngOnInit(): void { | ||
| this.subscribeIntValueChanges(); | ||
|
|
||
| super.ngOnInit(); | ||
| this.subscribeValueChanges(); | ||
| } | ||
|
|
||
| ngOnDestroy(): void { | ||
| this.unsubscribeAll(); | ||
| } | ||
|
|
||
| private subscribeIntValueChanges(): void { | ||
| this.subs.push( | ||
| this.intValueFormControl.valueChanges.subscribe(valueChanges => { | ||
| this.intValue = valueChanges; | ||
| if (!this.field.formControl || isEqual(this.field.formControl.value, valueChanges)) { | ||
| return; | ||
| } | ||
| this.field.formControl.setValue(valueChanges.toString()); | ||
| }) | ||
| ); | ||
| this.subs.push( | ||
| this.field.valueChanges$.subscribe((fieldValue) => { | ||
| const intValue = parseInt(fieldValue.value,10) || 0; | ||
| if (isEqual(this.intValueFormControl.value, intValue)) { | ||
| return; | ||
| } | ||
| this.intValueFormControl.setValue(intValue); | ||
| }) | ||
| ); | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
core/app/core/src/lib/fields/int/templates/edit/int.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /** | ||
| * SuiteCRM is a customer relationship management program developed by SalesAgility Ltd. | ||
| * Copyright (C) 2023 SalesAgility Ltd. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it under | ||
| * the terms of the GNU Affero General Public License version 3 as published by the | ||
| * Free Software Foundation with the addition of the following permission added | ||
| * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK | ||
| * IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE | ||
| * WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| * FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more | ||
| * details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * In accordance with Section 7(b) of the GNU Affero General Public License | ||
| * version 3, these Appropriate Legal Notices must retain the display of the | ||
| * "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably | ||
| * feasible for technical reasons, the Appropriate Legal Notices must display | ||
| * the words "Supercharged by SuiteCRM". | ||
| */ | ||
|
|
||
| import {NgModule} from '@angular/core'; | ||
| import {CommonModule} from '@angular/common'; | ||
|
|
||
| import {IntEditFieldComponent} from './int.component'; | ||
| import {FormatNumberModule} from '../../../../pipes/format-number/format-number.module'; | ||
| import {FormsModule, ReactiveFormsModule} from '@angular/forms'; | ||
| import {LabelModule} from '../../../../components/label/label.module'; | ||
|
|
||
| @NgModule({ | ||
| declarations: [IntEditFieldComponent], | ||
| exports: [IntEditFieldComponent], | ||
| imports: [ | ||
| CommonModule, | ||
| FormatNumberModule, | ||
| FormsModule, | ||
| ReactiveFormsModule, | ||
| LabelModule | ||
| ] | ||
| }) | ||
| export class IntEditFieldModule { | ||
| } |