MAGETWO-40049: Admin > catalog page does not work in production mode

- instance object in $data

Author: Andrii Lugovyi

app/code/Magento/Ui/etc/di.xml

@@ -180,7 +180,7 @@
     <type name="Magento\Framework\Data\Argument\Interpreter\Composite">
         <arguments>
             <argument name="interpreters" xsi:type="array">
-                <item name="object" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Object</item>
+                <item name="object" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="configurableObject" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="array" xsi:type="object">arrayArgumentInterpreterProxy</item>
                 <item name="boolean" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Boolean</item>

lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php

@@ -40,17 +40,22 @@ public function __construct(ObjectManagerInterface $objectManager, InterpreterIn
      */
     public function evaluate(array $data)
     {
-        if (!isset($data['argument'])) {
-            throw new \InvalidArgumentException('Node "argument" required for this type.');
+        if (isset($data['value'])) {
+            $className = $data['value'];
+            $arguments = [];
+        } else {
+            if (!isset($data['argument'])) {
+                throw new \InvalidArgumentException('Node "argument" required for this type.');
+            }
+            foreach ($data['argument'] as $name => $argument) {
+                $arguments[$name] = $this->argumentInterpreter->evaluate($argument);
+            }
+            if (!isset($arguments['class'])) {
+                throw new \InvalidArgumentException('Node "argument" with name "class" is required for this type.');
+            }
+            $className = $arguments['class'];
+            unset($arguments['class']);
         }
-        foreach ($data['argument'] as $name => $argument) {
-            $arguments[$name] = $this->argumentInterpreter->evaluate($argument);
-        }
-        if (!isset($arguments['class'])) {
-            throw new \InvalidArgumentException('Node "argument" with name "class" is required for this type.');
-        }
-        $className = $arguments['class'];
-        unset($arguments['class']);
 
         return $this->objectManager->create($className, $arguments);
     }