@topconsultnpm/sdkui-react 6.21.0-dev1.4 → 6.21.0-dev1.41

package/lib/helper/checkinCheckoutManager.js

@@ -259,8 +259,9 @@ export const getDcmtCicoStatus = (dcmt, allUsers, dtd) => {
     let checkoutDate;
     let version = 1;
     let fileExt;
+    let isMetadata = false;
     // ========================================================================
-    // CASO 1: Documento come Array di MetadataValueDescriptorEx
+    // CASO 1: Documento come Array di MetadataValueDescriptorEx: Form del documento
     // ========================================================================
     // Questo formato viene utilizzato quando il documento proviene da query
     // o liste dove ogni metadato è un oggetto separato con proprietà 'md' e 'value'
@@ -279,9 +280,11 @@ export const getDcmtCicoStatus = (dcmt, allUsers, dtd) => {
         version = (versionRaw != null && !isNaN(Number(versionRaw))) ? Number(versionRaw) : 1;
         const fileExtProperty = dcmtsArray.find((item) => item.mid === SystemMIDsAsNumber.FileExt);
         fileExt = fileExtProperty?.value ? fileExtProperty.value.toString() : null;
+        const fileCountProperty = dcmtsArray.find((item) => item.mid === SystemMIDsAsNumber.FileCount);
+        isMetadata = !(fileCountProperty?.value && Number(fileCountProperty.value) > 0);
     }
     // ========================================================================
-    // CASO 2: Documento come Oggetto Piatto (formato standard)
+    // CASO 2: Documento come Oggetto Piatto (formato standard): Risultato della ricerca
     // ========================================================================
     // Questo formato viene utilizzato quando il documento ha proprietà dirette
     // nel formato chiave-valore: TID, DID, e "TID_MetadataID" per i metadati
@@ -290,6 +293,8 @@ export const getDcmtCicoStatus = (dcmt, allUsers, dtd) => {
         const CICO_CheckoutUserID_Meta = dtd.metadata?.find(md => md.name === CICO_MetadataNames.CICO_CheckoutUserID);
         const CICO_CheckoutDate_Meta = dtd.metadata?.find(md => md.name === CICO_MetadataNames.CICO_CheckoutDate);
         const CICO_Version_Meta = dtd.metadata?.find(md => md.name === CICO_MetadataNames.CICO_Version);
+        const fileCountValue = dcmt.FILECOUNT != null ? Number(dcmt.FILECOUNT) : NaN;
+        isMetadata = isNaN(fileCountValue) || fileCountValue <= 0;
         fileExt = dcmt.FILEEXT ? dcmt.FILEEXT.toString() : null;
         // Estrai l'ID dell'utente che ha effettuato il checkout
         if (CICO_CheckoutUserID_Meta?.id) {
@@ -310,6 +315,15 @@ export const getDcmtCicoStatus = (dcmt, allUsers, dtd) => {
         }
     }
     // ========================================================================
+    // EARLY RETURN: Documento di soli metadati (senza file)
+    // ========================================================================
+    if (isMetadata) {
+        return {
+            cicoEnabled: false,
+            checkoutStatus: { isCheckedOut: false, mode: '', version: 1, icon: null, editLockTooltipText: null }
+        };
+    }
+    // ========================================================================
     // COSTRUZIONE DELLO STATO DI CHECKOUT
     // ========================================================================
     let checkoutStatus = {
@@ -345,8 +359,8 @@ export const getDcmtCicoStatus = (dcmt, allUsers, dtd) => {
     // RESTITUZIONE RISULTATO FINALE
     // ========================================================================
     return {
-        // CICO è abilitato se configurato nel DTD e l'utente ha i permessi
-        cicoEnabled: cicoInfo.CICO === 1 && cicoInfo.CanCICO === AccessLevels.Yes && fileExt !== null && fileExt !== '',
+        // CICO è abilitato se configurato nel DTD, l'utente ha i permessi e il documento non è di soli metadati
+        cicoEnabled: cicoInfo.CICO === 1 && cicoInfo.CanCICO === AccessLevels.Yes && fileExt !== null && fileExt !== '' && !isMetadata,
         checkoutStatus: checkoutStatus
     };
 };

package/lib/hooks/useDcmtOperations.d.ts

@@ -21,5 +21,6 @@ export interface UseDcmtOperationsReturn {
     removeDcmtsFileCache: (key: string) => void;
     isDcmtFileInCache: (key: string) => boolean;
     runOperationAsync: (inputDcmts: DcmtInfo[] | undefined, dcmtOperationType: DcmtOperationTypes, actionAfterOperationAsync?: () => Promise<void>) => Promise<void>;
+    FileSourceDialog: () => JSX.Element;
 }
 export declare const useDcmtOperations: () => UseDcmtOperationsReturn;

package/lib/hooks/useDcmtOperations.js

@@ -4,9 +4,19 @@ import { SDK_Globals, RetrieveFileOptions, DcmtOpers, ResultTypes, RecentCategor
 import { ShowAlert, TMResultManager, FormulaHelper, TMExceptionBoxManager, TMSpinner } from '../components';
 import { Globalization, getExceptionMessage, dialogConfirmOperation, extensionHandler, downloadBase64File, SDKUI_Globals, dcmtsFileCacheDownload, CACHE_SIZE_LIMIT, clearDcmtsFileCache, dcmtsFileCachePreview, isDcmtFileInCache, removeDcmtsFileCache, SDKUI_Localizator } from '../helper';
 import { DcmtOperationTypes, DownloadTypes, FileExtensionHandler } from '../ts';
-import { useFileDialog } from './useInputDialog';
+import { useFileDialog, useFileSourceDialog } from './useInputDialog';
 import { isXMLFileExt } from '../helper/dcmtsHelper';
 import { ShowConfirm } from '../components/base/TMConfirm';
+import { useBetaFeatures } from './useBetaFeatures';
+const isScannerLicenseConfigured = () => {
+    try {
+        const scannerLicense = SDKUI_Globals.userSettings.advancedSettings.scannerLicense;
+        return scannerLicense && scannerLicense.trim() !== '';
+    }
+    catch {
+        return false;
+    }
+};
 let abortController = new AbortController();
 const downloadCountMap = new Map();
 const getDownloadFileName = (fileName) => {
@@ -32,6 +42,8 @@ export const useDcmtOperations = () => {
     const [waitPanelValueSecondary, setWaitPanelValueSecondary] = useState(0);
     const [waitPanelMaxValueSecondary, setWaitPanelMaxValueSecondary] = useState(0);
     const { OpenFileDialog } = useFileDialog();
+    const isBetaFeaturesEnabled = useBetaFeatures();
+    const [selectFileSource, FileSourceDialog] = useFileSourceDialog();
     const _downloadDcmtsAsync = async (inputDcmts, downloadMode = "download", onFileDownloaded, skipConfirmation = false) => {
         if (inputDcmts === undefined)
             return;
@@ -210,7 +222,60 @@ export const useDcmtOperations = () => {
             return;
         if (inputDcmts.length <= 0)
             return;
-        let file = inputDcmts[0].FILE ?? await OpenFileDialog();
+        let file = inputDcmts[0].FILE;
+        if (!file) {
+            if (isBetaFeaturesEnabled && isScannerLicenseConfigured()) {
+                const source = await selectFileSource();
+                if (!source)
+                    return;
+                switch (source) {
+                    case 'filesystem':
+                        file = await OpenFileDialog();
+                        break;
+                    case 'scanner-new':
+                        if (SDKUI_Globals.scanRequestHandler) {
+                            file = await new Promise((resolve) => {
+                                SDKUI_Globals.scanRequestHandler('new', (scannedFile) => resolve(scannedFile), () => resolve(undefined));
+                            });
+                        }
+                        else {
+                            ShowAlert({ message: 'Funzionalità scanner non disponibile in questo contesto.', mode: 'info', duration: 3000, title: 'Scanner' });
+                            return;
+                        }
+                        break;
+                    case 'scanner-edit':
+                        if (SDKUI_Globals.scanRequestHandler) {
+                            // Download the existing file from the document
+                            let existingFile;
+                            try {
+                                const rfo = new RetrieveFileOptions();
+                                rfo.retrieveReason = DcmtOpers.None;
+                                const retrievedFile = await SDK_Globals.tmSession?.NewSearchEngine().RetrieveFileAsync(inputDcmts[0].TID, inputDcmts[0].DID, rfo);
+                                existingFile = retrievedFile;
+                            }
+                            catch (ex) {
+                                TMExceptionBoxManager.show({ exception: getExceptionMessage(ex) });
+                                return;
+                            }
+                            if (!existingFile) {
+                                ShowAlert({ message: 'Impossibile recuperare il file del documento.', mode: 'warning', duration: 3000, title: 'Scanner' });
+                                return;
+                            }
+                            file = await new Promise((resolve) => {
+                                SDKUI_Globals.scanRequestHandler('edit', (scannedFile) => resolve(scannedFile), () => resolve(undefined), existingFile);
+                            });
+                        }
+                        else {
+                            ShowAlert({ message: 'Funzionalità scanner non disponibile in questo contesto.', mode: 'info', duration: 3000, title: 'Scanner' });
+                            return;
+                        }
+                        break;
+                }
+            }
+            else {
+                file = await OpenFileDialog();
+            }
+        }
         if (!file)
             return;
         setShowWaitPanel(true);
@@ -489,10 +554,16 @@ export const useDcmtOperations = () => {
             actionAfterOperationAsync?.();
             TMResultManager.show(result, operationTitle, "TID", "DID");
         };
-        dialogConfirmOperation(operationTitle, msg, doOperationAsync);
+        // Per SubstituteFile con beta features e scanner, non mostrare conferma
+        if (dcmtOperationType === DcmtOperationTypes.SubstituteFile && isBetaFeaturesEnabled && isScannerLicenseConfigured()) {
+            await doOperationAsync();
+        }
+        else {
+            dialogConfirmOperation(operationTitle, msg, doOperationAsync);
+        }
     };
     return {
         abortController, showWaitPanel, showPrimary, waitPanelTitle, waitPanelTextPrimary, waitPanelValuePrimary, waitPanelMaxValuePrimary, showSecondary, waitPanelTextSecondary, waitPanelValueSecondary, waitPanelMaxValueSecondary,
-        downloadDcmtsAsync, getDcmtFileAsync, clearDcmtsFileCache, removeDcmtsFileCache, isDcmtFileInCache, runOperationAsync
+        downloadDcmtsAsync, getDcmtFileAsync, clearDcmtsFileCache, removeDcmtsFileCache, isDcmtFileInCache, runOperationAsync, FileSourceDialog
     };
 };

package/lib/hooks/useDocumentOperations.js

@@ -105,10 +105,11 @@ export const useDocumentOperations = (props) => {
     }, [refreshOperationsTrigger]);
     // Context helpers
     const isDcmtFormContext = context === SearchResultContext.DCMT_FORM;
+    const isMasterDetailContext = context === SearchResultContext.MASTER_DETAIL;
     const { showHistory, showHistoryCallback, hideHistoryCallback, showCheckoutInformationForm, commentFormState, hideCommentFormCallback, showCheckoutInformationFormCallback, hideCheckoutInformationFormCallback, copyCheckoutPathToClipboardCallback, handleCheckOutCallback, handleCheckInCallback, showCicoWaitPanel, cicoWaitPanelTitle, showCicoPrimaryProgress, cicoPrimaryProgressText, cicoPrimaryProgressValue, cicoPrimaryProgressMax, } = useCheckInOutOperations({
         onRefreshPreview: onRefreshPreviewCallback
     });
-    const { abortController, showWaitPanel, waitPanelTitle, showPrimary, waitPanelTextPrimary, waitPanelValuePrimary, waitPanelMaxValuePrimary, showSecondary, waitPanelTextSecondary, waitPanelValueSecondary, waitPanelMaxValueSecondary, downloadDcmtsAsync, runOperationAsync, getDcmtFileAsync, clearDcmtsFileCache, removeDcmtsFileCache, isDcmtFileInCache } = useDcmtOperations();
+    const { abortController, showWaitPanel, waitPanelTitle, showPrimary, waitPanelTextPrimary, waitPanelValuePrimary, waitPanelMaxValuePrimary, showSecondary, waitPanelTextSecondary, waitPanelValueSecondary, waitPanelMaxValueSecondary, downloadDcmtsAsync, runOperationAsync, getDcmtFileAsync, clearDcmtsFileCache, removeDcmtsFileCache, isDcmtFileInCache, FileSourceDialog } = useDcmtOperations();
     const { 
     // Data
     relatedDcmts, pairedSearchResults, manyToManyRelations, selectedManyToManyRelation, manyToManyChooserDataSource, relatedDcmtsChooserDataSource, 
@@ -632,7 +633,7 @@ export const useDocumentOperations = (props) => {
     const checkinMenuItem = () => {
         // Take the first document (used for validation checks)
         let dcmt = focusedItem;
-        if (isDcmtFormContext) {
+        if (isDcmtFormContext || isMasterDetailContext) {
             dcmt = dcmtDataRowForCicoStatus;
         }
         const { cicoEnabled, checkoutStatus } = getDcmtCicoStatus(dcmt, allUsers, dtd);
@@ -1059,9 +1060,13 @@ export const useDocumentOperations = (props) => {
                 disabled: isDisabledForSingleRow() && isDisabledForMultiRow(),
                 submenu: [
                     addToFavoriteOperation(),
-                    openFormOperation(),
+                    addReplaceFileOperation(),
+                    fileCheckMenuItem(),
+                    fileConversionsMenuItem(),
+                    ...(SDK_Globals.tmSession?.SessionDescr?.appModuleID === AppModules.SURFER ? [createContextualTaskMenuItem()] : []),
                     downloadFileMenuItem(),
                     downloadXMLAttachmentsMenuItem(),
+                    ...(selectedDcmtInfos.length > 0 && isPdfEditorAvailable(dtd, selectedDcmtInfos[0]?.FILEEXT) && onOpenPdfEditorRequest ? [pdfEditorMenuItem(onOpenPdfEditorRequest)] : []),
                 ]
             },
             signatureMenuItem(),
@@ -1081,6 +1086,7 @@ export const useDocumentOperations = (props) => {
                     ...(inputDcmtFormLayoutMode === LayoutModes.Update ? [addToFavoriteOperation()] : []),
                     addReplaceFileOperation(),
                     openFormOperation(),
+                    deletetionMenuItem(),
                     fileCheckMenuItem(),
                     fileConversionsMenuItem(),
                     ...(SDK_Globals.tmSession?.SessionDescr?.appModuleID === AppModules.SURFER ? [createContextualTaskMenuItem()] : []),
@@ -1090,6 +1096,7 @@ export const useDocumentOperations = (props) => {
                 ]
             },
             signatureMenuItem(),
+            checkinMenuItem(),
             ...((inputDcmtFormLayoutMode === LayoutModes.Update) ? [fullTextSearchMenuItem()] : []),
         ];
     };
@@ -1115,10 +1122,7 @@ export const useDocumentOperations = (props) => {
     };
     const renderFloatingBar = (floatingBarContainerRef && floatingBarContainerRef.current && allowFloatingBar && showFloatingBar && deviceType !== DeviceType.MOBILE) ? (_jsx(TMFloatingMenuBar, { containerRef: floatingBarContainerRef, contextMenuItems: operationItems(), isConstrained: true, defaultPosition: { x: 1, y: 88 }, defaultPinnedItems: ['rel-det', 'rel-mst', 'dl'], defaultOrientation: 'horizontal', hasContextMenu: false, pinnedItemIds: pinnedItemIds, onPinChange: setPinnedItemIds })) : null;
     const renderDcmtOperations = (_jsxs(_Fragment, { children: [(showExportForm && searchResult && dataColumns && dataSource && selectedRowKeys) && (_jsx(TMDataGridExportForm, { dataColumns: dataColumns, dataSource: dataSource, selectedRowKeys: selectedRowKeys, onCloseExportForm: () => setShowExportForm(false), searchResult: searchResult })), _jsx(StyledMultiViewPanel, { "$isVisible": isOpenDcmtForm, children: ((isOpenDcmtForm && focusedItem?.TID !== undefined && focusedItem?.DID !== undefined) &&
-                    _jsx(TMDcmtForm, { isModal: openDcmtFormAsModal || (dcmtFormLayoutMode === LayoutModes.Ark && focusedItem?.DID !== undefined), titleModal: dtd?.name ?? '', TID: focusedItem.TID, DID: focusedItem.DID, allowButtonsRefs: true, layoutMode: dcmtFormLayoutMode, count: visibleItems?.length, itemIndex: visibleItems ? visibleItems.findIndex(o => o.rowIndex === focusedItem?.rowIndex) + 1 : undefined, canNext: canNavigateHandler ? canNavigateHandler('next') : false, canPrev: canNavigateHandler ? canNavigateHandler('prev') : false, onNext: () => onNavigateHandler && onNavigateHandler('next'), onPrev: () => onNavigateHandler && onNavigateHandler('prev'), onClose: () => {
-                            (false);
-                            onDcmtFormOpenChange(false, LayoutModes.Update);
-                        }, onWFOperationCompleted: onWFOperationCompleted, onTaskCreateRequest: onTaskCreateRequest, onSavedAsyncCallback: onSavedAsyncCallback, openS4TViewer: openS4TViewer, onOpenS4TViewerRequest: onOpenS4TViewerRequest, onOpenPdfEditorRequest: onOpenPdfEditorRequest, onReferenceClick: onReferenceClick, allTasks: allTasks, getAllTasks: getAllTasks, deleteTaskByIdsCallback: deleteTaskByIdsCallback, addTaskCallback: addTaskCallback, editTaskCallback: editTaskCallback, handleNavigateToWGs: handleNavigateToWGs, handleNavigateToDossiers: handleNavigateToDossiers, moreInfoTasks: getMoreInfoTasksForDocument(allTasks, focusedItem?.TID, focusedItem?.DID), showDcmtFormSidebar: showDcmtFormSidebar, datagridUtility: {
+                    _jsx(TMDcmtForm, { isModal: openDcmtFormAsModal || (dcmtFormLayoutMode === LayoutModes.Ark && focusedItem?.DID !== undefined), titleModal: dtd?.name ?? '', TID: focusedItem.TID, DID: focusedItem.DID, allowButtonsRefs: true, layoutMode: dcmtFormLayoutMode, count: visibleItems?.length, itemIndex: visibleItems ? visibleItems.findIndex(o => o.rowIndex === focusedItem?.rowIndex) + 1 : undefined, canNext: canNavigateHandler ? canNavigateHandler('next') : false, canPrev: canNavigateHandler ? canNavigateHandler('prev') : false, onNext: () => onNavigateHandler && onNavigateHandler('next'), onPrev: () => onNavigateHandler && onNavigateHandler('prev'), onClose: () => { (false); onDcmtFormOpenChange(false, LayoutModes.Update); }, onWFOperationCompleted: onWFOperationCompleted, onTaskCreateRequest: onTaskCreateRequest, onSavedAsyncCallback: onSavedAsyncCallback, openS4TViewer: openS4TViewer, onOpenS4TViewerRequest: onOpenS4TViewerRequest, onOpenPdfEditorRequest: onOpenPdfEditorRequest, openFileUploaderPdfEditor: openFileUploaderPdfEditor, onReferenceClick: onReferenceClick, allTasks: allTasks, getAllTasks: getAllTasks, deleteTaskByIdsCallback: deleteTaskByIdsCallback, addTaskCallback: addTaskCallback, editTaskCallback: editTaskCallback, handleNavigateToWGs: handleNavigateToWGs, handleNavigateToDossiers: handleNavigateToDossiers, moreInfoTasks: getMoreInfoTasksForDocument(allTasks, focusedItem?.TID, focusedItem?.DID), showDcmtFormSidebar: showDcmtFormSidebar, datagridUtility: {
                             onRefreshSearchAsyncDatagrid,
                             onRefreshDataRowsAsync,
                             refreshFocusedDataRowAsync,
@@ -1184,7 +1188,7 @@ export const useDocumentOperations = (props) => {
                     updateBatchUpdateForm(false);
                     setIsModifiedBatchUpdate(false);
                     await onRefreshDataRowsAsync?.();
-                }, onStatusChanged: (isModified) => { setIsModifiedBatchUpdate(isModified); } }), showApprovePopup && _jsx(WorkFlowApproveRejectPopUp, { deviceType: deviceType, onCompleted: handleWFOperationCompleted, selectedItems: selectedDcmtInfos, isReject: 0, onClose: () => updateShowApprovePopup(false) }), showRejectPopup && _jsx(WorkFlowApproveRejectPopUp, { deviceType: deviceType, onCompleted: handleWFOperationCompleted, selectedItems: selectedDcmtInfos, isReject: 1, onClose: () => updateShowRejectPopup(false) }), showReAssignPopup && _jsx(WorkFlowReAssignPopUp, { deviceType: deviceType, onCompleted: handleWFOperationCompleted, selectedItems: selectedDcmtInfos, onClose: () => updateShowReAssignPopup(false) }), showMoreInfoPopup && _jsx(WorkFlowMoreInfoPopUp, { fromDTD: dtd, TID: contextConfig.approvalTID, DID: focusedItem?.DID, deviceType: deviceType, onCompleted: handleWFOperationCompleted, onClose: () => updateShowMoreInfoPopup(false), allTasks: allTasks, getAllTasks: getAllTasks, deleteTaskByIdsCallback: deleteTaskByIdsCallback, addTaskCallback: addTaskCallback, editTaskCallback: editTaskCallback, handleNavigateToWGs: handleNavigateToWGs, handleNavigateToDossiers: handleNavigateToDossiers, triggerBlogRefresh: onRefreshBlogDatagrid }), _jsx(ConfirmFormatDialog, {}), _jsx(ConfirmAttachmentsDialog, {}), taskFormDialogComponent, s4TViewerDialogComponent, currentCustomButton && _jsx(TMCustomButton, { button: currentCustomButton, formData: currentMetadataValues, selectedItems: selectedItemsFull, onClose: () => setCurrentCustomButton(undefined) })] }));
+                }, onStatusChanged: (isModified) => { setIsModifiedBatchUpdate(isModified); } }), showApprovePopup && _jsx(WorkFlowApproveRejectPopUp, { deviceType: deviceType, onCompleted: handleWFOperationCompleted, selectedItems: selectedDcmtInfos, isReject: 0, onClose: () => updateShowApprovePopup(false) }), showRejectPopup && _jsx(WorkFlowApproveRejectPopUp, { deviceType: deviceType, onCompleted: handleWFOperationCompleted, selectedItems: selectedDcmtInfos, isReject: 1, onClose: () => updateShowRejectPopup(false) }), showReAssignPopup && _jsx(WorkFlowReAssignPopUp, { deviceType: deviceType, onCompleted: handleWFOperationCompleted, selectedItems: selectedDcmtInfos, onClose: () => updateShowReAssignPopup(false) }), showMoreInfoPopup && _jsx(WorkFlowMoreInfoPopUp, { fromDTD: dtd, TID: contextConfig.approvalTID, DID: focusedItem?.DID, deviceType: deviceType, onCompleted: handleWFOperationCompleted, onClose: () => updateShowMoreInfoPopup(false), allTasks: allTasks, getAllTasks: getAllTasks, deleteTaskByIdsCallback: deleteTaskByIdsCallback, addTaskCallback: addTaskCallback, editTaskCallback: editTaskCallback, handleNavigateToWGs: handleNavigateToWGs, handleNavigateToDossiers: handleNavigateToDossiers, triggerBlogRefresh: onRefreshBlogDatagrid }), _jsx(ConfirmFormatDialog, {}), _jsx(ConfirmAttachmentsDialog, {}), _jsx(FileSourceDialog, {}), taskFormDialogComponent, s4TViewerDialogComponent, currentCustomButton && _jsx(TMCustomButton, { button: currentCustomButton, formData: currentMetadataValues, selectedItems: selectedItemsFull, onClose: () => setCurrentCustomButton(undefined) })] }));
     return {
         operationItems: operationItems(),
         renderFloatingBar,
@@ -1237,6 +1241,7 @@ export const useDocumentOperations = (props) => {
                 removeDcmtsFileCache,
                 isDcmtFileInCache,
                 runOperationAsync,
+                FileSourceDialog,
             },
             relatedDocumentsInfo: {
                 // Data

package/lib/hooks/useForm.js

@@ -94,21 +94,27 @@ export function useSaveForm(formMode, id, sfo, validator, onSaved, onStatusChang
     const saveDataAsync = async (...args) => {
         if (!formData)
             return;
-        let newId = -1;
-        if (saveCustomAsync)
-            newId = await saveCustomAsync();
-        else
-            newId = await setDataAsync?.(formMode, formData, ...args);
-        let newData;
-        if (sfo.loadDataAfterSave)
-            newData = await loadDataAsync(newId, FormModes.Update);
-        else {
-            newData = formData;
-            newData.id = newId;
-            setFormData(newData);
-            setFormDataOrig(newData);
+        try {
+            TMSpinner.show({ description: `${SDKUI_Localizator.SavingInProgress}...`, backgroundColor: 'transparent' });
+            let newId = -1;
+            if (saveCustomAsync)
+                newId = await saveCustomAsync();
+            else
+                newId = await setDataAsync?.(formMode, formData, ...args);
+            let newData;
+            if (sfo.loadDataAfterSave)
+                newData = await loadDataAsync(newId, FormModes.Update);
+            else {
+                newData = formData;
+                newData.id = newId;
+                setFormData(newData);
+                setFormDataOrig(newData);
+            }
+            onSaved?.(newData);
+        }
+        finally {
+            TMSpinner.hide();
         }
-        onSaved?.(newData);
     };
     useEffect(() => { id && loadDataAsync(id, formMode); }, [id, formMode]);
     useEffect(() => {

package/lib/hooks/useInputDialog.d.ts

@@ -7,3 +7,5 @@ export declare const useInputAttachmentsDialog: () => {
     openConfirmAttachmentsDialog: (list: FileDescriptor[]) => Promise<string[] | undefined>;
     ConfirmAttachmentsDialog: () => import("react/jsx-runtime").JSX.Element | null;
 };
+export type FileSourceType = 'filesystem' | 'scanner-new' | 'scanner-edit' | undefined;
+export declare const useFileSourceDialog: () => [() => Promise<FileSourceType>, () => JSX.Element];

package/lib/hooks/useInputDialog.js

@@ -103,3 +103,37 @@ export const useInputAttachmentsDialog = () => {
     };
     return { openConfirmAttachmentsDialog, ConfirmAttachmentsDialog };
 };
+const fileSourceOptions = [
+    { value: 'filesystem', display: 'Da file system' },
+    { value: 'scanner-new', display: 'Da scanner (nuova scansione)' },
+    { value: 'scanner-edit', display: 'Da scanner (modifica scansione)' },
+];
+export const useFileSourceDialog = () => {
+    const [promise, setPromise] = useState(null);
+    const [open, setOpen] = useState(false);
+    const handleClose = () => {
+        setOpen(false);
+        setPromise(null);
+    };
+    const handleConfirm = (source) => {
+        promise?.resolve(source);
+        handleClose();
+    };
+    const handleCancel = () => {
+        promise?.resolve(undefined);
+        handleClose();
+    };
+    const FileSourceDialog = () => {
+        const [source, setSource] = useState('filesystem');
+        return (open ?
+            _jsx(TMModal, { title: SDKUI_Localizator.AddOrSubstFile, height: "max-content", width: "320px", onClose: handleCancel, children: _jsxs("div", { style: { display: 'flex', flexDirection: 'column', gap: '5px', padding: '10px', height: '100%' }, children: [_jsx(TMRadioButton, { dataSource: fileSourceOptions, direction: 'column', value: source, onValueChanged: (newValue) => { setSource(newValue); } }), _jsxs("div", { style: { display: 'flex', flexDirection: 'row', gap: '5px', paddingTop: '10px', justifyContent: 'center', alignItems: 'center', height: '50px' }, children: [_jsx(TMButton, { btnStyle: "advanced", showTooltip: false, icon: _jsx(IconApply, {}), caption: "OK", advancedColor: TMColors.tertiary, onClick: () => handleConfirm(source) }), _jsx(TMButton, { btnStyle: "advanced", showTooltip: false, icon: _jsx(IconCloseOutline, {}), caption: SDKUI_Localizator.Cancel, onClick: handleCancel })] })] }) })
+            : _jsx(_Fragment, {}));
+    };
+    const selectFileSource = () => {
+        return new Promise((resolve) => {
+            setOpen(true);
+            setPromise({ resolve });
+        });
+    };
+    return [selectFileSource, FileSourceDialog];
+};

package/lib/hooks/useQueryParametersDialog.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import { QueryParameterDescriptor } from '@topconsultnpm/sdk-ts';
-import { TMModal, TMTextBox, TMButton } from "../components";
+import { TMModal, TMTextBox, TMButton, TMCard, StyledDivHorizontal } from "../components";
 import { IconApply, IconCloseOutline, SDKUI_Localizator } from "../helper";
-import { TMColors } from "../utils/theme";
+import { TMColors, TMMargin } from "../utils/theme";
 const paramPrefix = "{@QueryParam";
 export const useQueryParametersDialog = () => {
     const [promise, setPromise] = useState(null);
@@ -56,15 +56,15 @@ export const useQueryParametersDialog = () => {
     };
     const ConfirmQueryParamsDialog = () => {
         return (open ?
-            _jsx(TMModal, { title: SDKUI_Localizator.QueryParamBind, height: "max-content", width: "400px", onClose: handleClose, children: _jsxs("div", { style: { display: 'flex', flexDirection: 'column', gap: '5px', padding: '10px', height: '100%' }, children: [qdParams.map((qdp, index) => {
-                            return (_jsx(TMTextBox, { placeHolder: `${SDKUI_Localizator.EnterValue} ...`, label: qdp.name, autoFocus: index == 0, value: qdp.value ?? '', onValueChanged: (e) => {
+            _jsx(TMModal, { title: SDKUI_Localizator.QueryParamBind, height: `${qdParams.length > 0 ? (qdParams.length * 73) + 73 : 100}px`, width: "400px", onClose: handleClose, children: _jsxs(TMCard, { scrollX: true, height: "100%", children: [qdParams.map((qdp, index) => {
+                            return (_jsx(TMTextBox, { elementStyle: { marginBottom: TMMargin.smallMargin }, placeHolder: `${SDKUI_Localizator.EnterValue} ...`, label: qdp.name, autoFocus: index == 0, value: qdp.value ?? '', onValueChanged: (e) => {
                                     let newQdp = qdParamsOut.find(o => o.id == qdp.id);
                                     if (newQdp)
                                         newQdp.value = e.target.value;
                                     else
                                         qdParamsOut.push({ id: qdp.id, name: qdp.name, value: e.target.value });
                                 } }, qdp.id));
-                        }), _jsxs("div", { style: { display: 'flex', flexDirection: 'row', gap: '5px', paddingTop: '10px', justifyContent: 'flex-end', alignItems: 'center', height: '50px' }, children: [_jsx(TMButton, { btnStyle: "advanced", showTooltip: false, icon: _jsx(IconApply, {}), caption: "OK", advancedColor: TMColors.tertiary, onClick: handleConfirm }), _jsx(TMButton, { btnStyle: "advanced", showTooltip: false, icon: _jsx(IconCloseOutline, {}), caption: SDKUI_Localizator.Cancel, onClick: handleCancel })] })] }) })
+                        }), _jsxs(StyledDivHorizontal, { style: { gap: 10, marginBottom: TMMargin.smallMargin, width: '100%', alignItems: 'center' }, children: [_jsx(TMButton, { btnStyle: "advanced", showTooltip: false, icon: _jsx(IconApply, {}), caption: "OK", advancedColor: TMColors.tertiary, onClick: handleConfirm }), _jsx(TMButton, { btnStyle: "advanced", showTooltip: false, icon: _jsx(IconCloseOutline, {}), caption: SDKUI_Localizator.Cancel, onClick: handleCancel })] })] }) })
             : _jsx(_Fragment, {}));
     };
     return [confirmQueryParams, ConfirmQueryParamsDialog];

package/package.json

@@ -1,57 +1,57 @@
 {
-    "name":  "@topconsultnpm/sdkui-react",
-    "version":  "6.21.0-dev1.4",
-    "description":  "",
-    "scripts":  {
-                    "test":  "echo \"Error: no test specified\" \u0026\u0026 exit 1",
-                    "clean":  "powershell Remove-Item lib/ -recurse",
-                    "copy-files":  "copyfiles -u 1 src/assets/*.* src/assets/ImageLibrary/*.* src/assets/thumbnails/*.* src/assets/IconsS4t/*.* src/assets/Metadata/*.* src/css/tm-sdkui.css lib/",
-                    "tm-build":  "npm run clean \u0026\u0026 tsc \u0026\u0026 npm run copy-files",
-                    "tm-watch":  "tsc -w",
-                    "tm-publish":  "npm publish --tag latest",
-                    "tm-publish_wl":  "npm publish",
-                    "storybook":  "storybook dev -p 6006",
-                    "build-storybook":  "storybook build"
-                },
-    "author":  "TopConsult",
-    "license":  "ISC",
-    "devDependencies":  {
-                            "@chromatic-com/storybook":  "^4.1.3",
-                            "@storybook/addon-docs":  "^10.1.0",
-                            "@storybook/addon-onboarding":  "^10.1.0",
-                            "@storybook/react-vite":  "^10.1.0",
-                            "@types/htmlparser2":  "^3.10.7",
-                            "@types/node":  "^20.2.5",
-                            "@types/react":  "^18.3.3",
-                            "@types/react-dom":  "^18.3.3",
-                            "copyfiles":  "^2.4.1",
-                            "esbuild":  "^0.25.0",
-                            "react":  "^18.3.1",
-                            "react-dom":  "^18.3.1",
-                            "storybook":  "^10.1.0",
-                            "typescript":  "^5.9.3",
-                            "vite":  "^6.1.1"
-                        },
-    "main":  "dist/cjs/index.js",
-    "types":  "./index.d.ts",
-    "module":  "lib/esm/index.js",
-    "files":  [
-                  "dist",
-                  "lib"
-              ],
-    "dependencies":  {
-                         "react-router-dom":  "^6.15.0",
-                         "react-pdf":  "^10.3.0",
-                         "htmlparser2":  "^10.0.0",
-                         "buffer":  "^6.0.3",
-                         "@topconsultnpm/sdk-ts":  "6.20.0",
-                         "exceljs":  "^4.4.0",
-                         "devextreme":  "25.2.4",
-                         "styled-components":  "^6.1.1",
-                         "pdfjs-dist":  "5.4.296",
-                         "devextreme-react":  "25.2.4"
-                     },
-    "overrides":  {
-                      "esbuild":  "^0.25.0"
-                  }
+    "name": "@topconsultnpm/sdkui-react",
+    "version": "6.21.0-dev1.41",
+    "description": "",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "clean": "powershell Remove-Item lib/ -recurse",
+        "copy-files": "copyfiles -u 1 src/assets/*.* src/assets/ImageLibrary/*.* src/assets/thumbnails/*.* src/assets/IconsS4t/*.* src/assets/Metadata/*.* src/css/tm-sdkui.css lib/",
+        "tm-build": "npm run clean && tsc && npm run copy-files",
+        "tm-watch": "tsc -w",
+        "tm-publish": "npm publish --tag latest",
+        "tm-publish_wl": "npm publish",
+        "storybook": "storybook dev -p 6006",
+        "build-storybook": "storybook build"
+    },
+    "author": "TopConsult",
+    "license": "ISC",
+    "devDependencies": {
+        "@chromatic-com/storybook": "^5.1.2",
+        "@storybook/addon-docs": "^10.3.5",
+        "@storybook/addon-onboarding": "^10.3.5",
+        "@storybook/react-vite": "^10.3.5",
+        "@types/htmlparser2": "^3.10.7",
+        "@types/node": "^24.12.2",
+        "@types/react": "^18.3.3",
+        "@types/react-dom": "^18.3.3",
+        "copyfiles": "^2.4.1",
+        "esbuild": "^0.25.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "storybook": "^10.3.5",
+        "typescript": "^5.9.3",
+        "vite": "^6.1.1"
+    },
+    "main": "dist/cjs/index.js",
+    "types": "./index.d.ts",
+    "module": "lib/esm/index.js",
+    "files": [
+        "dist",
+        "lib"
+    ],
+    "dependencies": {
+        "@topconsultnpm/sdk-ts": "6.21.0-dev1.5",
+        "buffer": "^6.0.3",
+        "devextreme": "^25.2.6",
+        "devextreme-react": "^25.2.6",
+        "exceljs": "^4.4.0",
+        "htmlparser2": "^10.0.0",
+        "pdfjs-dist": "5.4.296",
+        "react-pdf": "^10.3.0",
+        "react-router-dom": "^6.15.0",
+        "styled-components": "^6.1.1"
+    },
+    "overrides": {
+        "esbuild": "^0.25.0"
+    }
 }