1. added resetschema.sql function to reset testing schema

2. formatting changes and consolidating some additional data
3. datagrid column arrays are in process of being moved into separate .tsx file so that Typography formatting can be applied to headers when needed (if column names are too large, etc)
4. Updated personnel fixeddata and cmprevalidation API endpoints to correctly work with updated PersonnelRDS type/table
5. Playwright initialization added and setup. No tests currently added, but future proofing for use.
6. RolloverModal added to handle rollover process when creating a new census. Allows users to selectively choose personnel OR quadrats to rollover from one OR more past censuses (where data is present).
7. Instead of discarding testing component file, was instead converted into the RolloverStemsModal. Its function has not been enabled but has been integrated. Allows users to additionally rollover stems data if needed ONLY if quadrats data is already being rolled over. Still needs to be fully tested and repaired (assuming bugs are present)
8. area selection options macro added now that dedicated selection array for area measurements added SQL-side.

frontend/.gitignore

@@ -56,4 +56,8 @@ yarn-error.log*
 /blob-report/
 /playwright/.cache/
 
-*storybook.log
+*storybook.log
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

frontend/README.md

@@ -1,5 +1,6 @@
 # The ForestGEO Data Entry App
 
+liquibase generate-changelog --exclude-objects="\b\w*view\w*\b"
 A cloud-native web application built to accelerate the pace of research for the Smithsonian
 Institution's Forest Global Earth Observatory (ForestGEO). ForestGEO is a global forest research
 network, unparalleled in size and scope, comprised of ecologists and research sites dedicated to

frontend/__tests__/rollovermodal.test.tsx

