@topconsultnpm/sdkui-react 6.19.0-dev1.34 → 6.19.0-dev1.36

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

@@ -153,18 +153,12 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
                 return;
             if (!DID && layoutMode === LayoutModes.Update)
                 return;
-            // Esegui in parallelo GetMetadataAsync e LayoutCacheService.GetAsync
-            // poiché non dipendono l'uno dall'altro
-            const [getMetadataResult, resLayout] = await Promise.all([
-                layoutMode === LayoutModes.Update
-                    ? SDK_Globals.tmSession?.NewSearchEngine().GetMetadataAsync(TID, DID, true)
-                    : Promise.resolve(undefined),
-                LayoutCacheService.GetAsync(TID, layoutMode)
-            ]);
-            // DcmtTypeListCacheService dipende da getMetadataResult, quindi deve attendere
+            let getMetadataResult;
+            if (layoutMode === LayoutModes.Update) {
+                getMetadataResult = await SDK_Globals.tmSession?.NewSearchEngine().GetMetadataAsync(TID, DID, true);
+            }
             let dtd = await DcmtTypeListCacheService.GetWithNotGrantedAsync(TID, DID, getMetadataResult);
             setFromDTD(dtd);
-            setLayout(resLayout);
             if (layoutMode === LayoutModes.Update || (layoutMode === LayoutModes.Ark && DID)) {
                 await setMetadataList(dtd?.metadata ?? [], getMetadataResult);
             }
@@ -175,6 +169,8 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
                 setFormData(structuredClone(metadataList));
                 formDataOrigRef.current = structuredClone(metadataList);
             }
+            let resLayout = await LayoutCacheService.GetAsync(TID, layoutMode);
+            setLayout(resLayout);
             (layoutMode === LayoutModes.Ark && !inputFile) && handleReset();
         }
         catch (e) {
@@ -288,9 +284,11 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
             return;
         if (!formData || formData.length === 0)
             return;
+        // Check if formData has actual user metadata (mid > 99), not just system metadata
+        if (!formData.some(md => md.mid && md.mid > 99))
+            return;
         if (appliedInputMidsRef.current && deepCompare(appliedInputMidsRef.current, inputMids))
             return;
-        appliedInputMidsRef.current = inputMids;
         let data = structuredClone(formData);
         for (let md of data) {
             if (!md.mid)
@@ -321,6 +319,7 @@ const TMDcmtForm = ({ showHeader = true, onSaveRecents, layoutMode = LayoutModes
             }
         });
         setFormData(data);
+        appliedInputMidsRef.current = inputMids;
     }, [inputMids, layoutMode, formData, formDataOrig]);
     // Memoizza solo il valore WI_SetID per evitare re-render quando altri metadata cambiano
     const workItemSetIDValue = useMemo(() => formData.find(o => o.md?.name === WorkItemMetadataNames.WI_SetID)?.value, [formData]);

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

@@ -83,11 +83,12 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
     const [currentMetadataValues, setCurrentMetadataValues] = useState([]);
     const [dcmtFormLayoutMode, setDcmtFormLayoutMode] = useState(LayoutModes.Update);
     const [isModifiedBatchUpdate, setIsModifiedBatchUpdate] = useState(false);
+    const [sharedDcmtFile, setSharedDcmtFile] = useState(undefined);
     // State to control whether the export form (for exporting to Excel/CSV/txt and others) should be shown
     const [showExportForm, setShowExportForm] = useState(false);
     const [confirmFormat, ConfirmFormatDialog] = useInputCvtFormatDialog();
     const { openConfirmAttachmentsDialog, ConfirmAttachmentsDialog } = useInputAttachmentsDialog();
