Merge branch '2025.4' into 2026.1

Author: wwidergoldpimcore

config/configuration.yaml

@@ -0,0 +1,8 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  Pimcore\Bundle\StudioBackendBundle\Configuration\Share\Service\ConfigurationShareServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Configuration\Share\Service\ConfigurationShareService

config/grid.yaml

@@ -45,9 +45,6 @@ services:
   Pimcore\Bundle\StudioBackendBundle\Grid\Service\FavoriteServiceInterface:
     class: Pimcore\Bundle\StudioBackendBundle\Grid\Service\FavoriteService
 
-  Pimcore\Bundle\StudioBackendBundle\Grid\Service\UserRoleShareServiceInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Grid\Service\UserRoleShareService
-
   Pimcore\Bundle\StudioBackendBundle\Grid\Service\SaveConfigurationServiceInterface:
     class: Pimcore\Bundle\StudioBackendBundle\Grid\Service\SaveConfigurationService
 

config/search.yaml

@@ -27,13 +27,24 @@ services:
   Pimcore\Bundle\StudioBackendBundle\Search\Hydrator\Preview\DocumentHydratorInterface:
     class: Pimcore\Bundle\StudioBackendBundle\Search\Hydrator\Preview\DocumentHydrator
 
+  Pimcore\Bundle\StudioBackendBundle\Search\Hydrator\ConfigurationHydratorInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Search\Hydrator\ConfigurationHydrator
+
+  Pimcore\Bundle\StudioBackendBundle\Search\Hydrator\DetailedConfigurationHydratorInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Search\Hydrator\DetailedConfigurationHydrator
+
   #
   # Repositories
   #
 
   Pimcore\Bundle\StudioBackendBundle\Search\Repository\SearchRepositoryInterface:
     class: Pimcore\Bundle\StudioBackendBundle\Search\Repository\SearchRepository
 
+  Pimcore\Bundle\StudioBackendBundle\Search\Repository\SavedSearchConfigurationRepositoryInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Search\Repository\SavedSearchConfigurationRepository
+    arguments:
+      - "@doctrine.orm.default_entity_manager"
+
   #
   # Services
   #
@@ -43,6 +54,9 @@ services:
     arguments:
       $previewHydratorLocator: '@search.element_preview.service_locator'
 
+  Pimcore\Bundle\StudioBackendBundle\Search\Service\SavedSearchConfigurationServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Search\Service\SavedSearchConfigurationService
+
   #
   # Service Locator
   #

doc/03_Extending/02_Additional_and_Custom_Attributes.md

@@ -239,6 +239,8 @@ For more details and frontend customization options, see the
 - `pre_response.quantity_value.unit_list`
 - `pre_response.recycle_bin.item`
 - `pre_response.role_tree_node`
+- `pre_response.saved_search_configuration`
+- `pre_response.saved_search_detailed_configuration`
 - `pre_response.schedule`
 - `pre_response.schedule.action_type`
 - `pre_response.select_option.detail`

src/ClassificationStore/Repository/CollectionConfigRepository.php

@@ -49,9 +49,7 @@ public function getPaginatedCollectionsByStore(
             $this->applyCollectionIdsFilter($list, $collectionIds);
         }
 
-        if ($searchTerm !== null) {
-            $this->searchHelperService->applySearchTermFilter($list, $searchTerm);
-        }
+        $this->searchHelperService->applySearchTermFilter($list, $searchTerm);
 
         return $list->load();
     }

src/ClassificationStore/Repository/Configuration/CollectionRepository.php

@@ -135,10 +135,6 @@ private function applySearchCondition(Listing $listing, FilterParameter $paramet
             return;
         }
 
-        if ($searchFilter->getFilterValue() === '' || $searchFilter->getFilterValue() === null) {
-            return;
-        }
-
         $this->searchHelperService->applySearchTermFilter($listing, $searchFilter->getFilterValue());
     }
 }

src/ClassificationStore/Repository/Configuration/GroupRepository.php

@@ -130,10 +130,6 @@ private function applySearchCondition(Listing $listing, FilterParameter $paramet
             return;
         }
 
-        if ($searchFilter->getFilterValue() === '' || $searchFilter->getFilterValue() === null) {
-            return;
-        }
-
         $this->searchHelperService->applySearchTermFilter($listing, $searchFilter->getFilterValue());
     }
 }

src/ClassificationStore/Repository/Configuration/KeyRepository.php

@@ -227,10 +227,6 @@ private function applySearchCondition(Listing $listing, FilterParameter $paramet
             return;
         }
 
-        if ($searchFilter->getFilterValue() === '' || $searchFilter->getFilterValue() === null) {
-            return;
-        }
-
         $this->searchHelperService->applyKeySearchFilter($listing, $searchFilter->getFilterValue());
     }
 }

src/ClassificationStore/Repository/GroupConfigRepository.php

@@ -47,9 +47,7 @@ public function getPaginatedGroupsByStore(
         $listing->setOrderKey('id');
         $listing->setCondition('storeId = ?', $storeId);
 
-        if ($searchTerm !== null) {
-            $this->searchHelperService->applySearchTermFilter($listing, $searchTerm);
-        }
+        $this->searchHelperService->applySearchTermFilter($listing, $searchTerm);
 
         if ($groupIds !== null) {
             $this->applyGroupIdsFilter($listing, $groupIds);

src/ClassificationStore/Repository/KeyGroupRelationRepository.php

@@ -96,9 +96,7 @@ private function getBaseListing(int $storeId, ?array $groupIds = null, ?string $
         $listing->setOrderKey('sorter');
         $this->applyGroupIdsFilter($listing, $groupIds);
 
-        if ($searchTerm !== null && $searchTerm !== '') {
-            $this->searchHelperService->applyKeyGroupRelationSearchFilter($listing, $searchTerm);
-        }
+        $this->searchHelperService->applyKeyGroupRelationSearchFilter($listing, $searchTerm);
 
         return $listing;
     }