Merge pull request #1088 from nowcommunity/finalize-entry

Fix locality species dirty state reset

Author: karilint

.gitignore

@@ -10,3 +10,4 @@ cypress/screenshots
 cypress/downloads
 coverage
 .nyc_output
+.eslintcache

.husky/pre-commit

@@ -10,4 +10,5 @@ command -v npm >/dev/null 2>&1 || {
   exit 1
 }
 
+# Full linting with cache for performance (97% faster on subsequent runs)
 npm run lint && npm run tsc

backend/package.json

@@ -10,7 +10,7 @@
     "test:unit": "jest src/unit-tests --coverage --config jest-config.js --detectOpenHandles --forceExit --silent",
     "test:api:local": "DOTENV_CONFIG_PATH=../.test.env npm run test:api -- --setupFiles dotenv/config",
     "start": "node build/index.js",
-    "lint": "eslint --report-unused-disable-directives --max-warnings 0",
+    "lint": "eslint --cache --report-unused-disable-directives --max-warnings 0",
     "prisma": "prisma generate --schema prisma/schema.prisma && prisma generate --schema prisma/schema_log.prisma",
     "clean": "rm -rf node_modules && rm -rf prisma/generated && rm -rf build && rm -rf coverage"
   },

cypress.config.js

@@ -76,6 +76,12 @@ module.exports = defineConfig({
     },
     baseUrl: 'http://localhost:5173/',
     specPattern: ['cypress/e2e/**/*.cy.{js,jsx,ts,tsx}', 'cypress/e2e/**/*.spec.{js,jsx,ts,tsx}'],
+    // Performance optimizations
+    experimentalMemoryManagement: true,
+    numTestsKeptInMemory: 0,
+    defaultCommandTimeout: 8000,
+    requestTimeout: 8000,
+    responseTimeout: 8000,
   },
   env: {
     databaseResetUrl: 'http://localhost:4000/test/reset-test-database',

cypress/e2e/asAdmin.cy.js

@@ -6,7 +6,7 @@ const pageLoadTimeout = 30000
 
 describe('Open each page, table view and detail view, and check at least some correct text appears', () => {
   beforeEach('Login as admin', () => {
-    cy.login('testSu')
+    cy.loginWithSession('testSu')
   })
 
   it('Locality works', () => {

cypress/e2e/locality.cy.js

@@ -5,8 +5,8 @@ before('Reset database', () => {
 const buildLocalityName = (base = 'Bugat') => `${base} ${Date.now()}-${Math.floor(Math.random() * 1e6)}`
 
 describe('Adding species in Locality -> Species tab for an existing locality', () => {
-  beforeEach('Login as admin', () => {
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it('works with valid, unique species', () => {
@@ -193,9 +193,8 @@ describe('Adding species in Locality -> Species tab for an existing locality', (
 })
 
 describe('Creating a new locality', () => {
-  beforeEach('Login as admin', () => {
-    cy.resetDatabase()
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it('with valid data works', () => {
@@ -415,8 +414,8 @@ describe('Creating a new locality', () => {
 })
 
 describe('Editing a locality', () => {
-  beforeEach('Login as admin', () => {
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it('with contradictory min and max ages does not work', () => {
@@ -497,8 +496,8 @@ describe('Editing a locality', () => {
 })
 
 describe('Locality table filtering', () => {
-  beforeEach('Login as admin', () => {
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it('supports filtering by synonym names', () => {
@@ -515,8 +514,8 @@ describe('Locality table filtering', () => {
 // This test needs GEONAMES_USERNAME to be set in .anon.env!
 
 describe("Locality's coordinate selection map works", () => {
-  beforeEach('Login as admin', () => {
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it('Map view and location search work', () => {
@@ -585,8 +584,8 @@ describe("Locality's coordinate selection map works", () => {
 })
 
 describe('Deleting a locality', () => {
-  beforeEach('Login as admin', () => {
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it('works and returns user to table view', () => {
@@ -610,8 +609,7 @@ describe('Linking projects to an existing locality', () => {
   const newProjectCode = 'WINE'
 
   beforeEach('Login as admin and open projects tab', () => {
-    cy.resetDatabase()
-    cy.login('testSu')
+    cy.loginWithSession('testSu')
     cy.visit(`/locality/${localityId}?tab=9`)
     cy.contains('Dmanisi')
   })

cypress/e2e/misc.cy.js

@@ -51,8 +51,8 @@ describe('Test individual features across the app', () => {
   })
 
   describe('Staging mode works for the data types that require it', () => {
-    beforeEach('Login as admin', () => {
-      cy.login('testSu')
+    beforeEach('Login as admin with session caching', () => {
+      cy.loginWithSession('testSu')
     })
 
     it('Staging mode works on locality', () => {
@@ -85,27 +85,27 @@ describe('Test individual features across the app', () => {
 
   // TODO remove the skips once onWrite's has been added to all
   describe('Staging mode does not appear for the data types that dont require it', () => {
-    beforeEach('Login as admin', () => {
-      cy.login('testSu')
+    beforeEach('Login as admin with session caching', () => {
+      cy.loginWithSession('testSu')
     })
 
     it('Staging mode does not appear on reference', () => {
-      cy.login('testSu')
+      cy.loginWithSession('testSu')
       doesNotHaveStagingMode('reference/10039')
     })
 
     it.skip('Staging mode does not appear on regions', () => {
-      cy.login('testSu')
+      cy.loginWithSession('testSu')
       doesNotHaveStagingMode('region/1')
     })
 
     it.skip('Staging mode does not appear on projects', () => {
-      cy.login('testSu')
+      cy.loginWithSession('testSu')
       doesNotHaveStagingMode('project/3')
     })
 
     it.skip('Staging mode does not appear on person page', () => {
-      cy.login('testSu')
+      cy.loginWithSession('testSu')
       doesNotHaveStagingMode('person/AD')
     })
   })

cypress/e2e/occurrence-edit.cy.ts

@@ -4,7 +4,7 @@ before('Reset database', () => {
 
 describe('Occurrence editing', () => {
   it('allows admin to open edit mode and finalize flow', () => {
-    cy.login('testSu')
+    cy.loginWithSession('testSu')
     cy.visit('/occurrence/21050/85729')
 
     cy.get('#edit-button').should('exist').click()
@@ -19,7 +19,7 @@ describe('Occurrence editing', () => {
   })
 
   it('prevents read-only user from editing occurrence', () => {
-    cy.login('testEu')
+    cy.loginWithSession('testEu')
     cy.visit('/occurrence/21050/85729')
 
     cy.get('#edit-button').should('not.exist')

cypress/e2e/person.cy.js

@@ -3,16 +3,16 @@ before('Reset database', () => {
 })
 
 describe('Creating a person', () => {
-  beforeEach('Login as admin', () => {
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it.skip('with valid data works', () => {})
 })
 
 describe('Editing a person', () => {
-  beforeEach('Login as admin', () => {
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it('with valid data works', () => {
@@ -84,21 +84,21 @@ describe('User rights', () => {
   })
 
   it('restricted editor is redirected to their own person page when opening another person', () => {
-    cy.login('testEr')
+    cy.loginWithSession('testEr')
     cy.visit(`/person/AD?tab=0`)
     cy.url().should('eq', 'http://localhost:5173/person/AD?tab=0')
     cy.get('[id=edit-button]').should('exist')
   })
 
   it('unrestricted editor is redirected to their own person page when opening another person', () => {
-    cy.login('testEu')
+    cy.loginWithSession('testEu')
     cy.visit(`/person/AD?tab=0`)
     cy.url().should('eq', 'http://localhost:5173/person/AD?tab=0')
     cy.get('[id=edit-button]').should('exist')
   })
 
   it('admin can view other users directly', () => {
-    cy.login('testSu')
+    cy.loginWithSession('testSu')
     cy.visit(`/person/AD?tab=0`)
     cy.url().should('eq', 'http://localhost:5173/person/AD?tab=0') // admin can see everyone's pages
     cy.get('[id=edit-button]').should('exist')

cypress/e2e/reference.cy.js

@@ -3,8 +3,8 @@ before('Reset database', () => {
 })
 
 describe('Creating a journal', () => {
-  beforeEach('Login as admin', () => {
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it('with valid data works', () => {
@@ -95,8 +95,8 @@ describe('Creating a journal', () => {
 // TODO: add more tests for different types of references
 
 describe('Editing a journal', () => {
-  beforeEach('Login as admin', () => {
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it('with valid data works', () => {
@@ -140,8 +140,8 @@ describe('Editing a journal', () => {
 // TODO: add more tests for different types of references
 
 describe('Deleting a reference', () => {
-  beforeEach('Login as admin', () => {
-    cy.login('testSu')
+  beforeEach('Login as admin with session caching', () => {
+    cy.loginWithSession('testSu')
   })
 
   it('that is not linked to anything works and returns user to table view', () => {