feat: save edited custom field (#2245)

Closes #2161

Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
This commit is contained in:
Thaïs
2023-10-27 18:06:31 +02:00
committed by GitHub
parent 40c5f72080
commit e488a87ce4
8 changed files with 84 additions and 16 deletions

View File

@ -636,6 +636,7 @@ export type UpdateFieldInput = {
icon?: InputMaybe<Scalars['String']['input']>; icon?: InputMaybe<Scalars['String']['input']>;
isActive?: InputMaybe<Scalars['Boolean']['input']>; isActive?: InputMaybe<Scalars['Boolean']['input']>;
label?: InputMaybe<Scalars['String']['input']>; label?: InputMaybe<Scalars['String']['input']>;
name?: InputMaybe<Scalars['String']['input']>;
}; };
export type UpdateObjectInput = { export type UpdateObjectInput = {

View File

@ -21,6 +21,15 @@ export const useMetadataField = () => {
createOneMetadataField({ createOneMetadataField({
...formatMetadataFieldInput(input), ...formatMetadataFieldInput(input),
objectId: input.objectId, objectId: input.objectId,
type: input.type,
});
const editMetadataField = (
input: Pick<Field, 'id' | 'label' | 'icon' | 'description'>,
) =>
updateOneMetadataField({
fieldIdToUpdate: input.id,
updatePayload: formatMetadataFieldInput(input),
}); });
const activateMetadataField = (metadataField: Field) => const activateMetadataField = (metadataField: Field) =>
@ -43,5 +52,6 @@ export const useMetadataField = () => {
createMetadataField, createMetadataField,
disableMetadataField, disableMetadataField,
eraseMetadataField, eraseMetadataField,
editMetadataField,
}; };
}; };

View File

