Skip to content

Commit 9d10f7c

Browse files
thomashwithomashwi
authored
Merge branch 'master' into chore-fjerne-BRUK_INNTEKTSGRADERING_I_UTTAK
2 parents ea5adf1 + c3ec829 commit 9d10f7c

File tree

189 files changed

+8307
-358
lines changed

Some content is hidden

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

189 files changed

+8307
-358
lines changed

‎.github/workflows/ung-sak-web-build-deploy.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Build and deploy ung-sak-web
2+
on:
3+
push:
4+
paths-ignore:
5+
- '**.md'
6+
- '.gitignore'
7+
- 'CODEOWNERS'
8+
branches:
9+
- master
10+
11+
jobs:
12+
build-deploy:
13+
name: Build and deploy Docker image
14+
runs-on: ubuntu-latest
15+
permissions:
16+
contents: read
17+
id-token: write
18+
env:
19+
CLUSTER: dev-gcp
20+
steps:
21+
- name: Hente kode
22+
uses: actions/checkout@v4
23+
24+
- name: Setup + Install
25+
uses: ./.github/actions/setup-install
26+
with:
27+
npmAuthToken: ${{ secrets.READER_TOKEN }}
28+
29+
- name: Bygge dist
30+
run: yarn build:ung
31+
32+
- name: Opprett release med Sentry
33+
run: yarn sentry-release-ung
34+
env:
35+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
36+
37+
- name: Build and push to docker registry
38+
uses: navikt/sif-gha-workflows/.github/actions/maven/build-push-docker-image@main
39+
id: docker-push
40+
with:
41+
image_base_name: 'ung-sak-web'
42+
without_navikt_prefix: true
43+
#Konfigurerer for bygging av ung docker image:
44+
build-args: |
45+
featureToggles=ung.feature-toggles.json
46+
proxyConfig=ung.proxy.nginx
47+
appVariant=ung
48+
port=9005
49+
labels: |
50+
org.opencontainers.image.title=ung-sak-web
51+
org.opencontainers.image.description=Frontend for ung-sak
52+
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
53+
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
54+
push-image: true
55+
- name: Deploy to nais
56+
uses: nais/deploy/actions/deploy@v2
57+
env:
58+
CLUSTER: ${{ env.CLUSTER }}
59+
RESOURCE: deploy/ung/${{ env.CLUSTER }}.yml
60+
VAR: image=${{ steps.docker-push.outputs.image }}

‎Dockerfile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
FROM nginxinc/nginx-unprivileged:stable-alpine-slim
2+
# These must be set when building for ung-sak-web. Defaults are for k9-sak-web
3+
ARG proxyConfig=proxy.nginx
4+
ARG featureToggles=feature-toggles.json
5+
ARG appVariant=k9
6+
ARG port=9000
27

38
LABEL org.opencontainers.image.source=https://github.com/navikt/k9-sak-web
49

5-
ADD proxy.nginx /etc/nginx/conf.d/app.conf.template
6-
ADD feature-toggles.json /etc/nginx/conf.d/feature-toggles.json
10+
ADD $proxyConfig /etc/nginx/conf.d/app.conf.template
11+
ADD $featureToggles /etc/nginx/conf.d/feature-toggles.json
712
ADD start-server.sh /start-server.sh
813

914
ENV APP_DIR="/app" \
10-
APP_PATH_PREFIX="/k9/sak" \
11-
APP_CALLBACK_PATH="/k9/sak/cb" \
12-
APP_URL_SAK="http://k9-sak"
15+
APP_PATH_PREFIX="/$appVariant/sak" \
16+
APP_CALLBACK_PATH="/$appVariant/sak/cb" \
17+
APP_URL_SAK="http://$appVariant-sak"
1318

1419
COPY dist /usr/share/nginx/html
1520

16-
EXPOSE 9000
21+
EXPOSE $port
1722

1823
# using bash over sh for better signal-handling
1924
CMD sh /start-server.sh

