Skip to content

Commit 469b547

Browse files
fredrikpefredrikpe
committed
Merge branch 'main' into chore/api-client-v2
2 parents a14d250 + 7504128 commit 469b547

File tree

331 files changed

+3880
-4387
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

331 files changed

+3880
-4387
lines changed

‎.github/dependabot.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ updates:
6565
# Trukket ut til egen gruppe siden biblioteket enda ikke er stabilt
6666
hey-api:
6767
patterns:
68-
- "@hey-api/openapi-ts"
68+
- "@hey-api/*"
6969

7070
playwright:
7171
patterns:
@@ -91,6 +91,7 @@ updates:
9191
- "minor"
9292
- "patch"
9393
exclude-patterns:
94+
- "@hey-api/*"
9495
- "playwright"
9596
- "@playwright/test"
9697
- "react"

‎common/database/src/testFixtures/kotlin/no/nav/mulighetsrommet/database/kotest/extensions/FlywayDatabaseTestListener.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import no.nav.mulighetsrommet.database.DatabaseConfig
1111
import no.nav.mulighetsrommet.database.FlywayMigrationManager
1212
import org.assertj.db.api.Assertions
1313
import org.assertj.db.api.TableAssert
14-
import org.assertj.db.type.Table
14+
import org.assertj.db.type.AssertDbConnectionFactory
1515

1616
class FlywayDatabaseTestListener(private val config: DatabaseConfig) : BeforeSpecListener, AfterSpecListener {
1717
private var delegate: Database? = null
@@ -41,8 +41,9 @@ class FlywayDatabaseTestListener(private val config: DatabaseConfig) : BeforeSpe
4141
delegate?.close()
4242
}
4343

