@fluxo-dev/shell-reporting 26.2.2 → 26.2.4

package/index.esm.js

@@ -4213,12 +4213,35 @@ const ReportDesigner = props => {
   const [designerLoaded, setDesignerLoaded] = useState(false);
   const designerInstanceRef = useRef(null);
   const shellSessionContext = useContext(ShellSessionContext);
+  const [showCloseConfirmModal, setShowCloseConfirmModal] = useState(false);
   // Use reportId from props if available, otherwise use id from params
   const effectiveReportId = (_a = props.reportId) !== null && _a !== void 0 ? _a : id ? +id : undefined;
   const requestOptions = {
     host: FluxoClientSys.Instance.clientConfig.fluxoInstanceUrl.replace('/api', ''),
     getDesignerModelAction: "/DXXRD/GetDesignerModel"
   };
+  // Verifica se ci sono modifiche non salvate controllando lo stato del pulsante "Salva"
+  const hasUnsavedChanges = useCallback(() => {
+    const saveButton = document.querySelector('.dxrd-image-save');
+    if (!saveButton) return false;
+    const menuItem = saveButton.closest('.dxrd-menu-item');
+    return menuItem ? !menuItem.classList.contains('dxrd-disabled-button') : false;
+  }, []);
+  // Gestisce la richiesta di chiusura del designer
+  const requestClose = useCallback(() => {
+    var _a;
+    if (props.mode === 'designer' && hasUnsavedChanges()) {
+      setShowCloseConfirmModal(true);
+      return;
+    }
+    (_a = props.onBack) === null || _a === void 0 ? void 0 : _a.call(props);
+  }, [props, hasUnsavedChanges]);
+  // Conferma la chiusura senza salvare
+  const confirmClose = useCallback(() => {
+    var _a;
+    setShowCloseConfirmModal(false);
+    (_a = props.onBack) === null || _a === void 0 ? void 0 : _a.call(props);
+  }, [props]);
   useEffect(() => {
     if (props.mode === 'designer') {
       shellSessionContext.enterFocusMode();
@@ -4314,43 +4337,67 @@ const ReportDesigner = props => {
         })]
       });
     }
