@topconsultnpm/sdkui-react 6.21.0-dev5.2 → 6.21.0-dev5.3

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

@@ -31,6 +31,10 @@ const TMMasterDetailDcmts = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallba
     const [contextMenuPosition, setContextMenuPosition] = useState({ x: 0, y: 0 });
     // Track if TMRelationViewer is loading (used to disable context menu during loading)
     const [isRelationViewerLoading, setIsRelationViewerLoading] = useState(false);
+    // Track if loading has ever been TRUE (to distinguish initial false from post-load false)
+    const hasLoadingBeenTrueRef = useRef(false);
+    // Track the previous loading state to detect transitions
+    const prevIsRelationViewerLoadingRef = useRef(false);
     const [dtdFocused, setDtdFocused] = useState();
     const [refreshKey, setRefreshKey] = useState(0);
     // Separate refresh key for TMFormOrResultWrapper only (doesn't affect tmTreeView)
@@ -39,6 +43,21 @@ const TMMasterDetailDcmts = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallba
     const [focusedItemFormData, setFocusedItemFormData] = useState([]);
     // Trigger operationItems refresh (after file substitution, etc.)
     const [refreshOperationsTrigger, setRefreshOperationsTrigger] = useState(0);
+    // Safety net: when TMRelationViewer finishes loading (transition from TRUE to FALSE),
+    // hide the spinner regardless of whether a document was focused or not.
+    // This handles edge cases where no document gets isRoot=true.
+    useEffect(() => {
+        const prevLoading = prevIsRelationViewerLoadingRef.current;
+        prevIsRelationViewerLoadingRef.current = isRelationViewerLoading;
+        if (isRelationViewerLoading) {
+            // Loading started - mark that we've seen a true state
+            hasLoadingBeenTrueRef.current = true;
+        }
+        else if (prevLoading && hasLoadingBeenTrueRef.current && isCheckingFirstLoad) {
+            // Transition from TRUE to FALSE (loading completed) - hide spinner
+            setIsCheckingFirstLoad(false);
+        }
+    }, [isRelationViewerLoading, isCheckingFirstLoad]);
     // Increments trigger counter to force operationItems to re-calculate
     const onRefreshOperationsDatagrid = useCallback(async () => {
         setRefreshOperationsTrigger(prev => prev + 1);
@@ -258,6 +277,7 @@ const TMMasterDetailDcmts = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallba
     useEffect(() => {
         if (noRelationsOnFirstLoad) {
             setNoRelationsOnFirstLoad(false);
+            setIsCheckingFirstLoad(false); // Hide spinner before navigating back
             ShowAlert({
                 message: SDKUI_Localizator.RelatedDcmtsNotFound,
                 title: SDKUI_Localizator.RelationsNotFound,

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

@@ -146,6 +146,8 @@ export declare const hasMasterRelations: (dTID: number | undefined) => Promise<b
 export declare const getDisplayValueByColumn: (col: DataColumnDescriptor | undefined, value: any) => any;
 /**
  * Convert SearchResultDescriptor to structured data source with metadata
+ * For each document, fetches complete metadata using GetMetadataAsync to ensure
+ * all metadata properties (isSpecialSearchOutput, permissions, etc.) are available
  */
 export declare const searchResultToDataSource: (searchResult: SearchResultDescriptor | undefined, hideSysMetadata?: boolean) => Promise<any[]>;
 export declare const DEFAULT_RELATION_EXPAND_LEVEL = 4;

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { DcmtTypeListCacheService, SDK_Globals, DataColumnTypes, MetadataFormats, MetadataDataDomains, RelationCacheService, RelationTypes, UserListCacheService } from "@topconsultnpm/sdk-ts";
-import { genUniqueId, IconFolder, IconBackhandIndexPointingRight, IconCircleInfo, getDcmtCicoStatus, IconChevronDown, IconChevronRight, SDKUI_Localizator, buildDcmtDisplayName, SDKUI_Globals } from '../../../helper';
+import { DcmtTypeListCacheService, SDK_Globals, DataColumnTypes, MetadataFormats, MetadataDataDomains, RelationCacheService, RelationTypes, UserListCacheService, LayoutModes } from "@topconsultnpm/sdk-ts";
+import { genUniqueId, IconFolder, IconBackhandIndexPointingRight, IconCircleInfo, getDcmtCicoStatus, IconChevronDown, IconChevronRight, SDKUI_Localizator, buildDcmtDisplayName, SDKUI_Globals, searchResultToMetadataValues } from '../../../helper';
 import ShowAlert from '../../base/TMAlert';
 import TMToppyMessage from '../../../helper/TMToppyMessage';
 import { TMColors } from '../../../utils/theme';
@@ -88,41 +88,77 @@ export const getDisplayValueByColumn = (col, value) => {
 };
 /**
  * Convert SearchResultDescriptor to structured data source with metadata
+ * For each document, fetches complete metadata using GetMetadataAsync to ensure
+ * all metadata properties (isSpecialSearchOutput, permissions, etc.) are available
  */
 export const searchResultToDataSource = async (searchResult, hideSysMetadata) => {
     const rows = searchResult?.dtdResult?.rows ?? [];
-    const tid = searchResult?.fromTID;
-    // IMPORTANT: Pass true to get full metadata with all properties (isSpecialSearchOutput, etc.)
-    const dtd = await DcmtTypeListCacheService.GetAsync(tid, true);
     const output = [];
+    // Find TID and DID column indices
+    const columns = searchResult?.dtdResult?.columns ?? [];
+    const tidColIndex = columns.findIndex(col => col.caption?.toUpperCase() === 'TID');
+    const didColIndex = columns.findIndex(col => col.caption?.toUpperCase() === 'DID');
     for (let index = 0; index < rows.length; index++) {
-        const item = { rowIndex: index };
         const row = rows[index];
-        for (let i = 0; i < row.length; i++) {
-            const column = searchResult?.dtdResult?.columns?.[i];
-            const mid = Number(column?.extendedProperties?.["MID"] ?? "0");
-            if (hideSysMetadata && mid < 100)
-                continue;
-            // For system metadata (MID <= 100), use UPPERCASE caption as key
-            // For custom metadata (MID > 100), use caption as key but handle duplicates
-            let key = column?.caption ?? '';
-            if (mid <= 100) {
-                key = key.toUpperCase();
+        // Extract TID and DID from row
+        const tid = tidColIndex >= 0 ? Number(row[tidColIndex]) : searchResult?.fromTID;
+        const did = didColIndex >= 0 ? Number(row[didColIndex]) : undefined;
+        // Fetch complete metadata for this specific document (like getFilteredMetadata does)
+        const metadata = await SDK_Globals.tmSession?.NewSearchEngine().GetMetadataAsync(tid, did, true);
+        if (metadata) {
+            // Get full DTD with metadata for this document
+            const dtdResult = metadata.dtdResult;
+            const metadataRows = dtdResult?.rows?.[0] ?? [];
+            const mids = metadata.selectMIDs;
+            const dtdWithMetadata = await DcmtTypeListCacheService.GetWithNotGrantedAsync(tid, did, metadata);
+            const mdList = dtdWithMetadata?.metadata ?? [];
+            // Convert to MetadataValueDescriptorEx array
+            const metadataList = searchResultToMetadataValues(tid, dtdResult, metadataRows, mids, mdList, LayoutModes.Update);
+            // Convert to DcmtMetadataMap format (like getFilteredMetadata does)
+            const item = { rowIndex: index };
+            for (const mvd of metadataList) {
+                if (hideSysMetadata && mvd.mid !== undefined && mvd.mid < 100)
+                    continue;
+                const key = mvd.mid !== undefined && mvd.mid <= 100
+                    ? (mvd.md?.name ?? '').toUpperCase()
+                    : (mvd.md?.name ?? '');
+                if (key) {
+                    item[key] = {
+                        md: mvd.md,
+                        value: mvd.value
+                    };
+                }
             }
-            else {
-                // If key already exists with a different MID, append MID to make it unique
-                if (item[key] !== undefined && item[key]?.md?.id !== mid) {
-                    key = `${key}_${mid}`;
+            output.push(item);
+        }
+        else {
+            // Fallback: use original row data with basic parsing
+            const item = { rowIndex: index };
+            const fallbackTid = searchResult?.fromTID;
+            const dtd = await DcmtTypeListCacheService.GetWithNotGrantedAsync(fallbackTid, undefined, searchResult);
+            for (let i = 0; i < row.length; i++) {
+                const column = searchResult?.dtdResult?.columns?.[i];
+                const mid = Number(column?.extendedProperties?.["MID"] ?? "0");
+                if (hideSysMetadata && mid < 100)
+                    continue;
+                let key = column?.caption ?? '';
+                if (mid <= 100) {
+                    key = key.toUpperCase();
                 }
+                else {
+                    if (item[key] !== undefined && item[key]?.md?.id !== mid) {
+                        key = `${key}_${mid}`;
+                    }
+                }
+                const value = row[i];
+                const md = dtd?.metadata?.find(o => o.id == mid);
+                item[key] = {
+                    md: md,
+                    value: getDisplayValueByColumn(column, value)
+                };
             }
-            const value = row[i];
-            const md = dtd?.metadata?.find(o => o.id == mid);
-            item[key] = {
-                md: md,
-                value: getDisplayValueByColumn(column, value)
-            };
+            output.push(item);
         }
-        output.push(item);
     }
     return output;
 };
@@ -437,71 +473,90 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
     const setupInitialTreeExpansion = (tree) => {
         if (tree.length === 0)
             return tree;
-        // ALWAYS expand the first container (even if empty, to show infoMessage)
-        const firstRootContainer = tree[0];
-        if (!firstRootContainer)
-            return tree;
-        // Create a deep copy of the first container with expanded=true, isRoot=true
-        let newFirstContainer = {
-            ...firstRootContainer,
-            expanded: true,
-            isRoot: true
-        };
-        // 2. Find first document/container and expand it
-        const firstRootItems = newFirstContainer.items;
-        if (firstRootItems && firstRootItems.length > 0) {
-            const firstDocOrContainer = firstRootItems[0];
-            if (firstDocOrContainer.isDcmt) {
-                // First item is a document - expand it and mark as root for focus
-                let newFirstDoc = {
-                    ...firstDocOrContainer,
-                    expanded: true,
-                    isRoot: true
-                };
-                // 3. Expand first correlation folder ONLY if there's exactly one
-                const docItems = newFirstDoc.items;
-                const containerChildren = docItems?.filter(child => child.isContainer) ?? [];
-                if (containerChildren.length === 1 && docItems && docItems.length > 0 && docItems[0].isContainer) {
-                    const newFirstCorrelation = { ...docItems[0], expanded: true };
-                    newFirstDoc = {
-                        ...newFirstDoc,
-                        items: [newFirstCorrelation, ...docItems.slice(1)]
-                    };
+        // Find the first container with documents (not empty)
+        // This ensures we focus on an actual document, not an empty container
+        const findFirstNonEmptyContainerIndex = () => {
+            for (let i = 0; i < tree.length; i++) {
+                const container = tree[i];
+                if (!container.isZero && container.items && Array.isArray(container.items) && container.items.length > 0) {
+                    return i;
                 }
-                // Update the container's items
-                newFirstContainer = {
-                    ...newFirstContainer,
-                    items: [newFirstDoc, ...firstRootItems.slice(1)]
-                };
             }
-            else if (firstDocOrContainer.isContainer) {
-                // First item is a container (correlation folder)
-                // Count how many sibling containers there are
-                const siblingContainers = firstRootItems.filter(child => child.isContainer);
-                const shouldExpand = siblingContainers.length === 1;
-                let newFirstCorrelation = {
-                    ...firstDocOrContainer,
-                    expanded: shouldExpand
-                };
-                // Find first document inside this container and mark for focus
-                const containerItems = newFirstCorrelation.items;
-                if (containerItems && containerItems.length > 0 && containerItems[0].isDcmt) {
-                    const newFirstDoc = { ...containerItems[0], isRoot: true };
-                    newFirstCorrelation = {
-                        ...newFirstCorrelation,
-                        items: [newFirstDoc, ...containerItems.slice(1)]
-                    };
+            return 0; // Fallback to first container if all are empty
+        };
+        const targetContainerIndex = findFirstNonEmptyContainerIndex();
+        // Process all containers, but only mark the target one for focus
+        const result = tree.map((container, index) => {
+            const isTargetContainer = index === targetContainerIndex;
+            const isFirstContainer = index === 0;
+            // Always expand the first container (even if empty, to show infoMessage)
+            // Also expand the target container if different
+            const shouldExpand = isFirstContainer || isTargetContainer;
+            if (!shouldExpand && !isTargetContainer) {
+                return container; // Keep non-target containers as-is
+            }
+            // Create a copy with expanded state
+            let newContainer = {
+                ...container,
+                expanded: shouldExpand,
+                isRoot: isTargetContainer // Only mark target container as root
+            };
+            // Only process items for the target container (the one with documents)
+            if (isTargetContainer) {
+                const containerItems = newContainer.items;
+                if (containerItems && containerItems.length > 0) {
+                    const firstDocOrContainer = containerItems[0];
+                    if (firstDocOrContainer.isDcmt) {
+                        // First item is a document - expand it and mark as root for focus
+                        let newFirstDoc = {
+                            ...firstDocOrContainer,
+                            expanded: true,
+                            isRoot: true
+                        };
+                        // Expand first correlation folder ONLY if there's exactly one
+                        const docItems = newFirstDoc.items;
+                        const containerChildren = docItems?.filter(child => child.isContainer) ?? [];
+                        if (containerChildren.length === 1 && docItems && docItems.length > 0 && docItems[0].isContainer) {
+                            const newFirstCorrelation = { ...docItems[0], expanded: true };
+                            newFirstDoc = {
+                                ...newFirstDoc,
+                                items: [newFirstCorrelation, ...docItems.slice(1)]
+                            };
+                        }
+                        // Update the container's items
+                        newContainer = {
+                            ...newContainer,
+                            items: [newFirstDoc, ...containerItems.slice(1)]
+                        };
+                    }
+                    else if (firstDocOrContainer.isContainer) {
+                        // First item is a container (correlation folder)
+                        const siblingContainers = containerItems.filter(child => child.isContainer);
+                        const shouldExpandCorrelation = siblingContainers.length === 1;
+                        let newFirstCorrelation = {
+                            ...firstDocOrContainer,
+                            expanded: shouldExpandCorrelation
+                        };
+                        // Find first document inside this container and mark for focus
+                        const correlationItems = newFirstCorrelation.items;
+                        if (correlationItems && correlationItems.length > 0 && correlationItems[0].isDcmt) {
+                            const newFirstDoc = { ...correlationItems[0], isRoot: true };
+                            newFirstCorrelation = {
+                                ...newFirstCorrelation,
+                                items: [newFirstDoc, ...correlationItems.slice(1)]
+                            };
+                        }
+                        // Update the container's items
+                        newContainer = {
+                            ...newContainer,
+                            items: [newFirstCorrelation, ...containerItems.slice(1)]
+                        };
+                    }
                 }
-                // Update the container's items
-                newFirstContainer = {
-                    ...newFirstContainer,
-                    items: [newFirstCorrelation, ...firstRootItems.slice(1)]
-                };
             }
-        }
-        // If firstRootItems is empty/undefined, the container is still expanded (will show infoMessage)
-        // Return new tree with the modified first container
-        return [newFirstContainer, ...tree.slice(1)];
+            return newContainer;
+        });
+        return result;
     };
     /**
      * Main data loading function
@@ -1130,9 +1185,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
             transition: 'opacity 0.2s ease-in-out',
             textDecoration: isLogicallyDeleted ? 'line-through' : 'none'
         };
-        const documentStyle = customDocumentStyle
-            ? { ...defaultDocumentStyle, ...customDocumentStyle(item) }
-            : defaultDocumentStyle;
+        const documentStyle = customDocumentStyle ? { ...defaultDocumentStyle, ...customDocumentStyle(item) } : defaultDocumentStyle;
         const textDecoration = isLogicallyDeleted ? 'line-through' : 'none';
         const textColor = isLogicallyDeleted ? 'gray' : undefined;
         const defaultMetadataContent = item.values && (() => {
@@ -1165,9 +1218,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                                 }, children: value }))] }, `${key}_${index}`));
                 }) }));
         })();
-        const metadataContent = customDocumentContent
-            ? customDocumentContent(item, defaultMetadataContent || _jsx(_Fragment, {}))
-            : defaultMetadataContent;
+        const metadataContent = customDocumentContent ? customDocumentContent(item, defaultMetadataContent || _jsx(_Fragment, {})) : defaultMetadataContent;
         // Calculate checkout status for non-root documents
         let checkoutStatusIcon = null;
         if (item.values && item.dtd) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.21.0-dev5.2",
+    "version": "6.21.0-dev5.3",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",