-    const { abortController, showWaitPanel, waitPanelTitle, showPrimary, waitPanelTextPrimary, waitPanelValuePrimary, waitPanelMaxValuePrimary, showSecondary, waitPanelTextSecondary, waitPanelValueSecondary, waitPanelMaxValueSecondary, downloadDcmtsAsync, runOperationAsync } = useDcmtOperations();
+    const { abortController, showWaitPanel, waitPanelTitle, showPrimary, waitPanelTextPrimary, waitPanelValuePrimary, waitPanelMaxValuePrimary, showSecondary, waitPanelTextSecondary, waitPanelValueSecondary, waitPanelMaxValueSecondary, downloadDcmtsAsync, runOperationAsync, getDcmtFileAsync } = useDcmtOperations();
     const relatedDocuments = useRelatedDocuments({ selectedSearchResult, focusedItem, currentSearchResults });
     const { relatedDcmts, showRelatedDcmtsChooser, archiveType, isOpenDetails, isOpenMaster, isOpenArchiveRelationForm, archiveRelatedDcmtFormTID, archiveRelatedDcmtFormMids, relatedDcmtsChooserDataSource, showPairDcmtsModal, isPairingManyToMany, pairedSearchResults, manyToManyRelations, selectedManyToManyRelation, showManyToManyChooser, manyToManyChooserDataSource, showPairSearchModal, pairSearchModalTargetTID, pairSearchModalParentTID, pairSearchModalParentDID, pairSearchModalRelation, pairSearchModalInputMids, currentTIDHasDetailRelations, currentTIDHasMasterRelations, canArchiveMasterRelation, canArchiveDetailRelation, hasManyToManyRelation, setIsOpenDetails, setIsOpenMaster, setShowRelatedDcmtsChooser, setShowManyToManyChooser, setShowPairDcmtsModal, setShowPairSearchModal, setIsOpenArchiveRelationForm, setArchiveType, setArchiveRelatedDcmtFormTID, setArchiveRelatedDcmtFormMids, pairFloatingActionConfig, pairSearchModalFloatingActionConfig, archiveMasterDocuments, archiveDetailDocuments, pairManyToMany, checkRelatedDcmtsArchiveCapability, checkManyToManyCapability, archiveRelatedDcmtHandler, executeManyToManyPairing, } = relatedDocuments;
     const deviceType = useDeviceType();
@@ -149,12 +150,19 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
         });
     }, [currentMetadataValues]);
     const openFormHandler = (layoutMode) => { setIsOpenDcmtForm(true); setDcmtFormLayoutMode(layoutMode); };
