@topconsultnpm/sdkui-react 6.22.0-dev2.51 → 6.22.0-dev2.53

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

@@ -1076,18 +1076,32 @@ const TMDcmtForm = ({ TID, DID, groupId, layoutMode = LayoutModes.Update, formMo
             setUseWaitPanelLocalState(false);
         }
     }, [TID, connectorFileSave, onSavedAsyncCallback, onSaveRecents, onClose, DID, setMetadataList, handleReset, layoutMode, isSharedDcmt]);
+    // Messaggio di conferma dell'archiviazione in base al vincolo del tipo documento (ArchiveConstraints).
+    const getArchiveConfirmMessage = useCallback(() => {
+        // Con connectorFileSave il file viene prodotto dal connettore solo alla conferma: si assume che ci sarà.
+        const hasFile = !!connectorFileSave || !!dcmtFileRef.current;
+        switch (fromDTDRef.current?.archiveConstraint) {
+            // Solo metadati: il file non è previsto.
+            case ArchiveConstraints.OnlyMetadata: return SDKUI_Localizator.ArchiveDocument_Confirm;
+            // File obbligatorio: senza file il pulsante Archivia è disabilitato, quindi qui il file c'è.
+            case ArchiveConstraints.ContentCompulsory: return SDKUI_Localizator.ArchiveDocument_Confirm;
+            // Metadati e/o file: se il file manca lo segnala, come in v5.
+            default: return hasFile ? SDKUI_Localizator.ArchiveDocument_Confirm : SDKUI_Localizator.ArchiveOnlyMetadata_Confirm;
+        }
+    }, [connectorFileSave]);
     const handleConfirmAction = useCallback(async () => {
+        const isUpdate = layoutMode === LayoutModes.Update;
         TMMessageBoxManager.show({
             parentId: isModal ? "TMDcmtFormShowConfirmForClose-" + id : undefined,
             buttons: [ButtonNames.YES, ButtonNames.NO],
-            message: layoutMode === LayoutModes.Update ? SDKUI_Localizator.SaveQuestion : 'Sei sicuro di voler archiviare questo documento?',
-            onButtonClick(e) {
+            message: isUpdate ? SDKUI_Localizator.SaveQuestion : getArchiveConfirmMessage(),
+            onButtonClick: (e) => {
                 if (e !== ButtonNames.YES)
                     return;
-                layoutMode === LayoutModes.Update ? handleSave() : handleArchiveCompleted();
+                isUpdate ? handleSave() : handleArchiveCompleted();
             },
         });
-    }, [isModal, id, layoutMode, handleSave, handleArchiveCompleted]);
+    }, [isModal, id, layoutMode, getArchiveConfirmMessage, handleSave, handleArchiveCompleted]);
     // Azione secondaria del form di archiviazione: archivia il master e, subito dopo,
     // apre il modale di archiviazione dei documenti di dettaglio multipli usando il master appena creato.
     const handleArchiveMasterAndDetails = useCallback(async () => {

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

@@ -1491,23 +1491,21 @@ const TMSearchResultGrid = ({ openInOffice, fromDTD, operationItems, allUsers, i
         setVisibleItems(visibleData);
     }, []);
     useEffect(() => { onVisibleItemChanged?.(visibleItems); }, [visibleItems]);
-    const gridCounterConfig = useMemo(() => {
-        if (!showCounterConfig)
-            return { show: false };
-        const defaultItems = dcmtsReturned !== undefined && dcmtsFound !== undefined
-            ? new Map([
-                [CounterItemKey.allItems, {
-                        key: CounterItemKey.allItems,
-                        show: true,
-                        caption: `${dcmtsReturned} restituiti su ${dcmtsFound} trovati`,
-                        value: `${dcmtsReturned}/${dcmtsFound}`,
-                        icon: _jsx(IconAll, {}),
-                        order: -1
-                    }]
-            ])
-            : undefined;
-        return { ...counterConfig, show: true, items: counterConfig?.items ?? defaultItems };
-    }, [showCounterConfig, counterConfig, dcmtsReturned, dcmtsFound]);
+    const defaultCounterItems = dcmtsReturned !== undefined && dcmtsFound !== undefined
+        ? new Map([
+            [CounterItemKey.allItems, {
+                    key: CounterItemKey.allItems,
+                    show: true,
+                    caption: `${dcmtsReturned} restituiti su ${dcmtsFound} trovati`,
+                    value: `${dcmtsReturned}/${dcmtsFound}`,
+                    icon: _jsx(IconAll, {}),
+                    order: -1
+                }]
+        ])
+        : undefined;
+    const gridCounterConfig = showCounterConfig
+        ? { ...counterConfig, show: true, items: counterConfig?.items ?? defaultCounterItems }
+        : { show: false };
     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

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { DcmtTypeListCacheService, LayoutModes, SDK_Localizator, TreeCacheService, TreeItemTypes } from '@topconsultnpm/sdk-ts';
 import { TreeList, Column, Scrolling, Selection } from 'devextreme-react/tree-list';
 import { DropDownBox } from 'devextreme-react';
@@ -31,6 +31,9 @@ const TMTreeSelector = ({ layoutMode = LayoutModes.Update, isVisible, onSelected
     const [selectedRowKeys, setSelectedRowKeys] = useState([]);
     // State hook to store the currently focused row key, initially set to undefined
     const [focusedRowKey, setFocusedRowKey] = useState(undefined);
+    // Elemento selezionato nell'albero: dopo un refresh va riproposto se esiste ancora
+    const [selectedTreeItemKey, setSelectedTreeItemKey] = useState(undefined);
+    const selectedTreeItemKeys = useMemo(() => selectedTreeItemKey !== undefined ? [selectedTreeItemKey] : [], [selectedTreeItemKey]);
     const [isGridBoxOpened, setIsGridBoxOpened] = useState(false);
     const [defaultTreeId, setDefaultTreeId] = useState(-1);
     const deviceType = useDeviceType();
@@ -90,6 +93,8 @@ const TMTreeSelector = ({ layoutMode = LayoutModes.Update, isVisible, onSelected
     useEffect(() => {
         let newTreeItems = trees.find(o => o.id == selectedTreeId)?.items ?? [];
         setTreeItems(newTreeItems);
+        // Mantiene la selezione dopo il refresh solo se l'elemento e' ancora presente (al cambio albero si azzera)
+        setSelectedTreeItemKey(prev => prev !== undefined && newTreeItems.some(o => o.id == prev) ? prev : undefined);
     }, [selectedTreeId, trees]);
     const renderCell = useCallback((data) => {
         const treeItem = data.data;
@@ -178,6 +183,10 @@ const TMTreeSelector = ({ layoutMode = LayoutModes.Update, isVisible, onSelected
             onSelectedTIDChanged?.(treeItem.tid, selectedTreeId);
         }
     }, [onSelectedTIDChanged, selectedTreeId]);
+    // La selezione la decide il widget (click, ctrl+click che deseleziona, barra spaziatrice): qui si allinea solo lo stato
+    const onSelectionChangedTreeView = useCallback((e) => {
+        setSelectedTreeItemKey(e.selectedRowKeys?.[0]);
+    }, []);
     return (_jsx(TMPanel, { title: SDK_Localizator.Trees, isVisible: isVisible, totalItems: trees.length, onClose: onClosePanel, allowMaximize: allowMaximize, onMaximize: onMaximizePanel, onHeaderDoubleClick: onMaximizePanel, onRefresh: () => loadTreesAsync(true), toolbar: _jsx(TMButton, { btnStyle: 'icon', caption: defaultTreeId == selectedTreeId ? SDKUI_Localizator.TreeRemoveDefault : SDKUI_Localizator.SetAsDefault, icon: defaultTreeId == selectedTreeId ? _jsx(IconStarRemove, { color: 'rgb(243, 114, 92)' }) : _jsx(IconStar, { color: 'rgb(248, 215, 117)' }), onClick: () => {
                 if (defaultTreeId == selectedTreeId) {
                     if (layoutMode == LayoutModes.Update)
@@ -210,7 +219,7 @@ const TMTreeSelector = ({ layoutMode = LayoutModes.Update, isVisible, onSelected
                                 }, value: selectedTreeId, opened: isGridBoxOpened, valueExpr: "id", displayExpr: "nameLoc", deferRendering: false, dataSource: trees, onValueChanged: syncDataGridSelection, onOptionChanged: onGridBoxOpened, style: { height: 30, padding: '5px' }, children: _jsx(TMDataGrid, { height: "100%", width: "100%", dataSource: trees, dataColumns: [
                                         { dataField: 'nameLoc', caption: SDKUI_Localizator.Name, width: 'auto' },
                                         { dataField: 'description', caption: SDKUI_Localizator.Description, width: 'auto' },
-                                    ], selection: { mode: 'single', showCheckBoxesMode: "none" }, showHeaderFilter: false, selectedRowKeys: selectedRowKeys, onSelectionChanged: onSelectionChanged, onRowClick: onRowClickTrees, focusedRowKey: focusedRowKey, onFocusedRowChanged: onFocusedRowChanged }) }) }), _jsxs(StyledTreeListWrapper, { children: [_jsxs(TreeList, { height: "100%", dataSource: treeItems, showRowLines: false, showColumnLines: false, showBorders: false, columnAutoWidth: false, keyExpr: "id", parentIdExpr: "parentID", dataStructure: "plain", showColumnHeaders: false, onContentReady: (e) => e.component.clearSelection(), onCellDblClick: onCellDblClickTreeView, onRowClick: onRowClickTreeView, children: [_jsx(Column, { dataField: "nameLoc", caption: SDKUI_Localizator.Name, cellRender: renderCell, width: "100%" }), _jsx(Scrolling, { mode: "virtual", useNative: Number(SDKUI_Globals.userSettings?.themeSettings.gridSettings.useNativeScrollbar) === 1 }), _jsx(Selection, { mode: "single" })] }), _jsxs(StyledOffCanvasPanel, { ref: panelRef, "$isOpen": isMobile && infoDTD !== undefined, children: [_jsxs(StyledDivHorizontal, { style: { gap: 10, padding: '10px 8px', width: '100%', alignItems: 'center' }, children: [_jsx("p", { style: { fontSize: '1.1rem', fontWeight: 'bold' }, children: `${SDKUI_Localizator.DcmtType} - ${SDKUI_Localizator.About}` }), _jsx(IconCloseOutline, { style: { marginLeft: 'auto', cursor: 'pointer' }, onClick: () => setInfoDTD(undefined) })] }), renderDTDTooltipContent(infoDTD)] })] })] })
+                                    ], selection: { mode: 'single', showCheckBoxesMode: "none" }, showHeaderFilter: false, selectedRowKeys: selectedRowKeys, onSelectionChanged: onSelectionChanged, onRowClick: onRowClickTrees, focusedRowKey: focusedRowKey, onFocusedRowChanged: onFocusedRowChanged }) }) }), _jsxs(StyledTreeListWrapper, { children: [_jsxs(TreeList, { height: "100%", dataSource: treeItems, showRowLines: false, showColumnLines: false, showBorders: false, columnAutoWidth: false, keyExpr: "id", parentIdExpr: "parentID", dataStructure: "plain", showColumnHeaders: false, selectedRowKeys: selectedTreeItemKeys, onSelectionChanged: onSelectionChangedTreeView, onCellDblClick: onCellDblClickTreeView, onRowClick: onRowClickTreeView, children: [_jsx(Column, { dataField: "nameLoc", caption: SDKUI_Localizator.Name, cellRender: renderCell, width: "100%" }), _jsx(Scrolling, { mode: "virtual", useNative: Number(SDKUI_Globals.userSettings?.themeSettings.gridSettings.useNativeScrollbar) === 1 }), _jsx(Selection, { mode: "single" })] }), _jsxs(StyledOffCanvasPanel, { ref: panelRef, "$isOpen": isMobile && infoDTD !== undefined, children: [_jsxs(StyledDivHorizontal, { style: { gap: 10, padding: '10px 8px', width: '100%', alignItems: 'center' }, children: [_jsx("p", { style: { fontSize: '1.1rem', fontWeight: 'bold' }, children: `${SDKUI_Localizator.DcmtType} - ${SDKUI_Localizator.About}` }), _jsx(IconCloseOutline, { style: { marginLeft: 'auto', cursor: 'pointer' }, onClick: () => setInfoDTD(undefined) })] }), renderDTDTooltipContent(infoDTD)] })] })] })
             : _jsx("div", { style: { display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100%', width: '100%', fontSize: '1.5rem' }, children: SDKUI_Localizator.TreesNoAvailable }) }));
 };
 export default TMTreeSelector;

package/lib/helper/SDKUI_Localizator.d.ts

@@ -61,6 +61,8 @@ export declare class SDKUI_Localizator {
     static get ArchiveMultipleDetailDocuments(): "Mehrere Details archivieren" | "Archive multiple details" | "Archivar múltiples detalles" | "Archiver plusieurs détails" | "Arquivar múltiplos detalhes" | "Archivia dettagli multipli";
     static get ArchiveMasterAndMultipleDetailDocuments(): "Master mit mehreren Details archivieren" | "Archive master with multiple details" | "Archivar maestro con múltiples detalles" | "Archiver le maître avec plusieurs détails" | "Arquivar mestre com múltiplos detalhes" | "Archivia master con dettagli multipli";
     static get ArchiveMasterAndDetails_Confirm(): "Master archivieren und mit den Details fortfahren?" | "Archive the master and proceed with the details?" | "¿Archivar el maestro y continuar con los detalles?" | "Archiver le maître et poursuivre avec les détails ?" | "Arquivar o mestre e prosseguir com os detalhes?" | "Archiviare il master e proseguire con i dettagli?";
+    static get ArchiveDocument_Confirm(): "Möchten Sie dieses Dokument wirklich archivieren?" | "Are you sure you want to archive this document?" | "¿Está seguro de que desea archivar este documento?" | "Êtes-vous sûr de vouloir archiver ce document ?" | "Tem a certeza de que pretende arquivar este documento?" | "Sei sicuro di voler archiviare questo documento?";
+    static get ArchiveOnlyMetadata_Confirm(): "Keine Datei ausgewählt.<br>Mit einer Archivierung von nur Metadaten fortfahren?" | "No file selected.<br>Proceed with a metadata-only archiving?" | "Ningún archivo seleccionado.<br>¿Continuar con un archivado de solo metadatos?" | "Aucun fichier sélectionné.<br>Poursuivre avec un archivage de métadonnées uniquement ?" | "Nenhum ficheiro selecionado.<br>Prosseguir com um arquivamento apenas de metadados?" | "Nessun file selezionato.<br>Procedere con una archiviazione di soli metadati?";
     static get ExitWithoutArchiving_Confirm(): "Möchten Sie wirklich beenden? Die eingegebenen Dokumente werden nicht archiviert. Fortfahren?" | "Are you sure you want to exit? The entered documents will not be archived. Continue?" | "¿Está seguro de que desea salir? Los documentos introducidos no se archivarán. ¿Continuar?" | "Êtes-vous sûr de vouloir quitter ? Les documents saisis ne seront pas archivés. Continuer ?" | "Tem a certeza de que pretende sair? Os documentos introduzidos não serão arquivados. Continuar?" | "Sei sicuro di voler uscire? I documenti inseriti non verranno archiviati. Continuare?";
     static get Archiving(): string;
     static get ArchivingCompletionInProgress(): string;

package/lib/helper/SDKUI_Localizator.js

@@ -564,6 +564,26 @@ export class SDKUI_Localizator {
             default: return "Archiviare il master e proseguire con i dettagli?";
         }
     }
+    static get ArchiveDocument_Confirm() {
+        switch (this._cultureID) {
+            case CultureIDs.De_DE: return "Möchten Sie dieses Dokument wirklich archivieren?";
+            case CultureIDs.En_US: return "Are you sure you want to archive this document?";
+            case CultureIDs.Es_ES: return "¿Está seguro de que desea archivar este documento?";
+            case CultureIDs.Fr_FR: return "Êtes-vous sûr de vouloir archiver ce document ?";
+            case CultureIDs.Pt_PT: return "Tem a certeza de que pretende arquivar este documento?";
+            default: return "Sei sicuro di voler archiviare questo documento?";
+        }
+    }
+    static get ArchiveOnlyMetadata_Confirm() {
+        switch (this._cultureID) {
+            case CultureIDs.De_DE: return "Keine Datei ausgewählt.<br>Mit einer Archivierung von nur Metadaten fortfahren?";
+            case CultureIDs.En_US: return "No file selected.<br>Proceed with a metadata-only archiving?";
+            case CultureIDs.Es_ES: return "Ningún archivo seleccionado.<br>¿Continuar con un archivado de solo metadatos?";
+            case CultureIDs.Fr_FR: return "Aucun fichier sélectionné.<br>Poursuivre avec un archivage de métadonnées uniquement ?";
+            case CultureIDs.Pt_PT: return "Nenhum ficheiro selecionado.<br>Prosseguir com um arquivamento apenas de metadados?";
+            default: return "Nessun file selezionato.<br>Procedere con una archiviazione di soli metadati?";
+        }
+    }
     static get ExitWithoutArchiving_Confirm() {
         switch (this._cultureID) {
             case CultureIDs.De_DE: return "Möchten Sie wirklich beenden? Die eingegebenen Dokumente werden nicht archiviert. Fortfahren?";

package/package.json

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