[Analytics][Tracker] Feature Smile-SA#3340, add repository existence …

…check before loading, minor styling fixes
vahonc · Oct 28, 2024 · d7c36ac · d7c36ac
1 parent 736ce97
commit d7c36ac
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 12 deletions.
diff --git a/src/module-elasticsuite-analytics/Block/Adminhtml/Report/CustomerCompanySelector.php b/src/module-elasticsuite-analytics/Block/Adminhtml/Report/CustomerCompanySelector.php
@@ -13,13 +13,14 @@
  */
 namespace Smile\ElasticsuiteAnalytics\Block\Adminhtml\Report;
 
-use Magento\Company\Api\Data\CompanyInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Magento\Company\Api\CompanyRepositoryInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
+
 
 /**
  * Block used to display customer company selector in reports.
@@ -37,11 +38,6 @@ class CustomerCompanySelector extends Template
      */
     const CONFIG_IS_B2B_COMPANY_ACTIVE_XPATH = 'btob/website_configuration/company_active';
 
-    /**
-     * @var CompanyRepositoryInterface
-     */
-    protected $companyRepository;
-
     /**
      * @var ScopeConfigInterface
      */
@@ -52,25 +48,42 @@ class CustomerCompanySelector extends Template
      */
     protected $searchCriteriaBuilder;
 
+    /**
+     * @var \Magento\Company\Api\CompanyRepositoryInterface|null
+     */
+    private $companyRepository = null;
+
     /**
      * CustomerCompanySelector constructor.
      *
      * @param Context                    $context               The template context.
-     * @param CompanyRepositoryInterface $companyRepository     The company repository.
+     * @param ModuleManager              $moduleManager         Module manager.
      * @param ScopeConfigInterface       $scopeConfig           Scope configuration.
      * @param SearchCriteriaBuilder      $searchCriteriaBuilder The search criteria builder.
      * @param array                      $data                  Additional block data.
+     * @throws LocalizedException
      */
     public function __construct(
         Context $context,
-        CompanyRepositoryInterface $companyRepository,
+        ModuleManager $moduleManager,
         ScopeConfigInterface $scopeConfig,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         array $data = []
     ) {
-        $this->companyRepository = $companyRepository;
         $this->scopeConfig = $scopeConfig;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+
+        // Check if Magento_Company module is enabled before attempting to load the repository.
+        if ($moduleManager->isEnabled('Magento_Company')) {
+            if (interface_exists('\Magento\Company\Api\CompanyRepositoryInterface')) {
+                $this->companyRepository = ObjectManager::getInstance()->get(
+                    \Magento\Company\Api\CompanyRepositoryInterface::class
+                );
+            } else {
+                throw new LocalizedException(__('CompanyRepositoryInterface is not available.'));
+            }
+        }
+
         parent::__construct($context, $data);
     }
 

diff --git a/src/module-elasticsuite-analytics/view/adminhtml/web/css/source/_module.less b/src/module-elasticsuite-analytics/view/adminhtml/web/css/source/_module.less
@@ -70,6 +70,10 @@
         }
     }
 
+    .page-main-actions {
+        display: block;
+    }
+
     .customer-group-selector {
         color: #41362f;
         float: left;
@@ -95,4 +99,8 @@
         margin-right: 1rem;
         font-weight: 700;
     }
+
+    .page-actions-inner {
+        margin-top: .59rem;
+    }
 }