Remove selected record id on related relation record detach (#12591)
# Introduction Verified for multi select record picker and it's already working Also works for both single and multi after record deletion Fixes https://github.com/twentyhq/twenty/issues/12544
This commit is contained in:
@ -24,7 +24,9 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-fiel
|
|||||||
import { FieldRelationMetadata } from '@/object-record/record-field/types/FieldMetadata';
|
import { FieldRelationMetadata } from '@/object-record/record-field/types/FieldMetadata';
|
||||||
import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
|
import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
|
||||||
import { PropertyBox } from '@/object-record/record-inline-cell/property-box/components/PropertyBox';
|
import { PropertyBox } from '@/object-record/record-inline-cell/property-box/components/PropertyBox';
|
||||||
|
import { singleRecordPickerSelectedIdComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSelectedIdComponentState';
|
||||||
import { RecordDetailRecordsListItem } from '@/object-record/record-show/record-detail-section/components/RecordDetailRecordsListItem';
|
import { RecordDetailRecordsListItem } from '@/object-record/record-show/record-detail-section/components/RecordDetailRecordsListItem';
|
||||||
|
import { getRecordFieldCardRelationPickerDropdownId } from '@/object-record/record-show/utils/getRecordFieldCardRelationPickerDropdownId';
|
||||||
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
|
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
|
||||||
import { getForeignKeyNameFromRelationFieldName } from '@/object-record/utils/getForeignKeyNameFromRelationFieldName';
|
import { getForeignKeyNameFromRelationFieldName } from '@/object-record/utils/getForeignKeyNameFromRelationFieldName';
|
||||||
import { getRecordFieldInputId } from '@/object-record/utils/getRecordFieldInputId';
|
import { getRecordFieldInputId } from '@/object-record/utils/getRecordFieldInputId';
|
||||||
@ -36,6 +38,7 @@ import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
|
|||||||
import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
|
import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
|
||||||
import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
|
import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
|
||||||
import { useModal } from '@/ui/layout/modal/hooks/useModal';
|
import { useModal } from '@/ui/layout/modal/hooks/useModal';
|
||||||
|
import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
|
||||||
import { createPortal } from 'react-dom';
|
import { createPortal } from 'react-dom';
|
||||||
import {
|
import {
|
||||||
IconChevronDown,
|
IconChevronDown,
|
||||||
@ -103,7 +106,7 @@ export const RecordDetailRelationRecordsListItem = ({
|
|||||||
onClick,
|
onClick,
|
||||||
relationRecord,
|
relationRecord,
|
||||||
}: RecordDetailRelationRecordsListItemProps) => {
|
}: RecordDetailRelationRecordsListItemProps) => {
|
||||||
const { fieldDefinition } = useContext(FieldContext);
|
const { fieldDefinition, recordId } = useContext(FieldContext);
|
||||||
|
|
||||||
const { openModal } = useModal();
|
const { openModal } = useModal();
|
||||||
|
|
||||||
@ -156,6 +159,15 @@ export const RecordDetailRelationRecordsListItem = ({
|
|||||||
|
|
||||||
const { closeDropdown, isDropdownOpen } = useDropdown(dropdownScopeId);
|
const { closeDropdown, isDropdownOpen } = useDropdown(dropdownScopeId);
|
||||||
|
|
||||||
|
const dropdownId = getRecordFieldCardRelationPickerDropdownId({
|
||||||
|
fieldDefinition,
|
||||||
|
recordId,
|
||||||
|
});
|
||||||
|
const setSingleRecordPickerSelectedId = useSetRecoilComponentStateV2(
|
||||||
|
singleRecordPickerSelectedIdComponentState,
|
||||||
|
dropdownId,
|
||||||
|
);
|
||||||
|
|
||||||
const handleDetach = () => {
|
const handleDetach = () => {
|
||||||
closeDropdown();
|
closeDropdown();
|
||||||
|
|
||||||
@ -167,17 +179,18 @@ export const RecordDetailRelationRecordsListItem = ({
|
|||||||
|
|
||||||
if (isToOneObject) {
|
if (isToOneObject) {
|
||||||
persistField(null);
|
persistField(null);
|
||||||
return;
|
} else {
|
||||||
|
updateOneRelationRecord({
|
||||||
|
idToUpdate: relationRecord.id,
|
||||||
|
updateOneRecordInput: {
|
||||||
|
[getForeignKeyNameFromRelationFieldName(
|
||||||
|
relationFieldMetadataItem.name,
|
||||||
|
)]: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
updateOneRelationRecord({
|
setSingleRecordPickerSelectedId(undefined);
|
||||||
idToUpdate: relationRecord.id,
|
|
||||||
updateOneRecordInput: {
|
|
||||||
[getForeignKeyNameFromRelationFieldName(
|
|
||||||
relationFieldMetadataItem.name,
|
|
||||||
)]: null,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleDelete = async () => {
|
const handleDelete = async () => {
|
||||||
|
|||||||
@ -12,6 +12,7 @@ import { RecordDetailRelationRecordsList } from '@/object-record/record-show/rec
|
|||||||
import { RecordDetailRelationSectionDropdown } from '@/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdown';
|
import { RecordDetailRelationSectionDropdown } from '@/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdown';
|
||||||
import { RecordDetailSection } from '@/object-record/record-show/record-detail-section/components/RecordDetailSection';
|
import { RecordDetailSection } from '@/object-record/record-show/record-detail-section/components/RecordDetailSection';
|
||||||
import { RecordDetailSectionHeader } from '@/object-record/record-show/record-detail-section/components/RecordDetailSectionHeader';
|
import { RecordDetailSectionHeader } from '@/object-record/record-show/record-detail-section/components/RecordDetailSectionHeader';
|
||||||
|
import { getRecordFieldCardRelationPickerDropdownId } from '@/object-record/record-show/utils/getRecordFieldCardRelationPickerDropdownId';
|
||||||
import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
|
import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
|
||||||
import { AggregateOperations } from '@/object-record/record-table/constants/AggregateOperations';
|
import { AggregateOperations } from '@/object-record/record-table/constants/AggregateOperations';
|
||||||
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
|
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
|
||||||
@ -65,7 +66,10 @@ export const RecordDetailRelationSection = ({
|
|||||||
? [fieldValue as ObjectRecord]
|
? [fieldValue as ObjectRecord]
|
||||||
: ((fieldValue as ObjectRecord[]) ?? []);
|
: ((fieldValue as ObjectRecord[]) ?? []);
|
||||||
|
|
||||||
const dropdownId = `record-field-card-relation-picker-${fieldDefinition.fieldMetadataId}-${recordId}`;
|
const dropdownId = getRecordFieldCardRelationPickerDropdownId({
|
||||||
|
fieldDefinition,
|
||||||
|
recordId,
|
||||||
|
});
|
||||||
|
|
||||||
const { isDropdownOpen } = useDropdown(dropdownId);
|
const { isDropdownOpen } = useDropdown(dropdownId);
|
||||||
|
|
||||||
|
|||||||
@ -19,6 +19,7 @@ import { SingleRecordPicker } from '@/object-record/record-picker/single-record-
|
|||||||
import { singleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState';
|
import { singleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState';
|
||||||
import { singleRecordPickerSelectedIdComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSelectedIdComponentState';
|
import { singleRecordPickerSelectedIdComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSelectedIdComponentState';
|
||||||
import { SingleRecordPickerRecord } from '@/object-record/record-picker/single-record-picker/types/SingleRecordPickerRecord';
|
import { SingleRecordPickerRecord } from '@/object-record/record-picker/single-record-picker/types/SingleRecordPickerRecord';
|
||||||
|
import { getRecordFieldCardRelationPickerDropdownId } from '@/object-record/record-show/utils/getRecordFieldCardRelationPickerDropdownId';
|
||||||
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
|
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
|
||||||
import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
|
import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
|
||||||
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
|
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
|
||||||
@ -69,7 +70,10 @@ export const RecordDetailRelationSectionDropdown = ({
|
|||||||
? [fieldValue as ObjectRecord]
|
? [fieldValue as ObjectRecord]
|
||||||
: ((fieldValue as ObjectRecord[]) ?? []);
|
: ((fieldValue as ObjectRecord[]) ?? []);
|
||||||
|
|
||||||
const dropdownId = `record-field-card-relation-picker-${fieldDefinition.fieldMetadataId}-${recordId}`;
|
const dropdownId = getRecordFieldCardRelationPickerDropdownId({
|
||||||
|
fieldDefinition,
|
||||||
|
recordId,
|
||||||
|
});
|
||||||
|
|
||||||
const { closeDropdown, dropdownPlacement } = useDropdown(dropdownId);
|
const { closeDropdown, dropdownPlacement } = useDropdown(dropdownId);
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,12 @@
|
|||||||
|
import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
|
||||||
|
import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
|
||||||
|
|
||||||
|
type GetRecordFieldCardRelationPickerDropdownIdArgs = {
|
||||||
|
fieldDefinition: FieldDefinition<FieldMetadata>;
|
||||||
|
recordId: string;
|
||||||
|
};
|
||||||
|
export const getRecordFieldCardRelationPickerDropdownId = ({
|
||||||
|
fieldDefinition,
|
||||||
|
recordId,
|
||||||
|
}: GetRecordFieldCardRelationPickerDropdownIdArgs) =>
|
||||||
|
`record-field-card-relation-picker-${fieldDefinition.fieldMetadataId}-${recordId}`;
|
||||||
Reference in New Issue
Block a user