From 8b5818df65ad4ab7ed33fe5933782151f9b0d2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Corr=C3=AAa=20Gomes?= <rafaelcgstz@gmail.com>
Date: Thu, 7 Nov 2019 22:55:40 -0300
Subject: [PATCH] Contact form > Adding ViewModel

---
 .../Contact/ViewModel/UserDataProvider.php    | 72 +++++++++++++++++++
 .../frontend/layout/contact_index_index.xml   |  3 +
 .../view/frontend/templates/form.phtml        | 11 +--
 3 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/Contact/ViewModel/UserDataProvider.php

diff --git a/app/code/Magento/Contact/ViewModel/UserDataProvider.php b/app/code/Magento/Contact/ViewModel/UserDataProvider.php
new file mode 100644
index 0000000000000..678f4349b0e88
--- /dev/null
+++ b/app/code/Magento/Contact/ViewModel/UserDataProvider.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Contact\ViewModel;
+
+use Magento\Contact\Helper\Data;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Provides the user data to fill the form.
+ */
+class UserDataProvider implements ArgumentInterface
+{
+
+    /**
+     * @var Data
+     */
+    private $helper;
+
+    /**
+     * UserDataProvider constructor.
+     * @param Data $helper
+     */
+    public function __construct(
+        Data $helper
+    ) {
+        $this->helper = $helper;
+    }
+
+    /**
+     * Get user name
+     *
+     * @return string
+     */
+    public function getUserName()
+    {
+        return $this->helper->getPostValue('name') ?: $this->helper->getUserName();
+    }
+
+    /**
+     * Get user email
+     *
+     * @return string
+     */
+    public function getUserEmail()
+    {
+        return $this->helper->getPostValue('email') ?: $this->helper->getUserEmail();
+    }
+
+    /**
+     * Get user telephone
+     *
+     * @return string
+     */
+    public function getUserTelephone()
+    {
+        return $this->helper->getPostValue('telephone');
+    }
+
+    /**
+     * Get user comment
+     *
+     * @return string
+     */
+    public function getUserComment()
+    {
+        return $this->helper->getPostValue('comment');
+    }
+}
diff --git a/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml b/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml
index 078c1a4ff5621..c7009831d4642 100644
--- a/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml
+++ b/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml
@@ -13,6 +13,9 @@
         <referenceContainer name="content">
             <block class="Magento\Contact\Block\ContactForm" name="contactForm" template="Magento_Contact::form.phtml">
                 <container name="form.additional.info" label="Form Additional Info"/>
+                <arguments>
+                    <argument name="view_model" xsi:type="object">Magento\Contact\ViewModel\UserDataProvider</argument>
+                </arguments>
             </block>
         </referenceContainer>
     </body>
diff --git a/app/code/Magento/Contact/view/frontend/templates/form.phtml b/app/code/Magento/Contact/view/frontend/templates/form.phtml
index d64a991bcafad..74708bf276a78 100644
--- a/app/code/Magento/Contact/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Contact/view/frontend/templates/form.phtml
@@ -6,6 +6,9 @@
 
 // @codingStandardsIgnoreFile
 /** @var \Magento\Contact\Block\ContactForm $block */
+/** @var \Magento\Contact\ViewModel\UserDataProvider $viewModel */
+
+$viewModel = $block->getViewModel();
 ?>
 <form class="form contact"
       action="<?= $block->escapeUrl($block->getFormAction()) ?>"
@@ -19,25 +22,25 @@
         <div class="field name required">
             <label class="label" for="name"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
             <div class="control">
-                <input name="name" id="name" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" value="<?= $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('name') ?: $this->helper('Magento\Contact\Helper\Data')->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
+                <input name="name" id="name" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" value="<?= $block->escapeHtmlAttr($viewModel->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
             </div>
         </div>
         <div class="field email required">
             <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input name="email" id="email" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" value="<?= $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('email') ?: $this->helper('Magento\Contact\Helper\Data')->getUserEmail()) ?>" class="input-text" type="email" data-validate="{required:true, 'validate-email':true}"/>
+                <input name="email" id="email" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" value="<?= $block->escapeHtmlAttr($viewModel->getUserEmail()) ?>" class="input-text" type="email" data-validate="{required:true, 'validate-email':true}"/>
             </div>
         </div>
         <div class="field telephone">
             <label class="label" for="telephone"><span><?= $block->escapeHtml(__('Phone Number')) ?></span></label>
             <div class="control">
-                <input name="telephone" id="telephone" title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>" value="<?= $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('telephone')) ?>" class="input-text" type="text" />
+                <input name="telephone" id="telephone" title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>" value="<?= $block->escapeHtmlAttr($viewModel->getUserTelephone()) ?>" class="input-text" type="text" />
             </div>
         </div>
         <div class="field comment required">
             <label class="label" for="comment"><span><?= $block->escapeHtml(__('What’s on your mind?')) ?></span></label>
             <div class="control">
-                <textarea name="comment" id="comment" title="<?= $block->escapeHtmlAttr(__('What’s on your mind?')) ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"><?= $block->escapeHtml($this->helper('Magento\Contact\Helper\Data')->getPostValue('comment')) ?></textarea>
+                <textarea name="comment" id="comment" title="<?= $block->escapeHtmlAttr(__('What’s on your mind?')) ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"><?= $block->escapeHtml($viewModel->getUserComment()) ?></textarea>
             </div>
         </div>
         <?= $block->getChildHtml('form.additional.info') ?>