From 28b677bf365117d29b13b36bbfc3de2c60623d2c Mon Sep 17 00:00:00 2001
From: Ivan Bochkarev <ivanx86@gmail.com>
Date: Fri, 8 May 2026 10:02:10 +0600
Subject: [PATCH 1/5] fix(manager): options category tree root for nested
 catalog (#237)

Add ms3_option_category_tree_parent setting and resolve parent=0 in OptionsController::getTree. Expose optionCategoryTreeParent in ms3.config; Vue passes rootParent. CHANGELOG + ru/en lexicons.
---
 _build/elements/settings.php                  |  5 +++++
 .../controllers/category/update.class.php     |  1 +
 .../controllers/mgr/settings.class.php        |  1 +
 .../minishop3/lexicon/en/setting.inc.php      |  3 +++
 .../minishop3/lexicon/ru/setting.inc.php      |  3 +++
 .../Api/Manager/OptionsController.php         | 20 +++++++++++++++++--
 .../src/components/CategoryOptionsTab.vue     |  7 +++++--
 .../src/components/OptionCategoryTree.vue     |  2 +-
 vueManager/src/components/OptionsGrid.vue     | 13 +++++++++---
 9 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/_build/elements/settings.php b/_build/elements/settings.php
index ab4375ac9..e468e1790 100644
--- a/_build/elements/settings.php
+++ b/_build/elements/settings.php
@@ -35,6 +35,11 @@
         'xtype' => 'combo-boolean',
         'area' => 'ms3_category',
     ],
+    'ms3_option_category_tree_parent' => [
+        'value' => 0,
+        'xtype' => 'numberfield',
+        'area' => 'ms3_options',
+    ],
     'ms3_template_category_default' => [
         'value' => '',
         'xtype' => 'modx-combo-template',
diff --git a/core/components/minishop3/controllers/category/update.class.php b/core/components/minishop3/controllers/category/update.class.php
index dadb9a37b..41fc39128 100644
--- a/core/components/minishop3/controllers/category/update.class.php
+++ b/core/components/minishop3/controllers/category/update.class.php
@@ -75,6 +75,7 @@ public function loadCustomCssJs()
             'connector_url' => $this->ms3->config['connectorUrl'],
             'show_options' => $showOptions,
             'default_thumb' => $this->ms3->config['defaultThumb'],
+            'optionCategoryTreeParent' => (int)$this->modx->getOption('ms3_option_category_tree_parent', null, 0),
             'show_nested_products' => (bool) $this->modx->getOption('ms3_category_show_nested_products', null, true),
             'category_products_rows' => (int) $this->getOption('ms3_category_products_default_rows', null, 20),
         );
diff --git a/core/components/minishop3/controllers/mgr/settings.class.php b/core/components/minishop3/controllers/mgr/settings.class.php
index ccea0f54d..66e5e15b6 100644
--- a/core/components/minishop3/controllers/mgr/settings.class.php
+++ b/core/components/minishop3/controllers/mgr/settings.class.php
@@ -64,6 +64,7 @@ public function loadCustomCssJs()
 
         $config = $this->ms3->config;
         $config['default_thumb'] = $this->ms3->config['defaultThumb'];
