From 02900dac3deadc3acdc8be576c086e8123ba5eaa Mon Sep 17 00:00:00 2001
From: circlesabound <circlesabound@users.noreply.github.com>
Date: Tue, 9 Apr 2024 10:23:26 +1000
Subject: [PATCH] Fix version sort for TBA mod, fix bad selected version when
 adding

Address #5
---
 web/src/app/mods/mod-list/mod-list.component.html           | 6 +++---
 web/src/app/mods/mod-list/mod-list.component.ts             | 2 +-
 .../app/mods/mod-list/mod-object/mod-object.component.html  | 4 ++--
 .../app/mods/mod-list/mod-object/mod-object.component.ts    | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/src/app/mods/mod-list/mod-list.component.html b/web/src/app/mods/mod-list/mod-list.component.html
index f4a94c3..ad6cea2 100644
--- a/web/src/app/mods/mod-list/mod-list.component.html
+++ b/web/src/app/mods/mod-list/mod-list.component.html
@@ -18,6 +18,9 @@ <h1 class="title is-1">Mod list</h1>
         <th>Version</th>
       </tr>
     </thead>
+    <tbody>
+      <tr *ngFor="let modInfo of modInfoList; let i = index" app-mod-object [(modInfo)]="modInfoList[i]" (removeModInfo)="removeMod($event)"></tr>
+    </tbody>
     <tfoot>
       <tr>
         <td>
@@ -40,9 +43,6 @@ <h1 class="title is-1">Mod list</h1>
         </td>
       </tr>
     </tfoot>
-    <tbody>
-      <tr *ngFor="let modInfo of modInfoList; let i = index" app-mod-object [(modInfo)]="modInfoList[i]" (removeModInfo)="removeMod($event)"></tr>
-    </tbody>
   </table>
 
   <button id="save-button" class="button is-success" (click)="pushModList()" [ngClass]="{'is-loading': saveButtonLoading}">
diff --git a/web/src/app/mods/mod-list/mod-list.component.ts b/web/src/app/mods/mod-list/mod-list.component.ts
index c388955..b6e5091 100644
--- a/web/src/app/mods/mod-list/mod-list.component.ts
+++ b/web/src/app/mods/mod-list/mod-list.component.ts
@@ -182,7 +182,7 @@ export class ModListComponent implements OnInit {
         return of(ret);
       }),
       map(infoShort => {
-        const versions = infoShort.releases.map(r => r.version).sort().reverse();
+        const versions = infoShort.releases?.map(r => r.version).sort(compareVersions).reverse();
         const selectedVersion = versions.length === 0 ? '' : versions[0];
         const ret: ModInfo = {
           name: infoShort.name,
diff --git a/web/src/app/mods/mod-list/mod-object/mod-object.component.html b/web/src/app/mods/mod-list/mod-object/mod-object.component.html
index a2e4860..ee6b032 100644
--- a/web/src/app/mods/mod-list/mod-object/mod-object.component.html
+++ b/web/src/app/mods/mod-list/mod-object/mod-object.component.html
@@ -9,8 +9,8 @@
 </td>
 <td>
   <div class="select is-small" style="min-width: 50%;">
-    <select style="min-width: 100%;">
-      <option class="dropdown-item" *ngFor="let version of modInfo.versions" (click)="setSelectedVersion(version)">
+    <select style="min-width: 100%;" [(ngModel)]="modInfo.selectedVersion">
+      <option class="dropdown-item" *ngFor="let version of modInfo.versions" [ngValue]="version" (click)="setSelectedVersion(version)">
         {{version}}
       </option>
     </select>
diff --git a/web/src/app/mods/mod-list/mod-object/mod-object.component.ts b/web/src/app/mods/mod-list/mod-object/mod-object.component.ts
index d1da52d..f7f802f 100644
--- a/web/src/app/mods/mod-list/mod-object/mod-object.component.ts
+++ b/web/src/app/mods/mod-list/mod-object/mod-object.component.ts
@@ -28,6 +28,7 @@ export class ModObjectComponent implements OnInit {
     this.removeModInfo.emit(this.modInfo);
   }
 
+  // TODO possibly not needed anymore with ngModel bind, need to test
   setSelectedVersion(version: string): void {
     this.modInfo.selectedVersion = version;
     this.modInfoChange.emit(this.modInfo);