Lagt til ny tag og fjernet ukurante miljoer

apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/Tags.java

@@ -1,27 +1,23 @@
 package no.nav.dolly.domain.resultset;
 
-import jakarta.persistence.Embeddable;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 @Getter
-@Embeddable
-@NoArgsConstructor
 public enum Tags {
     SALESFORCE("Salesforce"),
+    UTBETALING("Utbetaling"),
     DOLLY("Dolly");
 
-    private String beskrivelse;
+    private final String beskrivelse;
 
     Tags(String beskrivelse) {
         this.beskrivelse = beskrivelse;
     }
 
     @Getter
-    @Setter
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor

apps/dolly-backend/src/main/resources/application-dev.yaml

@@ -1,4 +1,3 @@
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:dolly-backend-dev
 
 open:
   search:
@@ -11,6 +10,13 @@ spring:
     hikari:
       maximum-pool-size: 3
       minimum-idle: 1
+  security:
+    oauth2:
+      resourceserver:
+        tokenx:
+          issuer-uri: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 consumers:
   testnav-pdl-forvalter:

apps/dolly-backend/src/main/resources/application-local.yaml

@@ -20,13 +20,6 @@ spring:
       maximum-pool-size: 3
       minimum-idle: 1
     driver-class-name: org.postgresql.Driver
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
-          accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
   jpa:
     properties:
       hibernate:

apps/dolly-backend/src/main/resources/application-prod.yaml

@@ -1,4 +1,3 @@
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:dolly-backend
 
 spring:
   datasource:
@@ -7,3 +6,10 @@ spring:
     hikari:
       maximum-pool-size: 10
       minimum-idle: 3
+  security:
+    oauth2:
+      resourceserver:
+        tokenx:
+          issuer-uri: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}

apps/dolly-backend/src/main/resources/application.yaml

@@ -43,13 +43,9 @@ spring:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b/v2.0
-          #The client_id of this application
+          issuer-uri: ${AAD_ISSUER_URI}/v2.0
+          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
           accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
-        tokenx:
-          issuer-uri: ${TOKEN_X_ISSUER}
-          jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

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

@@ -1864,7 +1864,7 @@ export const paginerteGrupperMock = {
 	favoritter: [nyGruppeMock],
 }
 
