Merge pull request #27 from matesich/refactor-action

added store configs to action
scandipwa · Feb 2, 2023 · 22bb87c · 22bb87c
2 parents a8db01f + d166e2c
commit 22bb87c
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 9 deletions.
diff --git a/src/Controller/Pwa.php b/src/Controller/Pwa.php
@@ -75,6 +75,11 @@ class Pwa extends Action implements HttpGetActionInterface, HttpPostActionInterf
      */
     protected $catalogDefaultSortBy;
 
+    /**
+     * @var array|null
+     */
+    protected $storeConfig;
+
     /**
      * @param string $type
      * @return $this
@@ -176,6 +181,16 @@ public function setCatalogDefaultSortBy(string $catalogDefaultSortBy): self
         return $this;
     }
 
+    /**
+     * @param $storeConfig
+     * @return Pwa
+     */
+    public function setStoreConfig($storeConfig): self
+    {
+        $this->storeConfig = $storeConfig;
+        return $this;
+    }
+
     /**
      * Rewrite constructor.
      * @param Context     $context
@@ -195,6 +210,7 @@ public function __construct(
         $this->cmsPage = null;
         $this->description = '';
         $this->catalogDefaultSortBy = '';
+        $this->storeConfig = null;
         parent::__construct($context);
     }
 
@@ -216,6 +232,7 @@ public function execute()
         $resultLayout->setDisplayMode($this->display_mode);
         $resultLayout->setDescription($this->description);
         $resultLayout->setCatalogDefaultSortBy($this->catalogDefaultSortBy);
+        $resultLayout->setStoreConfig($this->storeConfig);
         try{
             $templateName = 'pwa-root';
             $resultLayout->setRootTemplate($templateName);

diff --git a/src/Controller/Router.php b/src/Controller/Router.php
@@ -46,6 +46,11 @@ class Router extends BaseRouter
     const PAGE_TYPE_CATEGORY = 'CATEGORY';
     const PAGE_TYPE_CMS_PAGE = 'CMS_PAGE';
 
+    const CRUCIAL_STORE_CONFIG_VALUES = [
+        'cms_home_page' => self::XML_PATH_CMS_HOME_PAGE,
+        'catalog_default_sort_by' => self::XML_PATH_CATALOG_DEFAULT_SORT_BY
+    ];
+
     /**
      * @var ValidationManagerInterface
      */
@@ -218,13 +223,6 @@ public function match(RequestInterface $request)
         $action = $this->actionFactory->create(Pwa::class);
         $rewrite = $this->getRewrite($request);
 
-        $catalogDefaultSortBy = $this->scopeConfig->getValue(
-            self::XML_PATH_CATALOG_DEFAULT_SORT_BY,
-            ScopeInterface::SCOPE_STORE,
-            $this->storeId
-        );
-
-        $action->setCatalogDefaultSortBy($catalogDefaultSortBy);
 
         if ($rewrite) {
             // Do not execute any action for external rewrites,
@@ -245,7 +243,7 @@ public function match(RequestInterface $request)
             $action->setCode(404)->setPhrase('Not Found');
         }
 
-        if ($this->isHomePage($request)) {
+        if ($this->isHomePage($request, $action)) {
             $this->setResponseHomePage($action);
         }
 
@@ -276,6 +274,8 @@ protected function setPageDetails(UrlRewrite $urlRewrite, ActionInterface $actio
                 $this->setResponseCategory($entityId, $action);
                 break;
         }
+
+        $this->setStoreConfigs($action);
     }
 
     protected function setResponseHomePage(ActionInterface $action)
@@ -365,11 +365,30 @@ protected function setResponseCategory($id, ActionInterface $action)
             $action->setName($category->getName() ?? '');
             $action->setDisplayMode($category->getDisplayMode() ?? '');
             $action->setDescription($category->getDescription() ?? '');
+            $action->setCatalogDefaultSortBy($category->getCatalogDefaultSortBy() ?? '');
         } catch (NoSuchEntityException $e) {
             $this->setNotFound($action);
         }
     }
 
+    protected function setStoreConfigs(ActionInterface $action)
+    {
+        $storeConfig = [];
+        $crucialStoreConfigs = self::CRUCIAL_STORE_CONFIG_VALUES;
+
+        foreach ($crucialStoreConfigs as $configKey => $path) {
+            $configValue = $this->scopeConfig->getValue(
+                $path,
+                ScopeInterface::SCOPE_STORE,
+                $this->storeId
+            );
+
+            $storeConfig[$configKey] = $configValue;
+        }
+
+        $action->setStoreConfig($storeConfig);
+    }
+
     /**
      * Set "404 Not Found" response
      *
@@ -496,7 +515,7 @@ protected function isHomePage(RequestInterface $request): bool
     {
         $requestPath = $request->getPathInfo();
 
-        if(!$requestPath) {
+        if(!$requestPath || $requestPath === '/') {
             return true;
         }
 

diff --git a/src/View/Result/Page.php b/src/View/Result/Page.php
@@ -127,6 +127,11 @@ class Page extends ExtendedPage
      */
     protected $catalogDefaultSortBy;
 
+    /**
+     * @var array|null
+     */
+    protected $storeConfig;
+
     /**
      * Constructor
      *
@@ -183,6 +188,7 @@ public function __construct(
         $this->cmsPage = null;
         $this->description = '';
         $this->catalogDefaultSortBy = '';
+        $this->storeConfig = null;
     }
 
     /**
@@ -316,6 +322,21 @@ public function getCatalogDefaultSortBy()
         return $this->catalogDefaultSortBy;
     }
 
+    public function setStoreConfig($storeConfig)
+    {
+        if($this->storeConfig === null) {
+            $this->storeConfig = $storeConfig;
+            return $this;
+        }
+
+        return null;
+    }
+
+    public function getCatalogDefaultSortByConfig()
+    {
+        return $this->storeConfig;
+    }
+
     /**
      * @param string $template
      * @return Page