Skip to content

Commit 032d616

Browse files
krharumkrharum
committed
Merge branch 'master' into feature/magic-token-trivia
2 parents d30ec7c + 6dfa2c4 commit 032d616

42 files changed

Lines changed: 4542 additions & 1397 deletions

File tree

Some content is hidden

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

‎.github/workflows/app.team-dolly-lokal-app.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
paths:
66
- plugins/**
77
- .nais/team-dolly-lokal-app.yml
8+
- .nais/dolly-lokal-auth.yaml
89
- .github/workflows/app.team-dolly-lokal-app.yml
910

1011
jobs:

‎.nais/dolly-local-auth.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
apiVersion: "nais.io/v1alpha1"
2+
kind: "Application"
3+
metadata:
4+
name: "dolly-local-auth"
5+
namespace: "dolly"
6+
spec:
7+
image: "europe-north1-docker.pkg.dev/nais-management-233d/nais/localauth:latest"
8+
port: 8080
9+
replicas:
10+
min: 1
11+
max: 1
12+
liveness:
13+
path: "/internal/healthz"
14+
readiness:
15+
path: "/internal/healthz"
16+
resources:
17+
limits:
18+
memory: "256Mi"
19+
requests:
20+
cpu: "10m"
21+
memory: "32Mi"
22+
ingresses:
23+
- https://dolly-local-auth.intern.dev.nav.no
24+
azure:
25+
application:
26+
enabled: true
27+
allowAllUsers: true
28+
env:
29+
- name: LOCALAUTH_PUBLIC_URL
30+
value: "https://dolly-local-auth.intern.dev.nav.no"

‎.nais/localauth.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
apiVersion: "nais.io/v1alpha1"
2+
kind: "Application"
3+
metadata:
4+
name: "localauth"
5+
namespace: "dolly"
6+
spec:
7+
image: "europe-north1-docker.pkg.dev/nais-management-233d/nais/localauth:latest"
8+
port: 8080
9+
replicas:
10+
min: 1
11+
max: 1
12+
liveness:
13+
path: "/internal/healthz"
14+
readiness:
15+
path: "/internal/healthz"
16+
resources:
17+
limits:
18+
memory: "256Mi"
19+
requests:
20+
cpu: "10m"
21+
memory: "32Mi"
22+
ingresses:
23+
- https://localauth-dolly.intern.dev.nav.no
24+
azure:
25+
application:
26+
enabled: true
27+
allowAllUsers: true
28+
env:
29+
- name: LOCALAUTH_PUBLIC_URL
30+
value: "https://localauth-dolly.intern.dev.nav.no"

‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kelvinaap/domain/AapOpprettRequest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import lombok.Data;
66
import lombok.NoArgsConstructor;
77

8+
import java.time.LocalDate;
89
import java.util.List;
910

1011
@Data
@@ -19,6 +20,8 @@ public class AapOpprettRequest {
1920
private Boolean harMedlemskap;
2021
private Boolean harYrkesskade;
2122
private String ident;
23+
private LocalDate soeknadsdato;
24+
private Boolean automatiskMeldekort;
2225

2326
@Data
2427
@Builder

‎apps/dolly-backend/src/main/java/no/nav/dolly/consumer/teamkatalog/command/TeamkatalogGetCommand.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import reactor.core.publisher.Flux;
1010
import reactor.core.publisher.Mono;
1111

12+
import java.time.Duration;
1213
import java.util.List;
1314
import java.util.concurrent.Callable;
1415

@@ -49,6 +50,7 @@ public Flux<TeamkatalogDTO> call() {
4950
.status(description.getStatus())
5051
.feilmelding(description.getMessage())
5152
.build());
52-
});
53+
})
54+
.cache(Duration.ofDays(1));
5355
}
5456
}

‎apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/kelvinaap/RsKelvinAapRequestDTO.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import lombok.Data;
66
import lombok.NoArgsConstructor;
77

8+
import java.time.LocalDate;
89
import java.util.List;
910

1011
@Data
@@ -18,6 +19,8 @@ public class RsKelvinAapRequestDTO {
1819
private Boolean erStudent;
1920
private Boolean harMedlemskap;
2021
private Boolean harYrkesskade;
22+
private LocalDate soeknadsdato;
23+
private Boolean automatiskMeldekort;
2124

2225
@Data
2326
@Builder

‎apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/ForwardAndRedirectController.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public RouterFunction<ServerResponse> htmlRouter(@Value("classpath:/static/index
3232
.andRoute(RequestPredicates.GET("/bruker/**"), indexHandler)
3333
.andRoute(RequestPredicates.GET("/team/**"), indexHandler)
3434
.andRoute(RequestPredicates.GET("/dollysoek/**"), indexHandler)
35+
.andRoute(RequestPredicates.GET("/dashboard/**"), indexHandler)
3536
.andRoute(RequestPredicates.GET("/tenorpersoner/**"), indexHandler)
3637
.andRoute(RequestPredicates.GET("/orgtilgang/**"), indexHandler)
3738
.andRoute(RequestPredicates.GET("/levendearbeidsforhold/**"), indexHandler)

‎apps/dolly-frontend/src/main/js/package.json‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dolly",
3-
"version": "3.5.3",
3+
"version": "3.5.4",
44
"type": "module",
55
"description": "",
66
"main": "index.js",
@@ -25,18 +25,20 @@
2525
"@hookform/resolvers": "^5.4.0",
2626
"@navikt/aksel-icons": "^8.11.1",
2727
"@popperjs/core": "^2.11.8",
28-
"axios": "^1.16.1",
28+
"axios": "^1.17.0",
2929
"classnames": "^2.5.1",
3030
"country-data-list": "^1.6.3",
3131
"date-fns": "^4.4.0",
3232
"dayjs": "^1.11.21",
33+
"highcharts": "^12.6.0",
34+
"highcharts-react-official": "^3.2.3",
3335
"history": "^5.3.0",
3436
"immer": "^11.1.8",
3537
"lodash-es": "^4.18.1",
3638
"rc-tooltip": "^6.4.0",
37-
"react": "^19.2.6",
39+
"react": "^19.2.7",
3840
"react-confetti-explosion": "^3.0.3",
39-
"react-dom": "^19.2.6",
41+
"react-dom": "^19.2.7",
4042
"react-highlight-words": "^0.21.0",
4143
"react-hook-form": "8.0.0-beta.1",
4244
"react-inlinesvg": "^4.4.1",
@@ -68,19 +70,19 @@
6870
"@testing-library/react": "^16.3.2",
6971
"@testing-library/user-event": "^14.6.1",
7072
"@types/lodash-es": "^4.17.12",
71-
"@types/node": "^25.9.1",
72-
"@types/react": "^19.2.15",
73+
"@types/node": "^25.9.2",
74+
"@types/react": "^19.2.17",
7375
"@types/react-dom": "^19.2.3",
7476
"@types/react-highlight-words": "^0.20.1",
7577
"@types/react-modal": "^3.16.3",
7678
"@types/react-redux": "^7.1.34",
7779
"@types/redux-actions": "^2.6.5",
78-
"@typescript-eslint/eslint-plugin": "^8.60.0",
79-
"@typescript-eslint/parser": "^8.60.0",
80+
"@typescript-eslint/eslint-plugin": "^8.60.1",
81+
"@typescript-eslint/parser": "^8.60.1",
8082
"@vitejs/plugin-react": "^6.0.2",
81-
"@vitest/browser": "^4.1.7",
82-
"@vitest/browser-playwright": "^4.1.7",
83-
"@vitest/ui": "^4.1.7",
83+
"@vitest/browser": "^4.1.8",
84+
"@vitest/browser-playwright": "^4.1.8",
85+
"@vitest/ui": "^4.1.8",
8486
"babel-plugin-react-compiler": "^1.0.0",
8587
"babel-plugin-styled-components": "^2.3.0",
8688
"dot-prop": "^10.1.0",
@@ -98,12 +100,12 @@
98100
"react-dropzone": "^15.0.0",
99101
"react-pdf": "^10.4.1",
100102
"react-redux": "^9.3.0",
101-
"react-router": "^7.16.0",
103+
"react-router": "^7.17.0",
102104
"sass": "^1.100.0",
103105
"swr": "^2.4.1",
104106
"typescript": "^6.0.3",
105-
"vite": "^8.0.14",
106-
"vitest": "^4.1.7",
107+
"vite": "^8.0.16",
108+
"vitest": "^4.1.8",
107109
"vitest-browser-react": "^2.2.0"
108110
},
109111
"prettier": {

0 commit comments

Comments
 (0)
⚡