From daaac0c62b4c298437c7f952c98dbd9fe4ae9ef5 Mon Sep 17 00:00:00 2001
From: Kevin Hahn <kevin_hahn@sil.org>
Date: Mon, 27 Jan 2025 13:42:45 +0700
Subject: [PATCH 1/6] add a writing system editor

---
 .../FwLite/MiniLcm/Models/WritingSystem.cs    |  5 +-
 .../viewer/src/lib/layout/EntryList.svelte    |  6 ++
 .../src/lib/services/service-provider.ts      |  4 ++
 frontend/viewer/src/lib/utils.ts              | 16 +++++-
 .../writing-system/WritingSystemDialog.svelte | 56 +++++++++++++++++++
 .../writing-system/WritingSystemEditor.svelte | 42 ++++++++++++++
 6 files changed, 127 insertions(+), 2 deletions(-)
 create mode 100644 frontend/viewer/src/lib/writing-system/WritingSystemDialog.svelte
 create mode 100644 frontend/viewer/src/lib/writing-system/WritingSystemEditor.svelte

diff --git a/backend/FwLite/MiniLcm/Models/WritingSystem.cs b/backend/FwLite/MiniLcm/Models/WritingSystem.cs
index e23627cd7..2684b1dc9 100644
--- a/backend/FwLite/MiniLcm/Models/WritingSystem.cs
+++ b/backend/FwLite/MiniLcm/Models/WritingSystem.cs
@@ -1,4 +1,6 @@
-namespace MiniLcm.Models;
+using System.Text.Json.Serialization;
+
+namespace MiniLcm.Models;
 
 public record WritingSystem: IObjectWithId
 {
@@ -49,6 +51,7 @@ public record WritingSystems
     public WritingSystem[] Vernacular { get; set; } = [];
 }
 
