fix: handle aggregation funct on FE

SlovakNationalGallery · Aug 23, 2023 · bb4f08c · bb4f08c
1 parent 1dc169c
commit bb4f08c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/resources/js/components/catalog-new/ItemsFilterController.vue b/resources/js/components/catalog-new/ItemsFilterController.vue
@@ -23,7 +23,7 @@ function getParsedFilterFromUrl() {
 }
 
 function stringifyUrl({ url, params }) {
-    const { filter, size, terms, page } = params
+    const { filter, size, terms, page, min, max } = params
     const {
         yearRange,
         author,
@@ -63,6 +63,8 @@ function stringifyUrl({ url, params }) {
         sort: {
             [sort]: SORT_DIRECTIONS[sort],
         },
+        min,
+        max,
         page,
         terms,
         size,
@@ -254,6 +256,8 @@ export default {
                                 filter: this.query,
                                 terms: AGGREGATIONS_TERMS,
                                 size: AGGREGATIONS_SIZE,
+                                min: { date_earliest: 'date_earliest' },
+                                max: { date_latest: 'date_latest' },
                             },
                         }),
                         { headers: this.apiHeaders }

diff --git a/resources/js/components/catalog-new/SearchOptionsController.vue b/resources/js/components/catalog-new/SearchOptionsController.vue
@@ -10,12 +10,21 @@ export default {
         filteredOptions() {
             // TODO better matching algorithm?
             const query = this.search.toLowerCase()
-            return this.options
-                .filter((option) => option.value.toLowerCase().includes(query))
-                .map((option) => ({
+            const optionsWithSelected = [
+                ...this.options.map((option) => ({
                     ...option,
                     checked: this.selected.includes(option.value),
-                }))
+                })),
+                ...this.selected
+                    .filter((queryItem) =>
+                        this.options.every((option) => option.value !== queryItem)
+                    )
+                    .map((selected) => ({ value: selected, count: 0, checked: true })),
+            ]
+
+            return optionsWithSelected.filter((option) =>
+                option.value.toLowerCase().includes(query)
+            )
         },
     },
     render() {