Rename uniqueIdentifier to universalIdentifier (#14201)
This commit is contained in:
+1
-1
@@ -19,7 +19,7 @@ type GetWorkspaceMigrationUpdateFieldActionArgs = FromTo<
|
||||
'FlatFieldMetadata'
|
||||
>;
|
||||
/**
|
||||
* This comparator handles update on colliding uniqueIdentifier flatFieldMetadata
|
||||
* This comparator handles update on colliding universalIdentifier flatFieldMetadata
|
||||
*/
|
||||
export const compareTwoFlatFieldMetadata = ({
|
||||
fromFlatFieldMetadata,
|
||||
|
||||
+4
-3
@@ -22,7 +22,8 @@ export const fromFieldMetadataEntityToFlatRelationTargetFieldMetadata = (
|
||||
fieldMetadataEntity: FieldMetadataEntity<RelationAndMorphRelationFieldMetadataType>,
|
||||
): FlatRelationTargetFieldMetadata => {
|
||||
return {
|
||||
uniqueIdentifier: fieldMetadataEntity.standardId ?? fieldMetadataEntity.id,
|
||||
universalIdentifier:
|
||||
fieldMetadataEntity.standardId ?? fieldMetadataEntity.id,
|
||||
...removePropertiesFromRecord(fieldMetadataEntity, [
|
||||
'relationTargetObjectMetadata',
|
||||
'relationTargetFieldMetadata',
|
||||
@@ -78,7 +79,7 @@ export const fromFieldMetadataEntityToFlatFieldMetadata = <
|
||||
|
||||
return {
|
||||
...fieldMetadataWithoutRelations,
|
||||
uniqueIdentifier:
|
||||
universalIdentifier:
|
||||
fieldMetadataWithoutRelations.standardId ??
|
||||
fieldMetadataWithoutRelations.id,
|
||||
flatRelationTargetFieldMetadata,
|
||||
@@ -96,7 +97,7 @@ export const fromFieldMetadataEntityToFlatFieldMetadata = <
|
||||
|
||||
return {
|
||||
...fieldMetadataWithoutRelations,
|
||||
uniqueIdentifier:
|
||||
universalIdentifier:
|
||||
fieldMetadataWithoutRelations.standardId ??
|
||||
fieldMetadataWithoutRelations.id,
|
||||
flatRelationTargetFieldMetadata: null,
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@ export const getDefaultFlatFieldMetadata = ({
|
||||
standardId: null,
|
||||
standardOverrides: null,
|
||||
type: createFieldInput.type,
|
||||
uniqueIdentifier: fieldMetadataId,
|
||||
universalIdentifier: fieldMetadataId,
|
||||
workspaceId,
|
||||
flatRelationTargetFieldMetadata: null,
|
||||
flatRelationTargetObjectMetadata: null,
|
||||
|
||||
+6
-6
@@ -13,22 +13,22 @@ export const mergeTwoFlatFieldMetadatas = ({
|
||||
}: ToMerge<FlatFieldMetadata[], 'FlatFieldMetadatas'>): FlatFieldMetadata[] => {
|
||||
const initialRecordAccumulator = fromArrayToUniqueKeyRecord({
|
||||
array: destFlatFieldMetadatas,
|
||||
uniqueKey: 'uniqueIdentifier',
|
||||
uniqueKey: 'universalIdentifier',
|
||||
});
|
||||
|
||||
const mergedUniqueIdentifierFlatFieldMetadataRecord =
|
||||
const mergedUniversalIdentifierFlatFieldMetadataRecord =
|
||||
toMergeFlatFieldMetadatas.reduce((acc, flatFieldToMerge) => {
|
||||
const fieldUniqueIdentifier = flatFieldToMerge.uniqueIdentifier;
|
||||
const fieldUniversalIdentifier = flatFieldToMerge.universalIdentifier;
|
||||
const destFieldMetadata: FlatFieldMetadata | undefined =
|
||||
acc[fieldUniqueIdentifier];
|
||||
acc[fieldUniversalIdentifier];
|
||||
|
||||
return {
|
||||
...acc,
|
||||
[fieldUniqueIdentifier]: isDefined(destFieldMetadata)
|
||||
[fieldUniversalIdentifier]: isDefined(destFieldMetadata)
|
||||
? deepMerge(destFieldMetadata, flatFieldToMerge)
|
||||
: flatFieldToMerge,
|
||||
};
|
||||
}, initialRecordAccumulator);
|
||||
|
||||
return Object.values(mergedUniqueIdentifierFlatFieldMetadataRecord);
|
||||
return Object.values(mergedUniversalIdentifierFlatFieldMetadataRecord);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user