@fluxo-dev/shell-reporting 0.0.38 → 0.0.39

package/index.esm.js

@@ -6,7 +6,5 @@ import '@mantine/core';
 import '@mantine/dates';
 import '@mantine/notifications';
 import '@fluxo-dev/ui-components';
-import 'devexpress-reporting/dx-reportdesigner';
 import 'react-router-dom';
-import 'devexpress-reporting/dx-webdocumentviewer';
 import 'devextreme/localization';

package/index.esm2.js

@@ -1,13 +1,11 @@
 import { EmbeddedModule, FluxoClientSys } from '@fluxo-dev/api-client-base';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { lazy, Suspense, forwardRef, createElement as createElement$2, useState, useEffect, useCallback, useRef } from 'react';
-import { Stack, TextInput, NumberInput, Switch, Loader, Select, Box, Group, Text, Divider, Button, Center, Modal } from '@mantine/core';
+import { Stack, TextInput, NumberInput, Switch, Loader, Select, Box, Group, Text, Divider, Button, Center, LoadingOverlay, Modal } from '@mantine/core';
 import { DatePickerInput } from '@mantine/dates';
 import { showNotification } from '@mantine/notifications';
 import { NoData, ShellPage } from '@fluxo-dev/ui-components';
-import { DxReportDesigner } from 'devexpress-reporting/dx-reportdesigner';
 import { useParams } from 'react-router-dom';
