Fix consistency issuesin relation onDelete behavior while creating a new relation (#4372)
* Fix consistency issuesin relation onDelete behavior while creating a new relation * Fix according to review
This commit is contained in:
@ -9,7 +9,6 @@ import { ObjectTasks } from '@/activities/tasks/components/ObjectTasks';
|
|||||||
import { Timeline } from '@/activities/timeline/components/Timeline';
|
import { Timeline } from '@/activities/timeline/components/Timeline';
|
||||||
import { TimelineQueryEffect } from '@/activities/timeline/components/TimelineQueryEffect';
|
import { TimelineQueryEffect } from '@/activities/timeline/components/TimelineQueryEffect';
|
||||||
import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
|
import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
|
||||||
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
|
|
||||||
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
||||||
import {
|
import {
|
||||||
IconCalendarEvent,
|
IconCalendarEvent,
|
||||||
@ -65,11 +64,6 @@ export const ShowPageRightContainer = ({
|
|||||||
const { getActiveTabIdState } = useTabList(TAB_LIST_COMPONENT_ID);
|
const { getActiveTabIdState } = useTabList(TAB_LIST_COMPONENT_ID);
|
||||||
const activeTabId = useRecoilValue(getActiveTabIdState());
|
const activeTabId = useRecoilValue(getActiveTabIdState());
|
||||||
|
|
||||||
const { objectMetadataItem: targetableObjectMetadataItem } =
|
|
||||||
useObjectMetadataItem({
|
|
||||||
objectNameSingular: targetableObject.targetObjectNameSingular,
|
|
||||||
});
|
|
||||||
|
|
||||||
const shouldDisplayCalendarTab = useIsFeatureEnabled('IS_CALENDAR_ENABLED');
|
const shouldDisplayCalendarTab = useIsFeatureEnabled('IS_CALENDAR_ENABLED');
|
||||||
const shouldDisplayEmailsTab =
|
const shouldDisplayEmailsTab =
|
||||||
(emails &&
|
(emails &&
|
||||||
@ -101,7 +95,6 @@ export const ShowPageRightContainer = ({
|
|||||||
title: 'Files',
|
title: 'Files',
|
||||||
Icon: IconPaperclip,
|
Icon: IconPaperclip,
|
||||||
hide: !notes,
|
hide: !notes,
|
||||||
disabled: targetableObjectMetadataItem.isCustom,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'emails',
|
id: 'emails',
|
||||||
|
|||||||
@ -397,6 +397,7 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
|
|||||||
createdObjectMetadata,
|
createdObjectMetadata,
|
||||||
),
|
),
|
||||||
referencedTableColumnName: 'id',
|
referencedTableColumnName: 'id',
|
||||||
|
onDelete: RelationOnDeleteAction.CASCADE,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|||||||
@ -26,6 +26,7 @@ import { generateMigrationName } from 'src/metadata/workspace-migration/utils/ge
|
|||||||
import {
|
import {
|
||||||
RelationMetadataEntity,
|
RelationMetadataEntity,
|
||||||
RelationMetadataType,
|
RelationMetadataType,
|
||||||
|
RelationOnDeleteAction,
|
||||||
} from './relation-metadata.entity';
|
} from './relation-metadata.entity';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@ -209,6 +210,7 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
|
|||||||
isUnique:
|
isUnique:
|
||||||
relationMetadataInput.relationType ===
|
relationMetadataInput.relationType ===
|
||||||
RelationMetadataType.ONE_TO_ONE,
|
RelationMetadataType.ONE_TO_ONE,
|
||||||
|
onDelete: RelationOnDeleteAction.SET_NULL,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|||||||
@ -4,7 +4,7 @@ export const convertOnDeleteActionToOnDelete = (
|
|||||||
onDeleteAction: RelationOnDeleteAction | undefined,
|
onDeleteAction: RelationOnDeleteAction | undefined,
|
||||||
): 'CASCADE' | 'SET NULL' | 'RESTRICT' | 'NO ACTION' | undefined => {
|
): 'CASCADE' | 'SET NULL' | 'RESTRICT' | 'NO ACTION' | undefined => {
|
||||||
if (!onDeleteAction) {
|
if (!onDeleteAction) {
|
||||||
return;
|
return 'SET NULL';
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (onDeleteAction) {
|
switch (onDeleteAction) {
|
||||||
|
|||||||
Reference in New Issue
Block a user