ShadCN UI main

.github/workflows/fw-lite.yaml

@@ -21,6 +21,7 @@ on:
     branches:
       - develop
       - main
+      - shadcn-ui-main #just for now ensure PRs to this branch have checks run
 env:
   VIEWER_BUILD_OUTPUT_DIR: backend/FwLite/FwLiteShared/wwwroot/viewer
 jobs:

backend/FwLite/FwLiteShared/Events/EntryDeletedEvent.cs

@@ -0,0 +1,8 @@
+namespace FwLiteShared.Events;
+
+public class EntryDeletedEvent(Guid entryId) : IFwEvent
+{
+    public FwEventType Type => FwEventType.EntryDeleted;
+    public bool IsGlobal => false;
+    public Guid EntryId { get; init; } = entryId;
+}

backend/FwLite/FwLiteShared/Events/IFwEvent.cs

@@ -4,6 +4,7 @@ namespace FwLiteShared.Events;
 
 [JsonPolymorphic]
 [JsonDerivedType(typeof(EntryChangedEvent), nameof(EntryChangedEvent))]
+[JsonDerivedType(typeof(EntryDeletedEvent), nameof(EntryDeletedEvent))]
 [JsonDerivedType(typeof(ProjectEvent), nameof(ProjectEvent))]
 [JsonDerivedType(typeof(AuthenticationChangedEvent), nameof(AuthenticationChangedEvent))]
 public interface IFwEvent
@@ -19,4 +20,5 @@ public enum FwEventType
     EntryChanged,
     AuthenticationChanged,
     ProjectEvent,
+    EntryDeleted
 }

backend/FwLite/FwLiteShared/Pages/CrdtProject.razor

@@ -1,8 +1,10 @@
-@page "/project/{projectName}"
+@page "/project/{projectName}/{*path}"
 @using FwLiteShared.Layout
 @layout SvelteLayout;
 
 @code {
     [Parameter]
     public required string ProjectName { get; set; }
+    [Parameter]
+    public required string Path { get; set; }
 }

backend/FwLite/FwLiteShared/Pages/FwdataProject.razor

@@ -1,10 +1,12 @@
-@page "/fwdata/{projectName}"
+@page "/fwdata/{projectName}/{*path}"
 @using FwLiteShared.Layout
 @layout SvelteLayout;
 
 @code {
 
     [Parameter]
     public required string ProjectName { get; set; }
+    [Parameter]
+    public required string Path { get; set; }
 
 }

backend/FwLite/FwLiteShared/Pages/Sandbox.razor

@@ -1,6 +1,11 @@
-@page "/sandbox"
+@page "/sandbox/{*path}"
 @using FwLiteShared.Layout
 @using FwLiteShared.Services
 @layout SvelteLayout;
 
-@*this looks empty because it is, but it's required to declare the route which is then used by the svelte router*@
+@code {
+
+    [Parameter]
+    public required string Path { get; set; }
+
+}

backend/FwLite/FwLiteShared/Pages/TestingProject.razor

@@ -1,3 +1,10 @@
-@page "/testing/project-view"
+@page "/testing/project-view/{*path}"
 @using FwLiteShared.Layout
 @layout SvelteLayout;
+
+@code {
+
+    [Parameter]
+    public required string Path { get; set; }
+
+}

backend/FwLite/FwLiteShared/Services/MiniLcmApiNotifyWrapper.cs

@@ -72,6 +72,11 @@ public async Task NotifyEntryChangedAsync(Guid entryId)
         bus.PublishEntryChangedEvent(project, entry);
     }
 
+    public void NotifyEntryDeleted(Guid entryId)
+    {
+        bus.PublishEvent(project, new EntryDeletedEvent(entryId));
+    }
+
     // ********** Overrides go here **********
 
     async Task<Entry> IMiniLcmWriteApi.CreateEntry(Entry entry)
@@ -105,6 +110,24 @@ async Task IMiniLcmWriteApi.DeleteComplexFormComponent(ComplexFormComponent comp
         await NotifyEntryChangedAsync(complexFormComponent.ComponentEntryId);
     }
 
