File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed
packages/next/src/views/Version/RenderFieldsToDiff/fields/Relationship Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -34,11 +34,12 @@ const generateLabelFromValue = (
34
34
}
35
35
36
36
let relatedDoc : RelationshipValue
37
- let valueToReturn = '' as any
37
+ let valueToReturn : RelationshipValue | string = ''
38
38
39
39
const relationTo = 'relationTo' in field ? field . relationTo : undefined
40
40
41
41
if ( value === null || typeof value === 'undefined' ) {
42
+ // eslint-disable-next-line @typescript-eslint/no-base-to-string -- We want to return a string specifilly for null and undefined
42
43
return String ( value )
43
44
}
44
45
@@ -76,19 +77,22 @@ const generateLabelFromValue = (
76
77
valueToReturn = relatedDoc
77
78
}
78
79
79
- if ( typeof valueToReturn === 'object' && titleFieldIsLocalized ) {
80
+ if ( typeof valueToReturn === 'object' && titleFieldIsLocalized && valueToReturn ?. [ locale ] ) {
80
81
valueToReturn = valueToReturn [ locale ]
81
82
}
82
83
} else if ( relatedDoc ) {
83
84
// Handle non-polymorphic `hasMany` relationships or fallback
84
85
if ( typeof relatedDoc ?. id !== 'undefined' ) {
85
- valueToReturn = relatedDoc . id
86
+ valueToReturn = String ( relatedDoc . id )
86
87
} else {
87
88
valueToReturn = relatedDoc
88
89
}
89
90
}
90
91
91
- if ( typeof valueToReturn === 'object' && valueToReturn !== null ) {
92
+ if (
93
+ ( valueToReturn && typeof valueToReturn === 'object' && valueToReturn !== null ) ||
94
+ typeof valueToReturn !== 'string'
95
+ ) {
92
96
valueToReturn = JSON . stringify ( valueToReturn )
93
97
}
94
98
You can’t perform that action at this time.
0 commit comments