Skip to content

Commit

Permalink
merge fra master
Browse files Browse the repository at this point in the history
  • Loading branch information
joarau committed Nov 13, 2024
2 parents 548123f + 0ddb679 commit fe844dc
Show file tree
Hide file tree
Showing 7 changed files with 132 additions and 136 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
deploy-til-dev:
name: Deploy til dev-gcp
needs: bygg-og-push-docker-image
if: github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bytt-namespace-til-toi-for-foresporsel-om-deling-av-cv-api'
if: github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/amplitude'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
184 changes: 81 additions & 103 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
}
},
"dependencies": {
"@amplitude/analytics-browser": "^2.11.9",
"@grafana/faro-web-sdk": "1.3.9",
"@grafana/faro-web-tracing": "1.3.9",
"@navikt/ds-css": "6.1.0",
Expand All @@ -42,7 +43,6 @@
"@tiptap/extension-underline": "^2.5.5",
"@tiptap/pm": "^2.5.5",
"@tiptap/react": "^2.5.5",
"amplitude-js": "^8.21.9",
"classnames": "2.5.1",
"deep-equal": "2.2.3",
"history": "^5.3.0",
Expand All @@ -68,7 +68,6 @@
"@testing-library/jest-dom": "^6.1.0",
"@testing-library/react": "^14.2.1",
"@testing-library/user-event": "^14.5.2",
"@types/amplitude-js": "^8.16.2",
"@types/loadjs": "^4.0.0",
"@types/node": "^20.12.7",
"@types/react": "^18.2.14",
Expand Down
3 changes: 3 additions & 0 deletions src/felles/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import InfoAlert from './header/navigeringsmeny/InfoAlert';
import Navigeringsmeny from './header/navigeringsmeny/Navigeringsmeny';
import useAmplitude from './header/useAmplitude';
import { Rolle } from './tilgangskontroll/Roller';
import InfoAlertMidlertidigNedetid from './header/navigeringsmeny/InfoAlertMidlertidigNedetid';

const Header = () => {
const [mockAktiv] = useLocalStorageToggle('Mock modia');
Expand All @@ -24,6 +25,8 @@ const Header = () => {
}}
/>

<InfoAlertMidlertidigNedetid />

<Navigeringsmeny />
{!harRolle([
Rolle.AD_GRUPPE_REKRUTTERINGSBISTAND_ARBEIDSGIVERRETTET,
Expand Down
Loading

0 comments on commit fe844dc

Please sign in to comment.