@pega/dx-component-builder-sdk 0.25.7 → 0.25.8

package/tests/assets/sdk-a/components/create/override-sdk/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;
@@ -20,6 +20,7 @@ interface RadioButtonsProps extends PConnFieldProps {
   // If any, enter additional props that only exist on RadioButtons here
   inline: boolean;
   fieldMetadata?: any;
+  variant?: string;
 }
 
 @Component({
@@ -27,159 +28,60 @@ interface RadioButtonsProps extends PConnFieldProps {
   templateUrl: './radio-buttons.component.html',
   styleUrls: ['./radio-buttons.component.scss'],
   providers: [Utils],
-  standalone: true,
   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;
-
-  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();
-  }
+  variant?: string;
 
-  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 || '';
-
-    // 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);
-    }
-
-    if (this.configProps$.inline != null) {
-      this.bInline$ = this.utils.getBooleanValue(this.configProps$.inline);
-    }
+    // Update component common properties
+    this.updateComponentCommonProperties(this.configProps$);
 
-    if (this.configProps$.disabled != undefined) {
-      this.bDisabled$ = this.utils.getBooleanValue(this.configProps$.disabled);
-    }
+    // Extract and normalize the value property
+    const { value } = this.configProps$;
+    this.value$ = value;
 
-    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';
@@ -187,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 {
@@ -218,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/tests/assets/sdk-a/components/create/override-sdk/field/rich-text/rich-text.component.html

@@ -1,6 +1,7 @@
 <div *ngIf="displayMode$; else noDisplayMode">
   <component-mapper *ngIf="bVisible$ !== false" name="FieldValueList" [props]="{ label$, value$, displayMode$, isHtml$: true }"></component-mapper>
 </div>
+
 <ng-template #noDisplayMode>
   <div *ngIf="!bReadonly$; else noEdit">
     <div *ngIf="bVisible$">
@@ -13,6 +14,7 @@
     </div>
   </div>
 </ng-template>
+
 <ng-template #noEdit>
   <div *ngIf="bVisible$ !== false">
     <component-mapper name="RichTextEditor" [props]="{ label: label$, value: value$, readonly: true, testId }" [parent]="this"></component-mapper>

package/tests/assets/sdk-a/components/create/override-sdk/field/rich-text/rich-text.component.scss

@@ -0,0 +1,172 @@
+@use '@angular/material' as mat;
+
+:host {
+  display: block;
+  background-color: var(--mat-sys-surface, #fff);
+  color: var(--mat-sys-on-surface, #000);
+}
+
+::ng-deep {
+  .tox-tinymce {
+    border: 1px solid var(--mat-sys-outline, #ccc) !important;
+    border-radius: 4px !important;
+  }
+
+  .tox-edit-area__iframe {
+    background-color: transparent !important;
+  }
+
+  .tox .tox-toolbar,
+  .tox .tox-toolbar__primary,
+  .tox .tox-editor-header {
+    background-color: var(--mat-sys-surface-container-high, #f0f0f0) !important;
+    border-bottom: 1px solid var(--mat-sys-outline-variant, #ccc) !important;
+  }
+
+  .tox .tox-tbtn {
+    color: var(--mat-sys-on-surface-variant, #555) !important;
+    background: transparent !important;
+  }
+
+  .tox .tox-tbtn svg {
+    fill: var(--mat-sys-on-surface-variant, #555) !important;
+  }
+
+  .tox .tox-tbtn:hover {
+    background: var(--mat-sys-hover-state-layer-opacity, rgba(0, 0, 0, 0.05)) !important;
+  }
+
+  .tox .tox-tbtn--enabled,
+  .tox .tox-tbtn--enabled:hover {
+    background: var(--mat-sys-secondary-container, #e8def8) !important;
+    color: var(--mat-sys-on-secondary-container, #1d192b) !important;
+  }
+
+  .tox .tox-tbtn--enabled svg {
+    fill: var(--mat-sys-on-secondary-container, #1d192b) !important;
+  }
+
+  .tox .tox-tbtn--select {
+    background-color: transparent !important;
+    margin: 2px 0;
+  }
+
+  .tox .tox-tbtn__select-label {
+    color: var(--mat-sys-on-surface, #000) !important;
+  }
+
+  .tox .tox-tbtn__select-chevron svg {
+    fill: var(--mat-sys-on-surface-variant, #555) !important;
+  }
+
+  .tox .tox-tbtn--select:hover {
+    background-color: var(--mat-sys-hover-state-layer-opacity, rgba(0, 0, 0, 0.05)) !important;
+  }
+
+  .tox .tox-statusbar {
+    background-color: var(--mat-sys-surface-container-high, #f0f0f0) !important;
+    border-top: 1px solid var(--mat-sys-outline-variant, #ccc) !important;
+    color: var(--mat-sys-on-surface-variant, #555) !important;
+  }
+
+  .tox .tox-dialog {
+    background-color: var(--mat-sys-surface-container, #fff) !important;
+    color: var(--mat-sys-on-surface, #000) !important;
+    border: 1px solid var(--mat-sys-outline-variant, #ccc) !important;
+    box-shadow: 0 4px 12px var(--mat-sys-shadow, rgba(0, 0, 0, 0.2)) !important;
+  }
+
+  .tox .tox-dialog__header {
+    background-color: var(--mat-sys-surface-container, #fff) !important;
+    color: var(--mat-sys-on-surface, #000) !important;
+    border-bottom: 1px solid var(--mat-sys-outline-variant, #ccc) !important;
+  }
+
+  .tox .tox-dialog__footer {
+    background-color: var(--mat-sys-surface-container, #fff) !important;
+    border-top: 1px solid var(--mat-sys-outline-variant, #ccc) !important;
+  }
+
+  .tox .tox-dialog-wrap__backdrop {
+    background-color: var(--mat-sys-scrim, rgba(0, 0, 0, 0.5)) !important;
+    opacity: 0.6;
+  }
+
+  .tox .tox-dialog__body input,
+  .tox .tox-dialog__body textarea,
+  .tox .tox-dialog__body select {
+    background-color: transparent !important;
+    color: var(--mat-sys-on-surface, #000) !important;
+    border: 1px solid var(--mat-sys-outline, #ccc) !important;
+    border-radius: 4px !important;
+  }
+
+  .tox .tox-label {
+    color: var(--mat-sys-on-surface-variant, #555) !important;
+  }
+
+  .tox .tox-button--icon--hover:hover {
+    background-color: var(--mat-sys-hover-state-layer-opacity) !important;
+    color: var(--mat-sys-on-surface) !important;
+  }
+
+  .tox .tox-dialog__footer .tox-button {
+    background-color: var(--mat-sys-primary, #6200ee) !important;
+    color: var(--mat-sys-on-primary, #fff) !important;
+    border: none !important;
+  }
+
+  .tox .tox-dialog__footer .tox-button--secondary {
+    background-color: transparent !important;
+    color: var(--mat-sys-primary, #6200ee) !important;
+    border: 1px solid var(--mat-sys-outline, #ccc) !important;
+  }
+}
+
+::ng-deep {
+  .tox .tox-menu {
+    background-color: var(--mat-sys-surface-container, #2e334f) !important;
+    border: 1px solid var(--mat-sys-outline-variant, #404562) !important;
+    box-shadow: 0 4px 10px var(--mat-sys-shadow, rgba(0, 0, 0, 0.3)) !important;
+  }
+
+  .tox .tox-collection__item {
+    color: var(--mat-sys-on-surface, #dde1ff) !important;
+  }
+
+  .tox .tox-collection__item--active {
+    background-color: var(--mat-sys-secondary-container, #810081) !important;
+    color: var(--mat-sys-on-secondary-container, #ffd7f5) !important;
+  }
+
+  .tox .tox-collection__item-icon svg {
+    fill: var(--mat-sys-on-surface, #dde1ff) !important;
+  }
+
+  .tox .tox-collection__item-accessory {
+    color: var(--mat-sys-on-surface-variant, #c0c5e7) !important;
+  }
+
+  .tox .tox-swatches__picker-btn {
+    border-color: var(--mat-sys-outline-variant) !important;
+  }
+
+  .tox .tox-listbox {
+    background-color: transparent !important;
+    border: 1px solid var(--mat-sys-outline, #8a8faf) !important;
+    color: var(--mat-sys-on-surface, #dde1ff) !important;
+  }
+
+  .tox .tox-listbox__select-chevron svg {
+    fill: var(--mat-sys-on-surface-variant, #c0c5e7) !important;
+  }
+
+  .tox .tox-listbox__select-label {
+    color: var(--mat-sys-on-surface, #dde1ff) !important;
+  }
+
+  .tox .tox-listboxfield .tox-listbox--select {
+    background-color: transparent !important;
+    color: var(--mat-sys-on-surface, #dde1ff) !important;
+  }
+}

package/tests/assets/sdk-a/components/create/override-sdk/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';
@@ -15,110 +15,39 @@ interface RichTextProps extends PConnFieldProps {
   selector: 'app-rich-text',
   templateUrl: './rich-text.component.html',
   styleUrls: ['./rich-text.component.scss'],
-  standalone: true,
   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';
+    // Update component common properties
+    this.updateComponentCommonProperties(this.configProps$);
 
-    this.actionsApi = this.pConn$.getActionsApi();
-    this.propName = this.pConn$.getStateProps().value;
+    // Extract and normalize the value property
+    const { value, helperText } = this.configProps$;
+    this.value$ = value;
 
-    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);
-    }
-
-    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) {
     const oldVal = this.value$ ?? '';
     const newVal = editorValue?.editor?.getBody()?.innerHTML ?? '';
+
     const isValueChanged = newVal.toString() !== oldVal.toString();
 
     if (isValueChanged || this.status === 'error') {
@@ -133,6 +62,7 @@ export class RichTextComponent implements OnInit, OnDestroy {
 
   fieldOnBlur(editorValue: any) {
     const oldVal = this.value$ ?? '';
+
     const isValueChanged = editorValue.toString() !== oldVal.toString();
 
     if (isValueChanged) {