@topconsultnpm/sdkui-react 6.22.0-dev2.40 → 6.22.0-dev2.42

package/lib/components/features/documents/TMMergeToPdfForm.d.ts

@@ -17,8 +17,7 @@ interface ITMMergeToPdfFormProps {
 }
 /**
  * Form per l'unione di più documenti PDF in un singolo file.
- * Condivide TMDownloadRelationViewerSection e gli helper in copyAndMergeDcmtsShared
- * con TMCopyToFolderForm.
+ * Condivide TMDownloadRelationViewerSection e gli helper in copyAndMergeDcmtsShared con TMCopyToFolderForm.
  */
 declare const TMMergeToPdfForm: (props: ITMMergeToPdfFormProps) => import("react/jsx-runtime").JSX.Element;
 export default TMMergeToPdfForm;

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

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useRef, useState } from 'react';
 import { DownloadTypes } from '../../../ts';
 import { calcResponsiveSizes, getExceptionMessage, IconFolderOpen, IconPlay, IconUndo, SDKUI_Globals, SDKUI_Localizator, } from '../../../helper';
-import { DcmtOpers, FileFormats, GeneralRetrieveFormats, ResultTypes, RetrieveFileOptions, ValidationItem, } from '@topconsultnpm/sdk-ts';
+import { DcmtOpers, FileFormats, GeneralRetrieveFormats, InvoiceRetrieveFormats, OrderRetrieveFormats, ResultTypes, RetrieveFileOptions, ValidationItem, } from '@topconsultnpm/sdk-ts';
 import TMModal from '../../base/TMModal';
 import { useDeviceType } from '../../base/TMDeviceProvider';
 import TMTextBox from '../../editors/TMTextBox';
@@ -18,10 +18,35 @@ import ShowAlert from '../../base/TMAlert';
 import TMTooltip from '../../base/TMTooltip';
 import MergePdfManager from '../../../helper/MergePdfManager';
 import { TMResultManager } from '../../forms/TMResultDialog';
