feat: remove some translation properties from the search list and col…

…umns, allow to search for readonly props
oat-sa · Nov 15, 2024 · c8f39ad · c8f39ad
1 parent f7f9bc4
commit c8f39ad
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/model/Metadata/Service/AdvancedSearchSettingsService.php b/model/Metadata/Service/AdvancedSearchSettingsService.php
@@ -32,11 +32,15 @@
 use oat\tao\model\search\Contract\SearchSettingsServiceInterface;
 use oat\tao\model\search\ResultColumn;
 use oat\tao\model\search\SearchSettings;
+use oat\tao\model\TaoOntology;
 
 class AdvancedSearchSettingsService implements SearchSettingsServiceInterface
 {
     private const OMIT_PROPERTIES = [
-        OntologyRdfs::RDFS_LABEL
+        OntologyRdfs::RDFS_LABEL,
+        TaoOntology::PROPERTY_TRANSLATION_TYPE,
+        TaoOntology::PROPERTY_TRANSLATION_PROGRESS,
+        TaoOntology::PROPERTY_TRANSLATION_ORIGINAL_RESOURCE_URI,
     ];
 
     public const DEFAULT_SORT_COLUMN = 'label.raw';

diff --git a/model/Metadata/Service/ClassMetadataSearcher.php b/model/Metadata/Service/ClassMetadataSearcher.php
@@ -36,13 +36,20 @@
 use oat\tao\model\Lists\Business\Service\GetClassMetadataValuesService;
 use oat\tao\model\search\ResultSet;
 use oat\tao\model\search\SearchProxy;
+use oat\tao\model\TaoOntology;
 use oat\taoAdvancedSearch\model\SearchEngine\Driver\Elasticsearch\ElasticSearch;
 use oat\taoAdvancedSearch\model\SearchEngine\Query;
 
 class ClassMetadataSearcher extends ConfigurableService implements ClassMetadataSearcherInterface
 {
     private const BASE_LIST_ITEMS_URI = '/tao/PropertyValues/get?propertyUri=%s';
 
+    private const UNACCEPTABLE_PROPERTIES = [
+        TaoOntology::PROPERTY_TRANSLATION_TYPE,
+        TaoOntology::PROPERTY_TRANSLATION_PROGRESS,
+        TaoOntology::PROPERTY_TRANSLATION_ORIGINAL_RESOURCE_URI,
+    ];
+
     use OntologyAwareTrait;
 
     public function findAll(ClassMetadataSearchInput $input): ClassCollection
@@ -89,8 +96,9 @@ private function getProperties(string $classUri): array
         $allProperties = [$result];
         $allProperties = $this->getRelatedProperties($result, $allProperties);
         $allProperties = $this->getClassPathProperties($classUri, $allProperties);
+        $allProperties = $this->filterDuplicatedProperties($allProperties);
 
-        return $this->filterDuplicatedProperties($allProperties);
+        return array_diff_key($allProperties, array_flip(self::UNACCEPTABLE_PROPERTIES));
     }
 
     private function getClassPathProperties(string $classUri, array $allProperties): array

diff --git a/model/SearchEngine/Driver/Elasticsearch/QueryBuilder.php b/model/SearchEngine/Driver/Elasticsearch/QueryBuilder.php
@@ -80,6 +80,7 @@ class QueryBuilder
         'RadioBox',
         'SearchTextBox',
         'SearchDropdown',
+        'Readonly',
     ];
 
     private const LOGIC_MODIFIERS = [