Skip to content

Commit a5cd7c8

Browse files
author
Cari Spruiell
committed
Merge remote-tracking branch 'ogre/MAGETWO-52914-setup-ui-modifications' into pull-request
2 parents a6f0164 + 2a8117c commit a5cd7c8

File tree

4 files changed

+146
-46
lines changed

4 files changed

+146
-46
lines changed

‎setup/pub/magento/setup/select-version.js

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ angular.module('select-version', ['ngStorage'])
1717
$scope.componentsReadyForNext = true;
1818
$scope.componentsProcessed = false;
1919
$scope.componentsProcessError = false;
20+
$scope.showUnstable = false;
2021

2122
$scope.tryAgainEnabled = function() {
2223
return ($scope.upgradeProcessed || $scope.upgradeProcessError)
@@ -28,31 +29,23 @@ angular.module('select-version', ['ngStorage'])
2829
$http.get('index.php/select-version/systemPackage', {'responseType' : 'json'})
2930
.success(function (data) {
3031
if (data.responseType != 'error') {
31-
if (data.packages.length == 1 && data.packages[0].versions.length <=1) {
32+
if (data.packages.length == 1) {
3233
$scope.upgradeProcessError = true;
3334
$scope.upgradeProcessErrorMessage = "You're already using the latest version, there's nothing for us to do.";
3435
} else {
3536
$scope.selectedOption = [];
3637
$scope.versions = [];
37-
for (var i = 0; i < data.packages.length; i++) {
38-
angular.forEach(data.packages[i].versions, function (value, key) {
38+
$scope.data = data;
39+
angular.forEach(data.packages, function (value, key) {
40+
if (value.stable) {
3941
$scope.versions.push({
4042
'versionInfo': angular.toJson({
41-
'package': data.packages[i].package,
42-
'version': value
43-
}), 'version': value
43+
'package': value.package,
44+
'version': value.id
45+
}),
46+
'version': value
4447
});
45-
});
46-
}
47-
48-
$scope.versions = $scope.versions.sort(function (a, b) {
49-
if (a.version.id < b.version.id) {
50-
return 1;
51-
}
52-
if (a.version.id > b.version.id) {
53-
return -1;
5448
}
55-
return 0;
5649
});
5750
$scope.selectedOption = $scope.versions[0].versionInfo;
5851
$scope.upgradeReadyForNext = true;
@@ -160,10 +153,29 @@ angular.module('select-version', ['ngStorage'])
160153
return false;
161154
};
162155

156+
$scope.showUnstableClick = function() {
157+
$scope.upgradeReadyForNext = false;
158+
$scope.selectedOption = [];
159+
$scope.versions = [];
160+
angular.forEach($scope.data.packages, function (value, key) {
161+
if (value.stable || $scope.showUnstable) {
162+
$scope.versions.push({
163+
'versionInfo': angular.toJson({
164+
'package': value.package,
165+
'version': value.id
166+
}),
167+
'version': value
168+
});
169+
}
170+
});
171+
$scope.selectedOption = $scope.versions[0].versionInfo;
172+
$scope.upgradeReadyForNext = true;
173+
}
174+
163175
$scope.update = function() {
164176
var selectedVersionInfo = angular.fromJson($scope.selectedOption);
165177
$scope.packages[0]['name'] = selectedVersionInfo.package;
166-
$scope.packages[0].version = selectedVersionInfo.version.id;
178+
$scope.packages[0].version = selectedVersionInfo.version;
167179
if (angular.equals($scope.updateComponents.no, true)) {
168180
if ($scope.totalForGrid > 0) {
169181
$scope.packages.splice(1, $scope.totalForGrid);

‎setup/src/Magento/Setup/Model/SystemPackage.php

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ public function getPackageVersions()
8787
if (!in_array('magento/product-enterprise-edition', $systemPackages)) {
8888
$result = array_merge($this->getAllowedEnterpriseVersions($currentCE), $result);
8989
}
90+
91+
$result = $this->formatPackages($result);
9092

9193
return $result;
9294
}
@@ -194,6 +196,45 @@ public function sortVersions($enterpriseVersions)
194196
return $enterpriseVersions;
195197
}
196198

199+
/**
200+
* Re-formats packages array to merge packages, sort versions and add technical data
201+
*
202+
* @param array $packages
203+
* @return array
204+
*/
205+
private function formatPackages($packages)
206+
{
207+
208+
$versions = [];
209+
210+
foreach ($packages as $package) {
211+
foreach ($package['versions'] as $version) {
212+
$version['package'] = $package['package'];
213+
214+
if (preg_match('/^[0-9].[0-9].[0-9]$/', $version['id']) || strpos($version['name'], 'current')) {
215+
$version['stable'] = true;
216+
} else {
217+
$version['name'] = $version['name'] . ' (unstable version)';
218+
$version['stable'] = false;
219+
}
220+
221+
$versions[] = $version;
222+
}
223+
}
224+
225+
usort($versions, function ($versionOne, $versionTwo) {
226+
if (version_compare($versionOne['id'], $versionTwo['id'], '==')) {
227+
if ($versionOne['package'] === 'magento/product-community-edition') {
228+
return 1;
229+
}
230+
return 0;
231+
}
232+
return (version_compare($versionOne['id'], $versionTwo['id'], '<')) ? 1 : -1;
233+
});
234+
235+
return $versions;
236+
}
237+
197238
/**
198239
* @param string $currentCE
199240
* @param array $enterpriseVersions

‎setup/src/Magento/Setup/Test/Unit/Model/SystemPackageTest.php

Lines changed: 61 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,60 @@ class SystemPackageTest extends \PHPUnit_Framework_TestCase
4545
*/
4646
private $composer;
4747

48+
/**
49+
* @var array
50+
*/
51+
private $expectedPackages = [
52+
[
53+
'id' => '1.2.0',
54+
'name' => 'Version 1.2.0 EE (latest)',
55+
'package' => 'magento/product-enterprise-edition',
56+
'stable' => true
57+
],
58+
[
59+
'id' => '1.2.0',
60+
'name' => 'Version 1.2.0 CE (latest)',
61+
'package' => 'magento/product-community-edition',
62+
'stable' => true
63+
],
64+
[
65+
'id' => '1.1.0',
66+
'name' => 'Version 1.1.0 EE',
67+
'package' => 'magento/product-enterprise-edition',
68+
'stable' => true
69+
],
70+
[
71+
'id' => '1.1.0',
72+
'name' => 'Version 1.1.0 CE',
73+
'package' => 'magento/product-community-edition',
74+
'stable' => true
75+
],
76+
[
77+
'id' => '1.1.0-RC1',
78+
'name' => 'Version 1.1.0-RC1 EE (unstable version)',
79+
'package' => 'magento/product-enterprise-edition',
80+
'stable' => false
81+
],
82+
[
83+
'id' => '1.1.0-RC1',
84+
'name' => 'Version 1.1.0-RC1 CE (unstable version)',
85+
'package' => 'magento/product-community-edition',
86+
'stable' => false
87+
],
88+
[
89+
'id' => '1.0.0',
90+
'name' => 'Version 1.0.0 EE (current)',
91+
'package' => 'magento/product-enterprise-edition',
92+
'stable' => true
93+
],
94+
[
95+
'id' => '1.0.0',
96+
'name' => 'Version 1.0.0 CE (current)',
97+
'package' => 'magento/product-community-edition',
98+
'stable' => true
99+
],
100+
];
101+
48102
/**
49103
* @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Composer\ComposerInformation
50104
*/
@@ -113,27 +167,6 @@ public function testGetPackageVersions()
113167

114168
$this->systemPackage = new SystemPackage($this->composerAppFactory, $this->composerInformation);
115169

116-
$expected = [
117-
[
118-
'package' => 'magento/product-community-edition',
119-
'versions' =>
120-
[
121-
['id' => '1.2.0', 'name' => 'Version 1.2.0 CE (latest)'],
122-
['id' => '1.1.0', 'name' => 'Version 1.1.0 CE'],
123-
['id' => '1.0.0', 'name' => 'Version 1.0.0 CE (current)']
124-
]
125-
],
126-
[
127-
'package' => 'magento/product-enterprise-edition',
128-
'versions' =>
129-
[
130-
['id' => '1.2.0', 'name' => 'Version 1.2.0 EE (latest)'],
131-
['id' => '1.1.0', 'name' => 'Version 1.1.0 EE'],
132-
['id' => '1.0.0', 'name' => 'Version 1.0.0 EE (current)']
133-
]
134-
]
135-
];
136-
137170
$this->infoCommand->expects($this->at(0))
138171
->method('run')
139172
->with('magento/product-community-edition')
@@ -142,14 +175,14 @@ public function testGetPackageVersions()
142175
'name' => 'magento/product-community-edition',
143176
'description' => 'eCommerce Platform for Growth (Enterprise Edition)',
144177
'keywords' => '',
145-
'versions' => '1.2.0, 1.1.0, * 1.0.0',
178+
'versions' => '1.2.0, 1.1.0, 1.1.0-RC1, * 1.0.0',
146179
'type' => 'metapackage',
147180
'license' => 'OSL-3.0, AFL-3.0',
148181
'source' => '[]',
149182
'names' => 'magento/product-community-edition',
150183
'current_version' => '1.0.0',
151-
'available_versions' => [1 => '1.2.0', 2 => '1.1.0', 3 => '1.0.0'],
152-
'new_versions' => ['1.2.0', '1.1.0']
184+
'available_versions' => [1 => '1.2.0', 2 => '1.1.0', 3 => '1.1.0-RC1', 4 => '1.0.0'],
185+
'new_versions' => ['1.2.0', '1.1.0', '1.1.0-RC1']
153186
]
154187
);
155188

@@ -161,18 +194,17 @@ public function testGetPackageVersions()
161194
'name' => 'magento/product-enterprise-edition',
162195
'description' => 'eCommerce Platform for Growth (Enterprise Edition)',
163196
'keywords' => '',
164-
'versions' => '1.2.0, 1.1.0, * 1.0.0',
197+
'versions' => '1.2.0, 1.1.0, 1.1.0-RC1, * 1.0.0',
165198
'type' => 'metapackage',
166199
'license' => 'OSL-3.0, AFL-3.0',
167200
'source' => '[]',
168201
'names' => 'magento/product-enterprise-edition',
169202
'current_version' => '1.0.0',
170-
'available_versions' => [1 => '1.2.0', 2 => '1.1.0', 3 => '1.0.0'],
171-
'new_versions' => ['1.2.0', '1.1.0']
203+
'available_versions' => [1 => '1.2.0', 2 => '1.1.0', 3 => '1.1.0-RC1', 4 => '1.0.0'],
204+
'new_versions' => ['1.2.0', '1.1.0', '1.1.0-RC1']
172205
]
173206
);
174-
175-
$this->assertEquals($expected, $this->systemPackage->getPackageVersions());
207+
$this->assertEquals($this->expectedPackages, $this->systemPackage->getPackageVersions());
176208
}
177209

178210
/**

‎setup/view/magento/setup/select-version.phtml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,21 @@
5656
</select>
5757
</div>
5858
</div>
59+
<div class="row" ng-show="upgradeProcessed && !upgradeProcessError">
60+
<div class="col-m-3">
61+
<label class="form-label" for="showUnstable">
62+
Show All Versions
63+
</label>
64+
</div>
65+
<div class="col-m-4">
66+
<input
67+
id="showUnstable"
68+
type="checkbox"
69+
ng-model="showUnstable"
70+
ng-change="showUnstableClick()"
71+
>
72+
</div>
73+
</div>
5974
</div>
6075

6176
<div class="row form-row" ng-show="!upgradeProcessError">

0 commit comments

Comments
 (0)