@topconsultnpm/sdkui-react 6.20.0-dev3.9 → 6.20.0-dev4.2

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,57 +1,57 @@
 {
-    "name": "@topconsultnpm/sdkui-react",
-    "version": "6.20.0-dev3.9",
-    "description": "",
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
-        "clean": "powershell Remove-Item lib/ -recurse",
-        "copy-files": "copyfiles -u 1 src/assets/*.* src/assets/ImageLibrary/*.* src/assets/thumbnails/*.* src/assets/IconsS4t/*.* src/assets/Metadata/*.* src/css/tm-sdkui.css lib/",
-        "tm-build": "npm run clean && tsc && npm run copy-files",
-        "tm-watch": "tsc -w",
-        "tm-publish": "npm publish --tag latest",
-        "tm-publish_wl": "npm publish",
-        "storybook": "storybook dev -p 6006",
-        "build-storybook": "storybook build"
-    },
-    "author": "TopConsult",
-    "license": "ISC",
-    "devDependencies": {
-        "@chromatic-com/storybook": "^4.1.3",
-        "@storybook/addon-docs": "^10.1.0",
-        "@storybook/addon-onboarding": "^10.1.0",
-        "@storybook/react-vite": "^10.1.0",
-        "@types/htmlparser2": "^3.10.7",
-        "@types/node": "^20.2.5",
-        "@types/react": "^18.3.3",
-        "@types/react-dom": "^18.3.3",
-        "copyfiles": "^2.4.1",
-        "esbuild": "^0.25.0",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
-        "storybook": "^10.1.0",
-        "typescript": "^5.9.3",
-        "vite": "^6.1.1"
-    },
-    "main": "dist/cjs/index.js",
-    "types": "./index.d.ts",
-    "module": "lib/esm/index.js",
-    "files": [
-        "dist",
-        "lib"
-    ],
-    "dependencies": {
-        "@topconsultnpm/sdk-ts": "6.20.0-t2",
-        "buffer": "^6.0.3",
-        "devextreme": "25.2.4",
-        "devextreme-react": "25.2.4",
-        "exceljs": "^4.4.0",
-        "htmlparser2": "^10.0.0",
-        "pdfjs-dist": "5.4.296",
-        "react-pdf": "^10.3.0",
-        "react-router-dom": "^6.15.0",
-        "styled-components": "^6.1.1"
-    },
-    "overrides": {
-        "esbuild": "^0.25.0"
-    }
+    "name":  "@topconsultnpm/sdkui-react",
+    "version":  "6.20.0-dev4.2",
+    "description":  "",
+    "scripts":  {
+                    "test":  "echo \"Error: no test specified\" \u0026\u0026 exit 1",
+                    "clean":  "powershell Remove-Item lib/ -recurse",
+                    "copy-files":  "copyfiles -u 1 src/assets/*.* src/assets/ImageLibrary/*.* src/assets/thumbnails/*.* src/assets/IconsS4t/*.* src/assets/Metadata/*.* src/css/tm-sdkui.css lib/",
+                    "tm-build":  "npm run clean \u0026\u0026 tsc \u0026\u0026 npm run copy-files",
+                    "tm-watch":  "tsc -w",
+                    "tm-publish":  "npm publish --tag latest",
+                    "tm-publish_wl":  "npm publish",
+                    "storybook":  "storybook dev -p 6006",
+                    "build-storybook":  "storybook build"
+                },
+    "author":  "TopConsult",
+    "license":  "ISC",
+    "devDependencies":  {
+                            "@chromatic-com/storybook":  "^4.1.3",
+                            "@storybook/addon-docs":  "^10.1.0",
+                            "@storybook/addon-onboarding":  "^10.1.0",
+                            "@storybook/react-vite":  "^10.1.0",
+                            "@types/htmlparser2":  "^3.10.7",
+                            "@types/node":  "^20.2.5",
+                            "@types/react":  "^18.3.3",
+                            "@types/react-dom":  "^18.3.3",
+                            "copyfiles":  "^2.4.1",
+                            "esbuild":  "^0.25.0",
+                            "react":  "^18.3.1",
+                            "react-dom":  "^18.3.1",
+                            "storybook":  "^10.1.0",
+                            "typescript":  "^5.9.3",
+                            "vite":  "^6.1.1"
+                        },
+    "main":  "dist/cjs/index.js",
+    "types":  "./index.d.ts",
+    "module":  "lib/esm/index.js",
+    "files":  [
+                  "dist",
+                  "lib"
+              ],
+    "dependencies":  {
+                         "react-router-dom":  "^6.15.0",
+                         "react-pdf":  "^10.3.0",
+                         "htmlparser2":  "^10.0.0",
+                         "buffer":  "^6.0.3",
+                         "@topconsultnpm/sdk-ts":  "6.20.0-t3",
+                         "exceljs":  "^4.4.0",
+                         "devextreme":  "25.2.4",
+                         "styled-components":  "^6.1.1",
+                         "pdfjs-dist":  "5.4.296",
+                         "devextreme-react":  "25.2.4"
+                     },
+    "overrides":  {
+                      "esbuild":  "^0.25.0"
+                  }
 }

package/lib/components/features/search/TMSignSettingsForm.d.ts

@@ -1,9 +0,0 @@
-import { DcmtTypeDescriptor, SearchResultDescriptor } from "@topconsultnpm/sdk-ts";
-interface TMSignSettingsFormProps {
-    fromDTD: DcmtTypeDescriptor;
-    inputDcmts: any[];
-    onCloseSignSettingsForm: () => void;
-    onSavedAsyncCallback: ((tid: number | undefined, did: number | undefined, metadataResult?: SearchResultDescriptor | null) => Promise<void>);
-}
-declare const TMSignSettingsForm: (props: TMSignSettingsFormProps) => import("react/jsx-runtime").JSX.Element | null;
-export default TMSignSettingsForm;