+        $config['optionCategoryTreeParent'] = (int)$this->modx->getOption('ms3_option_category_tree_parent', null, 0);
 
         $this->addHtml('<script>
             ms3.config = ' . json_encode($config) . ';
diff --git a/core/components/minishop3/lexicon/en/setting.inc.php b/core/components/minishop3/lexicon/en/setting.inc.php
index effb99af2..e672429d7 100644
--- a/core/components/minishop3/lexicon/en/setting.inc.php
+++ b/core/components/minishop3/lexicon/en/setting.inc.php
@@ -21,6 +21,7 @@
 $_lang['area_ms3_security'] = 'Security';
 $_lang['area_ms3_api'] = 'API';
 $_lang['area_ms3_notifications'] = 'Notifications';
+$_lang['area_ms3_options'] = 'Product options';
 
 $_lang['setting_ms3_chunks_categories'] = 'Categories for chunks list';
 $_lang['setting_ms3_chunks_categories_desc'] = 'Comma-separated list of category IDs for chunks list.';
@@ -56,6 +57,8 @@
 $_lang['setting_ms3_category_show_nested_products_desc'] = 'If you enable this option, all nested products will be shown in category. They are highlighted with different color and have their parent category name under pagetitle.';
 $_lang['setting_ms3_category_show_options'] = 'Show category product options';
 $_lang['setting_ms3_category_show_options_desc'] = 'Show options for category products.';
+$_lang['setting_ms3_option_category_tree_parent'] = 'Options UI: category tree root resource ID';
+$_lang['setting_ms3_option_category_tree_parent_desc'] = 'When product categories (msCategory) are not direct children of the site root (parent = 0), set this to the container resource ID under which categories live. The manager options tree and category pickers then load the first level relative to this parent. Use 0 for default behavior (only msCategory resources with parent = 0).';
 $_lang['setting_ms3_category_remember_grid'] = 'Remember category grid';
 $_lang['setting_ms3_category_remember_grid_desc'] = 'If enabled, category grid state will be remembered and restored on page load, including page number and search string.';
 $_lang['setting_ms3_category_id_as_alias'] = 'Category id as alias';
diff --git a/core/components/minishop3/lexicon/ru/setting.inc.php b/core/components/minishop3/lexicon/ru/setting.inc.php
index 58afc901b..c8967d371 100644
--- a/core/components/minishop3/lexicon/ru/setting.inc.php
+++ b/core/components/minishop3/lexicon/ru/setting.inc.php
@@ -21,6 +21,7 @@
 $_lang['area_ms3_security'] = 'Безопасность';
 $_lang['area_ms3_api'] = 'API';
 $_lang['area_ms3_notifications'] = 'Уведомления';
+$_lang['area_ms3_options'] = 'Опции товаров';
 
 $_lang['setting_ms3_chunks_categories'] = 'Категории для списка чанков';
 $_lang['setting_ms3_chunks_categories_desc'] = 'Список ID категорий через запятую  для списка чанков.';
@@ -56,6 +57,8 @@
 $_lang['setting_ms3_category_show_nested_products_desc'] = 'Если вы включаете эту опцию, то в категории будут показаны все вложенные товары. Они выделены другим цветом и у них есть имя родной категории под pagetitle.';
 $_lang['setting_ms3_category_show_options'] = 'Показывать опции товаров категории';
 $_lang['setting_ms3_category_show_options_desc'] = 'Показывать опции к товарам категории.';
+$_lang['setting_ms3_option_category_tree_parent'] = 'UI опций: ID ресурса-корня дерева категорий';
+$_lang['setting_ms3_option_category_tree_parent_desc'] = 'Если категории магазина (msCategory) не являются прямыми детьми корня сайта (parent = 0), укажите ID контейнерного ресурса, под которым они лежат. Тогда дерево категорий в настройках опций и селекторах загрузит первый уровень относительно этого родителя. 0 — только категории с parent = 0 (поведение по умолчанию).';
 $_lang['setting_ms3_category_remember_grid'] = 'Запоминание таблицы категории';
 $_lang['setting_ms3_category_remember_grid_desc'] = 'Если включено, состояние таблицы категории будет запоминаться и восстанавливаться при загрузке страницы, включая номер страницы и строку поиска.';
 $_lang['setting_ms3_category_id_as_alias'] = 'Id категории как псевдоним';
diff --git a/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php b/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
index 66de7df03..a84fdee9b 100644
--- a/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
+++ b/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
@@ -319,11 +319,13 @@ public function getTypes(): array
      * MODX resource tree for category selection. Optional ?option_id= to flag which
      * categories already have the option linked (for checkbox UI).
      *
-     * @param array $params parent (default 0), option_id (optional), categories[] (prechecked)
+     * @param array $params parent (default 0 = semantic root; resolved via ms3_option_category_tree_parent when set),
+     *                     option_id (optional), categories[] (prechecked)
      */
     public function getTree(array $params = []): array
     {
-        $parent = (int)($params['parent'] ?? 0);
+        $requestedParent = (int)($params['parent'] ?? 0);
+        $parent = $this->resolveOptionsTreeParentId($requestedParent);
         $optionId = isset($params['option_id']) ? (int)$params['option_id'] : 0;
         $preChecked = $this->decodeIntArray($params['categories'] ?? null);
 
@@ -599,6 +601,20 @@ protected function splitCategoriesPayload($payload): array
         return [$enabled, $disabled];
     }
 
+    /**
+     * Map semantic tree root (client sends parent=0) to real MODX resource parent id when
+     * msCategory resources are not direct children of site root.
+     */
+    private function resolveOptionsTreeParentId(int $requestedParent): int
+    {
+        if ($requestedParent !== 0) {
+            return $requestedParent;
+        }
+        $configured = (int)$this->modx->getOption('ms3_option_category_tree_parent', null, 0);
+
+        return $configured > 0 ? $configured : 0;
+    }
+
     /**
      * Decode ids array whether it came as JSON string, comma string, or array.
      *
diff --git a/vueManager/src/components/CategoryOptionsTab.vue b/vueManager/src/components/CategoryOptionsTab.vue
index 29dce7600..0feee8385 100644
--- a/vueManager/src/components/CategoryOptionsTab.vue
+++ b/vueManager/src/components/CategoryOptionsTab.vue
@@ -13,9 +13,10 @@ import Select from 'primevue/select'
 import Toast from 'primevue/toast'
 import { useConfirm } from 'primevue/useconfirm'
 import { useToast } from 'primevue/usetoast'
-import { onMounted, ref, watch } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
+import { getMs3Config } from '../utils/modx.js'
 
 const props = defineProps({
   categoryId: { type: Number, required: true },
@@ -25,6 +26,8 @@ const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
 
+const optionCategoryTreeRootParent = computed(() => getMs3Config()?.optionCategoryTreeParent ?? 0)
+
 const links = ref([])
 const loading = ref(false)
 const searchQuery = ref('')
@@ -86,7 +89,7 @@ async function loadAvailableCategories() {
   // flattened: just fetch the first level of resources for now (limit to obvious set).
   // A richer picker would use the full tree, but a flat Select is consistent with the
   // legacy ExtJS behavior.
-  const r = await request.get('/api/mgr/options/tree', { parent: 0 })
+  const r = await request.get('/api/mgr/options/tree', { parent: optionCategoryTreeRootParent.value })
   const roots = r?.results || []
   // Expand one level for convenience (walk all children of each msCategory root).
   const expanded = [...roots]
diff --git a/vueManager/src/components/OptionCategoryTree.vue b/vueManager/src/components/OptionCategoryTree.vue
index 42afe2378..5881def02 100644
--- a/vueManager/src/components/OptionCategoryTree.vue
+++ b/vueManager/src/components/OptionCategoryTree.vue
@@ -24,7 +24,7 @@ const props = defineProps({
   modelValue: { type: Array, default: () => [] },
   /** Pre-fetch checked state from the option's current links. Pass 0/null to skip. */
   optionId: { type: [Number, String], default: 0 },
-  /** Root resource id. 0 = site root. */
+  /** Root resource id for first tree request. 0 = semantic site root (resolved on API via ms3_option_category_tree_parent when set). */
   rootParent: { type: Number, default: 0 },
 })
 
