Skip to content

Commit 00ff2b5

Browse files
Fix Data model object setting page not loading (twentyhq#16308)
1 parent 6e4f1bc commit 00ff2b5

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export type GenericFieldContextType = {
2626
fieldDefinition: FieldDefinition<FieldMetadata>;
2727
useUpdateRecord?: RecordUpdateHook;
2828
isLabelIdentifier: boolean;
29+
isLabelIdentifierCompact?: boolean;
2930
clearable?: boolean;
3031
maxWidth?: number;
3132
isCentered?: boolean;

packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/ChipFieldDisplay.tsx

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { RecordChip } from '@/object-record/components/RecordChip';
22
import { useChipFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay';
3-
import { shouldCompactRecordIndexLabelIdentifierComponentState } from '@/object-record/record-index/states/shouldCompactRecordIndexLabelIdentifierComponentState';
4-
import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
53
import { isDefined } from 'twenty-shared/utils';
64
import { ChipSize } from 'twenty-ui/components';
75

@@ -14,14 +12,9 @@ export const ChipFieldDisplay = () => {
1412
maxWidth,
1513
triggerEvent,
1614
onRecordChipClick,
15+
isLabelIdentifierCompact,
1716
} = useChipFieldDisplay();
1817

19-
const shouldCompactRecordIndexLabelIdentifier = useRecoilComponentValue(
20-
shouldCompactRecordIndexLabelIdentifierComponentState,
21-
);
22-
23-
const isLabelIdentifierCompact = shouldCompactRecordIndexLabelIdentifier;
24-
2518
if (!isDefined(recordValue)) {
2619
return null;
2720
}
@@ -33,7 +26,7 @@ export const ChipFieldDisplay = () => {
3326
record={recordValue}
3427
size={ChipSize.Small}
3528
to={labelIdentifierLink}
36-
isLabelHidden={isLabelIdentifierCompact}
29+
isLabelHidden={isLabelIdentifierCompact ?? false}
3730
forceDisableClick={disableChipClick}
3831
triggerEvent={triggerEvent}
3932
onClick={onRecordChipClick}

packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export const useChipFieldDisplay = () => {
2121
maxWidth,
2222
triggerEvent,
2323
onRecordChipClick,
24+
isLabelIdentifierCompact,
2425
} = useContext(FieldContext);
2526

2627
const { indexIdentifierUrl, labelIdentifierFieldMetadataItem } =
@@ -62,5 +63,6 @@ export const useChipFieldDisplay = () => {
6263
maxWidth,
6364
triggerEvent,
6465
onRecordChipClick,
66+
isLabelIdentifierCompact,
6567
};
6668
};

packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextLabelIdentifier.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObject
22
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
33
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
44
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
5+
import { shouldCompactRecordIndexLabelIdentifierComponentState } from '@/object-record/record-index/states/shouldCompactRecordIndexLabelIdentifierComponentState';
56
import { RecordUpdateContext } from '@/object-record/record-table/contexts/EntityUpdateMutationHookContext';
67
import { RecordTableCellContext } from '@/object-record/record-table/contexts/RecordTableCellContext';
78
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
89
import { useRecordTableRowContextOrThrow } from '@/object-record/record-table/contexts/RecordTableRowContext';
10+
import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
911
import { useContext, type ReactNode } from 'react';
1012

1113
type RecordTableCellFieldContextLabelIdentifierProps = {
@@ -31,6 +33,10 @@ export const RecordTableCellFieldContextLabelIdentifier = ({
3133
objectMetadataItem.id,
3234
);
3335

36+
const shouldCompactRecordIndexLabelIdentifier = useRecoilComponentValue(
37+
shouldCompactRecordIndexLabelIdentifierComponentState,
38+
);
39+
3440
const hasObjectReadPermissions = objectPermissions.canReadObjectRecords;
3541

3642
const updateRecord = useContext(RecordUpdateContext);
@@ -49,6 +55,7 @@ export const RecordTableCellFieldContextLabelIdentifier = ({
4955
fieldDefinition,
5056
useUpdateRecord: () => [updateRecord, {}],
5157
isLabelIdentifier: true,
58+
isLabelIdentifierCompact: shouldCompactRecordIndexLabelIdentifier,
5259
displayedMaxRows: 1,
5360
isRecordFieldReadOnly: isRecordFieldReadOnly({
5461
isRecordReadOnly: isRecordReadOnly ?? false,

0 commit comments

Comments
 (0)