-    const openSharedArchiveHandler = () => {
+    const openSharedArchiveHandler = async () => {
         const dcmts = getSelectedDcmtsOrFocused(selectedItems, focusedItem);
         if (dcmts.length === 0) {
             ShowAlert({ message: "Nessun documento selezionato", mode: "warning", duration: 3000 });
             return;
         }
+        let dcmtFile = await getDcmtFileAsync(focusedItem.TID, focusedItem.DID, 'Archiviazione Condivisa', true);
+        if (dcmtFile) {
+            setSharedDcmtFile(dcmtFile?.file);
+        }
+        else {
+            ShowAlert({ message: "Il documento selezionato non ha un file associato per l'archiviazione condivisa.", mode: "error", duration: 5000 });
+        }
         setIsOpenSharedArchive(true);
     };
     const openTaskFormHandler = (onTaskCreated) => {
@@ -608,7 +616,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, { inputTID: focusedItem?.TID, inputMids: currentMetadataValues.filter(md => md.mid && md.mid > 100).map(md => ({ mid: md.mid, value: md.value ?? '' })), isSharedArchive: true, onSavedAsyncCallback: async (tid, did) => {
+                }, width: isMobile ? '90%' : '80%', height: isMobile ? '90%' : '80%', children: _jsx(TMArchive, { 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

@@ -4,7 +4,7 @@ import { TMDataGridContextMenuItem } from '../../base/TMDataGrid';
 import { DcmtInfo, DcmtOperationTypes, DownloadModes, DownloadTypes, SearchResultContext } from '../../../ts';
 export declare const getSelectedDcmtsOrFocused: (selectedItems: Array<any>, focusedItem: any, fileFormat?: FileFormats) => DcmtInfo[];
 export declare const signatureInformationCallback: (isMobile: boolean, inputDcmts: DcmtInfo[] | undefined) => Promise<void>;
-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: () => 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<{
+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>;

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

@@ -406,13 +406,13 @@ export const getCommandsMenuItems = (isMobile, dtd, selectedItems, focusedItem,
                     text: "Archiviazione condivisa",
                     operationType: 'singleRow',
                     disabled: disabledForSingleRow(selectedItems, focusedItem),
-                    onClick: () => { openSharedArchiveHandler(); }
+                    onClick: async () => { await openSharedArchiveHandler(); }
                 },
                 {
                     icon: svgToString(_jsx(IconSharedDcmt, {})),
                     text: "Mostra documenti condivisi",
                     operationType: 'multiRow',
-                    disabled: !hasManyToManyRelation || disabledForMultiRow(selectedItems, focusedItem),
+                    disabled: disabledForMultiRow(selectedItems, focusedItem),
                     onClick: () => ShowAlert({ message: "TODO Mostra documenti condivisi", mode: 'info', title: `${"TODO"}`, duration: 3000 })
                 }
             ]

package/lib/hooks/useRelatedDocuments.js

@@ -346,9 +346,11 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
         const searchEngine = SDK_Globals.tmSession?.NewSearchEngine();
         if (!focusedItem?.TID || !focusedItem?.DID) {
             ShowAlert({
-                message: "Nessun documento selezionato per l'operazione molti-a-molti.",
+                message: isPairing
+                    ? "Nessun documento selezionato per l'abbinamento molti a molti."
+                    : "Nessun documento selezionato per il disabbinamento molti a molti.",
                 mode: 'warning',
-                title: 'Operazione molti-a-molti',
+                title: isPairing ? 'Abbina documenti molti a molti' : 'Disabbina documenti molti a molti',
                 duration: 5000
             });
             return;
@@ -363,9 +365,11 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
         }
         if (!qd) {
             ShowAlert({
-                message: "Nessuna query di recupero associata alla relazione molti-a-molti.",
+                message: isPairing
+                    ? "Nessuna query di recupero associata alla relazione di abbinamento molti a molti."
+                    : "Nessuna query di recupero associata alla relazione di disabbinamento molti a molti.",
                 mode: 'warning',
-                title: 'Operazione molti-a-molti',
+                title: isPairing ? 'Abbina documenti molti a molti' : 'Disabbina documenti molti a molti',
                 duration: 5000
             });
             return;
@@ -470,7 +474,7 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
                 ShowAlert({
                     message: "Nessun documento abbinato trovato.",
                     mode: 'warning',
-                    title: 'Operazione molti-a-molti',
+                    title: 'Disabbina documenti molti a molti',
                     duration: 5000
                 });
                 return;
@@ -494,7 +498,7 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
             ShowAlert({
                 message: "Nessun documento trovato.",
                 mode: 'warning',
-                title: 'Operazione molti-a-molti',
+                title: 'Abbina documenti molti a molti',
                 duration: 5000
             });
             openPairSearchModal(relation, targetTID, qd);
@@ -519,7 +523,7 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
             ShowAlert({
                 message: "Nessun documento da abbinare. Tutti i documenti risultanti sono già abbinati.",
                 mode: 'warning',
-                title: 'Operazione molti-a-molti',
+                title: 'Abbina documenti molti a molti',
                 duration: 5000
             });
             openPairSearchModal(relation, targetTID, qd);
@@ -537,9 +541,11 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
                 return;
             if (!relations.some(r => r.relationType === RelationTypes.ManyToMany)) {
                 ShowAlert({
-                    message: "Nessuna relazione molti-a-molti definita nel sistema.",
+                    message: isPairing
+                        ? "Nessuna relazione di abbinamento molti a molti definita nel sistema."
+                        : "Nessuna relazione di disabbinamento molti a molti definita nel sistema.",
                     mode: 'warning',
-                    title: 'Operazione molti-a-molti',
+                    title: isPairing ? 'Abbina documenti molti a molti' : 'Disabbina documenti molti a molti',
                     duration: 5000
                 });
                 return;
@@ -547,9 +553,11 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
             const manyToManyRels = relations.filter(r => r.relationType === RelationTypes.ManyToMany);
             if (!manyToManyRels.some(r => r.masterTID === selectedSearchResult?.fromTID || r.detailTID === selectedSearchResult?.fromTID)) {
                 ShowAlert({
-                    message: "Nessuna relazione molti-a-molti definita per il tipo di documento selezionato.",
+                    message: isPairing
+                        ? "Nessuna relazione di abbinamento molti a molti definita per il tipo di documento selezionato."
+                        : "Nessuna relazione di disabbinamento molti a molti definita per il tipo di documento selezionato.",
                     mode: 'warning',
-                    title: 'Operazione molti-a-molti',
+                    title: isPairing ? 'Abbina documenti molti a molti' : 'Disabbina documenti molti a molti',
                     duration: 5000
                 });
                 return;

package/package.json

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