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

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

@@ -19,6 +19,7 @@ const TMArchive = ({ onDcmtTypeSelect = undefined, inputTID, inputFile = null, c
     const [fromDTD, setFromDTD] = useState();
     const [currentInputMids, setCurrentInputMids] = useState(inputMids);
     const previousTIDRef = React.useRef(undefined);
+    const pendingMidsRef = React.useRef(null);
     const deviceType = useDeviceType();
     useEffect(() => { setMruTIDs(SDKUI_Globals.userSettings.archivingSettings.mruTIDs); }, []);
     useEffect(() => {
@@ -26,12 +27,13 @@ const TMArchive = ({ onDcmtTypeSelect = undefined, inputTID, inputFile = null, c
             return;
         setCurrentTID(inputTID);
         setCurrentMruTID(mruTIDs.includes(inputTID) ? inputTID : 0);
-    }, [inputTID]);
+    }, [inputTID, mruTIDs]);
     useEffect(() => {
-        setCurrentInputMids(inputMids);
+        pendingMidsRef.current = inputMids;
     }, [inputMids]);
     useEffect(() => {
         if (!currentTID || currentTID <= 0) {
+            previousTIDRef.current = currentTID;
             return;
         }
         if (onDcmtTypeSelect)
@@ -39,8 +41,18 @@ const TMArchive = ({ onDcmtTypeSelect = undefined, inputTID, inputFile = null, c
         DcmtTypeListCacheService.GetAsync(currentTID).then(async (dtd) => {
             setFromDTD(dtd);
         });
-        if (previousTIDRef.current !== undefined && previousTIDRef.current !== currentTID) {
-            setCurrentInputMids([]);
+        if (previousTIDRef.current !== undefined && previousTIDRef.current > 0 && previousTIDRef.current !== currentTID) {
+            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]);
@@ -61,7 +73,7 @@ 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) => {
                 if (onDcmtTypeSelect)
                     onDcmtTypeSelect(currentTID);
                 passToSearch(currentTID, outputMids);

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

@@ -46,6 +46,8 @@ interface ITMDcmtFormProps {
         value: string;
     }>) => 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('');
@@ -615,11 +615,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.js

@@ -42,23 +42,30 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
     const isMobile = deviceType === DeviceType.MOBILE;
     let initialMaxItems = deviceType === DeviceType.MOBILE ? 8 : 12;
     const appliedInputMidsRef = useRef(null);
+    const pendingMidsRef = useRef(null);
     useEffect(() => {
         if (!SQD)
             return;
         setDataAsync(SQD);
     }, [SQD]);
     useEffect(() => {
-        if (!inputMids || inputMids.length === 0 || !qd || !fromDTD)
+        pendingMidsRef.current = inputMids ?? null;
+    }, [inputMids]);
+    useEffect(() => {
+        if (!qd || !fromDTD)
+            return;
+        const midsToApply = pendingMidsRef.current;
+        if (!midsToApply || midsToApply.length === 0)
             return;
-        if (appliedInputMidsRef.current && deepCompare(appliedInputMidsRef.current, inputMids))
+        if (appliedInputMidsRef.current && deepCompare(appliedInputMidsRef.current, midsToApply))
             return;
-        appliedInputMidsRef.current = inputMids;
+        appliedInputMidsRef.current = midsToApply;
         const newWhere = qd.where?.map((curItem) => {
             let newWi = new WhereItem();
             newWi.init({ ...curItem, value1: undefined, value2: undefined });
             return newWi;
         }) || [];
-        inputMids.forEach(im => {
+        midsToApply.forEach(im => {
             const md = fromDTD.metadata?.find(m => m.id === im.mid);
             const defaultOperator = getDefaultOperator(md?.dataDomain, md?.dataType);
             let existingWi = newWhere.find(wi => wi.mid === im.mid);
@@ -78,7 +85,7 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
         });
         setQd({ ...qd, where: newWhere });
         setShowAllMdWhere(true);
-    }, [inputMids, qd, fromDTD]);
+    }, [qd, fromDTD]);
     // Eseguire la ricerca quando shouldSearch è true e qd è definito
     useEffect(() => {
         if (shouldSearch && qd) {

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.d.ts

@@ -7,4 +7,4 @@ export declare const signatureInformationCallback: (isMobile: boolean, inputDcmt
 export declare const getCommandsMenuItems: (isMobile: boolean, dtd: DcmtTypeDescriptor | undefined, selectedItems: Array<any>, focusedItem: any, context: SearchResultContext, showFloatingBar: boolean, workingGroupContext: WorkingGroupDescriptor | undefined, showSearch: boolean, setShowFloatingBar: React.Dispatch<React.SetStateAction<boolean>>, openFormHandler: (layoutMode: LayoutModes) => void, openSharedArchiveHandler: () => Promise<void>, downloadDcmtsAsync: (inputDcmts: DcmtInfo[] | undefined, downloadType: DownloadTypes, downloadMode: DownloadModes, onFileDownloaded?: (dcmtFile: File | undefined) => void, confirmAttachments?: (list: FileDescriptor[]) => Promise<string[] | undefined>) => Promise<void>, runOperationAsync: (inputDcmts: DcmtInfo[] | undefined, dcmtOperationType: DcmtOperationTypes, actionAfterOperationAsync?: () => Promise<void>) => Promise<void>, onRefreshSearchAsync: (() => Promise<void>) | undefined, onRefreshDataRowsAsync: (() => Promise<void>) | undefined, onRefreshAfterAddDcmtToFavs: (() => void) | undefined, confirmFormat: () => Promise<FileFormats>, confirmAttachments: (list: FileDescriptor[]) => Promise<string[] | undefined>, openTaskFormHandler: () => void, openDetailDcmtsFormHandler: (value: boolean) => void, openMasterDcmtsFormHandler: (value: boolean) => void, openBatchUpdateFormHandler: (value: boolean) => void, openExportForm: () => void, handleToggleSearch: () => void, handleSignApprove: () => void, openWGsCopyMoveForm?: ((mode: "copyToWgDraft" | "copyToWgArchivedDoc", dcmtTypeDescriptor: DcmtTypeDescriptor, documents: Array<DcmtInfo>) => void), openCommentFormCallback?: ((documents: Array<DcmtInfo>) => void), openEditPdf?: ((documents: Array<DcmtInfo>) => void), openAddDocumentForm?: () => void, passToArchiveCallback?: (outputMids: Array<{
     mid: number;
     value: string;
-}>) => void, archiveMasterDocuments?: (tid: number | undefined) => Promise<void>, archiveDetailDocuments?: (tid: number | undefined) => Promise<void>, hasMasterRelation?: boolean, hasDetailRelation?: boolean, canArchiveMasterRelation?: boolean, canArchiveDetailRelation?: boolean, pairManyToManyDocuments?: (isPairing: boolean) => Promise<void>, hasManyToManyRelation?: boolean) => Array<TMDataGridContextMenuItem>;
+}>, tid?: number) => void, archiveMasterDocuments?: (tid: number | undefined) => Promise<void>, archiveDetailDocuments?: (tid: number | undefined) => Promise<void>, hasMasterRelation?: boolean, hasDetailRelation?: boolean, canArchiveMasterRelation?: boolean, canArchiveDetailRelation?: boolean, pairManyToManyDocuments?: (isPairing: boolean) => Promise<void>, hasManyToManyRelation?: boolean) => Array<TMDataGridContextMenuItem>;

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

@@ -235,7 +235,7 @@ export const getCommandsMenuItems = (isMobile, dtd, selectedItems, focusedItem,
                         ?.filter(md => md.mid && md.mid > 100 && md.value && md.value.length > 0)
                         .map(md => ({ mid: md.mid, value: md.value })) || [];
                     TMSpinner.hide();
-                    passToArchiveCallback?.(outputMids);
+                    passToArchiveCallback?.(outputMids, item.TID);
                 }
                 catch (error) {
                     TMSpinner.hide();
@@ -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.42",
+    "version": "6.19.0-dev1.44",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",