Merging Hotfix/Pilot Demo Feedback Changes

frontend/app/(hub)/dashboard/page.tsx

@@ -250,7 +250,7 @@ export default function DashboardPage() {
                                     Object.entries(changelog.oldRowState).map(([key, value]) => (
                                       <Stack direction={'row'} key={key}>
                                         <Typography level={'body-md'}>
-                                          <strong>{key}</strong>: {value ?? 'NULL'}
+                                          <strong>{JSON.stringify(key)}</strong>: {JSON.stringify(value) ?? 'NULL'}
                                         </Typography>
                                       </Stack>
                                     ))
@@ -274,7 +274,7 @@ export default function DashboardPage() {
                                     Object.entries(changelog.newRowState).map(([key, value]) => (
                                       <Stack direction={'row'} key={key}>
                                         <Typography level={'body-md'}>
-                                          <strong>{key}</strong>: {value ?? 'NULL'}
+                                          <strong>{JSON.stringify(key)}</strong>: {JSON.stringify(value) ?? 'NULL'}
                                         </Typography>
                                       </Stack>
                                     ))

frontend/app/(hub)/fixeddatainput/alltaxonomies/page.tsx

@@ -1,5 +1,12 @@
+import RenderGridExplanations from '@/components/client/rendergridexplanations';
 import IsolatedAllTaxonomiesViewDataGrid from '@/components/datagrids/applications/isolated/isolatedalltaxonomiesdatagrid';
+import { DatagridType } from '@/config/macros/formdetails';
 
 export default function AllTaxonomiesPage() {
-  return <IsolatedAllTaxonomiesViewDataGrid />;
+  return (
+    <>
+      <RenderGridExplanations datagridType={DatagridType.alltaxonomiesview} />
+      <IsolatedAllTaxonomiesViewDataGrid />
+    </>
+  );
 }

frontend/app/(hub)/fixeddatainput/attributes/page.tsx

@@ -1,5 +1,12 @@
+import RenderGridExplanations from '@/components/client/rendergridexplanations';
 import IsolatedAttributesDataGrid from '@/components/datagrids/applications/isolated/isolatedattributesdatagrid';
+import { DatagridType } from '@/config/macros/formdetails';
 
 export default function AttributesPage() {
-  return <IsolatedAttributesDataGrid />;
+  return (
+    <>
+      <RenderGridExplanations datagridType={DatagridType.attributes} />
+      <IsolatedAttributesDataGrid />
+    </>
+  );
 }

frontend/app/(hub)/fixeddatainput/personnel/page.tsx

@@ -1,5 +1,12 @@
 import IsolatedPersonnelDataGrid from '@/components/datagrids/applications/isolated/isolatedpersonneldatagrid';
+import { DatagridType } from '@/config/macros/formdetails';
+import RenderGridExplanations from '@/components/client/rendergridexplanations';
 
 export default function PersonnelPage() {
-  return <IsolatedPersonnelDataGrid />;
+  return (
+    <>
+      <RenderGridExplanations datagridType={DatagridType.personnel} />
+      <IsolatedPersonnelDataGrid />
+    </>
+  );
 }

frontend/app/(hub)/fixeddatainput/quadrats/page.tsx

@@ -1,5 +1,12 @@
+import RenderGridExplanations from '@/components/client/rendergridexplanations';
 import IsolatedQuadratsDataGrid from '@/components/datagrids/applications/isolated/isolatedquadratsdatagrid';
+import { DatagridType } from '@/config/macros/formdetails';
 
 export default function QuadratsPage() {
-  return <IsolatedQuadratsDataGrid />;
+  return (
+    <>
+      <RenderGridExplanations datagridType={DatagridType.quadrats} />
+      <IsolatedQuadratsDataGrid />
+    </>
+  );
 }

frontend/app/(hub)/layout.tsx

@@ -4,10 +4,17 @@ import { title } from '@/config/primitives';
 import { useSession } from 'next-auth/react';
 import { redirect, usePathname } from 'next/navigation';
 import dynamic from 'next/dynamic';
-import { Box, IconButton, Stack, Typography } from '@mui/joy';
+import { Box, IconButton, Stack, Typography, useTheme } from '@mui/joy';
 import Divider from '@mui/joy/Divider';
 import { useLoading } from '@/app/contexts/loadingprovider';
-import { useOrgCensusContext, usePlotContext, useSiteContext } from '@/app/contexts/userselectionprovider';
+import {
+  useOrgCensusContext,
+  useOrgCensusDispatch,
+  usePlotContext,
+  usePlotDispatch,
+  useSiteContext,
+  useSiteDispatch
+} from '@/app/contexts/userselectionprovider';
 import { useOrgCensusListDispatch, usePlotListDispatch, useQuadratListDispatch, useSiteListDispatch } from '@/app/contexts/listselectionprovider';
 import { getEndpointHeaderName, siteConfig } from '@/config/macros/siteconfigs';
 import GithubFeedbackModal from '@/components/client/githubfeedbackmodal';
@@ -49,6 +56,9 @@ export default function HubLayout({ children }: { children: React.ReactNode }) {
   const currentSite = useSiteContext();
   const currentPlot = usePlotContext();
   const currentCensus = useOrgCensusContext();
+  const siteDispatch = useSiteDispatch();
+  const plotDispatch = usePlotDispatch();
+  const censusDispatch = useOrgCensusDispatch();
   const { data: session } = useSession();
   const previousSiteRef = useRef<string | undefined>(undefined);
   const previousPlotRef = useRef<number | undefined>(undefined);
@@ -205,16 +215,37 @@ export default function HubLayout({ children }: { children: React.ReactNode }) {
 
   // Handle manual reset logic
   useEffect(() => {
+    async function clearContexts() {
+      if (currentSite) {
+        if (siteDispatch) await siteDispatch({ site: undefined });
+      }
+      if (currentPlot) {
+        if (plotDispatch) await plotDispatch({ plot: undefined });
+      }
+      if (currentCensus) {
+        if (censusDispatch) await censusDispatch({ census: undefined });
+      }
+    }
+
     if (manualReset) {
       setLoading(true, 'Manual refresh beginning...');
 
-      // Reset all loading states
-      setSiteListLoaded(false);
-      setPlotListLoaded(false);
-      setCensusListLoaded(false);
-      setQuadratListLoaded(false);
-
-      setManualReset(false);
+      clearContexts()
+        .then(() => {
+          setSiteListLoaded(false);
+        })
+        .then(() => {
+          setPlotListLoaded(false);
+        })
+        .then(() => {
+          setCensusListLoaded(false);
+        })
+        .then(() => {
+          setQuadratListLoaded(false);
+        })
+        .finally(() => {
+          setManualReset(false);
+        });
     }
   }, [manualReset]);
 
@@ -287,6 +318,8 @@ export default function HubLayout({ children }: { children: React.ReactNode }) {
     }
   }, [session]);
 
+  const theme = useTheme();
+
   return (
     <>
       <Box
@@ -377,16 +410,8 @@ export default function HubLayout({ children }: { children: React.ReactNode }) {
                 justifyContent: 'center'
               }}
             >
-              {/*{siteConfig.name}*/}
               <AcaciaVersionTypography>{siteConfig.name}</AcaciaVersionTypography>
             </Typography>
-            {/*<Stack direction="row" sx={{ alignItems: 'center', justifyContent: 'center' }}>*/}
-            {/*  <Tooltip title="Version" variant="solid" placement="top" arrow sx={{ pointerEvents: 'none' }}>*/}
-            {/*    <Box sx={{ display: 'inline-block', verticalAlign: 'middle' }}>*/}
-            {/*      <AcaciaVersionTypography>{siteConfig.version}</AcaciaVersionTypography>*/}
-            {/*    </Box>*/}
-            {/*  </Tooltip>*/}
-            {/*</Stack>*/}
           </Stack>
           <IconButton
             onClick={() => setIsFeedbackModalOpen(true)}
@@ -396,10 +421,17 @@ export default function HubLayout({ children }: { children: React.ReactNode }) {
               bottom: 20,
               right: 20,
               zIndex: 2000,
-              bgcolor: 'primary.main',
-              color: 'white',
+              backgroundColor: 'transparent', // Remove background color
+              boxShadow: 'none', // Remove shadow if present
+              color: theme.vars.palette.primary.solidColor, // Text/icon color
+              opacity: 0.5, // Initial opacity
+              transition: 'opacity 0.3s ease',
               '&:hover': {
-                bgcolor: 'primary.dark'
+                opacity: 1,
+                backgroundColor: 'transparent' // Ensure no hover background
+              },
+              '&:focus-visible': {
+                outline: `2px solid ${theme.vars.palette.primary.solidColor}` // Add focus ring for accessibility if needed
               }
             }}
           >

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

@@ -4,10 +4,10 @@ import { useOrgCensusContext, usePlotContext, useSiteContext } from '@/app/conte
 import React, { useEffect, useState } from 'react';
 import { Box, Button, Checkbox, Table, Typography, useTheme } from '@mui/joy';
 import { PostValidationQueriesRDS } from '@/config/sqlrdsdefinitions/validations';
-import PostValidationRow from '@/components/client/postvalidationrow';
 import { Paper, TableBody, TableCell, TableContainer, TableHead, TableRow } from '@mui/material';
 import { Done } from '@mui/icons-material';
 import { useLoading } from '@/app/contexts/loadingprovider';
+import dynamic from 'next/dynamic';
 
 export default function PostValidationPage() {
   const currentSite = useSiteContext();
@@ -17,13 +17,16 @@ export default function PostValidationPage() {
   const [expandedQuery, setExpandedQuery] = useState<number | null>(null);
   const [expandedResults, setExpandedResults] = useState<number | null>(null);
   const [selectedResults, setSelectedResults] = useState<PostValidationQueriesRDS[]>([]);
+  const [schemaDetails, setSchemaDetails] = useState<{ table_name: string; column_name: string }[]>([]);
   const replacements = {
     schema: currentSite?.schemaName,
     currentPlotID: currentPlot?.plotID,
     currentCensusID: currentCensus?.dateRanges[0].censusID
   };
   const { setLoading } = useLoading();
 
+  const PostValidationRow = dynamic(() => import('@/components/client/postvalidationrow'), { ssr: false });
+
   const enabledPostValidations = postValidations.filter(query => query.isEnabled);
   const disabledPostValidations = postValidations.filter(query => !query.isEnabled);
 
@@ -86,6 +89,24 @@ export default function PostValidationPage() {
       .then(() => setLoading(false));
   }, []);
 
+  useEffect(() => {
+    const fetchSchema = async () => {
+      try {
+        const response = await fetch(`/api/structure/${currentSite?.schemaName ?? ''}`);
+        const data = await response.json();
+        if (data.schema) {
+          setSchemaDetails(data.schema);
+        }
+      } catch (error) {
+        console.error('Error fetching schema:', error);
+      }
+    };
+
+    if (postValidations.length > 0) {
+      fetchSchema().then(r => console.warn(r));
+    }
+  }, [postValidations]);
+
   const handleExpandClick = (queryID: number) => {
     setExpandedQuery(expandedQuery === queryID ? null : queryID);
   };
@@ -218,6 +239,7 @@ export default function PostValidationPage() {
                     handleExpandClick={handleExpandClick}
                     handleExpandResultsClick={handleExpandResultsClick}
                     handleSelectResult={handleSelectResult}
+                    schemaDetails={schemaDetails}
                   />
                 ))}
 