diff --git a/vueManager/src/components/OptionsGrid.vue b/vueManager/src/components/OptionsGrid.vue
index 756f87578..d6ba17633 100644
--- a/vueManager/src/components/OptionsGrid.vue
+++ b/vueManager/src/components/OptionsGrid.vue
@@ -14,6 +14,7 @@ import { useToast } from 'primevue/usetoast'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
+import { getMs3Config } from '../utils/modx.js'
 import { onOptionGroupsChanged } from '../utils/optionGroupsBus.js'
 import OptionCategoryTree from './OptionCategoryTree.vue'
 import OptionValuesEditor from './OptionValuesEditor.vue'
@@ -22,6 +23,8 @@ const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
 
+const optionCategoryTreeRootParent = computed(() => getMs3Config()?.optionCategoryTreeParent ?? 0)
+
 // Grid state
 const options = ref([])
 const totalRecords = ref(0)
@@ -348,7 +351,7 @@ onBeforeUnmount(() => {
       <!-- Category filter tree (left pane) -->
       <aside class="options-tree-pane">
         <h4 class="pane-title">{{ _('ms3_categories') || 'Категории' }}</h4>
-        <OptionCategoryTree v-model="selectedCategories" />
+        <OptionCategoryTree v-model="selectedCategories" :root-parent="optionCategoryTreeRootParent" />
       </aside>
 
       <!-- Main grid + toolbar + dialog (right pane) -->
@@ -542,7 +545,11 @@ onBeforeUnmount(() => {
 
         <div class="dialog-tree">
           <h4 class="pane-title">{{ _('ms3_categories') || 'Категории' }}</h4>
-          <OptionCategoryTree v-model="editingCategories" :option-id="editing.id || 0" />
+          <OptionCategoryTree
+            v-model="editingCategories"
+            :option-id="editing.id || 0"
+            :root-parent="optionCategoryTreeRootParent"
+          />
         </div>
       </div>
 
@@ -572,7 +579,7 @@ onBeforeUnmount(() => {
           'Выберите категории — в них будут созданы связи для выбранных опций (существующие останутся).'
         }}
       </p>
-      <OptionCategoryTree v-model="assignCategories" />
+      <OptionCategoryTree v-model="assignCategories" :root-parent="optionCategoryTreeRootParent" />
       <template #footer>
         <Button
           :label="_('cancel') || 'Отмена'"

From 944ee76fcf5f85e294ab89bce553b87c84c155b2 Mon Sep 17 00:00:00 2001
From: Ivan Bochkarev <ivanx86@gmail.com>
Date: Sun, 17 May 2026 21:33:47 +0600
Subject: [PATCH 2/5] fix(manager): make option category tree semantic (#237)

---
 _build/elements/settings.php                  |  5 --
 .../controllers/category/update.class.php     |  1 -
 .../controllers/mgr/settings.class.php        |  1 -
 .../minishop3/lexicon/en/setting.inc.php      |  3 -
 .../minishop3/lexicon/ru/setting.inc.php      |  3 -
 .../Api/Manager/OptionsController.php         | 84 ++++++++++++++-----
 .../src/components/CategoryOptionsTab.vue     | 38 +++++----
 .../src/components/OptionCategoryTree.vue     | 39 +++++++--
 vueManager/src/components/OptionsGrid.vue     |  7 +-
 9 files changed, 119 insertions(+), 62 deletions(-)

diff --git a/_build/elements/settings.php b/_build/elements/settings.php
index e468e1790..ab4375ac9 100644
--- a/_build/elements/settings.php
+++ b/_build/elements/settings.php
@@ -35,11 +35,6 @@
         'xtype' => 'combo-boolean',
         'area' => 'ms3_category',
     ],
-    'ms3_option_category_tree_parent' => [
-        'value' => 0,
-        'xtype' => 'numberfield',
-        'area' => 'ms3_options',
-    ],
     'ms3_template_category_default' => [
         'value' => '',
         'xtype' => 'modx-combo-template',
diff --git a/core/components/minishop3/controllers/category/update.class.php b/core/components/minishop3/controllers/category/update.class.php
index 41fc39128..dadb9a37b 100644
--- a/core/components/minishop3/controllers/category/update.class.php
+++ b/core/components/minishop3/controllers/category/update.class.php
@@ -75,7 +75,6 @@ public function loadCustomCssJs()
             'connector_url' => $this->ms3->config['connectorUrl'],
             'show_options' => $showOptions,
             'default_thumb' => $this->ms3->config['defaultThumb'],
-            'optionCategoryTreeParent' => (int)$this->modx->getOption('ms3_option_category_tree_parent', null, 0),
             'show_nested_products' => (bool) $this->modx->getOption('ms3_category_show_nested_products', null, true),
             'category_products_rows' => (int) $this->getOption('ms3_category_products_default_rows', null, 20),
         );
diff --git a/core/components/minishop3/controllers/mgr/settings.class.php b/core/components/minishop3/controllers/mgr/settings.class.php
index 66e5e15b6..ccea0f54d 100644
--- a/core/components/minishop3/controllers/mgr/settings.class.php
+++ b/core/components/minishop3/controllers/mgr/settings.class.php
@@ -64,7 +64,6 @@ public function loadCustomCssJs()
 
         $config = $this->ms3->config;
         $config['default_thumb'] = $this->ms3->config['defaultThumb'];
-        $config['optionCategoryTreeParent'] = (int)$this->modx->getOption('ms3_option_category_tree_parent', null, 0);
 
         $this->addHtml('<script>
             ms3.config = ' . json_encode($config) . ';
diff --git a/core/components/minishop3/lexicon/en/setting.inc.php b/core/components/minishop3/lexicon/en/setting.inc.php
index e672429d7..effb99af2 100644
--- a/core/components/minishop3/lexicon/en/setting.inc.php
+++ b/core/components/minishop3/lexicon/en/setting.inc.php
@@ -21,7 +21,6 @@
 $_lang['area_ms3_security'] = 'Security';
 $_lang['area_ms3_api'] = 'API';
 $_lang['area_ms3_notifications'] = 'Notifications';
-$_lang['area_ms3_options'] = 'Product options';
 
 $_lang['setting_ms3_chunks_categories'] = 'Categories for chunks list';
 $_lang['setting_ms3_chunks_categories_desc'] = 'Comma-separated list of category IDs for chunks list.';
@@ -57,8 +56,6 @@
 $_lang['setting_ms3_category_show_nested_products_desc'] = 'If you enable this option, all nested products will be shown in category. They are highlighted with different color and have their parent category name under pagetitle.';
 $_lang['setting_ms3_category_show_options'] = 'Show category product options';
 $_lang['setting_ms3_category_show_options_desc'] = 'Show options for category products.';
-$_lang['setting_ms3_option_category_tree_parent'] = 'Options UI: category tree root resource ID';
-$_lang['setting_ms3_option_category_tree_parent_desc'] = 'When product categories (msCategory) are not direct children of the site root (parent = 0), set this to the container resource ID under which categories live. The manager options tree and category pickers then load the first level relative to this parent. Use 0 for default behavior (only msCategory resources with parent = 0).';
 $_lang['setting_ms3_category_remember_grid'] = 'Remember category grid';
 $_lang['setting_ms3_category_remember_grid_desc'] = 'If enabled, category grid state will be remembered and restored on page load, including page number and search string.';
 $_lang['setting_ms3_category_id_as_alias'] = 'Category id as alias';
diff --git a/core/components/minishop3/lexicon/ru/setting.inc.php b/core/components/minishop3/lexicon/ru/setting.inc.php
index c8967d371..58afc901b 100644
--- a/core/components/minishop3/lexicon/ru/setting.inc.php
+++ b/core/components/minishop3/lexicon/ru/setting.inc.php
@@ -21,7 +21,6 @@
 $_lang['area_ms3_security'] = 'Безопасность';
 $_lang['area_ms3_api'] = 'API';
 $_lang['area_ms3_notifications'] = 'Уведомления';
-$_lang['area_ms3_options'] = 'Опции товаров';
 
 $_lang['setting_ms3_chunks_categories'] = 'Категории для списка чанков';
 $_lang['setting_ms3_chunks_categories_desc'] = 'Список ID категорий через запятую  для списка чанков.';
@@ -57,8 +56,6 @@
 $_lang['setting_ms3_category_show_nested_products_desc'] = 'Если вы включаете эту опцию, то в категории будут показаны все вложенные товары. Они выделены другим цветом и у них есть имя родной категории под pagetitle.';
 $_lang['setting_ms3_category_show_options'] = 'Показывать опции товаров категории';
 $_lang['setting_ms3_category_show_options_desc'] = 'Показывать опции к товарам категории.';
-$_lang['setting_ms3_option_category_tree_parent'] = 'UI опций: ID ресурса-корня дерева категорий';
-$_lang['setting_ms3_option_category_tree_parent_desc'] = 'Если категории магазина (msCategory) не являются прямыми детьми корня сайта (parent = 0), укажите ID контейнерного ресурса, под которым они лежат. Тогда дерево категорий в настройках опций и селекторах загрузит первый уровень относительно этого родителя. 0 — только категории с parent = 0 (поведение по умолчанию).';
 $_lang['setting_ms3_category_remember_grid'] = 'Запоминание таблицы категории';
 $_lang['setting_ms3_category_remember_grid_desc'] = 'Если включено, состояние таблицы категории будет запоминаться и восстанавливаться при загрузке страницы, включая номер страницы и строку поиска.';
 $_lang['setting_ms3_category_id_as_alias'] = 'Id категории как псевдоним';
diff --git a/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php b/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
index a84fdee9b..bb95b0956 100644
--- a/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
+++ b/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
@@ -23,6 +23,20 @@
  */
 class OptionsController
 {
+    private const OPTION_TREE_CATEGORY_CLASS_KEYS = [
+        msCategory::class,
+        'msCategory',
+    ];
+
+    private const OPTION_TREE_CONTAINER_CLASS_KEYS = [
+        modResource::class,
+        'MODX\\Revolution\\modDocument',
+        'MODX\\Revolution\\modWebLink',
+        'modResource',
+        'modDocument',
+        'modWebLink',
+    ];
+
     protected modX $modx;
     protected OptionService $optionService;
 
@@ -319,13 +333,17 @@ public function getTypes(): array
      * MODX resource tree for category selection. Optional ?option_id= to flag which
      * categories already have the option linked (for checkbox UI).
      *
-     * @param array $params parent (default 0 = semantic root; resolved via ms3_option_category_tree_parent when set),
-     *                     option_id (optional), categories[] (prechecked)
+     * The tree intentionally includes navigation containers so category pickers work
+     * with nested or multi-store resource structures without system settings:
+     *   - msCategory: visible and selectable;
+     *   - MODX folder resources/web links: visible for navigation only;
+     *   - msProduct and plain content resources: excluded.
+     *
+     * @param array $params parent (default 0), option_id (optional), categories[] (prechecked)
      */
     public function getTree(array $params = []): array
     {
-        $requestedParent = (int)($params['parent'] ?? 0);
-        $parent = $this->resolveOptionsTreeParentId($requestedParent);
+        $parent = (int)($params['parent'] ?? 0);
         $optionId = isset($params['option_id']) ? (int)$params['option_id'] : 0;
         $preChecked = $this->decodeIntArray($params['categories'] ?? null);
 
@@ -341,19 +359,22 @@ public function getTree(array $params = []): array
             $checkedSet[$catId] = true;
         }
 
-        // Only msCategory nodes (same rule as legacy ExtJS Processors\Category\GetNodes).
-        // leaf is derived from a child-count subquery: a node is a leaf when it has no msCategory children.
+        $treeClassKeysSql = $this->quoteSqlStringList($this->getOptionTreeClassKeys());
+        $categoryClassKeysSql = $this->quoteSqlStringList(self::OPTION_TREE_CATEGORY_CLASS_KEYS);
+        $treeNodeWhere = $this->getOptionTreeNodeSqlFilter('modResource', $treeClassKeysSql, $categoryClassKeysSql);
+        $childNodeWhere = $this->getOptionTreeNodeSqlFilter('Child', $treeClassKeysSql, $categoryClassKeysSql);
+
         $q = $this->modx->newQuery(modResource::class);
-        $q->leftJoin(modResource::class, 'Child', [
-            'modResource.id = Child.parent',
-            'Child.class_key' => msCategory::class,
-            'Child.deleted' => 0,
-        ]);
+        $q->leftJoin(
+            modResource::class,
+            'Child',
+            "`modResource`.`id` = `Child`.`parent` AND `Child`.`deleted` = 0 AND {$childNodeWhere}"
+        );
         $q->where([
             'modResource.parent' => $parent,
             'modResource.deleted' => 0,
-            'modResource.class_key' => msCategory::class,
         ]);
+        $q->where($treeNodeWhere);
         $q->select('modResource.id, modResource.pagetitle, modResource.menutitle, '
             . 'modResource.parent, modResource.published, modResource.hidemenu, modResource.class_key, '
             . 'COUNT(Child.id) AS childrenCount');
@@ -364,11 +385,14 @@ public function getTree(array $params = []): array
         if ($q->prepare() && $q->stmt->execute()) {
             while ($row = $q->stmt->fetch(\PDO::FETCH_ASSOC)) {
                 $id = (int)$row['id'];
+                $selectable = $this->isOptionTreeCategoryClass((string)$row['class_key']);
+                $label = (string)($row['menutitle'] ?: $row['pagetitle']);
                 $nodes[] = [
                     'id' => $id,
-                    'label' => $row['menutitle'] !== '' ? $row['menutitle'] : $row['pagetitle'],
+                    'label' => $label,
                     'leaf' => (int)$row['childrenCount'] === 0,
-                    'checked' => isset($checkedSet[$id]),
+                    'checked' => $selectable && isset($checkedSet[$id]),
+                    'selectable' => $selectable,
                     'class_key' => $row['class_key'],
                     'published' => (int)$row['published'],
                     'hidemenu' => (int)$row['hidemenu'],
@@ -601,18 +625,34 @@ protected function splitCategoriesPayload($payload): array
         return [$enabled, $disabled];
     }
 
+    private function getOptionTreeNodeSqlFilter(string $alias, string $treeClassKeysSql, string $categoryClassKeysSql): string
+    {
+        return "(`{$alias}`.`class_key` IN ({$treeClassKeysSql}) "
+            . "AND (`{$alias}`.`class_key` IN ({$categoryClassKeysSql}) OR `{$alias}`.`isfolder` = 1))";
+    }
+
     /**
-     * Map semantic tree root (client sends parent=0) to real MODX resource parent id when
-     * msCategory resources are not direct children of site root.
+     * @return string[]
      */
-    private function resolveOptionsTreeParentId(int $requestedParent): int
+    private function getOptionTreeClassKeys(): array
     {
-        if ($requestedParent !== 0) {
-            return $requestedParent;
-        }
-        $configured = (int)$this->modx->getOption('ms3_option_category_tree_parent', null, 0);
+        return array_values(array_unique(array_merge(
+            self::OPTION_TREE_CATEGORY_CLASS_KEYS,
+            self::OPTION_TREE_CONTAINER_CLASS_KEYS
+        )));
+    }
+
+    private function isOptionTreeCategoryClass(string $classKey): bool
+    {
+        return in_array($classKey, self::OPTION_TREE_CATEGORY_CLASS_KEYS, true);
+    }
 
-        return $configured > 0 ? $configured : 0;
+    /**
+     * @param string[] $values
+     */
+    private function quoteSqlStringList(array $values): string
+    {
+        return implode(', ', array_map(fn(string $value): string => $this->modx->quote($value), $values));
     }
 
     /**
diff --git a/vueManager/src/components/CategoryOptionsTab.vue b/vueManager/src/components/CategoryOptionsTab.vue
index 0feee8385..ffe3926ee 100644
--- a/vueManager/src/components/CategoryOptionsTab.vue
+++ b/vueManager/src/components/CategoryOptionsTab.vue
@@ -13,10 +13,9 @@ import Select from 'primevue/select'
 import Toast from 'primevue/toast'
 import { useConfirm } from 'primevue/useconfirm'
 import { useToast } from 'primevue/usetoast'
-import { computed, onMounted, ref, watch } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
-import { getMs3Config } from '../utils/modx.js'
 
 const props = defineProps({
   categoryId: { type: Number, required: true },
@@ -26,8 +25,6 @@ const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
 
-const optionCategoryTreeRootParent = computed(() => getMs3Config()?.optionCategoryTreeParent ?? 0)
-
 const links = ref([])
 const loading = ref(false)
 const searchQuery = ref('')
@@ -85,23 +82,30 @@ async function loadAvailableOptions() {
 }
 
 async function loadAvailableCategories() {
-  // Source categories for copy — all msCategory resources. We reuse the tree endpoint
-  // flattened: just fetch the first level of resources for now (limit to obvious set).
-  // A richer picker would use the full tree, but a flat Select is consistent with the
-  // legacy ExtJS behavior.
-  const r = await request.get('/api/mgr/options/tree', { parent: optionCategoryTreeRootParent.value })
-  const roots = r?.results || []
-  // Expand one level for convenience (walk all children of each msCategory root).
-  const expanded = [...roots]
-  for (const root of roots) {
-    const children = await request.get('/api/mgr/options/tree', { parent: root.id })
-    expanded.push(...(children?.results || []).map(c => ({ ...c, label: `  ${c.label}` })))
-  }
-  availableCategories.value = expanded
+  // Source categories for copy — all selectable msCategory resources from the semantic tree.
+  const categories = await collectSelectableCategories(0)
+  availableCategories.value = categories
     .filter(c => c.id !== props.categoryId)
     .map(c => ({ id: c.id, label: c.label }))
 }
 
+async function collectSelectableCategories(parent = 0, level = 0) {
+  const r = await request.get('/api/mgr/options/tree', { parent })
+  const rows = r?.results || []
+  const categories = []
+
+  for (const row of rows) {
+    if (row.selectable) {
+      categories.push({ ...row, label: `${'  '.repeat(level)}${row.label}` })
+    }
+    if (!row.leaf) {
+      categories.push(...(await collectSelectableCategories(row.id, level + 1)))
+    }
+  }
+
+  return categories
+}
+
 async function saveCellEdit(event) {
   const { newData, field } = event
   // category_caption / category_description are per-link overrides on msCategoryOption
diff --git a/vueManager/src/components/OptionCategoryTree.vue b/vueManager/src/components/OptionCategoryTree.vue
index 5881def02..4cf0c56ba 100644
--- a/vueManager/src/components/OptionCategoryTree.vue
+++ b/vueManager/src/components/OptionCategoryTree.vue
@@ -24,8 +24,6 @@ const props = defineProps({
   modelValue: { type: Array, default: () => [] },
   /** Pre-fetch checked state from the option's current links. Pass 0/null to skip. */
   optionId: { type: [Number, String], default: 0 },
-  /** Root resource id for first tree request. 0 = semantic site root (resolved on API via ms3_option_category_tree_parent when set). */
-  rootParent: { type: Number, default: 0 },
 })
 
 const emit = defineEmits(['update:modelValue'])
@@ -101,6 +99,7 @@ function normalizeNode(row) {
     leaf: !!row.leaf,
     data: {
       class_key: row.class_key,
+      selectable: !!row.selectable,
       published: row.published,
       hidemenu: row.hidemenu,
     },
@@ -112,11 +111,18 @@ function normalizeNode(row) {
   return node
 }
 
+function isSelectableNode(node) {
+  return !!node?.data?.selectable
+}
+
 function isChecked(node) {
   return checkedSet.value.has(node.id)
 }
 
 function toggleNode(node, checked) {
+  if (!isSelectableNode(node)) {
+    return
+  }
   const next = new Set(checkedSet.value)
   if (checked) {
     next.add(node.id)
@@ -130,7 +136,7 @@ function toggleNode(node, checked) {
 async function loadRoot() {
   loading.value = true
   try {
-    nodes.value = await fetchChildren(props.rootParent)
+    nodes.value = await fetchChildren(0)
   } finally {
     loading.value = false
   }
@@ -202,6 +208,12 @@ async function bulkToggleChecks(node, checked) {
 
   const next = new Set(checkedSet.value)
   function walk(n) {
+    if (!isSelectableNode(n)) {
+      if (Array.isArray(n.children)) {
+        n.children.forEach(walk)
+      }
+      return
+    }
     if (checked) {
       next.add(n.id)
     } else {
@@ -267,15 +279,23 @@ defineExpose({
       @node-expand="onNodeExpand"
     >
       <template #default="{ node }">
-        <span class="tree-node-row" @contextmenu.prevent="onNodeContextMenu($event, node)">
+        <span
+          class="tree-node-row"
+          :class="{ 'tree-node-row-navigation': !isSelectableNode(node) }"
+          @contextmenu.prevent="onNodeContextMenu($event, node)"
+        >
           <Checkbox
+            v-if="isSelectableNode(node)"
             :model-value="isChecked(node)"
             :binary="true"
             :input-id="'opt-cat-' + node.id"
             class="tree-node-check"
             @update:model-value="toggleNode(node, $event)"
           />
-          <label :for="'opt-cat-' + node.id" class="tree-node-label">{{ node.label }}</label>
+          <label v-if="isSelectableNode(node)" :for="'opt-cat-' + node.id" class="tree-node-label">
+            {{ node.label }}
+          </label>
+          <span v-else class="tree-node-label tree-node-label-navigation">{{ node.label }}</span>
         </span>
       </template>
     </Tree>
@@ -310,4 +330,13 @@ defineExpose({
   cursor: pointer;
   user-select: none;
 }
+
+.vueApp .option-category-tree .tree-node-row-navigation {
+  opacity: 0.72;
+}
+
+.vueApp .option-category-tree .tree-node-label-navigation {
+  cursor: default;
+  font-style: italic;
+}
 </style>
diff --git a/vueManager/src/components/OptionsGrid.vue b/vueManager/src/components/OptionsGrid.vue
index d6ba17633..ec825e9a2 100644
--- a/vueManager/src/components/OptionsGrid.vue
+++ b/vueManager/src/components/OptionsGrid.vue
@@ -23,8 +23,6 @@ const toast = useToast()
 const confirm = useConfirm()
 const { _ } = useLexicon()
 
-const optionCategoryTreeRootParent = computed(() => getMs3Config()?.optionCategoryTreeParent ?? 0)
-
 // Grid state
 const options = ref([])
 const totalRecords = ref(0)
@@ -351,7 +349,7 @@ onBeforeUnmount(() => {
       <!-- Category filter tree (left pane) -->
       <aside class="options-tree-pane">
         <h4 class="pane-title">{{ _('ms3_categories') || 'Категории' }}</h4>
-        <OptionCategoryTree v-model="selectedCategories" :root-parent="optionCategoryTreeRootParent" />
+        <OptionCategoryTree v-model="selectedCategories" />
       </aside>
 
       <!-- Main grid + toolbar + dialog (right pane) -->
@@ -548,7 +546,6 @@ onBeforeUnmount(() => {
           <OptionCategoryTree
             v-model="editingCategories"
             :option-id="editing.id || 0"
-            :root-parent="optionCategoryTreeRootParent"
           />
         </div>
       </div>
@@ -579,7 +576,7 @@ onBeforeUnmount(() => {
           'Выберите категории — в них будут созданы связи для выбранных опций (существующие останутся).'
         }}
       </p>
-      <OptionCategoryTree v-model="assignCategories" :root-parent="optionCategoryTreeRootParent" />
+      <OptionCategoryTree v-model="assignCategories" />
       <template #footer>
         <Button
           :label="_('cancel') || 'Отмена'"

From 20044838c3b4777c6aa3d84a3c79e8e436ae4b31 Mon Sep 17 00:00:00 2001
From: Ivan Bochkarev <ivanx86@gmail.com>
Date: Sun, 17 May 2026 21:35:58 +0600
Subject: [PATCH 3/5] fix(manager): align option tree selectable fallback with
 legacy API (#237)

Treat missing `selectable` as true (old tree payload). Document category class_key variants in OptionsController.
---
 .../src/Controllers/Api/Manager/OptionsController.php  |  1 +
 vueManager/src/components/CategoryOptionsTab.vue       | 10 ++++++++--
 vueManager/src/components/OptionCategoryTree.vue       |  7 ++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php b/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
index bb95b0956..49249d92a 100644
--- a/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
+++ b/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
@@ -23,6 +23,7 @@
  */
 class OptionsController
 {
+    /** FQCN + short name — `class_key` в БД может отличаться между MODX 2→3 и кастомными классами. */
     private const OPTION_TREE_CATEGORY_CLASS_KEYS = [
         msCategory::class,
         'msCategory',
diff --git a/vueManager/src/components/CategoryOptionsTab.vue b/vueManager/src/components/CategoryOptionsTab.vue
index ffe3926ee..15cf8698d 100644
--- a/vueManager/src/components/CategoryOptionsTab.vue
+++ b/vueManager/src/components/CategoryOptionsTab.vue
@@ -89,14 +89,20 @@ async function loadAvailableCategories() {
     .map(c => ({ id: c.id, label: c.label }))
 }
 
+/** Must match OptionCategoryTree: absent `selectable` means legacy msCategory-only payload. */
+function isTreeRowSelectable(row) {
+  return typeof row.selectable === 'boolean' ? row.selectable : true
+}
+
 async function collectSelectableCategories(parent = 0, level = 0) {
   const r = await request.get('/api/mgr/options/tree', { parent })
   const rows = r?.results || []
   const categories = []
+  const indent = '  '.repeat(level)
 
   for (const row of rows) {
-    if (row.selectable) {
-      categories.push({ ...row, label: `${'  '.repeat(level)}${row.label}` })
+    if (isTreeRowSelectable(row)) {
+      categories.push({ ...row, label: `${indent}${row.label}` })
     }
     if (!row.leaf) {
       categories.push(...(await collectSelectableCategories(row.id, level + 1)))
diff --git a/vueManager/src/components/OptionCategoryTree.vue b/vueManager/src/components/OptionCategoryTree.vue
index 4cf0c56ba..d30318b6e 100644
--- a/vueManager/src/components/OptionCategoryTree.vue
+++ b/vueManager/src/components/OptionCategoryTree.vue
@@ -91,6 +91,11 @@ async function fetchChildren(parent = 0) {
   return results.map(row => normalizeNode(row))
 }
 
+/** Backend adds `selectable`; older responses without it were msCategory-only (all selectable). */
+function isApiRowSelectable(row) {
+  return typeof row.selectable === 'boolean' ? row.selectable : true
+}
+
 function normalizeNode(row) {
   const node = {
     key: String(row.id),
@@ -99,7 +104,7 @@ function normalizeNode(row) {
     leaf: !!row.leaf,
     data: {
       class_key: row.class_key,
-      selectable: !!row.selectable,
+      selectable: isApiRowSelectable(row),
       published: row.published,
       hidemenu: row.hidemenu,
     },

From 510bf6f91b769e5733b8bf9dff230b73e4620a88 Mon Sep 17 00:00:00 2001
From: Ivan Bochkarev <ivanx86@gmail.com>
Date: Sun, 17 May 2026 21:36:41 +0600
Subject: [PATCH 4/5] chore(manager): shorten option tree category class_key
 comment (#237)

---
 .../minishop3/src/Controllers/Api/Manager/OptionsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php b/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
index 49249d92a..e10635cd6 100644
--- a/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
+++ b/core/components/minishop3/src/Controllers/Api/Manager/OptionsController.php
@@ -23,7 +23,7 @@
  */
 class OptionsController
 {
-    /** FQCN + short name — `class_key` в БД может отличаться между MODX 2→3 и кастомными классами. */
+    /** FQCN + short name. */
     private const OPTION_TREE_CATEGORY_CLASS_KEYS = [
         msCategory::class,
         'msCategory',

From 6f3ee6d66a41931c6d7881839a217372ff77b489 Mon Sep 17 00:00:00 2001
From: biz87 <team@tolkit.top>
Date: Thu, 21 May 2026 01:08:48 +0500
Subject: [PATCH 5/5] fix(vue): drop unused getMs3Config import in OptionsGrid

Leftover after #237 v3 removed the ms3_option_category_tree_parent
system setting. ESLint no-unused-vars caught it.
---
 vueManager/src/components/OptionsGrid.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vueManager/src/components/OptionsGrid.vue b/vueManager/src/components/OptionsGrid.vue
index ec825e9a2..5936b0fd5 100644
--- a/vueManager/src/components/OptionsGrid.vue
+++ b/vueManager/src/components/OptionsGrid.vue
@@ -14,7 +14,6 @@ import { useToast } from 'primevue/usetoast'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 import request from '../request.js'
-import { getMs3Config } from '../utils/modx.js'
 import { onOptionGroupsChanged } from '../utils/optionGroupsBus.js'
 import OptionCategoryTree from './OptionCategoryTree.vue'
 import OptionValuesEditor from './OptionValuesEditor.vue'