+[JsonConverter(typeof(JsonStringEnumConverter))]
 public enum WritingSystemType
 {
     Vernacular = 0,
diff --git a/frontend/viewer/src/lib/layout/EntryList.svelte b/frontend/viewer/src/lib/layout/EntryList.svelte
index 360a7ca0b..0a46a09c7 100644
--- a/frontend/viewer/src/lib/layout/EntryList.svelte
+++ b/frontend/viewer/src/lib/layout/EntryList.svelte
@@ -9,6 +9,8 @@
   import {useCurrentView} from '$lib/services/view-service';
   import {fieldName} from '$lib/i18n';
   import {useWritingSystemService} from '$lib/writing-system-service';
+  import WritingSystemDialog from '$lib/writing-system/WritingSystemDialog.svelte';
+  import DevContent from '$lib/layout/DevContent.svelte';
 
   const dispatch = createEventDispatcher<{
     entrySelected: IEntry;
@@ -81,6 +83,10 @@
       rounded
       on:click={() => dictionaryMode = !dictionaryMode}>
     </Button>
+<!--    todo move this-->
+    <DevContent>
+      <WritingSystemDialog/>
+    </DevContent>
     <div class="hidden lg-view:contents">
       <Button icon={expand ? mdiArrowCollapseLeft : mdiArrowExpandRight} variant="outline" iconOnly
         class="text-field-sibling-button"
diff --git a/frontend/viewer/src/lib/services/service-provider.ts b/frontend/viewer/src/lib/services/service-provider.ts
index 331dc8e6c..336c7ee6d 100644
--- a/frontend/viewer/src/lib/services/service-provider.ts
+++ b/frontend/viewer/src/lib/services/service-provider.ts
@@ -72,6 +72,10 @@ export function useLexboxApi(): IMiniLcmJsInvokable {
   return window.lexbox.ServiceProvider.getService(DotnetService.MiniLcmApi);
 }
 
+export function useMiniLcmApi(): IMiniLcmJsInvokable {
+  return window.lexbox.ServiceProvider.getService(DotnetService.MiniLcmApi);
+}
+
 export function useProjectsService(): ICombinedProjectsService {
   return window.lexbox.ServiceProvider.getService(DotnetService.CombinedProjectsService);
 }
diff --git a/frontend/viewer/src/lib/utils.ts b/frontend/viewer/src/lib/utils.ts
index 12292f698..20db9b3c1 100644
--- a/frontend/viewer/src/lib/utils.ts
+++ b/frontend/viewer/src/lib/utils.ts
@@ -1,4 +1,4 @@
-import type {IEntry, IExampleSentence, ISense} from '$lib/dotnet-types';
+import type {IEntry, IExampleSentence, ISense, IWritingSystem, WritingSystemType} from '$lib/dotnet-types';
 
 export function randomId(): string {
   return crypto.randomUUID();
@@ -48,3 +48,17 @@ export function defaultExampleSentence(senseId: string): IExampleSentence {
     reference: '',
   };
 }
+
+export function defaultWritingSystem(type: WritingSystemType): IWritingSystem {
+  return {
+    id: randomId(),
+    wsId: 'en',
+    name: 'English',
+    abbreviation: 'en',
+    font: 'Arial',
+    exemplars: [],
+    order: 0,
+    deletedAt: undefined,
+    type
+  };
+}
diff --git a/frontend/viewer/src/lib/writing-system/WritingSystemDialog.svelte b/frontend/viewer/src/lib/writing-system/WritingSystemDialog.svelte
new file mode 100644
index 000000000..544ed57f5
--- /dev/null
+++ b/frontend/viewer/src/lib/writing-system/WritingSystemDialog.svelte
@@ -0,0 +1,56 @@
+<script lang="ts">
+  import {Button, Dialog, SelectField} from 'svelte-ux';
+  import WritingSystemEditor from '$lib/writing-system/WritingSystemEditor.svelte';
+  import {useWritingSystemService} from '$lib/writing-system-service';
+  import {type IWritingSystem, WritingSystemType} from '$lib/dotnet-types';
+  import {defaultWritingSystem} from '$lib/utils';
+
+  let open = false;
+  let loading = false;
+  const writingSystemService = useWritingSystemService();
+  let vernacular = writingSystemService.vernacular;
+  let analysis = writingSystemService.analysis;
+  let options: Array<{ value: IWritingSystem, label: string, group: 'Vernacular' | 'Analysis' }> = [];
+  let newVernacular = defaultWritingSystem(WritingSystemType.Vernacular);
+  let newAnalysis = defaultWritingSystem(WritingSystemType.Analysis);
+  $: options = [
+    ...vernacular.map(ws => mapOption(ws)),
+    {value: newVernacular, label: 'New Vernacular Writing System', group: 'Vernacular'},
+    ...analysis.map(ws => mapOption(ws)),
+    {value: newAnalysis, label: 'New Analysis Writing System', group: 'Analysis'},
+  ];
+
+  function mapOption(ws: IWritingSystem): {
+    value: IWritingSystem,
+    label: string,
+    group: 'Vernacular' | 'Analysis'
+  } {
+    return {value: ws, label: `${ws.name} (${ws.wsId})`, group: ws.type === WritingSystemType.Vernacular ? 'Vernacular' : 'Analysis'};
+  }
+
+  let selectedOption: IWritingSystem = vernacular[0] ?? analysis[0];
+
+  function onCreate(_writingSystem: IWritingSystem) {
+    //todo need a better way to invalidate the writing system service
+    location.reload();
+  }
+  function onChange(_writingSystem: IWritingSystem) {
+    //todo need a better way to invalidate the writing system service
+    location.reload();
+  }
+</script>
+<Button rounded variant="outline" on:click={() => open = true}>
+  Edit WS
+</Button>
+<Dialog bind:open={open} {loading} persistent={loading} style="height: auto">
+  <div slot="title">Edit Writing Systems</div>
+  <SelectField label="Writing System" bind:value={selectedOption} {options} clearable={false}/>
+  <WritingSystemEditor
+    writingSystem={selectedOption}
+    newWs={selectedOption === newVernacular || selectedOption === newAnalysis}
+    on:create={(e) => onCreate(e.detail.writingSystem)}
+  on:change={(e) => onChange(e.detail.writingSystem)}/>
+  <div slot="actions">
+    <Button on:click={() => open = false}>Close</Button>
+  </div>
+</Dialog>
diff --git a/frontend/viewer/src/lib/writing-system/WritingSystemEditor.svelte b/frontend/viewer/src/lib/writing-system/WritingSystemEditor.svelte
new file mode 100644
index 000000000..32f2c0d1d
--- /dev/null
+++ b/frontend/viewer/src/lib/writing-system/WritingSystemEditor.svelte
@@ -0,0 +1,42 @@
+<script lang="ts">
+    import type {IWritingSystem} from '$lib/dotnet-types';
+    import {Button} from 'svelte-ux';
+    import CrdtTextField from '$lib/entry-editor/inputs/CrdtTextField.svelte';
+    import {useMiniLcmApi} from '$lib/services/service-provider';
+    import {createEventDispatcher} from 'svelte';
+
+    const dispatch = createEventDispatcher<{
+        change: { writingSystem: IWritingSystem },
+        create: { writingSystem: IWritingSystem }
+    }>();
+    const miniLcmApi = useMiniLcmApi();
+    export let writingSystem: IWritingSystem;
+    $: initialWs = JSON.parse(JSON.stringify(writingSystem));
+    function updateInitialWs() {
+        // eslint-disable-next-line svelte/no-reactive-reassign
+        initialWs = JSON.parse(JSON.stringify(writingSystem));
+    }
+    export let newWs: boolean = false;
+    async function onChange() {
+        if (newWs) return;
+        await miniLcmApi.updateWritingSystem(initialWs, writingSystem);
+        updateInitialWs();
+        dispatch('change', {writingSystem});
+    }
+
+    async function createNew() {
+        await miniLcmApi.createWritingSystem(writingSystem.type, writingSystem);
+        dispatch('create', {writingSystem});
+    }
+</script>
+<form class="flex flex-col gap-2 p-2">
+    <CrdtTextField label="Language Code" readonly={!newWs} on:change={() => onChange()} bind:value={writingSystem.wsId}/>
+    <CrdtTextField label="Name" on:change={() => onChange()} bind:value={writingSystem.name}/>
+    <CrdtTextField label="Abbreviation" on:change={() => onChange()} bind:value={writingSystem.abbreviation}/>
+    <CrdtTextField label="Font" on:change={() => onChange()} bind:value={writingSystem.font}/>
+    {#if newWs}
+        <Button variant="outline" on:click={createNew}>Create new Writing System</Button>
+    {:else}
+        <span>Changes are saved automatically</span>
+    {/if}
+</form>

From 486e7d9c6403b6078ca065fdd82439edf0f48a73 Mon Sep 17 00:00:00 2001
From: Kevin Hahn <kevin_hahn@sil.org>
Date: Mon, 27 Jan 2025 14:07:59 +0700
Subject: [PATCH 2/6] fix update writing system api in fwdata bridge so that it
 works, write a test for updating the abbreviation

---
 .../Api/FwDataMiniLcmApi.cs                   | 13 ++++--
 .../UpdateProxy/UpdateWritingSystemProxy.cs   | 45 ++++++-------------
 .../MiniLcm.Tests/WritingSystemTestsBase.cs   | 11 +++++
 .../FwLite/MiniLcm/Models/WritingSystem.cs    |  4 +-
 .../writing-system/WritingSystemEditor.svelte |  3 +-
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs b/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs
index 788bad33b..a701101bb 100644
--- a/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs
+++ b/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs
@@ -136,9 +136,15 @@ private WritingSystem FromLcmWritingSystem(CoreWritingSystemDefinition ws, int i
         };
     }
 
-    public Task<WritingSystem> GetWritingSystem(WritingSystemId id, WritingSystemType type)
+    public async Task<WritingSystem> GetWritingSystem(WritingSystemId id, WritingSystemType type)
     {
-        throw new NotImplementedException();
+        var writingSystems = await GetWritingSystems();
+        return type switch
+        {
+            WritingSystemType.Vernacular => writingSystems.Vernacular.FirstOrDefault(ws => ws.WsId == id),
+            WritingSystemType.Analysis => writingSystems.Analysis.FirstOrDefault(ws => ws.WsId == id),
+            _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
+        } ?? throw new NullReferenceException($"unable to find writing system with id {id}");
     }
 
     internal void CompleteExemplars(WritingSystems writingSystems)
@@ -208,13 +214,12 @@ await Cache.DoUsingNewOrCurrentUOW("Update WritingSystem",
             "Revert WritingSystem",
             async () =>
             {
-                var updateProxy = new UpdateWritingSystemProxy(lcmWritingSystem, this)
+                var updateProxy = new UpdateWritingSystemProxy(lcmWritingSystem)
                 {
                     Id = Guid.Empty,
                     Type = type,
                 };
                 update.Apply(updateProxy);
-                updateProxy.CommitUpdate(Cache);
             });
         return await GetWritingSystem(id, type);
     }
diff --git a/backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateWritingSystemProxy.cs b/backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateWritingSystemProxy.cs
index eaf849fcb..3baf370de 100644
--- a/backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateWritingSystemProxy.cs
+++ b/backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateWritingSystemProxy.cs
@@ -9,60 +9,43 @@ namespace FwDataMiniLcmBridge.Api.UpdateProxy;
 
 public record UpdateWritingSystemProxy : WritingSystem
 {
-    private readonly CoreWritingSystemDefinition _origLcmWritingSystem;
-    private readonly CoreWritingSystemDefinition _workingLcmWritingSystem;
-    private readonly FwDataMiniLcmApi _lexboxLcmApi;
+    private readonly CoreWritingSystemDefinition _lcmWritingSystem;
 
     [SetsRequiredMembers]
-    public UpdateWritingSystemProxy(CoreWritingSystemDefinition lcmWritingSystem, FwDataMiniLcmApi lexboxLcmApi)
+    public UpdateWritingSystemProxy(CoreWritingSystemDefinition lcmWritingSystem)
     {
-        _origLcmWritingSystem = lcmWritingSystem;
-        _workingLcmWritingSystem = new CoreWritingSystemDefinition(lcmWritingSystem, cloneId: true);
-        base.Abbreviation = Abbreviation = _origLcmWritingSystem.Abbreviation ?? "";
-        base.Name = Name = _origLcmWritingSystem.LanguageName ?? "";
-        base.Font = Font = _origLcmWritingSystem.DefaultFontName ?? "";
-        _lexboxLcmApi = lexboxLcmApi;
-    }
-
-    public void CommitUpdate(LcmCache cache)
-    {
-        if (_workingLcmWritingSystem.Id == _origLcmWritingSystem.Id)
-        {
-            cache.ServiceLocator.WritingSystemManager.Set(_workingLcmWritingSystem);
-        }
-        else
-        {
-            // Changing the ID of a writing system requires LCM to do a lot of work, so only go through that process if absolutely required
-            WritingSystemServices.MergeWritingSystems(cache, _workingLcmWritingSystem, _origLcmWritingSystem);
-        }
+        _lcmWritingSystem = lcmWritingSystem;
+        base.Abbreviation = Abbreviation = _lcmWritingSystem.Abbreviation ?? "";
+        base.Name = Name = _lcmWritingSystem.LanguageName ?? "";
+        base.Font = Font = _lcmWritingSystem.DefaultFontName ?? "";
     }
 
     public override required WritingSystemId WsId
     {
-        get => _workingLcmWritingSystem.Id;
-        set => _workingLcmWritingSystem.Id = value;
+        get => _lcmWritingSystem.Id;
+        set => throw new NotSupportedException("Changing the ID of a writing system is not supported");
     }
 
     public override required string Name
     {
-        get => _workingLcmWritingSystem.LanguageName;
+        get => _lcmWritingSystem.LanguageName;
         set { } // Silently do nothing; name should be derived from WsId at all times, so if the name should change then so should the WsId
     }
 
     public override required string Abbreviation
     {
-        get => _workingLcmWritingSystem.Abbreviation;
-        set => _workingLcmWritingSystem.Abbreviation = value;
+        get => _lcmWritingSystem.Abbreviation;
+        set => _lcmWritingSystem.Abbreviation = value;
     }
 
     public override required string Font
     {
-        get => _workingLcmWritingSystem.DefaultFontName;
+        get => _lcmWritingSystem.DefaultFontName;
         set
         {
-            if (value != _workingLcmWritingSystem.DefaultFontName)
+            if (value != _lcmWritingSystem.DefaultFontName)
             {
-                _workingLcmWritingSystem.DefaultFont = new FontDefinition(value);
+                _lcmWritingSystem.DefaultFont = new FontDefinition(value);
             }
         }
     }
diff --git a/backend/FwLite/MiniLcm.Tests/WritingSystemTestsBase.cs b/backend/FwLite/MiniLcm.Tests/WritingSystemTestsBase.cs
index 3d740d65a..99534c47f 100644
--- a/backend/FwLite/MiniLcm.Tests/WritingSystemTestsBase.cs
+++ b/backend/FwLite/MiniLcm.Tests/WritingSystemTestsBase.cs
@@ -64,4 +64,15 @@ await Api.CreateWritingSystem(WritingSystemType.Vernacular,
             });
         await action.Should().ThrowAsync<DuplicateObjectException>();
     }
