Merge branch 'master' into feature/krr-default-verdier

navikt · Jun 18, 2024 · 21244ef · 21244ef
2 parents 905d8f0 + daad535
commit 21244ef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/apps/dolly-frontend/src/main/js/playwright/mocks/Selectors.tsx b/apps/dolly-frontend/src/main/js/playwright/mocks/Selectors.tsx
@@ -1,6 +1,5 @@
 export enum TestComponentSelectors {
 	INPUT_MINSIDE_SOEK_MAL = 'input-minside-mal',
-	INPUT_DOLLY_SOEK = 'input-dolly-soek',
 	INPUT_TESTNORGE_FNR = 'input-testnorge-fnr',
 	INPUT_TENORSOEK_FNR = 'input-tenorsoek-fnr',
 	INPUT_NAVN = 'input-navn',
@@ -96,12 +95,12 @@ export enum TestComponentSelectors {
 	BUTTON_TENOR_CLEAR_HEADER = 'button-tenor-clear-options',
 	BUTTON_MODAL_CLOSE = 'button-modal-lukk',
 	SELECT_PERSON_SEARCH = 'select-person-search',
-	SELECT_TAGS = 'select-tags',
 	HOVER_MILJOE = 'hover-miljoe',
 	CHECKBOX_FORBEDRING_ANONYM = 'checkbox-forbedring-anonym',
 	CHECKBOX_TENORSOEK = 'checkbox-tenorsoek',
 	CHECKBOX_ORGANISASJONER_TENORSOEK = 'checkbox-organisasjoner-tenorsoek',
 	ERROR_MESSAGE_NAVIGERING = 'error-message-navigering',
 	EXPANDABLE_PERSONINFORMASJON = 'expandable-personinformasjon',
 	CONTAINER_VALGTE_PERSONER = 'container-valgte-personer',
+	CONTAINER_FINN_PERSON_BESTILLING = 'container-finn-person-bestilling',
 }
diff --git a/apps/dolly-frontend/src/main/js/playwright/tests/Navigering.spec.ts b/apps/dolly-frontend/src/main/js/playwright/tests/Navigering.spec.ts
@@ -52,7 +52,9 @@ test.describe('Navigering til ident som finnes i gruppe 1', () => {
 			})
 		})
 
-		await page.getByTestId(TestComponentSelectors.INPUT_DOLLY_SOEK).fill('12345')
+		const searchInput = page.getByTestId('container-finn-person-bestilling').locator('input')
+
+		await searchInput.fill('12345')
 		await page.getByTestId(TestComponentSelectors.BUTTON_NAVIGER_DOLLY).click()
 		await page.waitForTimeout(400)
 
@@ -69,11 +71,11 @@ test.describe('Navigering til ident som finnes i gruppe 1', () => {
 		})
 
 		await page.getByTestId(TestComponentSelectors.TOGGLE_SEARCH_BESTILLING).click()
-		await page.getByTestId(TestComponentSelectors.INPUT_DOLLY_SOEK).fill('1')
+		await searchInput.fill('1')
 
 		await page.getByTestId(TestComponentSelectors.BUTTON_NAVIGER_DOLLY).click()
 		await page.getByTestId(TestComponentSelectors.TOGGLE_SEARCH_PERSON).click()
-		await page.getByTestId(TestComponentSelectors.INPUT_DOLLY_SOEK).fill('12345')
+		await searchInput.fill('12345')
 
 		await page.getByTestId(TestComponentSelectors.BUTTON_NAVIGER_DOLLY).click()
 		await page.waitForTimeout(400)

diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppeOversikt/FinnPersonBestilling.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppeOversikt/FinnPersonBestilling.tsx
@@ -232,10 +232,6 @@ const FinnPersonBestilling = ({
 		</components.Option>
 	)
 
-	const CustomInput = (props: JSX.IntrinsicAttributes) => {
-		return <components.Input data-testid={TestComponentSelectors.INPUT_DOLLY_SOEK} {...props} />
-	}
-
 	const DropdownIndicator = (props: JSX.IntrinsicAttributes) => {
 		return (
 			// @ts-ignore
@@ -254,7 +250,10 @@ const FinnPersonBestilling = ({
 	return (
 		<ErrorBoundary>
 			<div>
-				<div className="finnperson-container skjemaelement">
+				<div
+					data-testId={TestComponentSelectors.CONTAINER_FINN_PERSON_BESTILLING}
+					className="finnperson-container skjemaelement"
+				>
 					<VelgSoekTypeToggle soekValg={soekType} setValgtSoekType={setSoekType} />
 					{/*@ts-ignore*/}
 					<StyledAsyncSelect
@@ -266,7 +265,6 @@ const FinnPersonBestilling = ({
 						components={{
 							Option: CustomOption,
 							DropdownIndicator,
-							Input: CustomInput,
 						}}
 						isClearable={true}
 						options={options}