@@ -0,0 +1,166 @@
+import RolloverModal from '@/components/client/rollovermodal';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+// Mock the fetch API
+global.fetch = vi.fn();
+
+// Mock contexts
+vi.mock('@/app/contexts/userselectionprovider', () => ({
+  useSiteContext: () => ({ schemaName: 'testSchema' }),
+  usePlotContext: () => ({ plotID: 1 }),
+}));
+vi.mock('@/app/contexts/listselectionprovider', () => ({
+  useOrgCensusListContext: () => [
+    { plotCensusNumber: 1, dateRanges: [{ censusID: 1 }] },
+    { plotCensusNumber: 2, dateRanges: [{ censusID: 2 }] },
+  ],
+}));
+
+// Mock Data
+const previousPersonnel = [
+  { personnelID: 1, name: 'Person 1' },
+  { personnelID: 2, name: 'Person 2' },
+];
+const previousQuadrats = [
+  { quadratID: 1, name: 'Quadrat 1' },
+  { quadratID: 2, name: 'Quadrat 2' },
+];
+
+describe('RolloverModal Component', () => {
+  const setup = (props = {}) => render(
+    <RolloverModal
+      open={true}
+      onClose={vi.fn()}
+      onConfirm={vi.fn()}
+      {...props}
+    />
+  );
+
+  beforeEach(() => {
+    (global.fetch as jest.Mock).mockClear();
+
+    (global.fetch as jest.Mock).mockImplementation((url: string) => {
+      if (url.includes('/fetchall/personnel/')) {
+        return Promise.resolve({
+          status: 200,
+          json: () => Promise.resolve(previousPersonnel),
+        });
+      }
+      if (url.includes('/fetchall/quadrats/')) {
+        return Promise.resolve({
+          status: 200,
+          json: () => Promise.resolve(previousQuadrats),
+        });
+      }
+      if (url.includes('/cmprevalidation/personnel/')) {
+        return Promise.resolve({
+          status: 200,
+        });
+      }
+      if (url.includes('/cmprevalidation/quadrats/')) {
+        return Promise.resolve({
+          status: 200,
+        });
+      }
+      return Promise.reject(new Error('Unknown API call'));
+    });
+  });
+
+  it('should open modal and display title', async () => {
+    setup();
+    await waitFor(() => {
+      expect(screen.getByText(/Rollover Census Data/i)).toBeInTheDocument();
+    });
+  });
+
+  it('should show error if no checkbox is selected and confirm is pressed', async () => {
+    setup();
+    fireEvent.click(screen.getByText(/Confirm/i));
+    await waitFor(() => {
+      expect(screen.getByText(/You must select at least one option to roll over or confirm no rollover/i)).toBeInTheDocument();
+    });
+  });
+
+  it('should allow selecting and confirming personnel rollover', async () => {
+    setup();
+    await waitFor(() => {
+      fireEvent.click(screen.getByLabelText(/Roll over personnel data/i));
+    });
+    fireEvent.click(screen.getByText(/Confirm/i));
+    await waitFor(() => {
+      expect(screen.queryByText(/You must select at least one option to roll over or confirm no rollover/i)).toBeNull();
+    });
+  });
+
+  it('should allow selecting and confirming quadrats rollover', async () => {
+    setup();
+    await waitFor(() => {
+      fireEvent.click(screen.getByLabelText(/Roll over quadrats data/i));
+    });
+    fireEvent.click(screen.getByText(/Confirm/i));
+    await waitFor(() => {
+      expect(screen.queryByText(/You must select at least one option to roll over or confirm no rollover/i)).toBeNull();
+    });
+  });
+
+  it('should allow selecting and confirming both personnel and quadrats rollover', async () => {
+    setup();
+    await waitFor(() => {
+      fireEvent.click(screen.getByLabelText(/Roll over personnel data/i));
+      fireEvent.click(screen.getByLabelText(/Roll over quadrats data/i));
+    });
+    fireEvent.click(screen.getByText(/Confirm/i));
+    await waitFor(() => {
+      expect(screen.queryByText(/You must select at least one option to roll over or confirm no rollover/i)).toBeNull();
+    });
+  });
+
+  it('should allow customizing personnel selection', async () => {
+    setup();
+    await waitFor(() => {
+      fireEvent.click(screen.getByLabelText(/Roll over personnel data/i));
+      fireEvent.click(screen.getByText(/Customize personnel selection/i));
+    });
+    expect(screen.getByText(/Person 1/i)).toBeInTheDocument();
+    expect(screen.getByText(/Person 2/i)).toBeInTheDocument();
+  });
+
+  it('should allow customizing quadrats selection', async () => {
+    setup();
+    await waitFor(() => {
+      fireEvent.click(screen.getByLabelText(/Roll over quadrats data/i));
+      fireEvent.click(screen.getByText(/Customize quadrats selection/i));
+    });
+    expect(screen.getByText(/Quadrat 1/i)).toBeInTheDocument();
+    expect(screen.getByText(/Quadrat 2/i)).toBeInTheDocument();
+  });
+
+  it('should confirm no rollover for personnel', async () => {
+    setup();
+    fireEvent.mouseDown(screen.getByLabelText(/Do not roll over any Personnel data/i));
+    fireEvent.click(screen.getByText(/Confirm No Rollover/i));
+    fireEvent.click(screen.getByText(/Confirm/i));
+    await waitFor(() => {
+      expect(screen.queryByText(/You must select at least one option to roll over or confirm no rollover/i)).toBeNull();
+    });
+  });
+
+  it('should confirm no rollover for quadrats', async () => {
+    setup();
+    fireEvent.mouseDown(screen.getByLabelText(/Do not roll over any Quadrats data/i));
+    fireEvent.click(screen.getByText(/Confirm No Rollover/i));
+    fireEvent.click(screen.getByText(/Confirm/i));
+    await waitFor(() => {
+      expect(screen.queryByText(/You must select at least one option to roll over or confirm no rollover/i)).toBeNull();
+    });
+  });
+
+  it('should handle error during fetch data', async () => {
+    (global.fetch as jest.Mock).mockImplementationOnce(() => Promise.reject(new Error('Failed to fetch')));
+    setup();
+    await waitFor(() => {
+      expect(screen.getByText(/Failed to fetch previous data. Please try again/i)).toBeInTheDocument();
+    });
+  });
+});

frontend/app/(hub)/measurementshub/summary/page.tsx

