@topconsultnpm/sdkui-react-beta 6.12.95 → 6.12.96

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

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import styled from 'styled-components';
-import { RetrieveFileOptions, DcmtOpers, GeneralRetrieveFormats, FileFormats, InvoiceRetrieveFormats, OrderRetrieveFormats } from '@topconsultnpm/sdk-ts-beta';
-import { extensionHandler, sleep, getExceptionMessage, formatBytes, IconMenuVertical, IconCloseCircle, IconClear, SDKUI_Localizator, IconCloseOutline, IconPreview } from '../../../helper';
+import { RetrieveFileOptions, DcmtOpers, GeneralRetrieveFormats, FileFormats } from '@topconsultnpm/sdk-ts-beta';
+import { extensionHandler, sleep, getExceptionMessage, formatBytes, IconMenuVertical, IconCloseCircle, IconClear, SDKUI_Localizator, IconCloseOutline, IconPreview, SDKUI_Globals } from '../../../helper';
 import { useDcmtOperations } from '../../../hooks/useDcmtOperations';
 import { FileExtensionHandler, FormModes } from '../../../ts';
 import { TMColors } from '../../../utils/theme';
@@ -47,8 +47,8 @@ const TMDcmtPreview = ({ dcmtData, onClose, canNext, canPrev, onNext, onPrev })
         rfo.retrieveReason = DcmtOpers.None;
         rfo.generalRetrieveFormat = GeneralRetrieveFormats.OriginalUnsigned;
         rfo.cvtFormat = extensionHandler(dcmtData?.fileExt) === FileExtensionHandler.CONVERTIBLE ? FileFormats.PDF : FileFormats.None;
-        rfo.invoiceRetrieveFormat = InvoiceRetrieveFormats.ASW_HTML;
-        rfo.orderRetrieveFormat = OrderRetrieveFormats.NSO_HTML;
+        rfo.invoiceRetrieveFormat = SDKUI_Globals.invoiceRetrieveFormat;
+        rfo.orderRetrieveFormat = SDKUI_Globals.orderRetrieveFormat;
         try {
             await sleep(300); //wait for DX-DataGrid selectionChanged
             let dcmtFile = await getDcmtFileAsync({ TID: dcmtData?.tid, DID: dcmtData?.did, FILEEXT: dcmtData?.fileExt }, rfo, 'Anteprima', false);

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

@@ -63,6 +63,7 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
     const [lastUpdateSearchTime, setLastUpdateSearchTime] = useState();
     const [fromDTD, setFromDTD] = useState();
     const [selectedSearchResult, setSelectedSearchResult] = useState();
+    const [currentSearchResults, setCurrentSearchResults] = useState(searchResults || []);
     const [isOpenDetails, setIsOpenDetails] = useState(false);
     const [isOpenMaster, setIsOpenMaster] = useState(false);
     const [secondaryMasterDcmts, setSecondaryMasterDcmts] = useState([]);
@@ -95,6 +96,7 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
         setSelectedItems([]);
         setFocusedItem(undefined);
         setIsOpenBatchUpdate(false);
+        setCurrentSearchResults(searchResults);
         if (searchResults.length <= 0)
             return;
         if (searchResults.length === 1) {
@@ -226,8 +228,8 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
             e.items.push(...menuItems);
         }
     };
