@topconsultnpm/sdkui-react 6.22.0-dev2.47 → 6.22.0-dev2.49

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, useState } from 'react';
+import { useCallback, useEffect, 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';
@@ -36,39 +36,57 @@ const TMTreeSelector = ({ layoutMode = LayoutModes.Update, isVisible, onSelected
     const deviceType = useDeviceType();
     const isMobile = deviceType === DeviceType.MOBILE;
     const panelRef = useOutsideClick(() => setInfoDTD(undefined));
-    // useEffect(() => {
-    //     if (treeItems.length > 0 && treeItems[0].id) {
-    //         setSelectedRowKeys([treeItems[0].id])
-    //     }
-    // }, [treeItems])
-    useEffect(() => {
-        const setResultCache = (result) => {
-            if (result && result.length > 0) {
-                setTrees(result);
-                let defaultTree = SDKUI_Globals.userSettings.searchSettings.defaultTree;
-                let initialTreeId;
-                let treeToSelect;
-                if (defaultTree > 0) {
-                    initialTreeId = defaultTree;
-                    treeToSelect = result.find(o => o.id == defaultTree);
-                }
-                else {
-                    initialTreeId = result[0]?.id ?? 0;
-                    treeToSelect = result[0];
-                }
-                setSelectedTreeId(initialTreeId);
-                if (treeToSelect?.id) {
-                    setSelectedRowKeys([treeToSelect.id]);
-                }
+    // Tiene traccia dell'albero selezionato senza far dipendere loadTreesAsync da selectedTreeId:
+    // così il refresh può riproporre la selezione corrente senza ricaricare a ogni cambio di albero
+    const selectedTreeIdRef = useRef(selectedTreeId);
+    useEffect(() => { selectedTreeIdRef.current = selectedTreeId; }, [selectedTreeId]);
+    // Carica tutti gli alberi del contesto corrente (ricerca o archiviazione).
+    // Con forceRefresh la cache viene invalidata, altrimenti GetAll* restituirebbe gli alberi già in memoria.
+    const loadTreesAsync = useCallback(async (forceRefresh = false) => {
+        const isSearchContext = layoutMode == LayoutModes.Update;
+        if (forceRefresh) {
+            if (isSearchContext)
+                TreeCacheService.RemoveAllSearch();
+            else
+                TreeCacheService.RemoveAllArchive();
+        }
+        const result = isSearchContext
+            ? await TreeCacheService.GetAllSearchAsync()
+            : await TreeCacheService.GetAllArchiveAsync();
+        if (!result || result.length === 0) {
+            // Sul refresh gli alberi possono essere spariti lato server: allinea anche lo stato vuoto
+            if (forceRefresh) {
+                setTrees([]);
+                setSelectedTreeId(0);
+                setSelectedRowKeys([]);
             }
-        };
-        if (layoutMode == LayoutModes.Update) {
-            TreeCacheService.GetAllSearchAsync().then((result) => { setResultCache(result); });
+            return;
+        }
+        setTrees(result);
+        // Dopo un refresh mantiene l'albero corrente, se ancora presente
+        const currentTreeId = selectedTreeIdRef.current;
+        if (forceRefresh && result.some(o => o.id == currentTreeId)) {
+            setSelectedTreeId(currentTreeId);
+            setSelectedRowKeys([currentTreeId]);
+            return;
+        }
+        let defaultTree = SDKUI_Globals.userSettings.searchSettings.defaultTree;
+        let initialTreeId;
+        let treeToSelect;
+        if (defaultTree > 0) {
+            initialTreeId = defaultTree;
+            treeToSelect = result.find(o => o.id == defaultTree);
         }
         else {
-            TreeCacheService.GetAllArchiveAsync().then((result) => { setResultCache(result); });
+            initialTreeId = result[0]?.id ?? 0;
+            treeToSelect = result[0];
+        }
+        setSelectedTreeId(initialTreeId);
+        if (treeToSelect?.id) {
+            setSelectedRowKeys([treeToSelect.id]);
         }
     }, [layoutMode]);
+    useEffect(() => { loadTreesAsync(); }, [loadTreesAsync]);
     useEffect(() => {
         let newTreeItems = trees.find(o => o.id == selectedTreeId)?.items ?? [];
         setTreeItems(newTreeItems);
@@ -160,7 +178,7 @@ const TMTreeSelector = ({ layoutMode = LayoutModes.Update, isVisible, onSelected
             onSelectedTIDChanged?.(treeItem.tid, selectedTreeId);
         }
     }, [onSelectedTIDChanged, selectedTreeId]);
-    return (_jsx(TMPanel, { title: SDK_Localizator.Trees, isVisible: isVisible, totalItems: trees.length, onClose: onClosePanel, allowMaximize: allowMaximize, onMaximize: onMaximizePanel, onHeaderDoubleClick: onMaximizePanel, 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: () => {
+    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)
                         SDKUI_Globals.userSettings.searchSettings.defaultTree = -1;
@@ -196,93 +214,93 @@ const TMTreeSelector = ({ layoutMode = LayoutModes.Update, isVisible, onSelected
             : _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;
-const StyledTreeDcmtTypeRow = styled(StyledDivHorizontal) `
-    align-items: center;
-    min-width: 0;
-    width: 100%;
-    gap: 2px;
-    position: relative;
-
-    .info-icon {
-        display: flex;
-        align-items: center;
-        margin-left: auto;
-        z-index: 2;
-        cursor: pointer;
-        opacity: 0;
-        pointer-events: none;
-        transition: opacity 0.2s;
-    }
-
-    &:hover .info-icon {
-        opacity: 1;
-        pointer-events: auto;
-    }
+const StyledTreeDcmtTypeRow = styled(StyledDivHorizontal) `
+    align-items: center;
+    min-width: 0;
+    width: 100%;
+    gap: 2px;
+    position: relative;
+
+    .info-icon {
+        display: flex;
+        align-items: center;
+        margin-left: auto;
+        z-index: 2;
+        cursor: pointer;
+        opacity: 0;
+        pointer-events: none;
+        transition: opacity 0.2s;
+    }
+
+    &:hover .info-icon {
+        opacity: 1;
+        pointer-events: auto;
+    }
 `;
-const StyledTreeListWrapper = styled.div `
-    width: 100%;
-    height: 100%;
-    min-height: 0;
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-
-    .dx-treelist,
-    .dx-treelist-rowsview,
-    .dx-scrollable,
-    .dx-scrollable-wrapper,
-    .dx-scrollable-container,
-    .dx-scrollable-content {
-        height: 100% !important;
-        min-height: 0 !important;
-        max-height: 100% !important;
-        box-sizing: border-box;
-    }
-
-    .dx-scrollable-scrollbar.dx-scrollbar-vertical {
-        /* Mostra solo quando serve */
-        opacity: 1 !important;
-    }
-
-    .dx-scrollable-scrollbar.dx-scrollbar-horizontal {
-        display: none !important;
-    }
-
-	.dx-treelist-container>.dx-treelist-headers,
-	.dx-treelist-container>.dx-treelist-rowsview {
-		background-color: transparent;
-	}
-
-	.dx-treelist-rowsview .dx-treelist-empty-space {
-		position: relative;
-		top: 4px;
-		display: inline-block;
-		width: 16px;
-	}
-
-	.dx-row > td {
-		padding: 10px 4px;
-		font-size: 1rem;
-        white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.dx-selection td {
-		background: oklch(from var(--dx-color-primary) l c h / .2) !important;
-	}
-
-    .dx-data-row:hover {
-        cursor: pointer;
-        background: linear-gradient(
-            270deg,
-            rgba(70, 181, 162, 0.15) 16%,
-            rgba(59, 170, 188, 0.15) 34%,
-            rgba(59, 170, 188, 0.15) 34%,
-            rgba(54, 129, 173, 0.15) 54%,
-            rgba(51, 104, 165, 0.15) 72%,
-            rgba(47, 84, 157, 0.15) 88%,
-            rgba(48, 79, 153, 0.15) 100%
-        );
-    }
+const StyledTreeListWrapper = styled.div `
+    width: 100%;
+    height: 100%;
+    min-height: 0;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+
+    .dx-treelist,
+    .dx-treelist-rowsview,
+    .dx-scrollable,
+    .dx-scrollable-wrapper,
+    .dx-scrollable-container,
+    .dx-scrollable-content {
+        height: 100% !important;
+        min-height: 0 !important;
+        max-height: 100% !important;
+        box-sizing: border-box;
+    }
+
+    .dx-scrollable-scrollbar.dx-scrollbar-vertical {
+        /* Mostra solo quando serve */
+        opacity: 1 !important;
+    }
+
+    .dx-scrollable-scrollbar.dx-scrollbar-horizontal {
+        display: none !important;
+    }
+
+	.dx-treelist-container>.dx-treelist-headers,
+	.dx-treelist-container>.dx-treelist-rowsview {
+		background-color: transparent;
+	}
+
+	.dx-treelist-rowsview .dx-treelist-empty-space {
+		position: relative;
+		top: 4px;
+		display: inline-block;
+		width: 16px;
+	}
+
+	.dx-row > td {
+		padding: 10px 4px;
+		font-size: 1rem;
+        white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.dx-selection td {
+		background: oklch(from var(--dx-color-primary) l c h / .2) !important;
+	}
+
+    .dx-data-row:hover {
+        cursor: pointer;
+        background: linear-gradient(
+            270deg,
+            rgba(70, 181, 162, 0.15) 16%,
+            rgba(59, 170, 188, 0.15) 34%,
+            rgba(59, 170, 188, 0.15) 34%,
+            rgba(54, 129, 173, 0.15) 54%,
+            rgba(51, 104, 165, 0.15) 72%,
+            rgba(47, 84, 157, 0.15) 88%,
+            rgba(48, 79, 153, 0.15) 100%
+        );
+    }
 `;

package/lib/helper/TMAppUpdatedModal.js

@@ -8,110 +8,110 @@ import { SDKUI_Globals } from './SDKUI_Globals';
 import { SDKUI_Localizator } from './SDKUI_Localizator';
 import { IconUpdate, IconOpenInNew } from './TMIcons';
 import { getAppModuleButtonColors } from './TMUtils';
-const Content = styled.div `
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    background-color: #ffffff;
+const Content = styled.div `
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    background-color: #ffffff;
 `;
-const Header = styled.div `
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    gap: 14px;
-    padding: 32px 30px 26px 30px;
-    background-color: ${({ $backgroundColor }) => $backgroundColor};
-    color: #ffffff;
-    text-align: center;
+const Header = styled.div `
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 14px;
+    padding: 32px 30px 26px 30px;
+    background-color: ${({ $backgroundColor }) => $backgroundColor};
+    color: #ffffff;
+    text-align: center;
 `;
-const HeaderIcon = styled.div `
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 68px;
-    height: 68px;
-    border-radius: 50%;
-    background-color: rgba(255, 255, 255, 0.18);
-    border: 1px solid rgba(255, 255, 255, 0.35);
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.18);
+const HeaderIcon = styled.div `
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 68px;
+    height: 68px;
+    border-radius: 50%;
+    background-color: rgba(255, 255, 255, 0.18);
+    border: 1px solid rgba(255, 255, 255, 0.35);
+    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.18);
 `;
-const HeaderTitle = styled.h2 `
-    margin: 0;
-    font-size: 22px;
-    font-weight: 600;
-    letter-spacing: 0.2px;
+const HeaderTitle = styled.h2 `
+    margin: 0;
+    font-size: 22px;
+    font-weight: 600;
+    letter-spacing: 0.2px;
 `;
-const VersionBadge = styled.span `
-    display: inline-block;
-    padding: 4px 12px;
-    border-radius: 999px;
-    background-color: rgba(255, 255, 255, 0.22);
-    border: 1px solid rgba(255, 255, 255, 0.4);
-    font-size: 13px;
-    font-weight: 600;
-    letter-spacing: 0.3px;
+const VersionBadge = styled.span `
+    display: inline-block;
+    padding: 4px 12px;
+    border-radius: 999px;
+    background-color: rgba(255, 255, 255, 0.22);
+    border: 1px solid rgba(255, 255, 255, 0.4);
+    font-size: 13px;
+    font-weight: 600;
+    letter-spacing: 0.3px;
 `;
-const Body = styled.div `
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-    padding: 26px 30px 22px 30px;
-    text-align: center;
+const Body = styled.div `
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    padding: 26px 30px 22px 30px;
+    text-align: center;
 `;
-const Message = styled.p `
-    margin: 0;
-    font-size: 15px;
-    line-height: 1.6;
-    color: #242424;
+const Message = styled.p `
+    margin: 0;
+    font-size: 15px;
+    line-height: 1.6;
+    color: #242424;
 `;
-const SubMessage = styled.p `
-    margin: 0;
-    font-size: 13px;
-    line-height: 1.6;
-    color: #6b6b6b;
+const SubMessage = styled.p `
+    margin: 0;
+    font-size: 13px;
+    line-height: 1.6;
+    color: #6b6b6b;
 `;
-const Footer = styled.div `
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 12px;
-    padding: 0 30px 28px 30px;
+const Footer = styled.div `
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 12px;
+    padding: 0 30px 28px 30px;
 `;
-const BaseButton = styled.button `
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    gap: 8px;
-    min-width: 150px;
-    padding: 10px 18px;
-    border-radius: 8px;
-    font-size: 14px;
-    font-weight: 600;
-    cursor: pointer;
-    transition: background-color 0.15s ease, border-color 0.15s ease, box-shadow 0.15s ease;
+const BaseButton = styled.button `
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    min-width: 150px;
+    padding: 10px 18px;
+    border-radius: 8px;
+    font-size: 14px;
+    font-weight: 600;
+    cursor: pointer;
+    transition: background-color 0.15s ease, border-color 0.15s ease, box-shadow 0.15s ease;
 `;
-const PrimaryButton = styled(BaseButton) `
-    border: 1px solid ${({ $base }) => $base};
-    background-color: ${({ $base }) => $base};
-    color: #ffffff;
-
-    &:hover {
-        background-color: ${({ $hover }) => $hover};
-        border-color: ${({ $hover }) => $hover};
-        box-shadow: 0 2px 8px ${({ $shadow }) => $shadow};
-    }
+const PrimaryButton = styled(BaseButton) `
+    border: 1px solid ${({ $base }) => $base};
+    background-color: ${({ $base }) => $base};
+    color: #ffffff;
+
+    &:hover {
+        background-color: ${({ $hover }) => $hover};
+        border-color: ${({ $hover }) => $hover};
+        box-shadow: 0 2px 8px ${({ $shadow }) => $shadow};
+    }
 `;
-const SecondaryButton = styled(BaseButton) `
-    border: 1px solid #d5d5d5;
-    background-color: #ffffff;
-    color: #444444;
-
-    &:hover {
-        background-color: #f3f3f3;
-        border-color: #bdbdbd;
-    }
+const SecondaryButton = styled(BaseButton) `
+    border: 1px solid #d5d5d5;
+    background-color: #ffffff;
+    color: #444444;
+
+    &:hover {
+        background-color: #f3f3f3;
+        border-color: #bdbdbd;
+    }
 `;
 export const TMAppUpdatedModal = () => {
     const deviceType = useDeviceType();

package/lib/helper/queryHelper.d.ts

@@ -5,7 +5,10 @@ export type TID_Alias = {
     alias: string | undefined;
 };
 export declare const getTIDsByQd: (qd: QueryDescriptor | undefined) => TID_Alias[];
-export declare const getDcmtTypesByQdAsync: (qd: QueryDescriptor) => Promise<import("@topconsultnpm/sdk-ts").DcmtTypeDescriptor[]>;
+/** Restituisce i tipi documento (con metadati) referenziati da qd.
+ *  Con refreshCache = true i descrittori vengono riletti dal server, così la lista dei metadati
+ *  recepisce quelli aggiunti o rimossi dopo il popolamento della cache. */
+export declare const getDcmtTypesByQdAsync: (qd: QueryDescriptor, refreshCache?: boolean) => Promise<import("@topconsultnpm/sdk-ts").DcmtTypeDescriptor[]>;
 export declare const displayMetadataValue: (md: MetadataDescriptor | undefined, value: string | undefined, valueEmptyDescription?: string) => string;
 export declare const IsParametricQuery: (qd: QueryDescriptor | undefined) => boolean;
 export declare const addHiddenSelectItem: (select: SelectItem[], tid: number | undefined, mid: SystemMIDsAsNumber) => void;

package/lib/helper/queryHelper.js

@@ -15,8 +15,11 @@ export const getTIDsByQd = (qd) => {
     }
     return tids;
 };
-export const getDcmtTypesByQdAsync = async (qd) => {
-    return await DcmtTypeListCacheService.GetFromQdAsync(qd);
+/** Restituisce i tipi documento (con metadati) referenziati da qd.
+ *  Con refreshCache = true i descrittori vengono riletti dal server, così la lista dei metadati
+ *  recepisce quelli aggiunti o rimossi dopo il popolamento della cache. */
+export const getDcmtTypesByQdAsync = async (qd, refreshCache = false) => {
+    return await DcmtTypeListCacheService.GetFromQdAsync(qd, undefined, false, refreshCache);
 };
 export const displayMetadataValue = (md, value, valueEmptyDescription = "") => {
     if (!value)

package/package.json

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