fix: show empty cell instead of 'Not shared' for soft-deleted related records (#20260)

## Summary

Fixes #20076 (supersedes #20250)

When a related record is soft-deleted, the frontend displays "Not
shared" (lock icon) because it sees a populated FK but a null relation
object. This is misleading -- the record was deleted, not
permission-restricted.

**Backend fix** (`process-nested-relations-v2.helper.ts`):
- For MANY_TO_ONE relations, widen the relation query with
`.withDeleted()` and include `deletedAt` in the select
- In `assignRelationResults`, if the matched record has `deletedAt` set,
nullify both the FK and the relation object in the API response
- Records filtered by RLS are still not returned (even with
`withDeleted()`), so they correctly continue to show "Not shared"
- Strip `deletedAt` from relation results before returning to the client

**Frontend fix** (`RelationFromManyFieldDisplay.tsx`):
- For ONE_TO_MANY junction relations, return `null` instead of
`<ForbiddenFieldDisplay />` when junction records exist but target
records are unavailable

### Three cases now handled correctly:

| Scenario | FK in response | Relation object | Frontend display |
|---|---|---|---|
| **Live record** | `"abc"` | `{ id: "abc", ... }` | Record chip |
| **Soft-deleted record** | `null` | `null` | Empty cell |
| **RLS-hidden record** | `"abc"` | `null` | "Not shared" |

## Test plan

- [ ] Create a record with a MANY_TO_ONE relation (e.g., a person linked
to a company)
- [ ] Soft-delete the related record (the company)
- [ ] Verify the relation field shows an empty cell, not "Not shared"
- [ ] Restore the related record and verify the relation reappears
- [ ] Verify that RLS-hidden relations still show "Not shared"

Made with [Cursor](https://cursor.com)

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Charles Bochet
2026-05-05 11:32:16 +02:00
committed by GitHub
parent fda2295beb
commit 7c4302d02a
3 changed files with 171 additions and 11 deletions
@@ -1,6 +1,7 @@
import { Injectable } from '@nestjs/common';
import { FieldMetadataType, type ObjectRecord } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { type FindOptionsRelations, type ObjectLiteral } from 'typeorm';
import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
@@ -173,7 +174,7 @@ export class ProcessNestedRelationsV2Helper {
targetObjectNameSingular,
);
const columnsToSelect = buildColumnsToSelect({
const columnsToSelect: Record<string, boolean> = buildColumnsToSelect({
select: selectedFields,
relations: nestedRelations,
flatObjectMetadata: targetObjectMetadata,
@@ -181,17 +182,22 @@ export class ProcessNestedRelationsV2Helper {
flatFieldMetadataMaps,
});
if (relationType === RelationType.MANY_TO_ONE) {
columnsToSelect.deletedAt = true;
targetObjectQueryBuilder = targetObjectQueryBuilder.withDeleted();
}
targetObjectQueryBuilder = targetObjectQueryBuilder.setFindOptions({
select: columnsToSelect,
});
const joinColumnName =
sourceFieldMetadata.settings.joinColumnName ?? `${sourceFieldName}Id`;
const relationIds = this.getUniqueIds({
records: parentObjectRecords,
idField:
relationType === RelationType.ONE_TO_MANY
? 'id'
: (sourceFieldMetadata.settings.joinColumnName ??
`${sourceFieldName}Id`),
relationType === RelationType.ONE_TO_MANY ? 'id' : joinColumnName,
});
const fieldMetadataTargetRelationColumnName =
@@ -227,7 +233,9 @@ export class ProcessNestedRelationsV2Helper {
relationType === RelationType.ONE_TO_MANY
? `${fieldMetadataTargetRelationColumnName}`
: 'id',
joinColumnName,
relationType,
selectedFields,
});
if (Object.keys(nestedRelations).length > 0) {
@@ -398,7 +406,9 @@ export class ProcessNestedRelationsV2Helper {
relationAggregatedFieldsResult,
sourceFieldName,
joinField,
joinColumnName,
relationType,
selectedFields,
}: {
parentRecords: ObjectRecord[];
// oxlint-disable-next-line @typescripttypescript/no-explicit-any
@@ -409,7 +419,9 @@ export class ProcessNestedRelationsV2Helper {
relationAggregatedFieldsResult: Record<string, any>;
sourceFieldName: string;
joinField: string;
joinColumnName: string;
relationType: RelationType;
selectedFields: Record<string, unknown>;
}): void {
parentRecords.forEach((item) => {
if (relationType === RelationType.ONE_TO_MANY) {
@@ -417,10 +429,24 @@ export class ProcessNestedRelationsV2Helper {
(rel) => rel[joinField] === item.id,
);
} else {
item[sourceFieldName] =
relationResults.find(
(rel) => rel.id === item[`${sourceFieldName}Id`],
) ?? null;
const matchedRelation = relationResults.find(
(rel) => rel.id === item[joinColumnName],
);
if (isDefined(matchedRelation?.deletedAt)) {
item[sourceFieldName] = null;
item[joinColumnName] = null;
} else if (isDefined(matchedRelation)) {
if (selectedFields?.deletedAt !== true) {
const { deletedAt: _, ...rest } = matchedRelation;
item[sourceFieldName] = rest;
} else {
item[sourceFieldName] = matchedRelation;
}
} else {
item[sourceFieldName] = null;
}
}
});