Refactor loops and fix analytics overview issues (#1137)

Author: bsuravech

Block/Configuration.php

@@ -286,13 +286,7 @@ public function getConfiguration()
 
     private function areCategoriesInFacets($facets)
     {
-        foreach ($facets as $facet) {
-            if ($facet['attribute'] === 'categories') {
-                return true;
-            }
-        }
-
-        return false;
+        return in_array('categories', array_column($facets, 'attribute'));
     }
 
     private function getUrlTrackedParameters()
@@ -336,28 +330,16 @@ private function isLandingPage()
 
     private function getLandingPageId()
     {
-        if (!$this->isLandingPage()) {
-            return '';
-        }
-
-        return $this->getCurrentLandingPage()->getId();
+        return $this->isLandingPage() ? $this->getCurrentLandingPage()->getId() : '';
     }
 
     private function getLandingPageQuery()
     {
-        if (!$this->isLandingPage()) {
-            return '';
-        }
-
-        return $this->getCurrentLandingPage()->getQuery();
+        return $this->isLandingPage() ? $this->getCurrentLandingPage()->getQuery() : '';
     }
 
     private function getLandingPageConfiguration()
     {
-        if (!$this->isLandingPage()) {
-            return json_encode([]);
-        }
-
-        return $this->getCurrentLandingPage()->getConfiguration();
+        return $this->isLandingPage() ? $this->getCurrentLandingPage()->getConfiguration() : json_encode([]);
     }
 }

Helper/AnalyticsHelper.php

@@ -323,7 +323,7 @@ public function isAnalyticsApiEnabled()
     {
         $clientData = $this->getClientData();
 
-        return (bool) $clientData && isset($clientData['analytics_api']) ? $clientData['analytics_api'] : 0;
+        return (bool) $clientData && isset($clientData['analytics_api']) ? $clientData['analytics_api'] : 1;
     }
 
     public function isClickAnalyticsEnabled()
@@ -334,7 +334,7 @@ public function isClickAnalyticsEnabled()
 
         $clientData = $this->getClientData();
 
-        return (bool) $clientData && isset($clientData['click_analytics']) ? $clientData['click_analytics'] : 0;
+        return (bool) $clientData && isset($clientData['click_analytics']) ? $clientData['click_analytics'] : 1;
     }
 
     /**

Helper/Entity/CategoryHelper.php

@@ -165,11 +165,7 @@ public function getCategoryCollectionQuery($storeId, $categoryIds = null)
         $storeRootCategoryPath = sprintf('%d/%d', $this->getRootCategoryId(), $store->getRootCategoryId());
 
         $unserializedCategorysAttrs = $this->getAdditionalAttributes($storeId);
-
-        $additionalAttr = [];
-        foreach ($unserializedCategorysAttrs as $attr) {
-            $additionalAttr[] = $attr['attribute'];
-        }
+        $additionalAttr = array_column($unserializedCategorysAttrs, 'attribute');
 
         $categories = $this->categoryCollectionFactory->create()
             ->distinct(true)

Model/Backend/EnableClickAnalytics.php

@@ -68,7 +68,7 @@ public function beforeSave()
 
         if ($result) {
             $result = json_decode($result);
-            if ($result->status === 401 && $result->message === 'Feature not available') {
+            if ($result->status === 402) {
                 throw new LocalizedException(
                     __('Click & Conversion analytics are not supported on your current plan. Please refer to <a target="_blank" href="https://www.algolia.com/pricing/">Algolia\'s pricing page</a> for more details.')
                 );

ViewModel/Adminhtml/Analytics/Overview.php

@@ -199,8 +199,7 @@ public function getDailySearchData()
                 $search['conversion'] = $this->getDateValue($conversion, $search['date'], 'rate');
             }
 
-            $date = $this->getBackendView()->getDateTime()->date($search['date']);
-            $search['formatted'] = date('M, d', $date->getTimestamp());
+            $search['formatted'] = date('M, d', strtotime($search['date']));
         }
 
         return $searches;

view/adminhtml/templates/analytics/graph.phtml

@@ -3,7 +3,6 @@
 ?>
 <?php if (!empty($block->getAnalytics())) : ?>
     <div id="algolia-analyatics-diagram"></div>
-
     <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
     <script type="text/javascript">
         google.charts.load("current", {packages:['corechart']});

view/adminhtml/web/css/analytics.css

@@ -73,6 +73,10 @@
     padding: 2rem;
 }
 
+.algoliasearch-analytics-overview .section.popular-results {
+    margin-left: 2%
+}
+
 .algoliasearch-analytics-overview .analytics-footer {
     margin-top: 1.5rem;
     text-align: left;