Added some changes to consolidate the backend query (#911)

Author: damcou

Controller/Adminhtml/System/Config/Save.php

@@ -25,6 +25,11 @@ private function handleDeactivatedSerializedArrays($groups)
             }
         }
 
+        if (isset($groups['instant']['fields']['is_instant_enabled']['value'])
+            && $groups['instant']['fields']['is_instant_enabled']['value'] == '1') {
+            $groups['instant']['fields']['backend_rendering_enable']['value'] = '0';
+        }
+
         return $groups;
     }
 }

Helper/Data.php

@@ -145,7 +145,9 @@ public function getSearchResult($query, $storeId, $searchParams = null, $targete
             }
         }
 
-        return [$data, $answer['nbHits'], $answer['facets']];
+        $facetsFromAnswer = isset($answer['facets']) ? $answer['facets'] : [];
+
+        return [$data, $answer['nbHits'], $facetsFromAnswer];
     }
 
     public function rebuildStoreAdditionalSectionsIndex($storeId)

Model/Layer/Filter/Item/Attribute.php

@@ -47,7 +47,7 @@ public function getRemoveUrl()
                 }
             }
 
-            $resetValue = null;
+            $resetValue = [];
 
             if (!is_null($idToRemove)) {
                 $resetValue = array_diff($this->getApplyValue(), [$idToRemove]);