@topconsultnpm/sdkui-react 6.22.0-dev4.5 → 6.22.0-dev4.7

package/lib/components/base/TMCounterContainer.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
+export declare const formatCount: (value: number | string | undefined) => string;
 export declare enum CounterItemKey {
     allItems = "allItems",
     visibleItems = "visibleItems",
-    selectedItems = "selectedItems"
+    selectedItems = "selectedItems",
+    pageSize = "pageSize"
 }
 export interface ITMCounterItemData {
     key?: string;

package/lib/components/base/TMCounterContainer.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import styled from "styled-components";
 import TMTooltip from './TMTooltip';
+import { DeviceType, useDeviceType } from './TMDeviceProvider';
 /* Styled container component that holds all counter items */
 const Container = styled.div `
     background: ${({ bgColor }) => bgColor || 'linear-gradient(to right, #f8f9fa, #e9ecef)'};
@@ -35,6 +36,14 @@ const Counter = styled.div `
         transition: color 0.3s ease-in-out;
     }
 `;
+/* Formatta un conteggio con il separatore delle migliaia della lingua del browser; i valori non numerici restano invariati.
+   useGrouping 'always' forza il separatore anche sotto le 10.000 unità, che in italiano e spagnolo di default non viene messo (2000 invece di 2.000).
+   Il cast serve perché la lib ES2021 tipizza useGrouping solo come boolean. */
+export const formatCount = (value) => {
+    if (value === undefined || value === '' || isNaN(Number(value)))
+        return String(value ?? '');
+    return Number(value).toLocaleString(navigator.language, { useGrouping: 'always' });
+};
 /* Enum for possible counter item keys */
 export var CounterItemKey;
 (function (CounterItemKey) {
@@ -44,15 +53,21 @@ export var CounterItemKey;
     CounterItemKey["visibleItems"] = "visibleItems";
     /* Key for selected item count */
     CounterItemKey["selectedItems"] = "selectedItems";
+    /* Key for rows per page count */
+    CounterItemKey["pageSize"] = "pageSize";
 })(CounterItemKey || (CounterItemKey = {}));
 ;
 ;
 const TMCounterContainer = (props) => {
     const { items, bgColorContainer, hoverColorItem, bgColorItem, textColorItem } = props;
+    // Su mobile lo spazio è poco: le righe per pagina non vengono mostrate
+    const isMobile = useDeviceType() === DeviceType.MOBILE;
     return (items && _jsx(Container, { bgColor: bgColorContainer, children: [...items.values()].map((item) => {
             if (!item.show)
                 return null;
-            return _jsx(TMTooltip, { content: item.caption ?? '', children: _jsxs(Counter, { bgColor: bgColorContainer, color: bgColorItem, hoverColor: hoverColorItem, textColor: textColorItem, children: [item.icon ?? null, _jsx("span", { children: item.value?.toString() ?? '' })] }) }, item.key ?? '');
+            if (isMobile && item.key === CounterItemKey.pageSize)
+                return null;
+            return _jsx(TMTooltip, { content: item.caption ?? '', children: _jsxs(Counter, { bgColor: bgColorContainer, color: bgColorItem, hoverColor: hoverColorItem, textColor: textColorItem, children: [item.icon ?? null, _jsx("span", { children: formatCount(item.value) })] }) }, item.key ?? '');
         }) }));
 };
 export default TMCounterContainer;

package/lib/components/base/TMDataGrid.js

@@ -3,8 +3,8 @@ import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, us
 import styled, { createGlobalStyle, css } from 'styled-components';
 import DataGrid, { Column, HeaderFilter, Selection, Scrolling, LoadPanel, SearchPanel, Pager, Sorting, Paging, FilterPanel, ColumnChooser, Grouping, GroupPanel, Summary, Editing, FilterRow, StateStoring, RowDragging, MasterDetail, Position, ColumnChooserSearch, ColumnChooserSelection } from 'devextreme-react/data-grid';
 import DataSource from 'devextreme/data/data_source';
-import { IconAll, IconSelected, IconVisible, SDKUI_Globals, SDKUI_Localizator } from '../../helper';
-import TMCounterContainer, { CounterItemKey } from './TMCounterContainer';
+import { IconAll, IconFormatPageSplit, IconSelected, IconVisible, SDKUI_Globals, SDKUI_Localizator } from '../../helper';
+import TMCounterContainer, { CounterItemKey, formatCount } from './TMCounterContainer';
 import TMContextMenu from '../NewComponents/ContextMenu/TMContextMenu';
 import { useLongPress } from '../NewComponents/ContextMenu/useLongPress';
 ;
@@ -132,6 +132,9 @@ const TMDataGrid = React.forwardRef((props, ref) => {
             setCustomContextMenuOnEmptyArea(false);
         },
     });
+    // Valori primitivi: paging di default viene ricreato a ogni render e non può stare tra le dipendenze dell'effetto
+    const pagingEnabled = !!paging && paging.enabled !== false;
+    const rowsPerPage = paging?.pageSize ?? pageSize;
     // Creating a ref to store the timestamp of the last selection change
     const lastSelectionChangeTime = useRef(Date.now());
     useEffect(() => {
@@ -148,6 +151,11 @@ const TMDataGrid = React.forwardRef((props, ref) => {
                 [
                     CounterItemKey.selectedItems,
                     { key: CounterItemKey.selectedItems, show: true, caption: SDKUI_Localizator.SelectedItems, value: selectedRowKeys.length, icon: _jsx(IconSelected, {}), order: 1 }
+                ],
+                [
+                    // Righe per pagina: visibile solo quando c'è il paginatore, cioè gli elementi non stanno in una pagina
+                    CounterItemKey.pageSize,
+                    { key: CounterItemKey.pageSize, show: pagingEnabled && totalRecordCount > rowsPerPage, caption: SDKUI_Localizator.DocumentsPerPage, value: `${formatCount(rowsPerPage)} ${SDKUI_Localizator.PerPage}`, icon: _jsx(IconFormatPageSplit, {}), order: 2 }
                 ]
             ]);
             const mergedCounterItems = new Map(defaultCounterItems);
@@ -164,7 +172,7 @@ const TMDataGrid = React.forwardRef((props, ref) => {
             }));
             setCounterValues(sortedCounterItems);
         }
-    }, [counterConfig, visibleItemsCount, selectedRowKeys]);
+    }, [counterConfig, visibleItemsCount, selectedRowKeys, pagingEnabled, rowsPerPage, totalRecordCount]);
     // Handle selection changes and invoke callback if provided
     const onSelectionChangedCallback = useCallback((e) => {
         lastSelectionChangeTime.current = Date.now(); // Store current time of selection change
@@ -435,229 +443,229 @@ export default TMDataGrid;
 // (padding, altezza minima, font e dimensione dei pulsanti di pagina).
 // Con compactPager = false non emette nessuna regola: width/height restano inline come in precedenza,
 // così il rendering è identico a quello del div originale.
-const StyledDataGridContainer = styled.div `
-    ${({ $compactPager }) => $compactPager && css `
-        & .dx-datagrid-pager {
-            padding: 2px 4px !important;
-            min-height: 0 !important;
-            font-size: 11px;
-        }
-
-        & .dx-datagrid-pager .dx-page,
-        & .dx-datagrid-pager .dx-page-size,
-        & .dx-datagrid-pager .dx-selection,
-        & .dx-datagrid-pager .dx-navigate-button {
-            min-width: 18px !important;
-            min-height: 18px !important;
-            height: auto !important;
-            padding: 1px 5px !important;
-            line-height: 16px !important;
-            font-size: 11px;
-        }
-
-        & .dx-datagrid-pager .dx-pages,
-        & .dx-datagrid-pager .dx-page-sizes,
-        & .dx-datagrid-pager .dx-info,
-        & .dx-datagrid-pager .dx-page-index,
-        & .dx-datagrid-pager .dx-pages .dx-info {
-            font-size: 11px;
-            margin-top: 0 !important;
-            margin-bottom: 0 !important;
-        }
-
-        & .dx-datagrid-pager .dx-info {
-            margin-left: 4px !important;
-            margin-right: 4px !important;
-        }
-
-        /* Editor del numero di pagina (displayMode compact) */
-        & .dx-datagrid-pager .dx-page-index .dx-texteditor-input,
-        & .dx-datagrid-pager .dx-page-sizes .dx-texteditor-input {
-            min-height: 18px !important;
-            height: 18px !important;
-            padding: 0 4px !important;
-            font-size: 11px;
-        }
-    `}
+const StyledDataGridContainer = styled.div `
+    ${({ $compactPager }) => $compactPager && css `
+        & .dx-datagrid-pager {
+            padding: 2px 4px !important;
+            min-height: 0 !important;
+            font-size: 11px;
+        }
+
+        & .dx-datagrid-pager .dx-page,
+        & .dx-datagrid-pager .dx-page-size,
+        & .dx-datagrid-pager .dx-selection,
+        & .dx-datagrid-pager .dx-navigate-button {
+            min-width: 18px !important;
+            min-height: 18px !important;
+            height: auto !important;
+            padding: 1px 5px !important;
+            line-height: 16px !important;
+            font-size: 11px;
+        }
+
+        & .dx-datagrid-pager .dx-pages,
+        & .dx-datagrid-pager .dx-page-sizes,
+        & .dx-datagrid-pager .dx-info,
+        & .dx-datagrid-pager .dx-page-index,
+        & .dx-datagrid-pager .dx-pages .dx-info {
+            font-size: 11px;
+            margin-top: 0 !important;
+            margin-bottom: 0 !important;
+        }
+
+        & .dx-datagrid-pager .dx-info {
+            margin-left: 4px !important;
+            margin-right: 4px !important;
+        }
+
+        /* Editor del numero di pagina (displayMode compact) */
+        & .dx-datagrid-pager .dx-page-index .dx-texteditor-input,
+        & .dx-datagrid-pager .dx-page-sizes .dx-texteditor-input {
+            min-height: 18px !important;
+            height: 18px !important;
+            padding: 0 4px !important;
+            font-size: 11px;
+        }
+    `}
 `;
 // Stile del pannello del filtro d'intestazione (ricerca, elenco valori, OK/Annulla).
 // Il popup è in portale sul body, fuori da StyledDataGridContainer: le regole sono globali
 // ma tutte sotto .dx-header-filter-menu, classe che DevExtreme applica solo a questo popup.
