Crdt demo (#1053)

* add upload button to project config, display configured server when there is one. * only push changes to the front end if they match the current filter. If the front end gets an entry not in the list, then add it to the end. --------- Co-authored-by: Tim Haasdyk <tim_haasdyk@sil.org>
sillsdev · Oct 2, 2024 · 3dffa35 · 3dffa35
1 parent e75aa06
commit 3dffa35
Show file tree

Hide file tree

Showing 39 changed files with 627 additions and 163 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,5 +18,6 @@ dump.sql
 test-results/
 **/*.sqlite
 **/*.sqlite-*
+msal.json
 msal.cache
 artifacts/
diff --git a/backend/FwLite/FwDataMiniLcmBridge.Tests/Fixtures/FwDataTestsKernel.cs b/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>();

diff --git a/backend/FwLite/FwDataMiniLcmBridge.Tests/FwDataMiniLcmBridge.Tests.csproj b/backend/FwLite/FwDataMiniLcmBridge.Tests/FwDataMiniLcmBridge.Tests.csproj
@@ -18,6 +18,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"/>

diff --git a/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs b/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs
@@ -123,7 +123,7 @@ private WritingSystem FromLcmWritingSystem(CoreWritingSystemDefinition ws)
     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);
 

diff --git a/backend/FwLite/FwDataMiniLcmBridge/FwDataBridgeKernel.cs b/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>();

diff --git a/backend/FwLite/FwDataMiniLcmBridge/FwDataMiniLcmBridge.csproj b/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 " />

diff --git a/backend/FwLite/FwLiteDesktop/FwLiteDesktop.csproj b/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\*" />

diff --git a/backend/FwLite/FwLiteDesktop/FwLiteDesktopKernel.cs b/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;
 
@@ -15,7 +16,11 @@ public static void AddFwLiteDesktopServices(this IServiceCollection services,
     {
         services.AddSingleton<MainPage>();
 
-        var serverManager = new ServerManager(webAppBuilder =>
+        string environment = "Production";
+#if DEBUG
+        environment = "Development";
+#endif
+        var serverManager = new ServerManager(environment, webAppBuilder =>
         {
             webAppBuilder.Logging.AddFile(Path.Combine(FileSystem.AppDataDirectory, "web-app.log"));
             webAppBuilder.Services.Configure<LcmCrdtConfig>(config =>
@@ -31,9 +36,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

diff --git a/backend/FwLite/FwLiteDesktop/MainPage.xaml b/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>
diff --git a/backend/FwLite/FwLiteDesktop/MainPage.xaml.cs b/backend/FwLite/FwLiteDesktop/MainPage.xaml.cs
@@ -1,12 +1,18 @@
-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 =>
         {
@@ -39,7 +45,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;
+        if (_environment.IsDevelopment())
+        {
+            _logger.LogInformation("Enabling dev mode in browser");
+            //lang=js
+            webView.Eval("""
+                         localStorage.setItem('devMode', 'true');
+                         if (enableDevMode) enableDevMode();
+                         """);
+        }
+    }
+}