@topconsultnpm/sdkui-react 6.20.0-t3 → 6.20.0

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

@@ -1583,7 +1583,7 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
     const emptyArchivedDocumentsFileItems = useMemo(() => [], []);
     const handleSignApprove = useCallback(() => {
         if (onOpenS4TViewerRequest && TID && DID) {
-            onOpenS4TViewerRequest([{ TID, DID }]);
+            onOpenS4TViewerRequest([{ TID, DID }], onClose ? async () => { onClose(); } : undefined);
             return;
         }
         ShowAlert({

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { PlatformObjectValidator, QueryDescriptor, WhereItem, SDK_Localizator, OrderByItem, SelectItem, SelectItemVisibilities, SDK_Globals, SavedQueryCacheService, SearchEngine, QueryOperators, AccessLevelsEx } from '@topconsultnpm/sdk-ts';
+import { PlatformObjectValidator, QueryDescriptor, WhereItem, SDK_Localizator, OrderByItem, SelectItem, SelectItemVisibilities, SDK_Globals, SavedQueryCacheService, SearchEngine, QueryOperators, AccessLevelsEx, AccessLevels } from '@topconsultnpm/sdk-ts';
 import styled from 'styled-components';
 import TMSearchQueryEditor from './TMSearchQueryEditor';
 import { getDcmtTypesByQdAsync, SDKUI_Localizator, getQD, IconMenuVertical, IconAddCircleOutline, IconEdit, IconEasy, IconAdvanced, deepCompare, IconSearch, IconClear, getDefaultOperator, prepareQdForSearchAsync, IsParametricQuery, SDKUI_Globals, IconArrowRight, IconMenuCAArchive, getListMaxItems, DEFAULT_MAX_DCMTS_TO_BE_RETURNED } from '../../../helper';
@@ -337,9 +337,9 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
                                         gap: '10px',
                                         width: '100%'
                                     }, children: [_jsx(TMButton, { btnStyle: 'advanced', icon: _jsx(IconSearch, {}), showTooltip: false, width: '90px', caption: SDKUI_Localizator.Search, advancedColor: '#4A96D2', onClick: handleSearchButtonClick }), _jsx(TMButton, { width: '90px', btnStyle: 'advanced', advancedType: 'primary', showTooltip: false, caption: SDKUI_Localizator.Clear, icon: _jsx(IconClear, {}), advancedColor: 'white', color: 'primaryOutline', onClick: clearFilters }), (!showAdvancedSearch && qd?.where && qd.where.length > initialMaxItems) && (_jsx(TMButton, { width: '120px', btnStyle: isMobile ? 'icon' : 'advanced', advancedColor: TMColors.button_primary, caption: captionText, showTooltip: false, icon: isMobile ? (_jsx("div", { children: _jsx("p", { children: showAllMdWhere ? `-${diff}` : `+${diff}` }) })) : (_jsx("p", { children: showAllMdWhere ? `-${diff}` : `+${diff}` })), onClick: () => setShowAllMdWhere(!showAllMdWhere) }))] }), showFiltersConfig &&
-                                    _jsx(TMMetadataChooserForm, { allowMultipleSelection: true, height: '500px', width: '600px', allowSysMetadata: true, qd: qd, selectedIDs: qd?.where?.map((w) => ({ tid: w.tid, mid: w.mid })), onClose: handleCloseFiltersConfig, onChoose: handleChooseFilters }), showOutputConfig &&
-                                    _jsx(TMMetadataChooserForm, { allowMultipleSelection: true, height: '500px', width: '600px', allowSysMetadata: true, qd: qd, selectedIDs: qd?.select?.map((item) => ({ tid: item.tid, mid: item.mid })), onClose: handleCloseOutputConfig, onChoose: handleChooseOutput }), showOrderByConfig &&
-                                    _jsx(TMMetadataChooserForm, { allowMultipleSelection: true, height: '500px', width: '600px', allowSysMetadata: true, qd: qd, selectedIDs: qd?.orderBy?.map((item) => ({ tid: item.tid, mid: item.mid })), onClose: handleCloseOrderByConfig, onChoose: handleChooseOrderBy })] })
+                                    _jsx(TMMetadataChooserForm, { allowMultipleSelection: true, height: '500px', width: '600px', allowSysMetadata: true, filterMetadata: (o => o.perm?.canSearch === AccessLevels.Yes), qd: qd, selectedIDs: qd?.where?.map((w) => ({ tid: w.tid, mid: w.mid })), onClose: handleCloseFiltersConfig, onChoose: handleChooseFilters }), showOutputConfig &&
+                                    _jsx(TMMetadataChooserForm, { allowMultipleSelection: true, height: '500px', width: '600px', allowSysMetadata: true, filterMetadata: (o => o.perm?.canView === AccessLevels.Yes || o.perm?.canUpdate === AccessLevels.Yes), qd: qd, selectedIDs: qd?.select?.map((item) => ({ tid: item.tid, mid: item.mid })), onClose: handleCloseOutputConfig, onChoose: handleChooseOutput }), showOrderByConfig &&
+                                    _jsx(TMMetadataChooserForm, { allowMultipleSelection: true, height: '500px', width: '600px', allowSysMetadata: true, filterMetadata: (o => o.perm?.canView === AccessLevels.Yes || o.perm?.canUpdate === AccessLevels.Yes), qd: qd, selectedIDs: qd?.orderBy?.map((item) => ({ tid: item.tid, mid: item.mid })), onClose: handleCloseOrderByConfig, onChoose: handleChooseOrderBy })] })
                         :
                             _jsx(TMToppyMessage, { message: SDKUI_Localizator.DcmtTypeSelectOrQuickSearch, titleTooltip: SDKUI_Localizator.DcmtTypeSelectOrQuickSearch }), showSqdForm &&
                         _jsx(StyledModalContainer, { style: { backgroundColor: `${TMColors.backgroundColorHeader}12` }, children: _jsx(TMSavedQueryForm, { height: '50%', width: '50%', id: formModeSqdForm === FormModes.Create ? -1 : SQD?.id, title: 'Ricerca rapida', formMode: formModeSqdForm, showBackButton: true, qd: qd, isAdvancedSearch: showAdvancedSearch, isModal: false, onClose: () => { setShowSqdForm(false); }, onSaved: onSqdSaved }) })] }), showDistinctValuesPanel &&

