refactor the event didEditFieldNameOnContentType triggered when we edit the field name

This commit is contained in:
Simone Taeggi 2022-11-23 00:13:19 +01:00
parent e3fa29997f
commit 59b86944a3
2 changed files with 15 additions and 4 deletions

View File

@ -512,10 +512,6 @@ const FormModal = () => {
if (canEditContentType(allDataSchema, modifiedData)) {
onCloseModal();
if (modifiedData?.displayName !== allDataSchema?.contentType?.schema?.displayName) {
trackUsage('didEditFieldNameOnContentType');
}
submitData(modifiedData);
} else {
toggleNotification({
@ -946,6 +942,13 @@ const FormModal = () => {
const schemaKind = get(contentTypes, [targetUid, 'schema', 'kind']);
const isEditingFieldName =
actionType === 'edit' && attributes.every(({ name }) => name !== modifiedData?.name);
const handleClickFinish = () => {
trackUsage('didEditFieldNameOnContentType');
};
return (
<ModalLayout onClose={handleClosed} labelledBy="title">
<FormModalHeader
@ -1076,6 +1079,7 @@ const FormModal = () => {
onSubmitEditContentType={handleSubmit}
onSubmitEditCustomFieldAttribute={handleSubmit}
onSubmitEditDz={handleSubmit}
onClickFinish={isEditingFieldName ? handleClickFinish : undefined}
/>
}
startActions={

View File

@ -43,6 +43,7 @@ const FormModalEndActions = ({
onSubmitEditContentType,
onSubmitEditCustomFieldAttribute,
onSubmitEditDz,
onClickFinish,
}) => {
const { formatMessage } = useIntl();
@ -93,6 +94,7 @@ const FormModalEndActions = ({
onClick={(e) => {
e.preventDefault();
onClickFinish();
onSubmitEditDz(e, false);
}}
>
@ -194,6 +196,7 @@ const FormModalEndActions = ({
onClick={(e) => {
e.preventDefault();
onClickFinish();
onSubmitAddComponentAttribute(e, false);
}}
>
@ -230,6 +233,7 @@ const FormModalEndActions = ({
onClick={(e) => {
e.preventDefault();
onClickFinish();
onSubmitEditAttribute(e, false);
}}
>
@ -409,6 +413,7 @@ const FormModalEndActions = ({
onClick={(e) => {
e.preventDefault();
onClickFinish();
onSubmitEditCustomFieldAttribute(e, false);
}}
>
@ -426,6 +431,7 @@ const FormModalEndActions = ({
FormModalEndActions.defaultProps = {
categoryName: null,
onClickFinish() {},
};
FormModalEndActions.propTypes = {
@ -460,6 +466,7 @@ FormModalEndActions.propTypes = {
onSubmitEditContentType: PropTypes.func.isRequired,
onSubmitEditCustomFieldAttribute: PropTypes.func.isRequired,
onSubmitEditDz: PropTypes.func.isRequired,
onClickFinish: PropTypes.func,
};
export default FormModalEndActions;