Bugfix/17284 field names and conditionals

CHANGELOG-WIP.md

@@ -1,5 +1,8 @@
 # Release Notes for Craft CMS 4.16 (WIP)
 
+### Content Management
+- Element condition builders now show condition rules for custom fields with duplicate names. ([#17361](https://github.com/craftcms/cms/pull/17361))
+
 ### Administration
 - Assets and Categories fields no longer have “Show the site menu” settings. ([#17156](https://github.com/craftcms/cms/issues/17156))
 - Improved the wording of validation errors caused by relational fields’ “Validate related [type]” settings. ([#9960](https://github.com/craftcms/cms/discussions/9960))

src/base/conditions/BaseCondition.php

@@ -467,13 +467,15 @@ private function _ruleTypeMenu(
         if ($rule) {
             $label = $rule->getLabel();
             $hint = $rule->getLabelHint();
+            $showHint = $rule->showLabelHint();
             $key = $label . ($hint !== null ? " - $hint" : '');
             $groupLabel = $rule->getGroupLabel() ?? '__UNGROUPED__';
 
             $groupedRuleTypeOptions[$groupLabel] = [
                 [
                     'label' => $label,
                     'hint' => $hint,
+                    'showHint' => $showHint,
                     'value' => $ruleValue,
                 ],
             ];
@@ -483,13 +485,15 @@ private function _ruleTypeMenu(
         foreach ($selectableRules as $value => $selectableRule) {
             $label = $selectableRule->getLabel();
             $hint = $selectableRule->getLabelHint();
+            $showHint = $selectableRule->showLabelHint();
             $key = $label . ($hint !== null ? " - $hint" : '');
             $groupLabel = $selectableRule->getGroupLabel() ?? '__UNGROUPED__';
 
             if (!isset($labelsByGroup[$groupLabel][$key])) {
                 $groupedRuleTypeOptions[$groupLabel][] = [
                     'label' => $label,
                     'hint' => $hint,
+                    'showHint' => $showHint,
                     'value' => $value,
                 ];
                 $labelsByGroup[$groupLabel][$key] = true;
@@ -517,7 +521,7 @@ private function _ruleTypeMenu(
                     $html = Html::beginTag('li');
 
                     $label = Html::encode($option['label']);
-                    if ($option['hint'] !== null) {
+                    if ($option['showHint'] && $option['hint'] !== null) {
                         $label .= ' ' .
                             Html::tag('span', sprintf('– %s', Html::encode($option['hint'])), [
                                 'class' => 'light',

src/base/conditions/BaseConditionRule.php

@@ -52,6 +52,14 @@ public function getLabelHint(): ?string
         return null;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function showLabelHint(): bool
+    {
+        return false;
+    }
+
     /**
      * @var string|null UUID
      */

src/base/conditions/ConditionRuleInterface.php

@@ -41,6 +41,14 @@ public function getLabel(): string;
      */
     public function getLabelHint(): ?string;
 
+    /**
+     * Returns whether to show rule’s option label hint.
+     *
+     * @return bool
+     * @since 4.16.0
+     */
+    public function showLabelHint(): bool;
+
     /**
      * Returns the optgroup label the condition rule should be grouped under.
      *

src/fields/conditions/FieldConditionRuleTrait.php

@@ -97,9 +97,15 @@ public function getLabel(): string
      */
     public function getLabelHint(): ?string
     {
-        static $showHandles = null;
-        $showHandles ??= Craft::$app->getUser()->getIdentity()?->getPreference('showFieldHandles') ?? false;
-        return $showHandles ? $this->field()->handle : null;
+        return $this->field()->handle;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function showLabelHint(): bool
+    {
+        return Craft::$app->getUser()->getIdentity()?->getPreference('showFieldHandles') ?? false;
     }
 
     /**