Skip to content

Commit 0e35f21

Browse files
author
Sharma
committed
Removed a duplicate utility function, converted a couple of files to typescript
1 parent 156b6f5 commit 0e35f21

File tree

6 files changed

+19
-23
lines changed

6 files changed

+19
-23
lines changed

packages/react-sdk-components/src/components/field/SelectableCard/utils.tsx

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
import { Link } from '@mui/material';
22

3+
import { Utils } from '../../helpers/utils';
4+
35
export const getResolvedConstantValue = (pConnect, key) => {
46
// @ts-ignore
57
return pConnect.getValue(PCore.getResolvedConstantValue(key)) || pConnect.getValue(key);
68
};
79

8-
export function getMappedKey(key) {
9-
const mappedKey = PCore.getEnvironmentInfo().getKeyMapping(key);
10-
if (!mappedKey) {
11-
return key;
12-
}
13-
return mappedKey;
14-
}
15-
1610
export const resolveReferencedPConnect = pConnect => {
1711
if (!pConnect || !pConnect.meta) return undefined;
1812
const type = pConnect?._type ?? undefined;
@@ -39,7 +33,7 @@ export function prepareComponentInCaseSummary(pConnectMeta: any, getPConnect: Fu
3933
let { type } = pConnectMeta;
4034
let showAddressLabel = true;
4135

42-
if (config && config.value === `@P .${getMappedKey('pyStatusWork')}`) {
36+
if (config && config.value === `@P .${Utils.getMappedKey('pyStatusWork')}`) {
4337
config.displayAsStatus = true;
4438
type = 'TextInput'; // force the type to be TextInput for status field.
4539
// As TextInput is loaded forcefully sometimes, TextInput component might not be available in lazy map.

packages/react-sdk-components/src/components/helpers/utils.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,14 @@ export class Utils {
337337
static isObject(objValue) {
338338
return objValue && typeof objValue === 'object' && objValue.constructor === Object;
339339
}
340+
341+
static getMappedKey(key) {
342+
const mappedKey = PCore.getEnvironmentInfo().getKeyMapping(key);
343+
if (!mappedKey) {
344+
return key;
345+
}
346+
return mappedKey;
347+
}
340348
}
341349

342350
export default Utils;

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
const SKIP_CACHE_KEY = '';
1+
import { Utils } from '../../../helpers/utils';
22

3-
export function getMappedKey(key) {
4-
const mappedKey = PCore.getEnvironmentInfo().getKeyMapping(key);
5-
if (!mappedKey) {
6-
return key;
7-
}
8-
return mappedKey;
9-
}
3+
const SKIP_CACHE_KEY = '';
104

115
const getComponentStateKey = (getPConnect, propertyName: string) => {
126
const pConnect = getPConnect();
13-
const caseID = `.${getMappedKey('pyID')}`; // Enhance this later when use-case arrives for data objects using S&S.
7+
const caseID = `.${Utils.getMappedKey('pyID')}`; // Enhance this later when use-case arrives for data objects using S&S.
148
const resolvedCaseID = pConnect.getValue(caseID);
159

1610
if (!resolvedCaseID) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { getComponentFromMap } from '../../../bridge/helpers/sdk_component_map';
44
import type { PConnProps } from '../../../types/PConnProps';
55
import useIsMount from '../../../hooks/useIsMount';
66
import componentCachePersistUtils from '../AdvancedSearch/SearchGroup/persistUtils';
7-
import { getMappedKey } from '../AdvancedSearch/SearchGroup/persistUtils';
87
import DataReferenceAdvancedSearchContext from './DataReferenceAdvancedSearchContext';
8+
import { Utils } from '../../helpers/utils';
99
import { getFirstChildConfig } from './utils';
1010

1111
// ReferenceProps can't be used until getComponentConfig() is NOT private
@@ -77,7 +77,7 @@ export default function DataReference(props: PropsWithChildren<DataReferenceProp
7777
const isDDSourceDeferred =
7878
(firstChildMeta?.type === 'Dropdown' && selectionMode === SELECTION_MODE.SINGLE && refFieldMetadata?.descriptors) ||
7979
firstChildMeta.config.deferDatasource;
80-
const pyID = getMappedKey('pyID');
80+
const pyID = Utils.getMappedKey('pyID');
8181
const isInfinity = pyID === 'pyID';
8282
const { allowImplicitRefresh } = isInfinity
8383
? PCore.getFieldDefaultUtils().fieldDefaults.DataReference || {}

packages/react-sdk-components/src/components/template/DataReference/DataReferenceAdvancedSearchContext.js renamed to packages/react-sdk-components/src/components/template/DataReference/DataReferenceAdvancedSearchContext.ts

File renamed without changes.

packages/react-sdk-components/src/components/template/DataReference/utils.js renamed to packages/react-sdk-components/src/components/template/DataReference/utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export function getFieldMeta(getPConnect, dataRelationshipContext) {
2323
const fieldMetadata =
2424
(isMultiSelectMode ? pConn.getFieldMetadata(`${referenceProp}`) : pConn.getCurrentPageFieldMetadata(contextPageReference)) ?? {};
2525
const { datasource: { parameters: fieldParameters = {} } = {} } = fieldMetadata;
26-
const compositeKeys = [];
27-
Object.values(fieldParameters).forEach(param => {
26+
const compositeKeys: any = [];
27+
Object.values(fieldParameters).forEach((param: any) => {
2828
if (isSelfReferencedProperty(param, referenceProp)) compositeKeys.push(param.substring(param.lastIndexOf('.') + 1));
2929
});
3030

@@ -38,7 +38,7 @@ export function getFieldMeta(getPConnect, dataRelationshipContext) {
3838
const getCompositeKeys = (pConnect, property) => {
3939
const fieldMetadata = pConnect.getFieldMetadata(property) || {};
4040
const { datasource: { parameters: fieldParameters = {} } = {} } = fieldMetadata;
41-
const compositeKeys = [];
41+
const compositeKeys: any = [];
4242
Object.values(fieldParameters).forEach(param => {
4343
if (isSelfReferencedProperty(param, property)) {
4444
compositeKeys.push(param);

0 commit comments

Comments
 (0)