[PWA-2499] Browser Reload on any Category load all products from default category (#18)

* Add support for UID field

* Add null guards to uid encoding

Author: tjwiebell

Model/Computed/PageInfo.php

@@ -8,6 +8,7 @@
 
 namespace Magento\UpwardConnector\Model\Computed;
 
+use Magento\Framework\GraphQl\Query\Uid;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Upward\Definition;
@@ -30,6 +31,9 @@ class PageInfo implements ComputedInterface
     /** @var \Magento\UrlRewriteGraphQl\Model\DataProvider\EntityDataProviderComposite */
     private $entityDataProviderComposite;
 
+    /** @var \Magento\Framework\GraphQl\Query\Uid */
+    private $uid;
+
     /**
      * @param \Magento\UpwardConnector\Model\PageType $pageTypeResolver
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -40,12 +44,14 @@ public function __construct(
         PageType $pageTypeResolver,
         StoreManagerInterface $storeManager,
         Json $json,
-        EntityDataProviderComposite $entityDataProviderComposite
+        EntityDataProviderComposite $entityDataProviderComposite,
+        Uid $uid
     ) {
         $this->pageTypeResolver = $pageTypeResolver;
         $this->storeManager = $storeManager;
         $this->json = $json;
         $this->entityDataProviderComposite = $entityDataProviderComposite;
+        $this->uid = $uid;
     }
 
     /**
@@ -131,7 +137,7 @@ public function isPageInfoComplete($pageInfo, $additionalMap): bool
     {
         $pageInfoHasAllData = true;
         if ($additionalMap) {
-            foreach($additionalMap as $key) {
+            foreach ($additionalMap as $key) {
                 if (!isset($pageInfo[$key])) {
                     $pageInfoHasAllData = false;
 
@@ -145,7 +151,8 @@ public function isPageInfoComplete($pageInfo, $additionalMap): bool
 
     /**
      * @param array $data
-     * @param array{type: string, fetch: string}|bool $map
+     * @param array|bool $map
+     * @param string $type
      *
      * @return array
      */
@@ -156,7 +163,7 @@ public function filterData($data, $map, $type)
         }
 
         $result = [];
-        foreach($map as $valueKey) {
+        foreach ($map as $valueKey) {
             $result[$valueKey] = $this->getEntityValue($data, $valueKey, $type);
         }
 
@@ -184,6 +191,10 @@ public function getEntityValue(array $data, string $key, string $type)
             return $data['id'] ?? $data['entity_id'];
         }
 
+        if ($key === 'uid' && (isset($data['id']) || isset($data['entity_id']))) {
+            return $this->uid->encode($data['id'] ?? $data['entity_id']);
+        }
+
         return $data[$key] ?? null;
     }
 }