From 7532e5988a34cbcf75e9a765a07e1ddd14ec0d69 Mon Sep 17 00:00:00 2001 From: Maria A Nunez Date: Thu, 2 Oct 2025 05:06:17 -0400 Subject: [PATCH] Fix ABAC not available for entry (#34027) Automatic Merge --- .../src/components/admin_console/admin_definition.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/channels/src/components/admin_console/admin_definition.tsx b/webapp/channels/src/components/admin_console/admin_definition.tsx index a6ceb7468ce..47d4d11df34 100644 --- a/webapp/channels/src/components/admin_console/admin_definition.tsx +++ b/webapp/channels/src/components/admin_console/admin_definition.tsx @@ -628,7 +628,7 @@ const AdminDefinition: AdminDefinitionType = { url: `system_attributes/attribute_based_access_control/edit_policy/:policy_id(${ID_PATH_PATTERN})`, isHidden: it.any( it.configIsFalse('AccessControlSettings', 'EnableAttributeBasedAccessControl'), - it.not(it.licensedForSku(LicenseSkus.EnterpriseAdvanced)), + it.not(it.minLicenseTier(LicenseSkus.EnterpriseAdvanced)), it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.USER_MANAGEMENT.SYSTEM_ROLES)), ), isDisabled: it.any( @@ -644,7 +644,7 @@ const AdminDefinition: AdminDefinitionType = { url: 'system_attributes/attribute_based_access_control/edit_policy', isHidden: it.any( it.configIsFalse('AccessControlSettings', 'EnableAttributeBasedAccessControl'), - it.not(it.licensedForSku(LicenseSkus.EnterpriseAdvanced)), + it.not(it.minLicenseTier(LicenseSkus.EnterpriseAdvanced)), it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.USER_MANAGEMENT.SYSTEM_ROLES)), it.configIsFalse('FeatureFlags', 'AttributeBasedAccessControl'), ), @@ -3257,7 +3257,7 @@ const AdminDefinition: AdminDefinitionType = { url: 'site_config/content_flagging', title: defineMessage({id: 'admin.sidebar.contentFlagging', defaultMessage: 'Content Flagging'}), isHidden: it.any( - it.not(it.licensedForSku(LicenseSkus.EnterpriseAdvanced)), + it.not(it.minLicenseTier(LicenseSkus.EnterpriseAdvanced)), it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.USER_MANAGEMENT.SYSTEM_ROLES)), it.configIsFalse('FeatureFlags', 'ContentFlagging'), ),