@topconsultnpm/sdkui-react 6.19.0-dev2.3 → 6.19.0-dev2.30

package/lib/helper/dcmtsHelper.js

@@ -24,20 +24,26 @@ export const isXMLFileExt = (fileExt) => {
     }
 };
 /*utility functions for TMCustomButton*/
-export const processButtonAttributes = (args, formData) => args && formData ? splitArguments(replaceCustomButtonAttributes(args, formDataMap(formData))) : undefined;
-const replaceCustomButtonAttributes = (input, attributes) => {
-    const matches = Array.from(input.matchAll(/@\w+/g));
-    return matches
-        .map(([match]) => `${match}=${attributes[match.slice(1)] ?? ''}`)
-        .join(';') + ';';
-};
-const formDataMap = (data) => data.reduce((acc, md) => {
-    const key = md.md?.name;
+export const processButtonAttributes = (args, formData) => args && formData ? formDataMap(formData, args) : undefined;
+export const processSelectedItems = (selectedItems) => selectedItems?.map(item => {
+    const tid = item.TID;
+    if (!tid)
+        return item;
+    const prefix = `${tid}_`;
+    const prefixLength = prefix.length;
+    return Object.keys(item).reduce((acc, key) => {
+        acc[key.startsWith(prefix) ? key.substring(prefixLength) : key] = item[key];
+        return acc;
+    }, {});
+});
+const formDataMap = (data, args) => data.reduce((acc, md) => {
+    const matches = Array.from(args.matchAll(/@\w+/g));
+    const keys = matches.map(([match]) => match.slice(1));
+    if (!keys.includes(md.md?.name || ''))
+        return acc;
+    //const key = md.md?.name;
+    const key = md?.mid; // inserisco il mid come chiave
     if (key && md.value)
         acc[key] = md.value;
     return acc;
 }, {});
-const splitArguments = (input) => Object.fromEntries(Array.from(input.matchAll(/@?(\w+)=([^;]+)/g), ([, key, value]) => [
-    key,
-    isNaN(Number(value)) ? value : Number(value),
-]));

package/lib/helper/helpers.js

@@ -633,7 +633,8 @@ export const highlightText = (text, searchValue) => {
 export const renderHighlightedText = (text, searchText, isSelected) => {
     if (!searchText)
         return text;
-    const regex = new RegExp(`(${searchText})`, 'gi');
+    const escapedSearchText = searchText.trim().replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const regex = new RegExp(`(${escapedSearchText})`, 'gi');
     return text.split(regex).map((part, index) => regex.test(part) ? (_jsx("span", { style: { backgroundColor: isSelected ? '#6c9023' : 'yellow' }, children: part }, index)) : (part));
 };
 export function versionAndBuildtypeInfo(module) {

package/lib/helper/index.d.ts

@@ -10,3 +10,4 @@ export * from './TMUtils';
 export * from './TMCommandsContextMenu';
 export * from './TMConditionalWrapper';
 export * from './TMToppyMessage';
+export * from './GlobalStyles';

package/lib/helper/index.js

@@ -10,3 +10,4 @@ export * from './TMUtils';
 export * from './TMCommandsContextMenu';
 export * from './TMConditionalWrapper';
 export * from './TMToppyMessage';
+export * from './GlobalStyles';

package/lib/hooks/useRelatedDocuments.js

@@ -195,9 +195,18 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
         }
     }, [selectedSearchResult?.fromTID]);
     const getFocusedItem = useCallback(() => {
-        if (!focusedItem || currentSearchResults.length !== 1)
+        if (!focusedItem)
             return undefined;
-        return { mdList: currentSearchResults[0].dtdResult?.rows?.[focusedItem?.rowIndex ?? 0], mids: currentSearchResults[0].selectMIDs ?? [] };
+        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();
@@ -222,8 +231,8 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
     const showNoRelationsAlert = (type) => {
         ShowAlert({
             message: type === 'detail'
-                ? "Nessun documento di dettaglio trovato per l'archiviazione."
-                : "Nessun documento di master trovato per l'archiviazione.",
+                ? SDKUI_Localizator.NoDetailDocumentFoundForArchiving
+                : SDKUI_Localizator.NoMasterDocumentFoundForArchiving,
             mode: 'info',
             title: type === 'detail' ? SDKUI_Localizator.DcmtsDetail : SDKUI_Localizator.DcmtsMaster,
             duration: 5000
@@ -232,8 +241,8 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
     const showNoAssociationsAlert = (type) => {
         ShowAlert({
             message: type === 'detail'
-                ? "Nessuna associazione trovata per i documenti di dettaglio."
-                : "Nessuna associazione trovata per i documenti di master.",
+                ? SDKUI_Localizator.NoMatchFoundForDetailDocuments
+                : SDKUI_Localizator.NoMatchFoundForMasterDocuments,
             mode: 'info',
             title: type === 'detail' ? SDKUI_Localizator.DcmtsDetail : SDKUI_Localizator.DcmtsMaster,
             duration: 5000
@@ -254,8 +263,8 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
             if (dtd?.perm?.canArchive !== AccessLevelsEx.Yes && dtd?.perm?.canArchive !== AccessLevelsEx.Mixed) {
                 ShowAlert({
                     message: type === 'detail'
-                        ? "Non hai i permessi per archiviare documenti di dettaglio di questo tipo."
-                        : "Non hai i permessi per archiviare documenti master di questo tipo.",
+                        ? SDKUI_Localizator.YouDoNotHavePermissionsToArchiveDetailDocumentsOfThisType
+                        : SDKUI_Localizator.YouDoNotHavePermissionsToArchiveMasterDocumentsOfThisType,
                     mode: 'warning',
                     title: type === 'detail' ? SDKUI_Localizator.DcmtsDetail : SDKUI_Localizator.DcmtsMaster,
                     duration: 5000
@@ -365,10 +374,10 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
         if (!focusedItem?.TID || !focusedItem?.DID) {
             ShowAlert({
                 message: isPairing
-                    ? "Nessun documento selezionato per l'abbinamento molti a molti."
-                    : "Nessun documento selezionato per il disabbinamento molti a molti.",
+                    ? SDKUI_Localizator.NoDocumentSelectedForManyToManyMatching
+                    : SDKUI_Localizator.NoDocumentSelectedForManyToManyUnmatching,
                 mode: 'warning',
-                title: isPairing ? 'Abbina documenti molti a molti' : 'Disabbina documenti molti a molti',
+                title: isPairing ? SDKUI_Localizator.MatchManyDocumentsManyToMany : SDKUI_Localizator.UnmatchManyDocumentsManyToMany,
                 duration: 5000
             });
             return;
@@ -384,10 +393,10 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
         if (!qd) {
             ShowAlert({
                 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.",
+                    ? SDKUI_Localizator.NoManyToManyMatchingRelationshipAssociatedWithRetrievalQuery
+                    : SDKUI_Localizator.NoManyToManyUnmatchingRelationshipAssociatedWithRetrievalQuery,
                 mode: 'warning',
-                title: isPairing ? 'Abbina documenti molti a molti' : 'Disabbina documenti molti a molti',
+                title: isPairing ? SDKUI_Localizator.MatchManyDocumentsManyToMany : SDKUI_Localizator.UnmatchManyDocumentsManyToMany,
                 duration: 5000
             });
             return;
@@ -490,9 +499,9 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
         if (!isPairing) {
             if (!pairedDocumentsResult?.dtdResult?.rows || pairedDocumentsResult.dtdResult.rows.length === 0) {
                 ShowAlert({
-                    message: "Nessun documento abbinato trovato.",
+                    message: SDKUI_Localizator.NoDocumentMatchFound,
                     mode: 'warning',
-                    title: 'Disabbina documenti molti a molti',
+                    title: SDKUI_Localizator.UnmatchManyDocumentsManyToMany,
                     duration: 5000
                 });
                 return;
@@ -514,9 +523,9 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
         const sq = await searchEngine.SearchByIDAsync(qd);
         if (!sq?.dtdResult?.rows || sq.dtdResult.rows.length === 0) {
             ShowAlert({
-                message: "Nessun documento trovato.",
+                message: SDKUI_Localizator.NoDcmtFound,
                 mode: 'warning',
-                title: 'Abbina documenti molti a molti',
+                title: SDKUI_Localizator.MatchManyDocumentsManyToMany,
                 duration: 5000
             });
             openPairSearchModal(relation, targetTID, qd);
@@ -539,9 +548,9 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
         };
         if (filteredRows.length === 0) {
             ShowAlert({
-                message: "Nessun documento da abbinare. Tutti i documenti risultanti sono già abbinati.",
+                message: SDKUI_Localizator.NoDocumentToMatch,
                 mode: 'warning',
-                title: 'Abbina documenti molti a molti',
+                title: SDKUI_Localizator.MatchManyDocumentsManyToMany,
                 duration: 5000
             });
             openPairSearchModal(relation, targetTID, qd);
@@ -560,10 +569,10 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
             if (!relations.some(r => r.relationType === RelationTypes.ManyToMany)) {
                 ShowAlert({
                     message: isPairing
-                        ? "Nessuna relazione di abbinamento molti a molti definita nel sistema."
-                        : "Nessuna relazione di disabbinamento molti a molti definita nel sistema.",
+                        ? SDKUI_Localizator.NoManyToManyMatchingRelationshipDefined
+                        : SDKUI_Localizator.NoManyToManyUnmatchingRelationshipDefined,
                     mode: 'warning',
-                    title: isPairing ? 'Abbina documenti molti a molti' : 'Disabbina documenti molti a molti',
+                    title: isPairing ? SDKUI_Localizator.MatchManyDocumentsManyToMany : SDKUI_Localizator.UnmatchManyDocumentsManyToMany,
                     duration: 5000
                 });
                 return;
@@ -572,10 +581,10 @@ export const useRelatedDocuments = ({ selectedSearchResult, focusedItem, current
             if (!manyToManyRels.some(r => r.masterTID === selectedSearchResult?.fromTID || r.detailTID === selectedSearchResult?.fromTID)) {
                 ShowAlert({
                     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.",
+                        ? SDKUI_Localizator.NoManyToManyMatchingRelationshipDefinedForSelectedDocumentType
+                        : SDKUI_Localizator.NoManyToManyUnmatchingRelationshipDefinedForSelectedDocumentType,
                     mode: 'warning',
-                    title: isPairing ? 'Abbina documenti molti a molti' : 'Disabbina documenti molti a molti',
+                    title: isPairing ? SDKUI_Localizator.MatchManyDocumentsManyToMany : SDKUI_Localizator.UnmatchManyDocumentsManyToMany,
                     duration: 5000
                 });
                 return;

package/lib/ts/types.d.ts

@@ -1,7 +1,7 @@
 import { ReactNode } from "react";
 import { FileFormats, ITopMediaSession, MetadataDescriptor, MetadataValueDescriptor, UserDescriptor, ValidationItem } from "@topconsultnpm/sdk-ts";
 import { ITMEditorBase } from "../components/base/TMEditorBase";
-import { IColumnProps } from "devextreme-react/cjs/data-grid";
+import { IColumnProps } from "devextreme-react/data-grid";
 export declare enum FormModes {
     None = 0,
     Create = 1,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.19.0-dev2.3",
+    "version": "6.19.0-dev2.30",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -21,12 +21,12 @@
         "@storybook/react-vite": "^10.1.0",
         "@types/htmlparser2": "^3.10.7",
         "@types/node": "^20.2.5",
-        "@types/react": "^18.2.7",
-        "@types/react-dom": "^18.2.4",
+        "@types/react": "^18.3.3",
+        "@types/react-dom": "^18.3.3",
         "copyfiles": "^2.4.1",
         "esbuild": "^0.25.0",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "storybook": "^10.1.0",
         "typescript": "^5.9.3",
         "vite": "^6.1.1"
@@ -39,10 +39,10 @@
         "lib"
     ],
     "dependencies": {
-        "@topconsultnpm/sdk-ts": "6.19.0-dev2.2",
+        "@topconsultnpm/sdk-ts": "6.19.0-dev2.4",
         "buffer": "^6.0.3",
-        "devextreme": "25.1.4",
-        "devextreme-react": "25.1.4",
+        "devextreme": "25.1.7",
+        "devextreme-react": "25.1.7",
         "exceljs": "^4.4.0",
         "htmlparser2": "^10.0.0",
         "react-router-dom": "^6.15.0",