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

* 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

View File

@ -126,12 +126,12 @@ export const ViewBarDetails = ({
{currentViewSorts?.map((sort) => {
return (
<SortOrFilterChip
key={sort.fieldId}
testId={sort.fieldId}
key={sort.fieldMetadataId}
testId={sort.fieldMetadataId}
labelValue={sort.definition.label}
Icon={sort.direction === 'desc' ? IconArrowDown : IconArrowUp}
isSort
onRemove={() => removeViewSort(sort.fieldId)}
onRemove={() => removeViewSort(sort.fieldMetadataId)}
/>
);
})}
@ -143,15 +143,15 @@ export const ViewBarDetails = ({
{currentViewFilters?.map((filter) => {
return (
<SortOrFilterChip
key={filter.fieldId}
testId={filter.fieldId}
key={filter.fieldMetadataId}
testId={filter.fieldMetadataId}
labelKey={filter.definition.label}
labelValue={`${getOperandLabelShort(filter.operand)} ${
filter.displayValue
}`}
Icon={filter.definition.Icon}
onRemove={() => {
removeViewFilter(filter.fieldId);
removeViewFilter(filter.fieldMetadataId);
}}
/>
);

View File

@ -28,21 +28,24 @@ export const ViewBarEffect = () => {
const [searchParams] = useSearchParams();
const currentViewIdFromUrl = searchParams.get('view');
const { viewTypeState, viewObjectIdState } = useViewScopedStates();
const { viewTypeState, viewObjectMetadataIdState } = useViewScopedStates();
const viewType = useRecoilValue(viewTypeState);
const viewObjectId = useRecoilValue(viewObjectIdState);
const viewObjectMetadataId = useRecoilValue(viewObjectMetadataIdState);
useFindManyObjects({
objectNamePlural: 'viewsV2',
filter: { type: { eq: viewType }, objectId: { eq: viewObjectId } },
filter: {
type: { eq: viewType },
objectMetadataId: { eq: viewObjectMetadataId },
},
onCompleted: useRecoilCallback(
({ snapshot, set }) =>
async (data: PaginatedObjectTypeResults<View>) => {
const nextViews = data.edges.map((view) => ({
id: view.node.id,
name: view.node.name,
objectId: view.node.objectId,
objectMetadataId: view.node.objectMetadataId,
}));
const { viewsState } = getViewScopedStatesFromSnapshot({
@ -132,7 +135,8 @@ export const ViewBarEffect = () => {
const queriedViewFilters = data.edges
.map(({ node }) => {
const availableFilterDefinition = availableFilterDefinitions.find(
(filterDefinition) => filterDefinition.fieldId === node.fieldId,
(filterDefinition) =>
filterDefinition.fieldMetadataId === node.fieldMetadataId,
);
if (!availableFilterDefinition) return null;
@ -185,14 +189,14 @@ export const ViewBarEffect = () => {
const queriedViewSorts = data.edges
.map(({ node }) => {
const availableSortDefinition = availableSortDefinitions.find(
(sort) => sort.fieldId === node.fieldId,
(sort) => sort.fieldMetadataId === node.fieldMetadataId,
);
if (!availableSortDefinition) return null;
return {
id: node.id,
fieldId: node.fieldId,
fieldMetadataId: node.fieldMetadataId,
direction: node.direction,
definition: availableSortDefinition,
};

View File

@ -97,12 +97,12 @@ export const ViewFieldsVisibilityDropdownSection = ({
.sort((a, b) => a.position - b.position)
.map((field, index) => (
<DraggableItem
key={field.fieldId}
draggableId={field.fieldId}
key={field.fieldMetadataId}
draggableId={field.fieldMetadataId}
index={index + 1}
itemComponent={
<MenuItemDraggable
key={field.fieldId}
key={field.fieldMetadataId}
LeftIcon={field.Icon}
iconButtons={getIconButtons(index + 1, field)}
isTooltipOpen={openToolTipIndex === index + 1}
@ -120,7 +120,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
) : (
fields.map((field, index) => (
<MenuItem
key={field.fieldId}
key={field.fieldMetadataId}
LeftIcon={field.Icon}
iconButtons={getIconButtons(index, field)}
isTooltipOpen={openToolTipIndex === index}