+
+    [Fact]
+    public async Task UpdateExistingWritingSystem_Works()
+    {
+        var writingSystems = await Api.GetWritingSystems();
+        var writingSystem = writingSystems.Vernacular.First();
+        var original = writingSystem.Copy();
+        writingSystem.Abbreviation = "New Abbreviation";
+        var updatedWritingSystem = await Api.UpdateWritingSystem(original, writingSystem);
+        updatedWritingSystem.Abbreviation.Should().Be("New Abbreviation");
+    }
 }
diff --git a/backend/FwLite/MiniLcm/Models/WritingSystem.cs b/backend/FwLite/MiniLcm/Models/WritingSystem.cs
index 2684b1dc9..93224e74e 100644
--- a/backend/FwLite/MiniLcm/Models/WritingSystem.cs
+++ b/backend/FwLite/MiniLcm/Models/WritingSystem.cs
@@ -2,7 +2,7 @@
 
 namespace MiniLcm.Models;
 
-public record WritingSystem: IObjectWithId
+public record WritingSystem: IObjectWithId<WritingSystem>
 {
     public required Guid Id { get; set; }
     public virtual required WritingSystemId WsId { get; set; }
@@ -28,7 +28,7 @@ public void RemoveReference(Guid id, DateTimeOffset time)
     {
     }
 
-    public IObjectWithId Copy()
+    public WritingSystem Copy()
     {
         return new WritingSystem
         {
diff --git a/frontend/viewer/src/lib/writing-system/WritingSystemEditor.svelte b/frontend/viewer/src/lib/writing-system/WritingSystemEditor.svelte
index 32f2c0d1d..71fe031e6 100644
--- a/frontend/viewer/src/lib/writing-system/WritingSystemEditor.svelte
+++ b/frontend/viewer/src/lib/writing-system/WritingSystemEditor.svelte
@@ -31,7 +31,8 @@
 </script>
 <form class="flex flex-col gap-2 p-2">
     <CrdtTextField label="Language Code" readonly={!newWs} on:change={() => onChange()} bind:value={writingSystem.wsId}/>
-    <CrdtTextField label="Name" on:change={() => onChange()} bind:value={writingSystem.name}/>
+<!--    todo changing the name for FieldWorks writing systems is not yet supported-->
+    <CrdtTextField label="Name" readonly={!newWs} on:change={() => onChange()} bind:value={writingSystem.name}/>
     <CrdtTextField label="Abbreviation" on:change={() => onChange()} bind:value={writingSystem.abbreviation}/>
     <CrdtTextField label="Font" on:change={() => onChange()} bind:value={writingSystem.font}/>
     {#if newWs}

From 69c06704e5228228dffbfc996426aa343942e4c7 Mon Sep 17 00:00:00 2001
From: Kevin Hahn <kevin_hahn@sil.org>
Date: Mon, 27 Jan 2025 14:11:48 +0700
Subject: [PATCH 3/6] add a second vernacular and analysis writing system to
 example projects

---
 backend/FwLite/LcmCrdt/CrdtProjectsService.cs | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/backend/FwLite/LcmCrdt/CrdtProjectsService.cs b/backend/FwLite/LcmCrdt/CrdtProjectsService.cs
index 0533e66f2..e2b1c3c89 100644
--- a/backend/FwLite/LcmCrdt/CrdtProjectsService.cs
+++ b/backend/FwLite/LcmCrdt/CrdtProjectsService.cs
@@ -150,6 +150,18 @@ await lexboxApi.CreateEntry(new()
             ]
         });
 
+        await lexboxApi.CreateWritingSystem(WritingSystemType.Vernacular,
+            new()
+            {
+                Id = Guid.NewGuid(),
+                Type = WritingSystemType.Vernacular,
+                WsId = "de",
+                Name = "German",
+                Abbreviation = "de",
+                Font = "Arial",
+                Exemplars = WritingSystem.LatinExemplars
+            });
+
         await lexboxApi.CreateWritingSystem(WritingSystemType.Vernacular,
             new()
             {
@@ -173,5 +185,16 @@ await lexboxApi.CreateWritingSystem(WritingSystemType.Analysis,
                 Font = "Arial",
                 Exemplars = WritingSystem.LatinExemplars
             });
+        await lexboxApi.CreateWritingSystem(WritingSystemType.Analysis,
+            new()
+            {
+                Id = Guid.NewGuid(),
+                Type = WritingSystemType.Analysis,
+                WsId = "fr",
+                Name = "French",
+                Abbreviation = "fr",
+                Font = "Arial",
+                Exemplars = WritingSystem.LatinExemplars
+            });
     }
 }

From 8daf2a0e594450db49abc977bf56a62bf099670f Mon Sep 17 00:00:00 2001
From: Kevin Hahn <kevin_hahn@sil.org>
Date: Tue, 28 Jan 2025 14:44:44 +0700
Subject: [PATCH 4/6] remove converter for ws type from numbers to string as
 numbers are already in changes. Update type gen to match

---
 .../FwLiteShared/TypeGen/ReinforcedFwLiteTypingConfig.cs      | 2 +-
 backend/FwLite/MiniLcm/Models/WritingSystem.cs                | 1 -
 .../generated-types/MiniLcm/Models/WritingSystemType.ts       | 4 ++--
 frontend/viewer/src/lib/entry-data.ts                         | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend/FwLite/FwLiteShared/TypeGen/ReinforcedFwLiteTypingConfig.cs b/backend/FwLite/FwLiteShared/TypeGen/ReinforcedFwLiteTypingConfig.cs
index 7aad43cdb..b0d9e1fd0 100644
--- a/backend/FwLite/FwLiteShared/TypeGen/ReinforcedFwLiteTypingConfig.cs
+++ b/backend/FwLite/FwLiteShared/TypeGen/ReinforcedFwLiteTypingConfig.cs
@@ -74,7 +74,7 @@ private static void ConfigureMiniLcmTypes(ConfigurationBuilder builder)
                 exportBuilder.Ignore();
             }
         }));
