MAGETWO-55193: Extension Management with Marketplace data

- Update message on Readiness Check

Author: viktym

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

@@ -138,6 +138,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

@@ -352,7 +352,7 @@ angular.module('readiness-check', [])
         $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';
@@ -369,6 +369,14 @@ angular.module('readiness-check', [])
             } 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

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

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

@@ -7,6 +7,7 @@
 
 /**
  * Class PackagesData returns system packages and available for update versions
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PackagesData
 {

setup/view/magento/setup/readiness-check/progress.phtml

@@ -30,7 +30,7 @@
             <span></span><span></span><span></span><span></span>
             <span></span><span></span><span></span><span></span>
         </span>
-        <span class="message-text">{{wordingOfReadinessCheckAction()}}.</span>
+        <span class="message-text" ng-bind-html="wordingOfReadinessCheckAction()"></span>
     </div>
 
 </div>