Replace entityId by recordId in the front end. (#6355)
Hey @lucasbordeau, I replaced every `entityId` with `recordId` in the frontend. ### Some clarifications: 1. At [this line](0b207d26b6 (diff-b4f415dd1f060307ad61f64394ee96b2912f6015e26c7fd2eab4b8c6a84d2d07L14)), I changed `recordId` to `selectedRecordId` because that component has `entityId` defined in code at [this line](0b207d26b6 (diff-b4f415dd1f060307ad61f64394ee96b2912f6015e26c7fd2eab4b8c6a84d2d07L55)) which was to be changed to `recordId`. To avoid repeated constants, I changed the arguments to `selectedRecordIds`. 2. At the following links: - [File 1](0b207d26b6 (diff-52b780bdd4cfc582ca7e1b457dbbd63733bfbb7790fc421054bbd2dbf0389e16)) - [File 2](0b207d26b6 (diff-6d47cb9a59dfcf6b1495937084ae799a61da6afccb21208f04ce8e1f5afca0e4)) - [File 3](0b207d26b6 (diff-821815783f9968f1da3cd437fc9d1d1666d12dc331d279cc5fbd9817bc2df2bf)) It seems to be the tests. As I can see, it is checking for both `objectFilterDropdownSelectedEntityIdState` and `objectFilterDropdownSelectedRecordIdsState`. Since `entityIds` are supposed to be removed and `recordedId` state is already being checked, I commented out all the `entityidState` code. If they are to be removed or uncommented, please let me know, and I will do as expected. --------- Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
This commit is contained in:
@ -11,7 +11,7 @@ import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRela
|
||||
import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
|
||||
|
||||
export type RelationPickerProps = {
|
||||
recordId?: string;
|
||||
selectedRecordId?: string;
|
||||
onSubmit: (selectedEntity: EntityForSelect | null) => void;
|
||||
onCancel?: () => void;
|
||||
width?: number;
|
||||
@ -21,7 +21,7 @@ export type RelationPickerProps = {
|
||||
};
|
||||
|
||||
export const RelationPicker = ({
|
||||
recordId,
|
||||
selectedRecordId,
|
||||
onSubmit,
|
||||
onCancel,
|
||||
excludeRecordIds,
|
||||
@ -52,7 +52,7 @@ export const RelationPicker = ({
|
||||
({ id }) => id === fieldDefinition.metadata.relationFieldMetadataId,
|
||||
);
|
||||
|
||||
const { entityId } = useContext(FieldContext);
|
||||
const { recordId } = useContext(FieldContext);
|
||||
|
||||
const { createNewRecordAndOpenRightDrawer } =
|
||||
useAddNewRecordAndOpenRightDrawer({
|
||||
@ -60,7 +60,7 @@ export const RelationPicker = ({
|
||||
fieldDefinition.metadata.relationObjectMetadataNameSingular,
|
||||
relationObjectMetadataItem,
|
||||
relationFieldMetadataItem,
|
||||
entityId,
|
||||
recordId,
|
||||
});
|
||||
|
||||
return (
|
||||
@ -75,7 +75,7 @@ export const RelationPicker = ({
|
||||
fieldDefinition.metadata.relationObjectMetadataNameSingular
|
||||
}
|
||||
relationPickerScopeId={relationPickerScopeId}
|
||||
selectedRelationRecordIds={recordId ? [recordId] : []}
|
||||
selectedRelationRecordIds={selectedRecordId ? [selectedRecordId] : []}
|
||||
excludedRelationRecordIds={excludeRecordIds}
|
||||
/>
|
||||
);
|
||||
|
||||
@ -20,13 +20,13 @@ type RecordDetailRelationSectionProps = {
|
||||
relationObjectMetadataNameSingular: string;
|
||||
relationObjectMetadataItem: ObjectMetadataItem;
|
||||
relationFieldMetadataItem?: FieldMetadataItem;
|
||||
entityId: string;
|
||||
recordId: string;
|
||||
};
|
||||
export const useAddNewRecordAndOpenRightDrawer = ({
|
||||
relationObjectMetadataNameSingular,
|
||||
relationObjectMetadataItem,
|
||||
relationFieldMetadataItem,
|
||||
entityId,
|
||||
recordId,
|
||||
}: RecordDetailRelationSectionProps) => {
|
||||
const setViewableRecordId = useSetRecoilState(viewableRecordIdState);
|
||||
const setViewableRecordNameSingular = useSetRecoilState(
|
||||
@ -89,7 +89,7 @@ export const useAddNewRecordAndOpenRightDrawer = ({
|
||||
) {
|
||||
createRecordPayload[
|
||||
`${relationFieldMetadataItem?.relationDefinition?.sourceFieldMetadata.name}Id`
|
||||
] = entityId;
|
||||
] = recordId;
|
||||
}
|
||||
|
||||
await createOneRecord(createRecordPayload);
|
||||
@ -99,7 +99,7 @@ export const useAddNewRecordAndOpenRightDrawer = ({
|
||||
RelationDefinitionType.OneToMany
|
||||
) {
|
||||
await updateOneRecord({
|
||||
idToUpdate: entityId,
|
||||
idToUpdate: recordId,
|
||||
updateOneRecordInput: {
|
||||
[`${relationFieldMetadataItem?.relationDefinition?.targetFieldMetadata.name}Id`]:
|
||||
newRecordId,
|
||||
|
||||
@ -37,7 +37,7 @@ export const useRelationPickerEntitiesOptions = ({
|
||||
],
|
||||
orderByField: 'createdAt',
|
||||
selectedIds: selectedRelationRecordIds,
|
||||
excludeEntityIds: excludedRelationRecordIds,
|
||||
excludeRecordIds: excludedRelationRecordIds,
|
||||
objectNameSingular: relationObjectNameSingular,
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user