eionet2-dashboard 3.2.2 → 3.2.3

package/CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [3.2.3](https://github.com/eea/eionet2-dashboard/compare/3.2.2...3.2.3) - 24 April 2026
+
+#### :bug: Bug Fixes
+
+- fix: grid toolbar issue (Refs #302855) [Mihai Nicolae - [`f50c4ee`](https://github.com/eea/eionet2-dashboard/commit/f50c4ee8a6160c91d39cbfa4b8d12832b609348f)]
+
+#### :house: Internal changes
+
+- chore: sonar [Mihai Nicolae - [`d531c58`](https://github.com/eea/eionet2-dashboard/commit/d531c587d99ed740ceb83ddbcbf3651bf5a82283)]
+- chore: coverage on master [Mihai Nicolae - [`d0a7925`](https://github.com/eea/eionet2-dashboard/commit/d0a79254460ffe9d06bf597d2bb1c3c24b1d42d5)]
+- chore: coverage on master [Mihai Nicolae - [`364faf4`](https://github.com/eea/eionet2-dashboard/commit/364faf432bd637b1e1782942161eafe4a450a648)]
+- chore: build [Mihai Nicolae - [`fa47ba5`](https://github.com/eea/eionet2-dashboard/commit/fa47ba5764bfc49824d15c41da8df0ba3bea4855)]
+
 ### [3.2.2](https://github.com/eea/eionet2-dashboard/compare/3.2.1...3.2.2) - 12 March 2026
 
 #### :rocket: New Features
@@ -24,6 +37,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore: code format [Mihai Nicolae - [`a593c60`](https://github.com/eea/eionet2-dashboard/commit/a593c6030a550a37d159ca864ed689663b1a8456)]
 - chore: jenking unit test [Mihai Nicolae - [`24bb98d`](https://github.com/eea/eionet2-dashboard/commit/24bb98d821adbceb9f231aaf9c3451eea8df3502)]
 - chore: code format [Mihai Nicolae - [`eea17da`](https://github.com/eea/eionet2-dashboard/commit/eea17da6d0b41610a2bcc1e4c4852ad2b60c893c)]
+- chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`438a9fb`](https://github.com/eea/eionet2-dashboard/commit/438a9fb90c90501e69fbf70651a0080fc17cd18a)]
 
 ### [3.2.1](https://github.com/eea/eionet2-dashboard/compare/3.2.0...3.2.1) - 18 February 2026
 

package/Jenkinsfile

@@ -31,7 +31,6 @@ pipeline {
         allOf {
           environment name: 'CHANGE_ID', value: ''
           not { changelog '.*^Automated release [0-9\\.]+$' }
-          not { branch 'master' }
         }
       }
       steps {
@@ -49,7 +48,6 @@ pipeline {
         allOf {
           environment name: 'CHANGE_ID', value: ''
           not { changelog '.*^Automated release [0-9\\.]+$' }
-          not { branch 'master' }
         }
       }
                  steps {
@@ -64,7 +62,6 @@ pipeline {
         allOf {
           environment name: 'CHANGE_ID', value: ''
           not { changelog '.*^Automated release [0-9\\.]+$' }
-          not { branch 'master' }
         }
       }
                  steps {   
@@ -113,7 +110,7 @@ pipeline {
       steps {
           script{
             withSonarQubeEnv('Sonarqube') {
-              sh "sonar-scanner -Dsonar.javascript.lcov.reportPaths=./tabs/coverage/lcov.info -Dsonar.sources=./tabs,./api  -Dsonar.projectKey=$GIT_NAME -Dsonar.projectName=$GIT_NAME -Dsonar.branch.name=$BRANCH_NAME"
+              sh "sonar-scanner -Dsonar.javascript.lcov.reportPaths=./tabs/coverage/lcov.info -Dsonar.sources=./tabs,./api -Dsonar.exclusions=**/__tests__/**,**/*.test.*,**/*.spec.* -Dsonar.projectKey=$GIT_NAME -Dsonar.projectName=$GIT_NAME -Dsonar.branch.name=$BRANCH_NAME"
               sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}&tags=${SONARQUBE_TAGS}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eionet2-dashboard",
-    "version": "3.2.2",
+    "version": "3.2.3",
     "description": "",
     "author": "",
     "scripts": {

package/tabs/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@eeacms/eionet2-dashboard",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@eeacms/eionet2-dashboard",
-      "version": "3.2.1",
+      "version": "3.2.2",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "@emotion/react": "^11.14.0",

package/tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/eionet2-dashboard",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "license": "SEE LICENSE IN LICENSE.md",
   "description": "MS Teams app for accessing Eionet activity and managing account information.",
   "dependencies": {

package/tabs/src/components/CustomColumnResizeIcon.jsx

@@ -52,7 +52,7 @@ export default function CustomColumnResizeIcon({ onWidthChanged, id }) {
     let timeout;
     if (resizeInfo) {
       timeout = setTimeout(() => {
-        onWidthChanged && onWidthChanged(resizeInfo.width, resizeInfo.index);
+        onWidthChanged?.(resizeInfo.width, resizeInfo.index);
       }, 100);
     }
     return () => {

package/tabs/src/components/my_country/DataReporters.jsx

@@ -335,10 +335,9 @@ export function DataReporters({ configuration, country, users }) {
           </Box>
           <Box className="grid-container">
             <ResizableGrid
-              showToolbar
               rows={flows}
-              components={{
-                Toolbar: customToolbar,
+              slots={{
+                toolbar: customToolbar,
               }}
               columns={gridColumns}
               pageSizeOptions={[25, 50, 100]}

package/tabs/src/components/my_country/DataReporters.test.jsx

@@ -76,7 +76,6 @@ describe('DataReporters', () => {
     );
 
     const gridProps = mockResizableGrid.mock.calls[0][0];
-    expect(gridProps.showToolbar).toBe(true);
     expect(gridProps.pageSizeOptions).toEqual([25, 50, 100]);
     expect(gridProps.hideFooterSelectedRowCount).toBe(true);
     expect(gridProps.initialState.pagination.paginationModel.pageSize).toBe(25);
@@ -86,7 +85,7 @@ describe('DataReporters', () => {
     });
     expect(gridProps.getRowHeight()).toBe('auto');
 
-    const toolbarHtml = renderToStaticMarkup(<gridProps.components.Toolbar />);
+    const toolbarHtml = renderToStaticMarkup(<gridProps.slots.toolbar />);
     expect(toolbarHtml).toContain('filter');
     expect(toolbarHtml).toContain('export');
 

package/tabs/src/components/CustomGridToolbar.jsx

@@ -1,202 +0,0 @@
-// import * as React from 'react';
-// import { styled } from '@mui/material/styles';
-// import {
-//   DataGrid,
-//   Toolbar,
-//   ToolbarButton,
-//   ColumnsPanelTrigger,
-//   FilterPanelTrigger,
-//   ExportCsv,
-//   ExportPrint,
-//   QuickFilter,
-//   QuickFilterControl,
-//   QuickFilterClear,
-//   QuickFilterTrigger,
-// } from '@mui/x-data-grid';
-// import { useDemoData } from '@mui/x-data-grid-generator';
-// import Tooltip from '@mui/material/Tooltip';
-// import Menu from '@mui/material/Menu';
-// import Badge from '@mui/material/Badge';
-// import ViewColumnIcon from '@mui/icons-material/ViewColumn';
-// import FilterListIcon from '@mui/icons-material/FilterList';
-// import FileDownloadIcon from '@mui/icons-material/FileDownload';
-// import MenuItem from '@mui/material/MenuItem';
-// import Divider from '@mui/material/Divider';
-// import TextField from '@mui/material/TextField';
-// import InputAdornment from '@mui/material/InputAdornment';
-// import CancelIcon from '@mui/icons-material/Cancel';
-// import SearchIcon from '@mui/icons-material/Search';
-// import Typography from '@mui/material/Typography';
-
-// type OwnerState = {
-//   expanded: boolean;
-// };
-
-// const StyledQuickFilter = styled(QuickFilter)({
-//   display: 'grid',
-//   alignItems: 'center',
-// });
-
-// const StyledToolbarButton = styled(ToolbarButton)<{ ownerState: OwnerState }>(
-//   ({ theme, ownerState }) => ({
-//     gridArea: '1 / 1',
-//     width: 'min-content',
-//     height: 'min-content',
-//     zIndex: 1,
-//     opacity: ownerState.expanded ? 0 : 1,
-//     pointerEvents: ownerState.expanded ? 'none' : 'auto',
-//     transition: theme.transitions.create(['opacity']),
-//   }),
-// );
-
-// const StyledTextField = styled(TextField)<{
-//   ownerState: OwnerState;
-// }>(({ theme, ownerState }) => ({
-//   gridArea: '1 / 1',
-//   overflowX: 'clip',
-//   width: ownerState.expanded ? 260 : 'var(--trigger-width)',
-//   opacity: ownerState.expanded ? 1 : 0,
-//   transition: theme.transitions.create(['width', 'opacity']),
-// }));
-
-// function CustomToolbar() {
-//   const [exportMenuOpen, setExportMenuOpen] = React.useState(false);
-//   const exportMenuTriggerRef = React.useRef<HTMLButtonElement>(null);
-
-//   return (
-//     <Toolbar>
-//       <Typography fontWeight="medium" sx={{ flex: 1, mx: 0.5 }}>
-//         Toolbar
-//       </Typography>
-
-//       <Tooltip title="Columns">
-//         <ColumnsPanelTrigger render={<ToolbarButton />}>
-//           <ViewColumnIcon fontSize="small" />
-//         </ColumnsPanelTrigger>
-//       </Tooltip>
-
-//       <Tooltip title="Filters">
-//         <FilterPanelTrigger
-//           render={(props, state) => (
-//             <ToolbarButton {...props} color="default">
-//               <Badge badgeContent={state.filterCount} color="primary" variant="dot">
-//                 <FilterListIcon fontSize="small" />
-//               </Badge>
-//             </ToolbarButton>
-//           )}
-//         />
-//       </Tooltip>
-
-//       <Divider orientation="vertical" variant="middle" flexItem sx={{ mx: 0.5 }} />
-
-//       <Tooltip title="Export">
-//         <ToolbarButton
-//           ref={exportMenuTriggerRef}
-//           id="export-menu-trigger"
-//           aria-controls="export-menu"
-//           aria-haspopup="true"
-//           aria-expanded={exportMenuOpen ? 'true' : undefined}
-//           onClick={() => setExportMenuOpen(true)}
-//         >
-//           <FileDownloadIcon fontSize="small" />
-//         </ToolbarButton>
-//       </Tooltip>
-
-//       <Menu
-//         id="export-menu"
-//         anchorEl={exportMenuTriggerRef.current}
-//         open={exportMenuOpen}
-//         onClose={() => setExportMenuOpen(false)}
-//         anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
-//         transformOrigin={{ vertical: 'top', horizontal: 'right' }}
-//         slotProps={{
-//           list: {
-//             'aria-labelledby': 'export-menu-trigger',
-//           },
-//         }}
-//       >
-//         <ExportPrint render={<MenuItem />} onClick={() => setExportMenuOpen(false)}>
-//           Print
-//         </ExportPrint>
-//         <ExportCsv render={<MenuItem />} onClick={() => setExportMenuOpen(false)}>
-//           Download as CSV
-//         </ExportCsv>
-//         {/* Available to MUI X Premium users */}
-//         {/* <ExportExcel render={<MenuItem />}>
-//           Download as Excel
-//         </ExportExcel> */}
-//       </Menu>
-
-//       <StyledQuickFilter>
-//         <QuickFilterTrigger
-//           render={(triggerProps, state) => (
-//             <Tooltip title="Search" enterDelay={0}>
-//               <StyledToolbarButton
-//                 {...triggerProps}
-//                 ownerState={{ expanded: state.expanded }}
-//                 color="default"
-//                 aria-disabled={state.expanded}
-//               >
-//                 <SearchIcon fontSize="small" />
-//               </StyledToolbarButton>
-//             </Tooltip>
-//           )}
-//         />
-//         <QuickFilterControl
-//           render={({ ref, ...controlProps }, state) => (
-//             <StyledTextField
-//               {...controlProps}
-//               ownerState={{ expanded: state.expanded }}
-//               inputRef={ref}
-//               aria-label="Search"
-//               placeholder="Search..."
-//               size="small"
-//               slotProps={{
-//                 input: {
-//                   startAdornment: (
-//                     <InputAdornment position="start">
-//                       <SearchIcon fontSize="small" />
-//                     </InputAdornment>
-//                   ),
-//                   endAdornment: state.value ? (
-//                     <InputAdornment position="end">
-//                       <QuickFilterClear
-//                         edge="end"
-//                         size="small"
-//                         aria-label="Clear search"
-//                         material={{ sx: { marginRight: -0.75 } }}
-//                       >
-//                         <CancelIcon fontSize="small" />
-//                       </QuickFilterClear>
-//                     </InputAdornment>
-//                   ) : null,
-//                   ...controlProps.slotProps?.input,
-//                 },
-//                 ...controlProps.slotProps,
-//               }}
-//             />
-//           )}
-//         />
-//       </StyledQuickFilter>
-//     </Toolbar>
-//   );
-// }
-
-// export default function GridToolbar() {
-//   const { data, loading } = useDemoData({
-//     dataSet: 'Commodity',
-//     rowLength: 10,
-//     maxColumns: 10,
-//   });
-
-//   return (
-//     <div style={{ height: 400, width: '100%' }}>
-//       <DataGrid
-//         {...data}
-//         loading={loading}
-//         slots={{ toolbar: CustomToolbar }}
-//         showToolbar
-//       />
-//     </div>
-//   );
-// }

package/tabs/src/components/CustomGridToolbar.test.jsx

@@ -1,8 +0,0 @@
-import React from 'react';
-
-describe('CustomGridToolbar', () => {
-  test('loads module even if exports are commented out', () => {
-    const mod = require('./CustomGridToolbar');
-    expect(mod).toBeDefined();
-  });
-});