IBX-10186 Limit impact of heavy count queries on the CMS

src/bundle/Controller/LocationController.php

@@ -297,7 +297,7 @@ public function swapAction(Request $request): Response
                 $currentLocation = $data->getCurrentLocation();
                 $newLocation = $data->getNewLocation();
 
-                $childCount = $this->locationService->getLocationChildCount($currentLocation);
+                $childCount = $this->locationService->getLocationChildCount($currentLocation, 1);
                 $contentType = $newLocation->getContent()->getContentType();
 
                 if (!$contentType->isContainer && $childCount) {

src/bundle/DependencyInjection/Configuration/Parser/SubtreeOperations.php

@@ -30,17 +30,23 @@ class SubtreeOperations extends AbstractParser
     /**
      * @inheritdoc
      */
-    public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerInterface $contextualizer): void
+    public function mapConfig(array & $scopeSettings, $currentScope, ContextualizerInterface $contextualizer): void
     {
-        if (!isset($scopeSettings['subtree_operations']['copy_subtree']['limit'])) {
-            return;
+        if (isset($scopeSettings['subtree_operations']['copy_subtree']['limit'])) {
+            $contextualizer->setContextualParameter(
+                'subtree_operations.copy_subtree.limit',
+                $currentScope,
+                $scopeSettings['subtree_operations']['copy_subtree']['limit']
+            );
         }
 
-        $contextualizer->setContextualParameter(
-            'subtree_operations.copy_subtree.limit',
-            $currentScope,
-            $scopeSettings['subtree_operations']['copy_subtree']['limit']
-        );
+        if (isset($scopeSettings['subtree_operations']['query_subtree']['limit'])) {
+            $contextualizer->setContextualParameter(
+                'subtree_operations.query_subtree.limit',
+                $currentScope,
+                $scopeSettings['subtree_operations']['query_subtree']['limit']
+            );
+        }
     }
 
     public function addSemanticConfig(NodeBuilder $nodeBuilder): void
@@ -57,6 +63,14 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder): void
                             ->end()
                         ->end()
                     ->end()
+                    ->arrayNode('query_subtree')
+                        ->children()
+                            ->integerNode('limit')
+                                ->info('Limit the total count of items queried for when calculating the the number of direct children a node has. -1 for no limit. Default is 500 for performance reasons.')
+                                ->defaultValue(500)
+                                ->isRequired()
+                            ->end()
+                        ->end()
                 ->end()
             ->end();
     }

src/bundle/Resources/config/ezplatform_default_settings.yaml

@@ -41,6 +41,7 @@ parameters:
 
     # Subtree Operations
     ezsettings.admin_group.subtree_operations.copy_subtree.limit: 100
+    ezsettings.admin_group.subtree_operations.query_subtree.limit: 500
 
     # Notifications
     ezsettings.admin_group.notifications.error.timeout: 0

src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig

@@ -34,7 +34,7 @@
                         <td class="ez-table__cell">
                             {% include '@ezdesign/ui/location_path.html.twig' with {'locations': location.pathLocations, 'link_last_element': true} %}
                         </td>
-                        <td class="ez-table__cell">{{ location.childCount }}</td>
+                        <td class="ez-table__cell">{% if sub_item_query_limit is not null and location.childCount > sub_item_query_limit %}{{ location.childCount -1 }}+{% else %}{{location.childCount}}{% endif %}</td>
                         <td class="ez-table__cell">
                             <label class="ez-checkbox-icon {{ not location.explicitlyHidden ? 'is-checked' }}{% if not can_hide[location.id] %} disabled{% endif %}"
                                    title="{{ 'tab.locations.visibility'|trans|desc('Visibility') }}">

src/lib/Form/TrashLocationOptionProvider/HasChildren.php

@@ -10,6 +10,7 @@
 
 use eZ\Publish\API\Repository\LocationService;
 use eZ\Publish\API\Repository\Values\Content\Location;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use EzSystems\EzPlatformAdminUi\Specification\Location\HasChildren as HasChildrenSpec;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormInterface;
