From 59733e0bbd5e9de013e29e67d305ba0e6e6a253f Mon Sep 17 00:00:00 2001
From: Robin Munn <rmunn@pobox.com>
Date: Tue, 15 Oct 2024 09:43:11 +0700
Subject: [PATCH] Address review comments

---
 backend/LexBoxApi/GraphQL/ProjectMutations.cs        |  2 --
 backend/LexBoxApi/Services/HgService.cs              | 12 ++----------
 .../components/Projects/FlexModelVersionText.svelte  |  2 +-
 .../project/[project_code]/+page.svelte              |  1 -
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/backend/LexBoxApi/GraphQL/ProjectMutations.cs b/backend/LexBoxApi/GraphQL/ProjectMutations.cs
index 4c39e029b..3ceeeb163 100644
--- a/backend/LexBoxApi/GraphQL/ProjectMutations.cs
+++ b/backend/LexBoxApi/GraphQL/ProjectMutations.cs
@@ -425,8 +425,6 @@ public async Task<IQueryable<Project>> UpdateFLExModelVersion(string code,
     {
         var projectId = await projectService.LookupProjectId(code);
         await permissionService.AssertCanManageProject(projectId);
-        var project = await dbContext.Projects.FindAsync(projectId);
-        NotFoundException.ThrowIfNull(project);
         await projectService.UpdateFLExModelVersion(projectId);
         return dbContext.Projects.Where(p => p.Id == projectId);
     }
diff --git a/backend/LexBoxApi/Services/HgService.cs b/backend/LexBoxApi/Services/HgService.cs
index 7df47938d..6a48f3c16 100644
--- a/backend/LexBoxApi/Services/HgService.cs
+++ b/backend/LexBoxApi/Services/HgService.cs
@@ -271,16 +271,8 @@ private string[] GetWsList(System.Xml.XmlElement root, string tagName)
     {
         var result = await ExecuteHgCommandServerCommand(code, "flexmodelversion", token);
         var text = await result.ReadAsStringAsync(token);
-        try
-        {
-            var json = JsonDocument.Parse(text);
-            return json.RootElement.GetProperty("modelversion").GetInt32();
-        }
-        catch
-        {
-            if (int.TryParse(text, out var num)) return num;
-        }
-        return null;
+        var json = JsonDocument.Parse(text);
+        return json.RootElement.GetProperty("modelversion").GetInt32();
     }
 
     public Task RevertRepo(ProjectCode code, string revHash)
diff --git a/frontend/src/lib/components/Projects/FlexModelVersionText.svelte b/frontend/src/lib/components/Projects/FlexModelVersionText.svelte
index 816e2a9b1..5adde58e2 100644
--- a/frontend/src/lib/components/Projects/FlexModelVersionText.svelte
+++ b/frontend/src/lib/components/Projects/FlexModelVersionText.svelte
@@ -28,4 +28,4 @@
   $: fwModel = versionLookupTable[modelVersion] ?? 'Unknown FieldWorks version';
 </script>
 
-<span class={extraClass}>{fwModel}</span>
+<span title="FLEx data model {modelVersion}" class={extraClass}>{fwModel}</span>
diff --git a/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte b/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte
index be2335f77..a0531bbc1 100644
--- a/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte
+++ b/frontend/src/routes/(authenticated)/project/[project_code]/+page.svelte
@@ -389,7 +389,6 @@
           </AdminContent>
         </DetailItem>
       {/if}
-      <!-- Only show model version to project managers and admins, too technical to show to regular members -->
       {#if project.type === ProjectType.FlEx}
         <DetailItem title={$t('project_page.model_version')}>
           <FlexModelVersionText modelVersion={flexModelVersion ?? 0} />