@pega/react-sdk-overrides 0.23.25 → 0.23.27

package/lib/template/ListView/config-ext.json

@@ -4,6 +4,5 @@
   "description": "Table Template",
   "type": "Template",
   "subtype": "LIST",
-  "properties": [
-  ]
+  "properties": []
 }

package/lib/template/ListView/{hooks.js → hooks.ts}

@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
+
 import { getContext, readContextResponse } from './utils';
 
 export default function useInit(props) {
-  const PCore = window.PCore;
   const {
     referenceList,
     getPConnect,
@@ -27,21 +27,22 @@ export default function useInit(props) {
 
     (async function init() {
       // promise to fetch metadata
-      const metaDataPromise = PCore.getAnalyticsUtils().getDataViewMetadata(referenceList, showDynamicFields);
+      // @ts-ignore - 3rd parameter "associationFilter" should be optional for getDataViewMetadata method
+      const metaDataPromise: Promise<any> = PCore.getAnalyticsUtils().getDataViewMetadata(referenceList, showDynamicFields);
 
       const promisesArray = [metaDataPromise];
 
       // promise to fetch report configured columns
-      const reportColumnsPromise = PCore.getAnalyticsUtils()
-        .getFieldsForDataSource(referenceList, false, getPConnect().getContextName())
-        .catch(() => {
-          return Promise.resolve({
-            data: { data: [] }
-          });
+      const reportColumnsPromise = (
+        PCore.getAnalyticsUtils().getFieldsForDataSource(referenceList, false, getPConnect().getContextName()) as Promise<any>
+      ).catch(() => {
+        return Promise.resolve({
+          data: { data: [] }
         });
+      });
       promisesArray.push(reportColumnsPromise);
 
-      const fetchEditDetails = async (metadata) => {
+      const fetchEditDetails = async metadata => {
         const {
           data: { isQueryable }
         } = metadata;
@@ -62,7 +63,7 @@ export default function useInit(props) {
         return Promise.resolve();
       };
 
-      const editPromise = metaDataPromise.then((metadata) => fetchEditDetails(metadata));
+      const editPromise = metaDataPromise.then(metadata => fetchEditDetails(metadata));
       promisesArray.push(editPromise);
       getContext({
         tableSource: referenceList,
@@ -74,20 +75,19 @@ export default function useInit(props) {
         isSearchable,
         isCacheable: true,
         xRayUid
-      })
-        .then(async (context) => {
-          if (isCompStillMounted) {
-            return readContextResponse(context, {
-              ...props,
-              editing,
-              selectionCountThreshold,
-              ref,
-              selectionMode,
-              xRayUid,
-              cosmosTableRef
-            });
-          }
-        });
+      }).then(async context => {
+        if (isCompStillMounted) {
+          return readContextResponse(context, {
+            ...props,
+            editing,
+            selectionCountThreshold,
+            ref,
+            selectionMode,
+            xRayUid,
+            cosmosTableRef
+          });
+        }
+      });
     })();
 
     return () => {

package/lib/template/ListView/{utils.js → utils.ts}

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 import getDefaultViewMeta from './DefaultViewMeta';
 
 const USER_REFERENCE = 'UserReference';
@@ -8,16 +7,51 @@ const PAGELIST = '!PL!';
 export const formatConstants = {
   WorkStatus: 'WorkStatus',
   Integer: 'Integer',
-  WorkLink: 'WorkLink',
+  WorkLink: 'WorkLink'
 };
 
+class DataApi {
+  mappedPropertyToOriginalProperty: any;
+  originalPropertyToMappedProperty: any;
+  constructor() {
+    this.originalPropertyToMappedProperty = {};
+    this.mappedPropertyToOriginalProperty = {};
+    this.setPropertyMaps = this.setPropertyMaps.bind(this);
+    this.getMappedProperty = this.getMappedProperty.bind(this);
+    this.getOriginalProperty = this.getOriginalProperty.bind(this);
+  }
+
+  setPropertyMaps(originalToMappedPropertyObj = {}, mappedToOriginalPropertyObj = {}) {
+    this.originalPropertyToMappedProperty = {
+      ...this.originalPropertyToMappedProperty,
+      ...originalToMappedPropertyObj
+    };
+    this.mappedPropertyToOriginalProperty = {
+      ...this.mappedPropertyToOriginalProperty,
+      ...mappedToOriginalPropertyObj
+    };
+  }
+
+  getMappedProperty(propertyName) {
+    return this.originalPropertyToMappedProperty[propertyName] ?? propertyName;
+  }
+
+  getOriginalProperty(propertyName) {
+    return this.mappedPropertyToOriginalProperty[propertyName] ?? propertyName;
+  }
+}
+
 export async function getContext(componentConfig) {
   const {
-    promisesArray = [], // array of promises which can be invoked paralelly,
+    promisesArray = [] // array of promises which can be invoked paralelly,
   } = componentConfig;
   const promisesResponseArray = await Promise.all(promisesArray);
+  const dataApi = new DataApi();
   return {
     promisesResponseArray,
+    setPropertyMaps: dataApi.setPropertyMaps,
+    getMappedProperty: dataApi.getMappedProperty,
+    getOriginalProperty: dataApi.getOriginalProperty
   };
 }
 
@@ -32,7 +66,7 @@ export async function getContext(componentConfig) {
  * getFieldNameFromEmbeddedFieldName('!P!Organisation:Name') return 'Organisation.Name'
  * getFieldNameFromEmbeddedFieldName('!PL!Employees:Name') return 'Employees.Name'
  */
- export function getFieldNameFromEmbeddedFieldName(propertyName) {
+export function getFieldNameFromEmbeddedFieldName(propertyName) {
   let value = propertyName;
   if (value.startsWith(PAGE) || value.startsWith(PAGELIST)) {
     value = value.substring(value.lastIndexOf('!') + 1);
@@ -47,15 +81,15 @@ export async function getContext(componentConfig) {
  * @ignore
  * @param {Array} metaFields  Fields metadata Array. Contains metadata of all the fields.
  */
- export function updateMetaEmbeddedFieldID(metaFields) {
-  return metaFields.forEach((metaField) => {
+export function updateMetaEmbeddedFieldID(metaFields) {
+  return metaFields.forEach(metaField => {
     if (metaField.fieldID?.startsWith(PAGE) || metaField.fieldID?.startsWith(PAGELIST)) {
       metaField.fieldID = getFieldNameFromEmbeddedFieldName(metaField.fieldID);
     }
   });
 }
 
-export const isEmbeddedField = (field) => {
+export const isEmbeddedField = field => {
   if (field?.startsWith('@')) {
     field = field.substring(field.indexOf(' ') + 1);
     if (field[0] === '.') field = field.substring(1);
@@ -63,6 +97,94 @@ export const isEmbeddedField = (field) => {
   return field?.indexOf('.') > 0;
 };
 
+/**
+ * [isPageListProperty]
+ * Description    -        checking if propertyName is pageList or not
+ * @ignore
+ * @param {string} propertyName   PropertyName
+ * @returns {boolean}  true if property is pageList else false
+ *
+ * @example <caption>Example for isPageListProperty </caption>
+ * isPageListProperty('!PL!Employees.Name') return true
+ * isPageListProperty('!P!Employees.Name') return false
+ * isPageListProperty('Name') return false
+ */
+export function isPageListProperty(propertyName) {
+  return propertyName.startsWith(PAGELIST);
+}
+
+export const isPageListInPath = (propertyName, currentClassID) => {
+  if (!propertyName.includes('.')) {
+    return false;
+  }
+  const [first, ...rest] = propertyName.split('.');
+  const metadata: any = PCore.getMetadataUtils().getPropertyMetadata(first, currentClassID);
+  if (metadata?.type === 'Page List') {
+    return true;
+  }
+  return isPageListInPath(rest.join('.'), metadata?.pageClass);
+};
+
+/**
+ * [getEmbeddedFieldName]
+ * Description    -               converting normal field name to embedded field starting with !P! or !PL!
+ * @ignore
+ * @param {string} propertyName   Field name
+ * @param {string} classID        classID of datapage
+ * @returns {string}              returns converted string with !P! or !PL! and :
+ *
+ * @example <caption>Example for getEmbeddedFieldName </caption>
+ * For page property, getEmbeddedFieldName('Organisation.Name') return '!P!Organisation:Name'
+ * For pageList property, getEmbeddedFieldName('Employees.Name') return '!PL!Employees:Name'
+ */
+
+export function getEmbeddedFieldName(propertyName, classID) {
+  let value = propertyName;
+  if (isPageListInPath(value, classID)) {
+    value = `!PL!${value.replace(/\./g, ':')}`;
+  } else {
+    value = `!P!${value.replace(/\./g, ':')}`;
+  }
+  return value;
+}
+
+/**
+ * [preparePropertyMaps]
+ * Description    -        preparing maps for property names and set it in dataApi context
+ * @ignore
+ * @param {Array} fields   fields array
+ * @param {string} classID  classID of datapage
+ * @param {string} context  dataApi context
+ * @returns {boolean} true if pageListProperty is present
+ */
+export function preparePropertyMaps(fields, classID, context) {
+  const { setPropertyMaps } = context;
+  const maps = fields.reduce(
+    (acc, field) => {
+      let { value } = field.config;
+      if (value.startsWith('@')) {
+        value = value.substring(value.indexOf(' ') + 1);
+        if (value[0] === '.') value = value.substring(1);
+      }
+      let name = value;
+      // Preparing name for embedded property
+      if (isEmbeddedField(name)) {
+        name = getEmbeddedFieldName(name, classID);
+      }
+      if (isPageListProperty(name) && !acc[2]) {
+        acc[2] = true;
+      }
+      acc[0][value] = name;
+      acc[1][name] = value;
+
+      return acc;
+    },
+    [{}, {}, false]
+  );
+  setPropertyMaps(maps[0], maps[1]);
+  return maps[2];
+}
+
 /**
  * [getConfigEmbeddedFieldsMeta]
  * Description    -           Get the metadata for configured embedded fields
@@ -72,15 +194,16 @@ export const isEmbeddedField = (field) => {
  * @returns {Array}           Metadata of configured embedded fields
  */
 export function getConfigEmbeddedFieldsMeta(configFields, classID) {
-  const configEmbeddedFieldsMeta = [];
-  configFields.forEach((field) => {
+  const configEmbeddedFieldsMeta: any[] = [];
+  configFields.forEach(field => {
     let value = field;
     if (isEmbeddedField(value)) {
       // conversion Page.PageList[].property => Page.PageList.property
       if (value.includes('[')) {
         value = value.substring(0, value.indexOf('[')) + value.substring(value.indexOf(']') + 1);
       }
-      const meta = PCore.getMetadataUtils().getEmbeddedPropertyMetadata(value, classID);
+      // @ts-ignore - Expected 3 arguments, but got 2.
+      const meta: any = PCore.getMetadataUtils().getEmbeddedPropertyMetadata(value, classID);
       meta.fieldID = field;
       configEmbeddedFieldsMeta.push(meta);
     }
@@ -97,8 +220,8 @@ export function getConfigEmbeddedFieldsMeta(configFields, classID) {
  */
 export function mergeConfigEmbeddedFieldsMeta(configEmbeddedFieldsMeta, metaFields) {
   const mergedMetaFields = [...metaFields];
-  configEmbeddedFieldsMeta.forEach((configFieldMeta) => {
-    const fieldMeta = metaFields.find((metaField) => metaField.fieldID === configFieldMeta.fieldID);
+  configEmbeddedFieldsMeta.forEach(configFieldMeta => {
+    const fieldMeta = metaFields.find(metaField => metaField.fieldID === configFieldMeta.fieldID);
     if (!fieldMeta) mergedMetaFields.push(configFieldMeta);
   });
   return mergedMetaFields;
@@ -115,8 +238,8 @@ const oldToNewFieldTypeMapping = {
  * @ignore
  * @param {Array} metaFields  Fields metadata Array. Contains metadata of all the fields.
  */
- function updateFieldType(metaFields) {
-  metaFields.forEach((metaField) => {
+function updateFieldType(metaFields) {
+  metaFields.forEach(metaField => {
     if (metaField.type) metaField.type = oldToNewFieldTypeMapping[metaField.type] || metaField.type;
   });
 }
@@ -141,8 +264,8 @@ function getPresetMetaAttribute(attribute) {
  * @param   {string}  classID          Class ID from the response
  * @returns {Array}                    List of fields with updated meta objects.
  */
- function generateViewMetaData(rawFields, classID, showField) {
-  return rawFields.map((item) => getDefaultViewMeta(item, classID, showField));
+function generateViewMetaData(rawFields, classID, showField) {
+  return rawFields.map(item => getDefaultViewMeta(item, classID, showField));
 }
 
 /**
@@ -155,9 +278,9 @@ function getPresetMetaAttribute(attribute) {
  * @param   {string}  classID           Class ID from the response
  * @returns {Array}                     List of all fields with their meta updated.
  */
- function getConfigFields(configFields, primaryFields, metaFields, classID) {
+function getConfigFields(configFields, primaryFields, metaFields, classID) {
   const presetConfigFields = configFields;
-  const primaryFieldsViewIndex = presetConfigFields.findIndex((field) => field.config.value === 'pyPrimaryFields');
+  const primaryFieldsViewIndex = presetConfigFields.findIndex(field => field.config.value === 'pyPrimaryFields');
   if (!primaryFields || !primaryFields.length) {
     if (primaryFieldsViewIndex < 0) return presetConfigFields;
 
@@ -169,12 +292,11 @@ function getPresetMetaAttribute(attribute) {
   if (primaryFieldsViewIndex > -1) {
     // list of uncommon fields - non overlap of primary fields grouped view and independent entity columns of primary type
     const uncommonFieldsList = primaryFields.filter(
-      (primaryField) =>
-        !presetConfigFields.some((presetConfigField) => presetConfigField.config.value.split('.')[1] === primaryField)
+      primaryField => !presetConfigFields.some(presetConfigField => presetConfigField.config.value.split('.')[1] === primaryField)
     );
-    const uncommonFieldsRawMeta = [];
-    uncommonFieldsList.forEach((uncommonField) => {
-      const uncommonFieldMeta = metaFields.find((metaField) => metaField.fieldID === uncommonField);
+    const uncommonFieldsRawMeta: any[] = [];
+    uncommonFieldsList.forEach(uncommonField => {
+      const uncommonFieldMeta = metaFields.find(metaField => metaField.fieldID === uncommonField);
       if (uncommonFieldMeta) uncommonFieldsRawMeta.push(uncommonFieldMeta);
     });
     const uncommonFieldsConfigMeta = generateViewMetaData(uncommonFieldsRawMeta, classID, true);
@@ -196,14 +318,7 @@ function getPresetMetaAttribute(attribute) {
  * @param   {Array}     metaFields          List of all metafields
  * @returns {object}                        Table config object
  */
- export function getTableConfigFromPresetMeta(
-  presetMeta,
-  isMetaWithPresets,
-  getPConnect,
-  classID,
-  primaryFields,
-  metaFields
-) {
+export function getTableConfigFromPresetMeta(presetMeta, isMetaWithPresets, getPConnect, classID, primaryFields, metaFields) {
   let presetId;
   let presetName;
   let cardHeader;
@@ -228,7 +343,7 @@ function getPresetMetaAttribute(attribute) {
     [fieldsMeta] = presetMeta.children;
     if (
       presetMeta.timelineTitle &&
-      !fieldsMeta.children.find((fieldMeta) => {
+      !fieldsMeta.children.find(fieldMeta => {
         return fieldMeta?.config?.value === presetMeta.timelineTitle?.config?.value;
       })
     ) {
@@ -237,7 +352,7 @@ function getPresetMetaAttribute(attribute) {
     }
     if (
       presetMeta.timelineDate &&
-      !fieldsMeta.children.find((fieldMeta) => {
+      !fieldsMeta.children.find(fieldMeta => {
         return fieldMeta?.config?.value === presetMeta.timelineDate?.config?.value;
       })
     ) {
@@ -251,7 +366,7 @@ function getPresetMetaAttribute(attribute) {
       fieldsMeta
         .getPConnect()
         .getChildren()
-        ?.map((child) => {
+        ?.map(child => {
           return child.getPConnect().getRawMetadata();
         }),
       primaryFields,
@@ -281,12 +396,12 @@ function getPresetMetaAttribute(attribute) {
  * @param   {object} response -
  * @returns {Set} Set of columns from the report response
  */
- function getReportColumns(response) {
+function getReportColumns(response) {
   const {
     data: { data: reportColumns }
   } = response;
   const reportColumnsSet = new Set();
-  reportColumns?.forEach((item) => {
+  reportColumns?.forEach(item => {
     let val = item.pyFieldName;
     // Remove '.' from index 0 only, if '.' is present
     if (val[0] === '.') {
@@ -305,7 +420,7 @@ function getPresetMetaAttribute(attribute) {
  *                   config.value - Raw value
  * @returns {string} value - Value with out any annotations or "."
  */
- function getConfigFieldValue(config) {
+function getConfigFieldValue(config) {
   let { value } = config;
   if (value.startsWith('@')) {
     value = value.substring(value.indexOf(' ') + 1);
@@ -324,7 +439,7 @@ function getPresetMetaAttribute(attribute) {
  */
 function prepareConfigFields(configFields, pushToComponentsList) {
   const configFieldSet = new Set();
-  configFields.forEach((item) => {
+  configFields.forEach(item => {
     pushToComponentsList(item.type);
     const val = getConfigFieldValue(item.config);
     configFieldSet.add(val);
@@ -340,8 +455,8 @@ function prepareConfigFields(configFields, pushToComponentsList) {
  * @param   {string}  fieldID      Filter
  * @returns {object}              config with its field value equal to fieldID, which means an authored field
  */
- function findAuthoredField(configFields, fieldID) {
-  return configFields.find((configField) => {
+function findAuthoredField(configFields, fieldID) {
+  return configFields.find(configField => {
     const val = getConfigFieldValue(configField.config);
     return val === fieldID;
   });
@@ -355,7 +470,7 @@ function prepareConfigFields(configFields, pushToComponentsList) {
  * @param   {object}  item        Field item to copy displayAs and category information
  * @param   {string}  classId     classID from the response
  */
- function findAndUpdateAuthoredFieldConfig(configFields, item, classId) {
+function findAndUpdateAuthoredFieldConfig(configFields, item, classId) {
   const authoredField = findAuthoredField(configFields, item.fieldID);
   if (authoredField?.config) {
     if (item.displayAs) {
@@ -387,7 +502,7 @@ function prepareConfigFields(configFields, pushToComponentsList) {
  * @param   {boolean} showDynamicFields Flag indicating whether fields are fetched dynamically at runtime
  * @returns {boolean}                  true If the field is an extra field else false.
  */
- function isAnExtraField(configFields, configFieldSet, reportColumnsSet, item, classId, showDynamicFields) {
+function isAnExtraField(configFields, configFieldSet, reportColumnsSet, item, classId, showDynamicFields) {
   // Is the field already present in authoring metadata?
   // Mutates config fields to copy displayAs and category information
   if (configFieldSet.has(item.fieldID)) {
@@ -411,16 +526,9 @@ function prepareConfigFields(configFields, pushToComponentsList) {
  * @param   {boolean} showDynamicFields Flag indicating whether fields are fetched dynamically at runtime
  * @returns {Array}                    List of extra fields with their meta updated.
  */
- function prepareExtraFields(
-  metaFields,
-  configFields,
-  configFieldSet,
-  reportColumnsSet,
-  classID,
-  showDynamicFields
-) {
+function prepareExtraFields(metaFields, configFields, configFieldSet, reportColumnsSet, classID, showDynamicFields) {
   // Filter all the extra fields
-  const extraFileds = metaFields.filter((item) => {
+  const extraFileds = metaFields.filter(item => {
     return isAnExtraField(configFields, configFieldSet, reportColumnsSet, item, classID, showDynamicFields);
   });
   return generateViewMetaData(extraFileds, classID, false);
@@ -443,10 +551,7 @@ function populateRenderingOptions(name, config, field) {
     config.cellRenderer = formatConstants.Integer;
   }
 }
-export function initializeColumns(
-  fields = [],
-  getMappedProperty
-) {
+export function initializeColumns(fields: any[] = [], getMappedProperty: any = null) {
   return fields.map((field, originalColIndex) => {
     let name = field.config.value;
 
@@ -475,7 +580,7 @@ export function initializeColumns(
       fieldType: field.config.fieldType,
       meta: {
         ...field
-      },
+      }
     };
 
     populateRenderingOptions(name, config, field);
@@ -484,9 +589,9 @@ export function initializeColumns(
   });
 }
 
-export const getItemKey = (fields) => {
+export const getItemKey = fields => {
   let itemKey;
-  if (fields.findIndex((field) => field.id === 'pyGUID') > -1) {
+  if (fields.findIndex(field => field.id === 'pyGUID') > -1) {
     itemKey = 'pyGUID';
   } else {
     itemKey = 'pzInsKey';
@@ -495,9 +600,9 @@ export const getItemKey = (fields) => {
 };
 
 export function preparePatchQueryFields(fields, isDataObject = false, classID = '') {
-  const queryFields = [];
-  fields.forEach((field) => {
-    const patchFields = [];
+  const queryFields: any[] = [];
+  fields.forEach(field => {
+    const patchFields: any[] = [];
     if (field.cellRenderer === 'WorkLink') {
       if (field.customObject && field.customObject.isAssignmentLink) {
         const associationName = field.name.includes(':') ? `${field.name.split(':')[0]}:` : '';
@@ -511,17 +616,15 @@ export function preparePatchQueryFields(fields, isDataObject = false, classID =
       } else if (isDataObject) {
         const dataViewName = PCore.getDataTypeUtils().getSavableDataPage(classID);
         const dataPageKeys = PCore.getDataTypeUtils().getDataPageKeys(dataViewName);
-        dataPageKeys?.forEach((item) =>
-          item.isAlternateKeyStorage ? patchFields.push(item.linkedField) : patchFields.push(item.keyName)
-        );
+        dataPageKeys?.forEach(item => (item.isAlternateKeyStorage ? patchFields.push(item.linkedField) : patchFields.push(item.keyName)));
       } else {
         patchFields.push('pyID');
         patchFields.push('pzInsKey');
         patchFields.push('pxObjClass');
       }
     }
-    patchFields.forEach((k) => {
-      if (!queryFields.find((q) => q === k)) {
+    patchFields.forEach(k => {
+      if (!queryFields.find(q => q === k)) {
         queryFields.push(k);
       }
     });
@@ -530,19 +633,28 @@ export function preparePatchQueryFields(fields, isDataObject = false, classID =
   return queryFields;
 }
 
+/**
+ * Update the renderer type for the properties of type Page.
+ */
+export function updatePageFieldsConfig(configFields, parentClassID) {
+  return configFields.forEach(item => {
+    const {
+      type,
+      config: { value }
+    } = item;
+    const propertyName = PCore.getAnnotationUtils().getPropertyName(value);
+    if (isEmbeddedField(value) && !isPageListInPath(propertyName, parentClassID)) {
+      item.config.componentType = type;
+      item.type = 'PagePropertyRenderer';
+    }
+  });
+}
+
 export const readContextResponse = async (context, params) => {
-  const {
-    getPConnect,
-    apiContext,
-    setListContext,
-    children,
-    showDynamicFields,
-    referenceList,
-    isDataObject
-  } = params;
+  const { getPConnect, apiContext, setListContext, children, showDynamicFields, referenceList, isDataObject } = params;
   const { promisesResponseArray, apiContext: otherContext } = context;
   // eslint-disable-next-line sonarjs/no-unused-collection
-  const listOfComponents = [];
+  const listOfComponents: any[] = [];
   const {
     data: { fields: metaFields, classID, isQueryable }
   } = promisesResponseArray[0];
@@ -551,7 +663,7 @@ export const readContextResponse = async (context, params) => {
   } = promisesResponseArray[0];
   // When list is configured with Include all class fields configuration, provide support for Primary fields column
   if (showDynamicFields) {
-    const sourceMetadata = PCore.getMetadataUtils().getDataPageMetadata(referenceList);
+    const sourceMetadata: any = PCore.getMetadataUtils().getDataPageMetadata(referenceList);
     if (sourceMetadata?.primaryFields) {
       primaryFields = sourceMetadata.primaryFields;
     }
@@ -560,14 +672,11 @@ export const readContextResponse = async (context, params) => {
   }
   updateFieldType(metaFields);
 
-
   if (isDataObject) {
-    const compositeKeys = [];
+    const compositeKeys: any[] = [];
     const dataViewName = PCore.getDataTypeUtils().getSavableDataPage(classID);
     const dataPageKeys = PCore.getDataTypeUtils().getDataPageKeys(dataViewName);
-    dataPageKeys?.forEach((item) =>
-      item.isAlternateKeyStorage ? compositeKeys.push(item.linkedField) : compositeKeys.push(item.keyName)
-    );
+    dataPageKeys?.forEach(item => (item.isAlternateKeyStorage ? compositeKeys.push(item.linkedField) : compositeKeys.push(item.keyName)));
     if (compositeKeys.length) {
       otherContext.setCompositeKeys(compositeKeys);
     }
@@ -583,9 +692,7 @@ export const readContextResponse = async (context, params) => {
   let fields;
   let tableConfig;
   childrenIterator?.forEach((presetMeta, index) => {
-    const {
-      configFields
-    } = getTableConfigFromPresetMeta(
+    const { configFields } = getTableConfigFromPresetMeta(
       { ...presetMeta, label: resolvedPresets[index].label },
       isMetaWithPresets,
       getPConnect,
@@ -593,7 +700,7 @@ export const readContextResponse = async (context, params) => {
       primaryFields,
       metaFields
     );
-    const pushToComponentsList = (fieldType) => {
+    const pushToComponentsList = fieldType => {
       listOfComponents.push(fieldType);
     };
     // read report columns response - in case of nonqueryable ignore the response and rely only on the fields configured at authoing time in presets
@@ -617,20 +724,24 @@ export const readContextResponse = async (context, params) => {
       showDynamicFields
     );
 
+    if (isQueryable) {
+      updatePageFieldsConfig(configFields, classID);
+      preparePropertyMaps([...configFields, ...extraFields], classID, context);
+    }
 
-    fields = initializeColumns(
-      [...configFields, ...extraFields],
-    );
+    const { getMappedProperty } = context;
+
+    fields = initializeColumns([...configFields, ...extraFields], getMappedProperty);
     const patchQueryFields = preparePatchQueryFields(fields, isDataObject, classID);
     const itemKey = getItemKey(fields);
-    tableConfig = { fieldDefs: fields, patchQueryFields, itemKey, isQueryable}
+    tableConfig = { fieldDefs: fields, patchQueryFields, itemKey, isQueryable };
   });
   const meta = tableConfig;
   setListContext({
     meta,
     presets: presetArray,
     apiContext: {
-      ...apiContext,
+      ...apiContext
     }
   });
 };