@pega/angular-sdk-overrides 0.25.1 → 0.25.2

package/lib/field/radio-buttons/radio-buttons.component.scss

@@ -15,11 +15,13 @@
 .psdk-radio-horizontal {
   display: flex;
   flex-direction: row;
+  margin-top: 1rem;
 }
 
 .psdk-radio-vertical {
   display: flex;
   flex-direction: column;
+  margin-top: 1rem;
 }
 
 .psdk-radio-button {
@@ -30,8 +32,8 @@
   width: 100%;
 }
 
-.psdk-radio-form ::ng-deep .mat-form-field-underline {
-  background-color: transparent;
+.psdk-radio-form ::ng-deep .mdc-line-ripple {
+  display: none;
 }
 
 .psdk-radio-form ::ng-deep .mat-form-field-label {

package/lib/field/radio-buttons/radio-buttons.component.ts

@@ -1,15 +1,15 @@
-import { Component, OnInit, Input, ChangeDetectorRef, forwardRef, OnDestroy } from '@angular/core';
+import { Component, forwardRef } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import { ReactiveFormsModule } from '@angular/forms';
 import { MatRadioModule } from '@angular/material/radio';
 import { MatInputModule } from '@angular/material/input';
 import { MatFormFieldModule } from '@angular/material/form-field';
-import { interval } from 'rxjs';
-import { AngularPConnectData, AngularPConnectService } from '@pega/angular-sdk-components';
-import { Utils } from '@pega/angular-sdk-components';
+
+import { FieldBase } from '@pega/angular-sdk-components';
 import { ComponentMapperComponent } from '@pega/angular-sdk-components';
-import { PConnFieldProps } from '@pega/angular-sdk-components';
+import { Utils } from '@pega/angular-sdk-components';
 import { handleEvent } from '@pega/angular-sdk-components';
+import { PConnFieldProps } from '@pega/angular-sdk-components';
 
 interface IOption {
   key: string;
@@ -30,159 +30,58 @@ interface RadioButtonsProps extends PConnFieldProps {
   providers: [Utils],
   imports: [CommonModule, ReactiveFormsModule, MatFormFieldModule, MatInputModule, MatRadioModule, forwardRef(() => ComponentMapperComponent)]
 })
-export class RadioButtonsComponent implements OnInit, OnDestroy {
-  @Input() pConn$: typeof PConnect;
-  @Input() formGroup$: FormGroup;
-
-  // Used with AngularPConnect
-  angularPConnectData: AngularPConnectData = {};
+export class RadioButtonsComponent extends FieldBase {
   configProps$: RadioButtonsProps;
 
-  label$ = '';
-  value$ = '';
-  bRequired$ = false;
-  bReadonly$ = false;
-  bDisabled$ = false;
-  bVisible$ = true;
   bInline$ = false;
-  displayMode$?: string = '';
-  controlName$: string;
-  bHasForm$ = true;
+
   options$: IOption[];
   componentReference = '';
-  testId: string;
-  helperText: string;
-  placeholder: string;
-
-  fieldControl = new FormControl('', null);
   fieldMetadata: any[];
   localeContext = '';
   localeClass = '';
   localeName = '';
   localePath = '';
   localizedValue = '';
-  actionsApi: Object;
-  propName: string;
   variant?: string;
 
-  constructor(
-    private angularPConnect: AngularPConnectService,
-    private cdRef: ChangeDetectorRef,
-    private utils: Utils
-  ) {}
-
-  ngOnInit(): void {
-    // First thing in initialization is registering and subscribing to the AngularPConnect service
-    this.angularPConnectData = this.angularPConnect.registerAndSubscribeComponent(this, this.onStateChange);
-    this.controlName$ = this.angularPConnect.getComponentID(this);
-
-    // Then, continue on with other initialization
-
-    // call updateSelf when initializing
-    // this.updateSelf();
-    this.checkAndUpdate();
-
-    if (this.formGroup$) {
-      // add control to formGroup
-      this.formGroup$.addControl(this.controlName$, this.fieldControl);
-      this.fieldControl.setValue(this.value$);
-      this.bHasForm$ = true;
-    } else {
-      this.bReadonly$ = true;
-      this.bHasForm$ = false;
-    }
-  }
-
-  ngOnDestroy(): void {
-    if (this.formGroup$) {
-      this.formGroup$.removeControl(this.controlName$);
-    }
-
-    if (this.angularPConnectData.unsubscribeFn) {
-      this.angularPConnectData.unsubscribeFn();
-    }
-  }
-
-  // Callback passed when subscribing to store change
-  onStateChange() {
-    this.checkAndUpdate();
-  }
-
-  checkAndUpdate() {
-    // Should always check the bridge to see if the component should
-    // update itself (re-render)
-    const bUpdateSelf = this.angularPConnect.shouldComponentUpdate(this);
-
-    // ONLY call updateSelf when the component should update
-    if (bUpdateSelf) {
-      this.updateSelf();
-    }
-  }
-
-  // updateSelf
-  updateSelf(): void {
-    // moved this from ngOnInit() and call this from there instead...
+  /**
+   * Updates the component when there are changes in the state.
+   */
+  override updateSelf(): void {
+    // Resolve config properties
     this.configProps$ = this.pConn$.resolveConfigProps(this.pConn$.getConfigProps()) as RadioButtonsProps;
 
-    if (this.configProps$.value != undefined) {
-      this.value$ = this.configProps$.value;
-    }
-
-    this.testId = this.configProps$.testId;
-    this.label$ = this.configProps$.label;
-    this.displayMode$ = this.configProps$.displayMode;
-    this.helperText = this.configProps$.helperText;
-    this.placeholder = this.configProps$.placeholder || '';
-
-    this.variant = this.configProps$.variant;
-
-    // timeout and detectChanges to avoid ExpressionChangedAfterItHasBeenCheckedError
-    setTimeout(() => {
-      if (this.configProps$.required != null) {
-        this.bRequired$ = this.utils.getBooleanValue(this.configProps$.required);
-      }
-      this.cdRef.detectChanges();
-    });
-
-    if (this.configProps$.visibility != null) {
-      this.bVisible$ = this.utils.getBooleanValue(this.configProps$.visibility);
-    }
+    // Update component common properties
+    this.updateComponentCommonProperties(this.configProps$);
 
-    if (this.configProps$.inline != null) {
-      this.bInline$ = this.utils.getBooleanValue(this.configProps$.inline);
-    }
+    // Extract and normalize the value property
+    const { value } = this.configProps$;
+    this.value$ = value;
 
-    if (this.configProps$.disabled != undefined) {
-      this.bDisabled$ = this.utils.getBooleanValue(this.configProps$.disabled);
-    }
-
-    if (this.configProps$.inline != null) {
-      this.bInline$ = this.utils.getBooleanValue(this.configProps$.inline);
-    }
-
-    if (this.bDisabled$) {
-      this.fieldControl.disable();
-    } else {
-      this.fieldControl.enable();
-    }
-
-    if (this.configProps$.readOnly != null) {
-      this.bReadonly$ = this.utils.getBooleanValue(this.configProps$.readOnly);
-    }
+    // Set component specific properties
+    this.updateRadioButtonsProperties(this.configProps$);
+  }
 
-    this.componentReference = this.pConn$.getStateProps().value;
+  /**
+   * Updates radio buttons properties based on the provided config props.
+   * @param configProps Configuration properties.
+   */
+  protected updateRadioButtonsProperties(configProps) {
+    const { inline, fieldMetadata, variant } = configProps;
 
-    this.options$ = this.utils.getOptionList(this.configProps$, this.pConn$.getDataObject());
+    this.variant = variant;
+    this.bInline$ = this.utils.getBooleanValue(inline);
 
-    this.actionsApi = this.pConn$.getActionsApi();
-    this.propName = this.pConn$.getStateProps().value;
+    // Get options from config props and data object
+    this.options$ = this.utils.getOptionList(configProps, this.pConn$.getDataObject());
 
+    // Extract metadata and locale information
     const className = this.pConn$.getCaseInfo().getClassName();
     const refName = this.propName?.slice(this.propName.lastIndexOf('.') + 1);
+    const metaData = Array.isArray(fieldMetadata) ? fieldMetadata.filter(field => field?.classID === className)[0] : fieldMetadata;
 
-    this.fieldMetadata = this.configProps$.fieldMetadata;
-    const metaData = Array.isArray(this.fieldMetadata) ? this.fieldMetadata.filter(field => field?.classID === className)[0] : this.fieldMetadata;
-
+    // Determine display name and locale context
     let displayName = metaData?.datasource?.propertyForDisplayText;
     displayName = displayName?.slice(displayName.lastIndexOf('.') + 1);
     this.localeContext = metaData?.datasource?.tableType === 'DataPage' ? 'datapage' : 'associated';
@@ -190,20 +89,12 @@ export class RadioButtonsComponent implements OnInit, OnDestroy {
     this.localeName = this.localeContext === 'datapage' ? metaData?.datasource?.name : refName;
     this.localePath = this.localeContext === 'datapage' ? displayName : this.localeName;
 
+    // Get localized value
     this.localizedValue = this.pConn$.getLocalizedValue(
       this.value$,
       this.localePath,
       this.pConn$.getLocaleRuleNameFromKeys(this.localeClass, this.localeContext, this.localeName)
     );
-    // trigger display of error message with field control
-    if (this.angularPConnectData.validateMessage != null && this.angularPConnectData.validateMessage != '') {
-      const timer = interval(100).subscribe(() => {
-        this.fieldControl.setErrors({ message: true });
-        this.fieldControl.markAsTouched();
-
-        timer.unsubscribe();
-      });
-    }
   }
 
   isSelected(buttonValue: string): boolean {
@@ -221,21 +112,4 @@ export class RadioButtonsComponent implements OnInit, OnDestroy {
       this.pConn$.getLocaleRuleNameFromKeys(this.localeClass, this.localeContext, this.localeName)
     );
   }
-
-  getErrorMessage() {
-    let errMessage = '';
-
-    // look for validation messages for json, pre-defined or just an error pushed from workitem (400)
-    if (this.fieldControl.hasError('message')) {
-      errMessage = this.angularPConnectData.validateMessage ?? '';
-      return errMessage;
-    }
-    if (this.fieldControl.hasError('required')) {
-      errMessage = 'You must enter a value';
-    } else if (this.fieldControl.errors) {
-      errMessage = this.fieldControl.errors.toString();
-    }
-
-    return errMessage;
-  }
 }

package/lib/field/rich-text/rich-text.component.ts

@@ -1,8 +1,8 @@
-import { Component, OnInit, Input, forwardRef, OnDestroy } from '@angular/core';
+import { Component, forwardRef } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormGroup, ReactiveFormsModule } from '@angular/forms';
-import { AngularPConnectData, AngularPConnectService } from '@pega/angular-sdk-components';
-import { Utils } from '@pega/angular-sdk-components';
+import { ReactiveFormsModule } from '@angular/forms';
+
+import { FieldBase } from '@pega/angular-sdk-components';
 import { ComponentMapperComponent } from '@pega/angular-sdk-components';
 import { handleEvent } from '@pega/angular-sdk-components';
 import { PConnFieldProps } from '@pega/angular-sdk-components';
@@ -17,102 +17,31 @@ interface RichTextProps extends PConnFieldProps {
   styleUrls: ['./rich-text.component.scss'],
   imports: [CommonModule, ReactiveFormsModule, forwardRef(() => ComponentMapperComponent)]
 })
-export class RichTextComponent implements OnInit, OnDestroy {
-  @Input() pConn$: typeof PConnect;
-  @Input() formGroup$: FormGroup;
-
-  // Used with AngularPConnect
-  angularPConnectData: AngularPConnectData = {};
+export class RichTextComponent extends FieldBase {
   configProps$: RichTextProps;
 
-  label$ = '';
-  value$ = '';
-  bRequired$ = false;
-  bReadonly$ = false;
-  bDisabled$ = false;
-  bVisible$ = true;
-  displayMode$?: string = '';
-  controlName$: string;
-  testId: string;
-  helperText: string;
-  placeholder: any;
   info: any;
   error: boolean;
   status: any;
-  actionsApi: Object;
-  propName: string;
-
-  constructor(
-    private angularPConnect: AngularPConnectService,
-    private utils: Utils
-  ) {}
-
-  ngOnInit(): void {
-    // First thing in initialization is registering and subscribing to the AngularPConnect service
-    this.angularPConnectData = this.angularPConnect.registerAndSubscribeComponent(this, this.onStateChange);
-
-    // call updateSelf when initializing
-    this.checkAndUpdate();
-  }
-
-  ngOnDestroy(): void {
-    if (this.angularPConnectData.unsubscribeFn) {
-      this.angularPConnectData.unsubscribeFn();
-    }
-  }
-
-  // Callback passed when subscribing to store change
-  onStateChange() {
-    this.checkAndUpdate();
-  }
-
-  checkAndUpdate() {
-    // Should always check the bridge to see if the component should
-    // update itself (re-render)
-    const bUpdateSelf = this.angularPConnect.shouldComponentUpdate(this);
 
-    // ONLY call updateSelf when the component should update
-    if (bUpdateSelf) {
-      this.updateSelf();
-    }
-  }
-
-  // updateSelf
-  updateSelf(): void {
-    // moved this from ngOnInit() and call this from there instead...
+  /**
+   * Updates the component when there are changes in the state.
+   */
+  override updateSelf(): void {
+    // Resolve config properties
     this.configProps$ = this.pConn$.resolveConfigProps(this.pConn$.getConfigProps()) as RichTextProps;
-    const stateProps = this.pConn$.getStateProps();
-    this.status = stateProps?.status;
-
-    if (this.configProps$.value != undefined) {
-      this.value$ = this.configProps$.value;
-    }
-
-    this.testId = this.configProps$.testId;
-    this.displayMode$ = this.configProps$.displayMode;
-    this.label$ = this.configProps$.label;
-    this.placeholder = this.configProps$.placeholder;
-    this.info = stateProps?.validatemessage || this.configProps$.helperText;
-    this.error = stateProps?.status === 'error';
 
-    this.actionsApi = this.pConn$.getActionsApi();
-    this.propName = this.pConn$.getStateProps().value;
+    // Update component common properties
+    this.updateComponentCommonProperties(this.configProps$);
 
-    if (this.configProps$.required != null) {
-      this.bRequired$ = this.utils.getBooleanValue(this.configProps$.required);
-    }
-
-    if (this.configProps$.visibility != null) {
-      this.bVisible$ = this.utils.getBooleanValue(this.configProps$.visibility);
-    }
+    // Extract and normalize the value property
+    const { value, helperText } = this.configProps$;
+    this.value$ = value;
 
-    if (this.configProps$.disabled != undefined) {
-      this.bDisabled$ = this.utils.getBooleanValue(this.configProps$.disabled);
-    }
-
-    if (this.configProps$.readOnly != null) {
-      this.bReadonly$ = this.utils.getBooleanValue(this.configProps$.readOnly);
-    }
+    const { status, validatemessage } = this.pConn$.getStateProps();
+    this.status = status;
+    this.info = validatemessage || helperText;
+    this.error = status === 'error';
   }
 
   fieldOnChange(editorValue: any) {

package/lib/field/scalar-list/scalar-list.component.ts

@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
-import { Component, forwardRef, Input, OnDestroy, OnInit } from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
-import { AngularPConnectData, AngularPConnectService } from '@pega/angular-sdk-components';
+import { Component, forwardRef } from '@angular/core';
+
+import { FieldBase } from '@pega/angular-sdk-components';
 import { ComponentMapperComponent } from '@pega/angular-sdk-components';
 import { PConnFieldProps } from '@pega/angular-sdk-components';
 
@@ -19,83 +19,27 @@ interface ScalarListProps extends Omit<PConnFieldProps, 'value'> {
   styleUrls: ['./scalar-list.component.scss'],
   imports: [CommonModule, forwardRef(() => ComponentMapperComponent)]
 })
-export class ScalarListComponent implements OnInit, OnDestroy {
-  @Input() pConn$: typeof PConnect;
-  @Input() formGroup$: FormGroup;
-
-  angularPConnectData: AngularPConnectData = {};
+export class ScalarListComponent extends FieldBase {
   configProps$: ScalarListProps;
 
-  label$ = '';
-  value$: any;
-  displayMode$?: string = '';
   items: any[];
   isDisplayModeEnabled = false;
-  controlName$: string;
-  fieldControl = new FormControl('', null);
-  bHasForm$ = true;
-  bReadonly$ = false;
-
-  constructor(private angularPConnect: AngularPConnectService) {}
-
-  ngOnInit(): void {
-    // First thing in initialization is registering and subscribing to the AngularPConnect service
-    this.angularPConnectData = this.angularPConnect.registerAndSubscribeComponent(this, this.onStateChange);
-    this.controlName$ = this.angularPConnect.getComponentID(this);
-    // Then, continue on with other initialization
-
-    // call updateSelf when initializing
-    // this.updateSelf();
-    this.checkAndUpdate();
-
-    if (this.formGroup$) {
-      // add control to formGroup
-      this.formGroup$.addControl(this.controlName$, this.fieldControl);
-      this.fieldControl.setValue(this.value$);
-      this.bHasForm$ = true;
-    } else {
-      this.bReadonly$ = true;
-      this.bHasForm$ = false;
-    }
-  }
-
-  ngOnDestroy(): void {
-    if (this.formGroup$) {
-      this.formGroup$.removeControl(this.controlName$);
-    }
 
-    if (this.angularPConnectData.unsubscribeFn) {
-      this.angularPConnectData.unsubscribeFn();
-    }
-  }
+  /**
+   * Updates the component when there are changes in the state.
+   */
+  override updateSelf(): void {
+    // Resolve config properties
+    this.configProps$ = this.pConn$.resolveConfigProps(this.pConn$.getConfigProps()) as ScalarListProps;
 
-  // Callback passed when subscribing to store change
-  onStateChange() {
-    this.checkAndUpdate();
-  }
+    // Extract properties from config props
+    const { componentType, displayMode = '', label, value, restProps } = this.configProps$;
 
-  checkAndUpdate() {
-    // Should always check the bridge to see if the component should
-    // update itself (re-render)
-    const bUpdateSelf = this.angularPConnect.shouldComponentUpdate(this);
+    // Update component properties
+    this.label$ = label;
+    this.displayMode$ = displayMode;
 
-    // ONLY call updateSelf when the component should update
-    if (bUpdateSelf) {
-      this.updateSelf();
-    }
-  }
-
-  // updateSelf
-  updateSelf(): void {
-    this.configProps$ = this.pConn$.resolveConfigProps(this.pConn$.getConfigProps()) as ScalarListProps;
-    this.label$ = this.configProps$.label;
-    const componentType = this.configProps$.componentType;
-    const scalarValues = this.configProps$.value;
-    this.displayMode$ = this.configProps$.displayMode;
-    const restProps = this.configProps$.restProps;
-    console.log('scalar values: ', scalarValues);
-    this.items = scalarValues?.map(scalarValue => {
-      console.log('scalar value: ', scalarValue);
+    this.items = value?.map(scalarValue => {
       return this.pConn$.createComponent(
         {
           type: componentType,
@@ -112,6 +56,7 @@ export class ScalarListComponent implements OnInit, OnDestroy {
         {}
       ); // 2nd, 3rd, and 4th args empty string/object/null until typedef marked correctly as optional;
     });
+
     this.isDisplayModeEnabled = ['STACKED_LARGE_VAL', 'DISPLAY_ONLY'].includes(this.displayMode$ as string);
     this.value$ = this.items;
   }

package/lib/field/selectable-card/selectable-card.component.html

@@ -1,4 +1,7 @@
-<div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(min(100%, 40ch), 1fr)); grid-auto-rows: 1fr; gap: 0.5rem">
+<div
+  *ngIf="type === 'checkbox'"
+  style="display: grid; grid-template-columns: repeat(auto-fit, minmax(min(250px, 100%), 1fr)); grid-auto-rows: 1fr; gap: 0.5rem"
+>
   <div *ngFor="let cardContent of contentList">
     <mat-card [ngStyle]="cardStyle" appearance="outlined" (click)="cardSelect($event, cardContent.commonCardProps)">
       <img
@@ -9,32 +12,59 @@
         [ngStyle]="cardContent.cardImage.style"
       />
       <mat-card-content>
-        <div *ngIf="type === 'radio'">
-          <mat-radio-button
-            [checked]="radioBtnValue === cardContent?.commonCardProps?.key"
-            [disabled]="disabled"
-            [value]="cardContent.commonCardProps.key"
-            (change)="fieldOnChange(cardContent.commonCardProps.key)"
-          >
-            {{ cardContent.commonCardProps.label }}
-          </mat-radio-button>
-        </div>
-        <div *ngIf="type === 'checkbox'">
-          <mat-checkbox
-            [labelPosition]="'after'"
-            [checked]="cardContent.commonCardProps.selected"
-            [disabled]="disabled || readOnly"
-            [attr.data-test-id]="testId + ':' + cardContent.commonCardProps.label"
-            (change)="handleChangeMultiMode($event, cardContent.commonCardProps)"
-            (blur)="fieldOnBlur()"
-            >{{ cardContent.commonCardProps.label }}</mat-checkbox
-          >
-        </div>
-        <div *ngFor="let field of cardContent.commonCardProps.fields" [ngStyle]="field.type !== 'TextArea' ? defaultStyle : specialStyle">
-          <div style="color: rgba(0, 0, 0, 0.6)">{{ field.name }}</div>
+        <mat-checkbox
+          [labelPosition]="'after'"
+          [checked]="cardContent.commonCardProps.selected"
+          [disabled]="disabled || readOnly"
+          [attr.data-test-id]="testId + ':' + cardContent.commonCardProps.label"
+          (change)="handleChangeMultiMode($event, cardContent.commonCardProps)"
+          (blur)="fieldOnBlur()"
+          >{{ cardContent.commonCardProps.label }}</mat-checkbox
+        >
+        <div
+          *ngFor="let field of cardContent.commonCardProps.fields"
+          [ngStyle]="field.type !== 'TextArea' ? (field.name ? defaultStyle : noLabelStyle) : specialStyle"
+        >
+          <div>{{ field.name }}</div>
           <div>{{ field?.value?.getPConnect().getConfigProps().value ?? '--' }}</div>
         </div>
       </mat-card-content>
     </mat-card>
   </div>
 </div>
+
+<mat-radio-group
+  *ngIf="type === 'radio'"
+  style="display: grid; grid-template-columns: repeat(auto-fit, minmax(min(250px, 100%), 1fr)); grid-auto-rows: 1fr; gap: 0.5rem"
+  [name]="propName"
+  [value]="radioBtnValue"
+  (change)="fieldOnChange($event.value)"
+>
+  <div *ngFor="let cardContent of contentList">
+    <mat-card [ngStyle]="cardStyle" appearance="outlined" (click)="cardSelect($event, cardContent.commonCardProps)">
+      <img
+        *ngIf="cardContent.cardImage"
+        mat-card-image
+        src="{{ cardContent.cardImage.src }}"
+        alt="{{ cardContent.cardImage.alt }}"
+        [ngStyle]="cardContent.cardImage.style"
+      />
+      <mat-card-content>
+        <mat-radio-button
+          [checked]="radioBtnValue === cardContent?.commonCardProps?.key"
+          [disabled]="disabled"
+          [value]="cardContent.commonCardProps.key"
+        >
+          {{ cardContent.commonCardProps.label }}
+        </mat-radio-button>
+        <div
+          *ngFor="let field of cardContent.commonCardProps.fields"
+          [ngStyle]="field.type !== 'TextArea' ? (field.name ? defaultStyle : noLabelStyle) : specialStyle"
+        >
+          <div>{{ field.name }}</div>
+          <div>{{ field?.value?.getPConnect().getConfigProps().value ?? '--' }}</div>
+        </div>
+      </mat-card-content>
+    </mat-card>
+  </div>
+</mat-radio-group>

package/lib/field/selectable-card/selectable-card.component.scss

@@ -0,0 +1,11 @@
+::ng-deep .mdc-label {
+  font-size: large;
+}
+
+.mat-mdc-card-content:last-child {
+  padding-bottom: 0;
+}
+
+.mat-mdc-card-content:first-child {
+  padding-top: 0;
+}