@topconsultnpm/sdkui-react 6.19.0-dev2.36 → 6.19.0-dev2.37

package/lib/components/base/TMCustomButton.js

@@ -20,7 +20,7 @@ const TMCustomButton = (props) => {
     const { appName: scriptUrl, arguments: args } = button;
     const iframeRef = useRef(null);
     const attributes = useMemo(() => processButtonAttributes(args, formData), [args, formData]);
-    const selectedItemsProcessed = useMemo(() => processSelectedItems(selectedItems), [selectedItems]);
+    const selectedItemsProcessed = useMemo(() => processSelectedItems(args, formData, selectedItems), [args, formData, selectedItems]);
     const RunOnce = button.mode === "RunOnce";
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(false);

package/lib/components/base/TMWaitPanel.js

@@ -33,8 +33,14 @@ const StyledProgressText = styled.p ` font-weight: bold; color: #333; margin: 0;
 const StyledMessage = styled.p ` color: #666; font-size: 0.9em; margin-top: 10px; `;
 const StyledAbortButton = styled.button ` background: #ff4d4d; color: white; border: none; border-radius: 5px; padding: 10px 20px; font-size: 1em; cursor: pointer; margin-top: 20px; &:hover { background: #ff6666; } `;
 export const TMWaitPanel = (props) => {
-    let progressValue1 = 100 * (((props.valuePrimary ?? 0) / (props.maxValuePrimary ?? 0)) || 0);
-    let progressValue2 = 100 * (((props.valueSecondary ?? 0) / (props.maxValueSecondary ?? 0)) || 0);
+    const calculateProgress = (value = 0, maxValue = 0) => {
+        if (maxValue === 0)
+            return 0;
+        const progress = (value / maxValue) * 100;
+        return Number.isFinite(progress) ? progress : 0;
+    };
+    let progressValue1 = calculateProgress(props.valuePrimary, props.maxValuePrimary);
+    let progressValue2 = calculateProgress(props.valueSecondary, props.maxValueSecondary);
     return (_jsx(StyledWaitPanelOverlay, { children: _jsxs(StyledWaitPanel, { "$height": (props.showPrimary && props.showSecondary) ? '350px' : '250px', children: [_jsx(StyledTitle, { children: props.title }), props.showPrimary &&
                     _jsxs("div", { style: { width: '100%', height: '100px' }, children: [_jsx(StyledProgressBarContainer, { children: _jsx(StyledProgressBar, { style: { width: `${progressValue1.toFixed(2)}%` } }) }), _jsxs(StyledProgressText, { children: [progressValue1.toFixed(2), "%"] }), _jsx(StyledMessage, { children: props.textPrimary })] }), props.showSecondary &&
                     _jsxs("div", { style: { width: '100%', height: '100px' }, children: [_jsx(StyledProgressBarContainer, { children: _jsx(StyledProgressBar, { style: { width: `${progressValue2.toFixed(2)}%` } }) }), _jsxs(StyledProgressText, { children: [progressValue2.toFixed(2), "%"] }), _jsx(StyledMessage, { children: props.textSecondary })] }), props.isCancelable && _jsx(StyledAbortButton, { onClick: () => props.onAbortClick?.(props.abortController), children: SDKUI_Localizator.Abort })] }) }));

package/lib/components/features/documents/TMDcmtPreview.js

@@ -15,11 +15,18 @@ import { TMSaveFormButtonPrevious, TMSaveFormButtonNext } from '../../forms/TMSa
 import { StyledAnimatedComponentOpacity } from '../../base/Styled';
 import TMPanel from '../../base/TMPanel';
 import TMTooltip from '../../base/TMTooltip';
+const ErrorContent = ({ error, isAbortError, onRetry }) => {
+    if (isAbortError) {
+        return (_jsx(StyledAnimatedComponentOpacity, { style: { width: '100%', height: '100%' }, children: _jsxs(StyledPanelStatusContainer, { children: [_jsx(IconCloseOutline, { fontSize: 92, color: TMColors.error }), _jsxs(StyledPreviewNotAvailable, { children: [_jsx("div", { children: error }), _jsx("div", { children: SDKUI_Localizator.PreviewNotAvailable })] }), _jsx(TMButton, { caption: SDKUI_Localizator.TryAgain, onClick: onRetry, showTooltip: false })] }) }));
+    }
+    return _jsx(TMNothingToShow, { icon: _jsx(IconCloseOutline, { fontSize: 92, color: TMColors.error }), text: error });
+};
 const TMDcmtPreview = ({ dcmtData, isResizingActive, isVisible, canNext, canPrev, onClosePanel, onNext, onPrev, allowMaximize = true, onMaximizePanel }) => {
     const [dcmtBlob, setDcmtBlob] = useState(undefined);
     const [showPreview, setShowPreview] = useState(false);
     const [isFromCache, setIsFromCache] = useState(false);
     const [error, setError] = useState('');
+    const [isAbortError, setIsAbortError] = useState(false);
     const { abortController, showWaitPanel, waitPanelTitle, showPrimary, waitPanelTextPrimary, waitPanelValuePrimary, waitPanelMaxValuePrimary, showSecondary, waitPanelTextSecondary, waitPanelValueSecondary, waitPanelMaxValueSecondary, getDcmtFileAsync, clearDcmtsFileCache, removeDcmtsFileCache, isDcmtFileInCache } = useDcmtOperations();
     const cacheKey = dcmtData ? `${dcmtData.tid}-${dcmtData.did}` : '00';
     const [hasLoadedDataOnce, setHasLoadedDataOnce] = useState(false);
@@ -29,6 +36,7 @@ const TMDcmtPreview = ({ dcmtData, isResizingActive, isVisible, canNext, canPrev
             setLastLoadedDid(undefined); // Reset 
             setDcmtBlob(undefined);
             setError('');
+            setIsAbortError(false);
             setShowPreview(false);
             return;
         }
@@ -42,6 +50,7 @@ const TMDcmtPreview = ({ dcmtData, isResizingActive, isVisible, canNext, canPrev
         if (shouldFetch) {
             setDcmtBlob(undefined);
             setError('');
+            setIsAbortError(false);
             if ((extensionHandler(dcmtData.fileExt) !== FileExtensionHandler.NONE) && ((dcmtData.fileSize ?? 0) <= (SDKUI_Globals.userSettings.searchSettings.previewThreshold * 1024))) {
                 loadDocumentWithCache();
                 setShowPreview(true);
@@ -65,15 +74,19 @@ const TMDcmtPreview = ({ dcmtData, isResizingActive, isVisible, canNext, canPrev
             let dcmtFile = await getDcmtFileAsync({ TID: dcmtData?.tid, DID: dcmtData?.did, FILEEXT: dcmtData?.fileExt }, rfo, 'Anteprima', false);
             setDcmtBlob(dcmtFile?.file);
             setIsFromCache(!!dcmtFile?.isFromCache);
+            setError('');
+            setIsAbortError(false);
         }
         catch (ex) {
             const err = ex;
             if (err.name === 'CanceledError') {
                 setError('Operazione annullata.');
+                setIsAbortError(true);
                 ShowAlert({ message: err.message, mode: 'warning', duration: 3000, title: 'Abort' });
             }
             else {
                 setError(getExceptionMessage(ex));
+                setIsAbortError(false);
                 TMExceptionBoxManager.show({ exception: ex });
             }
         }
@@ -101,6 +114,9 @@ const TMDcmtPreview = ({ dcmtData, isResizingActive, isVisible, canNext, canPrev
     const reOpenDcmt = async () => {
         removeDcmtsFileCache(cacheKey);
         setIsFromCache(false);
+        setError('');
+        setIsAbortError(false);
+        setDcmtBlob(undefined);
         try {
             await loadDocumentWithCache();
         }
@@ -112,7 +128,7 @@ const TMDcmtPreview = ({ dcmtData, isResizingActive, isVisible, canNext, canPrev
                                 { icon: _jsx(IconCloseCircle, {}), text: SDKUI_Localizator.RemoveFromCache, onClick: () => { removeDcmtsFileCache(cacheKey); setIsFromCache(false); } },
                                 { icon: _jsx(IconClear, {}), text: SDKUI_Localizator.ClearCache, onClick: () => { clearDcmtsFileCache(); setIsFromCache(false); } },
                             ] }, "btn13") }), _jsx(StyledHeaderIcon, { onClick: reOpenDcmt, "$color": TMColors.primaryColor, children: _jsx(TMTooltip, { content: SDKUI_Localizator.ReopenDocument, children: _jsx(IconRefresh, {}) }) })] }), children: error
-                ? _jsx(TMNothingToShow, { icon: _jsx(IconCloseOutline, { fontSize: 92, color: TMColors.error }), text: error })
+                ? _jsx(ErrorContent, { error: error, isAbortError: isAbortError, onRetry: reOpenDcmt })
                 : renderedPreview(dcmtData?.tid, dcmtData?.did, dcmtData?.fileExt, dcmtData?.fileSize, dcmtData?.fileCount, extensionHandler(dcmtData?.fileExt), showPreview, isResizingActive, () => { loadDocumentWithCache(); setShowPreview(true); }, dcmtBlob) }) }));
 };
 export default TMDcmtPreview;

