Merge branch 'development' into forestgeo-app-development

Author: siddheshraze

.github/workflows/dev-forestgeo-livesite.yml

@@ -48,22 +48,22 @@ jobs:
           echo OWNER=${{ secrets.OWNER }} >> frontend/.env
           echo REPO=${{ secrets.REPO }} >> frontend/.env
 
-      - name: Cache node modules
-        uses: actions/cache@v2
-        with:
-          path: frontend/node_modules
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
+#      - name: Cache node modules
+#        uses: actions/cache@v2
+#        with:
+#          path: frontend/node_modules
+#          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+#          restore-keys: |
+#            ${{ runner.os }}-node-
 
-      - name: Cache Next.js build
-        uses: actions/cache@v2
-        with:
-          path: frontend/build/cache
-          key: ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/.next/cache') }}
-          restore-keys: |
-            ${{ runner.os }}-next-
-            ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}
+#      - name: Cache Next.js build
+#        uses: actions/cache@v2
+#        with:
+#          path: frontend/build/cache
+#          key: ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/.next/cache') }}
+#          restore-keys: |
+#            ${{ runner.os }}-next-
+#            ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}
 
       - name: move into frontend --> npm install, build, and test
         run: |

frontend/__tests__/config/utils.test.ts

@@ -21,33 +21,26 @@ const handler = NextAuth({
   },
   callbacks: {
     async signIn({ user, profile, email: signInEmail }) {
-      console.log('callback -- signin');
       const azureProfile = profile as AzureADProfile;
       const userEmail = user.email || signInEmail || azureProfile.preferred_username;
-      console.log('user email: ', userEmail);
       if (typeof userEmail !== 'string') {
         console.error('User email is not a string:', userEmail);
         return false; // Email is not a valid string, abort sign-in
       }
       if (userEmail) {
-        console.log('getting connection');
         let conn, emailVerified, userStatus;
         try {
           conn = await getConn();
-          console.log('obtained');
           const query = `SELECT UserStatus FROM catalog.users WHERE Email = '${userEmail}' LIMIT 1`;
           const results = await runQuery(conn, query);
-          console.log('results: ', results);
 
           // emailVerified is true if there is at least one result
           emailVerified = results.length > 0;
-          console.log('emailVerified: ', emailVerified);
           if (!emailVerified) {
             console.error('User email not found.');
             return false;
           }
           userStatus = results[0].UserStatus;
-          console.log('userStatus: ', userStatus);
         } catch (e: any) {
           console.error('Error fetching user status:', e);
           throw new Error('Failed to fetch user status.');
@@ -66,7 +59,6 @@ const handler = NextAuth({
 
         user.sites = allowedSites;
         user.allsites = allSites;
-        // console.log('all sites: ', user.allsites);
       }
       return true;
     },

frontend/app/api/auth/[[...nextauth]]/route.ts

@@ -80,7 +80,7 @@ const getClosestAreaUnit = (input: string): string | null => {
   return closestUnit;
 };
 
-const EditUnitsCell = (params: GridRenderEditCellParams & { fieldName: string; isArea: boolean }) => {
+export const EditUnitsCell = (params: GridRenderEditCellParams & { fieldName: string; isArea: boolean }) => {
   const apiRef = useGridApiContext();
   const { id, fieldName, hasFocus, isArea } = params;
   const [value, setValue] = useState<string>(params.row[fieldName]);

frontend/components/client/formcolumns.tsx

@@ -12,7 +12,6 @@ import {
   Divider,
   FormControl,
   FormLabel,
-  Grid,
   Input,
   LinearProgress,
   List,
@@ -36,6 +35,7 @@ import { usePathname } from 'next/navigation';
 import { useSession } from 'next-auth/react';
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
+import Grid from '@mui/material/Grid2';
 
 // this has been shelved -- it's a little too complicated for a first iteration.
 // saving it for a later version.
@@ -185,7 +185,7 @@ ${pathname}
               <DialogContent sx={{ display: 'flex', flex: 1, flexDirection: 'column', overflow: 'hidden' }}>
                 <Divider orientation="horizontal" sx={{ my: 1 }} />
                 <Grid container spacing={1}>
-                  <Grid xs={4}>
+                  <Grid size={4}>
                     {currentSite ? (
                       <Box sx={{ display: 'flex', flex: 1, flexDirection: 'column' }}>
                         <Typography level="body-sm" fontWeight={'xl'}>
@@ -197,7 +197,7 @@ ${pathname}
                       <Typography level="body-sm">No site selected.</Typography>
                     )}
                   </Grid>
-                  <Grid xs={4}>
+                  <Grid size={4}>
                     {currentPlot ? (
                       <Box sx={{ display: 'flex', flex: 1, flexDirection: 'column' }}>
                         <Typography level="body-sm">Selected Plot: {currentPlot.plotName}</Typography>
@@ -207,7 +207,7 @@ ${pathname}
                       <Typography level="body-sm">No plot selected.</Typography>
                     )}
                   </Grid>
-                  <Grid xs={4}>
+                  <Grid size={4}>
                     {currentCensus ? (
                       <Box sx={{ display: 'flex', flex: 1, flexDirection: 'column' }}>
                         <Typography level="body-sm">Selected Census: {currentCensus.plotCensusNumber}</Typography>

frontend/components/client/githubfeedbackmodal.tsx

@@ -2,7 +2,8 @@
 import { Alert, Box, DialogActions, DialogContent, DialogTitle, List, ListItem, Modal, ModalDialog, Stack, Tooltip, Typography } from '@mui/joy';
 import { UploadParseFilesProps } from '@/config/macros/uploadsystemmacros';
 import { getTableHeaders } from '@/config/macros/formdetails';
-import { Button, Grid } from '@mui/material';
+import { Button } from '@mui/material';
+import Grid from '@mui/material/Grid2';
 import { DropzoneLogic } from '@/components/uploadsystemhelpers/dropzone';
 import { FileList } from '@/components/uploadsystemhelpers/filelist';
 import { LoadingButton } from '@mui/lab';
@@ -43,7 +44,7 @@ export default function UploadParseFiles(props: Readonly<UploadParseFilesProps>)
   return (
     <Box sx={{ display: 'flex', flex: 1, flexDirection: 'column' }}>
       <Grid container spacing={2}>
-        <Grid item xs={6}>
+        <Grid size={6}>
           <Box sx={{ display: 'flex', flexDirection: 'column', mb: 10, mr: 10 }}>
             <DropzoneLogic onChange={handleFileChange} />
             <Modal open={Boolean(fileToReplace)} onClose={() => setFileToReplace(null)}>
@@ -69,7 +70,7 @@ export default function UploadParseFiles(props: Readonly<UploadParseFilesProps>)
             </Modal>
           </Box>
         </Grid>
-        <Grid item xs={6}>
+        <Grid size={6}>
           <Stack direction={'column'} sx={{ display: 'flex', flexDirection: 'column', mb: 10 }}>
             <Typography sx={{ mb: 2 }}>
               You have selected {uploadForm}. Please ensure that your file has the following headers before continuing: <br />