Bugfixes jun2024 (#23)

* [webpage] Update actions on in-page navigation * Fix bug not allowing to copy widget/workflow with updated data when it is already copied * [Timer] Fix audio file loading issues
FreeterApp · Jun 28, 2024 · d5adaf6 · d5adaf6
1 parent 827cb35
commit d5adaf6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/main/infra/protocolHandler/protocolHandler.ts b/src/main/infra/protocolHandler/protocolHandler.ts
@@ -18,6 +18,7 @@ export function registerProtocol(
       standard: true,
       secure: true,
       supportFetchAPI: true,
+      stream: true
     }
   }])
   app.whenReady().then(() => {

diff --git a/src/renderer/application/useCases/widget/copyWidget.ts b/src/renderer/application/useCases/widget/copyWidget.ts
@@ -5,7 +5,7 @@
 
 import { AppStore } from '@/application/interfaces/store';
 import { EntityId } from '@/base/entity';
-import { addOneToEntityCollection, removeManyFromEntityCollection } from '@/base/entityCollection';
+import { removeManyFromEntityCollection, setOneInEntityCollection } from '@/base/entityCollection';
 import { addOrMoveItemInList, limitListLength } from '@/base/list';
 
 type Deps = {
@@ -45,7 +45,7 @@ export function createCopyWidgetUseCase({
         copy: {
           ...state.ui.copy,
           widgets: {
-            entities: addOneToEntityCollection(state.ui.copy.widgets.entities, {
+            entities: setOneInEntityCollection(state.ui.copy.widgets.entities, {
               id: widget.id,
               deps: {},
               entity: widget

diff --git a/src/renderer/application/useCases/workflow/copyWorkflow.ts b/src/renderer/application/useCases/workflow/copyWorkflow.ts
@@ -5,7 +5,7 @@
 
 import { AppStore } from '@/application/interfaces/store';
 import { EntityId } from '@/base/entity';
-import { addOneToEntityCollection, removeManyFromEntityCollection } from '@/base/entityCollection';
+import { removeManyFromEntityCollection, setOneInEntityCollection } from '@/base/entityCollection';
 import { addOrMoveItemInList, limitListLength } from '@/base/list';
 import { getWorkflowEntityDeps } from '@/base/state/entities';
 
@@ -47,7 +47,7 @@ export function createCopyWorkflowUseCase({
         copy: {
           ...state.ui.copy,
           workflows: {
-            entities: addOneToEntityCollection(state.ui.copy.workflows.entities, {
+            entities: setOneInEntityCollection(state.ui.copy.workflows.entities, {
               id: workflow.id,
               deps: workflowDeps,
               entity: workflow

diff --git a/src/renderer/widgets/webpage/widget.tsx b/src/renderer/widgets/webpage/widget.tsx
@@ -146,21 +146,26 @@ function Webview({settings, widgetApi, onRequireRestart, env, id}: WebviewProps)
     const handleDidNavigate = () => {
       refreshActions();
     }
-    // const handleDidNavigateInPage = () => {
-    //   refreshActions();
-    // }
+    const handleDidFrameNavigate = () => {
+      refreshActions();
+    }
+    const handleDidNavigateInPage = () => {
+      refreshActions();
+    }
 
     // Add event listeners
     webviewEl.addEventListener('dom-ready', handleDomReady);
     webviewEl.addEventListener('did-navigate', handleDidNavigate);
-    // webviewEl.addEventListener('did-navigate-in-page', handleDidNavigateInPage);
+    webviewEl.addEventListener('did-frame-navigate', handleDidFrameNavigate);
+    webviewEl.addEventListener('did-navigate-in-page', handleDidNavigateInPage);
     webviewEl.addEventListener('did-finish-load', handleDidFinishLoad);
 
     return () => {
       // Remove event listeners
       webviewEl.removeEventListener('dom-ready', handleDomReady);
       webviewEl.removeEventListener('did-navigate', handleDidNavigate);
-      // webviewEl.removeEventListener('did-navigate-in-page', handleDidNavigateInPage);
+      webviewEl.removeEventListener('did-frame-navigate', handleDidFrameNavigate);
+      webviewEl.removeEventListener('did-navigate-in-page', handleDidNavigateInPage);
       webviewEl.removeEventListener('did-finish-load', handleDidFinishLoad);
           };
   }, [refreshActions]);