eionet2-dashboard 1.7.0 → 1.8.0

package/CHANGELOG.md

@@ -4,7 +4,30 @@ 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.8.0](https://github.com/eea/eionet2-dashboard/compare/1.7.1...1.8.0) - 8 December 2023
+
+#### :rocket: New Features
+
+- feat:  country desk officers( #261011) [Mihai Nicolae - [`fcc8bc2`](https://github.com/eea/eionet2-dashboard/commit/fcc8bc217ef5327ce494fa961599e3f65adfc758)]
+
+#### :house: Internal changes
+
+- chore: version update [Mihai Nicolae - [`add4060`](https://github.com/eea/eionet2-dashboard/commit/add40609966c03810fc5cfdaf15b0ec2ce986b56)]
+- chore: readme updates [Mihai Nicolae - [`07dc15c`](https://github.com/eea/eionet2-dashboard/commit/07dc15c18f018c8d077083ba3d9cd22686ecc940)]
+
+### [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/README.md

@@ -1,26 +1,27 @@
+
 # eionet2-dashboard
 
 [![GitHub release](https://img.shields.io/github/v/release/eea/eionet2-dashboard)](https://github.com/eea/eionet2-dashboard/releases)
 
-Through this application, the users have access to information regarding:
+Through this MS Teams application, Eionet users have access to information regarding:
 - General Eionet activity (events, consultations, surveys, reports)
 - Specific country information (management board, NFPs, ETCs, Eionet groups etc.) - Eionet in my country
 - User account self management
 - Publications
-- Reporting
+- Reporting obligations
 
 The application is available to all Eionet 2.0 users.
 The data displayed is retrieved from the EEA Azure tenant and from an internal EEA SharePoint Online instance.
 
 ### General Eionet activity
 
-This functionality is available for all users. In this tab, the users can find information about (and register):
+This functionality is available for all users. In this tab, the users can find information about (and register to):
 - Events (that can be rated).
 - Consultations.
-- The (Admin or NFP) user enters the user attributes (contact data, roles, organizations etc.).
 - Inquiries.
 - Reports.
-The displayed information is a selected subtype of the full list, ordered by (expiration/closing) date. The full list can be accessed from the tab through a link, which will point the user to the corresponding repository folders in SharePoint.
+
+The displayed information is a selected sub-type of the full information list, ordered by (expiration/closing) date. The full list can be accessed from the tab through a link, which will point the user to the corresponding repository folder(s) stored in SharePoint.
 
 ### Eionet in my country
 
@@ -29,30 +30,26 @@ In its country the user have access to  information regarding:
 - The management board
 - The number of groups, organisations
 - Information about NFPs, ETCs etc.
-- Specific country information about events, consultations, surveys, reports
+- Specific country information about events, consultations, surveys, reports.
 
-### Self service
+### Account self-service
 
 This functionality offers users the option to manage/update their data themselves:
-- View current user account data (with the exception of the attributes that can be updated only by an user with a higher authority - Admin or NFP) 
-- Update current user account data (with the exception of the attributes that can be updated only by an user with a higher authority - Admin or NFP) 
+- View current user account data (with the exception of the attributes that can be updated only by an user with a higher authority - Admin or NFP).
+- Update current user account data (with the exception of the attributes that can be updated only by an user with a higher authority - Admin or NFP).
 
 ### Publications
 
 In this tab the users have access to information about Eionet publications.
 
-### Reporting
+### Reporting obligations
 
-_Under construction_
-
-<br/>
+In this tab the users have access to information about Eionet reporting obligations.
 
 ## Getting started
 
-The application is available as a "tab" application in the MS Teams Eionet 2.0 teams.
-When opening this tab, the users will see the Dashboard application, with two sets of tabs, corresponding to the functionalities presented above.
-
-<br/>
+The application is available as a "tab" application type in MS Teams Eionet 2.0 teams.
+When opening this tab, the users will see the Dashboard application, with two sets of tabs, corresponding to the application functionalities.
 
 ## Release
 

package/api/getGraphData/index.js

@@ -100,7 +100,7 @@ module.exports = async function (context, req, teamsfxContext) {
     const graphClient = teamsfx.createMicrosoftGraphClient(credential);
     graphClient.config.defaultVersion = 'beta';
     let path = "";
-    let result = undefined;
+    let result;
 
     let headers = {
       'Content-Type': 'application/json'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eionet2-dashboard",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "description": "",
     "author": "",
     "scripts": {
@@ -15,7 +15,7 @@
         "@microsoft/teamsfx-cli": "0.*",
         "jest": "^28.1.0"
     },
-    "license": "MIT",
+    "license": "SEE LICENSE IN LICENSE.md",
     "dependencies": {
         "@emotion/react": "^11.8.1",
         "@emotion/styled": "^11.8.1",

package/tabs/package-lock.json

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

package/tabs/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@eeacms/eionet2-dashboard",
-  "version": "1.7.0",
-  "license": "MIT",
-  "description": "Teams app for managing Eionet users.",
+  "version": "1.8.0",
+  "license": "SEE LICENSE IN LICENSE.md",
+  "description": "MS Teams app for accessing Eionet activity and managing account information.",
   "dependencies": {
     "@emotion/react": "^11.8.2",
     "@emotion/styled": "^11.8.1",

package/tabs/public/auth-start.html

@@ -91,7 +91,7 @@
       // y could be 1000, 1001, 1010, 1011 since most significant two bits needs to be 10
       // y values are 8, 9, A, B
       var cryptoObj = window.crypto || window.msCrypto; // for IE 11
-      if (cryptoObj && cryptoObj.getRandomValues) {
+      if (cryptoObj?.getRandomValues) {
         var buffer = new Uint8Array(16);
         cryptoObj.getRandomValues(buffer);
         //buffer[6] and buffer[7] represents the time_hi_and_version field. We will set the four most significant bits (4 through 7) of buffer[6] to represent decimal number 4 (UUID version number).
@@ -169,7 +169,7 @@
 
     // Return the base64-urlencoded sha256 hash for the PKCE challenge
     async function pkceChallengeFromVerifier(v) {
-      hashed = await sha256(v);
+      const hashed = await sha256(v);
       return base64urlencode(hashed);
     }
   </script>

package/tabs/src/components/CustomColumnResizeIcon.jsx

@@ -30,8 +30,8 @@ export default function CustomColumnResizeIcon({ onWidthChanged, id }) {
 
       const newWidth = parseInt(initialSize) + parseInt(e.clientX - initialPos);
       if (newWidth > 0) {
-        for (let i = 0; i < cells.length; i++) {
-          const style = cells[i].style;
+        for (let cell of cells) {
+          const style = cell.style;
           style.width = style.minWidth = style.maxWidth = `${newWidth}px`;
         }
         columnHeaderStyle.width =

package/tabs/src/components/Tab.jsx

@@ -158,7 +158,7 @@ export default function Tab() {
 
       me.isLoaded = true;
       setSelfInfo(me);
-      setIsEionetUser(me && me.isEionetUser);
+      setIsEionetUser(me?.isEionetUser);
       setLoading(false);
       !!configuration.DashboardVersion &&
         setVersionDialogOpen(configuration.DashboardVersion != version);
@@ -179,7 +179,7 @@ export default function Tab() {
       return userInfo.isLoaded && menuId == 2;
     }, [userInfo, menuId]),
     selfServiceVisible = useCallback(() => {
-      return selfInfo && selfInfo.isLoaded && menuId == 4 && isEionetUser;
+      return selfInfo?.isLoaded && menuId == 4 && isEionetUser;
     }, [selfInfo, menuId, isEionetUser]);
 
   const setData4Menu = useCallback(
@@ -252,9 +252,7 @@ export default function Tab() {
       uk: 'gb',
     },
     preProcessCountryCode = (code) => {
-      return Object.prototype.hasOwnProperty.call(nonIsoCountryCodes, code)
-        ? nonIsoCountryCodes[code]
-        : code;
+      return Object.hasOwn(nonIsoCountryCodes, code) ? nonIsoCountryCodes[code] : code;
     };
 
   return (

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'}
+          primary={'PUBLICATIONS & OUTREACH'}
           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 />
@@ -244,36 +271,43 @@ export function Activity({
       let fromDate = new Date();
       fromDate.setMonth(fromDate.getMonth() - monthsBehind);
 
-      getMeetings(fromDate, country, userInfo).then((loadedMeetings) => {
-        if (loadedMeetings) {
-          setCurrentMeetings(
-            loadedMeetings.filter((c) => {
-              return c.IsCurrent;
-            }),
-          );
-          setUpcomingMeetings(
-            loadedMeetings.filter((c) => {
-              return c.IsUpcoming;
-            }),
-          );
-          setPastMeetings(
-            loadedMeetings.filter((c) => {
-              return c.IsPast;
-            }),
-          );
-        }
+      getMeetings(fromDate, country, userInfo)
+        .then((loadedMeetings) => {
+          if (loadedMeetings) {
+            setCurrentMeetings(
+              loadedMeetings.filter((c) => {
+                return c.IsCurrent;
+              }),
+            );
+            setUpcomingMeetings(
+              loadedMeetings.filter((c) => {
+                return c.IsUpcoming;
+              }),
+            );
+            setPastMeetings(
+              loadedMeetings.filter((c) => {
+                return c.IsPast;
+              }),
+            );
+          }
 
-        setData4Menu(loadedMeetings);
-        setloading(false);
-      });
+          setData4Menu(loadedMeetings);
+          setloading(false);
+        })
+        .catch((e) => {
+          setloading(false);
+          console.log(e.message);
+        });
 
       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 +315,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 +324,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 +341,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 +351,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 +360,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,47 +421,49 @@ 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>
-        {false && <span>{userInfo.toString()}</span>}
       </Box>
     </div>
   );