Feature/dev 212 errors summary

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - `craft\base\Element::includeSetStatusAction()` now returns `false` by default regardless of what `hasStatuses()` returns, fixing a bug where some element indexes were unexpectedly getting “Set Status” actions.
 - Query conditions generated by `craft\helpers\Db::parseParam()` no longer account for `null` values, due to a heavy performance impact. ([#11931](https://github.com/craftcms/cms/issues/11931))
+- Fixed a bug where the default MySQL backup command would attempt to use credentials from `~/.my.cnf` if it exists, instead of Craft’s configured database connection settings. ([#12349](https://github.com/craftcms/cms/issues/12349))
 - Updated Yii to 2.0.47.
 
 ## 4.3.3 - 2022-11-17

src/base/Element.php

@@ -4951,6 +4951,30 @@ protected function fieldLayoutFields(bool $visibleOnly = false): array
         return [];
     }
 
+    /**
+     * @inheritdoc
+     * @throws InvalidConfigException
+     */
+    public function getNativeFieldByAttribute(string $attribute): ?BaseField
+    {
+        if (empty($attribute)) {
+            return null;
+        }
+
+        $fieldLayout = $this->getFieldLayout();
+        if ($fieldLayout) {
+            $field = array_values(array_filter(
+                $fieldLayout->getAvailableNativeFields(),
+                fn($nativeField) => $nativeField->attribute() == $attribute
+            ));
+            if (!empty($field)) {
+                return $field[0];
+            }
+        }
+
+        return null;
+    }
+
     /**
      * @inheritdoc
      * @throws InvalidConfigException if [[siteId]] is invalid

src/base/ElementInterface.php

@@ -12,6 +12,7 @@
 use craft\elements\db\ElementQueryInterface;
 use craft\elements\User;
 use craft\errors\InvalidFieldException;
+use craft\fieldlayoutelements\BaseField;
 use craft\models\FieldLayout;
 use craft\models\Site;
 use Illuminate\Support\Collection;
@@ -1609,4 +1610,12 @@ public function afterMoveInStructure(int $structureId): void;
      * Returns the string representation of the element.
      */
     public function __toString(): string;
+
+    /**
+     * Return the first native field for this element matched by the field attribute (~handle)
+     *
+     * @param string $attribute
+     * @return BaseField|null
+     */
+    public function getNativeFieldByAttribute(string $attribute): ?BaseField;
 }

src/controllers/ElementsController.php

@@ -32,6 +32,7 @@
 use craft\web\CpScreenResponseBehavior;
 use craft\web\View;
 use Throwable;
+use yii\helpers\Markdown;
 use yii\web\BadRequestHttpException;
 use yii\web\ForbiddenHttpException;
 use yii\web\Response;
@@ -411,6 +412,7 @@ public function actionEdit(?ElementInterface $element, ?int $elementId = null):
                 $isDraft
             ))
             ->notice($element->isProvisionalDraft ? fn() => $this->_draftNotice() : null)