+    async Task IMiniLcmWriteApi.DeleteEntry(Guid id)
+    {
+        await _api.DeleteEntry(id);
+        NotifyEntryDeleted(id);
+    }
+
+    async Task IMiniLcmWriteApi.DeleteSense(Guid entryId, Guid senseId)
+    {
+        await _api.DeleteSense(entryId, senseId);
+        await NotifyEntryChangedAsync(entryId);
+    }
+
+    async Task IMiniLcmWriteApi.DeleteExampleSentence(Guid entryId, Guid senseId, Guid exampleSentenceId)
+    {
+        await _api.DeleteExampleSentence(entryId, senseId, exampleSentenceId);
+        await NotifyEntryChangedAsync(entryId);
+    }
+
     void IDisposable.Dispose()
     {
     }

backend/FwLite/FwLiteShared/Sync/SyncService.cs

@@ -10,6 +10,7 @@
 using MiniLcm;
 using MiniLcm.Models;
 using SIL.Harmony;
+using SIL.Harmony.Changes;
 
 namespace FwLiteShared.Sync;
 
@@ -95,6 +96,13 @@ private async Task SendNotifications(SyncResults syncResults)
                     logger.LogError("Failed to get entry {EntryId}, was not found", entryId);
                 }
             }
+
+            foreach (var deleteChange in syncResults.MissingFromLocal
+                         .SelectMany(c => c.ChangeEntities, (_, change) => change.Change)
+                         .OfType<DeleteChange<Entry>>())
+            {
+                changeEventBus.PublishEvent(currentProjectService.Project, new EntryDeletedEvent(deleteChange.EntityId));
+            }
         }
         catch (Exception e)
         {

backend/FwLite/FwLiteWeb/Routes/FwIntegrationRoutes.cs

@@ -20,7 +20,7 @@ public static IEndpointConventionBuilder MapFwIntegrationRoutes(this WebApplicat
                 });
                 return operation;
             });
-        group.MapGet("/open/entry/{id}",
+        group.MapGet("/link/entry/{id}",
             async ([FromServices] FwDataProjectContext context,
                 [FromServices] IHubContext<FwDataMiniLcmHub, ILexboxHubClient> hubContext,
                 [FromServices] FwDataFactory factory,
@@ -29,8 +29,8 @@ public static IEndpointConventionBuilder MapFwIntegrationRoutes(this WebApplicat
                 if (context.Project is null) return Results.BadRequest("No project is set in the context");
                 await hubContext.Clients.Group(context.Project.Name).OnProjectClosed(CloseReason.Locked);
                 factory.CloseProject(context.Project);
-                //need to use redirect as a way to not trigger flex until after we have closed the project
-                return Results.Redirect(FwLink.ToEntry(id, context.Project.Name));
+                var link = FwLink.ToEntry(id, context.Project.Name);
+                return Results.Text(link, "text/plain");
             });
         return group;
     }

frontend/Taskfile.yml

@@ -31,7 +31,8 @@ tasks:
       - task: fw-lite-infr-internal
 
   fw-lite-infr-internal:
-    deps: [ viewer-dev, https-oauth-authority ]
+    internal: true
+    deps: [ viewer:run-app, run-https-proxy ]
 
   playwright-tests:
     aliases: [ pt ]
@@ -80,6 +81,9 @@ tasks:
     cmds:
       - corepack enable || true
       - pnpm install
+  run-https-proxy:
+    dir: ./https-proxy
+    cmd: pnpm run dev
   https-proxy:
     dir: ./https-proxy
     desc: "MSAL requires the oauth authority to be available over https. That's why this is here. As a bonus it dynamically looks for the UI either locally or in k8s."

frontend/package.json

@@ -38,7 +38,7 @@
     "@graphql-codegen/typescript": "^4.1.6",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@iconify-json/mdi": "^1.2.3",
-    "@playwright/test": "^1.52.0",
+    "@playwright/test": "catalog:",
     "@stylistic/eslint-plugin": "catalog:",
     "@sveltejs/adapter-node": "^5.2.12",
     "@sveltejs/kit": "2.20.7",
@@ -102,7 +102,7 @@
     "js-cookie": "^3.0.5",
     "just-order-by": "^1.0.0",
     "mjml": "^4.15.3",
-    "runed": "^0.26.0",
+    "runed": "catalog:",
     "set-cookie-parser": "^2.7.1",
     "svelte-exmarkdown": "catalog:",
     "svelte-intl-precompile": "^0.12.3",