From 65e65e1b8a8a237bfc2183b762e4593471bf7038 Mon Sep 17 00:00:00 2001
From: Ivan Bochkarev <ivanx86@gmail.com>
Date: Mon, 7 Sep 2026 09:55:47 +0600
Subject: [PATCH] fix(mgr): guard optional resource tabs on product update
 (#652)

Match category/update.js so missing access-permissions tab does not
leave undefined items and blank the form without resourcegroup_resource_list.
---
 .../minishop3/js/mgr/product/update.js        |  5 +-
 .../tests/ProductUpdateAccessTabGuardTest.php | 55 +++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 core/components/minishop3/tests/ProductUpdateAccessTabGuardTest.php

diff --git a/assets/components/minishop3/js/mgr/product/update.js b/assets/components/minishop3/js/mgr/product/update.js
index 4f1f72fed..4e197fd15 100644
--- a/assets/components/minishop3/js/mgr/product/update.js
+++ b/assets/components/minishop3/js/mgr/product/update.js
@@ -133,8 +133,9 @@ Ext.extend(ms3.panel.UpdateProduct, ms3.panel.Product, {
             // Gallery tab is now inside Vue ProductTabs component
             // No need to add it separately here
 
-            tabs.push(pageSettingsTab);
-            tabs.push(accessPermissionsTab);
+            // Optional tabs: MODX omits access permissions without resourcegroup_resource_list (#652)
+            pageSettingsTab && tabs.push(pageSettingsTab);
+            accessPermissionsTab && tabs.push(accessPermissionsTab);
 
             item.items = tabs;
             fields.push(item);
diff --git a/core/components/minishop3/tests/ProductUpdateAccessTabGuardTest.php b/core/components/minishop3/tests/ProductUpdateAccessTabGuardTest.php
new file mode 100644
index 000000000..8a547e8dc
--- /dev/null
+++ b/core/components/minishop3/tests/ProductUpdateAccessTabGuardTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Smoke #652: product update must not push undefined access/settings tabs into Ext items.
+ *
+ * Run: php tests/ProductUpdateAccessTabGuardTest.php
+ */
+
+declare(strict_types=1);
+
+$fail = static function (string $message): never {
+    fwrite(STDERR, "FAIL ProductUpdateAccessTabGuardTest: {$message}\n");
+    exit(1);
+};
+
+$repoRoot = dirname(__DIR__, 4);
+$productUpdate = $repoRoot . '/assets/components/minishop3/js/mgr/product/update.js';
+$categoryUpdate = $repoRoot . '/assets/components/minishop3/js/mgr/category/update.js';
+
+foreach ([$productUpdate, $categoryUpdate] as $path) {
+    if (!is_readable($path)) {
+        $fail('not readable: ' . $path);
+    }
+}
+
+$productSrc = file_get_contents($productUpdate);
+if ($productSrc === false) {
+    $fail('cannot read product/update.js');
+}
+
+// Unguarded pushes regress #652 (undefined tab → blank form for managers without resourcegroup_resource_list).
+if (preg_match('/^\s*tabs\.push\(pageSettingsTab\);\s*$/m', $productSrc) === 1) {
+    $fail('product/update.js must guard pageSettingsTab before tabs.push (#652)');
+}
+if (preg_match('/^\s*tabs\.push\(accessPermissionsTab\);\s*$/m', $productSrc) === 1) {
+    $fail('product/update.js must guard accessPermissionsTab before tabs.push (#652)');
+}
+
+if (!str_contains($productSrc, 'pageSettingsTab && tabs.push(pageSettingsTab)')) {
+    $fail('product/update.js missing pageSettingsTab && tabs.push guard');
+}
+if (!str_contains($productSrc, 'accessPermissionsTab && tabs.push(accessPermissionsTab)')) {
+    $fail('product/update.js missing accessPermissionsTab && tabs.push guard');
+}
+
+$categorySrc = file_get_contents($categoryUpdate);
+if ($categorySrc === false) {
+    $fail('cannot read category/update.js');
+}
+if (!str_contains($categorySrc, 'accessPermissionsTab && tabs.push(accessPermissionsTab)')) {
+    $fail('category/update.js lost accessPermissionsTab guard (parity reference)');
+}
+
+fwrite(STDOUT, "OK ProductUpdateAccessTabGuardTest\n");
+exit(0);