@@ -23,10 +24,14 @@ final class HasChildren implements TrashLocationOptionProvider
     /** @var \Symfony\Contracts\Translation\TranslatorInterface */
     private $translator;
 
-    public function __construct(LocationService $locationService, TranslatorInterface $translator)
+    /** @var \eZ\Publish\Core\MVC\ConfigResolverInterface */
+    private $configResolver;
+
+    public function __construct(LocationService $locationService, TranslatorInterface $translator, ConfigResolverInterface $configResolver)
     {
         $this->locationService = $locationService;
         $this->translator = $translator;
+        $this->configResolver = $configResolver;
     }
 
     public function supports(Location $location): bool
@@ -36,10 +41,15 @@ public function supports(Location $location): bool
 
     public function addOptions(FormInterface $form, Location $location): void
     {
-        $childCount = $this->locationService->getLocationChildCount($location);
+        $limit = $this->configResolver->getParameter('subtree_operations.query_subtree.limit');
+
+        $useLimit = $limit > 0;
+        $childCount = $this->locationService->getLocationChildCount($location, $useLimit ? $limit + 1 : null);
 
         $translatorParameters = [
-            '%children_count%' => $childCount,
+            '%children_count%' => ($useLimit && $childCount >= $limit) ?
+                sprintf('%d+', $limit) :
+                $childCount,
             '%content_name%' => $location->getContent()->getName(),
         ];
 

src/lib/Specification/Location/HasChildren.php

@@ -31,7 +31,7 @@ public function __construct(LocationService $locationService)
      */
     public function isSatisfiedBy($item): bool
     {
-        $childCount = $this->locationService->getLocationChildCount($item);
+        $childCount = $this->locationService->getLocationChildCount($item, 1);
 
         return 0 < $childCount;
     }

src/lib/Specification/Location/IsWithinCopySubtreeLimit.php

@@ -44,7 +44,7 @@ public function isSatisfiedBy($item): bool
             return false;
         }
 
-        return $this->copyLimit >= $this->locationService->getSubtreeSize($item);
+        return $this->copyLimit >= $this->locationService->getSubtreeSize($item, $this->copyLimit + 1);
     }
 
     private function isContainer(Location $location): bool

src/lib/Tab/LocationView/LocationsTab.php

@@ -184,12 +184,18 @@ public function getTemplateParameters(array $contextParameters = []): array
             );
         }
 