-        builder.ExportAsEnum<WritingSystemType>().UseString();
+        builder.ExportAsEnum<WritingSystemType>();
         builder.ExportAsInterface<MiniLcmJsInvokable>()
             .FlattenHierarchy()
             .WithPublicProperties()
diff --git a/backend/FwLite/MiniLcm/Models/WritingSystem.cs b/backend/FwLite/MiniLcm/Models/WritingSystem.cs
index 93224e74e..6b5b26b37 100644
--- a/backend/FwLite/MiniLcm/Models/WritingSystem.cs
+++ b/backend/FwLite/MiniLcm/Models/WritingSystem.cs
@@ -51,7 +51,6 @@ public record WritingSystems
     public WritingSystem[] Vernacular { get; set; } = [];
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter))]
 public enum WritingSystemType
 {
     Vernacular = 0,
diff --git a/frontend/viewer/src/lib/dotnet-types/generated-types/MiniLcm/Models/WritingSystemType.ts b/frontend/viewer/src/lib/dotnet-types/generated-types/MiniLcm/Models/WritingSystemType.ts
index 20921cddf..a19962b02 100644
--- a/frontend/viewer/src/lib/dotnet-types/generated-types/MiniLcm/Models/WritingSystemType.ts
+++ b/frontend/viewer/src/lib/dotnet-types/generated-types/MiniLcm/Models/WritingSystemType.ts
@@ -4,7 +4,7 @@
 //     the code is regenerated.
 
 export enum WritingSystemType {
-	Vernacular = "Vernacular",
-	Analysis = "Analysis"
+	Vernacular = 0,
+	Analysis = 1
 }
 /* eslint-enable */
diff --git a/frontend/viewer/src/lib/entry-data.ts b/frontend/viewer/src/lib/entry-data.ts
index 31880a53c..e182c5532 100644
--- a/frontend/viewer/src/lib/entry-data.ts
+++ b/frontend/viewer/src/lib/entry-data.ts
@@ -49,7 +49,7 @@ export const writingSystems: IWritingSystems = {
       'abbreviation': 'Por',
       'font': '???',
       'exemplars': ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'],
-      'type': WritingSystemType.Vernacular,
+      'type': WritingSystemType.Analysis,
       'order': 1
     }
   ],

