Feature/dolly frontend react hook form migration

.github/workflows/common.cypress.yml

@@ -16,15 +16,15 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v4
       - name: "Setup"
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20.x
           registry-url: https://npm.pkg.github.com/
           scope: "@navikt"
       - name: "Run"
         env:
           NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         with:
           config: video=false
           working-directory: ${{ inputs.working-directory }}/src/main/js

apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java

@@ -129,4 +129,4 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
                         .filters(filter, addUserJwtHeaderFilter())
                 ).uri(host);
     }
-}
+}

apps/dolly-frontend/src/main/js/.gitignore

@@ -41,3 +41,4 @@ stats.json
 # Cypress
 /cypress/videos/
 /cypress/screenshots/
+/cypress/downloads/

apps/dolly-frontend/src/main/js/cypress.config.ts

@@ -12,6 +12,7 @@ export default defineConfig({
 	},
 
 	e2e: {
+		baseUrl: 'http://localhost:5678',
 		setupNodeEvents() {},
 		experimentalRunAllSpecs: true,
 		specPattern: 'cypress/e2e/**/*.cy.{js,ts,jsx,tsx}',

apps/dolly-frontend/src/main/js/cypress/e2e/BestillingDetaljer.cy.ts

@@ -0,0 +1,24 @@
+import { CypressSelector } from '../mocks/Selectors'
+
+describe('Dolly Bestillingsdetaljer testing', () => {
+	it('passes', () => {
+		cy.visit('gruppe')
+
+		cy.get('div').contains('Testytest').click()
+
+		cy.dollyGet(CypressSelector.TOGGLE_VISNING_BESTILLINGER).click()
+
+		cy.get(':nth-child(2) > .dot-body-row > .dot-body-row-columns').click()
+		cy.dollyGet(CypressSelector.BUTTON_BESTILLINGDETALJER_GJENOPPRETT).should('be.disabled')
+		cy.get(':nth-child(2) > .dot-body-row > .dot-body-row-columns').click()
+
+		cy.get(':nth-child(3) > .dot-body-row > .dot-body-row-columns').click()
+		cy.dollyGet(CypressSelector.BUTTON_BESTILLINGDETALJER_GJENOPPRETT).click()
+		cy.dollyGet(CypressSelector.BUTTON_BESTILLINGDETALJER_GJENOPPRETT_UTFOER).click()
+
+		cy.dollyGet(CypressSelector.BUTTON_BESTILLINGDETALJER_OPPRETT_MAL).click()
+		cy.get('#malnavn').type('Testmal')
+
+		cy.dollyGet(CypressSelector.BUTTON_MALMODAL_LAGRE).click()
+	})
+})

apps/dolly-frontend/src/main/js/cypress/e2e/DollySoek.cy.ts

@@ -1,8 +1,9 @@
 import { CypressSelector } from '../mocks/Selectors'
 
 describe('Dolly-søk testing', () => {
+	const dollySoekIdenter = new RegExp(/dolly-backend\/api\/v1\/elastic\/identer/)
 	it('passes', () => {
-		cy.visit('http://localhost:5678')
+		cy.visit('')
 
 		cy.dollyGet(CypressSelector.BUTTON_HEADER_FINNPERSON).click()
 		cy.dollyGet(CypressSelector.BUTTON_HEADER_DOLLYSOEK).click()
@@ -14,10 +15,13 @@ describe('Dolly-søk testing', () => {
 		cy.get('div').contains('Testytest').invoke('show').click()
 		cy.wait(1000)
 
+		cy.intercept({ method: 'POST', url: dollySoekIdenter }, [])
 		cy.dollyGet(CypressSelector.BUTTON_NULLSTILL_SOEK).click()
 		cy.get('div').contains('Ingen søk er gjort')
 		cy.wait(1000)
 
+		cy.intercept({ method: 'POST', url: dollySoekIdenter }, ['12345678912'])
+
 		cy.get('.select-kjoenn__control').click().get('.select-kjoenn__menu').click()
 		cy.wait(200)
 

apps/dolly-frontend/src/main/js/cypress/e2e/Endringsmelding.cy.ts

@@ -2,7 +2,7 @@ import { CypressSelector } from '../mocks/Selectors'
 
 describe('Navigering til endringsmelding', () => {
 	it('passes', () => {
-		cy.visit('http://localhost:5678/gruppe')
+		cy.visit('gruppe')
 
 		cy.dollyGet(CypressSelector.BUTTON_HEADER_ENDRINGSMELDING).click()
 		cy.url().should('include', '/endringsmelding')

apps/dolly-frontend/src/main/js/cypress/e2e/Gruppe.cy.ts

@@ -1,47 +1,17 @@
 import { CypressSelector } from '../mocks/Selectors'
 import {
 	avbruttBestillingMock,
-	personFragmentNavigerMock,
 	uferdigBestillingMock,
 	uferdigeBestillingerMock,
 } from '../mocks/BasicMocks'
-import { ERROR_NAVIGATE_IDENT } from '../../src/ducks/errors/ErrorMessages'
 
 const uferdigBestilling = new RegExp(/dolly-backend\/api\/v1\/bestilling\/2$/)
 const uferdigeBestillinger = new RegExp(/dolly-backend\/api\/v1\/bestilling\/gruppe\/2\/ikkeferdig/)
 const personFragmentNaviger = new RegExp(/dolly-backend\/api\/v1\/ident\/naviger\/12345678912/)
 
-describe('Navigering, Opprett gruppe og start bestilling med alle mulige tilvalg', () => {
+describe('Opprett gruppe og start bestilling med alle mulige tilvalg', () => {
 	it('passes', () => {
-		cy.visit('http://localhost:5678/gruppe')
-
-		//Midlertidig not found på navigering til ident etter søk
-		cy.intercept({ method: 'GET', url: personFragmentNaviger }, { statusCode: 404 })
-
-		cy.dollyType(CypressSelector.INPUT_DOLLY_SOEK, '12345')
-		cy.dollyGet(CypressSelector.BUTTON_NAVIGER_DOLLY).click()
-		cy.wait(400)
-
-		cy.dollyGet(CypressSelector.ERROR_MESSAGE_NAVIGERING).should(
-			'contains.text',
-			ERROR_NAVIGATE_IDENT,
-		)
-
-		//Korrekt navigering igjen
-		cy.intercept({ method: 'GET', url: personFragmentNaviger }, personFragmentNavigerMock)
-
-		cy.dollyGet(CypressSelector.TOGGLE_SEARCH_BESTILLING).click()
-		cy.dollyType(CypressSelector.INPUT_DOLLY_SOEK, '1')
-		cy.dollyGet(CypressSelector.BUTTON_NAVIGER_DOLLY).click()
-		cy.dollyGet(CypressSelector.TOGGLE_SEARCH_PERSON).click()
-
-		cy.dollyType(CypressSelector.INPUT_DOLLY_SOEK, '12345')
-		cy.dollyGet(CypressSelector.BUTTON_NAVIGER_DOLLY).click()
-		cy.wait(400)
-
-		cy.url().should('include', '/gruppe/1')
-
-		cy.dollyGet(CypressSelector.BUTTON_HEADER_PERSONER).click()
+		cy.visit('gruppe')
 
 		// Naviger mellom tabs
 		cy.dollyGet(CypressSelector.TOGGLE_FAVORITTER).click()

apps/dolly-frontend/src/main/js/cypress/e2e/GruppeHeader.cy.ts

@@ -0,0 +1,83 @@
+import { CypressSelector } from '../mocks/Selectors'
+
+describe('Testing av forskjellige actions på gruppeheaderen', () => {
+	it('Legg til på alle i gruppe', () => {
+		cy.visit('gruppe')
+
+		cy.get('div').contains('Testytest').click()
+
+		cy.dollyGet(CypressSelector.BUTTON_LEGGTILPAAALLE).click()
+
+		cy.dollyGet(CypressSelector.BUTTON_VIDERE).click()
+
+		cy.dollyGet(CypressSelector.BUTTON_VIDERE).click()
+
+		cy.dollyGet(CypressSelector.BUTTON_FULLFOER_BESTILLING).click()
+	})
+
+	const tagsPost = new RegExp(/dolly-backend\/api\/v1\/tags/)
+	it('Posting av tags', () => {
+		cy.visit('gruppe')
+		cy.intercept({ method: 'POST', url: tagsPost }, { statusCode: 201 }).as('postTags')
+
+		cy.get('div').contains('Testytest').click()
+
+		cy.dollyGet(CypressSelector.BUTTON_TILKNYTT_TAGS).click()
+		cy.get('.select__input-container').type('DUMMY{enter}')
+
+		cy.dollyGet(CypressSelector.BUTTON_POST_TAGS).click()
+
+		cy.wait('@postTags').its('response.statusCode').should('eq', 201)
+
+		cy.get('h1').contains('Testytest')
+	})
+
+	it('Flyttpersoner funksjonalitet', () => {
+		cy.visit('gruppe')
+
+		cy.get('div').contains('Testytest').click()
+
+		cy.dollyGet(CypressSelector.BUTTON_FLYTT_PERSONER).click()
+
+		cy.dollyGet(CypressSelector.TOGGLE_ALLE_GRUPPER).click()
+		cy.dollyGet(CypressSelector.TOGGLE_EKSISTERENDE_GRUPPE).click()
+		cy.dollyGet(CypressSelector.TOGGLE_NY_GRUPPE).click()
+
+		cy.dollyGet(CypressSelector.INPUT_NY_GRUPPE_NAVN).type('TestNavn')
+		cy.dollyGet(CypressSelector.INPUT_NY_GRUPPE_HENSIKT).type('TestHensikt')
+		cy.dollyGet(CypressSelector.BUTTON_NY_GRUPPE_OPPRETT).click()
+
+		cy.get('.navds-checkbox__label').contains('12345678912').click()
+
+		cy.dollyGet(CypressSelector.CONTAINER_VALGTE_PERSONER).should('contain', '12345678912')
+		cy.dollyGet(CypressSelector.BUTTON_FLYTT_PERSONER_NULLSTILL).click()
+		cy.dollyGet(CypressSelector.CONTAINER_VALGTE_PERSONER).should('not.contain', '12345678912')
+
+		cy.dollyGet(CypressSelector.BUTTON_FLYTT_PERSONER_AVBRYT).click()
+	})
+
+	it('Gjenopprett gruppe funksjonalitet', () => {
+		cy.visit('gruppe')
+
+		cy.get('div').contains('Testytest').click()
+
+		cy.dollyGet(CypressSelector.BUTTON_GJENOPPRETT_GRUPPE).click()
+
+		cy.get('#q2').click()
+
+		cy.dollyGet(CypressSelector.BUTTON_BESTILLINGDETALJER_GJENOPPRETT_UTFOER).click()
+	})
+
+	it('Rediger gruppe funksjonalitet', () => {
+		cy.visit('gruppe')
+
+		cy.get('div').contains('Testytest').click()
+
+		cy.dollyGet(CypressSelector.BUTTON_REDIGER_GRUPPE).click()
+
+		cy.dollyGet(CypressSelector.INPUT_NAVN).clear().type('Redigert navn')
+		cy.dollyGet(CypressSelector.INPUT_HENSIKT).clear().type('Redigert hensikt')
+
+		cy.dollyGet(CypressSelector.BUTTON_OPPRETT).click()
+	})
+})

apps/dolly-frontend/src/main/js/cypress/e2e/IdentNavigering.cy.ts

@@ -0,0 +1,37 @@
+import { CypressSelector } from '../mocks/Selectors'
+import { personFragmentNavigerMock } from '../mocks/BasicMocks'
+import { ERROR_NAVIGATE_IDENT } from '../../src/ducks/errors/ErrorMessages'
+
+const personFragmentNaviger = new RegExp(/dolly-backend\/api\/v1\/ident\/naviger\/12345678912/)
+
+describe('Navigering til ident som finnes i gruppe 1', () => {
+	it('passes', () => {
+		cy.visit('gruppe')
+
+		//Midlertidig not found på navigering til ident etter søk
+		cy.intercept({ method: 'GET', url: personFragmentNaviger }, { statusCode: 404 })
+
+		cy.dollyType(CypressSelector.INPUT_DOLLY_SOEK, '12345')
+		cy.dollyGet(CypressSelector.BUTTON_NAVIGER_DOLLY).click()
+		cy.wait(400)
+
+		cy.dollyGet(CypressSelector.ERROR_MESSAGE_NAVIGERING).should(
+			'contains.text',
+			ERROR_NAVIGATE_IDENT,
+		)
+
+		//Korrekt navigering igjen
+		cy.intercept({ method: 'GET', url: personFragmentNaviger }, personFragmentNavigerMock)
+
+		cy.dollyGet(CypressSelector.TOGGLE_SEARCH_BESTILLING).click()
+		cy.dollyType(CypressSelector.INPUT_DOLLY_SOEK, '1')
+		cy.dollyGet(CypressSelector.BUTTON_NAVIGER_DOLLY).click()
+		cy.dollyGet(CypressSelector.TOGGLE_SEARCH_PERSON).click()
+
+		cy.dollyType(CypressSelector.INPUT_DOLLY_SOEK, '12345')
+		cy.dollyGet(CypressSelector.BUTTON_NAVIGER_DOLLY).click()
+		cy.wait(400)
+
+		cy.url().should('include', '/gruppe/1')
+	})
+})

apps/dolly-frontend/src/main/js/cypress/e2e/Identvisning.cy.ts

@@ -4,17 +4,10 @@ describe('Åpne bestilt ident med knytning mot alle fagsystem', () => {
 	it('passes', () => {
 		cy.intercept('PUT', '*', cy.spy().as('toggle_brukt'))
 
-		cy.visit('http://localhost:5678/gruppe')
+		cy.visit('gruppe')
 
 		cy.get('div').contains('Testytest').click()
 
-		cy.dollyGet(CypressSelector.BUTTON_FLYTT_PERSONER).click()
-
-		cy.dollyGet(CypressSelector.TOGGLE_NY_GRUPPE).click()
-		cy.dollyGet(CypressSelector.TOGGLE_EKSISTERENDE_GRUPPE).click()
-
-		cy.dollyGet(CypressSelector.BUTTON_FLYTT_PERSONER_AVBRYT).click()
-
 		cy.dollyGet(CypressSelector.TOGGLE_VISNING_BESTILLINGER).click()
 		cy.wait(200)
 

apps/dolly-frontend/src/main/js/cypress/e2e/Login.cy.ts

@@ -5,9 +5,9 @@ describe('Login side og aksepter varsling', () => {
 	it('passes', () => {
 		cy.intercept(
 			{ method: 'GET', url: new RegExp(/testnav-varslinger-service\/api\/v1\/varslinger/) },
-			varslingerVelkommenResponseMock
+			varslingerVelkommenResponseMock,
 		)
-		cy.visit('http://localhost:5678/login')
+		cy.visit('login')
 
 		cy.dollyGet(CypressSelector.BUTTON_LOGIN_NAV).click()
 		cy.dollyGet(CypressSelector.BUTTON_VARSLING_LUKK).click()

apps/dolly-frontend/src/main/js/cypress/e2e/Logout.cy.ts

@@ -4,7 +4,7 @@ describe('Tester at bruker blir sendt til login side dersom man ikke er autorise
 	it('passes', () => {
 		const current = new RegExp(/current/)
 		cy.intercept({ method: 'GET', url: current }, { statusCode: 401 })
-		cy.visit('http://localhost:5678/gruppe', { failOnStatusCode: false })
+		cy.visit('gruppe', { failOnStatusCode: false })
 
 		cy.url().should('include', 'login')
 		cy.dollyGet(CypressSelector.BUTTON_LOGIN_NAV).should('exist')

apps/dolly-frontend/src/main/js/cypress/e2e/Minside.cy.ts

@@ -9,7 +9,7 @@ describe('Minside mal testing', () => {
 		cy.intercept('PUT', '*', cy.spy().as('endre_malnavn'))
 		cy.intercept('POST', '*', cy.spy().as('send_oenske'))
 
-		cy.visit('http://localhost:5678')
+		cy.visit('')
 
 		cy.dollyGet(CypressSelector.BUTTON_PROFIL).click()
 		cy.dollyGet(CypressSelector.BUTTON_PROFIL_MINSIDE).click()
@@ -28,6 +28,9 @@ describe('Minside mal testing', () => {
 
 		cy.dollyGet(CypressSelector.INPUT_MINSIDE_SOEK_MAL).type('mal')
 		cy.dollyGet(CypressSelector.INPUT_MINSIDE_SOEK_MAL).clear()
+
+		cy.dollyGet(CypressSelector.TOGGLE_MIN_SIDE_ORGANISASJON_MALER).click()
+		cy.dollyGet(CypressSelector.TOGGLE_MIN_SIDE_PERSONER_MALER).click()
 		cy.dollyGet(CypressSelector.BUTTON_MALER_SLETT).click()
 		cy.dollyGet(CypressSelector.BUTTON_MALER_SLETT_BEKREFT).click()
 

apps/dolly-frontend/src/main/js/cypress/e2e/OpprettBestilling.cy.ts

@@ -2,7 +2,7 @@ import { CypressSelector } from '../mocks/Selectors'
 
 describe('Oppretter bestilling med alle artifakter som er avhengige av Q1 eller Q2 og sjekker at disse blir huket av', () => {
 	it('passes', () => {
-		cy.visit('http://localhost:5678/gruppe/1')
+		cy.visit('gruppe/1')
 
 		cy.dollyGet(CypressSelector.BUTTON_OPPRETT_PERSONER).click()
 		cy.dollyGet(CypressSelector.BUTTON_START_BESTILLING).click()

apps/dolly-frontend/src/main/js/cypress/e2e/Organisasjoner.cy.ts

@@ -2,7 +2,7 @@ import { CypressSelector } from '../mocks/Selectors'
 
 describe('Åpne en organisasjon med alle tilvalg', () => {
 	it('passes', () => {
-		cy.visit('http://localhost:5678')
+		cy.visit('')
 
 		cy.dollyGet(CypressSelector.BUTTON_HEADER_ORGANISASJONER).click()
 

apps/dolly-frontend/src/main/js/cypress/e2e/Test-Norge.cy.ts

@@ -2,7 +2,7 @@ import { CypressSelector } from '../mocks/Selectors'
 
 describe('Test-Norge søk testing', () => {
 	it('passes', () => {
-		cy.visit('http://localhost:5678')
+		cy.visit('')
 
 		cy.dollyGet(CypressSelector.BUTTON_HEADER_FINNPERSON).click()
 		cy.dollyGet(CypressSelector.BUTTON_HEADER_TESTNORGE).click()

apps/dolly-frontend/src/main/js/cypress/mocks/BasicMocks.tsx

@@ -881,6 +881,8 @@ export const pensjonMock = [
 
 export const pensjonTpMock = [{ ordning: '4095' }, { ordning: '3010' }]
 
+export const tagsMock = [{ tag: 'DUMMY', beskrivelse: 'Dummy' }]
+
 export const kontoregisterMock = {
 	kontohaver: '12345678912',
 	kontonummer: '99999999999',