44-
fun assertThat(tableName: String): TableAssert {
45-
val table = Table(db.getDatasource(), tableName)
44+
fun assertTable(tableName: String): TableAssert {
45+
val connection = AssertDbConnectionFactory.of(db.getDatasource()).create()
46+
val table = connection.table(tableName).build()
4647
return Assertions.assertThat(table)
4748
}
4849

‎common/domain/src/main/kotlin/no/nav/mulighetsrommet/domain/dbo/ArenaTiltaksgjennomforingDbo.kt ‎common/domain/src/main/kotlin/no/nav/mulighetsrommet/domain/dbo/ArenaGjennomforingDbo.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import java.time.LocalDate
77
import java.util.*
88

99
@Serializable
10-
data class ArenaTiltaksgjennomforingDbo(
10+
data class ArenaGjennomforingDbo(
1111
@Serializable(with = UUIDSerializer::class)
1212
val id: UUID,
1313
@Serializable(with = UUIDSerializer::class)

‎common/domain/src/main/kotlin/no/nav/mulighetsrommet/domain/dto/Personopplysning.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ enum class Personopplysning(private val tittel: String, private val hjelpetekst:
2525
PERSONLIGE_EGENSKAPER_OG_INTERESSER("Opplysninger om personlige egenskaper og interesser", null, 16),
2626
SPRAKKUNNSKAP("Opplysninger om språkkunnskap", null, 17),
2727
ADFERD(
28-
"Opplysninger om atferd som kan ha betydning for tiltaksgjennomføring og jobbmuligheter",
28+
"Opplysninger om atferd som kan ha betydning for tiltaket og jobbmuligheter",
2929
"For eksempel truende adferd, vanskelig å samarbeide med osv. Det kan for eksempel være tilfeller hvor det er nødvendig å informere tiltaksarrangør om at bruker har et sikkerhetstiltak hos Nav.",
3030
18,
3131
),
3232
SOSIALE_FORHOLD(
33-
"Sosiale eller personlige forhold som kan ha betydning for tiltaksgjennomføring og jobbmuligheter",
34-
"For eksempel aleneomsorg for barn og kan derfor ikke jobbe kveldstid, eller økonomiske forhold som går utover tiltaksgjennomføringen.",
33+
"Sosiale eller personlige forhold som kan ha betydning for tiltaket og jobbmuligheter",
34+
"For eksempel aleneomsorg for barn og kan derfor ikke jobbe kveldstid, eller økonomiske forhold som går utover tiltaket.",
3535
19,
3636
),
3737
HELSEOPPLYSNINGER(

‎common/kafka/src/test/kotlin/no/nav/mulighetsrommet/kafka/KafkaConsumerRepositoryTest.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ class KafkaConsumerRepositoryTest : FunSpec({
3131

3232
records.forEach { kafkaConsumerRepository.storeRecord(it) }
3333

34-
database.assertThat("failed_events").hasNumberOfRows(3)
34+
database.assertTable("failed_events").hasNumberOfRows(3)
3535
}
3636

3737
test("should delete records") {
3838
kafkaConsumerRepository.deleteRecords(mutableListOf(1))
39-
database.assertThat("failed_events").hasNumberOfRows(2)
39+
database.assertTable("failed_events").hasNumberOfRows(2)
4040
}
4141

4242
test("should retrieve correct key") {
@@ -51,11 +51,11 @@ class KafkaConsumerRepositoryTest : FunSpec({
5151
}
5252

5353
test("should increment retries") {
54-
database.assertThat("failed_events").row().value("retries").isEqualTo(0)
54+
database.assertTable("failed_events").row().value("retries").isEqualTo(0)
5555

5656
kafkaConsumerRepository.incrementRetries(2)
5757

58-
database.assertThat("failed_events").row().value("retries").isEqualTo(1)
58+
database.assertTable("failed_events").row().value("retries").isEqualTo(1)
5959
}
6060

6161
test("should get topic partitions") {

‎frontend/arena-adapter-manager/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
"preview": "vite preview"
1313
},
1414
"dependencies": {
15-
"@chakra-ui/react": "2.10.3",
15+
"@chakra-ui/react": "2.10.5",
1616
"@emotion/react": "11.14.0",
1717
"@emotion/styled": "11.14.0",
1818
"@rjsf/chakra-ui": "5.24.1",
1919
"@rjsf/core": "5.24.1",
2020
"@rjsf/utils": "5.24.1",
2121
"@rjsf/validator-ajv8": "5.24.1",
22-
"framer-motion": "11.17.0",
22+
"framer-motion": "11.18.1",
2323
"react": "18.3.1",
2424
"react-dom": "18.3.1",
2525
"react-hot-toast": "2.5.1",
2626
"react-icons": "5.4.0",
27-
"react-router": "7.1.1",
27+
"react-router": "7.1.3",
2828
"uuid": "11.0.5"
2929
},
3030
"devDependencies": {

‎frontend/arena-adapter-manager/src/core/api.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export const deleteEvents = async (arenaTable: string, arenaIds: string) => {
109109
export type MrApiTask =
110110
| "generate-validation-report"
111111
| "initial-load-tiltakstyper"
112-
| "initial-load-tiltaksgjennomforinger"
112+
| "initial-load-gjennomforinger"
113113
| "sync-navansatte"
114114
| "sync-utdanning"
115115
| "generate-refusjonskrav";

‎frontend/arena-adapter-manager/src/pages/MrApiManagement.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function MrApiManagement() {
5454

5555
<RunTask
5656
base={ApiBase.MR_API}
57-
task="initial-load-tiltaksgjennomforinger"
57+
task="initial-load-gjennomforinger"
5858
input={{
5959
oneOf: [
6060
{ $ref: "#/definitions/tiltakstyperInput" },

‎frontend/arrangor-flate/app/routes/$orgnr.tilsagn.$id.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { internalNavigation } from "../internal-navigation";
88
import { useOrgnrFromUrl } from "../utils";
99
import { apiHeaders } from "~/auth/auth.server";
1010
import { TilsagnStatusTag } from "~/components/tilsagn/TilsagnStatusTag";
11+
import { tekster } from "../tekster";
1112

1213
type LoaderData = {
1314
tilsagn: ArrangorflateTilsagn;
@@ -44,6 +45,7 @@ export default function TilsagnDetaljerPage() {
4445
definitions={[
4546
{ key: "Tiltakstype", value: tilsagn.tiltakstype.navn },
4647
{ key: "Tiltaksnavn", value: tilsagn.gjennomforing.navn },
48+
{ key: "Tilsagnstype", value: tekster.tilsagn.tilsagntype(tilsagn.type) },
4749
]}
4850
/>
4951
<TilsagnDetaljer tilsagn={tilsagn} />

‎frontend/arrangor-flate/app/tekster.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { TilsagnType } from "@mr/api-client-v2";
2+
3+
export const tekster = {
4+
tilsagn: {
5+
tilsagntype: (type: TilsagnType) => {
6+
switch (type) {
7+
case TilsagnType.TILSAGN:
8+
return "Tilsagn";
9+
case TilsagnType.EKSTRATILSAGN:
10+
return "Ekstratilsagn";
11+
case TilsagnType.INVESTERING:
12+
return "Tilsagn for investeringer";
13+
}
14+
},
15+
},
16+
};

‎frontend/arrangor-flate/package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"@axe-core/playwright": "4.10.1",
2424
"@mr/api-client-v2": "workspace:*",
2525
"@mr/frontend-common": "workspace:*",
26-
"@navikt/aksel-icons": "7.9.1",
27-
"@navikt/ds-css": "7.9.1",
28-
"@navikt/ds-react": "7.9.1",
29-
"@navikt/ds-tailwind": "7.9.1",
26+
"@navikt/aksel-icons": "7.9.2",
27+
"@navikt/ds-css": "7.9.2",
28+
"@navikt/ds-react": "7.9.2",
29+
"@navikt/ds-tailwind": "7.9.2",
3030
"@navikt/nav-dekoratoren-moduler": "3.1.3",
3131
"@navikt/oasis": "3.6.0",
32-
"@react-router/express": "7.1.1",
33-
"@react-router/node": "7.1.1",
34-
"@react-router/serve": "7.1.1",
32+
"@react-router/express": "7.1.3",
33+
"@react-router/node": "7.1.3",
34+
"@react-router/serve": "7.1.3",
3535
"compression": "1.7.5",
3636
"cross-env": "7.0.3",
3737
"csp-header": "6.0.0",
@@ -46,30 +46,30 @@
4646
"prom-client": "15.1.3",
4747
"react": "18.3.1",
4848
"react-dom": "18.3.1",
49-
"react-router": "7.1.1",
49+
"react-router": "7.1.3",
5050
"uuid": "11.0.5",
5151
"winston": "3.17.0"
5252
},
5353
"devDependencies": {
5454
"@playwright/test": "1.49.1",
55-
"@react-router/dev": "7.1.1",
56-
"@react-router/fs-routes": "7.1.1",
55+
"@react-router/dev": "7.1.3",
56+
"@react-router/fs-routes": "7.1.3",
5757
"@tailwindcss/typography": "0.5.16",
5858
"@types/compression": "1.7.5",
5959
"@types/express": "5.0.0",
6060
"@types/morgan": "1.9.9",
61-
"@types/node": "22.10.5",
61+
"@types/node": "22.10.7",
6262
"@types/react": "18.3.12",
6363
"@types/react-dom": "18.3.1",
64-
"@typescript-eslint/eslint-plugin": "8.19.1",
65-
"@typescript-eslint/parser": "8.19.1",
64+
"@typescript-eslint/eslint-plugin": "8.20.0",
65+
"@typescript-eslint/parser": "8.20.0",
6666
"autoprefixer": "10.4.20",
6767
"eslint": "9.18.0",
6868
"eslint-plugin-react": "7.37.4",
6969
"eslint-plugin-react-hooks": "5.1.0",
7070
"globals": "15.14.0",
7171
"playwright": "1.49.1",
72-
"postcss": "8.4.49",
72+
"postcss": "8.5.1",
7373
"postcss-import": "16.1.0",
7474
"tailwindcss": "3.4.17",
7575
"typescript": "5.7.3",

‎frontend/eslint-config-react-app/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
"main": "index.mjs",
66
"devDependencies": {
77
"@eslint/js": "9.18.0",
8-
"@tanstack/eslint-plugin-query": "5.62.16",
8+
"@tanstack/eslint-plugin-query": "5.64.2",
99
"eslint": "9.18.0",
10-
"eslint-plugin-prettier": "5.2.1",
10+
"eslint-plugin-prettier": "5.2.3",
1111
"eslint-plugin-promise": "7.2.1",
1212
"eslint-plugin-react": "7.37.4",
1313
"eslint-plugin-react-hooks": "5.1.0",
1414
"eslint-plugin-react-refresh": "0.4.18",
1515
"typescript": "5.7.3",
16-
"typescript-eslint": "8.19.1"
16+
"typescript-eslint": "8.20.0"
1717
}
1818
}

‎frontend/frontend-common/components/filterAndTableLayout/FilterAndTableLayout.module.scss

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
.tags_and_table_container {
77
grid-row: 2;
88
grid-column: 2 / 3;
9+
margin-left: 0.5rem;
910
@media (max-width: 1450px) {
1011
grid-column: 1 / 3;
1112
}

‎frontend/frontend-common/components/toolbar/toolbarMeny/ToolbarMeny.module.scss

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
justify-content: space-between;
44
align-items: center;
55
padding-bottom: 0.5rem;
6+
margin-left: 0.5rem;
67
}

‎frontend/frontend-common/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
"dependencies": {
1010
"@hookform/resolvers": "3.10.0",
1111
"@mr/api-client-v2": "workspace:*",
12-
"@navikt/aksel-icons": "7.9.1",
13-
"@navikt/ds-css": "7.9.1",
14-
"@navikt/ds-react": "7.9.1",
15-
"@tanstack/react-query": "5.64.0",
12+
"@navikt/aksel-icons": "7.9.2",
13+
"@navikt/ds-css": "7.9.2",
14+
"@navikt/ds-react": "7.9.2",
15+
"@tanstack/react-query": "5.64.2",
1616
"classnames": "2.5.1",
1717
"debounce": "2.2.0",
1818
"react": "18.3.1",
1919
"react-dom": "18.3.1",
2020
"react-error-boundary": "5.0.0",
2121
"react-hook-form": "7.54.2",
2222
"react-select": "5.9.0",
23-
"react-router": "7.1.1",
23+
"react-router": "7.1.3",
2424
"use-resize-observer": "9.1.0",
2525
"zod": "3.24.1"
2626
},

‎frontend/mr-admin-flate/package.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
"@hookform/resolvers": "3.10.0",
2626
"@mr/api-client": "workspace:*",
2727
"@mr/frontend-common": "workspace:*",
28-
"@navikt/aksel-icons": "7.9.1",
29-
"@navikt/ds-css": "7.9.1",
30-
"@navikt/ds-react": "7.9.1",
31-
"@navikt/ds-tailwind": "7.9.1",
28+
"@navikt/aksel-icons": "7.9.2",
29+
"@navikt/ds-css": "7.9.2",
30+
"@navikt/ds-react": "7.9.2",
31+
"@navikt/ds-tailwind": "7.9.2",
3232
"@portabletext/react": "3.2.0",
3333
"@portabletext/types": "2.0.13",
34-
"@tanstack/react-query": "5.64.0",
35-
"@tanstack/react-query-devtools": "5.64.0",
34+
"@tanstack/react-query": "5.64.2",
35+
"@tanstack/react-query-devtools": "5.64.2",
3636
"@types/is-url": "1.2.32",
3737
"classnames": "2.5.1",
3838
"highcharts": "12.1.2",
@@ -44,7 +44,7 @@
4444
"react-dom": "18.3.1",
4545
"react-hook-form": "7.54.2",
4646
"react-number-format": "5.4.3",
47-
"react-router": "7.1.1",
47+
"react-router": "7.1.3",
4848
"react-select": "5.9.0",
4949
"slate": "0.112.0",
5050
"slate-history": "0.110.3",
@@ -68,7 +68,6 @@
6868
"msw": "2.7.0",
6969
"playwright": "1.49.1",
7070
"postcss-import": "16.1.0",
71-
"sass-embedded": "1.83.1",
7271
"tailwindcss": "3.4.17",
7372
"typescript": "5.7.3",
7473
"vite": "6.0.7",

0 commit comments

Comments
 (0)