From 8c232f665bfb426632da63484fb32219e291eee9 Mon Sep 17 00:00:00 2001
From: Kevin Hahn <kevin_hahn@sil.org>
Date: Tue, 28 Jan 2025 14:52:47 +0700
Subject: [PATCH 5/6] move edit ws button into app bar menu

---
 frontend/viewer/src/lib/layout/AppBarMenu.svelte    | 13 +++++++++++--
 frontend/viewer/src/lib/layout/EntryList.svelte     |  4 ----
 .../lib/writing-system/WritingSystemDialog.svelte   |  9 ++++-----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/frontend/viewer/src/lib/layout/AppBarMenu.svelte b/frontend/viewer/src/lib/layout/AppBarMenu.svelte
index ec9315e23..12dd4040e 100644
--- a/frontend/viewer/src/lib/layout/AppBarMenu.svelte
+++ b/frontend/viewer/src/lib/layout/AppBarMenu.svelte
@@ -2,11 +2,13 @@
   import AboutDialog from '$lib/about/AboutDialog.svelte';
   import ActivityView from '$lib/activity/ActivityView.svelte';
   import {useFeatures} from '$lib/services/feature-service';
-  import {mdiDotsVertical, mdiEyeSettingsOutline, mdiHistory, mdiInformationVariantCircle} from '@mdi/js';
+  import {mdiDotsVertical, mdiEyeSettingsOutline, mdiHistory, mdiInformationVariantCircle, mdiNoteEdit} from '@mdi/js';
   import {createEventDispatcher} from 'svelte';
   import {Button, MenuItem, ResponsiveMenu, Toggle} from 'svelte-ux';
   import {asScottyPortal} from './Scotty.svelte';
   import {useProjectViewState} from '$lib/services/project-view-state-service';