‎deploy/ung/dev-gcp.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
apiVersion: 'nais.io/v1alpha1'
2+
kind: 'Application'
3+
metadata:
4+
name: ung-sak-web
5+
namespace: k9saksbehandling
6+
labels:
7+
team: k9saksbehandling
8+
annotations:
9+
nais.io/run-as-user: '101' #nginx
10+
nais.io/read-only-file-system: 'false' #nginx
11+
nginx.ingress.kubernetes.io/proxy-buffer-size: '32k'
12+
nginx.ingress.kubernetes.io/proxy-read-timeout: '600'
13+
nginx.ingress.kubernetes.io/proxy-send-timeout: '600'
14+
spec:
15+
image: {{ image }}
16+
port: 9005
17+
liveness:
18+
path: /isAlive
19+
initialDelay: 10
20+
readiness:
21+
path: /isReady
22+
initialDelay: 10
23+
replicas:
24+
disableAutoScaling: true
25+
min: 2
26+
max: 2
27+
resources:
28+
requests:
29+
cpu: 200m
30+
memory: 32Mi
31+
limits:
32+
memory: 64Mi
33+
ingresses:
34+
- 'https://ung.intern.dev.nav.no'
35+
accessPolicy:
36+
outbound:
37+
rules:
38+
- application: ung-sak
39+
env:
40+
- name: APP_NAME
41+
value: ung-sak-web
42+
- name: APP_URL
43+
value: 'http://ung-sak'
44+
- name: APP_PORT
45+
value: '9005'
46+
47+
# Setter flagg som bestemmer hvilket sett med feature toggles som skal brukes i frontend.
48+
# Faktiske feature toggles for ulike miljø er satt i ulike filer i packages/v2/gui/src/featuretoggles
49+
- name: FEATURE_TOGGLES_ENV
50+
value: 'ung-sak-q'

‎envDir/.env.development renamed to ‎envDir/k9/.env.development

File renamed without changes.

‎envDir/ung/.env.development

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VITE_FEATURE_TOGGLES_ENV=ung-sak-dev

‎loosely-type-checked-files.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@
7070
"packages/behandling-tilbakekreving/src/components/TilbakekrevingFakta.tsx",
7171
"packages/behandling-tilbakekreving/src/components/TilbakekrevingPaneler.tsx",
7272
"packages/behandling-tilbakekreving/src/components/TilbakekrevingProsess.tsx",
73+
"packages/behandling-ungdomsytelse/src/BehandlingUngdomsytelseIndex.tsx",
74+
"packages/behandling-ungdomsytelse/src/components/UngdomsytelsePaneler.tsx",
75+
"packages/behandling-ungdomsytelse/src/components/UngdomsytelseProsess.spec.tsx",
76+
"packages/behandling-ungdomsytelse/src/components/UngdomsytelseProsess.tsx",
7377
"packages/behandling-unntak/src/BehandlingUnntakIndex.tsx",
7478
"packages/behandling-unntak/src/components/UnntakFakta.spec.tsx",
7579
"packages/behandling-unntak/src/components/UnntakFakta.tsx",
@@ -513,6 +517,26 @@
513517
"packages/tidslinje/src/Timeline.tsx",
514518
"packages/tidslinje/src/components/pleiepenger/Tidslinje.spec.tsx",
515519
"packages/tidslinje/src/components/pleiepenger/Tidslinje.tsx",
520+
"packages/ung/sak-app/app/components/Dekorator.tsx",
521+
"packages/ung/sak-app/app/paths.ts",
522+
"packages/ung/sak-app/app/useTrackRouteParam.tsx",
523+
"packages/ung/sak-app/behandling/BehandlingEventHandler.ts",
524+
"packages/ung/sak-app/behandling/BehandlingIndex.tsx",
525+
"packages/ung/sak-app/behandlingmenu/BehandlingMenuIndex.tsx",
526+
"packages/ung/sak-app/behandlingmenu/MenyKodeverk.ts",
527+
"packages/ung/sak-app/behandlingsupport/BehandlingSupportIndex.tsx",
528+
"packages/ung/sak-app/behandlingsupport/dokument/DokumentIndex.tsx",
529+
"packages/ung/sak-app/behandlingsupport/historikk/HistorikkIndex.tsx",
530+
"packages/ung/sak-app/behandlingsupport/melding/MeldingIndex.tsx",
531+
"packages/ung/sak-app/behandlingsupport/totrinnskontroll/TotrinnskontrollIndex.spec.tsx",
532+
"packages/ung/sak-app/behandlingsupport/totrinnskontroll/TotrinnskontrollIndex.tsx",
533+
"packages/ung/sak-app/bootstrapUng.tsx",
534+
"packages/ung/sak-app/data/useKodeverk.tsx",
535+
"packages/ung/sak-app/data/useVisForhandsvisningAvMelding.tsx",
536+
"packages/ung/sak-app/fagsak/FagsakIndex.tsx",
537+
"packages/ung/sak-app/fagsak/useHentFagsakRettigheter.tsx",
538+
"packages/ung/sak-app/fagsakprofile/FagsakProfileIndex.spec.tsx",
539+
"packages/ung/sak-app/fagsakprofile/FagsakProfileIndex.tsx",
516540
"packages/utils-test/src/redux-form-test-helper.ts",
517541
"packages/utils/src/beregning/VilkarMapper.tsx",
518542
"packages/utils/src/beregning/mapAksjonspunktkoderBeregning.tsx",

