@pega/angular-sdk-overrides 24.2.10 → 24.2.12

package/lib/template/field-group-template/field-group-template.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, forwardRef, OnDestroy, OnChanges } from '@angular/core';
+import { Component, OnInit, Input, forwardRef, OnDestroy, OnChanges, AfterViewInit } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormGroup } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
@@ -6,11 +6,14 @@ import { AngularPConnectData, AngularPConnectService } from '@pega/angular-sdk-c
 import { buildView, getReferenceList } from '@pega/angular-sdk-components';
 import { Utils } from '@pega/angular-sdk-components';
 import { ComponentMapperComponent } from '@pega/angular-sdk-components';
+import { evaluateAllowRowAction } from '@pega/angular-sdk-components';
 
 interface FieldGroupTemplateProps {
   // If any, enter additional props that only exist on this component
   label?: string;
-  showLabel?: boolean;
+  hideLabel?: boolean;
+  allowActions?: any;
+  allowRowDelete?: any;
   referenceList?: any[];
   contextClass: string;
   renderMode?: string;
@@ -19,6 +22,7 @@ interface FieldGroupTemplateProps {
   displayMode?: string;
   fieldHeader?: string;
   allowTableEdit: boolean;
+  targetClassLabel?: string;
 }
 
 @Component({
@@ -28,26 +32,27 @@ interface FieldGroupTemplateProps {
   standalone: true,
   imports: [CommonModule, MatButtonModule, forwardRef(() => ComponentMapperComponent)]
 })
-export class FieldGroupTemplateComponent implements OnInit, OnDestroy, OnChanges {
+export class FieldGroupTemplateComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit {
   @Input() configProps$: FieldGroupTemplateProps;
   @Input() pConn$: typeof PConnect;
   @Input() formGroup$: FormGroup;
 
   angularPConnectData: AngularPConnectData = {};
-  inheritedProps$: object;
+
   showLabel$?: boolean = true;
   label$?: string;
   readonlyMode: boolean;
   contextClass: any;
-  referenceList: any;
-  pageReference: any;
   heading: any;
   children: any;
   menuIconOverride$: any;
-  prevRefLength: number;
-  allowAddEdit: boolean;
+  referenceListLength: number;
   fieldHeader: any;
 
+  allowAdd = true;
+  allowEdit = true;
+  allowDelete = true;
+
   constructor(
     private angularPConnect: AngularPConnectService,
     private utils: Utils
@@ -58,9 +63,21 @@ export class FieldGroupTemplateComponent implements OnInit, OnDestroy, OnChanges
     this.angularPConnectData = this.angularPConnect.registerAndSubscribeComponent(this, this.onStateChange);
     this.updateSelf();
 
-    const menuIconOverride$ = 'trash';
-    if (menuIconOverride$) {
-      this.menuIconOverride$ = this.utils.getImageSrc(menuIconOverride$, this.utils.getSDKStaticContentUrl());
+    this.menuIconOverride$ = this.utils.getImageSrc('trash', this.utils.getSDKStaticContentUrl());
+
+    const { allowActions, allowTableEdit, referenceList } = this.configProps$;
+
+    if (allowActions && Object.keys(allowActions).length > 0) {
+      this.allowAdd = allowActions.allowAdd ?? allowTableEdit ?? true;
+      this.allowEdit = allowActions.allowEdit ?? true;
+      this.allowDelete = allowActions.allowDelete ?? allowTableEdit ?? true;
+    } else {
+      this.allowAdd = allowTableEdit ?? true;
+      this.allowDelete = allowTableEdit ?? true;
+    }
+
+    if (referenceList?.length === 0 && (this.allowAdd || this.allowEdit)) {
+      this.pConn$.getListActions().insert({ classID: this.contextClass }, referenceList.length);
     }
   }
 
@@ -85,56 +102,57 @@ export class FieldGroupTemplateComponent implements OnInit, OnDestroy, OnChanges
       const props = changes.configProps$;
       if (props.currentValue !== props.previousValue) {
         this.configProps$ = props.currentValue;
+
         if (changes?.pConn$?.currentValue) {
           this.pConn$ = changes?.pConn$?.currentValue;
         }
+
         this.updateSelf();
       }
     }
   }
 
+  ngAfterViewInit() {
+    const resolvedList = getReferenceList(this.pConn$);
+    // @ts-ignore - Expected 3 arguments, but got 1
+    this.pConn$.getListActions().initDefaultPageInstructions(resolvedList);
+  }
+
   updateSelf() {
-    this.inheritedProps$ = this.pConn$.getInheritedProps();
-    this.label$ = this.configProps$.label;
-    this.showLabel$ = this.configProps$.showLabel;
-    // label & showLabel within inheritedProps takes precedence over configProps
-    this.label$ = (this.inheritedProps$ as any).label || this.label$;
-    this.showLabel$ = (this.inheritedProps$ as any).showLabel || this.showLabel$;
+    const inheritedProps: any = this.pConn$.getInheritedProps();
 
-    this.allowAddEdit = this.configProps$.allowTableEdit;
+    const { label, hideLabel, allowRowDelete, referenceList, fieldHeader, renderMode, displayMode, heading, contextClass, lookForChildInConfig } =
+      this.configProps$;
+
+    // label within inheritedProps takes precedence over configProps
+    this.label$ = inheritedProps.label || label;
+
+    this.showLabel$ = referenceList?.length === 0 || !hideLabel;
 
-    const renderMode = this.configProps$.renderMode;
-    const displayMode = this.configProps$.displayMode;
     this.readonlyMode = renderMode === 'ReadOnly' || displayMode === 'DISPLAY_ONLY';
-    this.contextClass = this.configProps$.contextClass;
-    const lookForChildInConfig = this.configProps$.lookForChildInConfig;
-    this.heading = this.configProps$.heading ?? 'Row';
-    this.fieldHeader = this.configProps$.fieldHeader;
+
+    this.contextClass = contextClass;
+    this.heading = heading ?? 'Row';
+    this.fieldHeader = fieldHeader;
+
     const resolvedList = getReferenceList(this.pConn$);
-    this.pageReference = `${this.pConn$.getPageReference()}${resolvedList}`;
     this.pConn$.setReferenceList(resolvedList);
+
     if (this.readonlyMode) {
       this.pConn$.setInheritedProp('displayMode', 'DISPLAY_ONLY');
     }
-    this.referenceList = this.configProps$.referenceList;
-    if (this.prevRefLength != this.referenceList.length) {
-      // eslint-disable-next-line sonarjs/no-collapsible-if
-      if (!this.readonlyMode) {
-        if (this.referenceList?.length === 0 && this.allowAddEdit !== false) {
-          this.addFieldGroupItem();
-        }
-      }
-      const children: any = [];
-      this.referenceList?.forEach((item, index) => {
-        children.push({
+
+    if (this.referenceListLength != referenceList?.length) {
+      this.children = referenceList?.map((item, index) => {
+        return {
           id: index,
           name: this.fieldHeader === 'propertyRef' ? this.getDynamicHeader(item, index) : this.getStaticHeader(this.heading, index),
-          children: buildView(this.pConn$, index, lookForChildInConfig)
-        });
+          children: buildView(this.pConn$, index, lookForChildInConfig),
+          allowRowDelete: evaluateAllowRowAction(allowRowDelete, item)
+        };
       });
-      this.children = children;
     }
-    this.prevRefLength = this.referenceList.length;
+    this.referenceListLength = referenceList?.length || 0;
   }
 
   getStaticHeader = (heading, index) => {
@@ -149,10 +167,15 @@ export class FieldGroupTemplateComponent implements OnInit, OnDestroy, OnChanges
   };
 
   addFieldGroupItem() {
-    this.pConn$.getListActions().insert({ classID: this.contextClass }, this.referenceList.length);
+    this.pConn$.getListActions().insert({ classID: this.contextClass }, this.referenceListLength);
   }
 
   deleteFieldGroupItem(index) {
     this.pConn$.getListActions().deleteEntry(index);
   }
+
+  getAddBtnLabel() {
+    const { targetClassLabel } = this.configProps$;
+    return targetClassLabel ? `+ Add ${targetClassLabel}` : '+ Add';
+  }
 }

package/lib/template/field-value-list/field-value-list.component.html

@@ -1,5 +1,5 @@
-<div *ngIf="displayMode$ === 'DISPLAY_ONLY'; else STACKED_LARGE_VAL" class="psdk-container-labels-left">
-  <div class="psdk-grid-label">{{ label$ }}</div>
+<div *ngIf="displayMode$ === 'DISPLAY_ONLY'; else STACKED_LARGE_VAL" [ngClass]="label$ ? 'psdk-container-labels-left' : 'psdk-container-nolabels'">
+  <div *ngIf="label$" class="psdk-grid-label">{{ label$ }}</div>
   <div class="psdk-val-labels-left">
     <ng-container *ngTemplateOutlet="valueTemplate"></ng-container>
   </div>

package/lib/template/field-value-list/field-value-list.component.scss

@@ -6,6 +6,10 @@
   align-items: start;
   padding-block: 8px;
 }
+.psdk-container-nolabels {
+  align-items: start;
+  padding-block: 8px;
+}
 .psdk-value {
   margin: 8px 0px;
 }

package/lib/template/list-view/list-view.component.html

@@ -180,7 +180,9 @@
               <tr mat-header-row *matHeaderRowDef="displayedColumns$"></tr>
             </table>
           </div>
-          <div class="psdk-no-records" *ngIf="repeatListData?.length === 0">No Records Found.</div>
+          <div class="psdk-no-records" *ngIf="repeatListData?.length === 0">
+            {{ utils.getGenericFieldsLocalizedValue('CosmosFields.fields.lists', 'No records found.') }}
+          </div>
         </div>
       </div>
     </div>

package/lib/template/list-view/list-view.component.ts

@@ -23,8 +23,6 @@ import { formatters } from '@pega/angular-sdk-components';
 
 import { init } from './listViewHelpers';
 
-declare const window: any;
-
 const SELECTION_MODE = { SINGLE: 'single', MULTI: 'multi' };
 
 interface ListViewProps {
@@ -165,7 +163,7 @@ export class ListViewComponent implements OnInit, OnDestroy {
 
   constructor(
     private psService: ProgressSpinnerService,
-    private utils: Utils
+    public utils: Utils
   ) {}
 
   ngOnInit(): void {

package/lib/template/list-view/listViewHelpers.ts

@@ -1,8 +1,5 @@
 import { getContext, readContextResponse } from './utils';
 
-// Remove this and use "real" PCore type once .d.ts is fixed (currently shows 1 error)
-declare const PCore: any;
-
 export function init(props) {
   const {
     referenceList,
@@ -25,9 +22,9 @@ export function init(props) {
   let selectionCountThreshold;
 
   // promise to fetch metadata
-  const metaDataPromise = PCore.getAnalyticsUtils().getDataViewMetadata(referenceList, showDynamicFields);
+  const metaDataPromise = PCore.getAnalyticsUtils().getDataViewMetadata(referenceList, showDynamicFields, null);
 
-  const promisesArray = [metaDataPromise];
+  const promisesArray: any = [metaDataPromise];
 
   // promise to fetch report configured columns
   const reportColumnsPromise = PCore.getAnalyticsUtils()

package/lib/template/list-view/utils.ts

@@ -1,8 +1,5 @@
 import { getDefaultViewMeta } from './DefaultViewMeta';
 
-// Remove this and use "real" PCore type once .d.ts is fixed (currently shows 5 errors)
-declare const PCore: any;
-
 const USER_REFERENCE = 'UserReference';
 const PAGE = '!P!';
 const PAGELIST = '!PL!';
@@ -121,7 +118,7 @@ export const isPageListInPath = (propertyName, currentClassID) => {
     return false;
   }
   const [first, ...rest] = propertyName.split('.');
-  const metadata = PCore.getMetadataUtils().getPropertyMetadata(first, currentClassID);
+  const metadata: any = PCore.getMetadataUtils().getPropertyMetadata(first, currentClassID);
   if (metadata?.type === 'Page List') {
     return true;
   }
@@ -205,7 +202,7 @@ export function getConfigEmbeddedFieldsMeta(configFields, classID) {
       if (value.includes('[')) {
         value = value.substring(0, value.indexOf('[')) + value.substring(value.indexOf(']') + 1);
       }
-      const meta = PCore.getMetadataUtils().getEmbeddedPropertyMetadata(value, classID);
+      const meta: any = PCore.getMetadataUtils().getEmbeddedPropertyMetadata(value, classID);
       meta.fieldID = field;
       configEmbeddedFieldsMeta.push(meta);
     }

package/lib/template/simple-table-manual/helpers.ts

@@ -44,18 +44,20 @@ function getFieldWidth(field, label) {
 export const getContext = thePConn => {
   const contextName = thePConn.getContextName();
   const pageReference = thePConn.getPageReference();
-  // 8.7 change = referenceList may now be in top-level of state props,
-  //  not always in config of state props
-  let { referenceList } = thePConn.getStateProps()?.config || thePConn.getStateProps();
+  const { readonlyContextList, referenceList = readonlyContextList } = thePConn.getStateProps()?.config || thePConn.getStateProps();
+
   const pageReferenceForRows = referenceList.startsWith('.') ? `${pageReference}.${referenceList.substring(1)}` : referenceList;
+  const viewName = thePConn.viewName;
 
   // removing "caseInfo.content" prefix to avoid setting it as a target while preparing pageInstructions
-  referenceList = pageReferenceForRows.replace(PCore.getConstants().CASE_INFO.CASE_INFO_CONTENT, '');
+  // skipping the removal as StateMachine itself is removing this case info prefix while preparing pageInstructions
+  // referenceList = pageReferenceForRows.replace(PCore.getConstants().CASE_INFO.CASE_INFO_CONTENT, '');
 
   return {
     contextName,
     referenceListStr: referenceList,
-    pageReferenceForRows
+    pageReferenceForRows,
+    viewName
   };
 };
 
@@ -189,7 +191,7 @@ export const createMetaForTable = (fields, renderMode) => {
 };
 
 export const filterDataByDate = (item, filterObj) => {
-  let bKeep;
+  let bKeep = true;
   let value = item[filterObj.ref] != null || item[filterObj.ref] != '' ? getSeconds(item[filterObj.ref]) : null;
   let filterValue = filterObj.containsFilterValue != null && filterObj.containsFilterValue != '' ? getSeconds(filterObj.containsFilterValue) : null;
 
@@ -237,7 +239,7 @@ export const filterDataByDate = (item, filterObj) => {
 };
 
 export const filterDataByCommonFields = (item, filterObj) => {
-  let bKeep;
+  let bKeep = true;
   const value = item[filterObj.ref].toLowerCase();
   const filterValue = filterObj.containsFilterValue.toLowerCase();
 

package/lib/template/simple-table-manual/simple-table-manual.component.html

@@ -3,8 +3,8 @@
     <h3 *ngIf="label" className="label" style="font-weight: bold">
       {{ label }} <span class="results-count">{{ getResultsText() }}</span>
     </h3>
-    <table *ngIf="readOnlyMode || allowEditingInModal" mat-table [dataSource]="rowData" class="mat-elevation-z8" id="readonly-table" matSort>
-      <ng-container *ngFor="let dCol of processedFields" [matColumnDef]="dCol.config.name">
+    <table *ngIf="readOnlyMode || allowEditingInModal" mat-table [dataSource]="elementsData" class="mat-elevation-z8" id="readonly-table" matSort>
+      <ng-container *ngFor="let dCol of processedFields; let i = index" [matColumnDef]="dCol.config.name">
         <th mat-header-cell *matHeaderCellDef mat-sort-header (click)="_headerSortClick($event, dCol)" arrowPosition="before">
           <div>{{ dCol.config.label }}</div>
           <div class="psdk-mat-header-filter">
@@ -27,7 +27,16 @@
             </mat-menu>
           </div>
         </th>
-        <td mat-cell *matCellDef="let element">{{ element[dCol.config.name] || '---' }}</td>
+        <td mat-cell *matCellDef="let element">
+          <component-mapper
+            [name]="element[i].getPConnect().getComponentName()"
+            [props]="{
+              pConn$: element[i].getPConnect(),
+              formGroup$: formGroup$
+            }"
+            errorMsg="Table wants component not yet available: {{ element[i].getPConnect().getComponentName() }}"
+          ></component-mapper>
+        </td>
       </ng-container>
       <ng-container matColumnDef="DeleteIcon">
         <div *ngIf="allowEditingInModal">
@@ -47,6 +56,11 @@
       </ng-container>
       <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
       <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+      <tr class="mat-row psdk-no-records" *matNoDataRow>
+        <td id="no-records" class="mat-cell" [attr.colspan]="displayedColumns.length">
+          {{ utils.getGenericFieldsLocalizedValue('CosmosFields.fields.lists', 'No records found.') }}
+        </td>
+      </tr>
     </table>
     <table *ngIf="editableMode && !allowEditingInModal" mat-table [dataSource]="elementsData" class="mat-elevation-z8" id="editable-table">
       <ng-container *ngFor="let dCol of fieldDefs; let i = index">
@@ -74,11 +88,16 @@
       </ng-container>
       <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
       <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+      <tr class="mat-row psdk-no-records" *matNoDataRow>
+        <td id="no-records" class="mat-cell" [attr.colspan]="displayedColumns.length">
+          {{ utils.getGenericFieldsLocalizedValue('CosmosFields.fields.lists', 'No records found.') }}
+        </td>
+      </tr>
     </table>
-    <div class="psdk-no-records" id="no-records" *ngIf="editableMode && referenceList?.length === 0">No Records Found.</div>
-    <div class="psdk-no-records" id="no-records" *ngIf="readOnlyMode && rowData?.data?.length === 0">No Records Found.</div>
   </div>
-  <button *ngIf="showAddRowButton" mat-button color="primary" style="font-size: 16px" (click)="addRecord()">+ Add</button>
+  <button *ngIf="showAddRowButton" mat-button color="primary" style="font-size: 16px" (click)="addRecord()">
+    + {{ localizedVal('Add', localeCategory) }}
+  </button>
 </ng-container>
 
 <!-- pop overs for filters-->

package/lib/template/simple-table-manual/simple-table-manual.component.scss

@@ -5,6 +5,10 @@
   margin-top: 0.5rem;
   margin-bottom: 0.5rem;
   overflow-y: auto;
+  box-shadow:
+    0px 2px 1px -1px rgba(0, 0, 0, 0.2),
+    0px 1px 1px 0px rgba(0, 0, 0, 0.14),
+    0px 1px 3px 0px rgba(0, 0, 0, 0.12);
 }
 
 table {
@@ -24,6 +28,12 @@ td.mat-mdc-cell,
 td.mat-mdc-footer-cell {
   border-right: 1px solid var(--app-neutral-light-color);
   padding: 8px !important;
+  min-width: 10rem;
+}
+
+::ng-deep th.mat-mdc-header-cell:last-child,
+td.mat-mdc-cell:last-child {
+  min-width: 2rem;
 }
 
 ::ng-deep .mat-mdc-button {
@@ -160,9 +170,7 @@ tr.mat-mdc-header-row {
 
 .psdk-no-records {
   height: 56px;
-  justify-content: center;
-  display: flex;
-  align-items: center;
+  text-align: center;
   border: 1px solid var(--app-neutral-light-color);
   border-top: none;
   background: var(--app-form-color);

package/lib/template/simple-table-manual/simple-table-manual.component.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 import { Component, OnInit, Input, ViewChild, forwardRef, OnDestroy } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormGroup } from '@angular/forms';
@@ -18,11 +17,10 @@ import { AngularPConnectData, AngularPConnectService } from '@pega/angular-sdk-c
 import { DatapageService } from '@pega/angular-sdk-components';
 import { getReferenceList } from '@pega/angular-sdk-components';
 import { buildFieldsForTable, filterDataByCommonFields, filterDataByDate, getContext } from './helpers';
+import { evaluateAllowRowAction } from '@pega/angular-sdk-components';
 import { Utils } from '@pega/angular-sdk-components';
 import { getSeconds } from '@pega/angular-sdk-components';
 
-declare const window: any;
-
 interface SimpleTableManualProps {
   // If any, enter additional props that only exist on this component
   visibility?: boolean;
@@ -37,7 +35,9 @@ interface SimpleTableManualProps {
   contextClass?: string;
   propertyLabel?: string;
   fieldMetadata?: any;
+  allowActions?: any;
   allowTableEdit?: boolean;
+  allowRowDelete?: any;
   editMode?: string;
   addAndEditRowsWithin?: any;
   viewForAddAndEditModal?: any;
@@ -104,6 +104,7 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
   showAddRowButton: boolean;
   prevReferenceList: any[] = [];
   elementsData: MatTableDataSource<any>;
+  originalElementsData: MatTableDataSource<any>;
   rawFields: any;
   label?: string = '';
   searchIcon$: string;
@@ -160,14 +161,16 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
 
   isInitialized = false;
   targetClassLabel: string;
-
+  localizedVal = PCore.getLocaleUtils().getLocaleValue;
+  localeCategory = 'SimpleTable';
   constructor(
     private angularPConnect: AngularPConnectService,
-    private utils: Utils,
+    public utils: Utils,
     private dataPageService: DatapageService
   ) {}
 
   ngOnInit(): void {
+    this.elementsData = new MatTableDataSource<any>([]);
     this.isInitialized = true;
     // First thing in initialization is registering and subscribing to the AngularPConnect service
     this.angularPConnectData = this.angularPConnect.registerAndSubscribeComponent(this, this.onStateChange);
@@ -229,7 +232,9 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
       renderMode,
       children, // destructure children into an array var: "resolvedFields"
       presets,
+      allowActions,
       allowTableEdit,
+      allowRowDelete,
       label: labelProp,
       propertyLabel,
       fieldMetadata,
@@ -243,12 +248,22 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
       targetClassLabel
     } = this.configProps$;
 
+    const simpleTableManualProps: any = {};
+    if (this.checkIfAllowActionsOrRowEditingExist(allowActions) && editMode) {
+      simpleTableManualProps.hideAddRow = allowActions?.allowAdd === false;
+      simpleTableManualProps.hideDeleteRow = allowActions?.allowDelete === false;
+      simpleTableManualProps.hideEditRow = allowActions?.allowEdit === false;
+      simpleTableManualProps.disableDragDrop = allowActions?.allowDragDrop === false;
+    } else if (allowTableEdit === false) {
+      simpleTableManualProps.hideAddRow = true;
+      simpleTableManualProps.hideDeleteRow = true;
+      simpleTableManualProps.disableDragDrop = true;
+    }
+
     this.referenceListStr = getContext(this.pConn$).referenceListStr;
     this.label = labelProp || propertyLabel;
     this.parameters = fieldMetadata?.datasource?.parameters;
     this.targetClassLabel = targetClassLabel;
-    const hideAddRow = allowTableEdit === false;
-    const hideDeleteRow = allowTableEdit === false;
     let { contextClass } = this.configProps$;
     this.referenceList = referenceList;
     if (!contextClass) {
@@ -285,10 +300,10 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
     this.readOnlyMode = renderMode === 'ReadOnly';
     this.editableMode = renderMode === 'Editable';
     const isDisplayModeEnabled = displayMode === 'DISPLAY_ONLY';
-    this.showAddRowButton = !this.readOnlyMode && !hideAddRow;
+    this.showAddRowButton = !this.readOnlyMode && !simpleTableManualProps.hideAddRow;
     this.allowEditingInModal =
       (editMode ? editMode === 'modal' : addAndEditRowsWithin === 'modal') && !(renderMode === 'ReadOnly' || isDisplayModeEnabled);
-    const showDeleteButton = this.editableMode && !hideDeleteRow;
+    const showDeleteButton = this.editableMode && !simpleTableManualProps.hideDeleteRow && evaluateAllowRowAction(allowRowDelete, this.rowData);
     this.defaultView = editModeConfig ? editModeConfig.defaultView : viewForAddAndEditModal;
     this.bUseSeparateViewForEdit = editModeConfig ? editModeConfig.useSeparateViewForEdit : useSeparateViewForEdit;
     this.editView = editModeConfig ? editModeConfig.editView : viewForEditModal;
@@ -327,7 +342,7 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
     });
 
     // for adding rows to table when editable and not modal view
-    if (this.prevReferenceList.length !== this.referenceList.length && this.editableMode && !this.allowEditingInModal) {
+    if (this.prevReferenceList.length !== this.referenceList.length) {
       this.buildElementsForTable();
     }
 
@@ -354,6 +369,10 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
     //  ties the 3 data structures together.
   }
 
+  checkIfAllowActionsOrRowEditingExist(newflagobject) {
+    return (newflagobject && Object.keys(newflagobject).length > 0) || this.pConn$.getComponentConfig().allowRowEdit;
+  }
+
   initializeDefaultPageInstructions() {
     if (this.isInitialized) {
       this.isInitialized = false;
@@ -375,8 +394,8 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
   }
 
   sortCompare(a, b): number {
-    let aValue = a[this.compareRef];
-    let bValue = b[this.compareRef];
+    let aValue = a[0][this.compareRef];
+    let bValue = b[0][this.compareRef];
 
     if (this.compareType == 'Date' || this.compareType == 'DateTime') {
       aValue = getSeconds(aValue);
@@ -499,17 +518,20 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
     // run through list of elements in path, if menu not in th path, then want to
     // hide (toggle) the menu
     const eventPath = event.path;
-    for (let eventIndex = 0; eventIndex < eventPath.length; eventIndex++) {
-      if (
-        eventPath[eventIndex].className == 'psdk-modal-file-top' ||
-        eventPath[eventIndex].tagName == 'BUTTON' ||
-        eventPath[eventIndex].tagName == 'MAT-OPTION' ||
-        eventPath[eventIndex].tagName == 'MAT-INPUT'
-      ) {
-        bInPopUp = true;
-        break;
+    if (eventPath) {
+      for (let eventIndex = 0; eventIndex < eventPath.length; eventIndex++) {
+        if (
+          eventPath[eventIndex].className == 'psdk-modal-file-top' ||
+          eventPath[eventIndex].tagName == 'BUTTON' ||
+          eventPath[eventIndex].tagName == 'MAT-OPTION' ||
+          eventPath[eventIndex].tagName == 'MAT-INPUT'
+        ) {
+          bInPopUp = true;
+          break;
+        }
       }
     }
+
     if (!bInPopUp) {
       // this.bShowFilterPopover$ = false;
 
@@ -628,7 +650,8 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
     }
   }
 
-  filterData(item: any) {
+  filterData(element: any) {
+    const item = element[0];
     let bKeep = true;
     for (const filterObj of this.filterByColumns) {
       if (filterObj.containsFilterValue != '' || filterObj.containsFilter == 'null' || filterObj.containsFilter == 'notnull') {
@@ -642,6 +665,8 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
             bKeep = filterDataByCommonFields(item, filterObj);
             break;
         }
+      } else if (filterObj.containsFilterValue === '') {
+        bKeep = true;
       }
 
       // if don't keep stop filtering
@@ -654,14 +679,22 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
   }
 
   filterSortGroupBy() {
-    let theData = this.originalData.slice();
+    let theData = this.originalData.slice().map((item, index) => {
+      return [item, index];
+    });
 
     // last filter config data is global
     theData = theData.filter(this.filterData.bind(this));
 
     // last sort config data is global
     theData.sort(this.sortCompare.bind(this));
-    this.rowData.data = theData;
+    this.rowData.data = theData.map(item => item[0]);
+
+    const newElements: any = new Array(this.rowData.data.length);
+    theData.forEach((item, index) => {
+      newElements[index] = this.originalElementsData[item[1]];
+    });
+    this.elementsData = newElements;
   }
 
   _headerSortClick(event, columnData) {
@@ -960,6 +993,10 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
     this.referenceList.forEach((element, index) => {
       const data: any = [];
       this.rawFields?.forEach(item => {
+        item = {
+          ...item,
+          config: { ...item.config, label: '', displayMode: this.readOnlyMode || this.allowEditingInModal ? 'DISPLAY_ONLY' : undefined }
+        };
         const referenceListData = getReferenceList(this.pConn$);
         const isDatapage = referenceListData.startsWith('D_');
         const pageReferenceValue = isDatapage ? `${referenceListData}[${index}]` : `${this.pConn$.getPageReference()}${referenceListData}[${index}]`;
@@ -977,6 +1014,7 @@ export class SimpleTableManualComponent implements OnInit, OnDestroy {
       });
       eleData.push(data);
     });
+    this.originalElementsData = eleData;
     this.elementsData = eleData;
   }
 }