MAGETWO-29463: Missing installation features of the new setup wizard - Save Session Data

- added dropdown to select session-save
- added validation in case redis is selected.

Author: mazhalai

setup/pub/magento/setup/web-configuration.js

@@ -27,6 +27,10 @@ angular.module('web-configuration', ['ngStorage'])
             },
             advanced: {
                 expanded: false
+            },
+            sessionSave: {
+                type: 'files',
+                error: false
             }
         };
 
@@ -115,4 +119,36 @@ angular.module('web-configuration', ['ngStorage'])
                 $scope.webconfig.submitted = false;
             }
         });
-    }]);
+    }])
+    .factory('redisFactory', function($http) {
+        var hasRedisExtension = function() {
+            return $http.get('index.php/web-configuration/has-redis').success(function (data) {
+                return data;
+            })
+        }
+        return { hasRedisExtension: hasRedisExtension }
+    })
+    .directive('checkRedis', ['redisFactory', function (redisFactory) {
+    return {
+        restrict: 'A',
+        require: 'ngModel',
+        link: function (scope, element, attrs, ngModel) {
+            var validator = function(value){
+                if (value === 'redis' ) {
+                    var ajaxPromise = redisFactory.hasRedisExtension();
+                    ajaxPromise.then(function(result) {
+                        ngModel.$setValidity('checkRedis', result.data.hasRedis);
+                        scope.validate();
+                    })
+                } else {
+                    ngModel.$setValidity('checkRedis', true);
+                    scope.validate();
+                }
+                return value;
+            };
+
+            ngModel.$parsers.unshift(validator);
+            ngModel.$formatters.unshift(validator);
+        }
+    };
+}]);

setup/src/Magento/Setup/Controller/Install.php

@@ -162,6 +162,8 @@ private function importDeploymentConfigForm()
             ? $source['config']['address']['admin'] : '';
         $result[SetupConfigOptionsList::INPUT_KEY_ENCRYPTION_KEY] = isset($source['config']['encrypt']['key'])
             ? $source['config']['encrypt']['key'] : null;
+        $result[SetupConfigOptionsList::INPUT_KEY_SESSION_SAVE] = isset($source['config']['sessionSave']['type'])
+            ? $source['config']['sessionSave']['type'] : SetupConfigOptionsList::SESSION_SAVE_FILES;
         $result[Installer::ENABLE_MODULES] = isset($source['store']['selectedModules'])
             ? implode(',', $source['store']['selectedModules']) : '';
         $result[Installer::DISABLE_MODULES] = isset($source['store']['allModules'])

setup/src/Magento/Setup/Controller/WebConfiguration.php

@@ -5,9 +5,11 @@
  */
 namespace Magento\Setup\Controller;
 
+use Magento\Framework\App\SetupInfo;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
-use Magento\Framework\App\SetupInfo;
+use Zend\View\Model\JsonModel;
 
 class WebConfiguration extends AbstractActionController
 {
@@ -22,10 +24,27 @@ public function indexAction()
         $view = new ViewModel(
             [
                 'autoBaseUrl'   => $setupInfo->getProjectUrl(),
-                'autoAdminPath' => $setupInfo->getProjectAdminPath()
+                'autoAdminPath' => $setupInfo->getProjectAdminPath(),
+                'sessionSave'   => [
+                        ConfigOptionsListConstants::SESSION_SAVE_FILES,
+                        ConfigOptionsListConstants::SESSION_SAVE_DB,
+                        ConfigOptionsListConstants::SESSION_SAVE_REDIS,
+                    ],
             ]
         );
         $view->setTerminal(true);
         return $view;
     }
+
+    /**
+     * Checks if redis extension exists
+     *
+     * @return array|JsonModel
+     */
+    public function hasRedisAction()
+    {
+        $json = new JsonModel(['hasRedis' => extension_loaded('redis')]);
+        $json->setTerminal(true);
+        return $json;
+    }
 }

setup/src/Magento/Setup/Model/ConfigOptionsList.php

@@ -271,6 +271,12 @@ private function validateSessionSave(array $options)
             && !in_array($options[ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE], $this->validSaveHandlers)
         ) {
             $errors[] = "Invalid session handler '{$options[ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE]}'";
+        } else if (isset($options[ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE])
+            && $options[ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE]
+            === ConfigOptionsListConstants::SESSION_SAVE_REDIS
+            && !extension_loaded('redis')
+        ) {
+            $errors[] = "Session handler has been chosen as 'redis', but PHP extension Redis is not loaded";
         }
 
         return $errors;

setup/view/magento/setup/web-configuration.phtml

@@ -280,6 +280,40 @@ $hints = [
             </div>
         </div>
 
+        <div class="row form-row">
+            <div class="col-m-3">
+                <label class="form-label required">
+                    Session Save
+                </label>
+            </div>
+            <div class="col-m-4">
+                <select
+                    name="session"
+                    class="form-el-select"
+                    ng-model="config.sessionSave.type"
+                    ng-class="{'invalid': webconfig.session.$invalid && webconfig.submitted}"
+                    tooltip-placement="right"
+                    tooltip-html-unsafe="The location of session. You can change this later in Magento Admin."
+                    tooltip-trigger="focus"
+                    tooltip-append-to-body="true"
+                    ng-change="$scope.validate()"
+                    check-Redis
+                    >
+                    <?php foreach ( $this->sessionSave as $value): ?>
+                        <?php echo "<option value=\"" . $value . "\">" . ucfirst($value) . "</option>"; ?>
+                    <?php endforeach; ?>
+                </select>
+
+                <div class="error-container">
+                    <span ng-show="webconfig.session.$error.checkRedis">
+                        Redis PHP extension is not loaded, please follow instructions on
+                        <a href="http://devdocs.magento.com/guides/v2.0/config-guide/redis/config-redis.html"
+                           target="_blank">how to setup Redis</a>,
+                        before selecting this option.
+                    </span>
+                </div>
+            </div>
+        </div>
     </div>
 
 </fieldset>