+            ->errorsSummary(fn() => $this->_errorsSummary($element))
             ->prepareScreen(
                 fn(Response $response, string $containerId) => $this->_prepareEditor(
                     $element,
@@ -810,6 +812,122 @@ private function _editorContent(
         return $html;
     }
 
+    /**
+     * Return html for errors summary box
+     *
+     * @param ElementInterface $element
+     * @return string
+     */
+    private function _errorsSummary(ElementInterface $element): string
+    {
+        $html = '';
+
+        if ($element->hasErrors()) {
+            $allErrors = $element->getErrors();
+            $allKeys = array_keys($allErrors);
+
+            // only show "top-level" errors
+            // if you e.g. have an assets field which is set to validate related assets,
+            // you should only see the top-level "Fix validation errors on the related asset" error
+            // and not the details of what's wrong with the selected asset;
+            foreach ($allKeys as $key) {
+                $lastNestedKey = substr_replace($key, '', strrpos($key, '.'));
+                $lastNestedKey = substr_replace($lastNestedKey, '', strrpos($lastNestedKey, '['));
+                if (!empty($lastNestedKey)) {
+                    if (in_array($lastNestedKey, $allKeys)) {
+                        unset($allErrors[$key]);
+                    }
+                }
+            }
+            $errorsList = [];
+            foreach ($allErrors as $key => $errors) {
+                foreach ($errors as $error) {
+                    $errorItem = Html::beginTag('li');
+
+                    // this is true in case of e.g. cross site validation error
+                    if (preg_match('/^\s?\<a /', $error)) {
+                        $errorItem .= $error;
+                    } else {
+                        $error = Markdown::processParagraph(htmlspecialchars($error));
+                        $errorItem .= Html::a(Craft::t('app', $error), '#', [
+                            'data-field-error-key' => $key,
+                        ]);
+                    }
+
+                    $errorItem .= Html::endTag('li');
+
+                    $errorsList[] = $errorItem;
+                }
+            }
+
+            if (!empty($errorsList)) {
+                $heading = Craft::t('app', 'Found {num, number} {num, plural, =1{error} other{errors}}:', [
+                    'num' => count($errorsList),
+                ]);
+
+                $html = Html::beginTag('div', [
+                        'class' => ['errors-summary'],
+                        'tabindex' => '-1',
+                    ]) .
+                    Html::beginTag('div') .
+                    Html::tag('span', '', [
+                        'class' => 'notification-icon',
+                        'data-icon' => 'alert',
+                        'aria-label' => 'error',
+                        'role' => 'img',
+                    ]) .
+                    Html::tag('h2', $heading) .
+                    Html::endTag('div') .
+                    Html::beginTag('ul', [
+                        'class' => ['errors'],
+                    ]) .
+                    implode('', $errorsList) .
+                    Html::endTag('ul') .
+                    Html::endTag('div');
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Returns array of <li> items for error given handle
+     *
+     * @param array $allErrors
+     * @param string $handle
+     * @param string|null $label
+     * @return array
+     */
+    private function _prepErrorsSummaryList(array $allErrors, string $handle, ?string $label = null): array
+    {
+        $errorsList = [];
+        if (isset($allErrors[$handle])) {
+            foreach ($allErrors[$handle] as $error) {
+                $errorItem = Html::beginTag('li');
+
+                // get name of the field; wrap that name in the error message in a span
+                if (!empty($label) && str_contains($error, $label)) {
+                    $error = str_replace($label, "<span>$label</span>", $error);
+                }
+
+                // this is true in case of e.g. cross site validation error
+                if (preg_match('/^\s?\<a /', $error)) {
+                    $errorItem .= $error;
+                } else {
+                    $errorItem .= Html::a(Craft::t('app', $error), '#', [
+                        'data-field-error-key' => $handle,
+                    ]);
+                }
+
+                $errorItem .= Html::endTag('li');
+
+                $errorsList[$handle][] = $errorItem;
+            }
+        }
+
+        return $errorsList;
+    }
+
     private function _editorSidebar(
         ElementInterface $element,
         bool $mergedCanonicalChanges,
@@ -898,7 +1016,7 @@ public function actionSave(): ?Response
         }
 
         try {
-            $success = $elementsService->saveElement($element);
+            $success = $elementsService->saveElement($element, crossSiteValidate: Craft::$app->getIsMultiSite());
         } catch (UnsupportedSiteException $e) {
             $element->addError('siteId', $e->getMessage());
             $success = false;
@@ -1307,7 +1425,7 @@ public function actionApplyDraft(): ?Response
             $element->setScenario(Element::SCENARIO_LIVE);
         }
 
-        if (!$elementsService->saveElement($element)) {
+        if (!$elementsService->saveElement($element, crossSiteValidate: Craft::$app->getIsMultiSite())) {
             return $this->_asAppyDraftFailure($element);
         }
 
@@ -1799,6 +1917,7 @@ private function _asFailure(ElementInterface $element, string $message): ?Respon
             'modelName' => 'element',
             'element' => $element->toArray($element->attributes()),
             'errors' => $element->getErrors(),
+            'errorsSummary' => $this->_errorsSummary($element),
         ];
 
         return $this->asFailure($message, $data, ['element' => $element]);

src/db/mysql/Schema.php

@@ -152,7 +152,7 @@ public function createColumnSchemaBuilder($type, $length = null): ColumnSchemaBu
     public function getDefaultBackupCommand(?array $ignoreTables = null): string
     {
         $defaultArgs =
-            ' --defaults-extra-file="' . $this->_createDumpConfigFile() . '"' .
+            ' --defaults-file="' . $this->_createDumpConfigFile() . '"' .
             ' --add-drop-table' .
             ' --comments' .
             ' --create-options' .

src/helpers/Cp.php

@@ -705,6 +705,7 @@ public static function fieldHtml(string $input, array $config = []): string
                     'data' => [
                         'attribute' => $attribute,
                     ],
+                    'tabindex' => -1,
                 ],
                 $config['fieldAttributes'] ?? []
             )) .

src/i18n/I18N.php

@@ -320,6 +320,17 @@ public function translate($category, $message, $params, $language): ?string
         return $translation;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function format($message, $params, $language)
+    {
+        // wrap attribute value in an <em> tag
+        array_walk($params, fn(&$val, $key) => ($key == 'attribute') ? $val = "*$val*" : $val);
+
+        return parent::format($message, $params, $language);
+    }
+
     /**
      * Returns whether [[translate()]] should wrap translations with `@` characters,
      * per the `translationDebugOutput` config setting.