‎package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"css:modules:typegen:watch": "tcm ./packages/v2/gui --camelCase dashes --allowArbitraryExtensions --watch",
2828
"css:modules:typegen:check": "tcm ./packages/v2/gui --camelCase dashes --allowArbitraryExtensions --listDifferent",
2929
"dev": "yarn cross-env APP_URL_K9FORMIDLING=http://localhost:8060/rest/dummy vite serve",
30-
"dev-lokal": "cross-env NODE_ENV=development APP_URL_SAK=http://k9-sak:8080 APP_URL_K9OPPDRAG=http://k9-oppdrag:8070 APP_URL_K9FORMIDLING_DD=http://k9-formidling-dokumentdata:8294 APP_URL_K9FORMIDLING=http://localhost:8290 SPLITTET_SAMMENLINGNING_BEREGNING=true AKSJONSPUNKT_OVERLAPPENDE_SAKER=true vite serve",
30+
"dev-lokal": "cross-env NODE_ENV=development APP_URL_SAK=http://k9-sak:8080 APP_URL_UNG_SAK=http://k9-sak:8085 APP_URL_K9OPPDRAG=http://k9-oppdrag:8070 APP_URL_K9FORMIDLING_DD=http://k9-formidling-dokumentdata:8294 APP_URL_K9FORMIDLING=http://localhost:8290 SPLITTET_SAMMENLINGNING_BEREGNING=true AKSJONSPUNKT_OVERLAPPENDE_SAKER=true vite serve",
3131
"dev-med-formidling": "yarn cross-env APP_URL_K9FORMIDLING=http://k9-formidling:8290 SPLITTET_SAMMENLINGNING_BEREGNING=true AKSJONSPUNKT_OVERLAPPENDE_SAKER=true vite serve",
3232
"build": "VITE_SENTRY_RELEASE=$(git rev-parse --short HEAD) vite build",
3333
"up": "docker-compose up -d --remove-orphans --build",
@@ -37,10 +37,14 @@
3737
"build-storybook": "storybook build -o .static_storybook",
3838
"build-storybook-test": "VITE_LOCAL_STORYBOOK=true storybook build --test -o .static_storybook",
3939
"prepare": "husky",
40-
"sentry-release": "(SENTRY_RELEASE=$(git rev-parse --short HEAD); node ./scripts/sentry-release.cjs)"
40+
"sentry-release": "(SENTRY_RELEASE=$(git rev-parse --short HEAD); node ./scripts/sentry-release.cjs)",
41+
"sentry-release-ung": "(SENTRY_RELEASE=$(git rev-parse --short HEAD); node ./scripts/sentry-release-ung.cjs)",
42+
"dev:ung": "vite -c ung.vite.config.js serve",
43+
"build:ung": "VITE_SENTRY_RELEASE=$(git rev-parse --short HEAD) vite -c ung.vite.config.js build"
4144
},
4245
"workspaces": [
4346
"packages/*",
47+
"packages/ung/*",
4448
"packages/v2/*"
4549
],
4650
"dependencies": {
@@ -50,7 +54,7 @@
5054
"@navikt/ds-react": "7.17.2",
5155
"@navikt/ds-tailwind": "^7.17.0",
5256
"@navikt/familie-endringslogg": "14.0.0",
53-
"@navikt/ft-plattform-komponenter": "^7.2.7",
57+
"@navikt/ft-plattform-komponenter": "^7.2.10",
5458
"@popperjs/core": "2.11.8",
5559
"@sentry/browser": "9.6.0",
5660
"@sentry/react": "^9.6.0",

‎packages/behandling-felles/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@k9-sak-web/modal-sett-pa-vent": "1.0.0",
1616
"@k9-sak-web/rest-api-hooks": "1.0.0",
1717
"@k9-sak-web/types": "1.0.0",
18-
"@navikt/ft-plattform-komponenter": "^7.2.7",
18+
"@navikt/ft-plattform-komponenter": "^7.2.10",
1919
"classnames": "2.5.1",
2020
"react": "19.0.0",
2121
"react-intl": "7.1.6",

‎packages/behandling-felles/src/components/InngangsvilkarPanel.tsx

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { RestApiState } from '@k9-sak-web/rest-api-hooks';
1111
import { EndpointData, Options, RestApiData } from '@k9-sak-web/rest-api-hooks/src/local-data/useMultipleRestApi';
1212
import { Behandling, KodeverkMedNavn } from '@k9-sak-web/types';
1313
import { HGrid, Tabs } from '@navikt/ds-react';
14-
import React, { useCallback, useMemo, useState } from 'react';
14+
import { useCallback, useMemo, useState } from 'react';
1515
import { FormattedMessage } from 'react-intl';
1616
import messages from '../i18n/nb_NO.json';
1717
import { ProsessStegPanelUtledet } from '../util/prosessSteg/ProsessStegUtledet';
@@ -105,19 +105,21 @@ const InngangsvilkarPanel = ({
105105
<VerticalSpacer thirtyTwoPx />
106106
</>
107107
)}
108-
<Tabs defaultValue="0">
109-
<Tabs.List>
110-
{tabs.map((tab, index) => (
111-
<Tabs.Tab
112-
key={tab.key}
113-
value={`${index}`}
114-
label={tab.label}
115-
onClick={() => setVisAllePerioder(index === 1)}
116-
/>
117-
))}
118-
</Tabs.List>
119-
</Tabs>
120-
<VerticalSpacer thirtyTwoPx />
108+
{tabs.length > 1 && (
109+
<Tabs defaultValue="0">
110+
<Tabs.List>
111+
{tabs.map((tab, index) => (
112+
<Tabs.Tab
113+
key={tab.key}
114+
value={`${index}`}
115+
label={tab.label}
116+
onClick={() => setVisAllePerioder(index === 1)}
117+
/>
118+
))}
119+
</Tabs.List>
120+
</Tabs>
121+
)}
122+
{tabs.length > 1 ? <VerticalSpacer thirtyTwoPx /> : <VerticalSpacer sixteenPx />}
121123
<HGrid gap="4" columns={filteredPanels.length > 2 ? { xs: '6fr 6fr' } : { xs: '8fr 4fr' }}>
122124
<div>
123125
{filteredPanels

‎packages/behandling-frisinn/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"@k9-sak-web/rest-api": "1.0.0",
1919
"@k9-sak-web/rest-api-hooks": "1.0.0",
2020
"@k9-sak-web/types": "1.0.0",
21-
"@navikt/ft-fakta-beregning": "^8.4.0",
22-
"@navikt/ft-prosess-beregningsgrunnlag": "^8.2.4",
21+
"@navikt/ft-fakta-beregning": "^8.4.2",
22+
"@navikt/ft-prosess-beregningsgrunnlag": "^8.2.6",
2323
"react": "19.0.0",
2424
"react-intl": "7.1.6"
2525
}

‎packages/behandling-omsorgspenger/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"@k9-sak-web/rest-api": "1.0.0",
3030
"@k9-sak-web/rest-api-hooks": "1.0.0",
3131
"@k9-sak-web/types": "1.0.0",
32-
"@navikt/ft-fakta-beregning": "^8.4.0",
33-
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "^9.2.6",
34-
"@navikt/ft-prosess-beregningsgrunnlag": "^8.2.4",
32+
"@navikt/ft-fakta-beregning": "^8.4.2",
33+
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "^9.2.8",
34+
"@navikt/ft-prosess-beregningsgrunnlag": "^8.2.6",
3535
"react": "19.0.0",
3636
"react-intl": "7.1.6"
3737
}

