@topconsultnpm/sdkui-react 6.19.0-dev1.15 → 6.19.0-dev1.17

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

@@ -432,19 +432,15 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
         type: 'multi',
         onClick: async (selected) => {
             if (!selectedManyToManyRelation || !focusedItem?.TID || !focusedItem?.DID) {
-                console.log('Missing required data');
                 return;
             }
             const isMaster = currentSearchResults[0].fromTID === selectedManyToManyRelation.masterTID;
             const isDetail = currentSearchResults[0].fromTID === selectedManyToManyRelation.detailTID;
-            console.log('isMaster:', isMaster, 'isDetail:', isDetail);
             if (!isMaster && !isDetail) {
-                console.log('TID does not match');
                 return;
             }
             const tms = SDK_Globals.tmSession;
             if (!tms) {
-                console.log('No session');
                 return;
             }
             const se = new SearchEngine(tms);
@@ -660,51 +656,48 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
     const archiveMasterDocuments = async (tid) => {
         await archiveRelatedDocuments(tid, 'master');
     };
-    const getAlreadyPairedDIDs = async (relation, currentTID, currentDID) => {
+    const getPairedDocuments = async (relation, currentTID, currentDID, searchEngine) => {
         if (!relation || !currentDID)
-            return [];
+            return null;
         try {
-            const tmSession = SDK_Globals.tmSession;
-            if (!tmSession)
-                return [];
-            const searchEngine = tmSession.NewSearchEngine();
-            if (!searchEngine)
-                return [];
             const isMaster = currentTID === relation.masterTID;
             const pairedResults = isMaster
                 ? await searchEngine.GetAllDetailDcmtsAsync(currentTID, currentDID)
                 : await searchEngine.GetAllMasterDcmtsAsync(currentTID, currentDID);
             if (!pairedResults || pairedResults.length === 0)
-                return [];
+                return null;
             const relationResult = pairedResults.find(r => r.relationID === relation.id);
             if (!relationResult?.dtdResult)
-                return [];
-            const pairedDIDs = [];
-            const rows = relationResult.dtdResult.rows ?? [];
-            const columns = relationResult.dtdResult.columns ?? [];
-            const didColumnIndex = columns.findIndex(col => {
-                const caption = col.caption?.toUpperCase();
-                const mid = col.extendedProperties?.["MID"];
-                const midNum = typeof mid === 'string' ? Number.parseInt(mid, 10) : mid;
-                return caption === 'DID' || midNum === 5;
-            });
-            if (didColumnIndex === -1)
-                return [];
-            for (const row of rows) {
-                const did = row[didColumnIndex];
-                if (did) {
-                    const didNumber = typeof did === 'string' ? Number.parseInt(did, 10) : did;
-                    if (!Number.isNaN(didNumber)) {
-                        pairedDIDs.push(didNumber);
-                    }
-                }
-            }
-            return pairedDIDs;
+                return null;
+            return relationResult;
         }
         catch (error) {
-            console.error('getAlreadyPairedDIDs - Error:', error);
+            console.error('getPairedDocuments - Error:', error);
+            return null;
+        }
+    };
+    const extractPairedDIDs = (relationResult) => {
+        const pairedDIDs = [];
+        const rows = relationResult.dtdResult?.rows ?? [];
+        const columns = relationResult.dtdResult?.columns ?? [];
+        const didColumnIndex = columns.findIndex(col => {
+            const caption = col.caption?.toUpperCase();
+            const mid = col.extendedProperties?.["MID"];
+            const midNum = typeof mid === 'string' ? Number.parseInt(mid, 10) : mid;
+            return caption === 'DID' || midNum === 5;
+        });
+        if (didColumnIndex === -1)
             return [];
+        for (const row of rows) {
+            const did = row[didColumnIndex];
+            if (did) {
+                const didNumber = typeof did === 'string' ? Number.parseInt(did, 10) : did;
+                if (!Number.isNaN(didNumber)) {
+                    pairedDIDs.push(didNumber);
+                }
+            }
         }
+        return pairedDIDs;
     };
     const executeManyToManyPairing = async (relation, isPairing) => {
         const searchEngine = SDK_Globals.tmSession?.NewSearchEngine();
@@ -777,6 +770,7 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
                 }
             }
             if (notMappedMIDs && qdRetrieveParamsValue.select && qdRetrieveParamsValue.select.length > 0) {
+                //HERE -> Fetch missing parameter values from the current document to use in the main query
                 const paramMetadata = await searchEngine.SearchByIDAsync(qdRetrieveParamsValue);
                 if (paramMetadata?.dtdResult?.rows?.[0]) {
                     for (const param of qd.params) {
@@ -810,7 +804,6 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
         const targetTID = relation.detailTID === selectedSearchResult?.fromTID
             ? relation.masterTID
             : relation.detailTID;
-        const qdWithSystemMIDs = structuredClone(qd);
         const systemSelects = [
             { tid: targetTID, mid: SystemMIDsAsNumber.DID, visibility: 0 },
             { tid: targetTID, mid: SystemMIDsAsNumber.TID, visibility: 0 },
@@ -823,13 +816,39 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
             { tid: targetTID, mid: SystemMIDsAsNumber.FileSize, visibility: 0 },
             { tid: targetTID, mid: SystemMIDsAsNumber.PageCount, visibility: 0 },
         ];
-        if (qdWithSystemMIDs.select) {
-            qdWithSystemMIDs.select = [...systemSelects, ...qdWithSystemMIDs.select];
+        if (qd.select) {
+            qd.select = [...systemSelects, ...qd.select];
         }
         else {
-            qdWithSystemMIDs.select = systemSelects;
+            qd.select = systemSelects;
         }
-        const sq = await searchEngine.SearchByIDAsync(qdWithSystemMIDs);
+        const pairedDocumentsResult = await getPairedDocuments(relation, focusedItem.TID, focusedItem.DID, searchEngine);
+        if (!isPairing) {
+            if (!pairedDocumentsResult?.dtdResult?.rows || pairedDocumentsResult.dtdResult.rows.length === 0) {
+                ShowAlert({
+                    message: "Nessun documento abbinato trovato.",
+                    mode: 'warning',
+                    title: 'Operazione molti-a-molti',
+                    duration: 5000
+                });
+                return;
+            }
+            const pairedSq = {
+                fromTID: targetTID,
+                fromName: await DcmtTypeListCacheService.GetAsync(targetTID).then(d => d?.name ?? ''),
+                dtdResult: pairedDocumentsResult.dtdResult,
+                selectMIDs: pairedDocumentsResult.selectMIDs,
+                relationID: relation.id,
+                dcmtsReturned: pairedDocumentsResult.dtdResult.rows.length,
+                dcmtsFound: pairedDocumentsResult.dtdResult.rows.length
+            };
+            setPairedSearchResults([pairedSq]);
+            setIsPairingManyToMany(isPairing);
+            setShowPairDcmtsModal(true);
+            return;
+        }
+        //HERE -> For pair mode, execute the query and filter out already paired documents
+        const sq = await searchEngine.SearchByIDAsync(qd);
         if (!sq?.dtdResult?.rows || sq.dtdResult.rows.length === 0) {
             ShowAlert({
                 message: "Nessun documento trovato.",
@@ -839,16 +858,11 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
             });
             return;
         }
-        const pairedDIDs = await getAlreadyPairedDIDs(relation, focusedItem.TID, focusedItem.DID);
+        const pairedDIDs = pairedDocumentsResult ? extractPairedDIDs(pairedDocumentsResult) : [];
         const filteredRows = sq.dtdResult.rows.filter(row => {
             const did = row[0];
-            const didNum = typeof did === 'string' ? parseInt(did, 10) : did;
-            if (isPairing) {
-                return !pairedDIDs.includes(didNum);
-            }
-            else {
-                return pairedDIDs.includes(didNum);
-            }
+            const didNum = typeof did === 'string' ? Number.parseInt(did, 10) : did;
+            return !pairedDIDs.includes(didNum);
         });
         const filteredSq = {
             ...sq,
@@ -861,14 +875,13 @@ const TMSearchResult = ({ context = SearchResultContext.METADATA_SEARCH, isVisib
         };
         if (filteredRows.length === 0) {
             ShowAlert({
-                message: isPairing ? "Nessun documento da abbinare." : "Nessun documento abbinato trovato.",
+                message: "Nessun documento da abbinare. Tutti i documenti risultanti dalla query sono già abbinati.",
                 mode: 'warning',
                 title: 'Operazione molti-a-molti',
                 duration: 5000
             });
             return;
         }
-        console.log(filteredSq);
         setPairedSearchResults([filteredSq]);
         setIsPairingManyToMany(isPairing);
         setShowPairDcmtsModal(true);

package/package.json

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