package/lib/helper/SDKUI_Localizator.d.ts

@@ -505,6 +505,7 @@ export declare class SDKUI_Localizator {
     static get RemovingFromList(): string;
     static get RememberCredentials(): "Anmeldedaten merken" | "Remember credentials" | "Recordar credenciales" | "Se souvenir des identifiants" | "Lembrar credenciais" | "Ricorda credenziali";
     static get ReopenDocument(): string;
+    static get TryAgain(): string;
     static get ReplaceDocument(): "Dokument ersetzen" | "Replace Document" | "Reemplazar Documento" | "Remplacer le Document" | "Substituir Documento" | "Sostituisci Documento";
     static get Request(): string;
     static get RequestTo(): string;

package/lib/helper/SDKUI_Localizator.js

@@ -4978,6 +4978,16 @@ export class SDKUI_Localizator {
             default: return "Riapri documento";
         }
     }
+    static get TryAgain() {
+        switch (this._cultureID) {
+            case CultureIDs.De_DE: return "Erneut versuchen";
+            case CultureIDs.En_US: return "Try Again";
+            case CultureIDs.Es_ES: return "Intentar de nuevo";
+            case CultureIDs.Fr_FR: return "Réessayer";
+            case CultureIDs.Pt_PT: return "Tentar novamente";
+            default: return "Riprova";
+        }
+    }
     static get ReplaceDocument() {
         switch (this._cultureID) {
             case CultureIDs.De_DE: return "Dokument ersetzen";

package/lib/helper/dcmtsHelper.d.ts

@@ -4,5 +4,5 @@ export declare const hasDetailRelations: (mTID: number | undefined) => Promise<b
 /** Check if dcmtType (mTID) has configured Master or Many-to-Many relations */
 export declare const hasMasterRelations: (mTID: number | undefined) => Promise<boolean>;
 export declare const isXMLFileExt: (fileExt: string | undefined) => boolean;
-export declare const processButtonAttributes: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined) => string[] | undefined;
-export declare const processSelectedItems: (selectedItems: Array<any> | undefined) => any[] | undefined;
+export declare const processButtonAttributes: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined) => (string | null)[] | undefined;
+export declare const processSelectedItems: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined, selectedItems: Array<any> | undefined) => any[][];

