Merge remote-tracking branch 'origin/MAGETWO-44650-sync-issue-with-different-users' into PR_Branch

Author: Ivan Gavryshko

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

@@ -8,6 +8,7 @@ angular.module('component-grid', ['ngStorage'])
     .controller('componentGridController', ['$rootScope', '$scope', '$http', '$localStorage', '$state',
         function ($rootScope, $scope, $http, $localStorage, $state) {
             $rootScope.componentsProcessed = false;
+            $scope.syncError = false;
             $http.get('index.php/componentGrid/components').success(function(data) {
                 $scope.components = data.components;
                 $scope.total = data.total;
@@ -65,7 +66,13 @@ angular.module('component-grid', ['ngStorage'])
             $scope.sync = function() {
                 $scope.isHiddenSpinner = false;
                 $http.get('index.php/componentGrid/sync').success(function(data) {
-                    $scope.lastSyncDate = $scope.convertDate(data.lastSyncData.lastSyncDate);
+                    if(typeof data.lastSyncData.lastSyncDate !== "undefined") {
+                        $scope.lastSyncDate = $scope.convertDate(data.lastSyncData.lastSyncDate);
+                    }
+                    if (data.error !== '') {
+                        $scope.syncError = true;
+                        $scope.ErrorMessage = data.error;
+                    }
                     $scope.availableUpdatePackages = data.lastSyncData.packages;
                     $scope.countOfUpdate = data.lastSyncData.countOfUpdate;
                     $scope.countOfInstall = data.lastSyncData.countOfInstall;

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

@@ -143,21 +143,27 @@ public function componentsAction()
      */
     public function syncAction()
     {
-        $this->updatePackagesCache->syncPackagesForUpdate();
-        $lastSyncData = $this->updatePackagesCache->getPackagesForUpdate();
+        $error = '';
+        try {
+            $this->updatePackagesCache->syncPackagesForUpdate();
+            $lastSyncData = $this->updatePackagesCache->getPackagesForUpdate();
+
+            $this->marketplaceManager->syncPackagesForInstall();
+            $packagesForInstall = $this->marketplaceManager->getPackagesForInstall();
+        } catch (\Exception $e) {
+            $error = $e->getMessage();
+        }
 
-        $this->marketplaceManager->syncPackagesForInstall();
-        $packagesForInstall = $this->marketplaceManager->getPackagesForInstall();
 
         $lastSyncData['countOfInstall'] =
             isset($packagesForInstall['packages']) ? count($packagesForInstall['packages']) : 0;
         $lastSyncData['countOfUpdate'] = isset($lastSyncData['packages']) ? count($lastSyncData['packages']) : 0;
 
-
         return new \Zend\View\Model\JsonModel(
             [
                 'success' => true,
-                'lastSyncData' => $lastSyncData
+                'lastSyncData' => $lastSyncData,
+                'error' => $error
             ]
         );
     }

setup/view/magento/setup/component-grid.phtml

@@ -6,6 +6,11 @@
 ?>
 <h2 class="page-title">{{$state.current.header}}</h2>
 <div ng-controller="authDialogController">
+    <div class="message message-error" ng-show="syncError">
+            <span class="message-text">
+                {{ErrorMessage}}
+            </span>
+    </div>
     <div ng-show="$root.isMarketplaceAuthorized" class="componenet-manager-wrap">
         <div class="component-manager-title">
             Magento Marketplace Account