-    const refreshDataGrid = async () => {
-        await onRefreshSearchAsync?.();
+    const refreshDataGridAfterRemoveAsync = async () => {
+        // await onRefreshSearchAsync?.();
         let index = selectedSearchResult?.dtdResult?.columns?.findIndex(col => col.caption === 'DID');
         let selectedRows = [];
         if (!index)
@@ -246,18 +248,28 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
         let newDtd = structuredClone(selectedSearchResult.dtdResult);
         newDtd.rows = newRows;
         newSearchresult.dtdResult = newDtd;
+        newSearchresult.dcmtsReturned = newRows.length;
+        newSearchresult.dcmtsFound = newRows.length;
         setSelectedSearchResult(newSearchresult);
+        setCurrentSearchResults((prev) => {
+            let newResults = [...prev];
+            let index = newResults.findIndex((res) => res.fromTID === selectedSearchResult?.fromTID);
+            if (index >= 0) {
+                newResults[index] = newSearchresult;
+            }
+            return newResults;
+        });
     };
     const removeDcmtFromFavsOrRecents = async () => {
         switch (selectedSearchResult?.category) {
             case "Favorites":
-                await runOperationAsync(getSelectedDcmtsOrFocused(selectedItems, focusedItem), DcmtOperationTypes.RemoveFromFavs, refreshDataGrid);
+                await runOperationAsync(getSelectedDcmtsOrFocused(selectedItems, focusedItem), DcmtOperationTypes.RemoveFromFavs, refreshDataGridAfterRemoveAsync);
                 break;
             case "RecentArchive":
-                await runOperationAsync(getSelectedDcmtsOrFocused(selectedItems, focusedItem), DcmtOperationTypes.RemoveFromRecentsArk, refreshDataGrid);
+                await runOperationAsync(getSelectedDcmtsOrFocused(selectedItems, focusedItem), DcmtOperationTypes.RemoveFromRecentsArk, refreshDataGridAfterRemoveAsync);
                 break;
             case "RecentView":
-                await runOperationAsync(getSelectedDcmtsOrFocused(selectedItems, focusedItem), DcmtOperationTypes.RemoveFromRecentsView, refreshDataGrid);
+                await runOperationAsync(getSelectedDcmtsOrFocused(selectedItems, focusedItem), DcmtOperationTypes.RemoveFromRecentsView, refreshDataGridAfterRemoveAsync);
                 break;
             default: break;
         }
@@ -420,7 +432,7 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
         return _jsxs("div", { style: { display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100%' }, children: [_jsx(IconBoard, { fontSize: 96 }), _jsx("div", { style: { fontSize: "15px", marginTop: "10px" }, children: SDKUI_Localizator.NoDcmtFound })] });
     return (_jsx(StyledMultiViewPanel, { "$isVisible": isVisible, children: _jsxs(TMLayoutWaitingContainer, { direction: 'vertical', showWaitPanel: showWaitPanel, showWaitPanelPrimary: showPrimary, showWaitPanelSecondary: showSecondary, waitPanelTitle: waitPanelTitle, waitPanelTextPrimary: waitPanelTextPrimary, waitPanelValuePrimary: waitPanelValuePrimary, waitPanelMaxValuePrimary: waitPanelMaxValuePrimary, waitPanelTextSecondary: waitPanelTextSecondary, waitPanelValueSecondary: waitPanelValueSecondary, waitPanelMaxValueSecondary: waitPanelMaxValueSecondary, isCancelable: true, abortController: abortController, children: [_jsxs(TMSplitterLayout, { separatorSize: 5, separatorColor: 'transparent', showSeparator: (isOpenPreview || isOpenMiddlePanel() || isOpenBatchUpdate) && deviceType !== DeviceType.MOBILE, start: getPrimarySplitterStartLayout(), min: deviceType !== DeviceType.MOBILE && isOpenDcmtForm ? ['150px', '0'] : ['0', '0'], direction: 'horizontal', children: [_jsx(TMLayoutItem, { children: _jsxs(TMToolbarCard, { toolbar: _jsxs(_Fragment, { children: [context !== SearchResultContext.METADATA_SEARCH && fromDTD?.templateTID === TemplateTIDs.WF_WIApprView && _jsx(WorkFlowOperationButtons, { deviceType: deviceType, onApprove: () => setShowApprovePopup(true), onReject: () => setShowRejectPopup(true), onReAssign: () => setShowReAssignPopup(true), approveDisable: disable, rejectDisable: disable, reassignDisable: disable, infoDisable: getSelectedDcmtsOrFocused(selectedItems, focusedItem).length !== 1 }), (dcmtsReturned != dcmtsFound) && _jsx("p", { style: { backgroundColor: `white`, color: TMColors.primaryColor, textAlign: 'center', padding: '1px 4px', borderRadius: '3px', display: 'flex' }, children: `${dcmtsReturned}/${dcmtsFound} restituiti` }), context === SearchResultContext.FAVORITES_AND_RECENTS &&
                                             _jsx("div", { style: { display: 'flex', alignItems: 'center', gap: '5px' }, children: _jsx(TMButton, { btnStyle: 'icon', icon: _jsx(IconDelete, { color: 'white' }), caption: "Rimuovi da " + (selectedSearchResult?.category === "Favorites" ? '"Preferiti"' : '"Recenti"'), disabled: getSelectedDcmtsOrFocused(selectedItems, focusedItem).length <= 0, onClick: removeDcmtFromFavsOrRecents }) }), _jsx(TMButton, { btnStyle: 'icon', icon: _jsx(IconRefresh, { color: 'white' }), caption: SDKUI_Localizator.Refresh, onClick: onRefreshSearchAsync }), _jsx(IconMenuVertical, { id: `commands-header-${id}`, color: 'white', cursor: 'pointer' }), _jsx(CommandsContextMenu, { target: `#commands-header-${id}`, menuItems: getCommandsMenuItems(fromDTD, selectedItems, focusedItem, context, showFloatingBar, setShowFloatingBar, openFormHandler, downloadDcmtsAsync, runOperationAsync, onRefreshSearchAsync, refreshSelectionDataRowsAsync, onRefreshAfterAddDcmtToFavs, confirmFormat, openConfirmAttachmentsDialog, openTaskFormHandler, openDetailDcmtsFormHandler, openMasterDcmtsFormHandler, openBatchUpdateFormHandler) })] }), onBack: !isClosable && allowBackButton() ? onBack : undefined, onClose: isClosable && allowBackButton() ? onBack : undefined, items: showSearchResultSidebar ? sideBarItems : undefined, title: getTitleHeader(), showHeader: showToolbarHeader, children: [_jsxs(TMLayoutItem, { height: '100%', children: [_jsxs(TMSplitterLayout, { direction: 'horizontal', min: ['0', '0'], showSeparator: showSelector && deviceType !== DeviceType.MOBILE, start: showSelector ? deviceType !== DeviceType.MOBILE ? ['25%', '75%'] : splitterSize : ['0%', '100%'], children: [showSelector ?
-                                                        _jsx(TMLayoutItem, { children: _jsx(TMSearchResultSelector, { searchResults: searchResults, onSelectionChanged: onSearchResultSelectionChanged }) })
+                                                        _jsx(TMLayoutItem, { children: _jsx(TMSearchResultSelector, { searchResults: currentSearchResults, onSelectionChanged: onSearchResultSelectionChanged }) })
                                                         :
                                                             _jsx(_Fragment, {}), _jsxs(TMLayoutItem, { children: [_jsx(TMSearchResultGrid
                                                             // allowMultipleSelection={allowMultipleSelection}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topconsultnpm/sdkui-react-beta",
-  "version": "6.12.95",
+  "version": "6.12.96",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",