Skip to content

Commit 0fa9546

Browse files
terjeofnorwayterjeofnorway
committed
Merge remote-tracking branch 'origin/main' into spor-rydding-del1
2 parents 117f68d + b1502ac commit 0fa9546

File tree

55 files changed

+368
-142
lines changed

Some content is hidden

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

55 files changed

+368
-142
lines changed

‎.github/workflows/build-image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232
INNLOGGINGSSTATUS_URL:
3333
required: true
3434
type: string
35-
NAVNO_API_URL:
35+
MELDEKORT_API_URL:
3636
required: true
3737
type: string
3838
NAVNO_SEARCH_API_URL:
@@ -95,8 +95,8 @@ jobs:
9595
FAILOVER_ORIGIN=${{ inputs.FAILOVER_ORIGIN }}
9696
IS_FAILOVER_INSTANCE=${{ inputs.IS_FAILOVER_INSTANCE }}
9797
INNLOGGINGSSTATUS_URL=${{ inputs.INNLOGGINGSSTATUS_URL }}
98-
NAVNO_API_URL=${{ inputs.NAVNO_API_URL }}
9998
NAVNO_SEARCH_API_URL=${{ inputs.NAVNO_SEARCH_API_URL }}
99+
MELDEKORT_API_URL=${{ inputs.MELDEKORT_API_URL }}
100100
ASSET_PREFIX=https://cdn.nav.no/personbruker/nav-enonicxp-frontend
101101
IMAGE_CACHE_DIR=/tmp/images
102102
NEXT_TELEMETRY_DISABLED=1

‎.github/workflows/deploy-alerts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Deploy prod-alerts
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66
paths:
77
- .nais/alerts.yml
88

‎.github/workflows/deploy-failover.prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
DECORATOR_URL: https://www.nav.no/dekoratoren
2121
XP_ORIGIN: https://www.nav.no
2222
TELEMETRY_URL: https://telemetry.nav.no/collect
23+
MELDEKORT_API_URL: https://meldekort-api.nav.no/meldekort/meldekort-api/api/person
2324
INNLOGGINGSSTATUS_URL: https://www.nav.no/person/nav-dekoratoren-api/auth
24-
NAVNO_API_URL: https://www.nav.no/person/navno-api
2525
NAVNO_SEARCH_API_URL: https://navno-search-api.nav.no/content/search-url
2626
FAILOVER_ORIGIN: https://www-failover.nav.no
2727
IS_FAILOVER_INSTANCE: true

‎.github/workflows/deploy-storybook.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Deploy Storybook to github pages
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
permissions:
99
contents: read

‎.github/workflows/deploy-to-nais.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
hpa_file:
1818
required: false
1919
type: string
20-
deploy_redis:
20+
deploy_valkey:
2121
required: false
2222
type: boolean
2323

@@ -30,14 +30,14 @@ jobs:
3030
steps:
3131
- name: Checkout repo
3232
uses: actions/checkout@v4
33-
- name: Deploy Redis
34-
if: ${{ inputs.deploy_redis == true }}
33+
- name: Deploy Valkey
34+
if: ${{ inputs.deploy_valkey == true }}
3535
uses: nais/deploy/actions/deploy@v2
3636
timeout-minutes: 1
3737
continue-on-error: true
3838
env:
3939
CLUSTER: ${{ inputs.cluster }}
40-
RESOURCE: .nais/redis.yml
40+
RESOURCE: .nais/valkey.yml
4141
VARS: .nais/vars/${{ inputs.vars_file }}
4242
- name: Deploy HPA
4343
if: ${{ inputs.hpa_file }}

‎.github/workflows/deploy.dev1.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
TELEMETRY_URL: https://telemetry.ekstern.dev.nav.no/collect
3030
INNLOGGINGSSTATUS_URL: https://www.ekstern.dev.nav.no/person/nav-dekoratoren-api/auth
3131
RELEASE_TAG: dev1-${{ github.sha }}
32-
NAVNO_API_URL: https://www.ansatt.dev.nav.no/person/navno-api
3332
NAVNO_SEARCH_API_URL: https://navno-search-api.ekstern.dev.nav.no/content/search-url
33+
MELDEKORT_API_URL: https://meldekort-api-q1.intern.dev.nav.no/meldekort/meldekort-api/api/person
3434
FAILOVER_ORIGIN: https://www-failover.intern.dev.nav.no
3535
NODE_ENV: ${{ inputs.NODE_ENV }}
3636
secrets:
@@ -48,4 +48,4 @@ jobs:
4848
vars_file: vars-dev1.yml
4949
config_file: config.yml
5050
hpa_file: hpa-dev1.yml
51-
deploy_redis: true
51+
deploy_valkey: true

