Fix side panel search filter (#1212)

* fix: schema properties and api call for search from side panel

* fix: filter box categories when one type only

* fix: testAvailableRelationshipsUrl

* fix: testfilterListByType

Author: didoda

resources/js/app/components/filter-box.vue

@@ -261,6 +261,7 @@ export default {
             this.availableFilters = this.filterList;
         } else if (this.rightTypes.length == 1 && this.filtersByType) {
             this.availableFilters = this.filtersByType[this.rightTypes[0]];
+            this.queryFilter.filter.type = this.rightTypes[0];
         } else {
             this.availableFilters = this.filtersByType?.[this.queryFilter.filter.type] || [];
         }
@@ -383,6 +384,10 @@ export default {
             this.folder = null;
             this.selectedSearchType = 'q';
             this.queryFilter = this.getCleanQuery();
+            if (this.rightTypes.length == 1 && this.filtersByType) {
+                this.availableFilters = this.filtersByType[this.rightTypes[0]];
+                this.queryFilter.filter.type = this.rightTypes[0];
+            }
             this.$emit('filter-reset');
         },
 

src/Controller/ModulesController.php

@@ -481,7 +481,7 @@ public function resources($id, string $type): void
     }
 
     /**
-     * Relation data load callig api `GET /:object_type/:id/relationships/:relation`
+     * Relation data load calling api `GET /:object_type/:id/relationships/:relation`
      * Json response
      *
      * @param string|int $id The object ID.
@@ -532,7 +532,7 @@ protected function availableRelationshipsUrl(string $relation): string
         $relationsSchema = $this->Schema->getRelationsSchema();
         $types = $this->Modules->relatedTypes($relationsSchema, $relation);
 
-        return '/objects?filter[type][]=' . implode('&filter[type][]=', $types);
+        return count($types) === 1 ? sprintf('/%s', $types[0]) : '/objects?filter[type][]=' . implode('&filter[type][]=', $types);
     }
 
     /**

src/View/Helper/SchemaHelper.php

@@ -368,6 +368,7 @@ public function filterListByType(array $filtersByType, ?array $schemasByType): a
         foreach ($filtersByType as $type => $filters) {
             $noSchema = empty($schemasByType) || !array_key_exists($type, $schemasByType);
             $schemaProperties = $noSchema ? null : Hash::get($schemasByType, $type);
+            $schemaProperties = array_key_exists('properties', (array)$schemaProperties) ? $schemaProperties['properties'] : $schemaProperties;
             $schemaProperties = $schemaProperties !== false ? $schemaProperties : null;
             $list[$type] = self::filterList($filters, $schemaProperties);
         }

tests/TestCase/Controller/ModulesControllerTest.php

@@ -1021,7 +1021,7 @@ public function testAvailableRelationshipsUrl(): void
             ->willReturn(['documents']);
 
         $url = $this->controller->availableRelationshipsUrl('test_relation');
-        static::assertEquals('/objects?filter[type][]=documents', $url);
+        static::assertEquals('/documents', $url);
 
         $this->controller->Modules = $this->createMock(ModulesComponent::class);
         $this->controller->Modules->method('relatedTypes')