@ -28,7 +28,7 @@ export const useUpdateOneMetadataField = () => {
fieldIdToUpdate: UpdateOneMetadataFieldMutationVariables['idToUpdate']; fieldIdToUpdate: UpdateOneMetadataFieldMutationVariables['idToUpdate'];
updatePayload: Pick< updatePayload: Pick<
UpdateOneMetadataFieldMutationVariables['updatePayload'], UpdateOneMetadataFieldMutationVariables['updatePayload'],
'description' | 'icon' | 'isActive' | 'label' 'description' | 'icon' | 'isActive' | 'label' | 'name'
>; >;
}) => { }) => {
return await mutate({ return await mutate({

View File

@ -1,16 +1,12 @@
import toCamelCase from 'lodash.camelcase'; import toCamelCase from 'lodash.camelcase';
import { MetadataFieldDataType } from '@/settings/data-model/types/ObjectFieldDataType';
import { Field } from '~/generated-metadata/graphql'; import { Field } from '~/generated-metadata/graphql';
export const formatMetadataFieldInput = ( export const formatMetadataFieldInput = (
input: Pick<Field, 'label' | 'icon' | 'description'> & { input: Pick<Field, 'label' | 'icon' | 'description'>,
type: MetadataFieldDataType;
},
) => ({ ) => ({
description: input.description?.trim() ?? null, description: input.description?.trim() ?? null,
icon: input.icon, icon: input.icon,
label: input.label.trim(), label: input.label.trim(),
name: toCamelCase(input.label.trim()), name: toCamelCase(input.label.trim()),
type: input.type,
}); });

View File

@ -42,6 +42,7 @@ export const SettingsObjectFieldFormSection = ({
/> />
<StyledInputsContainer> <StyledInputsContainer>
<IconPicker <IconPicker
disabled={disabled}
selectedIconKey={iconKey} selectedIconKey={iconKey}
onChange={(value) => onChange?.({ icon: value.iconKey })} onChange={(value) => onChange?.({ icon: value.iconKey })}
variant="primary" variant="primary"

View File

@ -96,7 +96,7 @@ export const SettingsObjectEdit = () => {
{ children: 'Edit' }, { children: 'Edit' },
]} ]}
/> />
{!!activeMetadataObject.isCustom && ( {activeMetadataObject.isCustom && (
<SaveAndCancelButtons <SaveAndCancelButtons
isSaveDisabled={!canSave} isSaveDisabled={!canSave}
onCancel={() => navigate(`/settings/objects/${objectSlug}`)} onCancel={() => navigate(`/settings/objects/${objectSlug}`)}

View File

@ -1,9 +1,10 @@
import { useEffect } from 'react'; import { useEffect, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom'; import { useNavigate, useParams } from 'react-router-dom';
import { useMetadataField } from '@/metadata/hooks/useMetadataField'; import { useMetadataField } from '@/metadata/hooks/useMetadataField';
import { useMetadataObjectForSettings } from '@/metadata/hooks/useMetadataObjectForSettings'; import { useMetadataObjectForSettings } from '@/metadata/hooks/useMetadataObjectForSettings';
import { getFieldSlug } from '@/metadata/utils/getFieldSlug'; import { getFieldSlug } from '@/metadata/utils/getFieldSlug';
import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer'; import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { SettingsObjectFieldFormSection } from '@/settings/data-model/components/SettingsObjectFieldFormSection'; import { SettingsObjectFieldFormSection } from '@/settings/data-model/components/SettingsObjectFieldFormSection';
@ -26,22 +27,64 @@ export const SettingsObjectFieldEdit = () => {
const activeMetadataObject = findActiveMetadataObjectBySlug(objectSlug); const activeMetadataObject = findActiveMetadataObjectBySlug(objectSlug);
const { disableMetadataField: disableField } = useMetadataField(); const { disableMetadataField, editMetadataField } = useMetadataField();
const activeMetadataField = activeMetadataObject?.fields.find( const activeMetadataField = activeMetadataObject?.fields.find(
(metadataField) => (metadataField) =>
metadataField.isActive && getFieldSlug(metadataField) === fieldSlug, metadataField.isActive && getFieldSlug(metadataField) === fieldSlug,
); );
const [formValues, setFormValues] = useState<
Partial<{
icon: string;
label: string;
description: string;
}>
>({});
useEffect(() => { useEffect(() => {
if (loading) return; if (loading) return;
if (!activeMetadataObject || !activeMetadataField)
if (!activeMetadataObject || !activeMetadataField) {
navigate(AppPath.NotFound); navigate(AppPath.NotFound);
}, [activeMetadataField, activeMetadataObject, loading, navigate]); return;
}
if (!Object.keys(formValues).length) {
setFormValues({
icon: activeMetadataField.icon ?? undefined,
label: activeMetadataField.label,
description: activeMetadataField.description ?? undefined,
});
}
}, [
activeMetadataField,
activeMetadataObject,
formValues,
loading,
navigate,
]);
if (!activeMetadataObject || !activeMetadataField) return null; if (!activeMetadataObject || !activeMetadataField) return null;
const areRequiredFieldsFilled = !!formValues.label;
const hasChanges =
formValues.description !== activeMetadataField.description ||
formValues.icon !== activeMetadataField.icon ||
formValues.label !== activeMetadataField.label;
const canSave = areRequiredFieldsFilled && hasChanges;
const handleSave = async () => {
const editedField = { ...activeMetadataField, ...formValues };
await editMetadataField(editedField);
navigate(`/settings/objects/${objectSlug}`);
};
const handleDisable = async () => { const handleDisable = async () => {
await disableField(activeMetadataField); await disableMetadataField(activeMetadataField);
navigate(`/settings/objects/${objectSlug}`); navigate(`/settings/objects/${objectSlug}`);
}; };
@ -59,13 +102,25 @@ export const SettingsObjectFieldEdit = () => {
{ children: activeMetadataField.label }, { children: activeMetadataField.label },
]} ]}
/> />
{activeMetadataField.isCustom && (
<SaveAndCancelButtons
isSaveDisabled={!canSave}
onCancel={() => navigate(`/settings/objects/${objectSlug}`)}
onSave={handleSave}
/>
)}
</SettingsHeaderContainer> </SettingsHeaderContainer>
<SettingsObjectFieldFormSection <SettingsObjectFieldFormSection
disabled={!activeMetadataField.isCustom} disabled={!activeMetadataField.isCustom}
name={activeMetadataField.label} name={formValues.label}
description={activeMetadataField.description ?? undefined} description={formValues.description}
iconKey={activeMetadataField.icon ?? undefined} iconKey={formValues.icon}
onChange={() => undefined} onChange={(values) =>
setFormValues((previousFormValues) => ({
...previousFormValues,
...values,
}))
}
/> />
<SettingsObjectFieldTypeSelectSection <SettingsObjectFieldTypeSelectSection
disabled disabled

View File

@ -9,6 +9,11 @@ export class UpdateFieldInput {
@Field({ nullable: true }) @Field({ nullable: true })
label?: string; label?: string;
@IsString()
@IsOptional()
@Field({ nullable: true })
name?: string;
@IsString() @IsString()
@IsOptional() @IsOptional()
@Field({ nullable: true }) @Field({ nullable: true })