@topconsultnpm/sdkui-react 6.20.0-dev1.74 → 6.20.0-dev1.76

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

@@ -806,8 +806,8 @@ const TMSearchResultGrid = ({ openInOffice, fromDTD, allUsers, inputFocusedItem,
     const [focusedItem, setFocusedItem] = useState();
     const [visibleItems, setVisibleItems] = useState([]);
     const [pageSize, setPageSize] = useState(SDKUI_Globals.userSettings.searchSettings?.pageSize ?? TMDataGridPageSize.Large);
-    const { loadDataListsAsync, renderDataListCell } = useDataListItem();
-    const { loadUsersAsync, renderUserIdViewer } = useDataUserIdItem();
+    const { loadDataListsAsync, renderDataListCell, dataListsCache } = useDataListItem();
+    const { loadUsersAsync, renderUserIdViewer, usersCache } = useDataUserIdItem();
     useEffect(() => {
         if (deepCompare(inputFocusedItem, focusedItem))
             return;
@@ -959,28 +959,104 @@ const TMSearchResultGrid = ({ openInOffice, fromDTD, allUsers, inputFocusedItem,
             return { type: 'currency', currency: "JPY" };
         return undefined;
     }, []);
+    /**
+     * Genera la configurazione delle colonne della griglia con i relativi headerFilter.
+     * Per le colonne di tipo DataList e UserID, crea headerFilter con valori leggibili (nomi/descrizioni)
+     * invece delle chiavi numeriche, migliorando l'esperienza utente durante il filtraggio.
+     */
+    const generateColumns = useCallback(() => {
+        // Verifica che esistano colonne da processare
+        if (!searchResult?.dtdResult?.columns)
+            return [];
+        // Genera chiavi univoche per ogni colonna basate sul TID del risultato
+        const uniqueKeys = generateUniqueColumnKeys(searchResult?.dtdResult?.columns, searchResult?.fromTID);
+        const cols = [];
+        // Itera su ogni colonna del risultato di ricerca
+        searchResult.dtdResult.columns.map((col, index) => {
+            // Determina se la colonna è visibile (non nascosta)
+            const isVisible = col.extendedProperties?.["Visibility"] != "Hidden";
+            // Estrae il dominio dati della colonna (es. DataList, UserID, None)
+            const dataDomain = MetadataDataDomains[(col.extendedProperties?.["DataDomain"] ?? "None")];
+            // Estrae l'ID della DataList associata (se presente)
+            const dataListID = Number(col.extendedProperties?.["DataListID"]);
+            // Estrae la modalità di visualizzazione della DataList
+            const dataListViewMode = DataListViewModes[(col.extendedProperties?.["DataListViewMode"] ?? "None")];
+            // Inizializza la configurazione del filtro header
+            let headerFilterConfig = undefined;
+            // Configurazione headerFilter per colonne DataList
+            if (dataDomain === MetadataDataDomains.DataList && dataListID) {
+                // Recupera gli elementi della DataList dalla cache
+                const dataListItems = dataListsCache.current.get(dataListID);
+                if (dataListItems && dataListItems.length > 0) {
+                    // Crea il datasource per l'headerFilter mostrando il nome (text) ma filtrando per valore (value)
+                    headerFilterConfig = {
+                        dataSource: dataListItems
+                            .filter(item => item.name != null && item.value != null)
+                            .map(item => ({
+                            text: item.name,
+                            value: item.value
+                        }))
+                    };
+                }
+            }
+            // Configurazione headerFilter per colonne UserID
+            if (dataDomain === MetadataDataDomains.UserID) {
+                // Recupera tutti gli utenti dalla cache
+                const users = Array.from(usersCache.current.values());
+                if (users.length > 0) {
+                    // Crea il datasource per l'headerFilter mostrando nome utente completo (dominio\nome)
+                    headerFilterConfig = {
+                        dataSource: users
+                            .filter(user => user.name != null && user.id != null)
+                            .map(user => ({
+                            text: user.domain ? `${user.domain}\\${user.name}` : user.name,
+                            value: user.id
+                        }))
+                    };
+                }
+            }
+            // Aggiunge la configurazione della colonna all'array
+            cols.push({
+                dataField: uniqueKeys[index],
+                dataType: dataType(col),
+                visible: isVisible,
+                cellRender: (cellData) => cellRender(cellData, dataDomain, dataListID, dataListViewMode),
+                headerFilter: headerFilterConfig,
+                caption: col.caption,
+                format: getDisplayFormat(col),
+            });
+        });
+        return cols;
+    }, [searchResult, dataType, cellRender, getDisplayFormat, dataListsCache, usersCache]);
+    /**
+     * Effect che carica i dati necessari e genera le colonne della griglia.
+     * Esegue il caricamento delle cache (DataList e UserID) in parallelo prima di generare le colonne,
+     * garantendo che gli headerFilter abbiano tutti i dati disponibili.
+     */
     useEffect(() => {
+        // Verifica che siano disponibili il tipo documento e i risultati di ricerca
         if (fromDTD === undefined || searchResult === undefined)
             return;
         const loadColumnsAndData = async () => {
-            setFocusedItem(undefined); // resetta sempre prima
-            let cols = [];
-            // Generate unique keys for all columns
-            const uniqueKeys = generateUniqueColumnKeys(searchResult?.dtdResult?.columns, searchResult?.fromTID);
+            // Resetta l'elemento focalizzato quando si caricano nuovi dati
+            setFocusedItem(undefined);
+            // Set per raccogliere gli ID univoci da precaricare
             const dataListIDs = new Set();
             const userIDs = new Set();
+            // Itera sulle colonne per identificare quali DataList devono essere caricate
             searchResult?.dtdResult?.columns?.forEach((col) => {
                 const dataDomain = MetadataDataDomains[(col.extendedProperties?.["DataDomain"] ?? "None")];
                 const dataListID = Number(col.extendedProperties?.["DataListID"]);
+                // Se la colonna è di tipo DataList, aggiunge l'ID al set per il caricamento
                 if (dataDomain === MetadataDataDomains.DataList && dataListID) {
                     dataListIDs.add(dataListID);
                 }
             });
-            await loadDataListsAsync(dataListIDs);
-            // Carica gli UserID dalle righe
+            // Itera sulle righe per identificare quali UserID devono essere caricati
             searchResult?.dtdResult?.rows?.forEach((row) => {
                 searchResult?.dtdResult?.columns?.forEach((col, colIndex) => {
                     const dataDomain = MetadataDataDomains[(col.extendedProperties?.["DataDomain"] ?? "None")];
+                    // Se la colonna è di tipo UserID, estrae l'ID dalla riga e lo aggiunge al set
                     if (dataDomain === MetadataDataDomains.UserID) {
                         const userId = Number(row[colIndex]);
                         if (userId && userId > 0) {
@@ -989,28 +1065,20 @@ const TMSearchResultGrid = ({ openInOffice, fromDTD, allUsers, inputFocusedItem,
                     }
                 });
             });
-            await loadUsersAsync(userIDs);
-            searchResult?.dtdResult?.columns?.map((col, index) => {
-                const isVisible = col.extendedProperties?.["Visibility"] != "Hidden";
-                const dataDomain = MetadataDataDomains[(col.extendedProperties?.["DataDomain"] ?? "None")];
-                const dataListID = Number(col.extendedProperties?.["DataListID"]);
-                const dataListViewMode = DataListViewModes[(col.extendedProperties?.["DataListViewMode"] ?? "None")];
-                cols.push({
-                    dataField: uniqueKeys[index],
-                    dataType: dataType(col),
-                    visible: isVisible,
-                    cellRender: (cellData) => cellRender(cellData, dataDomain, dataListID, dataListViewMode),
-                    caption: col.caption,
-                    format: getDisplayFormat(col),
-                });
-            });
+            // Carica in parallelo le cache di DataList e UserID per ottimizzare le prestazioni
+            await Promise.all([
+                loadDataListsAsync(dataListIDs),
+                loadUsersAsync(userIDs)
+            ]);
+            // Genera colonne con cache popolate per garantire headerFilter completi
+            const cols = generateColumns();
             setColumns(cols);
+            // Converte i risultati di ricerca in un array semplice per la griglia
             let newDataSource = searchResultDescriptorToSimpleArray(searchResult);
             setDataSource(newDataSource);
-            // setFocusedItem(newDataSource && newDataSource.length > 0 ? newDataSource[0] : undefined);
         };
         loadColumnsAndData();
-    }, [searchResult, fromDTD, allUsers, loadDataListsAsync]);
+    }, [searchResult, fromDTD, allUsers, loadDataListsAsync, loadUsersAsync, generateColumns]);
     useEffect(() => {
         let newDataSource = searchResultDescriptorToSimpleArray(searchResult);
         setDataSource(newDataSource);
@@ -1058,6 +1126,10 @@ const TMSearchResultGrid = ({ openInOffice, fromDTD, allUsers, inputFocusedItem,
         onDblClick();
     }, [onDblClick]);
     const dataColumns = useMemo(() => {
+        // Aspetta che le colonne siano completamente caricate
+        if (!columns || columns.length === 0) {
+            return [];
+        }
         return [
             {
                 dataType: "object",

package/lib/components/settings/SettingsAppearance.d.ts

@@ -1,4 +1,4 @@
-declare const SettingsAppearance: ({ landingPagesOptions, permissions }: {
+declare const SettingsAppearance: ({ landingPagesOptions, permissions, showConfirmPopup }: {
     landingPagesOptions?: {
         display: string;
         value: string;
@@ -10,5 +10,6 @@ declare const SettingsAppearance: ({ landingPagesOptions, permissions }: {
         dossiersLicense: boolean;
         workFlowLicense: boolean;
     };
+    showConfirmPopup: (title: string, onConfirm: () => void) => void;
 }) => import("react/jsx-runtime").JSX.Element;
 export default SettingsAppearance;

package/lib/components/settings/SettingsAppearance.js

@@ -23,8 +23,15 @@ const fontFamilies = [
     { value: "Inter", display: "Inter" },
     { value: "Roboto", display: "Roboto" }
 ];
-const SettingsAppearance = ({ landingPagesOptions, permissions = { canArchive: true, canSearch: true, dossiersLicense: true, wgGroupLicense: true, workFlowLicense: true } }) => {
+const SettingsAppearance = ({ landingPagesOptions, permissions = { canArchive: true, canSearch: true, dossiersLicense: true, wgGroupLicense: true, workFlowLicense: true }, showConfirmPopup }) => {
     const { showSavedBadge, lastChanged, triggerUIUpdate, closeBadge } = useSettingsFeedback();
+    const handleRestoreClick = () => {
+        showConfirmPopup(SDKUI_Localizator.ConfirmRestoreDefaultSettings, () => {
+            SDKUI_Globals.userSettings.themeSettings = new ThemeSettings();
+            SDKUI_Globals.userSettings.landingPage = LandingPages.DASHBOARD;
+            triggerUIUpdate(SDKUI_Localizator.Restore, 'Impostazioni predefinite', true);
+        });
+    };
     const filteredLandingPageOptopns = useMemo(() => {
         let options = landingPagesOptions ?? [];
         if (!permissions?.canArchive) {
@@ -44,17 +51,17 @@ const SettingsAppearance = ({ landingPagesOptions, permissions = { canArchive: t
         }
         return options;
     }, [permissions?.canArchive, permissions?.canSearch, permissions?.wgGroupLicense, permissions?.dossiersLicense, permissions?.workFlowLicense, landingPagesOptions]);
-    return (_jsxs("div", { style: { width: "100%", height: "100%", display: "flex", flexDirection: "column", position: "relative" }, children: [_jsxs("div", { style: { flex: 1, overflowY: "auto", padding: "4px" }, children: [_jsxs("div", { style: {
+    return (_jsxs("div", { style: { width: "100%", height: "100%", display: "flex", flexDirection: "column", position: "relative" }, children: [_jsxs("div", { style: { flex: 1, overflowY: "auto" }, children: [_jsxs("div", { style: {
                             backgroundColor: "rgba(var(--primary-rgb, 33, 150, 243), 0.04)",
                             borderLeft: "3px solid var(--primary-color, #2196f3)",
                             borderRadius: "4px",
                             padding: "10px 12px",
-                            marginBottom: "6px"
+                            marginBottom: "4px"
                         }, children: [_jsxs("div", { style: {
                                     display: "flex",
                                     alignItems: "center",
                                     gap: "6px",
-                                    marginBottom: "8px"
+                                    marginBottom: "4px"
                                 }, children: [_jsx("i", { className: "dx-icon-font", style: { fontSize: "1.1rem", color: "var(--primary-color, #2196f3)" } }), _jsx("p", { style: { fontSize: '1.05rem', fontWeight: '600', margin: 0, color: "var(--text-primary, #333)" }, children: "Font" })] }), _jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "2px" }, children: [_jsx(TMDropDown, { label: SDKUI_Localizator.Name, dataSource: fontFamilies, width: '100%', value: SDKUI_Globals.userSettings.themeSettings.fontFamily, onValueChanged: (e) => {
                                             let newFamily = e.target.value;
                                             SDKUI_Globals.userSettings.themeSettings.fontFamily = newFamily;
@@ -68,12 +75,12 @@ const SettingsAppearance = ({ landingPagesOptions, permissions = { canArchive: t
                             borderLeft: "3px solid var(--success-color, #4caf50)",
                             borderRadius: "4px",
                             padding: "10px 12px",
-                            marginBottom: "6px"
+                            marginBottom: "4px"
                         }, children: [_jsxs("div", { style: {
                                     display: "flex",
                                     alignItems: "center",
                                     gap: "6px",
-                                    marginBottom: "8px"
+                                    marginBottom: "4px"
                                 }, children: [_jsx("i", { className: "dx-icon-tableproperties", style: { fontSize: "1.1rem", color: "var(--success-color, #4caf50)" } }), _jsx("p", { style: { fontSize: '1.05rem', fontWeight: '600', margin: 0, color: "var(--text-primary, #333)" }, children: SDKUI_Localizator.Grids })] }), _jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "5px" }, children: [_jsx(TMCheckBox, { label: SDKUI_Localizator.ShowRowSeparatingLines, value: SDKUI_Globals.userSettings.themeSettings.gridSettings.showRowLines, onValueChanged: (newValue) => {
                                             SDKUI_Globals.userSettings.themeSettings.gridSettings.showRowLines = newValue;
                                             triggerUIUpdate(SDKUI_Localizator.ShowRowSeparatingLines, newValue ? 'Attivo' : 'Non attivo');
@@ -92,16 +99,12 @@ const SettingsAppearance = ({ landingPagesOptions, permissions = { canArchive: t
                                     display: "flex",
                                     alignItems: "center",
                                     gap: "6px",
-                                    marginBottom: "8px"
+                                    marginBottom: "4px"
                                 }, children: [_jsx("i", { className: "dx-icon-home", style: { fontSize: "1.1rem", color: "var(--warning-color, #ff9800)" } }), _jsx("p", { style: { fontSize: '1.05rem', fontWeight: '600', margin: 0, color: "var(--text-primary, #333)" }, children: SDKUI_Localizator.LandingPage })] }), _jsx(TMDropDown, { dataSource: filteredLandingPageOptopns, value: SDKUI_Globals.userSettings.landingPage, width: '100%', onValueChanged: (e) => {
                                     const selectedOption = filteredLandingPageOptopns.find(opt => opt.value === e.target.value);
                                     SDKUI_Globals.userSettings.landingPage = e.target.value;
                                     triggerUIUpdate(SDKUI_Localizator.LandingPage, selectedOption?.display || e.target.value);
-                                } })] }))] }), _jsxs("div", { style: { borderTop: "1px solid #e0e0e0", flexShrink: 0, paddingTop: "5px", display: "flex", flexDirection: "column", alignItems: "flex-end" }, children: [_jsx(TMButton, { elementStyle: { marginTop: '0px' }, caption: SDKUI_Localizator.Restore, showTooltip: false, onClick: () => {
-                            SDKUI_Globals.userSettings.themeSettings = new ThemeSettings();
-                            SDKUI_Globals.userSettings.landingPage = LandingPages.DASHBOARD;
-                            triggerUIUpdate(SDKUI_Localizator.Restore, 'Impostazioni predefinite', true);
-                        } }), showSavedBadge && (_jsxs("div", { style: {
+                                } })] }))] }), _jsxs("div", { style: { borderTop: "1px solid #e0e0e0", flexShrink: 0, paddingTop: "5px", display: "flex", flexDirection: "column", alignItems: "flex-end" }, children: [_jsx(TMButton, { elementStyle: { marginTop: '0px' }, caption: SDKUI_Localizator.Restore, showTooltip: false, onClick: handleRestoreClick }), showSavedBadge && (_jsxs("div", { style: {
                             marginTop: "5px",
                             backgroundColor: "#4caf50",
                             color: "white",

package/lib/helper/SDKUI_Localizator.d.ts

@@ -118,6 +118,7 @@ export declare class SDKUI_Localizator {
     static get ConfirmDownload(): string;
     static get ConfirmPassword(): "Bestätige das Passwort" | "Confirm password" | "Confirmar Contraseña" | "Confirmez le mot de passe" | "Confirme sua senha" | "Conferma password";
     static get ConfirmOnCancel(): "Wenn wir fortfahren, gehen die vorgenommenen Änderungen verloren. Fortfahren?" | "All modifications will be lost. Continue?" | "Si sigue adelante, se perderán las modificaciones aportadas. ¿Seguir?" | "Continuant, les changements seront perdus. Continuer?" | "Continuando as alterações feitas serão perdidas. Continuar?" | "Proseguendo le modifiche apportate andranno perse. Proseguire?";
+    static get ConfirmRestoreDefaultSettings(): "Bestätigen Sie das Zurücksetzen der Standardeinstellungen?" | "Do you confirm you want to restore default settings?" | "¿Confirmas que quieres restaurar la configuración predeterminada?" | "Confirmez-vous vouloir restaurer les paramètres par défaut ?" | "Confirma que deseja restaurar as configurações padrão?" | "Confermi di voler ripristinare le impostazioni predefinite?";
     static get ConfirmSelectedDocumentsMessage(): string;
     static get ContextualTask(): "Kontextbezogene Aufgabe" | "Contextual Task" | "Tarea contextual" | "Tâche contextuelle" | "Tarefa contextual" | "Attività contestuale";
     static get Continue(): string;

package/lib/helper/SDKUI_Localizator.js

@@ -1160,6 +1160,16 @@ export class SDKUI_Localizator {
             default: return "Proseguendo le modifiche apportate andranno perse. Proseguire?";
         }
     }
+    static get ConfirmRestoreDefaultSettings() {
+        switch (this._cultureID) {
+            case CultureIDs.De_DE: return "Bestätigen Sie das Zurücksetzen der Standardeinstellungen?";
+            case CultureIDs.En_US: return "Do you confirm you want to restore default settings?";
+            case CultureIDs.Es_ES: return "¿Confirmas que quieres restaurar la configuración predeterminada?";
+            case CultureIDs.Fr_FR: return "Confirmez-vous vouloir restaurer les paramètres par défaut ?";
+            case CultureIDs.Pt_PT: return "Confirma que deseja restaurar as configurações padrão?";
+            default: return "Confermi di voler ripristinare le impostazioni predefinite?";
+        }
+    }
     static get ConfirmSelectedDocumentsMessage() {
         switch (this._cultureID) {
             case CultureIDs.De_DE:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topconsultnpm/sdkui-react",
-  "version": "6.20.0-dev1.74",
+  "version": "6.20.0-dev1.76",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",