Merge branch '5.x' into 5.6

craftcms · Jan 4, 2025 · f72c989 · f72c989
2 parents 5548f20 + 22d6cd1
commit f72c989
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes for Craft CMS 5
 
+## Unreleased
+
+- Fixed a JavaScript error that could occur if there was a problem applying changes to field layout elements. ([#16380](https://github.com/craftcms/cms/issues/16380))
+- Fixed a bug where field layout designers were validating field names, handles, and instructions, even if they weren’t overridden within the field instance. ([#16380](https://github.com/craftcms/cms/issues/16380))
+
 ## 5.5.8 - 2025-01-02
 
 - Fixed a bug where custom fields were getting included in rendered field layout forms, even if their `getInputHtml()` method returned an empty string.

diff --git a/src/controllers/FieldsController.php b/src/controllers/FieldsController.php
@@ -478,14 +478,22 @@ public function actionApplyLayoutTabSettings(): Response
     public function actionApplyLayoutElementSettings(): Response
     {
         /** @var FieldLayoutElement $element */
-        $element = $this->_fldComponent();
+        $element = $this->_fldComponent($settings);
+
+        if (!empty($settings)) {
+            $validateAttributes = array_intersect(
+                array_keys(array_filter($settings)),
+                ['name', 'handle', 'instructions'],
+            );
+        }
 
-        if ($element instanceof CustomField) {
+        if (!empty($validateAttributes) && $element instanceof CustomField) {
             $field = $element->getField();
             if ($field instanceof Field) {
                 $field->validateHandleUniqueness = false;
             }
-            if (!$field->validate(['name', 'handle', 'instructions'])) {
+
+            if (!$field->validate($validateAttributes)) {
                 if ($field->hasErrors('name')) {
                     $field->addErrors(['label' => $field->getErrors('name')]);
                     $field->clearErrors('name');
@@ -574,9 +582,10 @@ public function actionRenderCardPreview()
     /**
      * Returns the field layout component being edited, populated with the posted config/settings.
      *
+     * @param array|null $settings The `settings` array that might have been posted
      * @return FieldLayoutComponent
      */
-    private function _fldComponent(): FieldLayoutComponent
+    private function _fldComponent(?array &$settings = null): FieldLayoutComponent
     {
         $uid = $this->request->getRequiredBodyParam('uid');
         $elementType = $this->request->getRequiredBodyParam('elementType');
@@ -593,9 +602,10 @@ private function _fldComponent(): FieldLayoutComponent
         $settingsStr = $this->request->getBodyParam('settings');
 
         if ($settingsStr !== null) {
-            parse_str($settingsStr, $settings);
+            parse_str($settingsStr, $postedSettings);
             $settingsNamespace = $this->request->getRequiredBodyParam('settingsNamespace');
-            $componentConfig = array_merge($componentConfig, ArrayHelper::getValue($settings, $settingsNamespace, []));
+            $settings = ArrayHelper::getValue($postedSettings, $settingsNamespace, []);
+            $componentConfig = array_merge($componentConfig, $settings);
         }
 
         $isTab = false;

diff --git a/src/migrations/m230617_070415_entrify_matrix_blocks.php b/src/migrations/m230617_070415_entrify_matrix_blocks.php
@@ -107,7 +107,7 @@ public function safeUp(): bool
                     'showSlugField' => false,
                 ]);
 
-                $fieldLayoutUid = ArrayHelper::firstKey($blockTypeConfig['fieldLayouts'] ?? []);
+                $fieldLayoutUid = array_key_first($blockTypeConfig['fieldLayouts'] ?? []);
                 $fieldLayout = $fieldLayoutUid ? $fieldsService->getLayoutByUid($fieldLayoutUid) : new FieldLayout();
                 $fieldLayout->type = Entry::class;
                 $entryType->setFieldLayout($fieldLayout);

diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/src/js/FieldLayoutDesigner.js b/src/web/assets/cp/src/js/FieldLayoutDesigner.js
@@ -1232,18 +1232,19 @@ Craft.FieldLayoutDesigner.Element = Garnish.Base.extend({
       );
       data = response.data;
     } catch (e) {
-      let errors = e?.response?.data?.errors;
-
-      if (errors) {
-        Object.entries(errors).forEach(([name, fieldErrors]) => {
-          const $field = this.slideout.$container.find(
-            `[data-error-key="${name}"]`
-          );
-          if ($field) {
-            Craft.ui.addErrorsToField($field, fieldErrors);
-            this.fieldsWithErrors.push($field);
-          }
-        });
+      if (withSettings) {
+        let errors = e?.response?.data?.errors;
+        if (errors) {
+          Object.entries(errors).forEach(([name, fieldErrors]) => {
+            const $field = this.slideout.$container.find(
+              `[data-error-key="${name}"]`
+            );
+            if ($field) {
+              Craft.ui.addErrorsToField($field, fieldErrors);
+              this.fieldsWithErrors.push($field);
+            }
+          });
+        }
       }
 
       Craft.cp.displayError(e?.response?.data?.message);