@topconsultnpm/sdkui-react 6.19.0-dev2.5 → 6.19.0-dev2.51

package/lib/helper/TMUtils.d.ts

@@ -6,10 +6,7 @@ export interface RowData {
     [key: string]: string | number | null;
 }
 export declare const associateColumnsToRows: (columns: Array<DataColumnDescriptor> | undefined, rows: Array<Array<string>> | undefined) => Array<RowData>;
-export declare const buildValueToLabelMapFromDataColumns: (columns: Array<DataColumnDescriptor>) => Promise<{
-    valueToNameMap: Map<string, string>;
-    captions: Set<string>;
-}>;
+export declare const buildValueToLabelMapFromDataColumns: (columns: Array<DataColumnDescriptor>) => Promise<Map<string, Map<string, string>>>;
 export declare const getAvatarColor: (name: string) => string;
 export declare const extractInitialsFromName: (name: string) => string;
 export declare const SIGN4_TOP_WIDGET_ID = "60003";

package/lib/helper/TMUtils.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import styled from "styled-components";
 import { TMTooltip } from '../components';
-import { IconKey } from './TMIcons';
+import { IconCADossier, IconKey, IconMenuCAWorkingGroups } from './TMIcons';
 import { DataListCacheService, MetadataDataDomains, PdGs } from '@topconsultnpm/sdk-ts';
 import { SDKUI_Localizator } from './SDKUI_Localizator';
 const StyledIconFileContainer = styled.div ` 
@@ -119,23 +119,27 @@ export const associateColumnsToRows = (columns, rows) => {
 };
 export const buildValueToLabelMapFromDataColumns = async (columns) => {
     const valueToNameMap = new Map();
-    const captions = new Set();
-    for (const col of columns) {
-        const dataDomain = MetadataDataDomains[(col.extendedProperties?.["DataDomain"] ?? "None")];
+    const dataListColumns = columns.filter(col => {
+        const dataDomainRaw = col.extendedProperties?.["DataDomain"];
+        const dataDomain = MetadataDataDomains[(dataDomainRaw ?? "None")];
+        return dataDomain === MetadataDataDomains.DataList;
+    });
+    for (const col of dataListColumns) {
+        const tid = Number(col.extendedProperties?.["TID"]);
+        const mid = Number(col.extendedProperties?.["MID"]);
         const dataListID = Number(col.extendedProperties?.["DataListID"]);
-        if (dataDomain === MetadataDataDomains.DataList) {
-            if (col.caption) {
-                captions.add(col.caption);
-            }
+        if (tid && mid && dataListID) {
+            const tid_mid = `${tid}_${mid}`;
+            valueToNameMap.set(tid_mid, new Map());
             const dl = await DataListCacheService.GetAsync(dataListID);
             dl?.items?.forEach((item) => {
                 if (item?.name !== undefined && item?.value !== undefined) {
-                    valueToNameMap.set(item.value, item.name);
+                    valueToNameMap.get(tid_mid)?.set(item.value, item.name);
                 }
             });
         }
     }
-    return { valueToNameMap, captions };
+    return valueToNameMap;
 };
 export const getAvatarColor = (name) => {
     const colors = [
@@ -197,21 +201,12 @@ export const StyledTabIcon = styled.i `
   transition: color 0.2s ease;
 `;
 export const TMCountBadge = styled.div ` background-color: #ff5252; color: white; border-radius: 999px; margin-left: 8px; font-size: 0.7rem; line-height: 1; min-height: 20px; min-width: 20px; display: flex ; align-items: center; justify-content: center; `;
-const taskPdgsIconClassMap = () => {
-    return new Map([
-        [PdGs.None, ""],
-        [PdGs.CF, "dx-icon-folder"],
-        [PdGs.DT, "dx-icon-file"],
-        [PdGs.WF, "dx-icon-box"],
-        [PdGs.WG, "dx-icon-group"],
-    ]);
-};
 export const getPdgsIconMap = (fontSize = 20) => {
     return new Map([
         [PdGs.None, _jsx("span", {}, "PdGs-None")],
-        [PdGs.CF, _jsx("i", { style: { fontSize }, className: taskPdgsIconClassMap().get(PdGs.CF) }, "PdGs-CF")],
-        [PdGs.DT, _jsx("i", { style: { fontSize }, className: taskPdgsIconClassMap().get(PdGs.DT) }, "PdGs-DT")],
-        [PdGs.WF, _jsx("i", { style: { fontSize }, className: taskPdgsIconClassMap().get(PdGs.WF) }, "PdGs-WF")],
-        [PdGs.WG, _jsx("i", { style: { fontSize }, className: taskPdgsIconClassMap().get(PdGs.WG) }, "PdGs-WG")], // <IconUserGroup color="#009700"/>
+        [PdGs.CF, _jsx(IconCADossier, { color: "#e65b00", fontSize: 28 }, "PdGs-CF")],
+        [PdGs.DT, _jsx("i", { style: { fontSize, color: '#b38600' }, className: "dx-icon-file" }, "PdGs-DT")],
+        [PdGs.WF, _jsx("i", { style: { fontSize }, className: "dx-icon-box" }, "PdGs-WF")],
+        [PdGs.WG, _jsx(IconMenuCAWorkingGroups, { color: "#009700", fontSize: 28 }, "PdGs-WG")],
     ]);
 };