-const HeaderFilterMenuGlobalStyle = createGlobalStyle `
-    .dx-header-filter-menu {
-
-        &.dx-popup-wrapper > .dx-overlay-content.dx-popup-normal {
-            border: 1px solid #E4E8EE;
-            border-radius: 8px;
-            box-shadow: 0 2px 6px rgba(18, 44, 76, .08), 0 12px 28px rgba(18, 44, 76, .14);
-            overflow: hidden;
-        }
-
-        &.dx-popup-wrapper .dx-popup-content {
-            padding: 10px 10px 4px;
-        }
-
-        /* Campo di ricerca: TextBox mode "search" resa da List o da TreeView (filtri gerarchici) */
-        .dx-searchbox.dx-list-search,
-        .dx-searchbox.dx-treeview-search {
-            margin-bottom: 8px;
-            border-radius: 6px;
-            border: 1px solid #CDD2D8;
-            background-color: #F4F6F9;
-            box-shadow: none;
-            transition: border-color .15s ease, background-color .15s ease, box-shadow .15s ease;
-
-            /* fluent disegna qui la barretta di focus, sostituita da bordo + alone */
-            &::before,
-            &::after {
-                display: none;
-            }
-
-            &.dx-state-hover:not(.dx-state-focused) {
-                border-color: #AEB6C1;
-                background-color: #EEF2F7;
-            }
-
-            &.dx-state-focused {
-                border-color: #2559A5;
-                background-color: #FFFFFF;
-                box-shadow: 0 0 0 2px rgba(37, 89, 165, .16);
-            }
-
-            .dx-icon-search {
-                width: 28px;
-                color: #8A929B;
-                transition: color .15s ease;
-            }
-
-            &.dx-state-focused .dx-icon-search {
-                color: #2559A5;
-            }
-
-            .dx-texteditor-input {
-                min-height: 28px;
-                padding-inline-start: 28px;
-                padding-inline-end: 8px;
-                font-size: 12px;
-                background-color: transparent;
-            }
-
-            .dx-placeholder {
-                color: #9AA3AD;
-                font-size: 12px;
-
-                &::before {
-                    padding-inline-start: 28px;
-                    padding-inline-end: 8px;
-                }
-            }
-
-            .dx-clear-button-area .dx-icon-clear {
-                color: #8A929B;
-                transition: color .15s ease;
-            }
-
-            .dx-clear-button-area:hover .dx-icon-clear {
-                color: #2559A5;
-            }
-        }
-
-        .dx-list-item {
-            border-radius: 4px;
-            transition: background-color .12s ease;
-        }
-
-        .dx-list-item-content {
-            padding: 4px 6px;
-        }
-
-        .dx-list-item.dx-state-hover,
-        .dx-list-item.dx-state-focused {
-            background-color: #F1F6FD;
-            color: #122C4C;
-        }
-
-        .dx-list-select-all {
-            padding: 2px 0 6px;
-            margin-bottom: 4px;
-            border-bottom: 1px solid #ECEFF3;
-        }
-
-        .dx-list-select-all-label {
-            font-weight: 600;
-            color: #122C4C;
-        }
-
-        .dx-checkbox-checked .dx-checkbox-icon,
-        .dx-checkbox-indeterminate .dx-checkbox-icon {
-            border-color: #2559A5;
-            background-color: #2559A5;
-        }
-
-        .dx-checkbox.dx-state-hover:not(.dx-checkbox-checked) .dx-checkbox-icon {
-            border-color: #2559A5;
-        }
-
-        /* il :not() lascia intatto il fade-out nativo della scrollbar */
-        .dx-scrollable-scroll:not(.dx-state-invisible) .dx-scrollable-scroll-content {
-            background-color: rgba(18, 44, 76, .28);
-            border-radius: 3px;
-        }
-
-        &.dx-popup-wrapper .dx-popup-bottom.dx-toolbar {
-            padding: 8px 10px 10px;
-            border-top: 1px solid #ECEFF3;
-        }
-
-        .dx-popup-bottom .dx-button {
-            border-radius: 5px;
-            min-width: 76px;
-            margin: 0;
-        }
-
-        .dx-popup-bottom .dx-toolbar-button + .dx-toolbar-button {
-            margin-inline-start: 6px;
-
-            .dx-button {
-                margin: 0;
-            }
-        }
-
-        /* DevExtreme aggiunge prima OK e poi Annulla: individuarli per posizione li rende indipendenti dalla lingua */
-        .dx-popup-bottom .dx-toolbar-after > .dx-toolbar-button:first-child .dx-button {
-            border-color: transparent;
-            background-color: #2559A5;
-
-            .dx-button-text {
-                color: #FFFFFF;
-            }
-
-            &.dx-state-hover {
-                background-color: #1E4A8C;
-            }
-
-            &.dx-state-active {
-                background-color: #1A3F78;
-            }
-        }
-
-        .dx-popup-bottom .dx-toolbar-after > .dx-toolbar-button + .dx-toolbar-button .dx-button {
-            border-color: transparent;
-            background-color: transparent;
-
-            .dx-button-text {
-                color: #44506B;
-            }
-
-            &.dx-state-hover {
-                background-color: #F0F3F7;
-            }
-
-            &.dx-state-active {
-                background-color: #E6EBF2;
-            }
-        }
-    }
+const HeaderFilterMenuGlobalStyle = createGlobalStyle `
+    .dx-header-filter-menu {
+
+        &.dx-popup-wrapper > .dx-overlay-content.dx-popup-normal {
+            border: 1px solid #E4E8EE;
+            border-radius: 8px;
+            box-shadow: 0 2px 6px rgba(18, 44, 76, .08), 0 12px 28px rgba(18, 44, 76, .14);
+            overflow: hidden;
+        }
+
+        &.dx-popup-wrapper .dx-popup-content {
+            padding: 10px 10px 4px;
+        }
+
+        /* Campo di ricerca: TextBox mode "search" resa da List o da TreeView (filtri gerarchici) */
+        .dx-searchbox.dx-list-search,
+        .dx-searchbox.dx-treeview-search {
+            margin-bottom: 8px;
+            border-radius: 6px;
+            border: 1px solid #CDD2D8;
+            background-color: #F4F6F9;
+            box-shadow: none;
+            transition: border-color .15s ease, background-color .15s ease, box-shadow .15s ease;
+
+            /* fluent disegna qui la barretta di focus, sostituita da bordo + alone */
+            &::before,
+            &::after {
+                display: none;
+            }
+
+            &.dx-state-hover:not(.dx-state-focused) {
+                border-color: #AEB6C1;
+                background-color: #EEF2F7;
+            }
+
+            &.dx-state-focused {
+                border-color: #2559A5;
+                background-color: #FFFFFF;
+                box-shadow: 0 0 0 2px rgba(37, 89, 165, .16);
+            }
+
+            .dx-icon-search {
+                width: 28px;
+                color: #8A929B;
+                transition: color .15s ease;
+            }
+
+            &.dx-state-focused .dx-icon-search {
+                color: #2559A5;
+            }
+
+            .dx-texteditor-input {
+                min-height: 28px;
+                padding-inline-start: 28px;
+                padding-inline-end: 8px;
+                font-size: 12px;
+                background-color: transparent;
+            }
+
+            .dx-placeholder {
+                color: #9AA3AD;
+                font-size: 12px;
+
+                &::before {
+                    padding-inline-start: 28px;
+                    padding-inline-end: 8px;
+                }
+            }
+
+            .dx-clear-button-area .dx-icon-clear {
+                color: #8A929B;
+                transition: color .15s ease;
+            }
+
+            .dx-clear-button-area:hover .dx-icon-clear {
+                color: #2559A5;
+            }
+        }
+
+        .dx-list-item {
+            border-radius: 4px;
+            transition: background-color .12s ease;
+        }
+
+        .dx-list-item-content {
+            padding: 4px 6px;
+        }
+
+        .dx-list-item.dx-state-hover,
+        .dx-list-item.dx-state-focused {
+            background-color: #F1F6FD;
+            color: #122C4C;
+        }
+
+        .dx-list-select-all {
+            padding: 2px 0 6px;
+            margin-bottom: 4px;
+            border-bottom: 1px solid #ECEFF3;
+        }
+
+        .dx-list-select-all-label {
+            font-weight: 600;
+            color: #122C4C;
+        }
+
+        .dx-checkbox-checked .dx-checkbox-icon,
+        .dx-checkbox-indeterminate .dx-checkbox-icon {
+            border-color: #2559A5;
+            background-color: #2559A5;
+        }
+
+        .dx-checkbox.dx-state-hover:not(.dx-checkbox-checked) .dx-checkbox-icon {
+            border-color: #2559A5;
+        }
+
+        /* il :not() lascia intatto il fade-out nativo della scrollbar */
+        .dx-scrollable-scroll:not(.dx-state-invisible) .dx-scrollable-scroll-content {
+            background-color: rgba(18, 44, 76, .28);
+            border-radius: 3px;
+        }
+
+        &.dx-popup-wrapper .dx-popup-bottom.dx-toolbar {
+            padding: 8px 10px 10px;
+            border-top: 1px solid #ECEFF3;
+        }
+
+        .dx-popup-bottom .dx-button {
+            border-radius: 5px;
+            min-width: 76px;
+            margin: 0;
+        }
+
+        .dx-popup-bottom .dx-toolbar-button + .dx-toolbar-button {
+            margin-inline-start: 6px;
+
+            .dx-button {
+                margin: 0;
+            }
+        }
+
+        /* DevExtreme aggiunge prima OK e poi Annulla: individuarli per posizione li rende indipendenti dalla lingua */
+        .dx-popup-bottom .dx-toolbar-after > .dx-toolbar-button:first-child .dx-button {
+            border-color: transparent;
+            background-color: #2559A5;
+
+            .dx-button-text {
+                color: #FFFFFF;
+            }
+
+            &.dx-state-hover {
+                background-color: #1E4A8C;
+            }
+
+            &.dx-state-active {
+                background-color: #1A3F78;
+            }
+        }
+
+        .dx-popup-bottom .dx-toolbar-after > .dx-toolbar-button + .dx-toolbar-button .dx-button {
+            border-color: transparent;
+            background-color: transparent;
+
+            .dx-button-text {
+                color: #44506B;
+            }
+
+            &.dx-state-hover {
+                background-color: #F0F3F7;
+            }
+
+            &.dx-state-active {
+                background-color: #E6EBF2;
+            }
+        }
+    }
 `;
 const getRecordCount = (dataSource) => {
     if (Array.isArray(dataSource)) {

package/lib/components/base/waitPanel/TMWaitPanelManager.d.ts

@@ -21,6 +21,8 @@ export interface ITMWaitPanelOptions {
     /** Didascalie fisse sopra le due barre, es. "Documenti" e "File corrente". Omesse: nessuna riga. */
     primaryLabel?: string;
     secondaryLabel?: string;
+    /** Quanti messaggi di warning / errore mostrare nel popover delle pill. Default: 5. */
+    maxVisibleMessages?: number;
     /** Invocato quando l'utente interrompe */
     onAbort?: () => void;
 }
@@ -67,10 +69,10 @@ export interface ITMWaitPanelHandle {
     setSubtitle(subtitle: string | undefined): void;
     /** Incrementa il contatore verde (default +1). */
     ok(delta?: number): void;
-    /** Incrementa il contatore giallo (default +1). */
-    warning(delta?: number): void;
-    /** Incrementa il contatore rosso (default +1). */
-    error(delta?: number): void;
+    /** Incrementa il contatore giallo (default +1). Il messaggio, se presente, finisce nel popover della pill. */
+    warning(delta?: number, message?: string): void;
+    /** Incrementa il contatore rosso (default +1). Il messaggio, se presente, finisce nel popover della pill. */
+    error(delta?: number, message?: string): void;
     /** Aggiornamento cumulativo: i contatori qui sono valori assoluti, non incrementi. */
     update(patch: ITMWaitPanelUpdate): void;
     /** Aggiorna la barra secondaria. Senza `showSecondary` non ha effetto. */
@@ -104,6 +106,12 @@ declare class TMWaitPanelInstance implements ITMWaitPanelHandle {
     private _secondaryValue;
     private _secondaryMax;
     private _secondaryText;
+    private readonly maxVisibleMessages;
+    private readonly _warningMessages;
+    private readonly _errorMessages;
+    private warningMessageTotal;
+    private errorMessageTotal;
+    private messagesDirty;
     private lastPercentText;
     private lastSubtitleText;
     private lastElapsedText;
@@ -129,8 +137,8 @@ declare class TMWaitPanelInstance implements ITMWaitPanelHandle {
     setTitle: (title: string) => void;
     setSubtitle: (subtitle: string | undefined) => void;
     ok: (delta?: number) => void;
-    warning: (delta?: number) => void;
-    error: (delta?: number) => void;
+    warning: (delta?: number, message?: string) => void;
+    error: (delta?: number, message?: string) => void;
     setSecondary: (patch: ITMWaitPanelSecondaryUpdate) => void;
     update: (patch: ITMWaitPanelUpdate) => void;
     close: () => void;
@@ -148,6 +156,8 @@ declare class TMWaitPanelInstance implements ITMWaitPanelHandle {
     private schedule;
     /** Riversa sul DOM lo stato corrente (barra, percentuale, testi, contatori), saltando cio' che non e' cambiato. */
     private flush;
+    /** Riscrive la lista di un popover con gli ultimi messaggi e la riga "... e altri N". Il popover si apre solo se non e' vuoto. */
+    private flushMessages;
     /** Riversa sul DOM la seconda barra. Invocata solo quando la view l'ha renderizzata. */
     private flushSecondary;
     /** Aggiorna la riga dei tempi: trascorso al netto delle pause e stima del rimanente. */