From 7e763b6fb854aa7a3cdc9115f24f2dadc2da44a4 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Tue, 12 Nov 2024 13:37:00 +0100 Subject: [PATCH 01/10] Use LocationList::getTotalCount() instead of LocationList::$totalCount --- .../api/public_php_api/src/Command/FilterLocationCommand.php | 2 +- docs/search/search_api.md | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code_samples/api/public_php_api/src/Command/FilterLocationCommand.php b/code_samples/api/public_php_api/src/Command/FilterLocationCommand.php index cb280895f1..dc17b915e3 100644 --- a/code_samples/api/public_php_api/src/Command/FilterLocationCommand.php +++ b/code_samples/api/public_php_api/src/Command/FilterLocationCommand.php @@ -41,7 +41,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $result = $this->locationService->find($filter, []); - $output->writeln('Found ' . $result->totalCount . ' items'); + $output->writeln('Found ' . $result->getTotalCount() . ' items'); foreach ($result as $content) { $output->writeln($content->getContent()->getName()); diff --git a/docs/search/search_api.md b/docs/search/search_api.md index 502b6fa67e..03a0d45c37 100644 --- a/docs/search/search_api.md +++ b/docs/search/search_api.md @@ -137,8 +137,6 @@ The same Filter can be applied to find Locations instead of content items, for e [[= include_file('code_samples/api/public_php_api/src/Command/FilterLocationCommand.php', 32, 52) =]] ``` -Notice that the total number of items is retrieved differently for `ContentList` and `LocationList`. - !!! caution The total count is the total number of matched items, regardless of pagination settings. From e3dabe39b11c8603d2937299c2740f77b884e59b Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Tue, 12 Nov 2024 13:55:20 +0100 Subject: [PATCH 02/10] search_in_trash_reference.md: findTrashItems use same Query than SearchService --- docs/search/search_in_trash_reference.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/search/search_in_trash_reference.md b/docs/search/search_in_trash_reference.md index a41eecd9e7..25a4ee37e6 100644 --- a/docs/search/search_in_trash_reference.md +++ b/docs/search/search_in_trash_reference.md @@ -5,8 +5,8 @@ page_type: reference # Search in trash reference -When you [search for content items that are held in trash](search_api.md#searching-in-trash), you can apply only a limited set of Search Criteria and Sort Clauses. -They can be used by `Ibexa\Contracts\Core\Repository\TrashService::findTrashItems` only. +When you [search for content items that are held in trash](search_api.md#searching-in-trash), you can apply only a limited subset of Search Criteria and Sort Clauses +which can be used by `Ibexa\Contracts\Core\Repository\TrashService::findTrashItems`. ## Search Criteria From 200782ab3f8d0cd6e6aea6420d4400e4f95d8e77 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:54:15 +0100 Subject: [PATCH 03/10] Search criteria and sort references: Add a "Trash" column --- .../search_criteria_reference.md | 98 +++++++++---------- .../sort_clause_reference.md | 43 ++++---- 2 files changed, 72 insertions(+), 69 deletions(-) diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md index 43326db78e..ff43b9762d 100644 --- a/docs/search/criteria_reference/search_criteria_reference.md +++ b/docs/search/criteria_reference/search_criteria_reference.md @@ -21,55 +21,55 @@ Due to this storage limitation, searching content using the Country Field Type o ## Search Criteria -|Search Criterion|Search based on|Content Search |Location Search |Filtering | -|-----|-----|-----|-----|-----| -|[Ancestor](ancestor_criterion.md)|Whether the content item is an ancestor of the provided Location|✔ |✔ |✔ | -|[ContentId](contentid_criterion.md)|Content item's ID|✔ |✔ |✔ | -|[ContentName](contentname_criterion.md)|Content item's name|✔ |✔ |✔ | -|[ContentTypeGroupId](contenttypegroupid_criterion.md)|ID of the content item's content type group|✔ |✔ |✔ | -|[ContentTypeId](contenttypeid_criterion.md)|ID of the content item's content type|✔ |✔ |✔ | -|[ContentTypeIdentifier](contenttypeidentifier_criterion.md)|Identifier of the content item's content type|✔ |✔ |✔ | -|[CurrencyCodeCriterion](currencycode_criterion.md)|Currency code|✔ |✔ |✔ | -|[DateMetadata](datemetadata_criterion.md)|The date when content was created or last modified|✔ |✔ |✔ | -|[Depth](depth_criterion.md)|Location depth in the Content tree| |✔ |✔ | -|[Field](field_criterion.md)|Content of one of content item's Fields|✔ |✔ | | -|[FieldRelation](fieldrelation_criterion.md)|Content items the content in question has Relations to|✔ |✔ | | -|[FullText](fulltext_criterion.md)|Full text content of a content item's Fields|✔ |✔ | | -|[Image](image_criterion.md)|Image by specified image attributes|✔|✔|| -|[ImageDimensions](imagedimensions_criterion.md)|Image dimensions: height and width|✔|✔|| -|[ImageFileSize](imagefilesize_criterion.md)|Image size in MB|✔|✔|| -|[ImageHeight](imageheight_criterion.md)|Image height in pixels|✔|✔|| -|[ImageMimeType](imagemimetype_criterion.md)|Image type|✔|✔|| -|[ImageOrientation](imageorientation_criterion.md)|Image orientation|✔|✔|| -|[ImageWidth](imagewidth_criterion.md)|Image width in pixels|✔|✔|| -|[IsCurrencyEnabledCriterion](iscurrencyenabled_criterion.md)|Whether a specified currency is enabled in the system| | | | -|[IsFieldEmpty](isfieldempty_criterion.md)|Whether a specified Field of a content item is empty or not|✔ |✔ | | -|[IsMainLocation](ismainlocation_criterion.md)|Whether a Location is the main Location of a content item| |✔ |✔ | -|[IsProductBased](isproductbased_criterion.md)|Whether content represents a product|✔ |✔ |✔ | -|[IsUserBased](isuserbased_criterion.md)|Whether content represents a User account|✔ |✔ |✔ | -|[IsUserEnabled](isuserenabled_criterion.md)|Whether a User account is enabled|✔ |✔ |✔ | -|[LanguageCode](languagecode_criterion.md)|Whether a content item is translated into the selected language|✔ |✔ |✔ | -|[LocationId](locationid_criterion.md)|Location ID|✔ |✔ |✔ | -|[LocationRemoteId](locationremoteid_criterion.md)|Location remote ID|✔ |✔ |✔ | -|[MapLocationDistance](maplocationdistance_criterion.md)|Distance between the location contained in a MapLocation Field and the provided coordinates|✔ |✔ | | -|[MatchAll](matchall_criterion.md)|Returns all search results|✔ |✔ |✔ | -|[MatchNone](matchnone_criterion.md)|Returns no search results|✔ |✔ |✔ | -|[ObjectStateId](objectstateid_criterion.md)|Object State ID|✔ |✔ |✔ | -|[ObjectStateIdentifier](objectstateidentifier_criterion.md)|Object State Identifier|✔ |✔ |✔ | -|[ParentLocationId](parentlocationid_criterion.md)|Location ID of a content item's parent|✔ |✔ |✔ | -|[ParentLocationRemoteId](parentlocationremoteId_criterion.md)|Location remote ID of a content item's parent|✔ |✔ | -|[Priority](priority_criterion.md)|Location priority| |✔ |✔ | -|[RemoteId](remoteid_criterion.md)|Remote content ID|✔ |✔ |✔ | -|[SectionId](sectionid_criterion.md)|ID of the Section content is assigned to|✔ |✔ |✔ | -|[SectionIdentifier](sectionidentifier_criterion.md)|Identifier of the Section content is assigned to|✔ |✔ |✔ | -|[Sibling](sibling_criterion.md)|Locations that are children of the same parent|✔ |✔ |✔ | -|[Subtree](subtree_criterion.md)|Location subtree|✔ |✔ |✔ | -|[TaxonomyEntryId](taxonomy_entry_id.md)|Content tagged with Entry ID|✔ |✔ |✔ | -|[UserEmail](useremail_criterion.md)|Email address of a User account|✔ |✔ |✔ | -|[UserId](userid_criterion.md)|User ID|✔ |✔ |✔ | -|[UserLogin](userlogin_criterion.md)|User login|✔ |✔ |✔ | -|[UserMetadata](usermetadata_criterion.md)|The creator or modifier of a content item|✔ |✔ |✔ | -|[Visibility](visibility_criterion.md)|Whether the content item is visible or not|✔ |✔ |✔ | +| Search Criterion | Search based on | Content Search | Location Search | Filtering | Trash | +|---------------------------------------------------------------|---------------------------------------------------------------------------------------------|----------------|-----------------|-----------|----------| +| [Ancestor](ancestor_criterion.md) | Whether the content item is an ancestor of the provided Location | ✔ | ✔ | ✔ | | +| [ContentId](contentid_criterion.md) | Content item's ID | ✔ | ✔ | ✔ | | +| [ContentName](contentname_criterion.md) | Content item's name | ✔ | ✔ | ✔ | | +| [ContentTypeGroupId](contenttypegroupid_criterion.md) | ID of the content item's content type group | ✔ | ✔ | ✔ | | +| [ContentTypeId](contenttypeid_criterion.md) | ID of the content item's content type | ✔ | ✔ | ✔ | ✔ | +| [ContentTypeIdentifier](contenttypeidentifier_criterion.md) | Identifier of the content item's content type | ✔ | ✔ | ✔ | | +| [CurrencyCodeCriterion](currencycode_criterion.md) | Currency code | ✔ | ✔ | ✔ | | +| [DateMetadata](datemetadata_criterion.md) | The date when content was created or last modified | ✔ | ✔ | ✔ | ✔ | +| [Depth](depth_criterion.md) | Location depth in the Content tree | | ✔ | ✔ | | +| [Field](field_criterion.md) | Content of one of content item's Fields | ✔ | ✔ | | | +| [FieldRelation](fieldrelation_criterion.md) | Content items the content in question has Relations to | ✔ | ✔ | | | +| [FullText](fulltext_criterion.md) | Full text content of a content item's Fields | ✔ | ✔ | | | +| [Image](image_criterion.md) | Image by specified image attributes | ✔ | ✔ | | | +| [ImageDimensions](imagedimensions_criterion.md) | Image dimensions: height and width | ✔ | ✔ | | | +| [ImageFileSize](imagefilesize_criterion.md) | Image size in MB | ✔ | ✔ | | | +| [ImageHeight](imageheight_criterion.md) | Image height in pixels | ✔ | ✔ | | | +| [ImageMimeType](imagemimetype_criterion.md) | Image type | ✔ | ✔ | | | +| [ImageOrientation](imageorientation_criterion.md) | Image orientation | ✔ | ✔ | | | +| [ImageWidth](imagewidth_criterion.md) | Image width in pixels | ✔ | ✔ | | | +| [IsCurrencyEnabledCriterion](iscurrencyenabled_criterion.md) | Whether a specified currency is enabled in the system | | | | | +| [IsFieldEmpty](isfieldempty_criterion.md) | Whether a specified Field of a content item is empty or not | ✔ | ✔ | | | +| [IsMainLocation](ismainlocation_criterion.md) | Whether a Location is the main Location of a content item | | ✔ | ✔ | | +| [IsProductBased](isproductbased_criterion.md) | Whether content represents a product | ✔ | ✔ | ✔ | | +| [IsUserBased](isuserbased_criterion.md) | Whether content represents a User account | ✔ | ✔ | ✔ | | +| [IsUserEnabled](isuserenabled_criterion.md) | Whether a User account is enabled | ✔ | ✔ | ✔ | | +| [LanguageCode](languagecode_criterion.md) | Whether a content item is translated into the selected language | ✔ | ✔ | ✔ | | +| [LocationId](locationid_criterion.md) | Location ID | ✔ | ✔ | ✔ | | +| [LocationRemoteId](locationremoteid_criterion.md) | Location remote ID | ✔ | ✔ | ✔ | | +| [MapLocationDistance](maplocationdistance_criterion.md) | Distance between the location contained in a MapLocation Field and the provided coordinates | ✔ | ✔ | | | +| [MatchAll](matchall_criterion.md) | Returns all search results | ✔ | ✔ | ✔ | ✔ | +| [MatchNone](matchnone_criterion.md) | Returns no search results | ✔ | ✔ | ✔ | ✔ | +| [ObjectStateId](objectstateid_criterion.md) | Object State ID | ✔ | ✔ | ✔ | | +| [ObjectStateIdentifier](objectstateidentifier_criterion.md) | Object State Identifier | ✔ | ✔ | ✔ | | +| [ParentLocationId](parentlocationid_criterion.md) | Location ID of a content item's parent | ✔ | ✔ | ✔ | | +| [ParentLocationRemoteId](parentlocationremoteId_criterion.md) | Location remote ID of a content item's parent | ✔ | ✔ | | +| [Priority](priority_criterion.md) | Location priority | | ✔ | ✔ | | +| [RemoteId](remoteid_criterion.md) | Remote content ID | ✔ | ✔ | ✔ | | +| [SectionId](sectionid_criterion.md) | ID of the Section content is assigned to | ✔ | ✔ | ✔ | ✔ | +| [SectionIdentifier](sectionidentifier_criterion.md) | Identifier of the Section content is assigned to | ✔ | ✔ | ✔ | | +| [Sibling](sibling_criterion.md) | Locations that are children of the same parent | ✔ | ✔ | ✔ | | +| [Subtree](subtree_criterion.md) | Location subtree | ✔ | ✔ | ✔ | | +| [TaxonomyEntryId](taxonomy_entry_id.md) | Content tagged with Entry ID | ✔ | ✔ | ✔ | | +| [UserEmail](useremail_criterion.md) | Email address of a User account | ✔ | ✔ | ✔ | | +| [UserId](userid_criterion.md) | User ID | ✔ | ✔ | ✔ | | +| [UserLogin](userlogin_criterion.md) | User login | ✔ | ✔ | ✔ | | +| [UserMetadata](usermetadata_criterion.md) | The creator or modifier of a content item | ✔ | ✔ | ✔ | ✔ | +| [Visibility](visibility_criterion.md) | Whether the content item is visible or not | ✔ | ✔ | ✔ | | ### Logical operators diff --git a/docs/search/sort_clause_reference/sort_clause_reference.md b/docs/search/sort_clause_reference/sort_clause_reference.md index 5ab7a74efa..9c5ca8b34c 100644 --- a/docs/search/sort_clause_reference/sort_clause_reference.md +++ b/docs/search/sort_clause_reference/sort_clause_reference.md @@ -16,23 +16,26 @@ All Sort Clauses can take the following optional argument: ## Sort Clauses -| Sort Clause | Sorting based on | Content Search | Location Search | Filtering | -|---------------------------------------------------------------|---------------------------------------------------------------------------------------------|----------------|-----------------|-----------| -| [ContentId](contentid_sort_clause.md) | Content items' ID | ✔ | ✔ | ✔ | -| [ContentName](contentname_sort_clause.md) | Content names | ✔ | ✔ | ✔ | -| [ContentTranslatedName](contenttranslatedname_sort_clause.md) | Translated content names | ✔ | ✔ | | -| [CustomField](customfield_sort_clause.md) | Raw search index fields | ✔ | ✔ | | -| [DateModified](datemodified_sort_clause.md) | The date when content was last modified | ✔ | ✔ | ✔ | -| [DatePublished](datepublished_sort_clause.md) | The date when content was created | ✔ | ✔ | ✔ | -| [Depth](depth_sort_clause.md) | Location depth in the Content Tree | | ✔ | ✔ | -| [Field](field_sort_clause.md) | Content of one of content item's Fields | ✔ | ✔ | | -| [Id](id_sort_clause.md) | Location ID | | ✔ | ✔ | -| [IsMainLocation](ismainlocation_sort_clause.md) | Whether a Location is the main Location of a content item | | ✔ | | -| [MapLocationDistance](maplocationdistance_sort_clause.md) | Distance between the location contained in a MapLocation Field and the provided coordinates | ✔ | ✔ | | -| [Path](path_sort_clause.md) | PathString of the Location | | ✔ | ✔ | -| [Priority](priority_sort_clause.md) | Location priority | | ✔ | ✔ | -| [Random](random_sort_clause.md) | Random seed | ✔ | ✔ | | -| [Score](score_sort_clause.md) | Score of the search result | ✔ | ✔ | | -| [SectionIdentifier](sectionidentifier_sort_clause.md) | ID of the Section content is assigned to | ✔ | ✔ | ✔ | -| [SectionName](sectionname_sort_clause.md) | Name of the Section content is assigned to | ✔ | ✔ | ✔ | -| [Visibility](visibility_sort_clause.md) | Whether the Location is visible or not | | ✔ | ✔ | +| Sort Clause | Sorting based on | Content Search | Location Search | Filtering | Trash | +|---------------------------------------------------------------|--------------------------------------------------------------------------------------------|----------------|-----------------|-----------|----------| +| [ContentId](contentid_sort_clause.md) | Content items' ID | ✔ | ✔ | ✔ | | +| [ContentName](contentname_sort_clause.md) | Content names | ✔ | ✔ | ✔ | | +| [ContentTranslatedName](contenttranslatedname_sort_clause.md) | Translated content names | ✔ | ✔ | | | +| [ContentTypeName](contenttypename_sort_clause.md) | Content items' content type name | | | | ✔ | +| [CustomField](customfield_sort_clause.md) | Raw search index fields | ✔ | ✔ | | | +| [DateModified](datemodified_sort_clause.md) | The date when content was last modified | ✔ | ✔ | ✔ | | +| [DatePublished](datepublished_sort_clause.md) | The date when content was created | ✔ | ✔ | ✔ | | +| [DateTrashed](datetrashed_sort_clause.md) | The date when content was sent to trash | | | | ✔ | +| [Depth](depth_sort_clause.md) | Location depth in the Content Tree | | ✔ | ✔ | ✔ | +| [Field](field_sort_clause.md) | Content of one of content item's Fields | ✔ | ✔ | | | +| [Id](id_sort_clause.md) | Location ID | | ✔ | ✔ | | +| [IsMainLocation](ismainlocation_sort_clause.md) | Whether a Location is the main Location of a content item | | ✔ | | | +| [MapLocationDistance](maplocationdistance_sort_clause.md) | Distance between the location contained in a MapLocation Field and the provided coordinates | ✔ | ✔ | | | +| [Path](path_sort_clause.md) | PathString of the Location | | ✔ | ✔ | ✔ | +| [Priority](priority_sort_clause.md) | Location priority | | ✔ | ✔ | ✔ | +| [Random](random_sort_clause.md) | Random seed | ✔ | ✔ | | | +| [Score](score_sort_clause.md) | Score of the search result | ✔ | ✔ | | | +| [SectionIdentifier](sectionidentifier_sort_clause.md) | ID of the Section content is assigned to | ✔ | ✔ | ✔ | | +| [SectionName](sectionname_sort_clause.md) | Name of the Section content is assigned to | ✔ | ✔ | ✔ | ✔ | +| [UserLogin](userlogin_sort_clause.md) | Login of the content item's creator | | | | ✔ | +| [Visibility](visibility_sort_clause.md) | Whether the Location is visible or not | | ✔ | ✔ | | From 16d7aa35c277dc50e9482cf27c01d47d3b52f485 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:25:20 +0100 Subject: [PATCH 04/10] Update docs/search/search_in_trash_reference.md --- docs/search/search_in_trash_reference.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/search/search_in_trash_reference.md b/docs/search/search_in_trash_reference.md index 25a4ee37e6..083f497f63 100644 --- a/docs/search/search_in_trash_reference.md +++ b/docs/search/search_in_trash_reference.md @@ -7,6 +7,7 @@ page_type: reference When you [search for content items that are held in trash](search_api.md#searching-in-trash), you can apply only a limited subset of Search Criteria and Sort Clauses which can be used by `Ibexa\Contracts\Core\Repository\TrashService::findTrashItems`. +Some sort clauses are exclusive to trash search. ## Search Criteria From 5f1c15395cefa5bb476dedcd4647a10c778ee820 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:30:19 +0100 Subject: [PATCH 05/10] search_criteria_reference.md: Format after merge --- docs/search/criteria_reference/search_criteria_reference.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md index 3f621c6ccd..8689a69540 100644 --- a/docs/search/criteria_reference/search_criteria_reference.md +++ b/docs/search/criteria_reference/search_criteria_reference.md @@ -42,8 +42,8 @@ Due to this storage limitation, searching content using the Country Field Type o | [ImageMimeType](imagemimetype_criterion.md) | Image type | ✔ | ✔ | | | | [ImageOrientation](imageorientation_criterion.md) | Image orientation | ✔ | ✔ | | | | [ImageWidth](imagewidth_criterion.md) | Image width in pixels | ✔ | ✔ | | | -| [IsBookmarked](isbookmarked_criterion.md)|Whether a location is bookmarked or not| |✔ |✔ | -|[IsCurrencyEnabledCriterion](iscurrencyenabled_criterion.md) | Whether a specified currency is enabled in the system | | | | | +| [IsBookmarked](isbookmarked_criterion.md) | Whether a location is bookmarked or not | | ✔ | ✔ | | +| [IsCurrencyEnabledCriterion](iscurrencyenabled_criterion.md) | Whether a specified currency is enabled in the system | | | | | | [IsFieldEmpty](isfieldempty_criterion.md) | Whether a specified Field of a content item is empty or not | ✔ | ✔ | | | | [IsMainLocation](ismainlocation_criterion.md) | Whether a Location is the main Location of a content item | | ✔ | ✔ | | | [IsProductBased](isproductbased_criterion.md) | Whether content represents a product | ✔ | ✔ | ✔ | | From a310045d02862643b9f96e2fbd70e2d9f7ad90a9 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Wed, 27 Nov 2024 09:36:31 +0100 Subject: [PATCH 06/10] search_criteria_reference.md: Format another table --- .../criteria_reference/search_criteria_reference.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md index 8689a69540..2fd1e461b6 100644 --- a/docs/search/criteria_reference/search_criteria_reference.md +++ b/docs/search/criteria_reference/search_criteria_reference.md @@ -77,8 +77,8 @@ Due to this storage limitation, searching content using the Country Field Type o All Logical operators are supported by Content and Location Search and [Repository filtering](search_api.md#repository-filtering). -|Search Criterion|Search based on| -|-----|-----| -|[LogicalAnd](logicaland_criterion.md)|Implements a logical AND Criterion. It matches if ALL of the provided Criteria match.| -|[LogicalNot](logicalnot_criterion.md)|Implements a logical NOT Criterion. It matches if the provided Criterion doesn't match.| -|[LogicalOr](logicalor_criterion.md)|Implements a logical OR Criterion. It matches if at least one of the provided Criteria matches.| +| Search Criterion | Search based on | +|---------------------------------------|-------------------------------------------------------------------------------------------------| +| [LogicalAnd](logicaland_criterion.md) | Implements a logical AND Criterion. It matches if ALL of the provided Criteria match. | +| [LogicalNot](logicalnot_criterion.md) | Implements a logical NOT Criterion. It matches if the provided Criterion doesn't match. | +| [LogicalOr](logicalor_criterion.md) | Implements a logical OR Criterion. It matches if at least one of the provided Criteria matches. | From ae5f3feff891fdf8eb2ec1cd610248715d7311c4 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:11:03 +0100 Subject: [PATCH 07/10] search_in_trash_reference.md: Note about `DateMetadata::TRASHED` --- docs/search/search_in_trash_reference.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/search/search_in_trash_reference.md b/docs/search/search_in_trash_reference.md index 083f497f63..634e1472b2 100644 --- a/docs/search/search_in_trash_reference.md +++ b/docs/search/search_in_trash_reference.md @@ -6,13 +6,13 @@ page_type: reference # Search in trash reference When you [search for content items that are held in trash](search_api.md#searching-in-trash), you can apply only a limited subset of Search Criteria and Sort Clauses -which can be used by `Ibexa\Contracts\Core\Repository\TrashService::findTrashItems`. +which can be used by [`Ibexa\Contracts\Core\Repository\TrashService::findTrashItems`](../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-TrashService.html#method_findTrashItems). Some sort clauses are exclusive to trash search. ## Search Criteria - [ContentTypeId](contenttypeid_criterion.md) -- [DateMetadata](datemetadata_criterion.md) +- [DateMetadata](datemetadata_criterion.md) (which can use the additional exclusive target `DateMetadata::TRASHED`) - [MatchAll](matchall_criterion.md) - [MatchNone](matchnone_criterion.md) - [SectionId](sectionid_criterion.md) From 58ad71eca9936039cd775c1676c9c48b5ef9b0d1 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:34:23 +0100 Subject: [PATCH 08/10] sort_clause_reference.md: Trash+ContentName https://github.com/ibexa/core/blob/4.6/src/contracts/Repository/Values/Content/Query/SortClause/ContentName.php#L19 --- docs/search/sort_clause_reference/sort_clause_reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/search/sort_clause_reference/sort_clause_reference.md b/docs/search/sort_clause_reference/sort_clause_reference.md index 0018fddfb9..e3bc02e0ce 100644 --- a/docs/search/sort_clause_reference/sort_clause_reference.md +++ b/docs/search/sort_clause_reference/sort_clause_reference.md @@ -19,7 +19,7 @@ All Sort Clauses can take the following optional argument: | Sort Clause | Sorting based on | Content Search | Location Search | Filtering | Trash | |---------------------------------------------------------------|--------------------------------------------------------------------------------------------|----------------|-----------------|-----------|----------| | [ContentId](contentid_sort_clause.md) | Content items' ID | ✔ | ✔ | ✔ | | -| [ContentName](contentname_sort_clause.md) | Content names | ✔ | ✔ | ✔ | | +| [ContentName](contentname_sort_clause.md) | Content names | ✔ | ✔ | ✔ | ✔ | | [ContentTranslatedName](contenttranslatedname_sort_clause.md) | Translated content names | ✔ | ✔ | | | | [ContentTypeName](contenttypename_sort_clause.md) | Content items' content type name | | | | ✔ | | [CustomField](customfield_sort_clause.md) | Raw search index fields | ✔ | ✔ | | | From bc136a1e755e08b146032c4ef78583cd95aed8c2 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Fri, 21 Feb 2025 11:39:37 +0100 Subject: [PATCH 09/10] search_criteria_reference.md: Trash+ContentName php bin/console debug:container --tag=ibexa.search.legacy.trash.gateway.criterion.handler --- docs/search/criteria_reference/search_criteria_reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/search/criteria_reference/search_criteria_reference.md b/docs/search/criteria_reference/search_criteria_reference.md index 9a60b7266e..4fc927923f 100644 --- a/docs/search/criteria_reference/search_criteria_reference.md +++ b/docs/search/criteria_reference/search_criteria_reference.md @@ -24,7 +24,7 @@ Due to this storage limitation, searching content using the Country field type o |---------------------------------------------------------------|---------------------------------------------------------------------------------------------|----------------|-----------------|-----------|----------| | [Ancestor](ancestor_criterion.md) | Whether the content item is an ancestor of the provided location | ✔ | ✔ | ✔ | | | [ContentId](contentid_criterion.md) | Content item's ID | ✔ | ✔ | ✔ | | -| [ContentName](contentname_criterion.md) | Content item's name | ✔ | ✔ | ✔ | | +| [ContentName](contentname_criterion.md) | Content item's name | ✔ | ✔ | ✔ | ✔ | | [ContentTypeGroupId](contenttypegroupid_criterion.md) | ID of the content item's content type group | ✔ | ✔ | ✔ | | | [ContentTypeId](contenttypeid_criterion.md) | ID of the content item's content type | ✔ | ✔ | ✔ | ✔ | | [ContentTypeIdentifier](contenttypeidentifier_criterion.md) | Identifier of the content item's content type | ✔ | ✔ | ✔ | | From 01a03dddf6f2551a3168d8efe11606ae8d3e8b8b Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Tue, 25 Feb 2025 11:27:22 +0100 Subject: [PATCH 10/10] search_in_trash_reference.md + ContentName --- docs/search/search_in_trash_reference.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/search/search_in_trash_reference.md b/docs/search/search_in_trash_reference.md index 634e1472b2..d8ae83e295 100644 --- a/docs/search/search_in_trash_reference.md +++ b/docs/search/search_in_trash_reference.md @@ -11,6 +11,7 @@ Some sort clauses are exclusive to trash search. ## Search Criteria +- [ContentName](contentname_criterion.md) - [ContentTypeId](contenttypeid_criterion.md) - [DateMetadata](datemetadata_criterion.md) (which can use the additional exclusive target `DateMetadata::TRASHED`) - [MatchAll](matchall_criterion.md)