@strapi/content-type-builder 5.57.0 → 5.58.0

package/dist/admin/components/FormModal/FormModal.mjs

@@ -103,39 +103,34 @@ const FormModal = ()=>{
         }
         return getRenameStorageChange(initialData, modifiedData, attributeRenameMigrationMode);
     };
-    const checkFieldNameChanges = ()=>{
-        // Only check when editing an attribute
+    /**
+   * Fields whose visibility condition depends on this field and references an
+   * enum value that this edit removes or changes. Renames are followed
+   * automatically, so only an enum value change can break a condition.
+   */ const getConditionsBrokenByEnumChange = ()=>{
         if (actionType !== 'edit' || modalType !== 'attribute') {
             return false;
         }
-        const oldName = initialData.name;
         const oldEnum = initialData.enum;
         const newEnum = modifiedData.enum;
-        // Get all attributes from the content type schema
+        if (!Array.isArray(oldEnum) || !Array.isArray(newEnum)) {
+            return false;
+        }
+        const removedValues = oldEnum.filter((value)=>!newEnum.includes(value));
+        if (removedValues.length === 0) {
+            return false;
+        }
+        const fieldName = initialData.name;
         const contentTypeAttributes = type?.attributes ?? [];
-        // Find all fields that reference this field in their conditions
-        const referencedFields = contentTypeAttributes.filter((attr)=>{
+        const brokenFields = contentTypeAttributes.filter((attr)=>{
             const conditionEntry = getFirstVisibleConditionEntry(attr.conditions);
             if (conditionEntry === null) {
                 return false;
             }
             const { fieldVar, value } = conditionEntry;
-            // Check if this condition references our field
-            if (fieldVar.var !== oldName) {
-                return false;
-            }
-            // If it's an enum field, also check if the value is being deleted/changed
-            if (oldEnum !== undefined && newEnum !== undefined) {
-                const deletedOrChangedValues = oldEnum.filter((oldValue)=>!newEnum.includes(oldValue));
-                return typeof value === 'string' && deletedOrChangedValues.includes(value);
-            }
-            return true;
+            return fieldVar.var === fieldName && typeof value === 'string' && removedValues.includes(value);
         });
-        // If any fields reference this field, return them
-        if (referencedFields.length > 0) {
-            return referencedFields;
-        }
-        return false;
+        return brokenFields.length > 0 ? brokenFields : false;
     };
     React.useEffect(()=>{
         if (isOpen && modalType) {
@@ -832,9 +827,9 @@ const FormModal = ()=>{
     };
     const handleSubmit = async (e, shouldContinue = isCreating)=>{
         e.preventDefault();
-        // Check for field name changes when clicking Finish
-        const referencedFields = checkFieldNameChanges();
-        if (referencedFields) {
+        // Check for conditions broken by an enum value change when clicking Finish
+        const brokenFields = getConditionsBrokenByEnumChange();
+        if (brokenFields) {
             setPendingSubmit({
                 e,
                 shouldContinue
@@ -1014,46 +1009,17 @@ const FormModal = ()=>{
                                 setPendingSubmit(null);
                             },
                             children: (()=>{
-                                const referencedFields = checkFieldNameChanges();
-                                if (referencedFields === false) return null;
-                                const fieldNames = referencedFields.map((field)=>field.name).join(', ');
-                                const oldEnum = initialData.enum;
-                                const newEnum = modifiedData.enum;
-                                const isEnum = Array.isArray(oldEnum) && Array.isArray(newEnum);
-                                if (isEnum === true) {
-                                    const deletedOrChangedValues = oldEnum.filter((value)=>!newEnum.includes(value));
-                                    return /*#__PURE__*/ jsx(Box, {
-                                        children: /*#__PURE__*/ jsxs(Typography, {
-                                            children: [
-                                                formatMessage({
-                                                    id: 'form.attribute.condition.enum-change-warning',
-                                                    defaultMessage: 'The following fields have conditions that depend on this field: '
-                                                }),
-                                                /*#__PURE__*/ jsx(Typography, {
-                                                    fontWeight: "bold",
-                                                    children: fieldNames
-                                                }),
-                                                formatMessage({
-                                                    id: 'form.attribute.condition.enum-change-warning-values',
-                                                    defaultMessage: '. Changing or removing the enum values '
-                                                }),
-                                                /*#__PURE__*/ jsx(Typography, {
-                                                    fontWeight: "bold",
-                                                    children: deletedOrChangedValues.join(', ')
-                                                }),
-                                                formatMessage({
-                                                    id: 'form.attribute.condition.enum-change-warning-end',
-                                                    defaultMessage: ' will break these conditions. Do you want to proceed?'
-                                                })
-                                            ]
-                                        })
-                                    });
-                                }
+                                const brokenFields = getConditionsBrokenByEnumChange();
+                                if (brokenFields === false) return null;
+                                const fieldNames = brokenFields.map((field)=>field.name).join(', ');
+                                const oldEnum = initialData.enum ?? [];
+                                const newEnum = modifiedData.enum ?? [];
+                                const deletedOrChangedValues = oldEnum.filter((value)=>!newEnum.includes(value));
                                 return /*#__PURE__*/ jsx(Box, {
                                     children: /*#__PURE__*/ jsxs(Typography, {
                                         children: [
                                             formatMessage({
-                                                id: 'form.attribute.condition.field-change-warning',
+                                                id: 'form.attribute.condition.enum-change-warning',
                                                 defaultMessage: 'The following fields have conditions that depend on this field: '
                                             }),
                                             /*#__PURE__*/ jsx(Typography, {
@@ -1061,8 +1027,16 @@ const FormModal = ()=>{
                                                 children: fieldNames
                                             }),
                                             formatMessage({
-                                                id: 'form.attribute.condition.field-change-warning-end',
-                                                defaultMessage: '. Renaming it will break these conditions. Do you want to proceed?'
+                                                id: 'form.attribute.condition.enum-change-warning-values',
+                                                defaultMessage: '. Changing or removing the enum values '
+                                            }),
+                                            /*#__PURE__*/ jsx(Typography, {
+                                                fontWeight: "bold",
+                                                children: deletedOrChangedValues.join(', ')
+                                            }),
+                                            formatMessage({
+                                                id: 'form.attribute.condition.enum-change-warning-end',
+                                                defaultMessage: ' will break these conditions. Do you want to proceed?'
                                             })
                                         ]
                                     })