Merge branch 'development' into forestgeo-app-development

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

@@ -48,29 +48,35 @@ 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: |
           cd frontend/
           npm install
           npm run build
-          npm run test --if-present
+
+      - name: Cypress run
+        uses: cypress-io/github-action@v6
+        with:
+          build: npm run build
+          start: npm start
+          browser: chrome
 
       - name: Move directories into build/standalone to reduce app load
         run: |

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

@@ -1,5 +1,5 @@
 'use client';
-import React, { useEffect, useState, useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import useSWR from 'swr';
 import { ValidationProceduresRDS } from '@/config/sqlrdsdefinitions/validations';
 import { useOrgCensusContext, usePlotContext, useSiteContext } from '@/app/contexts/userselectionprovider';

frontend/app/(login)/login/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 import React, { useEffect, useState } from 'react';
 import { useSession } from 'next-auth/react';
-import { motion, AnimatePresence } from 'framer-motion';
+import { AnimatePresence, motion } from 'framer-motion';
 import styles from '@/styles/styles.module.css';
 import Box from '@mui/joy/Box';
 import UnauthenticatedSidebar from '@/components/unauthenticatedsidebar';

frontend/app/contexts/loadingprovider.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import React, { createContext, useContext, useEffect, useState, useRef } from 'react';
+import React, { createContext, useContext, useEffect, useRef, useState } from 'react';
 
 const LoadingContext = createContext<{
   isLoading: boolean;