introduce DurableInvoke helper which uses a method defined on window …

…in index which will always be there, to call methods which might not always be there
sillsdev · Dec 18, 2024 · bf4b63a · bf4b63a
1 parent 3c3a487
commit bf4b63a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/backend/FwLite/FwLiteDesktop/wwwroot/index.html b/backend/FwLite/FwLiteDesktop/wwwroot/index.html
@@ -7,10 +7,13 @@
     <base href="/" />
     <link rel="icon" type="image/png" href="_content/FwLiteShared/favicon.png"/>
     <script>
-        window.onBlazorNavigate = (path) => {
-            if ('svelteNavigate' in window) {
-                window.svelteNavigate(path);
+        window.invokeOnWindow = function (methodName, args) {
+            if (!(methodName in window)) {
+                //todo not sure how to handle this for now, maybe we wait until the app is ready?
+                console.error(`Method ${methodName} not found`);
+                return;
             }
+            window[methodName](...args);
         };
     </script>
 </head>

diff --git a/backend/FwLite/FwLiteShared/JsInteropInvokeHelper.cs b/backend/FwLite/FwLiteShared/JsInteropInvokeHelper.cs
@@ -0,0 +1,11 @@
+using Microsoft.JSInterop;
+
+namespace FwLiteShared;
+
+public static class JsInteropInvokeHelper
+{
+    public static async ValueTask DurableInvokeVoidAsync(this IJSRuntime jsRuntime, string identifier, params object?[] args)
+    {
+        await jsRuntime.InvokeVoidAsync("invokeOnWindow", identifier, args);
+    }
+}
diff --git a/backend/FwLite/FwLiteShared/Routes.razor b/backend/FwLite/FwLiteShared/Routes.razor
@@ -2,7 +2,7 @@
 @code {
     private async Task OnNavigateAsync(NavigationContext context)
     {
-        await jsRuntime.InvokeVoidAsync("onBlazorNavigate", context.Path);
+        await jsRuntime.DurableInvokeVoidAsync("svelteNavigate", context.Path);
     }
 }
 <Router AppAssembly="typeof(Layout.SvelteLayout).Assembly" OnNavigateAsync="OnNavigateAsync">

diff --git a/backend/FwLite/FwLiteShared/Services/FwLiteProvider.cs b/backend/FwLite/FwLiteShared/Services/FwLiteProvider.cs
@@ -66,7 +66,7 @@ public object GetService(DotnetService service)
             logger.LogInformation("Clearing Service {Service}", service);
         }
 
-        await jsRuntime.InvokeVoidAsync(OverrideServiceFunctionName, service.ToString(), reference);
+        await jsRuntime.DurableInvokeVoidAsync(OverrideServiceFunctionName, service.ToString(), reference);
         return reference;
     }
 
@@ -79,7 +79,7 @@ public async Task<IAsyncDisposable> InjectCrdtProject(IJSRuntime jsRuntime,
         await lexboxProjectService.ListenForProjectChanges(projectData, CancellationToken.None);
         var entryUpdatedSubscription = changeEventBus.OnProjectEntryUpdated(project).Subscribe(entry =>
         {
-            _ = jsRuntime.InvokeVoidAsync("notifyEntryUpdated", projectName, entry);
+            _ = jsRuntime.DurableInvokeVoidAsync("notifyEntryUpdated", projectName, entry);
         });
         var service = ActivatorUtilities.CreateInstance<MiniLcmJsInvokable>(scopedServices, project);
         var reference = await SetService(jsRuntime,DotnetService.MiniLcmApi, service);

diff --git a/backend/FwLite/LocalWebApp/Components/App.razor b/backend/FwLite/LocalWebApp/Components/App.razor
@@ -7,6 +7,16 @@
     <base href="/"/>
     <link rel="icon" type="image/png" href="_content/FwLiteShared/favicon.png"/>
     <HeadOutlet @rendermode="InteractiveServer"/>
+    <script>
+        window.invokeOnWindow = function (methodName, args) {
+            if (!(methodName in window)) {
+                //todo not sure how to handle this for now, maybe we wait until the app is ready?
+                console.error(`Method ${methodName} not found`);
+                return;
+            }
+            window[methodName](...args);
+        };
+    </script>
 </head>
 
 <body>