@@ -233,6 +255,7 @@ export default function PostValidationPage() {
                     handleExpandClick={handleExpandClick}
                     handleExpandResultsClick={handleExpandResultsClick}
                     handleSelectResult={handleSelectResult}
+                    schemaDetails={schemaDetails}
                   />
                 ))}
               </TableBody>

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

@@ -0,0 +1,14 @@
+'use client';
+
+import RenderGridExplanations from '@/components/client/rendergridexplanations';
+import IsolatedUnifiedChangelogDataGrid from '@/components/datagrids/applications/isolated/isolatedunifiedchangelogdatagrid';
+import { DatagridType } from '@/config/macros/formdetails';
+
+export default function RecentChangesPage() {
+  return (
+    <>
+      <RenderGridExplanations datagridType={DatagridType.unifiedchangelog} />
+      <IsolatedUnifiedChangelogDataGrid />
+    </>
+  );
+}

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

@@ -1,5 +1,12 @@
+import RenderGridExplanations from '@/components/client/rendergridexplanations';
 import MeasurementsSummaryViewDataGrid from '@/components/datagrids/applications/msvdatagrid';
+import { DatagridType } from '@/config/macros/formdetails';
 
 export default function SummaryPage() {
-  return <MeasurementsSummaryViewDataGrid />;
+  return (
+    <>
+      <RenderGridExplanations datagridType={DatagridType.measurementssummaryview} />
+      <MeasurementsSummaryViewDataGrid />
+    </>
+  );
 }