-    return jsxs(Box, {
-      pos: 'relative',
-      children: [jsx(LoadingOverlay, {
-        visible: !designerLoaded
-      }), props.showBackButton && jsx(Group, {
-        px: "sm",
-        h: 48,
-        justify: "space-between",
-        style: {
-          borderBottom: '1px solid var(--mantine-color-gray-3)'
-        },
-        children: jsxs(Group, {
-          gap: 8,
-          children: [jsx(ActionIcon, {
-            variant: "subtle",
-            color: "gray",
-            onClick: () => {
-              var _a;
-              return (_a = props.onBack) === null || _a === void 0 ? void 0 : _a.call(props);
-            },
-            children: jsx(IconArrowLeft, {
-              size: 18
-            })
-          }), jsx(Text, {
+    return jsxs(Fragment, {
+      children: [jsxs(Box, {
+        pos: 'relative',
+        children: [jsx(LoadingOverlay, {
+          visible: !designerLoaded
+        }), props.showBackButton && jsx(Group, {
+          px: "sm",
+          h: 48,
+          justify: "space-between",
+          style: {
+            borderBottom: '1px solid var(--mantine-color-gray-3)'
+          },
+          children: jsxs(Group, {
+            gap: 8,
+            children: [jsx(ActionIcon, {
+              variant: "subtle",
+              color: "gray",
+              onClick: requestClose,
+              children: jsx(IconArrowLeft, {
+                size: 18
+              })
+            }), jsx(Text, {
+              size: "sm",
+              fw: 500,
+              children: "Torna ai report"
+            })]
+          })
+        }), jsx("div", {
+          style: {
+            width: "100%",
+            height: props.showBackButton ? "calc(100vh - 234px)" : "calc(100vh - 48px)"
+          },
+          children: jsx("div", {
+            ref: designerRef
+          })
+        })]
+      }), jsx(Modal, {
+        opened: showCloseConfirmModal,
+        onClose: () => setShowCloseConfirmModal(false),
+        title: "Modifiche non salvate",
+        size: "md",
+        centered: true,
+        children: jsxs(Stack, {
+          gap: "lg",
+          children: [jsx(Text, {
             size: "sm",
-            fw: 500,
-            children: "Torna ai report"
+            c: "dimmed",
+            children: "Sono presenti modifiche non salvate. Se esci ora, le modifiche correnti andranno perse."
+          }), jsxs(Group, {
+            justify: "flex-end",
+            children: [jsx(Button, {
+              variant: "default",
+              onClick: () => setShowCloseConfirmModal(false),
+              children: "Annulla"
+            }), jsx(Button, {
+              color: "red",
+              onClick: confirmClose,
+              children: "Esci senza salvare"
+            })]
           })]
         })
-      }), jsx("div", {
-        style: {
-          width: "100%",
-          height: props.showBackButton ? "calc(100vh - 234px)" : "calc(100vh - 48px)"
-        },
-        children: jsx("div", {
-          ref: designerRef
-        })
       })]
     });
   };
@@ -4756,32 +4803,6 @@ function ReportsManager(props) {
       setSelectedCategoryKey(`${firstCategory.scope}-${firstCategory.packageName}-${firstCategory.namespace}-${firstCategory.reportTypeId}`);
     }
   }, [reportsList, selectedCategoryKey]);
-  // Intercetta la navigazione nel router (back button del browser)
-  useEffect(() => {
-    if (!reportEditorState.show) return;
-    const handlePopState = () => {
-      var _a, _b;
-      if (!isClosingRef.current) {
-        const confirmExit = window.confirm('Sei sicuro di voler uscire dall\'editor? Le modifiche non salvate andranno perse.');
-        if (!confirmExit) {
-          window.history.pushState(null, '', window.location.href);
-        } else {
-          setReportEditorState({
-            show: false,
-            reportId: undefined
-          });
-          (_b = (_a = props.shellPageRef) === null || _a === void 0 ? void 0 : _a.current) === null || _b === void 0 ? void 0 : _b.openSidebar();
-          refresh();
-        }
-      }
-    };
-    // Aggiungi uno stato alla history per intercettare il back button
-    window.history.pushState(null, '', window.location.href);
-    window.addEventListener('popstate', handlePopState);
-    return () => {
-      window.removeEventListener('popstate', handlePopState);
-    };
-  }, [reportEditorState.show, props.shellPageRef]);
   const refresh = () => {
     FluxoClientSys.Instance.reporting.getReportsList().then(res => {
       setReportsList(res);
@@ -4844,20 +4865,17 @@ function ReportsManager(props) {
   };
   const handleCloseReportEditor = useCallback(() => {
     var _a, _b;
-    const confirmClose = window.confirm('Sei sicuro di voler chiudere l\'editor? Le modifiche non salvate andranno perse.');
-    if (confirmClose) {
-      isClosingRef.current = true;
-      setReportEditorState({
-        show: false,
-        reportId: undefined
-      });
-      (_b = (_a = props.shellPageRef) === null || _a === void 0 ? void 0 : _a.current) === null || _b === void 0 ? void 0 : _b.openSidebar();
-      refresh();
-      // Reset del flag dopo un breve delay
-      setTimeout(() => {
-        isClosingRef.current = false;
-      }, 100);
-    }
+    isClosingRef.current = true;
+    setReportEditorState({
+      show: false,
+      reportId: undefined
+    });
+    (_b = (_a = props.shellPageRef) === null || _a === void 0 ? void 0 : _a.current) === null || _b === void 0 ? void 0 : _b.openSidebar();
+    refresh();
+    // Reset del flag dopo un breve delay
+    setTimeout(() => {
+      isClosingRef.current = false;
+    }, 100);
   }, [props.shellPageRef]);
   const deleteReport = () => {
     if (!(selectedReport === null || selectedReport === void 0 ? void 0 : selectedReport.id)) return;
@@ -6408,7 +6426,7 @@ $$3({ target: 'Set', proto: true, real: true, forced: !setMethodAcceptSetLike('u
 });
 
 /** Valore speciale usato per indicare "stampa dal browser (anteprima)" */
-const CLIENT_PRINTER_VALUE = "client-printer";
+const CLIENT_PRINTER_VALUE = 'client-printer';
 // ─────────────────────────────────────────────
 // Preview placeholder del documento selezionato
 // ─────────────────────────────────────────────

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@fluxo-dev/shell-reporting",
-  "version": "26.2.2",
+  "version": "26.2.4",
   "peerDependencies": {
     "react": "^18.3.1",
     "@mantine/core": "^7.12.2",
     "react-router-dom": "^6.11.2",
     "react-redux": "^8.0.5",
     "@reduxjs/toolkit": "^1.9.1",
-    "@fluxo-dev/api-client-base": "^26.2.2",
-    "@fluxo-dev/state": "^26.2.2",
-    "@fluxo-dev/ui-components": "^26.2.2",
+    "@fluxo-dev/api-client-base": "^26.2.4",
+    "@fluxo-dev/state": "^26.2.4",
+    "@fluxo-dev/ui-components": "^26.2.4",
     "@devexpress/analytics-core": "23.1.3",
     "devexpress-reporting": "23.1.3",
     "devextreme": "23.1.3",