eionet2-dashboard 1.7.0 → 1.7.1

package/CHANGELOG.md

@@ -4,7 +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).
 
-### [1.7.0](https://github.com/eea/eionet2-dashboard/compare/1.6.1...1.7.0) - 24 November 2023
+### [1.7.1](https://github.com/eea/eionet2-dashboard/compare/1.7.0...1.7.1) - 29 November 2023
+
+#### :rocket: New Features
+
+- feat: ui improvements [Mihai Nicolae - [`822051f`](https://github.com/eea/eionet2-dashboard/commit/822051f21c19ddae4973012a052e1583207af9a9)]
+- feat: add future cons/survery; fixes (#257970) [Mihai Nicolae - [`0f971ad`](https://github.com/eea/eionet2-dashboard/commit/0f971ad96f0539ebafd9061fb7d9d952fe1922c5)]
+
+#### :house: Internal changes
+
+- chore: version [Mihai Nicolae - [`870064d`](https://github.com/eea/eionet2-dashboard/commit/870064db6a0e5609c41a412f0c51438d6547db19)]
+- chore: version [Mihai Nicolae - [`088ba5d`](https://github.com/eea/eionet2-dashboard/commit/088ba5de1b0738a011dfd0a1364113ed0acdaa13)]
+
+### [1.7.0](https://github.com/eea/eionet2-dashboard/compare/1.6.1...1.7.0) - 28 November 2023
 
 #### :rocket: New Features
 

package/package.json

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

package/tabs/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/eionet2-dashboard",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/eionet2-dashboard",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "license": "MIT",
   "description": "Teams app for managing Eionet users.",
   "dependencies": {

package/tabs/src/components/activity/Activity.jsx

@@ -15,6 +15,8 @@ import Constants from '../../data/constants.json';
 import LoopIcon from '@mui/icons-material/Loop';
 import FastForwardOutlinedIcon from '@mui/icons-material/FastForwardOutlined';
 import HistoryOutlinedIcon from '@mui/icons-material/HistoryOutlined';
+import NextPlanOutlinedIcon from '@mui/icons-material/NextPlanOutlined';
+
 import { ConsultationList } from './ConsultationList';
 import { EventList } from './EventList';
 import {
@@ -43,9 +45,11 @@ export function Activity({
     [openConsultations, setOpenConsultations] = useState([]),
     [reviewConsultations, setReviewConsultations] = useState([]),
     [finalisedConsultations, setFinalisedConsultations] = useState([]),
+    [futureConsultations, setFutureConsultations] = useState([]),
     [openSurveys, setOpenSurveys] = useState([]),
     [reviewSurveys, setReviewSurveys] = useState([]),
     [finalisedSurveys, setFinalisedSurveys] = useState([]),
+    [futureSurveys, setFutureSurveys] = useState([]),
     [futurePublications, setFuturePublications] = useState([]),
     [pastPublications, setPastPublications] = useState([]),
     [upcomingObligations, setUpcomingObligations] = useState([]),
@@ -107,9 +111,9 @@ export function Activity({
           onClick={() => setTabsValue(3)}
         >
           <ListItemIcon className="list-item-icon">
-            <LoopIcon />
+            <NextPlanOutlinedIcon />
           </ListItemIcon>
-          <ListItemText primary={'Open (' + openConsultations.length + ')'} />
+          <ListItemText primary={'Future(' + futureConsultations.length + ')'} />
         </ListItemButton>
       </ListItem>
       <ListItem disablePadding className="list-item" key={6}>
@@ -118,15 +122,26 @@ export function Activity({
           onClick={() => setTabsValue(4)}
         >
           <ListItemIcon className="list-item-icon">
-            <FastForwardOutlinedIcon />
+            <LoopIcon />
           </ListItemIcon>
-          <ListItemText primary={'Review(' + reviewConsultations.length + ')'} />
+          <ListItemText primary={'Open (' + openConsultations.length + ')'} />
         </ListItemButton>
       </ListItem>
       <ListItem disablePadding className="list-item" key={7}>
         <ListItemButton
           className={'list-item-button ' + (tabsValue == 5 ? ' drawer-item-selected' : '')}
           onClick={() => setTabsValue(5)}
+        >
+          <ListItemIcon className="list-item-icon">
+            <FastForwardOutlinedIcon />
+          </ListItemIcon>
+          <ListItemText primary={'Review(' + reviewConsultations.length + ')'} />
+        </ListItemButton>
+      </ListItem>
+      <ListItem disablePadding className="list-item" key={8}>
+        <ListItemButton
+          className={'list-item-button ' + (tabsValue == 6 ? ' drawer-item-selected' : '')}
+          onClick={() => setTabsValue(6)}
         >
           <ListItemIcon className="list-item-icon">
             <HistoryOutlinedIcon />
@@ -134,17 +149,29 @@ export function Activity({
           <ListItemText primary={'Finalised(' + finalisedConsultations.length + ')'} />
         </ListItemButton>
       </ListItem>
-      <ListItem disablePadding className="list-item" key={8}>
+
+      <ListItem disablePadding className="list-item" key={9}>
         <ListItemText
           className="list-item-text"
           primary={'INQUIRIES'}
           sx={{ color: 'primary.main' }}
         />
       </ListItem>
-      <ListItem disablePadding className="list-item" key={9}>
+      <ListItem disablePadding className="list-item" key={10}>
         <ListItemButton
-          className={'list-item-button ' + (tabsValue == 6 ? ' drawer-item-selected' : '')}
-          onClick={() => setTabsValue(6)}
+          className={'list-item-button ' + (tabsValue == 7 ? ' drawer-item-selected' : '')}
+          onClick={() => setTabsValue(7)}
+        >
+          <ListItemIcon className="list-item-icon">
+            <NextPlanOutlinedIcon />
+          </ListItemIcon>
+          <ListItemText primary={'Future(' + futureSurveys.length + ')'} />
+        </ListItemButton>
+      </ListItem>
+      <ListItem disablePadding className="list-item" key={11}>
+        <ListItemButton
+          className={'list-item-button ' + (tabsValue == 8 ? ' drawer-item-selected' : '')}
+          onClick={() => setTabsValue(8)}
         >
           <ListItemIcon className="list-item-icon">
             <LoopIcon />
@@ -152,10 +179,10 @@ export function Activity({
           <ListItemText primary={'Open(' + openSurveys.length + ')'} />
         </ListItemButton>
       </ListItem>
-      <ListItem disablePadding className="list-item" key={10}>
+      <ListItem disablePadding className="list-item" key={12}>
         <ListItemButton
-          className={'list-item-button ' + (tabsValue == 7 ? ' drawer-item-selected' : '')}
-          onClick={() => setTabsValue(7)}
+          className={'list-item-button ' + (tabsValue == 9 ? ' drawer-item-selected' : '')}
+          onClick={() => setTabsValue(9)}
         >
           <ListItemIcon className="list-item-icon">
             <FastForwardOutlinedIcon />
@@ -163,10 +190,10 @@ export function Activity({
           <ListItemText primary={'Review(' + reviewSurveys.length + ')'} />
         </ListItemButton>
       </ListItem>
-      <ListItem disablePadding className="list-item" key={11}>
+      <ListItem disablePadding className="list-item" key={13}>
         <ListItemButton
-          className={'list-item-button ' + (tabsValue == 8 ? ' drawer-item-selected' : '')}
-          onClick={() => setTabsValue(8)}
+          className={'list-item-button ' + (tabsValue == 10 ? ' drawer-item-selected' : '')}
+          onClick={() => setTabsValue(10)}
         >
           <ListItemIcon className="list-item-icon">
             <HistoryOutlinedIcon />
@@ -174,17 +201,17 @@ export function Activity({
           <ListItemText primary={'Finalised(' + finalisedSurveys.length + ')'} />
         </ListItemButton>
       </ListItem>
-      <ListItem disablePadding className="list-item" key={12}>
+      <ListItem disablePadding className="list-item" key={14}>
         <ListItemText
           className="list-item-text"
           primary={'PUBLICATIONS'}
           sx={{ color: 'primary.main' }}
         />
       </ListItem>
-      <ListItem disablePadding className="list-item" key={13}>
+      <ListItem disablePadding className="list-item" key={15}>
         <ListItemButton
-          className={'list-item-button ' + (tabsValue == 9 ? ' drawer-item-selected' : '')}
-          onClick={() => setTabsValue(9)}
+          className={'list-item-button ' + (tabsValue == 11 ? ' drawer-item-selected' : '')}
+          onClick={() => setTabsValue(11)}
         >
           <ListItemIcon className="list-item-icon">
             <LoopIcon />
@@ -192,10 +219,10 @@ export function Activity({
           <ListItemText primary={'Future(' + futurePublications.length + ')'} />
         </ListItemButton>
       </ListItem>
-      <ListItem disablePadding className="list-item" key={14}>
+      <ListItem disablePadding className="list-item" key={16}>
         <ListItemButton
-          className={'list-item-button ' + (tabsValue == 10 ? ' drawer-item-selected' : '')}
-          onClick={() => setTabsValue(10)}
+          className={'list-item-button ' + (tabsValue == 12 ? ' drawer-item-selected' : '')}
+          onClick={() => setTabsValue(12)}
         >
           <ListItemIcon className="list-item-icon">
             <HistoryOutlinedIcon />
@@ -203,17 +230,17 @@ export function Activity({
           <ListItemText primary={'Past(' + pastPublications.length + ')'} />
         </ListItemButton>
       </ListItem>
-      <ListItem disablePadding className="list-item" key={15}>
+      <ListItem disablePadding className="list-item" key={17}>
         <ListItemText
           className="list-item-text"
           primary={'REPORTING OBLIGATIONS'}
           sx={{ color: 'primary.main' }}
         />
       </ListItem>
-      <ListItem disablePadding className="list-item" key={16}>
+      <ListItem disablePadding className="list-item" key={18}>
         <ListItemButton
-          className={'list-item-button ' + (tabsValue == 11 ? ' drawer-item-selected' : '')}
-          onClick={() => setTabsValue(11)}
+          className={'list-item-button ' + (tabsValue == 13 ? ' drawer-item-selected' : '')}
+          onClick={() => setTabsValue(13)}
         >
           <ListItemIcon className="list-item-icon">
             <LoopIcon />
@@ -221,10 +248,10 @@ export function Activity({
           <ListItemText primary={'Upcoming(' + upcomingObligations.length + ')'} />
         </ListItemButton>
       </ListItem>
-      <ListItem disablePadding className="list-item" key={17}>
+      <ListItem disablePadding className="list-item" key={19}>
         <ListItemButton
-          className={'list-item-button ' + (tabsValue == 12 ? ' drawer-item-selected' : '')}
-          onClick={() => setTabsValue(12)}
+          className={'list-item-button ' + (tabsValue == 14 ? ' drawer-item-selected' : '')}
+          onClick={() => setTabsValue(14)}
         >
           <ListItemIcon className="list-item-icon">
             <HistoryOutlinedIcon />
@@ -269,11 +296,13 @@ export function Activity({
 
       getConsultations(undefined, fromDate, country).then((loadedConsultations) => {
         if (loadedConsultations) {
+          const currentDate = new Date(new Date().toDateString());
           setOpenConsultations(
             loadedConsultations.filter((c) => {
               return (
                 c.ConsultationType == Constants.ConsultationType.Consultation &&
-                c.Closed >= new Date()
+                c.Closed >= currentDate &&
+                c.Startdate <= currentDate
               );
             }),
           );
@@ -281,8 +310,8 @@ export function Activity({
             loadedConsultations.filter((c) => {
               return (
                 c.ConsultationType == Constants.ConsultationType.Consultation &&
-                c.Closed < new Date() &&
-                c.Deadline >= new Date()
+                c.Closed < currentDate &&
+                c.Deadline >= currentDate
               );
             }),
           );
@@ -290,8 +319,16 @@ export function Activity({
             loadedConsultations.filter((c) => {
               return (
                 c.ConsultationType == Constants.ConsultationType.Consultation &&
-                c.Closed <= new Date() &&
-                c.Deadline < new Date()
+                c.Closed <= currentDate &&
+                c.Deadline < currentDate
+              );
+            }),
+          );
+          setFutureConsultations(
+            loadedConsultations.filter((c) => {
+              return (
+                c.ConsultationType == Constants.ConsultationType.Consultation &&
+                c.Startdate > currentDate
               );
             }),
           );
@@ -299,7 +336,9 @@ export function Activity({
           setOpenSurveys(
             loadedConsultations.filter((c) => {
               return (
-                c.ConsultationType == Constants.ConsultationType.Survey && c.Closed >= new Date()
+                c.ConsultationType == Constants.ConsultationType.Survey &&
+                c.Closed >= currentDate &&
+                c.Startdate <= currentDate
               );
             }),
           );
@@ -307,8 +346,8 @@ export function Activity({
             loadedConsultations.filter((c) => {
               return (
                 c.ConsultationType == Constants.ConsultationType.Survey &&
-                c.Closed < new Date() &&
-                c.Deadline >= new Date()
+                c.Closed < currentDate &&
+                c.Deadline >= currentDate
               );
             }),
           );
@@ -316,8 +355,15 @@ export function Activity({
             loadedConsultations.filter((c) => {
               return (
                 c.ConsultationType == Constants.ConsultationType.Survey &&
-                c.Closed <= new Date() &&
-                c.Deadline < new Date()
+                c.Closed <= currentDate &&
+                c.Deadline < currentDate
+              );
+            }),
+          );
+          setFutureSurveys(
+            loadedConsultations.filter((c) => {
+              return (
+                c.ConsultationType == Constants.ConsultationType.Survey && c.Startdate > currentDate
               );
             }),
           );
@@ -370,43 +416,46 @@ export function Activity({
               openApproval={openApproval}
             ></EventList>
           )}
-          {tabsValue >= 3 && tabsValue <= 5 && (
+          {tabsValue >= 3 && tabsValue <= 6 && (
             <ConsultationList
               configuration={configuration}
               openConsultations={openConsultations}
               reviewConsultations={reviewConsultations}
               finalisedConsultations={finalisedConsultations}
+              futureConsultations={futureConsultations}
               type={Constants.ConsultationType.Consultation}
               country={country}
               tabsValue={tabsValue - 3}
             ></ConsultationList>
           )}
-          {tabsValue >= 6 && tabsValue <= 8 && (
+          {tabsValue >= 7 && tabsValue <= 10 && (
             <ConsultationList
               configuration={configuration}
               openConsultations={openSurveys}
               reviewConsultations={reviewSurveys}
               finalisedConsultations={finalisedSurveys}
+              futureConsultations={futureSurveys}
               type={Constants.ConsultationType.Survey}
-              tabsValue={tabsValue - 6}
+              country={country}
+              tabsValue={tabsValue - 7}
             ></ConsultationList>
           )}
-          {tabsValue >= 9 && tabsValue <= 10 && (
+          {tabsValue >= 11 && tabsValue <= 12 && (
             <PublicatonList
               userInfo={userInfo}
               configuration={configuration}
               futurePublications={futurePublications}
               pastPublications={pastPublications}
-              tabsValue={tabsValue - 9}
+              tabsValue={tabsValue - 11}
             ></PublicatonList>
           )}
-          {tabsValue >= 11 && tabsValue <= 12 && (
+          {tabsValue >= 13 && tabsValue <= 14 && (
             <ObligationList
               userInfo={userInfo}
               configuration={configuration}
               upcomingObligations={upcomingObligations}
               continuousObligations={continuousObligations}
-              tabsValue={tabsValue - 11}
+              tabsValue={tabsValue - 13}
             ></ObligationList>
           )}
         </Box>

package/tabs/src/components/activity/ConsultationList.jsx

@@ -13,6 +13,7 @@ export function ConsultationList({
   openConsultations,
   reviewConsultations,
   finalisedConsultations,
+  futureConsultations,
   type,
   country,
   tabsValue,
@@ -72,21 +73,19 @@ export function ConsultationList({
     renderGroupsTags = (params) => {
       return <GroupsTags handleClick={handleCellClick} groups={params.row.EionetGroups || []} />;
     },
-    renderStartDate = (params) => {
+    renderDate = (date) => {
       let dateFormat = configuration.DateFormatDashboard || 'dd-MMM-yyyy';
       return (
         <Typography className="grid-text" variant="body1" component={'span'}>
-          {format(params.row.Startdate, dateFormat)}
+          {format(date, dateFormat)}
         </Typography>
       );
     },
+    renderStartDate = (params) => {
+      return renderDate(params.row.Startdate);
+    },
     renderDeadline = (params) => {
-      let dateFormat = configuration.DateFormatDashboard || 'dd-MMM-yyyy';
-      return (
-        <Typography className="grid-text" variant="body1" component={'span'}>
-          {format(params.row.Deadline, dateFormat)}
-        </Typography>
-      );
+      return renderDate(params.row.Deadline);
     },
     renderResults = (params) => {
       if (params.row.LinkToResults) {
@@ -226,6 +225,18 @@ export function ConsultationList({
     align: 'center',
     renderCell: renderResults,
   });
+
+  let futureColumns = [];
+  futureColumns.push(titleColumn);
+  futureColumns.push(documentColumn);
+  futureColumns.push(groupsColumn);
+  futureColumns.push({
+    field: 'Startdate',
+    headerName: 'Expected launch date',
+    width: '190',
+    align: 'center',
+    renderCell: renderStartDate,
+  });
   return (
     <div className="">
       {false && <span>{configuration.toString()}</span>}
@@ -245,6 +256,25 @@ export function ConsultationList({
         </Dialog>
         <Box className="grid-container">
           {tabsValue == 0 && (
+            <ResizableGrid
+              rows={futureConsultations}
+              columns={futureColumns}
+              pageSizeOptions={[25, 50, 100]}
+              hideFooterSelectedRowCount={true}
+              initialState={{
+                pagination: { paginationModel: { pageSize: 25 } },
+                sorting: {
+                  sortModel: [
+                    {
+                      field: 'Startdate',
+                      sort: 'asc',
+                    },
+                  ],
+                },
+              }}
+            />
+          )}
+          {tabsValue == 1 && (
             <ResizableGrid
               rows={openConsultations}
               columns={openColumns}
@@ -263,7 +293,7 @@ export function ConsultationList({
               }}
             />
           )}
-          {tabsValue == 1 && (
+          {tabsValue == 2 && (
             <ResizableGrid
               rows={reviewConsultations}
               columns={reviewColumns}
@@ -281,7 +311,7 @@ export function ConsultationList({
               }}
             />
           )}
-          {tabsValue == 2 && (
+          {tabsValue == 3 && (
             <ResizableGrid
               rows={finalisedConsultations}
               columns={finalisedColumns}

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

@@ -54,7 +54,9 @@ export function AtAGlance({
           consultationsCount: allConsultations.length,
           surveysCount: allSurveys.length,
           attendedMeetingsCount: allMeetings.filter((meeting) => {
-            return meeting.Participants.some((participant) => participant.Country == country);
+            return meeting.Participants.some(
+              (participant) => participant.Country == country && participant.Participated,
+            );
           }).length,
           responseConsultationsCount: allConsultations.filter((c) => {
             return c.Respondants.includes(country);