package/lib/helper/dcmtsHelper.js

@@ -25,29 +25,26 @@ export const isXMLFileExt = (fileExt) => {
 };
 /*utility functions for TMCustomButton*/
 export const processButtonAttributes = (args, formData) => args && formData ? formDataMap(formData, args) : undefined;
-export const processSelectedItems = (selectedItems) => selectedItems?.map(item => {
-    const tid = item.TID;
-    if (!tid)
-        return item;
-    const prefix = `${tid}_`;
-    const prefixLength = prefix.length;
-    return Object.keys(item).reduce((acc, key) => {
-        acc[key.startsWith(prefix) ? key.substring(prefixLength) : key] = item[key];
-        return acc;
-    }, {});
-});
-const formDataMap = (data, args) => {
+export const processSelectedItems = (args, formData, selectedItems) => {
+    if (!args || !selectedItems)
+        return [];
+    const MidList = formData ? formDataMap(formData, args, true) : [];
+    return selectedItems.map(item => 
+    //salvo il did come primo elemento dell'array
+    [item["DID"], ...MidList.map(key => key && item[key])]);
+};
+const formDataMap = (data, args, returnMid = false) => {
     const tokens = args.match(/\{@?[^}]+\}/g) || [];
     return tokens.map(token => {
         if (token.startsWith('{@')) {
             // Campo dinamico: {@campo} -> cerca in formData
-            const fieldName = token.slice(2, -1); // Rimuove {@...}
+            const fieldName = token.slice(2, -1);
             const md = data.find(md => md.md?.name === fieldName);
-            return md?.value;
+            return returnMid ? (md ? `${md.tid}_${md.mid}` : null) : (md?.value ?? null);
         }
         else {
-            // Campo statico: {valore} -> ritorna il valore direttamente
-            return token.slice(1, -1); // Rimuove {...}
+            // Campo statico: {valore} -> ritorna il valore o null
+            return returnMid ? null : token.slice(1, -1);
         }
-    }).filter((value) => value !== undefined && value !== null);
+    });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.19.0-dev2.36",
+    "version": "6.19.0-dev2.37",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",