Update per review: Revert page calc, rename and fix Link, rm uuid,

Author: ijoel

client/src/components/Link/Link.jsx …omponents/ProjectWizard/NumberedLink.jsxclient/src/components/Link/Link.jsx renamed to client/src/components/ProjectWizard/NumberedLink.jsx client/src/components/Link/Link.jsx renamed to client/src/components/ProjectWizard/NumberedLink.jsx

@@ -29,7 +29,7 @@ const useStyles = createUseStyles(theme => ({
   }
 }));
 
-const Link = ({
+const NumberedLink = ({
   children,
   className,
   isDisplayed = true,
@@ -48,11 +48,13 @@ const Link = ({
     <a
       className={clsx(classes.link, isActive && classes.activeLink, className)}
       onClick={e => {
+        e.preventDefault();
         if (disabled || isActive) {
-          e.preventDefault();
           return;
         }
-        if (onClick) onClick(e);
+        if (onClick) {
+          onClick(e);
+        }
       }}
       href={disabled ? undefined : href}
       aria-label={ariaLabel}
@@ -65,7 +67,7 @@ const Link = ({
   );
 };
 
-Link.propTypes = {
+NumberedLink.propTypes = {
   onClick: PropTypes.func,
   children: PropTypes.any,
   isDisplayed: PropTypes.bool,
@@ -77,4 +79,4 @@ Link.propTypes = {
   isActive: PropTypes.bool
 };
 
-export default Link;
+export default NumberedLink;

client/src/components/ProjectWizard/TdmCalculationWizard.jsx

@@ -460,17 +460,11 @@ const TdmCalculationWizard = props => {
     if (Number(pageNo) > Number(page)) {
       if (handleValidate()) {
         const nextPage = Number(page) + 1;
-        // navigate(`/calculation/${nextPage}${projectIdParam}`);
-        console.log(`old calc: /calculation/${nextPage}${projectIdParam}`);
-        console.log(`new calc: /calculation/${pageNo}${projectIdParam}`);
-        navigate(`/calculation/${pageNo}${projectIdParam}`);
+        navigate(`/calculation/${nextPage}${projectIdParam}`);
       }
     } else {
       const prevPage = Number(page) - 1;
-      // navigate(`/calculation/${prevPage}${projectIdParam}`);
-      console.log(`old calc: /calculation/${prevPage}${projectIdParam}`);
-      console.log(`new calc: /calculation/${pageNo}${projectIdParam}`);
-      navigate(`/calculation/${pageNo}${projectIdParam}`);
+      navigate(`/calculation/${prevPage}${projectIdParam}`);
     }
   };
 

client/src/components/ProjectWizard/WizardFooter.jsx

@@ -5,7 +5,7 @@ import { createUseStyles } from "react-jss";
 import Button from "../Button/Button";
 import { useReactToPrint } from "react-to-print";
 import { PdfPrint } from "../PdfPrint/PdfPrint";
-import Link from "../Link/Link";
+import NumberedLink from "./NumberedLink";
 import { formatDatetime } from "../../helpers/util";
 import UserContext from "../../contexts/UserContext";
 import Popup from "reactjs-popup";
@@ -114,8 +114,6 @@ const WizardFooter = ({
     pageStyle: ".printContainer {overflow: hidden;}"
   });
 
-  const isDraft = !project.dateSnapshotted;
-
   // If the project exists and has been saved, AND a user is currently logged in
   const showNumberedLinks = !!project?.id && !!loggedInUserId;
 
@@ -126,46 +124,45 @@ const WizardFooter = ({
           <>
             <div id="nav-container" className="space-between">
               <div className={classes.navButtonGroup}>
-                <NavButton
-                  id="leftNavArrow"
-                  navDirection="previous"
-                  color="colorPrimary"
-                  isVisible={
-                    page !== 1 &&
-                    isDraft &&
-                    (!shareView || isAdmin)
-                  }
-                  isDisabled={
-                    (shareView && !isAdmin) ||
-                    !isDraft ||
-                    Number(page) === 1
-                  }
-                  onClick={() => {
-                    onPageChange(Number(page) - 1);
-                  }}
-                />
+              <NavButton
+                id="leftNavArrow"
+                navDirection="previous"
+                color="colorPrimary"
+                isVisible={
+                  page !== 1 &&
+                  !project.dateSnapshotted &&
+                  (!shareView || isAdmin)
+                }
+                isDisabled={
+                  (shareView && !isAdmin) ||
+                  !!project.dateSnapshotted ||
+                  Number(page) === 1
+                }
+                onClick={() => {
+                  onPageChange(Number(page) - 1);
+                }}
+              />
 
-                {showNumberedLinks &&
-                  Array.from({ length: 5 }, (_, i) => i + 1).map(p => (
-                    <Link
-                      key={`nav-page-${p}`}
-                      id={`nav-page-${p}`}
-                      className={classes.numberedNavButton}
-                      onClick={() => onPageChange(p)}
-                      isActive={p === Number(page)}
-                      disabled={
-                        (shareView && !isAdmin) ||
-                        (p === 4 && projectLevel === 0) ||
-                        (isDraft &&
-                          p > Number(page) &&
-                          setDisabledForNextNavButton())
-                      }
-                      ariaLabel={`go to page ${p}`}
-                    >
-                      {p}
-                    </Link>
-                  ))}
-              </div>
+              {showNumberedLinks &&
+               Array.from({ length: 5 }, (_, i) => i + 1).map(p => (
+                 <NumberedLink
+                   key={`nav-page-${p}`}
+                   id={`nav-page-${p}`}
+                   className={classes.numberedNavButton}
+                   onClick={() => onPageChange(p)}
+                   isActive={p === Number(page)}
+                   disabled={
+                     (shareView && !isAdmin) ||
+                       (p === 4 && projectLevel === 0) ||
+                       (!project.dateSnapshotted &&
+                        p > Number(page) &&
+                        setDisabledForNextNavButton())
+                   }
+                   ariaLabel={`go to page ${p}`}
+                 >
+                   {p}
+                 </NumberedLink>
+               ))}
 
               {(!shareView || isAdmin) && !project?.id ? (
                 <div className={classes.pageNumberCounter}>
@@ -184,6 +181,7 @@ const WizardFooter = ({
                 }}
               />
             </div>
+            </div>
             {isFinalPage && (
               <div>
                 <Popup

client/src/components/ProjectWizard/WizardSidebar/SidebarPoints.jsx

@@ -96,7 +96,7 @@ const SidebarPoints = props => {
   return (
     <div className={clsx(classes.metricsPanelItem, opacityTest)}>
       <div id={rule.code} className={earnedPointsColor || targetPointsColor}>
-        {Number.isNaN(Number(rule.value)) ? 0 : rule.value}
+        {rule.value}
       </div>
       <h3 className={classes.ruleName}>
         {rule.name}

client/src/components/ProjectWizard/WizardSidebar/SidebarProjectLevel.jsx

@@ -59,7 +59,7 @@ const SidebarProjectLevel = ({ level, rules }) => {
       )}
     >
       <p id="PROJECT_LEVEL" className={classes.projectLevelValue}>
-        {Number.isNaN(Number(level)) ? 0 : level}
+        {level}
       </p>
       <h3 className={classes.projectLevelHeader}>
         PROJECT LEVEL

server/package-lock.json

@@ -41,8 +41,7 @@
     "mssql": "^11.0.1",
     "node-flywaydb": "^3.0.7",
     "nodemailer": "^8.0.5",
-    "path": "^0.12.7",
-    "uuid": "^11.1.0"
+    "path": "^0.12.7"
   },
   "devDependencies": {
     "@babel/core": "^7.28.5",