MAGETWO-55252: Stabilization

- Fix bug with localstorage reset

Author: viktym

dev/tests/functional/tests/app/Magento/Setup/Test/Block/Extension/Grid.php

@@ -133,7 +133,7 @@ public function findExtensionOnGrid(Extension $extension)
         $this->_rootElement->waitUntil(
             function () {
                 //TODO: Sleep will be removed after MAGETWO-52137
-                sleep(5);
+                sleep(10);
                 $message = $this->_rootElement->find($this->notFoundMessage)->isVisible();
                 $grid = $this->_rootElement->find($this->dataGrid)->isVisible();
 

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

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

setup/pub/magento/setup/updater-success.js

@@ -5,7 +5,7 @@
 
 'use strict';
 angular.module('updater-success', ['ngStorage'])
-    .controller('updaterSuccessController', ['$scope', '$state', '$localStorage', '$window', function ($scope, $state, $localStorage, $window) {
+    .controller('updaterSuccessController', ['$scope', '$state', '$localStorage', '$window', 'navigationService', function ($scope, $state, $localStorage, $window, navigationService) {
         if ($localStorage.successPageAction) {
             $scope.successPageAction = $localStorage.successPageAction;
             $scope.successPageActionMessage = $scope.successPageAction +
@@ -25,4 +25,8 @@ angular.module('updater-success', ['ngStorage'])
             }
         };
         $localStorage.$reset();
+        $scope.isHiddenSpinner = false;
+        navigationService.load().then(function () {
+            $scope.isHiddenSpinner = true;
+        });
     }]);

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

@@ -64,7 +64,7 @@
 
 <div class="row" ng-show="$root.isMarketplaceAuthorized && extensionsProcessed && total == 0">
     <label class="form-label not-found">
-        <b>We didn't find any extensions to update at this time. Please try later.</b><br/>
+        <b>You haven't purchased any extensions yet. Visit  <a href="https://marketplace.magento.com">Marketplace</a> for purchasing extensions.</b><br/>
     </label>
 </div>
 <div class="admin__data-grid-outer-wrap" ng-show="$root.isMarketplaceAuthorized && extensionsProcessed && total > 0">

setup/view/magento/setup/updater-success.phtml

@@ -26,4 +26,12 @@
         ng-click="back()"
         type="button"
         >Back to Setup Tool</button>
-</div>
+</div>
+<div ng-show="!isHiddenSpinner" class="loading-mask ng-scope" data-role="loader">
+    <div class="popup popup-loading">
+        <div class="popup-inner">
+            <img alt="Loading..." src="<?php echo $this->basePath() ?>/pub/images/loader-1.gif">
+            Please wait...
+        </div>
+    </div>
+</div>