fixed the conflicts

Author: manasa

packages/react-sdk-components/src/components/template/AdvancedSearch/SearchGroup/persistUtils.ts

@@ -1,7 +1,13 @@
-import { getMappedKey } from '../../DataReference/persistUtils';
-
 const SKIP_CACHE_KEY = '';
 
+export function getMappedKey(key) {
+  const mappedKey = PCore.getEnvironmentInfo().getKeyMapping(key);
+  if (!mappedKey) {
+    return key;
+  }
+  return mappedKey;
+}
+
 const getComponentStateKey = (getPConnect, propertyName: string) => {
   const pConnect = getPConnect();
   const caseID = `.${getMappedKey('pyID')}`; // Enhance this later when use-case arrives for data objects using S&S.
@@ -39,8 +45,7 @@ const setComponentCache = ({
   options: ReturnType<typeof getComponentStateOptions>;
 }) => {
   if (cacheKey !== SKIP_CACHE_KEY) {
-    // @ts-ignore
-    PCore.getNavigationUtils().setComponentCache(cacheKey, state, options);
+    (PCore.getNavigationUtils() as any).setComponentCache(cacheKey, state, options);
   }
 };
 

packages/react-sdk-components/src/components/template/DataReference/DataReference.tsx

@@ -3,8 +3,8 @@ import React, { PropsWithChildren, ReactElement, useEffect, useMemo, useState }
 import { getComponentFromMap } from '../../../bridge/helpers/sdk_component_map';
 import { PConnProps } from '../../../types/PConnProps';
 import useIsMount from './useIsMount';
-import componentCachePersistUtils from './persistUtils';
-import { getMappedKey } from './persistUtils';
+import componentCachePersistUtils from '../AdvancedSearch/SearchGroup/persistUtils';
+import { getMappedKey } from '../AdvancedSearch/SearchGroup/persistUtils';
 import DataReferenceAdvancedSearchContext from './DataReferenceAdvancedSearchContext';
 import { getFirstChildConfig } from './utils';
 import SearchForm from './SearchForm';

packages/react-sdk-components/src/components/template/DataReference/persistUtils.ts

@@ -208,6 +208,7 @@ export default function ListView(props: ListViewProps) {
 
   const classes = useStyles();
 
+  // Hook to clear the selections and update table in AdvancedSearch template when switching between search views
   function useClearSelectionsAndUpdateTable({ getPConnect, uniqueId, viewName }) {
     const clearSelectionsAndRefreshList = useCallback(
       ({ viewName: name, clearSelections }) => {
@@ -423,8 +424,9 @@ export default function ListView(props: ListViewProps) {
           [`T${index++}`]: { ...filter[relationalOp][1].condition }
         };
         if (dashboardFilterPayload.query.filter.logic) {
-          dashboardFilterPayload.query.filter.logic = `${dashboardFilterPayload.query.filter.logic} ${relationalOp} (T${index - 2
-            } ${dateRelationalOp} T${index - 1})`;
+          dashboardFilterPayload.query.filter.logic = `${dashboardFilterPayload.query.filter.logic} ${relationalOp} (T${
+            index - 2
+          } ${dateRelationalOp} T${index - 1})`;
         } else {
           dashboardFilterPayload.query.filter.logic = `(T${index - 2} ${relationalOp} T${index - 1})`;
         }
@@ -483,9 +485,9 @@ export default function ListView(props: ListViewProps) {
     // getDataAsync isn't returning correct data for the Page(i.e. ListView within a page) case
     return !bInForm
       ? // @ts-ignore - 3rd parameter "context" should be optional in getData method
-      PCore.getDataApiUtils().getData(referenceList, payload)
+        PCore.getDataApiUtils().getData(referenceList, payload)
       : // @ts-ignore - Argument of type 'null' is not assignable to parameter of type 'object'
-      PCore.getDataPageUtils().getDataAsync(referenceList, context, payload ? payload.dataViewParameters : dataViewParameters, null, query);
+        PCore.getDataPageUtils().getDataAsync(referenceList, context, payload ? payload.dataViewParameters : dataViewParameters, null, query);
   }
 
   const buildSelect = (fieldDefs, colId, patchQueryFields = [], compositeKeys = []) => {

packages/react-sdk-components/src/components/template/ListView/ListView.tsx

@@ -10,30 +10,11 @@ export const formatConstants = {
   WorkLink: 'WorkLink'
 };
 
-function formatPromotedFilters(promotedFilters) {
-  return Object.entries(promotedFilters).reduce((acc, [field, value]) => {
-    if (value) {
-      acc[field] = {
-        lhs: {
-          field
-        },
-        comparator: 'EQ',
-        rhs: {
-          value
-        }
-      };
-    }
-    return acc;
-  }, {});
-}
-
 class DataApi {
   mappedPropertyToOriginalProperty: any;
   originalPropertyToMappedProperty: any;
-  promotedFilters: any;
   showRecords: any;
-  constructor(promotedFilters = undefined, showRecords = true) {
-    this.promotedFilters = promotedFilters;
+  constructor(showRecords = true) {
     this.showRecords = showRecords;
     this.originalPropertyToMappedProperty = {};
     this.mappedPropertyToOriginalProperty = {};
@@ -65,10 +46,6 @@ class DataApi {
   getOriginalProperty(propertyName) {
     return this.mappedPropertyToOriginalProperty[propertyName] ?? propertyName;
   }
-
-  updatePromotedFilters(promotedFilters, formatRequired = true) {
-    this.promotedFilters = formatRequired ? formatPromotedFilters(promotedFilters) : promotedFilters;
-  }
 }
 
 export async function getContext(componentConfig) {
@@ -79,7 +56,6 @@ export async function getContext(componentConfig) {
   const dataApi = new DataApi();
   return {
     promisesResponseArray,
-    updatePromotedFilters: dataApi.updatePromotedFilters,
     setPropertyMaps: dataApi.setPropertyMaps,
     getMappedProperty: dataApi.getMappedProperty,
     getOriginalProperty: dataApi.getOriginalProperty
@@ -707,10 +683,9 @@ export function updatePageFieldsConfig(configFields, parentClassID) {
 
 export const readContextResponse = async (context, params) => {
   const { getPConnect, apiContext, setListContext, children, showDynamicFields, referenceList, isDataObject, ref } = params;
-  const { promisesResponseArray, updatePromotedFilters, setShowRecords, apiContext: otherContext } = context;
+  const { promisesResponseArray, setShowRecords, apiContext: otherContext } = context;
   // eslint-disable-next-line sonarjs/no-unused-collection
   const listOfComponents: any[] = [];
-  ref.updatePromotedFilters = updatePromotedFilters;
   ref.setShowRecords = setShowRecords;
   const {
     data: { fields: metaFields, classID, isQueryable }