Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated package json,added decimal as currency support,fixed BUG-878536 #186

Merged
merged 4 commits into from
Jul 22, 2024
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
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"@angular/compiler-cli": "^16.2.12",
"@angular/language-service": "^16.2.12",
"@pega/configs": "^0.7.1",
"@pega/constellationjs": "24.1.0",
"@pega/constellationjs": "24.1.1-dev",
"@pega/eslint-config": "^0.7.1",
"@pega/pcore-pconnect-typedefs": "~2.1.1",
"@pega/prettier-config": "^0.7.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
<div *ngIf="displayMode$; else noDisplayMode">
<component-mapper *ngIf="bVisible$ !== false" name="FieldValueList" [props]="{ label$, value$, displayMode$ }"></component-mapper>
<component-mapper *ngIf="bVisible$ !== false" name="FieldValueList" [props]="{ label$, value$: formattedValue, displayMode$ }"></component-mapper>
</div>
<ng-template #noDisplayMode>
<div *ngIf="!bReadonly$ && bHasForm$; else noEdit">
<div *ngIf="bHasForm$; else noEdit">
<div [formGroup]="formGroup$" *ngIf="bVisible$">
<mat-form-field class="psdk-full-width" subscriptSizing="dynamic" [hintLabel]="helperText">
<mat-label>{{ label$ }}</mat-label>
<input
type="text"
matInput
currencyMask
[options]="{ prefix: '', thousands: currSep, decimal: currDec, align: 'left', nullable: true }"
[options]="{
prefix: bReadonly$ && formatter === 'Currency' ? currSym : '',
thousands: currSep,
decimal: currDec,
align: 'left',
nullable: true,
inputMode: inputMode
}"
[placeholder]="placeholder"
step="0.01"
[formControlName]="controlName$"
[required]="bRequired$"
[formControl]="fieldControl"
[attr.data-test-id]="testId"
(blur)="fieldOnBlur($event)"
[readonly]="bReadonly$"
/>
<mat-error *ngIf="fieldControl.invalid">{{ getErrorMessage() }}</mat-error>
</mat-form-field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import { CommonModule } from '@angular/common';
import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';
import { MatFormFieldModule } from '@angular/material/form-field';
import { NgxCurrencyDirective } from 'ngx-currency';
import { NgxCurrencyDirective, NgxCurrencyInputMode } from 'ngx-currency';
import { AngularPConnectData, AngularPConnectService } from '../../../_bridge/angular-pconnect';
import { Utils } from '../../../_helpers/utils';
import { ComponentMapperComponent } from '../../../_bridge/component-mapper/component-mapper.component';
import { handleEvent } from '../../../_helpers/event-util';
import { getCurrencyCharacters } from '../../../_helpers/currency-utils';
import { getCurrencyCharacters, getCurrencyOptions } from '../../../_helpers/currency-utils';
import { PConnFieldProps } from '../../../_types/PConnProps.interface';
import { format } from '../../../_helpers/formatters';

interface DecimalProps extends PConnFieldProps {
// If any, enter additional props that only exist on Decimal here
Expand Down Expand Up @@ -59,7 +60,12 @@ export class DecimalComponent implements OnInit, OnDestroy {
fieldControl = new FormControl<number | null>(null, null);
currDec: string;
currSep: string;
currSym: string;
decimalPrecision: number | undefined;
formatter;
formattedValue: any;
inputMode: any;

constructor(
private angularPConnect: AngularPConnectService,
private cdRef: ChangeDetectorRef,
Expand Down Expand Up @@ -123,6 +129,7 @@ export class DecimalComponent implements OnInit, OnDestroy {
this.testId = this.configProps$.testId;
this.label$ = this.configProps$.label;
this.displayMode$ = this.configProps$.displayMode;
this.inputMode = NgxCurrencyInputMode.Natural;
let nValue: any = this.configProps$.value;
if (nValue) {
if (typeof nValue === 'string') {
Expand All @@ -139,6 +146,15 @@ export class DecimalComponent implements OnInit, OnDestroy {
this.currDec = theSymbols.theDecimalIndicator;
this.currSep = showGroupSeparators ? theSymbols.theDigitGroupSeparator : '';

const theCurrencyOptions = getCurrencyOptions(currencyISOCode);
this.formatter = this.configProps$.formatter;

if (this.formatter === 'Currency') {
this.formattedValue = format(this.value$, this.formatter.toLowerCase(), theCurrencyOptions);
} else {
this.formattedValue = format(this.value$, this.pConn$.getComponentName().toLowerCase(), theCurrencyOptions);
}

// timeout and detectChanges to avoid ExpressionChangedAfterItHasBeenCheckedError
setTimeout(() => {
if (this.configProps$.required != null) {
Expand Down Expand Up @@ -166,6 +182,12 @@ export class DecimalComponent implements OnInit, OnDestroy {
this.fieldControl.enable();
}

if (this.bReadonly$ && this.formatter === 'Currency') {
this.currSym = theSymbols.theCurrencySymbol;
} else {
this.currSym = '';
}

this.componentReference = (this.pConn$.getStateProps() as any).value;
}

Expand Down
2 changes: 1 addition & 1 deletion playwright.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const config = {
slowMo: 200
}
},
testIgnore: 'e2e/DigV2/ComplexFields/ManyToMany.spec.js',
testIgnore: ['e2e/DigV2/ComplexFields/ManyToMany.spec.js', 'e2e/DigV2/Localization/Localization.spec.js'],
/* Configure projects for major browsers */
projects: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ export class MCNavComponent implements OnInit, OnDestroy {

showHideProgress(bShow: boolean) {
this.isProgress$ = bShow;
this.cdRef.detectChanges();
// causing failure on actions buttons in emebedded mode
// this.cdRef.detectChanges();
}

logOff() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ test.describe('E2E test', () => {
attributes = await common.getAttributes(editableDecimal);
await expect(attributes.includes('readonly')).toBeFalsy();

const decimalAsCurrency = page.locator('input[data-test-id="9e438afab6d7ec67b5582bded10f5172"]');
attributes = await common.getAttributes(decimalAsCurrency);
await expect(attributes.includes('readonly')).toBeTruthy();
await expect(await decimalAsCurrency.inputValue()).toBe('$20.00');

/** Selecting Visibility from the Sub Category dropdown */
selectedSubCategory = page.locator('mat-select[data-test-id="9463d5f18a8924b3200b56efaad63bda"]');
await selectedSubCategory.click();
Expand Down
Loading