@@ -2,7 +2,7 @@
 import React, { useEffect, useState } from "react";
 import { GridRowModes, GridRowModesModel, GridRowsProp } from "@mui/x-data-grid";
 import { Alert, AlertProps, LinearProgress, Tooltip, TooltipProps, styled, tooltipClasses } from "@mui/material";
-import { gridColumnsArrayMSVRDS, initialMeasurementsSummaryViewRDSRow } from '@/config/sqlrdsdefinitions/views/measurementssummaryviewrds';
+import { initialMeasurementsSummaryViewRDSRow } from '@/config/sqlrdsdefinitions/views/measurementssummaryviewrds';
 import { Box, ListItemContent, ListItem, List, Modal, ModalDialog, Typography, Button, DialogTitle, DialogContent, DialogActions, Snackbar, Stack, } from "@mui/joy";
 import Select, { SelectOption } from "@mui/joy/Select";
 import { useSession } from "next-auth/react";
@@ -15,7 +15,7 @@ import Option from '@mui/joy/Option';
 import MeasurementSummaryGrid from "@/components/datagrids/msvdatagrid";
 import { useDataValidityContext } from "@/app/contexts/datavalidityprovider";
 import { UnifiedValidityFlags } from "@/config/macros";
-
+import { msvGridColumns } from "@/components/client/datagridcolumns";
 const LargeTooltip = styled(({ className, ...props }: TooltipProps) => (
   <Tooltip {...props} classes={{ popper: className }} />
 ))(({ theme }) => ({
@@ -321,7 +321,7 @@ export default function SummaryPage() {
         formType={"measurements"}
       />
       <MeasurementSummaryGrid
-        gridColumns={gridColumnsArrayMSVRDS[0]}
+        gridColumns={msvGridColumns}
         rows={rows}
         setRows={setRows}
         rowCount={rowCount}

frontend/app/api/cmprevalidation/[dataType]/[[...slugs]]/route.ts

@@ -1,11 +1,11 @@
-import {getConn, runQuery} from "@/components/processors/processormacros";
-import {PoolConnection} from "mysql2/promise";
-import {NextRequest, NextResponse} from "next/server";
-import {HTTPResponses} from "@/config/macros";
+import { getConn, runQuery } from "@/components/processors/processormacros";
+import { PoolConnection } from "mysql2/promise";
+import { NextRequest, NextResponse } from "next/server";
+import { HTTPResponses } from "@/config/macros";
 
 // datatype: table name
 // expecting 1) schema 2) plotID 3) plotCensusNumber
-export async function GET(_request: NextRequest, {params}: { params: { dataType: string, slugs?: string[] } }) {
+export async function GET(_request: NextRequest, { params }: { params: { dataType: string, slugs?: string[] } }) {
   if (!params.slugs || !params.dataType) throw new Error("missing slugs");
   const [schema, plotID, plotCensusNumber] = params.slugs;
   if ((!schema || schema === 'undefined') || (!plotID || plotID === 'undefined') || (!plotCensusNumber || plotCensusNumber === 'undefined') || (params.slugs.length > 3 || params.slugs.length < 3)) throw new Error("incorrect slugs provided");
@@ -16,18 +16,23 @@ export async function GET(_request: NextRequest, {params}: { params: { dataType:
 
     switch (params.dataType) {
       case 'attributes':
-      case 'personnel':
       case 'species':
         const baseQuery = `SELECT 1 FROM ${schema}.${params.dataType} LIMIT 1`; // Check if the table has any row
         const baseResults = await runQuery(connection, baseQuery);
         if (connection) connection.release();
-        if (baseResults.length === 0) return new NextResponse(null, {status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE});
+        if (baseResults.length === 0) return new NextResponse(null, { status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE });
+        break;
+      case 'personnel':
+        const pQuery = `SELECT 1 FROM ${schema}.${params.dataType} WHERE CensusID IN (SELECT CensusID from ${schema}.census WHERE PlotCensusNumber = ${plotCensusNumber})`; // Check if the table has any row
+        const pResults = await runQuery(connection, pQuery);
+        if (connection) connection.release();
+        if (pResults.length === 0) return new NextResponse(null, { status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE });
         break;
       case 'quadrats':
         const query = `SELECT 1 FROM ${schema}.${params.dataType} WHERE PlotID = ${plotID} AND CensusID IN (SELECT CensusID from ${schema}.census WHERE PlotCensusNumber = ${plotCensusNumber})`; // Check if the table has any row
         const results = await runQuery(connection, query);
         if (connection) connection.release();
-        if (results.length === 0) return new NextResponse(null, {status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE});
+        if (results.length === 0) return new NextResponse(null, { status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE });
         break;
       case 'subquadrats':
         const subquadratsQuery = `SELECT 1
@@ -37,7 +42,7 @@ export async function GET(_request: NextRequest, {params}: { params: { dataType:
                                   AND q.CensusID IN (SELECT CensusID from ${schema}.census WHERE PlotCensusNumber = ${plotCensusNumber}) LIMIT 1`;
         const subquadratsResults = await runQuery(connection, subquadratsQuery);
         if (connection) connection.release();
-        if (subquadratsResults.length === 0) return new NextResponse(null, {status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE});
+        if (subquadratsResults.length === 0) return new NextResponse(null, { status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE });
         break;
       case 'quadratpersonnel':
         // Validation for quadrats table
@@ -47,24 +52,24 @@ export async function GET(_request: NextRequest, {params}: { params: { dataType:
                                AND CensusID IN (SELECT CensusID from ${schema}.census WHERE PlotCensusNumber = ${plotCensusNumber}) LIMIT 1`;
         const quadratsResults = await runQuery(connection, quadratsQuery);
         if (connection) connection.release();
-        if (quadratsResults.length === 0) return new NextResponse(null, {status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE});
+        if (quadratsResults.length === 0) return new NextResponse(null, { status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE });
 
         // Validation for personnel table
         const personnelQuery = `SELECT 1 FROM ${schema}.personnel LIMIT 1`;
         const personnelResults = await runQuery(connection, personnelQuery);
         if (connection) connection.release();
-        if (personnelResults.length === 0) return new NextResponse(null, {status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE});
+        if (personnelResults.length === 0) return new NextResponse(null, { status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE });
 
         break;
       default:
-        return new NextResponse(null, {status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE});
+        return new NextResponse(null, { status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE });
     }
     // If all conditions are satisfied
     connection.release();
-    return new NextResponse(null, {status: 200});
+    return new NextResponse(null, { status: HTTPResponses.OK });
   } catch (e: any) {
     console.error(e);
-    return new NextResponse(null, {status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE});
+    return new NextResponse(null, { status: HTTPResponses.PRECONDITION_VALIDATION_FAILURE });
   } finally {
     if (connection) connection.release();
   }

frontend/app/api/details/cmid/route.ts

@@ -1,6 +1,7 @@
 import {NextRequest, NextResponse} from "next/server";
 import {getConn, runQuery} from "@/components/processors/processormacros";
 import {PoolConnection} from "mysql2/promise";
+import { HTTPResponses } from "@/config/macros";
 
 export async function GET(request: NextRequest) {
   const cmID = parseInt(request.nextUrl.searchParams.get('cmid')!);
@@ -49,7 +50,7 @@ export async function GET(request: NextRequest) {
           personnelName: row.FirstName + ' ' + row.LastName,
           speciesName: row.SpeciesName
         }))
-      ), {status: 200});
+      ), {status: HTTPResponses.OK});
   } catch (error: any) {
     throw new Error('SQL query failed: ' + error.message);
   } finally {

frontend/app/api/fetchall/[[...slugs]]/route.ts

@@ -22,13 +22,9 @@ const buildQuery = (schema: string, fetchType: string, plotID?: string, plotCens
   let query = `SELECT * FROM ${schema}.${fetchType}`;
   const conditions = [];
 
-  if (plotID && plotID !== 'undefined' && !isNaN(parseInt(plotID))) conditions.push(`PlotID = ${plotID}`);
+  if (plotID && plotID !== 'undefined' && !isNaN(parseInt(plotID)) && fetchType !== 'personnel') conditions.push(`PlotID = ${plotID}`);
   if (plotCensusNumber && plotCensusNumber !== 'undefined' && !isNaN(parseInt(plotCensusNumber))) {
-    conditions.push(`CensusID IN (
-              SELECT c.CensusID
-              FROM ${schema}.census c
-              WHERE c.PlotID = PlotID
-                AND c.PlotCensusNumber = ${plotCensusNumber})`);
+    conditions.push(`CensusID IN ( SELECT c.CensusID FROM ${schema}.census c WHERE c.PlotID = ${plotID} AND c.PlotCensusNumber = ${plotCensusNumber})`);
   }
   if (quadratID && quadratID !== 'undefined' && !isNaN(parseInt(quadratID))) conditions.push(`QuadratID = ${quadratID}`);
 
@@ -38,20 +34,20 @@ const buildQuery = (schema: string, fetchType: string, plotID?: string, plotCens
   return query;
 };
 
-
+// ordering: PCQ
 export async function GET(request: NextRequest, {params}: { params: { slugs?: string[] } }) {
   const schema = request.nextUrl.searchParams.get('schema');
   if (!schema || schema === 'undefined') {
     throw new Error("Schema selection was not provided to API endpoint");
   }
 
-  const [fetchType, plotID, censusID, quadratID] = params.slugs ?? [];
-  if (!fetchType) {
+  const [dataType, plotID, censusID, quadratID] = params.slugs ?? [];
+  if (!dataType) {
     throw new Error("fetchType was not correctly provided");
   }
 
-  console.log('fetchall --> slugs provided: fetchType: ', fetchType, 'plotID: ', plotID, 'censusID: ', censusID, 'quadratID: ', quadratID);
-  const query = buildQuery(schema, fetchType, plotID, censusID, quadratID);
+  console.log('fetchall --> slugs provided: fetchType: ', dataType, 'plotID: ', plotID, 'censusID: ', censusID, 'quadratID: ', quadratID);
+  const query = buildQuery(schema, dataType, plotID, censusID, quadratID);
   let conn: PoolConnection | null = null;
 
   try {
@@ -61,7 +57,7 @@ export async function GET(request: NextRequest, {params}: { params: { slugs?: st
       return new NextResponse(null, {status: 500});
     }
 
-    const mapper: IDataMapper<any, any> = MapperFactory.getMapper<any, any>(fetchType);
+    const mapper: IDataMapper<any, any> = MapperFactory.getMapper<any, any>(dataType);
     const rows = mapper.mapData(results);
     return new NextResponse(JSON.stringify(rows), {status: HTTPResponses.OK});
   } catch (error) {

frontend/app/api/filehandlers/deletefile/route.ts

@@ -1,5 +1,6 @@
 import {NextRequest, NextResponse} from "next/server";
 import {getContainerClient} from "@/config/macros/azurestorage";
+import { HTTPResponses } from "@/config/macros";
 
 export async function DELETE(request: NextRequest) {
   const containerName = request.nextUrl.searchParams.get('container');
@@ -15,7 +16,7 @@ export async function DELETE(request: NextRequest) {
     const blobClient = containerClient.getBlobClient(filename);
 
     await blobClient.delete();
-    return new NextResponse('File deleted successfully', {status: 200});
+    return new NextResponse('File deleted successfully', {status: HTTPResponses.OK});
   } catch (error) {
     console.error('Delete file error:', error);
     return new NextResponse((error as Error).message, {status: 500});

frontend/app/api/filehandlers/downloadallfiles/route.ts

@@ -1,6 +1,7 @@
 // DOWNLOAD ALL FILES ROUTE HANDLER
 import {NextRequest, NextResponse} from "next/server";
 import {getContainerClient} from "@/config/macros/azurestorage";
+import { HTTPResponses } from "@/config/macros";
 
 
 export async function GET(request: NextRequest) {
@@ -41,7 +42,7 @@ export async function GET(request: NextRequest) {
         responseMessage: "List of files",
         blobData: blobData,
       }),
-      {status: 200}
+      {status: HTTPResponses.OK}
     );
   } catch (error: any) {
     console.error('error in blob listing: ', error);