package/lib/components/viewers/TMTidViewer.js

@@ -272,8 +272,11 @@ const TMTidViewer = ({ tmSession, tid, did, showIcon = false, color, showId = fa
         if (count <= 0)
             TMSpinner.show({ description: `${SDKUI_Localizator.Loading} - ${SDK_Localizator.ListDcmtTypeOrView} ...` });
         try {
-            const dtd = await DcmtTypeListCacheService.GetWithNotGrantedAsync(tid, did, undefined, false, tmSession);
-            setDtd(dtd);
+            let resultDTD = await DcmtTypeListCacheService.GetAsync(tid);
+            if (!resultDTD) {
+                resultDTD = await DcmtTypeListCacheService.GetWithNotGrantedAsync(tid, did);
+            }
+            setDtd(resultDTD);
         }
         finally {
             if (count <= 0)

package/lib/hooks/useRelatedDocuments.js

@@ -194,29 +194,6 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
             setHasManyToManyRelation(false);
         }
     }, [selectedSearchResult?.fromTID]);
-    const getFocusedItem = useCallback(() => {
-        if (!focusedItem)
-            return undefined;
-        if (currentSearchResults.length === 1) {
-            return { mdList: currentSearchResults[0].dtdResult?.rows?.[focusedItem?.rowIndex ?? 0], mids: currentSearchResults[0].selectMIDs ?? [] };
-        }
-        const matchingSearchResult = currentSearchResults.find(res => res.fromTID == focusedItem?.TID);
-        if (!matchingSearchResult)
-            return undefined;
-        return {
-            mdList: matchingSearchResult.dtdResult?.rows?.[focusedItem?.rowIndex ?? 0],
-            mids: matchingSearchResult.selectMIDs ?? []
-        };
-    }, [focusedItem, currentSearchResults]);
-    const fetchAssociatedValues = useCallback((mid) => {
-        let mdList = getFocusedItem();
-        if (!mdList)
-            return;
-        let index = mdList.mids.findIndex(m => m == mid);
-        if (index === -1)
-            return;
-        return mdList.mdList?.[index];
-    }, [getFocusedItem]);
     const filterRelationsByType = (relations, tid, type) => {
         return type === 'detail'
             ? relations.filter(r => r.masterTID == tid)
@@ -245,12 +222,34 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
             duration: 5000
         });
     };