‎packages/behandling-opplaeringspenger/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"@k9-sak-web/rest-api-hooks": "1.0.0",
3434
"@k9-sak-web/sak-app": "1.0.0",
3535
"@k9-sak-web/types": "1.0.0",
36-
"@navikt/ft-fakta-beregning": "^8.4.0",
37-
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "^9.2.6",
38-
"@navikt/ft-prosess-beregningsgrunnlag": "^8.2.4",
36+
"@navikt/ft-fakta-beregning": "^8.4.2",
37+
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "^9.2.8",
38+
"@navikt/ft-prosess-beregningsgrunnlag": "^8.2.6",
3939
"axios": "1.8.3",
4040
"react": "19.0.0",
4141
"react-intl": "7.1.6"

‎packages/behandling-pleiepenger-sluttfase/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"@k9-sak-web/rest-api-hooks": "1.0.0",
3030
"@k9-sak-web/sak-app": "1.0.0",
3131
"@k9-sak-web/types": "1.0.0",
32-
"@navikt/ft-fakta-beregning": "^8.4.0",
33-
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "^9.2.6",
34-
"@navikt/ft-prosess-beregningsgrunnlag": "^8.2.4",
32+
"@navikt/ft-fakta-beregning": "^8.4.2",
33+
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "^9.2.8",
34+
"@navikt/ft-prosess-beregningsgrunnlag": "^8.2.6",
3535
"axios": "1.8.3",
3636
"react": "19.0.0",
3737
"react-intl": "7.1.6"

