Merge remote-tracking branch 'origin/MAGETWO-51505-component-manager-workflow' into PR_Branch

Author: monkeysee

dev/tests/integration/testsuite/Magento/Setup/Model/UpdatePackagesCacheTest.php

@@ -41,6 +41,7 @@ angular.module('system-config', ['ngStorage'])
                 $http.post('index.php/marketplace/save-auth-json', $scope.user)
                     .success(function (data) {
                         $scope.saveAuthJson.result = data;
+                        $scope.logout = false;
                         if ($scope.saveAuthJson.result.success) {
                             $scope.logout = false;
                             $localStorage.isMarketplaceAuthorized = true;

setup/pub/magento/setup/system-config.js

@@ -6,11 +6,12 @@
 
 namespace Magento\Setup\Controller;
 
-use Magento\Setup\Model\DateTime\TimezoneProvider;
+use Magento\Setup\Model\ObjectManagerProvider;
+use Magento\Setup\Model\PackagesAuth;
+use Magento\Setup\Model\PackagesData;
 
 /**
  * Controller for component grid tasks
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ComponentGrid extends \Zend\Mvc\Controller\AbstractActionController
 {
@@ -27,14 +28,9 @@ class ComponentGrid extends \Zend\Mvc\Controller\AbstractActionController
     private $packageInfo;
 
     /**
-     * @var \Magento\Setup\Model\MarketplaceManager
+     * @var ObjectManagerProvider
      */
-    private $marketplaceManager;
-
-    /**
-     * @var \Magento\Framework\Module\ModuleList
-     */
-    private $enabledModuleList;
+    private $objectManagerProvider;
 
     /**
      * Full Module info
@@ -44,37 +40,31 @@ class ComponentGrid extends \Zend\Mvc\Controller\AbstractActionController
     private $fullModuleList;
 
     /**
-     * @var \Magento\Setup\Model\UpdatePackagesCache
+     * @var PackagesData
      */
-    private $updatePackagesCache;
+    private $packagesData;
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     * @var PackagesAuth
      */
-    private $timezone;
+    private $packagesAuth;
 
     /**
      * @param \Magento\Framework\Composer\ComposerInformation $composerInformation
      * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
-     * @param \Magento\Setup\Model\UpdatePackagesCache $updatePackagesCache
-     * @param \Magento\Setup\Model\MarketplaceManager $marketplaceManager
-     * @param TimezoneProvider $tzProvider
+     * @param PackagesData $packagesData
+     * @param PackagesAuth $packagesAuth
      */
     public function __construct(
         \Magento\Framework\Composer\ComposerInformation $composerInformation,
         \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider,
-        \Magento\Setup\Model\UpdatePackagesCache $updatePackagesCache,
-        \Magento\Setup\Model\MarketplaceManager $marketplaceManager,
-        TimezoneProvider $tzProvider
+        \Magento\Setup\Model\PackagesData $packagesData,
+        \Magento\Setup\Model\PackagesAuth $packagesAuth
     ) {
         $this->composerInformation = $composerInformation;
-        $objectManager = $objectManagerProvider->get();
-        $this->enabledModuleList = $objectManager->get('Magento\Framework\Module\ModuleList');
-        $this->fullModuleList = $objectManager->get('Magento\Framework\Module\FullModuleList');
-        $this->packageInfo = $objectManager->get('Magento\Framework\Module\PackageInfoFactory')->create();
-        $this->marketplaceManager = $marketplaceManager;
-        $this->updatePackagesCache = $updatePackagesCache;
-        $this->timezone = $tzProvider->get();
+        $this->objectManagerProvider = $objectManagerProvider;
+        $this->packagesData = $packagesData;
+        $this->packagesAuth = $packagesAuth;
     }
 
     /**
@@ -94,11 +84,19 @@ public function indexAction()
      *
      * @return \Zend\View\Model\JsonModel
      * @throws \RuntimeException
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function componentsAction()
     {
-        $lastSyncData = $this->updatePackagesCache->getPackagesForUpdate();
+        $objectManager = $this->objectManagerProvider->get();
+        $enabledModuleList = $objectManager->get('Magento\Framework\Module\ModuleList');
+        $this->fullModuleList = $objectManager->get('Magento\Framework\Module\FullModuleList');
+        $this->packageInfo = $objectManager->get('Magento\Framework\Module\PackageInfoFactory')->create();
+
+        $lastSyncData = [];
+        $authDetails = $this->packagesAuth->getAuthJsonData();
+        if ($authDetails) {
+            $lastSyncData = $this->packagesData->syncPackagesData();
+        }
         $components = $this->composerInformation->getInstalledMagentoPackages();
         $allModules = $this->getAllModules();
         $components = array_replace_recursive($components, $allModules);
@@ -121,7 +119,7 @@ public function componentsAction()
             }
             if ($component['type'] === \Magento\Framework\Composer\ComposerInformation::MODULE_PACKAGE_TYPE) {
                 $components[$component['name']]['enable'] =
-                    $this->enabledModuleList->has($components[$component['name']]['moduleName']);
+                    $enabledModuleList->has($components[$component['name']]['moduleName']);
                 $components[$component['name']]['disable'] = !$components[$component['name']]['enable'];
             } else {
                 $components[$component['name']]['enable'] = false;
@@ -131,9 +129,6 @@ public function componentsAction()
             $components[$component['name']]['vendor'] = $componentNameParts[0];
         }
 
-        $packagesForInstall = $this->marketplaceManager->getPackagesForInstall();
-        $lastSyncData = $this->formatLastSyncData($packagesForInstall, $lastSyncData);
-
         return new \Zend\View\Model\JsonModel(
             [
                 'success' => true,
@@ -152,15 +147,9 @@ public function componentsAction()
     public function syncAction()
     {
         $error = '';
-        $packagesForInstall = [];
         $lastSyncData = [];
         try {
-            $this->updatePackagesCache->syncPackagesForUpdate();
-            $lastSyncData = $this->updatePackagesCache->getPackagesForUpdate();
-
-            $this->marketplaceManager->syncPackagesForInstall();
-            $packagesForInstall = $this->marketplaceManager->getPackagesForInstall();
-            $lastSyncData = $this->formatLastSyncData($packagesForInstall, $lastSyncData);
+            $lastSyncData = $this->packagesData->syncPackagesData();
         } catch (\Exception $e) {
             $error = $e->getMessage();
         }
@@ -190,44 +179,4 @@ private function getAllModules()
         }
         return $modules;
     }
-
-    /**
-     * Format the lastSyncData for use on frontend
-     *
-     * @param array $packagesForInstall
-     * @param array $lastSyncData
-     * @return mixed
-     */
-    private function formatLastSyncData($packagesForInstall, $lastSyncData)
-    {
-        $lastSyncData['countOfInstall']
-            = isset($packagesForInstall['packages']) ? count($packagesForInstall['packages']) : 0;
-        $lastSyncData['countOfUpdate'] = isset($lastSyncData['packages']) ? count($lastSyncData['packages']) : 0;
-        if (isset($lastSyncData['lastSyncDate'])) {
-            $lastSyncData['lastSyncDate'] = $this->formatSyncDate($lastSyncData['lastSyncDate']);
-        }
-        return $lastSyncData;
-    }
-
-    /**
-     * Format a UTC timestamp (seconds since epoch) to structure expected by frontend
-     *
-     * @param string $syncDate seconds since epoch
-     * @return array
-     */
-    private function formatSyncDate($syncDate)
-    {
-        return [
-            'date' => $this->timezone->formatDateTime(
-                new \DateTime('@'.$syncDate),
-                \IntlDateFormatter::MEDIUM,
-                \IntlDateFormatter::NONE
-            ),
-            'time' => $this->timezone->formatDateTime(
-                new \DateTime('@'.$syncDate),
-                \IntlDateFormatter::NONE,
-                \IntlDateFormatter::MEDIUM
-            ),
-        ];
-    }
 }

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

@@ -9,24 +9,24 @@
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\JsonModel;
 use Zend\View\Model\ViewModel;
-use Magento\Setup\Model\MarketplaceManager;
+use Magento\Setup\Model\PackagesData;
 
 /**
  * Controller for extensions grid tasks
  */
 class InstallExtensionGrid extends AbstractActionController
 {
     /**
-     * @var MarketplaceManager
+     * @var PackagesData
      */
-    private $marketplaceManager;
+    private $packagesData;
 
     /**
-     * @param MarketplaceManager $marketplaceManager
+     * @param PackagesData $packagesData
      */
-    public function __construct(MarketplaceManager $marketplaceManager)
+    public function __construct(PackagesData $packagesData)
     {
-        $this->marketplaceManager = $marketplaceManager;
+        $this->packagesData = $packagesData;
     }
 
     /**
@@ -48,7 +48,7 @@ public function indexAction()
      */
     public function extensionsAction()
     {
-        $extensions = $this->getMarketplaceManager()->getPackagesForInstall();
+        $extensions = $this->packagesData->getPackagesForInstall();
         $packages = isset($extensions['packages']) ? $extensions['packages'] : [];
         return new JsonModel(
             [
@@ -58,13 +58,4 @@ public function extensionsAction()
             ]
         );
     }
-
-    /**
-     * @return MarketplaceManager
-     */
-
-    public function getMarketplaceManager()
-    {
-        return $this->marketplaceManager;
-    }
 }