-    const mapAssociationsToMids = useCallback((relation, type) => {
-        return relation.associations?.map(assoc => ({
-            mid: type === 'detail' ? (assoc.item2 ?? 0) : (assoc.item1 ?? 0),
-            value: fetchAssociatedValues(type === 'detail' ? (assoc.item1 ?? 0) : (assoc.item2 ?? 0)) ?? ''
-        })) ?? [];
-    }, [fetchAssociatedValues]);
+    //This ensures archive master/detail works correctly regardless of output metadata configuration.
+    const mapAssociationsToMidsAsync = useCallback(async (relation, type) => {
+        if (!relation.associations || relation.associations.length === 0)
+            return [];
+        if (!focusedItem?.TID || !focusedItem?.DID)
+            return [];
+        const searchEngine = SDK_Globals.tmSession?.NewSearchEngine();
+        if (!searchEngine)
+            return [];
+        const allMetadata = await searchEngine.GetMetadataAsync(focusedItem.TID, focusedItem.DID, false);
+        if (!allMetadata?.dtdResult?.rows?.[0] || !allMetadata.selectMIDs)
+            return [];
+        const row = allMetadata.dtdResult.rows[0];
+        const mids = allMetadata.selectMIDs;
+        const metadataMap = new Map();
+        mids.forEach((mid, index) => {
+            const value = row[index];
+            if (value !== undefined && value !== null) {
+                metadataMap.set(mid, value.toString());
+            }
+        });
+        return relation.associations.map(assoc => {
+            const sourceMid = type === 'detail' ? (assoc.item1 ?? 0) : (assoc.item2 ?? 0);
+            const targetMid = type === 'detail' ? (assoc.item2 ?? 0) : (assoc.item1 ?? 0);
+            const value = metadataMap.get(sourceMid) ?? '';
+            return { mid: targetMid, value };
+        });
+    }, [focusedItem]);
     const archiveRelatedDcmtHandler = useCallback(async (relation, type) => {
         const targetTID = type === 'detail' ? relation.detailTID : relation.masterTID;
         if (!targetTID)
@@ -268,7 +267,7 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
                 });
                 return;
             }
-            const mids = mapAssociationsToMids(relation, type);
+            const mids = await mapAssociationsToMidsAsync(relation, type);
             setArchiveType(type);
             setArchiveRelatedDcmtFormTID(targetTID);
             setArchiveRelatedDcmtFormMids(mids);
@@ -278,7 +277,7 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
             console.error("Error checking archive permissions:", error);
             TMExceptionBoxManager.show({ exception: error });
         }
-    }, [mapAssociationsToMids]);
+    }, [mapAssociationsToMidsAsync]);
     const filterRelationsByPermission = async (relations, type) => {
         const dataSourcePromises = relations.map(async (rel) => {
             const targetTID = type === 'detail' ? rel.detailTID : rel.masterTID;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.20.0-t3",
+    "version": "6.20.0",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -40,7 +40,7 @@
         "lib"
     ],
     "dependencies": {
-        "@topconsultnpm/sdk-ts": "6.20.0-t3",
+        "@topconsultnpm/sdk-ts": "6.20.0",
         "buffer": "^6.0.3",
         "devextreme": "25.2.4",
         "devextreme-react": "25.2.4",