‎packages/behandling-pleiepenger/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
"@k9-sak-web/sak-app": "1.0.0",
3535
"@k9-sak-web/types": "1.0.0",
3636
"@navikt/diagnosekoder": "^1.2025.0",
37-
"@navikt/ft-fakta-beregning": "^8.4.0",
38-
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "^9.2.6",
39-
"@navikt/ft-prosess-beregningsgrunnlag": "^8.2.4",
37+
"@navikt/ft-fakta-beregning": "^8.4.2",
38+
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "^9.2.8",
39+
"@navikt/ft-prosess-beregningsgrunnlag": "^8.2.6",
4040
"axios": "1.8.3",
4141
"react": "19.0.0",
4242
"react-intl": "7.1.6"

‎packages/behandling-tilbakekreving/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@k9-sak-web/rest-api-hooks": "1.0.0",
1818
"@k9-sak-web/types": "1.0.0",
1919
"@navikt/ft-kodeverk": "^3.0.0",
20-
"@navikt/ft-prosess-tilbakekreving-foreldelse": "^4.2.4",
20+
"@navikt/ft-prosess-tilbakekreving-foreldelse": "^4.2.6",
2121
"react": "19.0.0",
2222
"react-intl": "7.1.6"
2323
}

‎packages/behandling-ungdomsytelse/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export { default } from './src/BehandlingUngdomsytelseIndex';
2+
export * from './src/types';

‎packages/behandling-ungdomsytelse/package.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"name": "@k9-sak-web/behandling-ungdomsytelse",
3+
"version": "1.0.0",
4+
"module": "index.ts",
5+
"license": "MIT",
6+
"private": true,
7+
"dependencies": {
8+
"@fpsak-frontend/kodeverk": "1.0.0",
9+
"@fpsak-frontend/prosess-tilkjent-ytelse": "1.0.0",
10+
"@fpsak-frontend/prosess-vedtak": "1.0.0",
11+
"@fpsak-frontend/shared-components": "1.0.0",
12+
"@fpsak-frontend/utils": "1.0.0",
13+
"@k9-sak-web/behandling-felles": "1.0.0",
14+
"@k9-sak-web/konstanter": "1.0.0",
15+
"@k9-sak-web/rest-api": "1.0.0",
16+
"@k9-sak-web/rest-api-hooks": "1.0.0",
17+
"@k9-sak-web/sak-app": "1.0.0",
18+
"@k9-sak-web/types": "1.0.0",
19+
"axios": "1.8.3",
20+
"react": "19.0.0",
21+
"react-intl": "7.1.6"
22+
}
23+
}

0 commit comments

Comments
 (0)