..F....... [ZBX-21785] fixed Actions checkboxes in Audit log form filter

Merge in ZBX/zabbix from feature/ZBX-21785-6.2 to release/6.2

* commit 'e8e0c28e8a18bed22c02f8174930d4ef969d363d':
  .......... [ZBX-21785] reverted testFormFilterProblems autotest changes
  .......... [ZBX-21785] updated testPageReportsAudit and testFormFilterProblems autotest
  ..F....... [ZBX-21785] fixed Actions checkboxes in Audit log form filter

(cherry picked from commit 0f7d5fc5c7276afffcf12fde1d51463f85ae6b78)

3 files changed, 25 insertions, 21 deletions

diff --git a/ChangeLog.d/bugfix/ZBX-21785 b/ChangeLog.d/bugfix/ZBX-21785
new file mode 100644
index 00000000000..782cc1cdf4f
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21785
@@ -0,0 +1 @@
+..F....... [ZBX-21785] updated Actions checkboxes in Audit log form filter for User directory and Autoregistration (kkuzmina)
diff --git a/ui/app/views/js/reports.auditlog.list.js.php b/ui/app/views/js/reports.auditlog.list.js.php
index 29c42a3cd75..361fcda1c3f 100644
--- a/ui/app/views/js/reports.auditlog.list.js.php
+++ b/ui/app/views/js/reports.auditlog.list.js.php
@@ -56,18 +56,19 @@
 			// [Action => [Resources]]
 			const resources = <?php echo json_encode([
 				CAudit::ACTION_ADD => [
-					CAudit::RESOURCE_ACTION, CAudit::RESOURCE_AUTH_TOKEN, CAudit::RESOURCE_AUTOREGISTRATION,
-					CAudit::RESOURCE_CORRELATION, CAudit::RESOURCE_DASHBOARD, CAudit::RESOURCE_DISCOVERY_RULE,
-					CAudit::RESOURCE_GRAPH, CAudit::RESOURCE_GRAPH_PROTOTYPE, CAudit::RESOURCE_HA_NODE,
-					CAudit::RESOURCE_HOST, CAudit::RESOURCE_HOST_GROUP, CAudit::RESOURCE_HOST_PROTOTYPE,
-					CAudit::RESOURCE_ICON_MAP, CAudit::RESOURCE_IMAGE, CAudit::RESOURCE_ITEM,
-					CAudit::RESOURCE_ITEM_PROTOTYPE, CAudit::RESOURCE_IT_SERVICE, CAudit::RESOURCE_MACRO,
-					CAudit::RESOURCE_MAINTENANCE, CAudit::RESOURCE_MAP, CAudit::RESOURCE_MEDIA_TYPE,
-					CAudit::RESOURCE_MODULE, CAudit::RESOURCE_PROXY, CAudit::RESOURCE_REGEXP, CAudit::RESOURCE_SCENARIO,
+					CAudit::RESOURCE_ACTION, CAudit::RESOURCE_AUTH_TOKEN,CAudit::RESOURCE_CORRELATION,
+					CAudit::RESOURCE_DASHBOARD, CAudit::RESOURCE_DISCOVERY_RULE, CAudit::RESOURCE_GRAPH,
+					CAudit::RESOURCE_GRAPH_PROTOTYPE, CAudit::RESOURCE_HA_NODE, CAudit::RESOURCE_HOST,
+					CAudit::RESOURCE_HOST_GROUP, CAudit::RESOURCE_HOST_PROTOTYPE, CAudit::RESOURCE_ICON_MAP,
+					CAudit::RESOURCE_IMAGE, CAudit::RESOURCE_ITEM, CAudit::RESOURCE_ITEM_PROTOTYPE,
+					CAudit::RESOURCE_IT_SERVICE, CAudit::RESOURCE_MACRO, CAudit::RESOURCE_MAINTENANCE,
+					CAudit::RESOURCE_MAP, CAudit::RESOURCE_MEDIA_TYPE, CAudit::RESOURCE_MODULE,
+					CAudit::RESOURCE_PROXY, CAudit::RESOURCE_REGEXP, CAudit::RESOURCE_SCENARIO,
 					CAudit::RESOURCE_SCHEDULED_REPORT, CAudit::RESOURCE_SCRIPT, CAudit::RESOURCE_SLA,
 					CAudit::RESOURCE_TEMPLATE, CAudit::RESOURCE_TEMPLATE_DASHBOARD, CAudit::RESOURCE_TEMPLATE_GROUP,
 					CAudit::RESOURCE_TRIGGER, CAudit::RESOURCE_TRIGGER_PROTOTYPE, CAudit::RESOURCE_USER,
-					CAudit::RESOURCE_USER_GROUP, CAudit::RESOURCE_USER_ROLE, CAudit::RESOURCE_VALUE_MAP
+					CAudit::RESOURCE_USERDIRECTORY, CAudit::RESOURCE_USER_GROUP, CAudit::RESOURCE_USER_ROLE,
+					CAudit::RESOURCE_VALUE_MAP
 				],
 				CAudit::ACTION_UPDATE => [
 					CAudit::RESOURCE_ACTION, CAudit::RESOURCE_AUTHENTICATION, CAudit::RESOURCE_AUTH_TOKEN,
@@ -81,22 +82,23 @@
 					CAudit::RESOURCE_REGEXP, CAudit::RESOURCE_SCENARIO, CAudit::RESOURCE_SCHEDULED_REPORT,
 					CAudit::RESOURCE_SCRIPT, CAudit::RESOURCE_SETTINGS, CAudit::RESOURCE_SLA, CAudit::RESOURCE_TEMPLATE,
 					CAudit::RESOURCE_TEMPLATE_DASHBOARD, CAudit::RESOURCE_TEMPLATE_GROUP, CAudit::RESOURCE_TRIGGER,
-					CAudit::RESOURCE_TRIGGER_PROTOTYPE, CAudit::RESOURCE_USER, CAudit::RESOURCE_USER_GROUP,
-					CAudit::RESOURCE_USER_ROLE, CAudit::RESOURCE_VALUE_MAP
+					CAudit::RESOURCE_TRIGGER_PROTOTYPE, CAudit::RESOURCE_USER, CAudit::RESOURCE_USERDIRECTORY,
+					CAudit::RESOURCE_USER_GROUP, CAudit::RESOURCE_USER_ROLE, CAudit::RESOURCE_VALUE_MAP
 				],
 				CAudit::ACTION_DELETE => [
-					CAudit::RESOURCE_ACTION, CAudit::RESOURCE_AUTH_TOKEN, CAudit::RESOURCE_AUTOREGISTRATION,
-					CAudit::RESOURCE_CORRELATION, CAudit::RESOURCE_DASHBOARD, CAudit::RESOURCE_DISCOVERY_RULE,
-					CAudit::RESOURCE_GRAPH, CAudit::RESOURCE_GRAPH_PROTOTYPE, CAudit::RESOURCE_HA_NODE,
-					CAudit::RESOURCE_HOST, CAudit::RESOURCE_HOST_GROUP, CAudit::RESOURCE_HOST_PROTOTYPE,
-					CAudit::RESOURCE_ICON_MAP, CAudit::RESOURCE_IMAGE, CAudit::RESOURCE_ITEM,
-					CAudit::RESOURCE_ITEM_PROTOTYPE, CAudit::RESOURCE_IT_SERVICE, CAudit::RESOURCE_MACRO,
-					CAudit::RESOURCE_MAINTENANCE, CAudit::RESOURCE_MAP, CAudit::RESOURCE_MEDIA_TYPE,
-					CAudit::RESOURCE_MODULE, CAudit::RESOURCE_PROXY, CAudit::RESOURCE_REGEXP, CAudit::RESOURCE_SCENARIO,
+					CAudit::RESOURCE_ACTION, CAudit::RESOURCE_AUTH_TOKEN, CAudit::RESOURCE_CORRELATION,
+					CAudit::RESOURCE_DASHBOARD, CAudit::RESOURCE_DISCOVERY_RULE, CAudit::RESOURCE_GRAPH,
+					CAudit::RESOURCE_GRAPH_PROTOTYPE, CAudit::RESOURCE_HA_NODE, CAudit::RESOURCE_HOST,
+					CAudit::RESOURCE_HOST_GROUP, CAudit::RESOURCE_HOST_PROTOTYPE, CAudit::RESOURCE_ICON_MAP,
+					CAudit::RESOURCE_IMAGE, CAudit::RESOURCE_ITEM, CAudit::RESOURCE_ITEM_PROTOTYPE,
+					CAudit::RESOURCE_IT_SERVICE, CAudit::RESOURCE_MACRO, CAudit::RESOURCE_MAINTENANCE,
+					CAudit::RESOURCE_MAP, CAudit::RESOURCE_MEDIA_TYPE, CAudit::RESOURCE_MODULE,
+					CAudit::RESOURCE_PROXY, CAudit::RESOURCE_REGEXP, CAudit::RESOURCE_SCENARIO,
 					CAudit::RESOURCE_SCHEDULED_REPORT, CAudit::RESOURCE_SCRIPT, CAudit::RESOURCE_SLA,
 					CAudit::RESOURCE_TEMPLATE, CAudit::RESOURCE_TEMPLATE_DASHBOARD, CAudit::RESOURCE_TEMPLATE_GROUP,
 					CAudit::RESOURCE_TRIGGER, CAudit::RESOURCE_TRIGGER_PROTOTYPE, CAudit::RESOURCE_USER,
-					CAudit::RESOURCE_USER_GROUP, CAudit::RESOURCE_USER_ROLE, CAudit::RESOURCE_VALUE_MAP
+					CAudit::RESOURCE_USERDIRECTORY, CAudit::RESOURCE_USER_GROUP, CAudit::RESOURCE_USER_ROLE,
+					CAudit::RESOURCE_VALUE_MAP
 				],
 				CAudit::ACTION_LOGOUT => [CAudit::RESOURCE_USER],
 				CAudit::ACTION_EXECUTE => [CAudit::RESOURCE_SCRIPT],
diff --git a/ui/tests/selenium/reports/testPageReportsAudit.php b/ui/tests/selenium/reports/testPageReportsAudit.php
index 864ca48aeb8..336ce4a1e94 100644
--- a/ui/tests/selenium/reports/testPageReportsAudit.php
+++ b/ui/tests/selenium/reports/testPageReportsAudit.php
@@ -96,7 +96,7 @@ class testPageReportsAudit extends CWebTest {
 			'API token' => ['Add', 'Delete', 'Update'],
 			'Action' => ['Add', 'Delete', 'Update'],
 			'Authentication' => ['Update'],
-			'Autoregistration' => ['Add', 'Delete', 'Update'],
+			'Autoregistration' => ['Update'],
 			'Dashboard' => ['Add', 'Delete', 'Update'],
 			'Discovery rule' => ['Add', 'Delete', 'Update'],
 			'Event correlation' => ['Add', 'Delete', 'Update'],
@@ -128,6 +128,7 @@ class testPageReportsAudit extends CWebTest {
 			'Trigger' => ['Add', 'Delete', 'Update'],
 			'Trigger prototype' => ['Add', 'Delete', 'Update'],
 			'User' => ['Add', 'Delete', 'Failed login', 'Login', 'Logout', 'Update'],
+			'User directory' => ['Add', 'Delete', 'Update'],
 			'User group' => ['Add', 'Delete', 'Update'],
 			'User role' => ['Add', 'Delete', 'Update'],
 			'Value map' => ['Add', 'Delete', 'Update'],