Merge pull request #489 from anzin/fixed-data-provider

Fixed data provider to work with listing and form

Author: eduard13

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

@@ -102,10 +102,17 @@ class ${CLASS_NAME} extends ${EXTENDS}
             return $this->loadedData;
         }
         $this->loadedData = parent::getData();
+        $itemsById = [];
 
+#set($entityId = "#if(${ENTITY_ID})${ENTITY_ID}#{else}entity_id#end")
+#set($entityIdAccessor = '[(int) $item[' + "'$entityId'" + ']]')
+#set($getIdAccessor = "[(int) $id]")
         foreach ($this->loadedData['items'] as $item) {
-        #set($idAccessor = '[' + "#if(${ENTITY_ID})'${ENTITY_ID}'#{else}'entity_id'#end" + ']')
-            $this->loadedData['items'][$item$idAccessor] = $item;
+            $itemsById$entityIdAccessor = $item;
+        }
+
+        if ($id = $this->request->getParam('$entityId', null)) {
+            $this->loadedData['entity'] = $itemsById$getIdAccessor;
         }
 
         return $this->loadedData;

resources/fileTemplates/internal/Magento UI Component Form XML.xml.ft

@@ -9,6 +9,7 @@
     </argument>
     <settings>
         <namespace>${NAME}</namespace>
+        <dataScope>data.general</dataScope>
         <deps>
             <dep>${NAME}.${NAME}_data_source</dep>
         </deps>

testData/actions/generation/generator/UiComponentFormGenerator/generateFormXmlFile/my_form.xml

@@ -10,6 +10,7 @@
     </argument>
     <settings>
         <namespace>my_form</namespace>
+        <dataScope>data.general</dataScope>
         <deps>
             <dep>my_form.my_form_data_source</dep>
         </deps>

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

@@ -99,9 +99,14 @@ public function getData(): array
             return $this->loadedData;
         }
         $this->loadedData = parent::getData();
+        $itemsById = [];
 
         foreach ($this->loadedData['items'] as $item) {
-            $this->loadedData['items'][$item['entity_id']] = $item;
+            $itemsById[(int)$item['entity_id']] = $item;
+        }
+
+        if ($id = $this->request->getParam('entity_id', null)) {
+            $this->loadedData['entity'] = $itemsById[(int)$id];
         }
 
         return $this->loadedData;