-export const miljoeMock = '["q1","q2","q4","q5","t3"]'
+export const miljoeMock = '["q1","q2","q4"]'
 export const personFragmentNavigerMock = {
 	gruppe: eksisterendeGruppeMock,
 	identHovedperson: '12345678912',

apps/dolly-frontend/src/main/js/src/components/miljoVelger/MiljoVelger.tsx

@@ -1,15 +1,15 @@
-import { FieldArray } from 'formik'
-import { DollyCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
-import { MiljoeInfo } from './MiljoeInfo'
+import {FieldArray} from 'formik'
+import {DollyCheckbox} from '@/components/ui/form/inputs/checbox/Checkbox'
+import {MiljoeInfo} from './MiljoeInfo'
 
 import './MiljoVelger.less'
 import styled from 'styled-components'
-import { ifPresent } from '@/utils/YupValidations'
+import {ifPresent} from '@/utils/YupValidations'
 import * as Yup from 'yup'
-import { useDollyEnvironments } from '@/utils/hooks/useEnvironments'
+import {useDollyEnvironments} from '@/utils/hooks/useEnvironments'
 import Loading from '@/components/ui/loading/Loading'
-import { ErrorMessageWithFocus } from '@/utils/ErrorMessageWithFocus'
-import { Alert } from '@navikt/ds-react'
+import {ErrorMessageWithFocus} from '@/utils/ErrorMessageWithFocus'
+import {Alert} from '@navikt/ds-react'
 
 const StyledH3 = styled.h3`
 	display: flex;
@@ -78,14 +78,13 @@ export const MiljoVelger = ({
 			return bankIdQ1
 		}
 		return {
-			Q: miljoer.Q.filter((env) => env.id !== 'qx' && env.id !== 'q5'),
-			T: miljoer.T.filter((env) => env.id !== 't13'),
+			Q: miljoer.Q.filter((env) => env.id !== 'qx')
 		}
 	}
 
 	const disableAllEnvironments = erMiljouavhengig(bestillingsdata)
 	const filteredEnvironments = filterEnvironments(dollyEnvironments, bankIdBruker)
-	const order = ['T', 'Q']
+	const order = ['Q']
 
 	return (
 		<div className="miljo-velger">
@@ -123,7 +122,7 @@ export const MiljoVelger = ({
 
 						return (
 							<fieldset key={type} name={`Liste over ${type}-miljøer`}>
-								<StyledH3>{type}-miljøer </StyledH3>
+								<StyledH3>Miljøer </StyledH3>
 								<div className="miljo-velger_checkboxes">
 									{category.map((env) => (
 										<DollyCheckbox

apps/dolly-frontend/src/main/js/src/utils/hooks/useEnvironments.tsx

@@ -1,4 +1,4 @@
-import { fetcher } from '@/api'
+import {fetcher} from '@/api'
 import useSWRImmutable from 'swr/immutable'
 import useSWR from 'swr'
 
@@ -8,7 +8,7 @@ const getArenaMiljoerUrl = '/testnav-arena-forvalteren-proxy/api/v1/miljoe'
 const getInstMiljoerUrl = '/testnav-inst-proxy/api/v1/environment'
 const getDokarkivMiljoerUrl = '/testnav-dokarkiv-proxy/rest/miljoe'
 
-const prefetchedMiljoer = ['t3', 't13', 'q1', 'q2', 'q4', 'q5', 'qx']
+const prefetchedMiljoer = ['t13', 'q1', 'q2', 'q4', 'qx']
 const prefetchedPensjonMiljoer = ['q1', 'q2']
 const prefetchedArenaMiljoer = ['q1', 'q2', 'q4']
 const prefetchedInstMiljoer = { institusjonsoppholdEnvironments: ['q1', 'q2'] }

apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjoner.tsx

@@ -1,9 +1,9 @@
 import useSWR from 'swr'
-import { fetcher, multiFetcherAareg, multiFetcherAmelding } from '@/api'
-import { Organisasjon, OrganisasjonFasteData } from '@/service/services/organisasjonforvalter/types'
-import { Bestillingsinformasjon } from '@/components/bestilling/sammendrag/miljoeStatus/MiljoeStatus'
-import { Arbeidsforhold } from '@/components/fagsystem/inntektsmelding/InntektsmeldingTypes'
-import { useDollyEnvironments } from '@/utils/hooks/useEnvironments'
+import {fetcher, multiFetcherAareg, multiFetcherAmelding} from '@/api'
+import {Organisasjon, OrganisasjonFasteData} from '@/service/services/organisasjonforvalter/types'
+import {Bestillingsinformasjon} from '@/components/bestilling/sammendrag/miljoeStatus/MiljoeStatus'
+import {Arbeidsforhold} from '@/components/fagsystem/inntektsmelding/InntektsmeldingTypes'
+import {useDollyEnvironments} from '@/utils/hooks/useEnvironments'
 
 type MiljoDataListe = {
 	miljo: string
@@ -215,7 +215,7 @@ export const useOrganisasjonBestillingStatus = (
 
 export const useArbeidsforhold = (ident: string, harAaregBestilling: boolean, miljoe?: string) => {
 	const { dollyEnvironmentList } = useDollyEnvironments()
-	const unsupportedEnvironments = ['t13', 'qx', 't3']
+	const unsupportedEnvironments = ['t13', 'qx']
 	const filteredEnvironments = dollyEnvironmentList
 		?.map((miljoe) => miljoe.id)
 		?.filter((miljoe) => !unsupportedEnvironments.includes(miljoe))

apps/dolly-frontend/src/main/resources/application-local.yml

@@ -1,5 +1,6 @@
 POST_LOGOUT_REDIRECT_URI: 'http://localhost:3000/login'
 REDIS_HOST: localhost
+TOKEN_X_ISSUER: dummy
 
 server:
   port: 8020

apps/faste-data-frontend/src/main/js/src/pages/FasteOrganiasjonDataPage/FasteOrganisasjonDataPage.tsx

@@ -1,18 +1,10 @@
-import {
-  Form,
-  InputFormItem,
-  Knapp,
-  Line,
-  Page,
-  Pageable,
-  SelectFormItem,
-} from '@navikt/dolly-komponenter';
-import React, { useEffect, useState } from 'react';
-import { OrganisasjonFasteDataService, OrganisasjonService } from '@/service';
-import { Organisasjon as FasteDataOrganisasjon } from '@/service/OrganisasjonFasteDataService';
-import { CompareTable } from '@/components/compare-table';
-import { OrganisasjonComperator } from '@/comperator';
-import { CodeSearch } from '@/components/CodeSearch';
+import {Form, InputFormItem, Knapp, Line, Page, Pageable, SelectFormItem,} from '@navikt/dolly-komponenter';
+import React, {useEffect, useState} from 'react';
+import {OrganisasjonFasteDataService, OrganisasjonService} from '@/service';
+import {Organisasjon as FasteDataOrganisasjon} from '@/service/OrganisasjonFasteDataService';
+import {CompareTable} from '@/components/compare-table';
+import {OrganisasjonComperator} from '@/comperator';
+import {CodeSearch} from '@/components/CodeSearch';
 
 const grupper = [
   'DOLLY',
@@ -26,7 +18,7 @@ const grupper = [
   'WIP',
 ];
 
-const miljoer = ['q1', 'q2', 'q4', 'q5', 't3'];
+const miljoer = ['q1', 'q2', 'q4'];
 
 const toOptions = (options: string[]) =>
   options.map((value) => ({

apps/faste-data-frontend/src/main/js/src/pages/FastePersonDataPage/FastePersonDataPage.tsx

@@ -1,16 +1,8 @@
-import {
-  Form,
-  InputFormItem,
-  Knapp,
-  Line,
-  Page,
-  Pageable,
-  SelectFormItem,
-} from '@navikt/dolly-komponenter';
-import React, { useEffect, useState } from 'react';
-import { PersonFasteDataService, PersonService } from '@/service';
-import { CompareTable } from '@/components/compare-table';
-import { PersonComperator } from '@/comperator';
+import {Form, InputFormItem, Knapp, Line, Page, Pageable, SelectFormItem,} from '@navikt/dolly-komponenter';
+import React, {useEffect, useState} from 'react';
+import {PersonFasteDataService, PersonService} from '@/service';
+import {CompareTable} from '@/components/compare-table';
+import {PersonComperator} from '@/comperator';
 
 const grupper = [
   'DOLLY',
@@ -28,9 +20,7 @@ const miljoer = [
   'q1',
   'q2',
   'q4',
-  'q5',
   'qx',
-  't3',
   't13',
 ];
 

apps/miljoer-service/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
 
 config:
-  miljoer: t3, t13, q1, q2, q4, qx
+  miljoer: t13, q1, q2, q4, qx
 
 spring:
   main: