Merge remote-tracking branch 'falcons/MAGETWO-46316' into MAGETWO-55903

Author: Bohdan Korablov

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

@@ -18,6 +18,11 @@ angular.module('extension-grid', ['ngStorage'])
                 $scope.extensions = data.extensions;
                 $scope.total = data.total;
 
+                if (data.error !== '') {
+                    $scope.syncError = true;
+                    $scope.ErrorMessage = data.error;
+                }
+
                 if (typeof data.lastSyncData.lastSyncDate === 'undefined') {
                     $scope.isOutOfSync = true;
                     $scope.countOfUpdate = 0;

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

@@ -70,16 +70,16 @@ public function extensionsAction()
         $error = '';
         $lastSyncData = [];
         $authDetails = $this->packagesAuth->getAuthJsonData();
+        $extensions = [];
         if ($authDetails) {
             try {
                 $lastSyncData = $this->packagesData->syncPackagesData();
+                $extensions = $this->gridExtension->getList();
             } catch (\Exception $e) {
                 $error = $e->getMessage();
             }
         }
 
-        $extensions = $this->gridExtension->getList();
-
         return new JsonModel(
             [
                 'success' => true,

setup/view/magento/setup/navigation/side-menu.phtml

@@ -33,9 +33,8 @@
                 <span>Home</span>
             </a>
         </li>
-        <li class="item-extension level-0"   ng-class="{_active: $state.current.type === 'extension'
-            || $state.current.type === 'uninstall'
-            || $state.current.type === 'update'}">
+        <li class="item-extension level-0"  ng-class="{_active: $state.current.type === 'extension'
+            || ['install', 'uninstall', 'update'].indexOf($state.current.type) !== -1}">
             <a href="" ui-sref="root.extension-auth">
                 <span>Extension Manager</span>
             </a>