Data provider extended to provide right data into the entity form, test case adjustments

Author: bohdan-harniuk

resources/fileTemplates/internal/Magento UI Component Custom Data Provider Class.php.ft

@@ -29,6 +29,11 @@ class ${CLASS_NAME} extends ${EXTENDS}
      */
     private $searchResultFactory;
 
+    /**
+     * @var array
+     */
+    private $loadedData = [];
+
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -85,6 +90,26 @@ class ${CLASS_NAME} extends ${EXTENDS}
             '#if(${ENTITY_ID})${ENTITY_ID}#{else}entity_id#end'
         );
     }
+
+    /**
+     * Get data.
+     *
+     * @return array
+     */
+    public function getData(): array
+    {
+        if ($this->loadedData) {
+            return $this->loadedData;
+        }
+        $this->loadedData = parent::getData();
+
+        foreach ($this->loadedData['items'] as $item) {
+        #set($idAccessor = '[' + "#if(${ENTITY_ID})'${ENTITY_ID}'#{else}'entity_id'#end" + ']')
+            $this->loadedData['items'][$item$idAccessor] = $item;
+        }
+
+        return $this->loadedData;
+    }
 #else
     /**
      * @inheritDoc

testData/actions/generation/generator/UiComponentGridDataProviderGenerator/generateDataProviderWithInjectedGetListQuery/GridDataProvider.php

@@ -25,6 +25,11 @@ class GridDataProvider extends DataProvider
      */
     private $searchResultFactory;
 
+    /**
+     * @var array
+     */
+    private $loadedData = [];
+
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -82,4 +87,23 @@ public function getSearchResult()
             'entity_id'
         );
     }
+
+    /**
+     * Get data.
+     *
+     * @return array
+     */
+    public function getData(): array
+    {
+        if ($this->loadedData) {
+            return $this->loadedData;
+        }
+        $this->loadedData = parent::getData();
+
+        foreach ($this->loadedData['items'] as $item) {
+            $this->loadedData['items'][$item['entity_id']] = $item;
+        }
+
+        return $this->loadedData;
+    }
 }