Fixed #15075

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Craft CMS 5
 
+## Unreleased
+
+- Fixed a bug where entry type condition rules prefixed their option labels with section names. ([#15075](https://github.com/craftcms/cms/issues/15075))
+
 ## 5.1.7 - 2024-05-25
 
 - Scalar element queries no longer set their `$select` property to the scalar expression, fixing an error that could occur when executing scalar queries for relation fields. ([#15071](https://github.com/craftcms/cms/issues/15071))

src/elements/conditions/entries/TypeConditionRule.php

@@ -9,7 +9,6 @@
 use craft\elements\db\ElementQueryInterface;
 use craft\elements\db\EntryQuery;
 use craft\elements\Entry;
-use craft\models\Section;
 
 /**
  * Entry type condition rule.
@@ -35,21 +34,6 @@ public function getExclusiveQueryParams(): array
         return ['type', 'typeId'];
     }
 
-    /**
-     * @var Section[]
-     */
-    private array $_sections = [];
-
-    /**
-     * @inheritdoc
-     */
-    public function init(): void
-    {
-        $this->_sections = Craft::$app->getEntries()->getAllSections();
-
-        parent::init();
-    }
-
     /**
      * @inheritdoc
      */
@@ -69,12 +53,9 @@ public function setAttributes($values, $safeOnly = true): void
     protected function options(): array
     {
         $options = [];
-        foreach ($this->_sections as $section) {
-            foreach ($section->getEntryTypes() as $entryType) {
-                $options[$entryType->uid] = sprintf('%s - %s', $section->name, $entryType->name);
-            }
+        foreach (Craft::$app->getEntries()->getAllEntryTypes() as $entryType) {
+            $options[$entryType->uid] = $entryType->getUiLabel();
         }
-
         return $options;
     }
 
@@ -84,8 +65,8 @@ protected function options(): array
     public function modifyQuery(ElementQueryInterface $query): void
     {
         /** @var EntryQuery $query */
-        $sections = Craft::$app->getEntries();
-        $query->typeId($this->paramValue(fn($uid) => $sections->getEntryTypeByUid($uid)->id ?? null));
+        $entriesService = Craft::$app->getEntries();
+        $query->typeId($this->paramValue(fn($uid) => $entriesService->getEntryTypeByUid($uid)->id ?? null));
     }
 
     /**