Merge pull request #15 from apisearch-io/fix/updated-version-and-fixe…

…d-parts

Fixed apisearch version and fixed parts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apisearch-ui",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Javascript User Interface of Apisearch.",
   "main": "./dist/apisearch-ui.js",
   "scripts": {
@@ -44,7 +44,7 @@
     "webpack-merge": "^4.1.3"
   },
   "dependencies": {
-    "apisearch": "^0.2.6",
+    "apisearch": "^0.2.8",
     "clone-deep": "^4.0.0",
     "flux": "^3.1.3",
     "hogan.js": "^3.0.2",

src/components/ClearFilters/ClearFiltersActions.ts

@@ -21,7 +21,10 @@ export function clearFiltersAction(
 ) {
     const clonedQuery = cloneDeep(currentQuery);
 
-    clonedQuery.filters = [];
+    clonedQuery.filters = {
+        _query: currentQuery.getFilter("_query"),
+    };
+
     clonedQuery.page = 1;
     const dispatcher = container.get(`${APISEARCH_DISPATCHER}__${environmentId}`);
 

src/components/ClearFilters/ClearFiltersComponent.tsx

@@ -23,10 +23,9 @@ class ClearFiltersComponent extends Component<ClearFiltersProps, ClearFiltersSta
      * @param props
      */
     componentWillReceiveProps(props) {
-        let filters = props.currentQuery.filters;
+        let filters = props.currentQuery.getFilters();
         let areFiltersActive = (
-            Object.keys(filters).length !== 0 &&
-            filters.length !== 0
+            Object.keys(filters).length > 1
         );
 
         this.setState({showClearFilters: areFiltersActive});

src/components/Result/ResultActions.ts

@@ -43,15 +43,15 @@ export function changeItemsPerResultPageSetup(
     /**
      * Promoted uuids
      */
-    if (promotedUUIDs.length !== 0) {
-        clonedQuery.promoteUUIDs(promotedUUIDs);
+    for (const i in promotedUUIDs) {
+        clonedQuery.promoteUUID(promotedUUIDs[i]);
     }
 
     /**
      * excluded uuids
      */
-    if (excludedUUIDs.length !== 0) {
-        clonedQuery.excludeUUIDs(excludedUUIDs);
+    for (const i in excludedUUIDs) {
+        clonedQuery.excludeUUID(excludedUUIDs[i]);
     }
 
     const dispatcher = container.get(`${APISEARCH_DISPATCHER}__${environmentId}`);

src/components/Result/ResultComponent.tsx

@@ -3,6 +3,7 @@ import Template from "../Template";
 import {defaultItemsListTemplate} from "./defaultTemplates";
 import {changeItemsPerResultPageSetup} from "./ResultActions";
 import {ResultProps} from "./ResultProps";
+import {ItemUUID} from "apisearch/lib/Model/ItemUUID";
 
 /**
  * Result Component
@@ -24,8 +25,16 @@ class ResultComponent extends Component<ResultProps> {
             props.currentQuery,
             props.itemsPerPage,
             props.highlightsEnabled,
-            props.promote,
-            props.exclude
+            props.promote.map((itemUUID) => {
+                return itemUUID instanceof ItemUUID
+                    ? itemUUID
+                    : ItemUUID.createFromArray(itemUUID)
+            }),
+            props.exclude.map((itemUUID) => {
+                return itemUUID instanceof ItemUUID
+                    ? itemUUID
+                    : ItemUUID.createFromArray(itemUUID)
+            })
         );
     }