fix issue trying to remove a writing system (#1713)

* write test for removing a writing system for both Rich and normal MultiStrings

Author: hahn-kev

backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateDictionaryProxy.cs

@@ -34,19 +34,32 @@ public bool ContainsKey(WritingSystemId key)
 
     public void Add(object key, object? value)
     {
-        var valStr = value as string ?? throw new ArgumentException("unable to convert value to string", nameof(value));
-        if (key is WritingSystemId keyWs)
+        WritingSystemId keyWs;
+        if (key is WritingSystemId typed)
         {
-            Add(keyWs, valStr);
+            keyWs = typed;
         }
         else if (key is string keyStr)
         {
-            Add(keyStr, valStr);
+            keyWs = keyStr;
         }
         else
         {
             throw new ArgumentException("unable to convert key to writing system id", nameof(key));
         }
+
+        if (value is string valueStr)
+        {
+            Add(keyWs, valueStr);
+        }
+        else if (value is RichString valueRich)
+        {
+            Add(keyWs, valueRich);
+        }
+        else
+        {
+            throw new ArgumentException("unable to convert value to string", nameof(value));
+        }
     }
 
     public bool Contains(object key)
@@ -105,6 +118,26 @@ IDictionaryEnumerator IDictionary.GetEnumerator()
 
     public void Remove(object key)
     {
+        if (key is WritingSystemId keyWs)
+        {
+            Remove(keyWs);
+        }
+        else if (key is string keyStr)
+        {
+            Remove(keyStr);
+        }
+        else
+        {
+            throw new ArgumentException($"unable to convert key {key} to writing system id", nameof(key));
+        }
+    }
+
+    public bool Remove(WritingSystemId key)
+    {
+        var containedKey = ContainsKey(key);
+        var writingSystemHandle = lexboxLcmApi.GetWritingSystemHandle(key);
+        multiString.set_String(writingSystemHandle, null);
+        return containedKey;
     }
 
     public bool IsFixedSize => false;
@@ -151,10 +184,6 @@ public void CopyTo(Array array, int index)
 
     public bool IsReadOnly => false;
 
-    public bool Remove(WritingSystemId key)
-    {
-        throw new NotSupportedException();
-    }
 
     public bool TryGetValue(WritingSystemId key, out string value)
     {

backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateEntryProxy.cs

@@ -88,20 +88,17 @@ public class UpdateRichMultiStringProxy(ITsMultiString multiString, FwDataMiniLc
 
     void IDictionary.Add(object key, object? value)
     {
-        var valStr = value as RichString ??
-                     throw new ArgumentException($"unable to convert value {value?.GetType().Name ?? "null"} to RichString",
-                         nameof(value));
-        if (key is WritingSystemId keyWs)
-        {
-            proxy.Add(keyWs, valStr);
-        }
-        else if (key is string keyStr)
-        {
-            proxy.Add(keyStr, valStr);
-        }
-        else
-        {
-            throw new ArgumentException("unable to convert key to writing system id", nameof(key));
-        }
+        ((IDictionary)proxy).Add(key, value);
+    }
+
+    void IDictionary.Remove(object key)
+    {
+        ((IDictionary)proxy).Remove(key);
+    }
+
+    object? IDictionary.this[object key]
+    {
+        get => ((IDictionary)proxy)[key];
+        set => ((IDictionary)proxy)[key] = value;
     }
 }

backend/FwLite/MiniLcm.Tests/UpdateEntryTestsBase.cs

@@ -59,6 +59,28 @@ public async Task UpdateEntry_Works()
         updatedEntry.Should().BeEquivalentTo(entry, options => options);
     }
 
+    [Fact]
+    public async Task UpdateEntry_SupportsRemovingAMultiStringWs()
+    {
+        var entry = await Api.GetEntry(Entry1Id);
+        ArgumentNullException.ThrowIfNull(entry);
+        var before = entry.Copy();
+        entry.CitationForm.Remove("en");
+        var updatedEntry = await Api.UpdateEntry(before, entry);
+        updatedEntry.CitationForm.Values.Should().NotContainKey("en");
+    }
+
+    [Fact]
+    public async Task UpdateEntry_SupportsRemovingARichMultiStringWs()
+    {
+        var entry = await Api.GetEntry(Entry1Id);
+        ArgumentNullException.ThrowIfNull(entry);
+        var before = entry.Copy();
+        entry.Note.Remove("en");
+        var updatedEntry = await Api.UpdateEntry(before, entry);
+        updatedEntry.Note.Should().NotContainKey("en");
+    }
+
     [Fact]
     public async Task UpdateEntry_SupportsSenseChanges()
     {

backend/FwLite/MiniLcm/Models/MultiString.cs

@@ -95,6 +95,11 @@ public void Add(string key, string value)
         Values.Add(key, value);
     }
 
+    public bool Remove(WritingSystemId key)
+    {
+        return Values.Remove(key);
+    }
+
     void IDictionary.Add(object key, object? value)
     {
         ((IDictionary)Values).Add(key, value);