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

@ -36,9 +36,10 @@ export const SettingsNewObject = () => {
objectNamePlural: 'viewsV2',
});
const [selectedStandardObjectIds, setSelectedStandardObjectIds] = useState<
Record<string, boolean>
>({});
const [
selectedStandardObjectMetadataIds,
setSelectedStandardObjectMetadataIds,
] = useState<Record<string, boolean>>({});
const [customFormValues, setCustomFormValues] = useState<{
description?: string;
@ -49,7 +50,7 @@ export const SettingsNewObject = () => {
const canSave =
(selectedObjectType === 'Standard' &&
Object.values(selectedStandardObjectIds).some(
Object.values(selectedStandardObjectMetadataIds).some(
(isSelected) => isSelected,
)) ||
(selectedObjectType === 'Custom' &&
@ -59,9 +60,11 @@ export const SettingsNewObject = () => {
const handleSave = async () => {
if (selectedObjectType === 'Standard') {
await Promise.all(
Object.entries(selectedStandardObjectIds).map(
([standardObjectId, isSelected]) =>
isSelected ? activateObject({ id: standardObjectId }) : undefined,
Object.entries(selectedStandardObjectMetadataIds).map(
([standardObjectMetadataId, isSelected]) =>
isSelected
? activateObject({ id: standardObjectMetadataId })
: undefined,
),
);
@ -77,7 +80,7 @@ export const SettingsNewObject = () => {
});
await createOneView?.({
objectId: createdObject.data?.createOneObject.id,
objectMetadataId: createdObject.data?.createOneObject.id,
type: ViewType.Table,
name: `All ${customFormValues.labelPlural}`,
});
@ -124,12 +127,12 @@ export const SettingsNewObject = () => {
<SettingsAvailableStandardObjectsSection
objectItems={disabledObjects.filter(({ isCustom }) => !isCustom)}
onChange={(selectedIds) =>
setSelectedStandardObjectIds((previousSelectedIds) => ({
setSelectedStandardObjectMetadataIds((previousSelectedIds) => ({
...previousSelectedIds,
...selectedIds,
}))
}
selectedIds={selectedStandardObjectIds}
selectedIds={selectedStandardObjectMetadataIds}
/>
)}
{selectedObjectType === 'Custom' && (

View File

@ -72,10 +72,12 @@ export const SettingsObjectNewFieldStep1 = () => {
if (!activeObjectMetadataItem) return null;
const handleToggleField = (fieldId: string) =>
const handleToggleField = (fieldMetadataId: string) =>
setMetadataFields((previousFields) =>
previousFields.map((field) =>
field.id === fieldId ? { ...field, isActive: !field.isActive } : field,
field.id === fieldMetadataId
? { ...field, isActive: !field.isActive }
: field,
),
);

View File

@ -52,7 +52,7 @@ export const SettingsObjectNewFieldStep2 = () => {
objectNamePlural: 'viewsV2',
filter: {
type: { eq: ViewType.Table },
objectId: { eq: activeObjectMetadataItem?.id },
objectMetadataId: { eq: activeObjectMetadataItem?.id },
},
onCompleted: async (data: PaginatedObjectTypeResults<View>) => {
const views = data.edges;
@ -72,12 +72,12 @@ export const SettingsObjectNewFieldStep2 = () => {
const handleSave = async () => {
const createdField = await createMetadataField({
...formValues,
objectId: activeObjectMetadataItem.id,
objectMetadataId: activeObjectMetadataItem.id,
});
objectViews.forEach(async (view) => {
await createOneViewField?.({
viewId: view.id,
fieldId: createdField.data?.createOneField.id,
fieldMetadataId: createdField.data?.createOneField.id,
position: activeObjectMetadataItem.fields.length,
isVisible: true,
size: 100,