@topconsultnpm/sdkui-react 6.19.0-dev1.44 → 6.19.0-dev1.46

package/lib/components/editors/TMMetadataValues.js

@@ -402,38 +402,56 @@ const TMMetadataValues = ({ showCheckBoxes = ShowCheckBoxesMode.Never, checkPerm
         return (_jsx("div", { style: { width: '100%' }, children: dsAttachsData.length > 0 && _jsx(TMAccordion, { title: SDKUI_Localizator.Attachment, children: dsAttachsData.map(item => renderMetadataItem(item, isReadOnly)) }) }));
     }, [metadataValues, showCheckBoxes, showNullValueCheckBoxes, isReadOnly, dynDataListsToBeRefreshed, validationItems, selectedMID, isOpenDistinctValues, openChooserBySingleClick, metadataValuesOrig]);
     const layoutCustom = useMemo(() => {
+        console.log('Rendering custom layout with layout:', layout);
         if (!layout || !layout.items || layout.items.length === 0) {
             return metadataValues.map((item) => renderMetadataItem(item));
         }
-        // Build a map of items by ID for quick lookup
+        // Build a map of items by ID for quick lookup (include negative/zero IDs)
         const itemsById = new Map();
         layout.items.forEach(item => {
-            if (item.layoutItemID) {
+            if (item.layoutItemID !== undefined && item.layoutItemID !== null) {
                 itemsById.set(item.layoutItemID, item);
             }
         });
-        // Find root items (items without parent or parent === 0)
-        const rootItems = layout.items.filter(item => item.type === LayoutItemTypes.LayoutRoot);
-        // Recursive function to get children of an item
+        // Determine root items. Prefer explicit LayoutRoot items if present;
+        // otherwise fall back to items with no parent (parentID undefined or -1).
+        const hasExplicitRoot = layout.items.some(item => item.type === LayoutItemTypes.LayoutRoot);
+        const rootItems = hasExplicitRoot
+            ? layout.items.filter(item => item.type === LayoutItemTypes.LayoutRoot)
+            : layout.items.filter(item => item.parentID === undefined || item.parentID === -1);
+        // Recursive function to get children of an item. Handle parentID === -1 and undefined
+        // because some layouts use -1 for root while children use undefined.
         const getChildren = (parentID) => {
+            if (parentID === -1) {
+                return layout.items?.filter(item => item.parentID === -1 || item.parentID === undefined) || [];
+            }
+            if (parentID === undefined) {
+                return layout.items?.filter(item => item.parentID === undefined) || [];
+            }
             return layout.items?.filter(item => item.parentID === parentID) || [];
         };
         // Recursive function to render layout items with depth tracking for indentation
-        const renderLayoutItem = (layoutItem, depth = 0) => {
+        // Prevent infinite recursion by tracking visited layoutItemIDs (handles malformed layouts where an item
+        // may reference itself as a child or cycles exist).
+        const renderLayoutItem = (layoutItem, depth = 0, visited = new Set()) => {
+            const id = layoutItem.layoutItemID ?? 0;
+            if (visited.has(id))
+                return null;
+            visited.add(id);
             // Check if this is a LayoutRoot - just render its children
             if (layoutItem.type === LayoutItemTypes.LayoutRoot) {
-                const children = getChildren(layoutItem.layoutItemID ?? 0);
-                return (_jsx(React.Fragment, { children: children.map(child => renderLayoutItem(child, depth)) }, `root-${layoutItem.layoutItemID}`));
+                const children = getChildren(layoutItem.layoutItemID);
+                return (_jsx(React.Fragment, { children: children.map(child => renderLayoutItem(child, depth, visited)) }, `root-${layoutItem.layoutItemID}`));
             }
             // Check if this is a LayoutGroup
             else if (layoutItem.type === LayoutItemTypes.LayoutGroup && layoutItem.lgd) {
-                const children = getChildren(layoutItem.layoutItemID ?? 0);
+                const children = getChildren(layoutItem.layoutItemID);
                 const groupDescriptor = layoutItem.lgd;
                 const groupTitle = groupDescriptor.caption || `Group ${layoutItem.layoutItemID}`;
                 const isCollapsed = false; // LayoutGroupDescriptor doesn't have collapsed property
                 // Apply indentation only to subgroups (depth > 0), not to root groups
                 const indentationPx = depth > 0 ? depth * 10 : 0;
-                return (_jsx("div", { style: { paddingLeft: `${indentationPx}px` }, children: _jsx(TMAccordion, { title: groupTitle, defaultCollapsed: isCollapsed, children: children.map(child => renderLayoutItem(child, depth + 1)) }) }, `group-wrapper-${layoutItem.layoutItemID}`));
+                return (_jsx("div", { style: { paddingLeft: `${indentationPx}px` }, children: _jsx(TMAccordion, { title: groupTitle, defaultCollapsed: isCollapsed, children: children.map(child => renderLayoutItem(child, depth + 1, visited)) }) }, `group-wrapper-${layoutItem.layoutItemID}`));
             }
             // Check if this is a LayoutControlItem (metadata field)
             else if (layoutItem.type === LayoutItemTypes.LayoutControlItem && layoutItem.lcid) {
@@ -455,7 +473,10 @@ const TMMetadataValues = ({ showCheckBoxes = ShowCheckBoxesMode.Never, checkPerm
             }
             return null;
         };
-        return (_jsx("div", { style: { width: '100%' }, children: rootItems.map(item => renderLayoutItem(item, 0)) }));
+        return (_jsx("div", { style: { width: '100%' }, children: (() => {
+                const visited = new Set();
+                return rootItems.map(item => renderLayoutItem(item, 0, visited));
+            })() }));
     }, [layout, metadataValues, showCheckBoxes, showNullValueCheckBoxes, isReadOnly, dynDataListsToBeRefreshed, validationItems, selectedMID, isOpenDistinctValues, openChooserBySingleClick, metadataValuesOrig]);
     const renderForm = useMemo(() => {
         // Se currentDTD non è ancora stato caricato, non renderizzare nulla

package/lib/components/features/archive/TMArchive.js

@@ -30,7 +30,10 @@ const TMArchive = ({ onDcmtTypeSelect = undefined, inputTID, inputFile = null, c
     }, [inputTID, mruTIDs]);
     useEffect(() => {
         pendingMidsRef.current = inputMids;
-    }, [inputMids]);
+        if (currentTID && currentTID > 0 && inputMids && inputMids.length > 0) {
+            setCurrentInputMids(inputMids);
+        }
+    }, [inputMids, currentTID]);
     useEffect(() => {
         if (!currentTID || currentTID <= 0) {
             previousTIDRef.current = currentTID;
@@ -42,20 +45,16 @@ const TMArchive = ({ onDcmtTypeSelect = undefined, inputTID, inputFile = null, c
             setFromDTD(dtd);
         });
         if (previousTIDRef.current !== undefined && previousTIDRef.current > 0 && previousTIDRef.current !== currentTID) {
+            if (!isSharedArchive) {
+                setCurrentInputMids([]);
+            }
             if (pendingMidsRef.current && pendingMidsRef.current.length > 0) {
                 setCurrentInputMids(pendingMidsRef.current);
                 pendingMidsRef.current = null;
             }
-            else {
-                setCurrentInputMids([]);
-            }
-        }
-        else if (pendingMidsRef.current) {
-            setCurrentInputMids(pendingMidsRef.current);
-            pendingMidsRef.current = null;
         }
         previousTIDRef.current = currentTID;
-    }, [currentTID, onDcmtTypeSelect]);
+    }, [currentTID, onDcmtTypeSelect, isSharedArchive]);
     const isMobile = deviceType === DeviceType.MOBILE;
     const tmTreeSelectorElement = useMemo(() => _jsx(TMTreeSelectorWrapper, { isMobile: isMobile, isSharedArchive: isSharedArchive, onSelectedTIDChanged: (tid) => {
             setCurrentTID(tid);
@@ -73,10 +72,11 @@ const TMArchive = ({ onDcmtTypeSelect = undefined, inputTID, inputFile = null, c
             setMruTIDs(newMruTIDS);
         } }), [mruTIDs, currentMruTID, deviceType, isSharedArchive]);
     const tmFormElement = useMemo(() => currentTID ?
-        _jsx(TMDcmtForm, { TID: currentTID, DID: currentTID === inputTID ? inputDID : undefined, sharedSourceTID: isSharedArchive ? inputTID : undefined, sharedSourceDID: isSharedArchive ? inputDID : undefined, groupId: 'tmForm', layoutMode: LayoutModes.Ark, onClose: deviceType === DeviceType.MOBILE ? () => setCurrentTID(undefined) : undefined, onSaveRecents: (TIDs) => setMruTIDs(TIDs), showDcmtFormSidebar: false, inputFile: inputFile, connectorFileSave: connectorFileSave, onSavedAsyncCallback: onSavedAsyncCallback, inputMids: currentInputMids, enableDragDropOverlay: enableDragDropOverlay, passToSearch: passToSearch ? (outputMids) => {
+        _jsx(TMDcmtForm, { TID: currentTID, DID: currentTID === inputTID ? inputDID : undefined, sharedSourceTID: isSharedArchive ? inputTID : undefined, sharedSourceDID: isSharedArchive ? inputDID : undefined, groupId: 'tmForm', layoutMode: LayoutModes.Ark, onClose: deviceType === DeviceType.MOBILE ? () => setCurrentTID(undefined) : undefined, onSaveRecents: (TIDs) => setMruTIDs(TIDs), showDcmtFormSidebar: false, inputFile: inputFile, connectorFileSave: connectorFileSave, onSavedAsyncCallback: onSavedAsyncCallback, inputMids: currentInputMids, enableDragDropOverlay: enableDragDropOverlay, passToSearch: passToSearch ? (outputMids, tid) => {
+                const tidToUse = tid ?? currentTID;
                 if (onDcmtTypeSelect)
-                    onDcmtTypeSelect(currentTID);
-                passToSearch(currentTID, outputMids);
+                    onDcmtTypeSelect(tidToUse);
+                passToSearch(tidToUse, outputMids);
             } : undefined, isSharedDcmt: isSharedArchive }, currentTID)
         :
             _jsx(TMPanel, { title: 'Archiviazione', allowMaximize: false, children: _jsxs(TMLayoutContainer, { gap: 30, alignItems: 'center', justifyContent: 'center', children: [_jsx(StyledToppyTextContainer, { children: _jsx(StyledToppyText, { children: SDKUI_Localizator.DcmtTypeSelect }) }), _jsx(StyledToppyImage, { src: Logo, alt: 'Toppy' })] }) }), [currentTID, deviceType, mruTIDs, inputFile, currentInputMids, enableDragDropOverlay, isSharedArchive]);

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

@@ -44,7 +44,7 @@ interface ITMDcmtFormProps {
     passToSearch?: (outputMids: Array<{
         mid: number;
         value: string;
-    }>) => void;
+    }>, tid?: number) => void;
     isSharedDcmt?: boolean;
     sharedSourceTID?: number;
     sharedSourceDID?: number;

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

@@ -291,6 +291,7 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
         if (layoutMode !== LayoutModes.Ark)
             return;
         setFocusedMetadataValue(undefined);
+        appliedInputMidsRef.current = null;
     }, [fromDTD, layoutMode]);
     useEffect(() => {
         if (!inputMids || inputMids.length === 0)
@@ -421,8 +422,8 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
         const outputMids = formData
             .filter(md => md.mid && md.mid > 100 && md.value && md.value.length > 0)
             .map(md => ({ mid: md.mid, value: md.value }));
-        passToSearch(outputMids);
-    }, [passToSearch, formData]);
+        passToSearch(outputMids, TID);
+    }, [passToSearch, formData, TID]);
     const isPreviewDisabled = useMemo(() => layoutMode === LayoutModes.Ark && fromDTD?.archiveConstraint === ArchiveConstraints.OnlyMetadata, [layoutMode, fromDTD?.archiveConstraint]);
     const isBoardDisabled = useMemo(() => layoutMode !== LayoutModes.Update || fromDTD?.hasBlog !== 1, [layoutMode, fromDTD?.hasBlog]);
     const isSysMetadataDisabled = useMemo(() => layoutMode !== LayoutModes.Update, [layoutMode]);

package/lib/components/features/search/TMSearchQueryPanel.d.ts

@@ -19,7 +19,7 @@ interface ITMSearchQueryPanelProps {
     passToArchiveCallback?: (outputMids: Array<{
         mid: number;
         value: string;
-    }>) => void;
+    }>, tid?: number) => void;
 }
 declare const TMSearchQueryPanel: React.FunctionComponent<ITMSearchQueryPanelProps>;
 export default TMSearchQueryPanel;

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

@@ -52,7 +52,24 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
         pendingMidsRef.current = inputMids ?? null;
     }, [inputMids]);
     useEffect(() => {
-        if (!qd || !fromDTD)
+        if (!fromDTD)
+            return;
+        // Reset appliedInputMidsRef when TID changes so pending mids can be applied to new TID
+        appliedInputMidsRef.current = null;
+        const initQd = async () => {
+            // Only initialize if qd doesn't exist or is for a different TID
+            if (!qd || qd.from?.tid !== fromDTD.id) {
+                const newQd = await getQD(fromDTD.id, false);
+                if (newQd) {
+                    setQd(newQd);
+                }
+            }
+        };
+        initQd();
+    }, [fromDTD?.id]);
+    // Apply inputMids when qd is ready and matches fromDTD
+    useEffect(() => {
+        if (!qd || !fromDTD || qd.from?.tid !== fromDTD.id)
             return;
         const midsToApply = pendingMidsRef.current;
         if (!midsToApply || midsToApply.length === 0)
@@ -67,6 +84,11 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
         }) || [];
         midsToApply.forEach(im => {
             const md = fromDTD.metadata?.find(m => m.id === im.mid);
+            // Skip MIDs that don't belong to this TID
+            if (!md) {
+                console.warn(`MID ${im.mid} does not belong to TID ${fromDTD.id}, skipping`);
+                return;
+            }
             const defaultOperator = getDefaultOperator(md?.dataDomain, md?.dataType);
             let existingWi = newWhere.find(wi => wi.mid === im.mid);
             if (existingWi) {
@@ -85,7 +107,7 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
         });
         setQd({ ...qd, where: newWhere });
         setShowAllMdWhere(true);
-    }, [qd, fromDTD]);
+    }, [qd, fromDTD, inputMids]);
     // Eseguire la ricerca quando shouldSearch è true e qd è definito
     useEffect(() => {
         if (shouldSearch && qd) {
@@ -200,8 +222,8 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
         const outputMids = qd.where
             .filter(wi => wi.mid && wi.value1 && wi.value1.length > 0)
             .map(wi => ({ mid: wi.mid, value: wi.value1 }));
-        passToArchiveCallback(outputMids);
-    }, [passToArchiveCallback, qd?.where]);
+        passToArchiveCallback(outputMids, fromDTD?.id);
+    }, [passToArchiveCallback, qd?.where, fromDTD?.id]);
     const handleCloseFiltersConfig = useCallback(() => setShowFiltersConfig(false), []);
     const handleChooseFilters = useCallback((tid_mids) => {
         if (!fromDTD?.metadata)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.19.0-dev1.44",
+    "version": "6.19.0-dev1.46",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",