package/lib/helper/dcmtsHelper.d.ts

@@ -4,4 +4,5 @@ export declare const hasDetailRelations: (mTID: number | undefined) => Promise<b
 /** Check if dcmtType (mTID) has configured Master or Many-to-Many relations */
 export declare const hasMasterRelations: (mTID: number | undefined) => Promise<boolean>;
 export declare const isXMLFileExt: (fileExt: string | undefined) => boolean;
-export declare const processButtonAttributes: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined) => Record<string, string | number> | undefined;
+export declare const getButtonAttributes: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined, selectedItems: Array<any> | undefined) => Record<string, any> | undefined;
+export declare const getSelectedItem: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined, item: any) => Record<string, any> | undefined;

package/lib/helper/dcmtsHelper.js

@@ -1,4 +1,4 @@
-import { RelationCacheService, RelationTypes } from "@topconsultnpm/sdk-ts";
+import { RelationCacheService, RelationTypes, SDK_Globals } from "@topconsultnpm/sdk-ts";
 /** Check if dcmtType (mTID) has configured Detail or Many-to-Many relations */
 export const hasDetailRelations = async (mTID) => {
     let allRelations = await RelationCacheService.GetAllAsync();
@@ -24,20 +24,59 @@ 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(';') + ';';
+export const getButtonAttributes = (args, formData, selectedItems) => args && formData ? formDataMap(formData, args, selectedItems) : undefined;
+const getSelectedItems = (selectedItems) => selectedItems && selectedItems.map(item => item["DID"]) || [];
+export const getSelectedItem = (args, formData, item) => {
+    //converto item in formData
+    const formDataConverted = [];
+    for (const key in item) {
+        const md = formData?.find(md => `${item["TID"]}_${md.mid}` === key);
+        if (md) { // aggiungo solo i metadati
+            const name = md.md?.name || "";
+            formDataConverted.push({ md: { name: name }, value: item[key] });
+        }
+    }
+    return args && formDataConverted ?
+        formDataMap(formDataConverted, args, []) : undefined;
+};
+const formDataMap = (data, args, selectedItems) => {
+    const session = SDK_Globals.tmSession;
+    const sessionDescr = session?.SessionDescr;
+    const result = {};
+    // Helper per estrarre il valore di un campo
+    const getParamValue = (fieldName) => {
+        const md = data.find(md => md.md?.name === fieldName);
+        switch (fieldName) {
+            case 'SelectedDIDs': return getSelectedItems(selectedItems);
+            case 'AuthenticationMode': return sessionDescr?.authenticationMode ?? null;
+            case 'ArchiveID': return sessionDescr?.archiveID ?? null;
+            case 'CultureID': return sessionDescr?.cultureID ?? null;
+            case 'Domain': return sessionDescr?.domain ?? null;
+            case 'UserID': return sessionDescr?.userID ?? null;
+            case 'UserName': return sessionDescr?.userName ?? null;
+            case 'Session': return session ?? null;
+            default: return md?.value;
+        }
+    };
+    // Regex per catturare: chiave=[...] o chiave={...} o {@campo}
+    const keyValueRegex = /(\w+)=\[([^\]]+)\]|(\w+)=\{@?([^}]+)\}|\{@([^}]+)\}/g;
+    for (const match of args.matchAll(keyValueRegex)) {
+        if (match[1]) {
+            // Formato: chiave=[{@campo} testo {@campo} ...]
+            const key = match[1];
+            const content = match[2].replace(/\{@([^}]+)\}/g, (_, fieldName) => data.find(md => md.md?.name === fieldName)?.value ?? '');
+            result[key] = content;
+        }
+        else if (match[3]) {
+            // Formato: chiave={@campo} o chiave={valore}
+            const key = match[3];
+            const value = match[4];
+            result[key] = value.startsWith('@') ? getParamValue(value.substring(1)) : value;
+        }
+        else if (match[5]) {
+            // Formato: {@campo}
+            result[match[5]] = getParamValue(match[5]);
+        }
+    }
+    return result;
 };
-const formDataMap = (data) => data.reduce((acc, md) => {
-    const key = md.md?.name;
-    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

@@ -480,6 +480,9 @@ export const extensionHandler = (fileExt) => {
         case 'xml.p7m.tsd': return FileExtensionHandler.READY_TO_SHOW;
         case 'pdf': return FileExtensionHandler.READY_TO_SHOW;
         case 'txt': return FileExtensionHandler.READY_TO_SHOW;
+        case 'config':
+        case 'cfg':
+        case 'json': return FileExtensionHandler.READY_TO_SHOW;
         default: return FileExtensionHandler.NONE;
     }
 };
@@ -633,7 +636,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,
@@ -112,6 +112,7 @@ export type TaskContext = {
     dossier?: {
         id: number;
         name: string;
+        origin?: string;
     };
     document?: {
         tid: number;
@@ -172,6 +173,7 @@ export interface ITMSaveFormBaseProps {
     customTooltipSaveButton?: string;
     showBackButton?: boolean;
     showUndoButton?: boolean;
+    showCloseButton?: boolean;
     showWarningsCount?: boolean;
     showErrorCount?: boolean;
     hasNavigation?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.19.0-dev2.5",
+    "version": "6.19.0-dev2.51",
     "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.3",
+        "@topconsultnpm/sdk-ts": "6.19.0-dev2.5",
         "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",