Merge pull request #33 from dachcom-digital/type_selection

solverat · web-flow · commit ca66f756f55d · 2023-09-22T16:54:32.000+02:00
move index types out of compiler pass
diff --git a/README.md b/README.md
@@ -73,23 +73,23 @@ dynamic_search:
 
 ### always
 
-| Name                               | Default Value                         | Description |
-|:-----------------------------------|:--------------------------------------|:------------|
-| `index_asset`                      | false                                 |             |
-| `asset_data_builder_identifier`    | true                                  |             |
-| `asset_types`                      | `Asset::$types[]`, except folder      |             |
-| `asset_additional_params`          | []                                    |             |
-|                                    |                                       |             |
-| `index_object`                     | false                                 |             |
-| `object_data_builder_identifier`   | 'default'                             |             |
-| `object_types`                     | `DataObject::$types[]`, except folder |             |
-| `object_class_names`               | []                                    |             |
-| `object_additional_params`         | []                                    |             |
-|                                    |                                       |             |
-| `index_document`                   | false                                 |             |
-| `document_data_builder_identifier` | 'default'                             |             |
-| `document_types`                   | `Document::$types`, except folder     |             |
-| `document_additional_params`       | []                                    |             |
+| Name                               | Default Value                           | Description |
+|:-----------------------------------|:----------------------------------------|:------------|
+| `index_asset`                      | false                                   |             |
+| `asset_data_builder_identifier`    | true                                    |             |
+| `asset_types`                      | `Asset::getTypes()`, except folder      |             |
+| `asset_additional_params`          | []                                      |             |
+|                                    |                                         |             |
+| `index_object`                     | false                                   |             |
+| `object_data_builder_identifier`   | 'default'                               |             |
+| `object_types`                     | `DataObject::getTypes()`, except folder |             |
+| `object_class_names`               | []                                      |             |
+| `object_additional_params`         | []                                      |             |
+|                                    |                                         |             |
+| `index_document`                   | false                                   |             |
+| `document_data_builder_identifier` | 'default'                               |             |
+| `document_types`                   | `Document::getTypes()`, except folder   |             |
+| `document_additional_params`       | []                                      |             |
 
 ### full_dispatch
 
diff --git a/src/Provider/TrinityDataProvider.php b/src/Provider/TrinityDataProvider.php
@@ -32,24 +32,18 @@ public static function configureOptions(OptionsResolver $resolver): void
                     'index_asset'                      => false,
                     'asset_data_builder_identifier'    => 'default',
                     'asset_additional_params'          => [],
-                    'asset_types'                      => array_filter(Asset::getTypes(), static function ($type) {
-                        return $type !== 'folder';
-                    }),
+                    'asset_types'                      => null,
                     // objects
                     'index_object'                     => false,
                     'object_data_builder_identifier'   => 'default',
                     'object_class_names'               => [],
                     'object_additional_params'         => [],
-                    'object_types'                     => array_filter(DataObject::getTypes(), static function ($type) {
-                        return $type !== 'folder';
-                    }),
+                    'object_types'                     => null,
                     // documents
                     'index_document'                   => false,
                     'document_data_builder_identifier' => 'default',
                     'document_additional_params'       => [],
-                    'document_types'                   => array_filter(Document::getTypes(), static function ($type) {
-                        return $type !== 'folder';
-                    })
+                    'document_types'                   => null
                 ];
 
                 $spoolResolver->setDefaults($options);
@@ -138,5 +132,4 @@ protected function setupDataProvider(ContextDefinitionInterface $contextDefiniti
         $this->dataProvider->setContextDispatchType($contextDefinition->getContextDispatchType());
         $this->dataProvider->setIndexOptions($this->options);
     }
-
 }
diff --git a/src/Service/Builder/AssetListBuilder.php b/src/Service/Builder/AssetListBuilder.php
@@ -73,8 +73,14 @@ protected function getList(array $options): Asset\Listing
         return $list;
     }
 