-import { DxReportViewer } from 'devexpress-reporting/dx-webdocumentviewer';
 import { locale } from 'devextreme/localization';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -4944,20 +4942,51 @@ fixRegExpWellKnownSymbolLogic('replace', function (_, nativeReplace, maybeCallNa
   ];
 }, !REPLACE_SUPPORTS_NAMED_GROUPS || !REPLACE_KEEPS_$0 || REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE);
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
+
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
 const ReportDesigner = props => {
-  var _a, _b;
   const {
     id
   } = useParams();
   const [report, setReport] = useState();
   const designerRef = useRef(null);
   const [designerLoaded, setDesignerLoaded] = useState(false);
+  const [designerInstance, setDesignerInstance] = useState(null);
   const requestOptions = {
     host: FluxoClientSys.Instance.clientConfig.fluxoInstanceUrl.replace('/api', ''),
     getDesignerModelAction: "/DXXRD/GetDesignerModel"
   };
   useEffect(() => {
-    //loadMessages(itMessages);
     locale('it');
   }, []);
   useEffect(() => {
@@ -4967,55 +4996,89 @@ const ReportDesigner = props => {
     });
   }, [id]);
   useEffect(() => {
-    if (!report) return;
-    if ((designerRef === null || designerRef === void 0 ? void 0 : designerRef.current) === undefined) return;
-    let designer = null;
-    if (props.mode === 'designer') designer = new DxReportDesigner(designerRef.current, {
-      reportUrl: report.id.toString(),
-      requestOptions
-    });else designer = new DxReportViewer(designerRef.current, {
-      reportUrl: report.id.toString() + '?' + props.reportParameters,
-      requestOptions: {
-        host: FluxoClientSys.Instance.clientConfig.fluxoInstanceUrl.replace('/api', '/'),
-        invokeAction: "DXXRDV"
+    if (!report || !(designerRef === null || designerRef === void 0 ? void 0 : designerRef.current)) return;
+    const loadDesigner = () => __awaiter(void 0, void 0, void 0, function* () {
+      setDesignerLoaded(false);
+      try {
+        let designer;
+        if (props.mode === 'designer') {
+          const {
+            DxReportDesigner
+          } = yield import('devexpress-reporting/dx-reportdesigner');
+          designer = new DxReportDesigner(designerRef.current, {
+            reportUrl: report.id.toString(),
+            requestOptions
+          });
+        } else {
+          const {
+            DxReportViewer
+          } = yield import('devexpress-reporting/dx-webdocumentviewer');
+          designer = new DxReportViewer(designerRef.current, {
+            reportUrl: report.id.toString() + '?' + props.reportParameters,
+            requestOptions: {
+              host: FluxoClientSys.Instance.clientConfig.fluxoInstanceUrl.replace('/api', '/'),
+              invokeAction: "DXXRDV"
+            }
+          });
+        }
+        if (designer) {
+          designer.render();
+          setDesignerInstance(designer);
+          setTimeout(() => setDesignerLoaded(true), 2000);
+        }
+      } catch (error) {
+        console.error('Error loading designer:', error);
       }
     });
-    if (designer) {
-      designer.render();
-      setDesignerLoaded(true);
-    }
-    return () => designer ? designer.dispose() : undefined;
+    loadDesigner();
+    return () => {
+      if (designerInstance) {
+        designerInstance.dispose();
+      }
+    };
   }, [designerRef, report]);
-  return jsx(Fragment, {
-    children: props.mode === 'viewer' ? jsxs(Fragment, {
-      children: [!designerLoaded && jsx(Loader, {}), jsx("div", {
-        style: {
-          width: "100%",
-          height: "calc(100vh - 38px)",
-          marginTop: -16
-        },
-        children: jsx("div", {
-          ref: designerRef
-        })
-      })]
-    }) : jsxs(ShellPage, {
-      withoutPadding: true,
+  const renderContent = () => {
+    if (props.mode === 'viewer') {
+      return jsxs(Box, {
+        pos: 'relative',
+        children: [jsx(LoadingOverlay, {
+          visible: !designerLoaded
+        }), jsx("div", {
+          style: {
+            width: "100%",
+            height: "calc(100vh - 38px)",
+            marginTop: -16
+          },
+          children: jsx("div", {
+            ref: designerRef
+          })
+        })]
+      });
+    }
+    return jsx(ShellPage, {
       headerProps: {
-        title: (_a = report === null || report === void 0 ? void 0 : report.name) !== null && _a !== void 0 ? _a : "Caricamento...",
-        subtitle: (_b = report === null || report === void 0 ? void 0 : report.annotations) !== null && _b !== void 0 ? _b : "...",
-        backButtonTo: "/fluxo/reporting/reports"
+        title: 'Report Designer',
+        subtitle: report === null || report === void 0 ? void 0 : report.name,
+        backButtonTo: '/fluxo/reporting/reports'
       },
-      children: [!designerLoaded && jsx(Loader, {}), jsx("div", {
-        style: {
-          width: "100%",
-          height: "calc(100vh - 153px)"
-        },
-        children: jsx("div", {
-          ref: designerRef
-        })
-      }), " :"]
-    })
-  });
+      withoutPadding: true,
+      children: jsxs(Box, {
+        pos: 'relative',
+        children: [jsx(LoadingOverlay, {
+          visible: !designerLoaded
+        }), jsx("div", {
+          style: {
+            width: "100%",
+            height: "calc(100vh - 151px)"
+          },
+          children: jsx("div", {
+            ref: designerRef
+          })
+        })]
+      })
+    });
+  };
+  return renderContent();
 };
 
 var reportDesigner = /*#__PURE__*/Object.freeze({

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@fluxo-dev/shell-reporting",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "peerDependencies": {
-    "@fluxo-dev/api-client-base": "0.0.38"
+    "@fluxo-dev/api-client-base": "0.0.39"
   },
   "module": "./index.esm.js",
   "type": "module",

package/reports-manager.esm.js

@@ -7,8 +7,6 @@ import { FluxoClientSys } from '@fluxo-dev/api-client-base';
 import { useNavigate } from 'react-router-dom';
 import { showNotification } from '@mantine/notifications';
 import '@mantine/dates';
-import 'devexpress-reporting/dx-reportdesigner';
-import 'devexpress-reporting/dx-webdocumentviewer';
 import 'devextreme/localization';
 
 /**