admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix chromatic build

Browse Source
This commit is contained in:
Charles Bochet
2023-11-04 13:22:10 +01:00
parent d17978777e
commit aa50ee4b21
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
front/src/modules/metadata/components/RecordShowPage.tsx
View File

@ -115,34 +115,35 @@ export const RecordShowPage = () => {
avatarType="squared"
/>
<PropertyBox extraPadding={true}>
{foundObjectMetadataItem?.fields
.toSorted((a, b) =>
DateTime.fromISO(a.createdAt)
.diff(DateTime.fromISO(b.createdAt))
.toMillis(),
)
.map((metadataField, index) => {
return (
<FieldContext.Provider
key={object.id + metadataField.id}
value={{
entityId: object.id,
recoilScopeId: object.id + metadataField.id,
fieldDefinition:
formatMetadataFieldAsColumnDefinition({
field: metadataField,
position: index,
objectMetadataItem: foundObjectMetadataItem,
icons,
}),
useUpdateEntityMutation: useUpdateOneObjectMutation,
hotkeyScope: InlineCellHotkeyScope.InlineCell,
}}
>
<InlineCell />
</FieldContext.Provider>
);
})}
{foundObjectMetadataItem &&
[...foundObjectMetadataItem.fields]
.sort((a, b) =>
DateTime.fromISO(a.createdAt)
.diff(DateTime.fromISO(b.createdAt))
.toMillis(),
)
.map((metadataField, index) => {
return (
<FieldContext.Provider
key={object.id + metadataField.id}
value={{
entityId: object.id,
recoilScopeId: object.id + metadataField.id,
fieldDefinition:
formatMetadataFieldAsColumnDefinition({
field: metadataField,
position: index,
objectMetadataItem: foundObjectMetadataItem,
icons,
}),
useUpdateEntityMutation: useUpdateOneObjectMutation,
hotkeyScope: InlineCellHotkeyScope.InlineCell,
}}
>
<InlineCell />
</FieldContext.Provider>
);
})}
</PropertyBox>
</ShowPageLeftContainer>
<ShowPageRightContainer

4
front/src/modules/ui/object/record-table/states/selectors/visibleTableColumnsScopedSelector.ts
View File

@ -13,11 +13,11 @@ export const visibleTableColumnsScopedSelector = selectorFamily({
availableTableColumnsScopedState(scopeId),
).map(({ fieldId }) => fieldId);
return columns
return [...columns]
.filter(
(column) =>
column.isVisible && availableColumnKeys.includes(column.fieldId),
)
.toSorted((a, b) => a.position - b.position);
.sort((a, b) => a.position - b.position);
},
});