fix: enable localized number inputs for budgets

intershop · Apr 18, 2024 · a67cf06 · a67cf06
1 parent ddf650f
commit a67cf06
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 65 deletions.
diff --git a/.../components/cost-center-buyer-edit-dialog/cost-center-buyer-edit-dialog.component.spec.ts b/.../components/cost-center-buyer-edit-dialog/cost-center-buyer-edit-dialog.component.spec.ts
@@ -1,9 +1,10 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { instance, mock } from 'ts-mockito';
+import { of } from 'rxjs';
+import { anything, instance, mock, when } from 'ts-mockito';
 
 import { AppFacade } from 'ish-core/facades/app.facade';
-import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';
+import { CostCenterBuyer } from 'ish-core/models/cost-center/cost-center.model';
 
 import { OrganizationManagementFacade } from '../../facades/organization-management.facade';
 
@@ -20,6 +21,8 @@ describe('Cost Center Buyer Edit Dialog Component', () => {
 
   beforeEach(async () => {
     appFacade = mock(AppFacade);
+    when(appFacade.currencySymbol$(anything())).thenReturn(of('$'));
+
     organizationManagementFacade = mock(organizationManagementFacade);
 
     await TestBed.configureTestingModule({
@@ -41,11 +44,15 @@ describe('Cost Center Buyer Edit Dialog Component', () => {
       login: ['jlink@test.intershop.de'],
       firstName: ['Jack'],
       lastName: ['Link'],
-      budgetValue: [123, [SpecialValidators.moneyAmount]],
+      budgetValue: [123],
       budgetPeriod: ['monthly'],
     });
 
     component.costCenterBuyerForm = form;
+    component.show({
+      login: 'jlink@test.intershop.de',
+      budget: { currency: 'USD', value: 10000 },
+    } as CostCenterBuyer);
   });
 
   it('should be created', () => {
@@ -54,19 +61,6 @@ describe('Cost Center Buyer Edit Dialog Component', () => {
     expect(() => fixture.detectChanges()).not.toThrow();
   });
 
-  it('should not submit a form when the user does not provide money format for budget', () => {
-    component.costCenterBuyerForm = fb.group({
-      budgetValue: ['abc', [SpecialValidators.moneyAmount]],
-    });
-
-    fixture.detectChanges();
-
-    expect(component.formDisabled).toBeFalse();
-    component.submitCostCenterBuyerForm();
-
-    expect(component.formDisabled).toBeTrue();
-  });
-
   it('should display all form input fields for cost center buyer update', () => {
     fixture.detectChanges();
 

diff --git a/...c/app/components/cost-center-buyer-edit-dialog/cost-center-buyer-edit-dialog.component.ts b/...c/app/components/cost-center-buyer-edit-dialog/cost-center-buyer-edit-dialog.component.ts
@@ -8,7 +8,6 @@ import { CostCenterBuyer } from 'ish-core/models/cost-center/cost-center.model';
 import { PriceHelper } from 'ish-core/models/price/price.helper';
 import { markAsDirtyRecursive } from 'ish-shared/forms/utils/form-utils';
 import { FormsService } from 'ish-shared/forms/utils/forms.service';
-import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';
 
 import { OrganizationManagementFacade } from '../../facades/organization-management.facade';
 
@@ -65,16 +64,9 @@ export class CostCenterBuyerEditDialogComponent implements OnInit {
               fieldClass: 'col-md-8  pr-0',
               label: 'account.costcenter.details.buyers.dialog.editbudget.budget.label',
               addonLeft: {
-                text: this.appFacade.currencySymbol$(this.buyer?.budget.currency),
-              },
-            },
-            validators: {
-              validation: [SpecialValidators.moneyAmount],
-            },
-            validation: {
-              messages: {
-                moneyAmount: 'account.costcenter.budget.error.valid',
+                text: this.appFacade.currencySymbol$(this.buyer?.budget?.currency),
               },
+              mask: 'separator.2',
             },
           },
           {

diff --git a/...organization-management/src/app/components/cost-center-form/cost-center-form.component.ts b/...organization-management/src/app/components/cost-center-form/cost-center-form.component.ts
@@ -128,13 +128,10 @@ export class CostCenterFormComponent implements OnInit {
                   addonLeft: {
                     text: this.appFacade.currencySymbol$(currentCurrency),
                   },
-                },
-                validators: {
-                  validation: [SpecialValidators.moneyAmount],
+                  mask: 'separator.2',
                 },
                 validation: {
                   messages: {
-                    moneyAmount: 'account.costcenter.budget.error.valid',
                     required: 'account.costcenter.budget.error.required',
                   },
                 },

diff --git a/...organization-management/src/app/components/user-budget-form/user-budget-form.component.ts b/...organization-management/src/app/components/user-budget-form/user-budget-form.component.ts
@@ -5,7 +5,6 @@ import { FormlyFieldConfig } from '@ngx-formly/core';
 
 import { AppFacade } from 'ish-core/facades/app.facade';
 import { whenTruthy } from 'ish-core/utils/operators';
-import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';
 
 import { UserBudget } from '../../models/user-budget/user-budget.model';
 
@@ -88,14 +87,7 @@ export class UserBudgetFormComponent implements OnInit {
               addonLeft: {
                 text: this.appFacade.currencySymbol$(this.model.currency),
               },
-            },
-            validators: {
-              validation: [SpecialValidators.moneyAmount],
-            },
-            validation: {
-              messages: {
-                moneyAmount: 'account.user.new.OrderLimit.error.valid',
-              },
+              mask: 'separator.2',
             },
           },
           {
@@ -114,14 +106,7 @@ export class UserBudgetFormComponent implements OnInit {
                   addonLeft: {
                     text: this.appFacade.currencySymbol$(this.model.currency),
                   },
-                },
-                validators: {
-                  validation: [SpecialValidators.moneyAmount],
-                },
-                validation: {
-                  messages: {
-                    moneyAmount: 'account.user.new.Budget.error.valid',
-                  },
+                  mask: 'separator.2',
                 },
               },
               {

diff --git a/...nization-management/src/app/pages/cost-center-buyers/cost-center-buyers-page.component.ts b/...nization-management/src/app/pages/cost-center-buyers/cost-center-buyers-page.component.ts
@@ -12,7 +12,6 @@ import { HttpError } from 'ish-core/models/http-error/http-error.model';
 import { PriceHelper } from 'ish-core/models/price/price.model';
 import { markAsDirtyRecursive } from 'ish-shared/forms/utils/form-utils';
 import { FormsService } from 'ish-shared/forms/utils/forms.service';
-import { SpecialValidators } from 'ish-shared/forms/validators/special-validators';
 
 import { OrganizationManagementFacade } from '../../facades/organization-management.facade';
 import { B2bUser } from '../../models/b2b-user/b2b-user.model';
@@ -127,16 +126,9 @@ export class CostCenterBuyersPageComponent implements OnInit {
                 addonLeft: {
                   text: this.appFacade.currencySymbol$(),
                 },
+                mask: 'separator.2',
                 ariaLabel: 'Buyer budget',
               },
-              validators: {
-                validation: [SpecialValidators.moneyAmount],
-              },
-              validation: {
-                messages: {
-                  moneyAmount: 'account.costcenter.budget.error.valid',
-                },
-              },
             },
             {
               key: 'budgetPeriod',

diff --git a/src/assets/i18n/de_DE.json b/src/assets/i18n/de_DE.json
@@ -87,7 +87,6 @@
   "account.costCenter.status.inactive": "(Inaktiv)",
   "account.costcenter.activate.button.title": "Aktivieren",
   "account.costcenter.budget.error.required": "Geben Sie einen Geldbetrag ein (Budget).",
-  "account.costcenter.budget.error.valid": "Geben Sie einen gültigen Geldbetrag ein (Budget).",
   "account.costcenter.budget.label": "Budget",
   "account.costcenter.budget.period.value.fixed": "vordefiniert",
   "account.costcenter.budget.period.value.half-yearly": "halbjährlich",
@@ -493,8 +492,6 @@
   "account.user.list.status.inactive": "(Inaktiv)",
   "account.user.login.error.required": "Bitte geben Sie einen Benutzernamen an.",
   "account.user.login.invalid.error": "Bitte geben Sie einen gültigen Benutzernamen an.",
-  "account.user.new.Budget.error.valid": "Geben Sie einen gültigen Geldbetrag ein (Budget).",
-  "account.user.new.OrderLimit.error.valid": "Geben Sie einen gültigen Geldbetrag ein (Limit pro Bestellung).",
   "account.user.new.budget.period.value.half-yearly": "halbjährlich",
   "account.user.new.budget.period.value.monthly": "monatlich",
   "account.user.new.budget.period.value.quarterly": "quartalsweise",

diff --git a/src/assets/i18n/en_US.json b/src/assets/i18n/en_US.json
@@ -87,7 +87,6 @@
   "account.costCenter.status.inactive": "(Inactive)",
   "account.costcenter.activate.button.title": "Activate",
   "account.costcenter.budget.error.required": "Please enter an amount of money (Budget).",
-  "account.costcenter.budget.error.valid": "Please enter a valid amount of money (Budget).",
   "account.costcenter.budget.label": "Budget",
   "account.costcenter.budget.period.value.fixed": "fixed",
   "account.costcenter.budget.period.value.half-yearly": "half-yearly",
@@ -493,8 +492,6 @@
   "account.user.list.status.inactive": "(Inactive)",
   "account.user.login.error.required": "Please enter a username.",
   "account.user.login.invalid.error": "Please enter a valid username.",
-  "account.user.new.Budget.error.valid": "Please enter a valid amount of money (Budget).",
-  "account.user.new.OrderLimit.error.valid": "Please enter a valid amount of money (limit per order).",
   "account.user.new.budget.period.value.half-yearly": "half-yearly",
   "account.user.new.budget.period.value.monthly": "monthly",
   "account.user.new.budget.period.value.quarterly": "quarterly",

diff --git a/src/assets/i18n/fr_FR.json b/src/assets/i18n/fr_FR.json
@@ -87,7 +87,6 @@
   "account.costCenter.status.inactive": "(Inactif)",
   "account.costcenter.activate.button.title": "Activer",
   "account.costcenter.budget.error.required": "Veuillez saisir une valeur monétaire (budget).",
-  "account.costcenter.budget.error.valid": "Veuillez saisir une valeur monétaire valide (budget).",
   "account.costcenter.budget.label": "Budget",
   "account.costcenter.budget.period.value.fixed": "fixe",
   "account.costcenter.budget.period.value.half-yearly": "semestriel",
@@ -493,8 +492,6 @@
   "account.user.list.status.inactive": "(Inactif)",
   "account.user.login.error.required": "Veuillez saisir un nom d’utilisateur",
   "account.user.login.invalid.error": "Veuillez saisir un nom d’utilisateur valide",
-  "account.user.new.Budget.error.valid": "Veuillez saisir une valeur monétaire valide (budget).",
-  "account.user.new.OrderLimit.error.valid": "Veuillez saisir une valeur monétaire valide (limite par commande).",
   "account.user.new.budget.period.value.half-yearly": "semestriel",
   "account.user.new.budget.period.value.monthly": "mensuel",
   "account.user.new.budget.period.value.quarterly": "trimestriel",