‎.github/workflows/deploy.dev2.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
TELEMETRY_URL: https://telemetry.ekstern.dev.nav.no/collect
3030
INNLOGGINGSSTATUS_URL: https://www.ekstern.dev.nav.no/person/nav-dekoratoren-api/auth
3131
RELEASE_TAG: dev2-${{ github.sha }}
32-
NAVNO_API_URL: https://www.ansatt.dev.nav.no/person/navno-api
32+
MELDEKORT_API_URL: https://meldekort-api-q1.intern.dev.nav.no/meldekort/meldekort-api/api/person
3333
NAVNO_SEARCH_API_URL: https://navno-search-api.ekstern.dev.nav.no/content/search-url
3434
FAILOVER_ORIGIN: https://www-2-failover.intern.dev.nav.no
3535
NODE_ENV: ${{ inputs.NODE_ENV }}
@@ -48,4 +48,4 @@ jobs:
4848
vars_file: vars-dev2.yml
4949
config_file: config.yml
5050
hpa_file: hpa-dev2.yml
51-
deploy_redis: true
51+
deploy_valkey: true

‎.github/workflows/deploy.prod.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
build:
8-
if: github.event.release.target_commitish == 'master'
8+
if: github.event.release.target_commitish == 'main'
99
uses: ./.github/workflows/build-image.yml
1010
permissions:
1111
contents: "read"
@@ -23,7 +23,7 @@ jobs:
2323
INNLOGGINGSSTATUS_URL: https://www.nav.no/person/nav-dekoratoren-api/auth
2424
NAVNO_SEARCH_API_URL: https://navno-search-api.nav.no/content/search-url
2525
RELEASE_TAG: ${{ github.ref_name }}
26-
NAVNO_API_URL: https://www.nav.no/person/navno-api
26+
MELDEKORT_API_URL: https://meldekort-api.nav.no/meldekort/meldekort-api/api/person
2727
FAILOVER_ORIGIN: https://www-failover.nav.no
2828
NODE_ENV: production
2929
secrets:
@@ -41,4 +41,4 @@ jobs:
4141
vars_file: vars-prod.yml
4242
config_file: config.yml
4343
hpa_file: hpa-prod.yml
44-
deploy_redis: true
44+
deploy_valkey: true

