Crdt demo

backend/FwLite/FwDataMiniLcmBridge.Tests/Fixtures/FwDataTestsKernel.cs

@@ -1,4 +1,5 @@
 using FwDataMiniLcmBridge.LcmUtils;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace FwDataMiniLcmBridge.Tests.Fixtures;
@@ -8,6 +9,7 @@ public static class FwDataTestsKernel
     public static IServiceCollection AddTestFwDataBridge(this IServiceCollection services)
     {
         services.AddFwDataBridge();
+        services.AddSingleton<IConfiguration>(_ => new ConfigurationRoot([]));
         services.AddSingleton<MockFwProjectLoader>();
         services.AddSingleton<IProjectLoader>(sp => sp.GetRequiredService<MockFwProjectLoader>());
         services.AddSingleton<FieldWorksProjectList, MockFwProjectList>();

backend/FwLite/FwDataMiniLcmBridge.Tests/FwDataMiniLcmBridge.Tests.csproj

@@ -15,6 +15,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0"/>
         <PackageReference Include="FluentAssertions" Version="6.12.0"/>

backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs

@@ -122,7 +122,7 @@
     internal void CompleteExemplars(WritingSystems writingSystems)
     {
         var wsExemplars = writingSystems.Vernacular.Concat(writingSystems.Analysis)
-            .Distinct()
+            .DistinctBy(ws => ws.Id)
             .ToDictionary(ws => ws, ws => ws.Exemplars.Select(s => s[0]).ToHashSet());
         var wsExemplarsByHandle = wsExemplars.ToFrozenDictionary(kv => GetWritingSystemHandle(kv.Key.Id), kv => kv.Value);
 
@@ -167,7 +167,7 @@
         throw new NotImplementedException();
     }
 
     public async IAsyncEnumerable<PartOfSpeech> GetPartsOfSpeech()
     {
         foreach (var partOfSpeech in PartOfSpeechRepository.AllInstances().OrderBy(p => p.Name.BestAnalysisAlternative.Text))
         {
@@ -175,7 +175,7 @@
         }
     }
 
     public async Task CreatePartOfSpeech(PartOfSpeech partOfSpeech)
     {
         if (partOfSpeech.Id == default) partOfSpeech.Id = Guid.NewGuid();
         UndoableUnitOfWorkHelper.Do("Create Part of Speech",
@@ -189,7 +189,7 @@
             });
     }
 
     public async IAsyncEnumerable<SemanticDomain> GetSemanticDomains()
     {
         foreach (var semanticDomain in SemanticDomainRepository.AllInstances().OrderBy(p => p.Abbreviation.UiString))
         {
@@ -202,7 +202,7 @@
         }
     }
 
     public async Task CreateSemanticDomain(SemanticDomain semanticDomain)
     {
         if (semanticDomain.Id == Guid.Empty) semanticDomain.Id = Guid.NewGuid();
         UndoableUnitOfWorkHelper.Do("Create Semantic Domain",
@@ -285,7 +285,7 @@
         return GetEntries(null, options);
     }
 
     public async IAsyncEnumerable<Entry> GetEntries(
         Func<ILexEntry, bool>? predicate, QueryOptions? options = null)
     {
         var entries = EntriesRepository.AllInstances();

backend/FwLite/FwDataMiniLcmBridge/FwDataBridgeKernel.cs

@@ -11,7 +11,7 @@ public static IServiceCollection AddFwDataBridge(this IServiceCollection service
     {
         services.AddMemoryCache();
         services.AddLogging();
-        services.AddOptions<FwDataBridgeConfig>();
+        services.AddOptions<FwDataBridgeConfig>().BindConfiguration("FwDataBridge");
         services.AddSingleton<FwDataFactory>();
         services.AddSingleton<FieldWorksProjectList>();
         services.AddSingleton<IProjectLoader, ProjectLoader>();

backend/FwLite/FwDataMiniLcmBridge/FwDataMiniLcmBridge.csproj

@@ -11,6 +11,7 @@
         <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
         <PackageReference Include="SIL.Core" Version="14.2.0-beta0009" />
         <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" Condition="$([MSBuild]::IsOsPlatform('Windows'))" />
         <PackageReference Include="SIL.LCModel" Version="11.0.0-beta0100 " />

backend/FwLite/FwLiteDesktop/FwLiteDesktop.csproj

@@ -65,7 +65,7 @@
 		<MauiIcon Include="Resources\AppIcon\logo_light.svg" />
 
 		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#152747" BaseSize="512,512" />
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />

backend/FwLite/FwLiteDesktop/FwLiteDesktopKernel.cs

@@ -2,6 +2,7 @@
 using LcmCrdt;
 using LocalWebApp.Auth;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using NReco.Logging.File;
 
@@ -17,6 +18,9 @@ public static void AddFwLiteDesktopServices(this IServiceCollection services,
 
         var serverManager = new ServerManager(webAppBuilder =>
         {
+            #if DEBUG
+            webAppBuilder.Environment.EnvironmentName = "Development";
+            #endif
             webAppBuilder.Logging.AddFile(Path.Combine(FileSystem.AppDataDirectory, "web-app.log"));
             webAppBuilder.Services.Configure<LcmCrdtConfig>(config =>
             {
@@ -31,9 +35,11 @@ public static void AddFwLiteDesktopServices(this IServiceCollection services,
         //using a lambda here means that the serverManager will be disposed when the app is disposed
         services.AddSingleton<ServerManager>(_ => serverManager);
         services.AddSingleton<IMauiInitializeService>(_ => _.GetRequiredService<ServerManager>());
+        services.AddSingleton<IHostEnvironment>(_ => _.GetRequiredService<ServerManager>().WebServices.GetRequiredService<IHostEnvironment>());
         configuration.Add<ServerConfigSource>(source => source.ServerManager = serverManager);
         services.AddOptions<LocalWebAppConfig>().BindConfiguration("LocalWebApp");
         logging.AddFile(Path.Combine(FileSystem.AppDataDirectory, "app.log"));
+        logging.AddConsole();
 #if DEBUG
         logging.AddDebug();
 #endif

backend/FwLite/FwLiteDesktop/MainPage.xaml

@@ -3,6 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="FwLiteDesktop.MainPage">
 
-    <WebView x:Name="webView"/>
+    <WebView x:Name="webView" IsVisible="False"/>
 
 </ContentPage>

backend/FwLite/FwLiteDesktop/MainPage.xaml.cs

@@ -1,19 +1,26 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace FwLiteDesktop;
 
 public partial class MainPage : ContentPage
 {
-    public MainPage(IOptionsMonitor<LocalWebAppConfig> options, ILogger<MainPage> logger)
+    private readonly ILogger<MainPage> _logger;
+    private readonly IHostEnvironment _environment;
+
+    public MainPage(IOptionsMonitor<LocalWebAppConfig> options, ILogger<MainPage> logger, IHostEnvironment environment)
     {
+        _logger = logger;
+        _environment = environment;
         InitializeComponent();
         options.OnChange(o =>
         {
             var url = o.Url;
             webView.Dispatcher.Dispatch(() => webView.Source = url);
             logger.LogInformation("Url updated: {Url}", url);
         });
+        webView.IsVisible = false;
         var url = options.CurrentValue.Url;
         webView.Source = url;
         logger.LogInformation("Main page initialized, url: {Url}", url);
@@ -39,7 +46,24 @@ public MainPage(IOptionsMonitor<LocalWebAppConfig> options, ILogger<MainPage> lo
                     logger.LogWarning("Too many navigations, stopping");
                 }
             }
+            else if (!args.Url.StartsWith("https://appdir"))
+            {
+                NavigationSuccess();
+            }
         };
     }
-}
 
+    private void NavigationSuccess()
+    {
+        webView.IsVisible = true;
+        //not currently working
+        // if (_environment.IsDevelopment())
+        {
+            //lang=js
+            webView.Eval("""
+                         localStorage.setItem('devMode', 'true');
+                         if (enableDevMode) enableDevMode();
+                         """);
+        }
+    }
+}