+/**
+ * Converte il formato di visualizzazione fatture impostato dall'utente nel corrispondente formato PDF:
+ * il foglio di stile SDI resta SDI, in tutti gli altri casi si usa ASW.
+ */
+const toPdfInvoiceRetrieveFormat = (format) => {
+    switch (format) {
+        case InvoiceRetrieveFormats.SDI_HTML:
+        case InvoiceRetrieveFormats.SDI_PDF:
+            return InvoiceRetrieveFormats.SDI_PDF;
+        default:
+            return InvoiceRetrieveFormats.ASW_PDF;
+    }
+};
+/**
+ * Converte il formato di visualizzazione ordini impostato dall'utente nel corrispondente formato PDF:
+ * il foglio di stile NSO resta NSO, in tutti gli altri casi si usa ER.
+ */
+const toPdfOrderRetrieveFormat = (format) => {
+    switch (format) {
+        case OrderRetrieveFormats.NSO_HTML:
+        case OrderRetrieveFormats.NSO_PDF:
+            return OrderRetrieveFormats.NSO_PDF;
+        default:
+            return OrderRetrieveFormats.ER_PDF;
+    }
+};
 /**
  * Form per l'unione di più documenti PDF in un singolo file.
- * Condivide TMDownloadRelationViewerSection e gli helper in copyAndMergeDcmtsShared
- * con TMCopyToFolderForm.
+ * Condivide TMDownloadRelationViewerSection e gli helper in copyAndMergeDcmtsShared con TMCopyToFolderForm.
  */
 const TMMergeToPdfForm = (props) => {
     const { mode, selectedDcmtInfos, selectedItemsFull, onClose, showTMRelationViewer, allTasks, getAllTasks, deleteTaskByIdsCallback, addTaskCallback, editTaskCallback, handleNavigateToWGs, handleNavigateToDossiers } = props;
@@ -169,8 +194,8 @@ const TMMergeToPdfForm = (props) => {
             rfo.retrieveReason = DcmtOpers.None;
             rfo.generalRetrieveFormat = GeneralRetrieveFormats.OriginalUnsigned;
             rfo.cvtFormat = FileFormats.PDF;
-            rfo.invoiceRetrieveFormat = SDKUI_Globals.userSettings?.searchSettings.invoiceRetrieveFormat;
-            rfo.orderRetrieveFormat = SDKUI_Globals.userSettings?.searchSettings.orderRetrieveFormat;
+            rfo.invoiceRetrieveFormat = toPdfInvoiceRetrieveFormat(SDKUI_Globals.userSettings?.searchSettings.invoiceRetrieveFormat);
+            rfo.orderRetrieveFormat = toPdfOrderRetrieveFormat(SDKUI_Globals.userSettings?.searchSettings.orderRetrieveFormat);
             const collectFileForMerge = async (file, dcmtInfo) => {
                 pdfFilesMap.set(`${dcmtInfo.TID}_${dcmtInfo.DID}`, file);
             };

package/lib/components/features/search/TMSearchResult.js

@@ -1510,9 +1510,9 @@ const TMSearchResultGrid = ({ openInOffice, fromDTD, operationItems, allUsers, i
     return _jsxs("div", { style: { width: "100%", height: "100%" }, children: [!isDataGridReady && (_jsxs("div", { style: { display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100%', width: '100%', gap: '10px' }, children: [_jsx(LoadIndicator, { height: 60, width: 60 }), _jsx("div", { children: SDKUI_Localizator.Loading })] })), isDataGridReady && _jsx(TMDataGrid, { ref: dataGridRef, id: "tm-search-result", keyExpr: "rowIndex", dataColumns: dataColumns, dataSource: dataSource, customizeColumns: customizeColumns, repaintChangesOnly: true, selectedRowKeys: selectedRowKeys, focusedRowKey: disableAutoFocus ? undefined : Number(focusedItem?.rowIndex ?? 0), showSearchPanel: showSearchTMDatagrid, showFilterPanel: true, sorting: { mode: "multiple" }, selection: { mode: allowMultipleSelection ? 'multiple' : 'single' }, pageSize: pageSize, compactPager: compactPager, onSelectionChanged: handleSelectionChange, onFocusedRowChanged: handleFocusedRowChange, onRowDblClick: onRowDblClick, onContentReady: onContentReady, showHeaderColumnChooser: true, onKeyDown: onKeyDown, customContextMenuItems: operationItems, counterConfig: gridCounterConfig })] });
 };
 //#region TMSearchResultSelector
-const StyledItemTemplate = styled.div ` 
-    background: ${(props) => props.$isSelected ? 'oklch(from var(--dx-color-primary) l c h / .2) !important' : 'transparent'};
-    cursor: pointer; 
+const StyledItemTemplate = styled.div ` 
+    background: ${(props) => props.$isSelected ? 'oklch(from var(--dx-color-primary) l c h / .2) !important' : 'transparent'};
+    cursor: pointer; 
 `;
 const MemoizedStyledItemTemplate = React.memo(StyledItemTemplate);
 const TMSearchResultSelector = ({ searchResults = [], disableAccordionIfSingleCategory = false, selectedTID, selectedSearchResult, autoSelectFirst = true, onSelectionChanged }) => {
@@ -1719,85 +1719,85 @@ const TMDcmtPreviewWrapper = ({ refreshPreviewTrigger, currentDcmt, isVisible, i
     return (_jsx(TMDcmtPreview, { dcmtData: currentDcmt, onClosePanel: (!isMobile && countVisibleLeafPanels() > 1) ? () => setPanelVisibilityById('tmDcmtPreview', false) : undefined, onBack: onBack, allowMaximize: !isMobile && countVisibleLeafPanels() > 1, onMaximizePanel: (!isMobile && countVisibleLeafPanels() > 1) ? () => toggleMaximize("tmDcmtPreview") : undefined, isResizingActive: isResizingActive, isVisible: isVisible && isPageVisible }, refreshPreviewTrigger));
 };
 // Styled Components
-const StyledPlaceholder = styled.div `
-    padding: 20px;
-    text-align: center;
-    color: #888;
+const StyledPlaceholder = styled.div `
+    padding: 20px;
+    text-align: center;
+    color: #888;
 `;
-const StyledIndexingInfoSection = styled.div `
-    padding: 15px;
-    border-top: 1px solid #e0e0e0;
-    background: linear-gradient(to bottom, #f9f9f9, #f5f5f5);
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
+const StyledIndexingInfoSection = styled.div `
+    padding: 15px;
+    border-top: 1px solid #e0e0e0;
+    background: linear-gradient(to bottom, #f9f9f9, #f5f5f5);
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
 `;
-const StyledIndexingToggle = styled.button `
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-    padding: 10px 16px;
-    background: white;
-    border: 1px solid #d0d0d0;
-    border-radius: 6px;
-    cursor: ${props => props.disabled ? 'not-allowed' : 'pointer'};
-    transition: all 0.2s ease;
-    font-size: 14px;
-    font-weight: 500;
-    color: #333;
-    opacity: ${props => props.disabled ? 0.6 : 1};
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-
-    &:hover:not(:disabled) {
-        background: #f8f8f8;
-        border-color: #2196F3;
-        box-shadow: 0 2px 4px rgba(33, 150, 243, 0.2);
-    }
-
-    &:active:not(:disabled) {
-        transform: translateY(1px);
-        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-    }
+const StyledIndexingToggle = styled.button `
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    padding: 10px 16px;
+    background: white;
+    border: 1px solid #d0d0d0;
+    border-radius: 6px;
+    cursor: ${props => props.disabled ? 'not-allowed' : 'pointer'};
+    transition: all 0.2s ease;
+    font-size: 14px;
+    font-weight: 500;
+    color: #333;
+    opacity: ${props => props.disabled ? 0.6 : 1};
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+
+    &:hover:not(:disabled) {
+        background: #f8f8f8;
+        border-color: #2196F3;
+        box-shadow: 0 2px 4px rgba(33, 150, 243, 0.2);
+    }
+
+    &:active:not(:disabled) {
+        transform: translateY(1px);
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+    }
 `;
-const StyledLeftContent = styled.div `
-    display: flex;
-    align-items: center;
-    gap: 8px;
+const StyledLeftContent = styled.div `
+    display: flex;
+    align-items: center;
+    gap: 8px;
 `;
-const StyledRightContent = styled.div `
-    display: flex;
-    align-items: center;
-    gap: 8px;
+const StyledRightContent = styled.div `
+    display: flex;
+    align-items: center;
+    gap: 8px;
 `;
-const StyledChevron = styled.span `
-    transition: transform 0.2s ease;
-    transform: ${props => props.$isOpen ? 'rotate(180deg)' : 'rotate(0deg)'};
-    color: #666;
-    font-size: 12px;
+const StyledChevron = styled.span `
+    transition: transform 0.2s ease;
+    transform: ${props => props.$isOpen ? 'rotate(180deg)' : 'rotate(0deg)'};
+    color: #666;
+    font-size: 12px;
 `;
-const StyledIndexingInfoBox = styled.div `
-    position: relative;
-    background: white;
-    border: 1px solid #e0e0e0;
-    border-radius: 6px;
-    padding: 12px;
-    max-height: 200px;
-    overflow: auto;
-    font-family: 'Courier New', monospace;
-    font-size: 12px;
-    color: #333;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-    animation: slideDown 0.2s ease;
-
-    @keyframes slideDown {
-        from {
-            opacity: 0;
-            transform: translateY(-10px);
-        }
-        to {
-            opacity: 1;
-            transform: translateY(0);
-        }
-    }
+const StyledIndexingInfoBox = styled.div `
+    position: relative;
+    background: white;
+    border: 1px solid #e0e0e0;
+    border-radius: 6px;
+    padding: 12px;
+    max-height: 200px;
+    overflow: auto;
+    font-family: 'Courier New', monospace;
+    font-size: 12px;
+    color: #333;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    animation: slideDown 0.2s ease;
+
+    @keyframes slideDown {
+        from {
+            opacity: 0;
+            transform: translateY(-10px);
+        }
+        to {
+            opacity: 1;
+            transform: translateY(0);
+        }
+    }
 `;

package/lib/devextreme-license.d.ts

@@ -1 +1 @@
-export declare const licenseKey = "LCPv1>7eY(j4LeYSi9_V6!J4He7,1:JfoSYV:%QDL7+aJZee3%oR>!N,(7<,!cyaX>Qta3%e7(nrB7+a42R-8pJ@(>Qm<IJ+(Sn,e3J+:VN-;(y,$Zj4yZ74[S<FZ:ee49ntV(%Xn3Lr19Y9[7iR3:74X7RV(6ye(Iea1cNSS3gFf!N91%R-ppQQmk79-6%)<SQf-I_@F6_y6SjzB6_!Q2bREIgF:aQdE!KF6>%X<2p@62%!F2bR62<-$2i-)2i-FI%d@G<-@!jy$2iRQ6b-v!jyvIg!:ajzvaj@Fpg!$2b-FIp9;9K-:>Q4:G_@@9Qdv6<!F6<dFI7yFI7yFI7Ll";
+export declare const licenseKey = "LCPv1(%@j2<F<eQy:2N+f,7R@!i)BcQ,N374Qe%m;9etySj@gGntp77@@:<VJ77@j!_t<%yd-Siei,7FYV%!G>7a(cj%z3Ltv!ot1SeaicLr[3o,6>H:1(e,jSQt$3bREp%tv%H+4InRJ3J88Gn+aIidEee--SQVb,yVH7QRgSpm:2be9I%,;Z+Qmk%!<9jyG6%!6pLdQ6Lt<!N-Q%iR)6%fBIR+:2<)<!Qr->%X<2p@62%!F2bR62<-$2i-)2i-FI%d@G<-@!jy$2iRQ6b-v!jyvIg!:ajzvaj@Fpg!$2b-FIp9;9K-:>Q4:G_@@9Qdv6<!F6<dFI7yFI7yFI7Ll";

package/lib/devextreme-license.js

@@ -1,3 +1,3 @@
 // Auto-generated by devextreme-license.
 // Do not commit this file to source control.
-export const licenseKey = 'LCPv1>7eY(j4LeYSi9_V6!J4He7,1:JfoSYV:%QDL7+aJZee3%oR>!N,(7<,!cyaX>Qta3%e7(nrB7+a42R-8pJ@(>Qm<IJ+(Sn,e3J+:VN-;(y,$Zj4yZ74[S<FZ:ee49ntV(%Xn3Lr19Y9[7iR3:74X7RV(6ye(Iea1cNSS3gFf!N91%R-ppQQmk79-6%)<SQf-I_@F6_y6SjzB6_!Q2bREIgF:aQdE!KF6>%X<2p@62%!F2bR62<-$2i-)2i-FI%d@G<-@!jy$2iRQ6b-v!jyvIg!:ajzvaj@Fpg!$2b-FIp9;9K-:>Q4:G_@@9Qdv6<!F6<dFI7yFI7yFI7Ll';
+export const licenseKey = 'LCPv1(%@j2<F<eQy:2N+f,7R@!i)BcQ,N374Qe%m;9etySj@gGntp77@@:<VJ77@j!_t<%yd-Siei,7FYV%!G>7a(cj%z3Ltv!ot1SeaicLr[3o,6>H:1(e,jSQt$3bREp%tv%H+4InRJ3J88Gn+aIidEee--SQVb,yVH7QRgSpm:2be9I%,;Z+Qmk%!<9jyG6%!6pLdQ6Lt<!N-Q%iR)6%fBIR+:2<)<!Qr->%X<2p@62%!F2bR62<-$2i-)2i-FI%d@G<-@!jy$2iRQ6b-v!jyvIg!:ajzvaj@Fpg!$2b-FIp9;9K-:>Q4:G_@@9Qdv6<!F6<dFI7yFI7yFI7Ll';

package/lib/hooks/useDocumentOperations.js

@@ -1420,10 +1420,15 @@ export const useDocumentOperations = (props) => {
                     setArchiveRelatedDcmtFormTID(undefined);
                     setArchiveRelatedDcmtFormMids([]);
                 }, onSavedAsyncCallback: async (tid, did, metadataResult) => {
+                    const originDcmt = selectedDcmtInfos?.[0];
                     setIsOpenArchiveRelationForm(false);
                     setArchiveType(undefined);
                     setArchiveRelatedDcmtFormTID(undefined);
                     setArchiveRelatedDcmtFormMids([]);
+                    if (refreshFocusedDataRowAsync && originDcmt?.TID && originDcmt?.DID) {
+                        await refreshFocusedDataRowAsync(originDcmt.TID, originDcmt.DID, true);
+                        return;
+                    }
                     await onRefreshSearchAsyncDatagrid?.();
                 }, allTasks: allTasks, getAllTasks: getAllTasks, deleteTaskByIdsCallback: deleteTaskByIdsCallback, addTaskCallback: addTaskCallback, editTaskCallback: editTaskCallback, handleNavigateToWGs: handleNavigateToWGs, handleNavigateToDossiers: handleNavigateToDossiers, showDcmtFormSidebar: showDcmtFormSidebar, openFileUploaderPdfEditor: openFileUploaderPdfEditor, showTodoDcmtForm: showTodoDcmtForm, graphometricManager: graphometricManager }), showRelatedDcmtsChooser &&
                 _jsx(TMChooserForm, { dataSource: relatedDcmtsChooserDataSource, onChoose: async (selectedRelation) => {

package/package.json

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