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

Rename fieldId and objectId into fieldMetadataId and objectMetadataId (#2421)

Browse Source 
* Rename fieldId and objectId into fieldMetadataId and objectMetadataId

* Fix tests
This commit is contained in:
Charles Bochet
2023-11-10 14:35:18 +01:00
committed by GitHub
parent 57cfd4db45
commit 618513afcd
136 changed files with 544 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/modules/ui/object/record-table/components/ColumnHeadWithDropdown.tsx
View File

@ -21,7 +21,7 @@ export const ColumnHeadWithDropdown = ({
primaryColumnKey,
}: ColumnHeadWithDropdownProps) => {
return (
<DropdownScope dropdownScopeId={column.fieldId + '-header'}>
<DropdownScope dropdownScopeId={column.fieldMetadataId + '-header'}>
<Dropdown
clickableComponent={<ColumnHead column={column} />}
dropdownComponents={
@ -34,7 +34,7 @@ export const ColumnHeadWithDropdown = ({
}
dropdownOffset={{ x: -1 }}
dropdownPlacement="bottom-start"
dropdownHotkeyScope={{ scope: column.fieldId + '-header' }}
dropdownHotkeyScope={{ scope: column.fieldMetadataId + '-header' }}
/>
</DropdownScope>
);

2
front/src/modules/ui/object/record-table/components/RecordTableColumnDropdownMenu.tsx
View File

@ -46,7 +46,7 @@ export const RecordTableColumnDropdownMenu = ({
handleColumnVisibilityChange(column);
};
return column.fieldId === primaryColumnKey ? (
return column.fieldMetadataId === primaryColumnKey ? (
<></>
) : (
<DropdownMenuItemsContainer>

16
front/src/modules/ui/object/record-table/components/RecordTableHeader.tsx
View File

@ -156,7 +156,7 @@ export const RecordTableHeader = () => {
if (nextWidth !== tableColumnsByKey[resizedFieldKey].size) {
const nextColumns = tableColumns.map((column) =>
column.fieldId === resizedFieldKey
column.fieldMetadataId === resizedFieldKey
? { ...column, size: nextWidth }
: column,
);
@ -194,11 +194,13 @@ export const RecordTableHeader = () => {
</th>
{visibleTableColumns.map((column) => (
<StyledColumnHeaderCell
key={column.fieldId}
isResizing={resizedFieldKey === column.fieldId}
key={column.fieldMetadataId}
isResizing={resizedFieldKey === column.fieldMetadataId}
columnWidth={Math.max(
tableColumnsByKey[column.fieldId].size +
(resizedFieldKey === column.fieldId ? resizeFieldOffset : 0),
tableColumnsByKey[column.fieldMetadataId].size +
(resizedFieldKey === column.fieldMetadataId
? resizeFieldOffset
: 0),
COLUMN_MIN_WIDTH,
)}
>
@ -209,14 +211,14 @@ export const RecordTableHeader = () => {
isLastColumn={
column.position === visibleTableColumns.length - 1
}
primaryColumnKey={primaryColumn?.fieldId || ''}
primaryColumnKey={primaryColumn?.fieldMetadataId || ''}
/>
</StyledColumnHeadContainer>
<StyledResizeHandler
className="cursor-col-resize"
role="separator"
onPointerDown={() => {
setResizedFieldKey(column.fieldId);
setResizedFieldKey(column.fieldMetadataId);
}}
/>
</StyledColumnHeaderCell>

2
front/src/modules/ui/object/record-table/components/RecordTableHeaderPlusButtonContent.tsx
View File

@ -32,7 +32,7 @@ export const RecordTableHeaderPlusButtonContent = () => {
<DropdownMenuItemsContainer>
{hiddenTableColumns.map((column) => (
<MenuItem
key={column.fieldId}
key={column.fieldMetadataId}
iconButtons={[
{
Icon: IconPlus,

2
front/src/modules/ui/object/record-table/components/RecordTableRow.tsx
View File

@ -42,7 +42,7 @@ export const RecordTableRow = forwardRef<
.sort((columnA, columnB) => columnA.position - columnB.position)
.map((column, columnIndex) => {
return (
<ColumnContext.Provider value={column} key={column.fieldId}>
<ColumnContext.Provider value={column} key={column.fieldMetadataId}>
<RecordTableCell cellIndex={columnIndex} />
</ColumnContext.Provider>
);

10
front/src/modules/ui/object/record-table/hooks/useTableColumns.ts
View File

@ -47,13 +47,14 @@ export const useTableColumns = () => {
viewField: Omit<ColumnDefinition<FieldMetadata>, 'size' | 'position'>,
) => {
const isNewColumn = !tableColumns.some(
(tableColumns) => tableColumns.fieldId === viewField.fieldId,
(tableColumns) =>
tableColumns.fieldMetadataId === viewField.fieldMetadataId,
);
if (isNewColumn) {
const newColumn = availableTableColumns.find(
(availableTableColumn) =>
availableTableColumn.fieldId === viewField.fieldId,
availableTableColumn.fieldMetadataId === viewField.fieldMetadataId,
);
if (!newColumn) return;
@ -65,7 +66,7 @@ export const useTableColumns = () => {
await handleColumnsChange(nextColumns);
} else {
const nextColumns = tableColumns.map((previousColumn) =>
previousColumn.fieldId === viewField.fieldId
previousColumn.fieldMetadataId === viewField.fieldMetadataId
? { ...previousColumn, isVisible: !viewField.isVisible }
: previousColumn,
);
@ -82,7 +83,8 @@ export const useTableColumns = () => {
column: ColumnDefinition<FieldMetadata>,
) => {
const currentColumnArrayIndex = visibleTableColumns.findIndex(
(visibleColumn) => visibleColumn.fieldId === column.fieldId,
(visibleColumn) =>
visibleColumn.fieldMetadataId === column.fieldMetadataId,
);
const columns = handleColumnMove(

2
front/src/modules/ui/object/record-table/record-table-cell/hooks/useTableCell.ts
View File

@ -42,7 +42,7 @@ export const useTableCell = () => {
const [, setFieldInitialValue] = useRecoilState(
entityFieldInitialValueFamilyState({
entityId,
fieldId: fieldDefinition.fieldId,
fieldMetadataId: fieldDefinition.fieldMetadataId,
}),
);

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

@ -9,10 +9,10 @@ export const hiddenTableColumnsScopedSelector = selectorFamily({
(scopeId: string) =>
({ get }) => {
const columns = get(tableColumnsScopedState({ scopeId }));
const columnKeys = columns.map(({ fieldId }) => fieldId);
const columnKeys = columns.map(({ fieldMetadataId }) => fieldMetadataId);
const otherAvailableColumns = get(
availableTableColumnsScopedState({ scopeId }),
).filter(({ fieldId }) => !columnKeys.includes(fieldId));
).filter(({ fieldMetadataId }) => !columnKeys.includes(fieldMetadataId));
return [
...columns.filter((column) => !column.isVisible),

5
front/src/modules/ui/object/record-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts
View File

@ -12,5 +12,8 @@ export const savedTableColumnsByKeyFamilySelector = selectorFamily({
({ get }) =>
get(savedTableColumnsFamilyState(viewId)).reduce<
Record<string, ColumnDefinition<FieldMetadata>>
>((result, column) => ({ ...result, [column.fieldId]: column }), {}),
>(
(result, column) => ({ ...result, [column.fieldMetadataId]: column }),
{},
),
});

5
front/src/modules/ui/object/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts
View File

@ -12,5 +12,8 @@ export const tableColumnsByKeyScopedSelector = selectorFamily({
({ get }) =>
get(tableColumnsScopedState({ scopeId })).reduce<
Record<string, ColumnDefinition<FieldMetadata>>
>((result, column) => ({ ...result, [column.fieldId]: column }), {}),
>(
(result, column) => ({ ...result, [column.fieldMetadataId]: column }),
{},
),
});

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

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