@topconsultnpm/sdkui-react 6.19.0-dev1.43 → 6.19.0-dev1.45

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: inputDID, 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,8 +44,10 @@ interface ITMDcmtFormProps {
     passToSearch?: (outputMids: Array<{
         mid: number;
         value: string;
-    }>) => void;
+    }>, tid?: number) => void;
     isSharedDcmt?: boolean;
+    sharedSourceTID?: number;
+    sharedSourceDID?: number;
 }
 declare const TMDcmtForm: React.FC<ITMDcmtFormProps>;
 export default TMDcmtForm;

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import TMDcmtPreview from './TMDcmtPreview';
-import { AccessLevels, ArchiveConstraints, ArchiveEngineByID, DcmtTypeListCacheService, LayoutCacheService, LayoutModes, MetadataDataTypes, ResultTypes, SDK_Globals, SDK_Localizator, SystemMIDsAsNumber, SystemTIDs, Task_States, TemplateTIDs, UpdateEngineByID, ValidationItem, WorkflowCacheService, WorkItemMetadataNames } from '@topconsultnpm/sdk-ts';
+import { AccessLevels, ArchiveConstraints, ArchiveEngineByID, DcmtTypeListCacheService, LayoutCacheService, LayoutModes, MetadataDataTypes, ResultTypes, SDK_Globals, SDK_Localizator, SystemMIDsAsNumber, SystemTIDs, Task_States, TemplateTIDs, TID_DID, UpdateEngineByID, ValidationItem, WorkflowCacheService, WorkItemMetadataNames } from '@topconsultnpm/sdk-ts';
 import { ContextMenu } from 'devextreme-react';
 import { WorkFlowApproveRejectPopUp, WorkFlowMoreInfoPopUp, WorkFlowOperationButtons, WorkFlowReAssignPopUp } from '../workflow/TMWorkflowPopup';
 import { DownloadTypes, FormModes } from '../../../ts';
@@ -37,7 +37,7 @@ import WFDiagram from '../workflow/diagram/WFDiagram';
 import TMTooltip from '../../base/TMTooltip';
 let abortControllerLocal = new AbortController();
 //#endregion
-const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes.Update, onClose, onSavedAsyncCallback, TID, DID, formMode = FormModes.Update, canNext, canPrev, count, itemIndex, onNext, onPrev, allowNavigation = true, allowRelations = true, isClosable = false, isExpertMode = SDKUI_Globals.userSettings.advancedSettings.expertMode === 1, showDcmtFormSidebar = true, invokedByTodo = false, titleModal, isModal = false, widthModal = "100%", heightModal = "100%", groupId, onWFOperationCompleted, onTaskCompleted, inputFile = null, taskFormDialogComponent, taskMoreInfo, connectorFileSave = undefined, inputMids = [], onOpenS4TViewerRequest, s4TViewerDialogComponent, enableDragDropOverlay = false, passToSearch, isSharedDcmt = false }) => {
+const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes.Update, onClose, onSavedAsyncCallback, TID, DID, formMode = FormModes.Update, canNext, canPrev, count, itemIndex, onNext, onPrev, allowNavigation = true, allowRelations = true, isClosable = false, isExpertMode = SDKUI_Globals.userSettings.advancedSettings.expertMode === 1, showDcmtFormSidebar = true, invokedByTodo = false, titleModal, isModal = false, widthModal = "100%", heightModal = "100%", groupId, onWFOperationCompleted, onTaskCompleted, inputFile = null, taskFormDialogComponent, taskMoreInfo, connectorFileSave = undefined, inputMids = [], onOpenS4TViewerRequest, s4TViewerDialogComponent, enableDragDropOverlay = false, passToSearch, isSharedDcmt = false, sharedSourceTID, sharedSourceDID }) => {
     const [id, setID] = useState('');
     const [showWaitPanelLocal, setShowWaitPanelLocal] = useState(false);
     const [waitPanelTitleLocal, setWaitPanelTitleLocal] = useState('');
@@ -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]);
@@ -615,11 +616,12 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
             else {
                 ae.ArchivingFile = dcmtFileRef.current;
             }
-            // if (isSharedDcmt) {
-            //     console.log(TID);
-            //     console.log(DID);
-            //     ae.SharedDcmt = { tid: TID, did: DID } as TID_DID;
-            // }
+            if (isSharedDcmt && sharedSourceTID && sharedSourceDID) {
+                const sharedDcmt = new TID_DID();
+                sharedDcmt.tid = sharedSourceTID;
+                sharedDcmt.did = sharedSourceDID;
+                ae.SharedDcmt = sharedDcmt;
+            }
             let newDID = await ae.ArchiveAsync(abortControllerLocal.signal, (pd) => {
                 if (firstBlock) {
                     maxFileSize = pd.ProgressBarMaximum ?? 0;

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/lib/components/features/search/TMSearchResult.js

@@ -621,7 +621,7 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
                     await onRefreshSearchAsync?.();
                 } }), isOpenSharedArchive && _jsx(TMModal, { title: "Archiviazione condivisa", onClose: () => {
                     setIsOpenSharedArchive(false);
-                }, width: isMobile ? '90%' : '80%', height: isMobile ? '90%' : '80%', children: _jsx(TMArchive, { inputDID: focusedItem?.DID, inputTID: focusedItem?.TID, inputMids: currentMetadataValues.filter(md => md.mid && md.mid > 100).map(md => ({ mid: md.mid, value: md.value ?? '' })), isSharedArchive: true, inputFile: sharedDcmtFile, onSavedAsyncCallback: async (tid, did) => {
+                }, width: isMobile ? '90%' : '60%', height: isMobile ? '90%' : '80%', children: _jsx(TMArchive, { inputDID: focusedItem?.DID, inputTID: focusedItem?.TID, inputMids: currentMetadataValues.filter(md => md.mid && md.mid > 100).map(md => ({ mid: md.mid, value: md.value ?? '' })), isSharedArchive: true, inputFile: sharedDcmtFile, onSavedAsyncCallback: async (tid, did) => {
                         setIsOpenSharedArchive(false);
                         await onRefreshSearchAsync?.();
                     } }) })] }));

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

@@ -397,7 +397,7 @@ export const getCommandsMenuItems = (isMobile, dtd, selectedItems, focusedItem,
     const sharedDcmtsMenuItem = () => {
         return {
             icon: svgToString(_jsx(IconSharedDcmt, {})),
-            text: 'Documenti Condivisi',
+            text: 'Documenti condivisi',
             operationType: 'multiRow',
             disabled: disabledForMultiRow(selectedItems, focusedItem),
             items: [

package/package.json

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