-    protected function addAssetTypeRestriction(Asset\Listing $listing, array $allowedTypes): Asset\Listing
+    protected function addAssetTypeRestriction(Asset\Listing $listing, ?array $allowedTypes): Asset\Listing
     {
+        if ($allowedTypes === null) {
+            $allowedTypes = array_filter(Asset::getTypes(), static function ($type) {
+                return $type !== 'folder';
+            });
+        }
+
         if (count($allowedTypes) === 0) {
             return $listing;
         }
diff --git a/src/Service/Builder/DocumentListBuilder.php b/src/Service/Builder/DocumentListBuilder.php
@@ -75,8 +75,14 @@ protected function getList(array $options): Document\Listing
         return $list;
     }
 
-    protected function addDocumentTypeRestriction(Document\Listing $listing, array $allowedTypes): Document\Listing
+    protected function addDocumentTypeRestriction(Document\Listing $listing, ?array $allowedTypes): Document\Listing
     {
+        if ($allowedTypes === null) {
+            $allowedTypes = array_filter(Document::getTypes(), static function ($type) {
+                return $type !== 'folder';
+            });
+        }
+
         if (count($allowedTypes) === 0) {
             return $listing;
         }
diff --git a/src/Service/Builder/ObjectListBuilder.php b/src/Service/Builder/ObjectListBuilder.php
@@ -76,8 +76,14 @@ protected function getList(array $options): DataObject\Listing
         return $event->getListing();
     }
 
-    protected function addObjectTypeRestriction(DataObject\Listing $listing, array $allowedTypes): DataObject\Listing
+    protected function addObjectTypeRestriction(DataObject\Listing $listing, ?array $allowedTypes): DataObject\Listing
     {
+        if ($allowedTypes === null) {
+            $allowedTypes = array_filter(DataObject::getTypes(), static function ($type) {
+                return $type !== 'folder';
+            });
+        }
+
         if (count($allowedTypes) === 0) {
             return $listing;
         }

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,14 @@ protected function getList(array $options): Asset\Listing`
`73`	`73`	`return $list;`
`74`	`74`	`}`
`75`	`75`
`76`		`- protected function addAssetTypeRestriction(Asset\Listing $listing, array $allowedTypes): Asset\Listing`
	`76`	`+ protected function addAssetTypeRestriction(Asset\Listing $listing, ?array $allowedTypes): Asset\Listing`
`77`	`77`	`{`
	`78`	`+ if ($allowedTypes === null) {`
	`79`	`+ $allowedTypes = array_filter(Asset::getTypes(), static function ($type) {`
	`80`	`+ return $type !== 'folder';`
	`81`	`+ });`
	`82`	`+ }`
	`83`	`+`
`78`	`84`	`if (count($allowedTypes) === 0) {`
`79`	`85`	`return $listing;`
`80`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,14 @@ protected function getList(array $options): Document\Listing`
`75`	`75`	`return $list;`
`76`	`76`	`}`
`77`	`77`
`78`		`- protected function addDocumentTypeRestriction(Document\Listing $listing, array $allowedTypes): Document\Listing`
	`78`	`+ protected function addDocumentTypeRestriction(Document\Listing $listing, ?array $allowedTypes): Document\Listing`
`79`	`79`	`{`
	`80`	`+ if ($allowedTypes === null) {`
	`81`	`+ $allowedTypes = array_filter(Document::getTypes(), static function ($type) {`
	`82`	`+ return $type !== 'folder';`
	`83`	`+ });`
	`84`	`+ }`
	`85`	`+`
`80`	`86`	`if (count($allowedTypes) === 0) {`
`81`	`87`	`return $listing;`
`82`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,14 @@ protected function getList(array $options): DataObject\Listing`
`76`	`76`	`return $event->getListing();`
`77`	`77`	`}`
`78`	`78`
`79`		`- protected function addObjectTypeRestriction(DataObject\Listing $listing, array $allowedTypes): DataObject\Listing`
	`79`	`+ protected function addObjectTypeRestriction(DataObject\Listing $listing, ?array $allowedTypes): DataObject\Listing`
`80`	`80`	`{`
	`81`	`+ if ($allowedTypes === null) {`
	`82`	`+ $allowedTypes = array_filter(DataObject::getTypes(), static function ($type) {`
	`83`	`+ return $type !== 'folder';`
	`84`	`+ });`
	`85`	`+ }`
	`86`	`+`
`81`	`87`	`if (count($allowedTypes) === 0) {`
`82`	`88`	`return $listing;`
`83`	`89`	`}`