Merge branch 'MAGETWO-55193' of https://github.com/magento-falcons/magento2ce into MAGETWO-56240

Author: shiftedreality

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less

@@ -112,6 +112,26 @@
             }
         }
     }
+
+    &._tooltip {
+        background: transparent;
+        margin: 0px 0px 8px 5px;
+
+        a {
+            width: 21px;
+
+            &:hover {
+                text-decoration: none;
+            }
+
+            &:before {
+                color: @color-tertiary;
+                content: @icon-help__content;
+                font-family: @icons__font-family;
+                font-size: @component-indicator__size;
+            }
+        }
+    }
 }
 
 .col-manager-item-name {

setup/pub/magento/setup/extension-grid.js

@@ -129,7 +129,7 @@ angular.module('extension-grid', ['ngStorage'])
                         version: $scope.availableUpdatePackages[extension.name]['latestVersion']
                     }
                 ];
-                titleService.setTitle('update', extension.moduleName ? extension.moduleName : extension.name);
+                titleService.setTitle('update', extension);
                 $state.go('root.readiness-check-update');
             };
 
@@ -139,7 +139,7 @@ angular.module('extension-grid', ['ngStorage'])
                         name: extension.name
                     }
                 ];
-                titleService.setTitle('uninstall', extension.moduleName ? extension.moduleName : extension.name);
+                titleService.setTitle('uninstall', extension);
                 $localStorage.componentType = extension.type;
                 $state.go('root.readiness-check-uninstall');
             };

setup/pub/magento/setup/install-extension-grid.js

@@ -74,6 +74,7 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
                                 }
                             ];
                             $localStorage.moduleName = extension.name;
+                            $localStorage.packageTitle = extension.package_title;
                             $scope.error = false;
                             $scope.errorMessage = '';
                         }

setup/pub/magento/setup/main.js

@@ -251,13 +251,19 @@ main.controller('navigationController',
 .service('titleService', ['$localStorage', '$rootScope',
     function ($localStorage, $rootScope) {
         return {
-            setTitle: function(type, moduleName) {
-                $localStorage.moduleName = moduleName;
+            setTitle: function(type, component) {
+                if (type === 'enable' || type === 'disable') {
+                    $localStorage.packageTitle = $localStorage.moduleName = component.moduleName;
+                } else {
+                    $localStorage.moduleName = component.moduleName ? component.moduleName : component.name;
+                    $localStorage.packageTitle = component.package_title;
+                }
+
                 if (typeof $localStorage.titles === 'undefined') {
                     $localStorage.titles = [];
                 }
                 $localStorage.titles[type] = type.charAt(0).toUpperCase() + type.slice(1) + ' '
-                    + $localStorage.moduleName;
+                    + ($localStorage.packageTitle ? $localStorage.packageTitle : $localStorage.moduleName);
                 $rootScope.titles = $localStorage.titles;
             }
         };

setup/pub/magento/setup/module-grid.js

@@ -66,7 +66,7 @@ angular.module('module-grid', ['ngStorage'])
                         isComposerPackage: component.name !== 'unknown',
                     }
                 ];
-                titleService.setTitle(type, component.moduleName ? component.moduleName : component.name);
+                titleService.setTitle(type, component);
                 $localStorage.componentType = component.type;
                 $state.go('root.readiness-check-'+type);
             };

setup/pub/magento/setup/readiness-check.js

@@ -353,7 +353,7 @@ angular.module('readiness-check', ['remove-dialog'])
         $scope.wordingOfReadinessCheckAction = function() {
             var $actionString = 'We\'re making sure your server environment is ready for ';
             if ($localStorage.moduleName) {
-                $actionString += $localStorage.moduleName;
+                $actionString += $localStorage.packageTitle ? $localStorage.packageTitle : $localStorage.moduleName;
             } else {
                 if($state.current.type === 'install' || $state.current.type === 'upgrade') {
                     $actionString += 'Magento';
@@ -373,6 +373,14 @@ angular.module('readiness-check', ['remove-dialog'])
             } else {
                 $actionString +='ed';
             }
+
+            if ($localStorage.moduleName
+                && $localStorage.packageTitle
+                && $localStorage.moduleName != $localStorage.packageTitle
+            ) {
+                $actionString += ', which consists of the following packages:<br/>- ' + $localStorage.moduleName;
+            }
+
             return $actionString;
         };
 

setup/pub/magento/setup/update-extension-grid.js

@@ -48,7 +48,7 @@ angular.module('update-extension-grid', ['ngStorage', 'clickOut'])
                         version: extension.updateVersion
                     }
                 ];
-                titleService.setTitle('update', extension.name);
+                titleService.setTitle('update', extension);
                 $scope.nextState();
             };
             $scope.isHiddenSpinner = true;

setup/pub/styles/setup.css

@@ -10,7 +10,6 @@
 use Zend\View\Model\JsonModel;
 use Zend\View\Model\ViewModel;
 use Magento\Setup\Model\PackagesData;
-use \Magento\Setup\Model\Grid\TypeMapper;
 
 /**
  * Controller for extensions grid tasks
@@ -22,21 +21,13 @@ class InstallExtensionGrid extends AbstractActionController
      */
     private $packagesData;
 
-    /**
-     * @var TypeMapper
-     */
-    private $typeMapper;
-
     /**
      * @param PackagesData $packagesData
-     * @param TypeMapper $typeMapper
      */
     public function __construct(
-        PackagesData $packagesData,
-        TypeMapper $typeMapper
+        PackagesData $packagesData
     ) {
         $this->packagesData = $packagesData;
-        $this->typeMapper = $typeMapper;
     }
 
     /**
@@ -60,10 +51,7 @@ public function extensionsAction()
     {
         $extensions = $this->packagesData->getPackagesForInstall();
         $packages = isset($extensions['packages']) ? $extensions['packages'] : [];
-        array_walk($packages, function (&$package) {
-            $package['vendor'] = ucfirst($package['vendor']);
-            $package['type'] =  $this->typeMapper->map($package['name'], $package['type']);
-        });
+        $packages = $this->formatPackageList($packages);
 
         return new JsonModel(
             [
@@ -73,4 +61,19 @@ public function extensionsAction()
             ]
         );
     }
+
+    /**
+     * Format package list
+     *
+     * @param array $packages
+     * @return array
+     */
+    private function formatPackageList(array $packages)
+    {
+        array_walk($packages, function (&$package) {
+            $package['vendor'] = ucfirst($package['vendor']);
+        });
+
+        return $packages;
+    }
 }

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

@@ -18,11 +18,6 @@ class Extension
      */
     private $composerInformation;
 
-    /**
-     * @var TypeMapper
-     */
-    private $typeMapper;
-
     /**
      * @var PackagesData
      */
@@ -31,16 +26,13 @@ class Extension
     /**
      * @param ComposerInformation $composerInformation
      * @param PackagesData $packagesData
-     * @param TypeMapper $typeMapper
      */
     public function __construct(
         ComposerInformation $composerInformation,
-        PackagesData $packagesData,
-        TypeMapper $typeMapper
+        PackagesData $packagesData
     ) {
         $this->composerInformation = $composerInformation;
         $this->packagesData = $packagesData;
-        $this->typeMapper = $typeMapper;
     }
 
     /**
@@ -89,7 +81,6 @@ private function formatExtensions(array $extensions)
     {
         foreach ($extensions as &$extension) {
             $extension['vendor'] = ucfirst(current(explode('/', $extension['name'])));
-            $extension['type'] = $this->typeMapper->map($extension['name'], $extension['type']);
         }
         return array_values($extensions);
     }