‎.nais/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ spec:
2727
prometheus:
2828
enabled: true
2929
path: /internal/metrics
30-
redis:
31-
- instance: {{ redis.instance }}
30+
valkey:
31+
- instance: {{ valkey.instance }}
3232
access: readwrite
3333
ingresses:
3434
{{#each ingresses as |url|}}

‎.nais/redis.yml ‎.nais/valkey.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
apiVersion: aiven.io/v1alpha1
2-
kind: Redis
2+
kind: Valkey
33
metadata:
44
labels:
55
app: nav-enonicxp-frontend
66
team: personbruker
7-
name: redis-personbruker-{{ redis.instance }}
7+
name: valkey-personbruker-{{ valkey.instance }}
88
namespace: personbruker
99
spec:
10-
plan: {{ redis.plan }}
11-
project: {{ redis.project }}
10+
plan: {{ valkey.plan }}
11+
project: {{ valkey.project }}
1212
maintenanceWindowDow: saturday
1313
maintenanceWindowTime: 20:00:00
1414
userConfig:
15-
redis_maxmemory_policy: allkeys-lru
15+
valkey_maxmemory_policy: allkeys-lru
1616

1717
---
1818
apiVersion: aiven.io/v1alpha1
1919
kind: ServiceIntegration
2020
metadata:
2121
labels:
2222
team: personbruker
23-
name: redis-personbruker-{{ redis.instance }}
23+
name: valkey-personbruker-{{ valkey.instance }}
2424
namespace: personbruker
2525
spec:
26-
project: {{ redis.project }}
26+
project: {{ valkey.project }}
2727
integrationType: prometheus
28-
destinationEndpointId: {{ redis.endpointId }}
29-
sourceServiceName: redis-personbruker-{{ redis.instance }}
28+
destinationEndpointId: {{ valkey.endpointId }}
29+
sourceServiceName: valkey-personbruker-{{ valkey.instance }}

‎.nais/vars/vars-dev1.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ resources:
1515
memory: 1000Mi
1616
limits:
1717
memory: 2000Mi
18-
redis:
18+
valkey:
1919
plan: hobbyist
2020
project: nav-dev
2121
instance: pagecache

‎.nais/vars/vars-dev2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resources:
1616
memory: 500Mi
1717
limits:
1818
memory: 1000Mi
19-
redis:
19+
valkey:
2020
plan: hobbyist
2121
project: nav-dev
2222
instance: pagecache

‎.nais/vars/vars-prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ resources:
1313
memory: 2048Mi
1414
limits:
1515
memory: 4096Mi
16-
redis:
16+
valkey:
1717
plan: startup-4
1818
project: nav-prod
1919
instance: pagecache

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Se også https://cloud.google.com/artifact-registry/docs/docker/authentication#g
5858

5959
## Prodsetting
6060

61-
- Lag en PR til master, og merge inn etter godkjenning
62-
- Lag en release på master med versjon-bump, beskrivende tittel og oppsummering av endringene dine
61+
- Lag en PR til main, og merge inn etter godkjenning
62+
- Lag en release på main med versjon-bump, beskrivende tittel og oppsummering av endringene dine
6363
- Publiser release'en for å starte deploy til prod
6464

6565
## Logger og metrikker

‎docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
- '3002:3002'
88
environment:
99
SERVICE_SECRET: 'dummyToken'
10-
NO_REDIS: true
10+
NO_VALKEY: true
1111

1212
dekoratoren:
1313
container_name: dekoratoren-xpfrontend

‎package-lock.json

+37-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/nextjs/.env.development

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ IS_FAILOVER_INSTANCE='false'
1414
RELEASE_TAG=development
1515
ASSET_PREFIX=http://localhost:3000
1616
TELEMETRY_URL=http://localhost:12347/collect
17-
NAVNO_API_URL=https://www.nav.no/person/navno-api
1817
NAVNO_SEARCH_API_URL=https://navno-search-api.ekstern.dev.nav.no/content/search-url
1918
NEXT_TELEMETRY_DISABLED=1
19+
MELDEKORT_API_URL=https://meldekort-api-q1.intern.dev.nav.no/meldekort/meldekort-api/api/person

‎packages/nextjs/.env.prod-local

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ IS_FAILOVER_INSTANCE='false'
1414
RELEASE_TAG=prodLocal
1515
ASSET_PREFIX=http://localhost:3000
1616
TELEMETRY_URL=http://localhost:12347/collect
17-
NAVNO_API_URL=https://www.nav.no/person/navno-api
1817
NAVNO_SEARCH_API_URL=https://navno-search-api.ekstern.dev.nav.no/content/search-url
1918
NEXT_TELEMETRY_DISABLED=1
19+
MELDEKORT_API_URL=https://meldekort-api.nav.no/meldekort/meldekort-api/api/person

‎packages/nextjs/next.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ const config = {
148148
FAILOVER_ORIGIN: process.env.FAILOVER_ORIGIN,
149149
IS_FAILOVER_INSTANCE: process.env.IS_FAILOVER_INSTANCE,
150150
INNLOGGINGSSTATUS_URL: process.env.INNLOGGINGSSTATUS_URL,
151-
NAVNO_API_URL: process.env.NAVNO_API_URL,
152151
NAVNO_SEARCH_API_URL: process.env.NAVNO_SEARCH_API_URL,
153152
DECORATOR_URL: process.env.DECORATOR_URL,
154153
TELEMETRY_URL: process.env.TELEMETRY_URL,
154+
MELDEKORT_API_URL: process.env.MELDEKORT_API_URL,
155155
},
156156
images: {
157157
minimumCacheTTL: isFailover ? 3600 * 24 * 365 : 3600 * 24,

‎packages/nextjs/nodeenv.d.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ declare global {
1515
IMAGE_CACHE_DIR: string;
1616
FAILOVER_ORIGIN: string;
1717
IS_FAILOVER_INSTANCE: string;
18-
NAVNO_API_URL: string;
18+
MELDEKORT_API_URL: string;
1919
NAVNO_SEARCH_API_URL: string;
2020
ASSET_PREFIX: string;
2121
TELEMETRY_URL: string;
2222
NEXT_PHASE: string;
23-
REDIS_URI_PAGECACHE: string;
24-
REDIS_USERNAME_PAGECACHE: string;
25-
REDIS_PASSWORD_PAGECACHE: string;
23+
VALKEY_URI_PAGECACHE: string;
24+
VALKEY_USERNAME_PAGECACHE: string;
25+
VALKEY_PASSWORD_PAGECACHE: string;
2626
DECORATOR_NOCACHE?: 'true' | 'false';
2727
}
2828
}

‎packages/nextjs/src/components/_common/accordion/Accordion.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, useRef, useState } from 'react';
22
import { Accordion as DSAccordion } from '@navikt/ds-react';
33
import { ParsedHtml } from 'components/_common/parsedHtml/ParsedHtml';
4-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
4+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
55
import { Shortcuts, useShortcuts } from 'utils/useShortcuts';
66
import { usePageContentProps } from 'store/pageContext';
77
import { getDecoratorParams } from 'utils/decorator-utils';
@@ -38,7 +38,7 @@ export const Accordion = ({ accordion }: AccordionProps) => {
3838
} else {
3939
setOpenAccordions(openAccordions.filter((i) => i !== index));
4040
}
41-
logAmplitudeEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
41+
logAnalyticsEvent(isOpening ? AnalyticsEvents.ACC_EXPAND : AnalyticsEvents.ACC_COLLAPSE, {
4242
tittel,
4343
opprinnelse: 'trekkspill',
4444
komponent: 'Accordion',

‎packages/nextjs/src/components/_common/card/useCard.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useLayoutConfig } from 'components/layouts/useLayoutConfig';
44
import { CardSize, CardType } from 'types/card';
55
import { Interaction } from 'types/interaction';
66
import { LinkProps } from 'types/link-props';
7-
import { AnalyticsEvents, logAmplitudeEvent } from 'utils/amplitude';
7+
import { AnalyticsEvents, logAnalyticsEvent } from 'utils/analytics';
88
import { usePublicUrl } from 'utils/usePublicUrl';
99
import { usePageContentProps } from 'store/pageContext';
1010
import { getDecoratorParams } from 'utils/decorator-utils';
@@ -84,7 +84,7 @@ export const useCard = ({ link, size, type }: UseCardSettings): UseCardState =>
8484
return;
8585
}
8686

87-
logAmplitudeEvent(AnalyticsEvents.NAVIGATION, analyticsPayload);
87+
logAnalyticsEvent(AnalyticsEvents.NAVIGATION, analyticsPayload);
8888

8989
const isOpeningInNewWindow = e.ctrlKey || e.metaKey;
9090
if (isOpeningInNewWindow) {

‎packages/nextjs/src/components/_common/chatbot/ChatbotLinkPanel.module.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$chatPointerSize: 1.5rem;
44

55
.chat {
6-
$bgColor: common.$a-blue-50;
6+
$bgColor: var(--a-white);
77
$borderRadius: 24px;
88

99
position: relative;
@@ -19,7 +19,6 @@ $chatPointerSize: 1.5rem;
1919
height: 0;
2020
border-right: $chatPointerSize solid transparent;
2121
border-top: $chatPointerSize solid $bgColor;
22-
2322
display: block;
2423
}
2524
}

‎packages/nextjs/src/components/_common/contact-option/CallOption/CallOption.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import { Alert, BodyLong, BodyShort, Heading } from '@navikt/ds-react';
33
import { translator } from 'translations';
44
import { LenkeBase } from 'components/_common/lenke/lenkeBase/LenkeBase';
5-
import { AnalyticsEvents } from 'utils/amplitude';
5+
import { AnalyticsEvents } from 'utils/analytics';
66
import { useLayoutConfig } from 'components/layouts/useLayoutConfig';
77
import { ParsedHtml } from 'components/_common/parsedHtml/ParsedHtml';
88
import { OpeningInfo } from 'components/_common/contact-option/openingInfo/OpeningInfo';

0 commit comments

Comments
 (0)