FIX: Reports could not be closed (#2463)

origam · Feb 8, 2024 · 03993ee · 03993ee
1 parent 11d8105
commit 03993ee
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/frontend-html/src/model/actions-ui/ScreenTabHandleRow/onScreenTabCloseClick.ts b/frontend-html/src/model/actions-ui/ScreenTabHandleRow/onScreenTabCloseClick.ts
@@ -44,9 +44,11 @@ export function onScreenTabCloseClick(ctx: any) {
   return flow(function*onFormTabCloseClick(event: any, closeWithoutSaving?: boolean) {
     const openedScreen = getOpenedScreen(ctx);
     const formScreen = openedScreen.content?.formScreen;
-    const lifecycle = getFormScreenLifecycle(openedScreen.content.formScreen!);
-    if(formScreen?.showWorkflowNextButton) {
-      return yield*lifecycle.onWorkflowAbortClick(null);
+    if(formScreen){
+      const lifecycle = getFormScreenLifecycle(formScreen);
+      if(formScreen?.showWorkflowNextButton) {
+        return yield*lifecycle.onWorkflowAbortClick(null);
+      }
     }
     let dataViews = openedScreen.content?.formScreen?.dataViews ?? [];
     for (const dataView of dataViews) {
@@ -59,6 +61,7 @@ export function onScreenTabCloseClick(ctx: any) {
       closingScreens.add(openedScreen);
       // TODO: Better lifecycle handling
       if (openedScreen.content && !openedScreen.content.isLoading) {
+        const lifecycle = getFormScreenLifecycle(openedScreen.content.formScreen!);
         yield*lifecycle.onRequestScreenClose(closeWithoutSaving);
       } else {
         yield*closeForm(ctx)();