Skip to content

Commit 621fe54

Browse files
committed
Fixed minMinionVersion calculations + added doc to compareVersions
Request: MO Change-Id: I9342170a16d3ab173d0c7a3452f24ab9adc9ebb7
1 parent a2020cd commit 621fe54

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

ui/webapp/src/app/modules/core/utils/version.utils.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@ export function convert2String(version: Version): string {
1212

1313
/**
1414
* Compares two versions. Ignores qualifiers.
15+
* @param a the first Version to compare
16+
* @param b the second Version to compare
17+
* @returns a positive number if Version a is newer than Version b, a negative number if Version a is older than Version b, and exactly 0 if they are the same Version
1518
*/
1619
export function compareVersions(a: Version, b: Version): number {
1720
if (a.major !== b.major) {
18-
return a.major - b.major;
21+
return a.major - b.major;
1922
}
2023
if (a.minor !== b.minor) {
21-
return a.minor - b.minor;
24+
return a.minor - b.minor;
2225
}
2326
return a.micro - b.micro;
24-
}
27+
}

ui/webapp/src/app/modules/panels/instances/components/add-instance/add-instance.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ export class AddInstanceComponent implements OnInit, OnDestroy, DirtyableDialog
182182
if (minimumVersion) {
183183
const currentVersion = this.cfg?.config?.version;
184184
if (currentVersion) {
185-
if (compareVersions(minimumVersion, currentVersion) < 0) {
185+
if (compareVersions(currentVersion, minimumVersion) >= 0) {
186186
this.addInstanceButtonDisabledMessage.set(null);
187187
} else {
188188
this.addInstanceButtonDisabledMessage.set(

ui/webapp/src/app/modules/panels/instances/components/instance-settings/product-update/update-action/update-action.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export class UpdateActionComponent implements OnInit, CellComponent<ProductDto,
4949
if (minimumVersion) {
5050
const currentVersion = this.cfg?.config?.version;
5151
if (currentVersion) {
52-
this.hasMinMinionVersion = compareVersions(minimumVersion, currentVersion) < 0;
52+
this.hasMinMinionVersion = compareVersions(currentVersion, minimumVersion) >= 0;
5353
if (!this.hasMinMinionVersion) {
5454
this.installButtonTooltip =
5555
'This product version cannot be applied because it requires a BDeploy version of ' +

ui/webapp/src/app/modules/primary/instances/components/dashboard/dashboard.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
176176
if (minimumVersion) {
177177
const currentVersion = this.cfg?.config?.version;
178178
if (currentVersion) {
179-
if (compareVersions(minimumVersion, currentVersion) < 0) {
179+
if (compareVersions(currentVersion, minimumVersion) >= 0) {
180180
this.hasMinMinionVersion.set(true);
181181
this.installButtonDisabledMessage.set(null);
182182
} else {

0 commit comments

Comments
 (0)