+        $subItemQueryLimit = $this->configResolver->getParameter('subtree_operations.query_subtree.limit');
+        if ($subItemQueryLimit <= 0) {
+            $subItemQueryLimit = null;
+        }
+
         $viewParameters = [
             'pager' => $pagination,
             'pager_options' => [
                 'pageParameter' => sprintf('[%s]', self::PAGINATION_PARAM_NAME),
             ],
             'locations' => $locations,
+            'sub_item_query_limit' => $subItemQueryLimit,
             'form_content_location_add' => $formLocationAdd->createView(),
             'form_content_location_remove' => $formLocationRemove->createView(),
             'form_content_location_swap' => $formLocationSwap->createView(),

src/lib/UI/Module/Subitems/ContentViewParameterSupplier.php

@@ -16,6 +16,7 @@
 use eZ\Publish\API\Repository\Values\Content\Content;
 use eZ\Publish\API\Repository\Values\Content\Location;
 use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use eZ\Publish\Core\MVC\Symfony\View\ContentView;
 use eZ\Publish\Core\Query\QueryFactoryInterface;
 use EzSystems\EzPlatformAdminUi\UI\Config\Provider\ContentTypeMappings;
@@ -71,6 +72,9 @@ class ContentViewParameterSupplier
     /** @var \eZ\Publish\API\Repository\SearchService */
     private $searchService;
 
+    /** @var \eZ\Publish\Core\MVC\ConfigResolverInterface */
+    private $configResolver;
+
     public function __construct(
         Visitor $outputVisitor,
         JsonOutputGenerator $outputGenerator,
@@ -83,7 +87,8 @@ public function __construct(
         ContentTypeMappings $contentTypeMappings,
         UserSettingService $userSettingService,
         QueryFactoryInterface $queryFactory,
-        SearchService $searchService
+        SearchService $searchService,
+        ConfigResolverInterface $configResolver
     ) {
         $this->outputVisitor = $outputVisitor;
         $this->outputGenerator = $outputGenerator;
@@ -97,6 +102,7 @@ public function __construct(
         $this->userSettingService = $userSettingService;
         $this->queryFactory = $queryFactory;
         $this->searchService = $searchService;
+        $this->configResolver = $configResolver;
     }
 
     /**
@@ -187,7 +193,12 @@ private function createRestLocation(Location $location): RestLocation
     {
         return new RestLocation(
             $location,
-            $this->locationService->getLocationChildCount($location)
+            $this->locationService->getLocationChildCount(
+                $location,
+                 // For the sub items module we only ever use the count to determine if there are children (0 or 1+),
+                 // hence setting a limit of 1 is sufficient here.
+                1
+            )
         );
     }
 

src/lib/UI/Value/ValueFactory.php

@@ -30,6 +30,7 @@
 use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup;
 use eZ\Publish\API\Repository\Values\User\Policy;
 use eZ\Publish\API\Repository\Values\User\RoleAssignment;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use eZ\Publish\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface;
 use eZ\Publish\Core\Repository\LocationResolver\LocationResolver;
 use eZ\Publish\SPI\Limitation\Target;
@@ -74,6 +75,9 @@ class ValueFactory
     /** @var \eZ\Publish\Core\Repository\LocationResolver\LocationResolver */
     protected $locationResolver;
 
+    /** @var \eZ\Publish\Core\MVC\ConfigResolverInterface */
+    protected $configResolver;
+
     /**
      * @param \eZ\Publish\API\Repository\UserService $userService
      * @param \eZ\Publish\API\Repository\LanguageService $languageService
@@ -86,6 +90,7 @@ class ValueFactory
      * @param \EzSystems\EzPlatformAdminUi\UI\Dataset\DatasetFactory $datasetFactory
      * @param \eZ\Publish\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface $userLanguagePreferenceProvider
      * @param \eZ\Publish\Core\Repository\LocationResolver\LocationResolver $locationResolver
+     * @param \eZ\Publish\Core\MVC\ConfigResolverInterface $configResolver
      */
     public function __construct(
         UserService $userService,
@@ -98,7 +103,8 @@ public function __construct(
         PathService $pathService,
         DatasetFactory $datasetFactory,
         UserLanguagePreferenceProviderInterface $userLanguagePreferenceProvider,
-        LocationResolver $locationResolver
+        LocationResolver $locationResolver,
+        ConfigResolverInterface $configResolver
     ) {
         $this->userService = $userService;
         $this->languageService = $languageService;
@@ -111,6 +117,7 @@ public function __construct(
         $this->datasetFactory = $datasetFactory;
         $this->userLanguagePreferenceProvider = $userLanguagePreferenceProvider;
         $this->locationResolver = $locationResolver;
+        $this->configResolver = $configResolver;
     }
 
     /**
@@ -235,9 +242,11 @@ public function createLocation(Location $location): UIValue\Content\Location
     {
         $translations = $location->getContent()->getVersionInfo()->languageCodes;
         $target = (new Target\Version())->deleteTranslations($translations);
+        $limit = $this->configResolver->getParameter('subtree_operations.query_subtree.limit');
+        $useLimit = $limit > 0;
 
         return new UIValue\Content\Location($location, [
-            'childCount' => $this->locationService->getLocationChildCount($location),
+            'childCount' => $this->locationService->getLocationChildCount($location, $useLimit ? $limit + 1 : null),
             'pathLocations' => $this->pathService->loadPathLocations($location),
             'userCanManage' => $this->permissionResolver->canUser(
                 'content', 'manage_locations', $location->getContentInfo()