feature:

Author: jissereitsma

Component/Grid/GridRepository.php

@@ -13,6 +13,9 @@
 use Loki\AdminComponents\ProviderHandler\ProviderHandlerListing;
 use Loki\Components\Component\ComponentRepository;
 
+/**
+ * @method GridViewModel getViewModel()
+ */
 class GridRepository extends ComponentRepository
 {
     public function __construct(
@@ -25,7 +28,7 @@ public function __construct(
 
     public function getNamespace(): string
     {
-        return $this->getComponent()->getViewModel()->getNamespace();
+        return $this->getViewModel()->getNamespace();
     }
 
     // @todo: Remove the requirement for this
@@ -47,7 +50,7 @@ public function getPrimaryKey(): string
 
     public function getItems(): array
     {
-        $searchableFields = $this->getComponent()->getViewModel()->getSearchableFields();
+        $searchableFields = $this->getViewModel()->getSearchableFields();
         $this->getState()->setSearchableFields($searchableFields);
 
         return $this->getProviderHandler()->getItems($this->getProvider(), $this->getState());
@@ -102,7 +105,7 @@ protected function getState(): State
 
     protected function getBlock(): AbstractBlock
     {
-        return $this->getComponent()->getViewModel()->getBlock();
+        return $this->getViewModel()->getBlock();
     }
 
     public function getResourceModel(): ?AbstractDb

ViewModel/Form/Field/EntitySelect.php

@@ -85,6 +85,7 @@ private function getGridViewModel(): GridViewModel
             return $gridViewModel;
         }
 
+        /** @var Template $block */
         $block = $this->block->getLayout()->createBlock(Template::class);
         $block->setNamespace($this->getNamespace());
 

ViewModel/Options/StoreViewOptions.php

@@ -5,7 +5,9 @@
 
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
 
 class StoreViewOptions implements ArgumentInterface, OptionSourceInterface
 {
@@ -21,7 +23,7 @@ public function toOptionArray(): array
         $options[] = ['label' => __('All Store Views'), 'value' => ''];
 
         $websites = $this->storeManager->getWebsites();
-        uasort($websites, function ($a, $b) {
+        uasort($websites, function (Website $a, Website $b) {
             $soA = (int)$a->getSortOrder();
             $soB = (int)$b->getSortOrder();
 
@@ -42,7 +44,7 @@ public function toOptionArray(): array
                 /** @var \Magento\Store\Model\Group $group */
 
                 $stores = $group->getStores();
-                usort($stores, function ($a, $b) {
+                usort($stores, function (Store $a, Store $b) {
                     $soA = (int)$a->getSortOrder();
                     $soB = (int)$b->getSortOrder();
 

ViewModel/ProductImage.php

@@ -2,7 +2,7 @@
 
 namespace Loki\AdminComponents\ViewModel;
 
-use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Helper\Image as ImageHelper;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 
@@ -13,15 +13,15 @@ public function __construct(
     ) {
     }
 
-    public function getThumbnailUrl(ProductInterface $product): string
+    public function getThumbnailUrl(Product $product): string
     {
         return $this->imageHelper->init($product, 'product_page_image_small')
             ->setImageFile($product->getImage()) // image,small_image,thumbnail
             ->resize(80)
             ->getUrl();
     }
 
-    public function getImageUrl(ProductInterface $product): string
+    public function getImageUrl(Product $product): string
     {
         return $this->imageHelper->init($product, 'product_page_image_medium')
             ->setImageFile($product->getImage())

ViewModel/StoreView.php

@@ -4,6 +4,7 @@
 
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Store\Model\StoreManager;
+use Magento\Store\Model\Website;
 
 class StoreView implements ArgumentInterface
 {
@@ -18,9 +19,11 @@ public function getStoreHierarchy(array $storeIds): array
 
         foreach ($storeIds as $storeId) {
             $store = $this->storeManager->getStore($storeId);
-            $websites[$store->getWebsiteId()]['selected'] = true;
-            $websites[$store->getWebsiteId()]['groups'][$store->getStoreGroupId()]['selected'] = true;
-            $websites[$store->getWebsiteId()]['groups'][$store->getStoreGroupId()]['stores'][$storeId]['selected'] = true;
+            $websiteId = $store->getWebsiteId();
+            $groupId = $store->getStoreGroupId();
+            $websites[$websiteId]['selected'] = true;
+            $websites[$websiteId]['groups'][$groupId]['selected'] = true;
+            $websites[$websiteId]['groups'][$groupId]['stores'][$storeId]['selected'] = true;
         }
 
         return $websites;
@@ -31,6 +34,10 @@ private function getDefaultHierarchy(): array
     {
         $websites = [];
         foreach ($this->storeManager->getWebsites() as $website) {
+            if (false === $website instanceof Website) {
+                continue;
+            }
+
             $groups = [];
             foreach ($website->getGroups() as $group) {
                 $stores = [];