Merge pull request #1199 from fdm-monster/fix/fdmm-3216-software-upgr…

…ade-wrong-latest-downgrade fix: another regression fixed for software upgrade page + release note - 1.5.12
fdm-monster · Apr 18, 2024 · e43e9bd · e43e9bd
2 parents 13a8450 + 5a1364b
commit e43e9bd
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 20 deletions.
diff --git a/RELEASE_NOTES.MD b/RELEASE_NOTES.MD
@@ -1,5 +1,12 @@
 # Client develop
 
+# Client 18/04/2024 1.5.12
+
+Fixes:
+
+- Settings: software upgrade page for client upgrades would not calculate ability to upgrade correctly (again). Now fixed.
+
+
 # Client 18/04/2024 1.5.11
 
 Fixes:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fdm-monster/client",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
   "repository": {

diff --git a/src/components/Settings/SoftwareUpgradeSettings.vue b/src/components/Settings/SoftwareUpgradeSettings.vue
@@ -7,21 +7,21 @@
         <v-list-item>
           <v-list-item-content>
             <v-list-item-title> Current versions in use:</v-list-item-title>
-            <v-list-item-action-text>
-              <strong>Your server's version is:</strong> {{ serverVersion }}
-              <br />
-              <strong>Your client's version is:</strong> {{ version }}
-              <br />
+            <v-list-item-subtitle>
+              Your server's version is: {{ serverVersion }}
+            </v-list-item-subtitle>
+            <v-list-item-subtitle> Your client's version is: {{ version }} </v-list-item-subtitle>
+            <v-list-item-subtitle>
               <div v-if="monsterPiVersion">
                 MonsterPi:
-                <strong> Your MonsterPi version is: </strong>
+                <div>Your MonsterPi version is:</div>
                 {{ monsterPiVersion }}<br />
               </div>
               <div v-else>
-                <strong>MonsterPi:</strong>
+                MonsterPi:
                 <div>No MonsterPi distro was detected.</div>
               </div>
-            </v-list-item-action-text>
+            </v-list-item-subtitle>
           </v-list-item-content>
         </v-list-item>
       </v-list-item-content>
@@ -78,16 +78,8 @@
             <v-radio
               v-for="release in filteredReleases"
               :key="release.tag_name"
-              :disabled="
-                isCurrentRelease(release) ||
-                !isUpgradeOrAllowedDowngrade(release, current) ||
-                isBelowMinimum(release)
-              "
-              :label="`${release.tag_name}${
-                isCurrentRelease(release) ? ', currently installed' : ''
-              }${!isUpgradeOrAllowedDowngrade(release, current) ? ', downgrade not allowed' : ''}${
-                isBelowMinimum(release) ? ', below minimum' : ''
-              }${isVersionUnstable(release) ? ', unstable version' : ''}`"
+              :disabled="isDisabledRelease(release)"
+              :label="calculateLabelDisabledReason(release)"
               :value="release.tag_name"
             >
             </v-radio>
@@ -226,6 +218,30 @@ function isCurrentUnstable() {
   return isVersionUnstable(currentRelease);
 }
 
+function isDisabledRelease(release: IRelease) {
+  return (
+    isCurrentRelease(release) ||
+    !isUpgradeOrAllowedDowngrade(release, current.value) ||
+    isBelowMinimum(release)
+  );
+}
+
+function calculateLabelDisabledReason(release: IRelease) {
+  const prefix = isVersionUnstable(release) ? `${release.tag_name}, unstable` : release.tag_name;
+
+  if (isCurrentRelease(release)) {
+    return `${prefix}, currently installed`;
+  }
+  if (isBelowMinimum(release)) {
+    return `${prefix}, below minimum`;
+  }
+  if (!isUpgradeOrAllowedDowngrade(release, current.value)) {
+    return `${prefix}, downgrade not allowed`;
+  }
+
+  return prefix;
+}
+
 function isVersionUnstable(release?: IRelease) {
   if (release?.tag_name?.length) {
     return (
@@ -250,7 +266,7 @@ function isUpgradeOrAllowedDowngrade(release: IRelease, current?: IRelease) {
 
   return (
     compare(release.tag_name, current.tag_name) !== -1 &&
-    compare(minimum.value!.tag_name, current.tag_name) !== -1
+    compare(release.tag_name, minimum.value!.tag_name) !== -1
   );
 }