+  import WritingSystemDialog from '$lib/writing-system/WritingSystemDialog.svelte';
+  import DevContent from '$lib/layout/DevContent.svelte';
 
   const dispatch = createEventDispatcher<{
     showOptionsDialog: void;
@@ -20,6 +22,7 @@
 
   let activityViewOpen = false;
   let aboutDialogOpen = false;
+  let wsEditDialogOpen = false;
 </script>
 
 <!-- #key prevents rendering ugly delayed state updates -->
@@ -41,6 +44,11 @@
             <MenuItem icon={mdiInformationVariantCircle} on:click={() => aboutDialogOpen = true}>About</MenuItem>
           </div>
         {/if}
+        <DevContent>
+          <MenuItem icon={mdiNoteEdit} on:click={() => wsEditDialogOpen = true}>
+            Edit WS
+          </MenuItem>
+        </DevContent>
       </button>
     </ResponsiveMenu>
   </Button>
@@ -50,11 +58,12 @@
 {#if $features.history}
   <ActivityView bind:open={activityViewOpen} {projectName} />
 {/if}
-
 {#if about}
   <AboutDialog bind:open={aboutDialogOpen} text={about} />
 {/if}
 
+<WritingSystemDialog bind:open={wsEditDialogOpen}/>
+
 <style lang="postcss" global>
   .app-bar-menu .MenuItem {
     @apply justify-start;
diff --git a/frontend/viewer/src/lib/layout/EntryList.svelte b/frontend/viewer/src/lib/layout/EntryList.svelte
index a3b7190bb..bf61e1a8f 100644
--- a/frontend/viewer/src/lib/layout/EntryList.svelte
+++ b/frontend/viewer/src/lib/layout/EntryList.svelte
@@ -83,10 +83,6 @@
       rounded
       on:click={() => dictionaryMode = !dictionaryMode}>
     </Button>
-<!--    todo move this-->
-    <DevContent>
-      <WritingSystemDialog/>
-    </DevContent>
     <div class="hidden lg-view:contents">
       <Button icon={expand ? mdiArrowCollapseLeft : mdiArrowExpandRight} variant="outline" iconOnly
         class="text-field-sibling-button"
diff --git a/frontend/viewer/src/lib/writing-system/WritingSystemDialog.svelte b/frontend/viewer/src/lib/writing-system/WritingSystemDialog.svelte
index 544ed57f5..3045e6413 100644
--- a/frontend/viewer/src/lib/writing-system/WritingSystemDialog.svelte
+++ b/frontend/viewer/src/lib/writing-system/WritingSystemDialog.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
-  import {Button, Dialog, SelectField} from 'svelte-ux';
+  import {Button, Dialog, MenuItem, SelectField} from 'svelte-ux';
   import WritingSystemEditor from '$lib/writing-system/WritingSystemEditor.svelte';
   import {useWritingSystemService} from '$lib/writing-system-service';
   import {type IWritingSystem, WritingSystemType} from '$lib/dotnet-types';
   import {defaultWritingSystem} from '$lib/utils';
+  import {mdiNoteEdit} from '@mdi/js';
 
-  let open = false;
+  export let open = false;
   let loading = false;
   const writingSystemService = useWritingSystemService();
   let vernacular = writingSystemService.vernacular;
@@ -39,9 +40,7 @@
     location.reload();
   }
 </script>
-<Button rounded variant="outline" on:click={() => open = true}>
-  Edit WS
-</Button>
+
 <Dialog bind:open={open} {loading} persistent={loading} style="height: auto">
   <div slot="title">Edit Writing Systems</div>
   <SelectField label="Writing System" bind:value={selectedOption} {options} clearable={false}/>

From ef989a35b5c0656ad0e8eb5e0d7018425929a6b4 Mon Sep 17 00:00:00 2001
From: Kevin Hahn <kevin_hahn@sil.org>
Date: Tue, 28 Jan 2025 14:55:14 +0700
Subject: [PATCH 6/6] remove unused imports

---
 frontend/viewer/src/lib/layout/EntryList.svelte | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/viewer/src/lib/layout/EntryList.svelte b/frontend/viewer/src/lib/layout/EntryList.svelte
index bf61e1a8f..2bdd8c628 100644
--- a/frontend/viewer/src/lib/layout/EntryList.svelte
+++ b/frontend/viewer/src/lib/layout/EntryList.svelte
@@ -9,8 +9,6 @@
   import {useCurrentView} from '$lib/services/view-service';
   import {fieldName} from '$lib/i18n';
   import {useWritingSystemService} from '$lib/writing-system-service';
-  import WritingSystemDialog from '$lib/writing-system/WritingSystemDialog.svelte';
-  import DevContent from '$lib/layout/DevContent.svelte';
 
   const dispatch = createEventDispatcher<{
     entrySelected: IEntry;