Skip to content

FIX av lenker til og fra avdelingsleder og journalføring-app #6870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2025
Merged

FIX av lenker til og fra avdelingsleder og journalføring-app #6870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions apps/fp-avdelingsleder/src/app/Dekorator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useNavigate } from 'react-router-dom';
import type { Theme } from '@navikt/ds-react';

import { FellesDekorator, type QueryStrings } from '@navikt/fp-app-felles';
import { AVDELINGSLEDER_URL_NAME, FPSAK_URL_NAME } from '@navikt/fp-konstanter';
import { getFpSakLenke } from '@navikt/fp-konstanter';
import { type DekoratorLenke } from '@navikt/fp-sak-dekorator';

interface Props {
Expand All @@ -24,8 +24,7 @@ export const Dekorator = (props: Props) => {
const interneLenker: DekoratorLenke[] = [
{
tekst: intl.formatMessage({ id: 'Dekorator.Foreldrepenger' }),
callback: () =>
(globalThis.location.href = globalThis.location.href.replace(AVDELINGSLEDER_URL_NAME, FPSAK_URL_NAME)),
callback: () => (globalThis.location.href = getFpSakLenke()),
},
];

Expand Down
8 changes: 3 additions & 5 deletions apps/fp-frontend/src/app/components/Dekorator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { Theme } from '@navikt/ds-react';
import { useQuery } from '@tanstack/react-query';

import { FellesDekorator, type QueryStrings } from '@navikt/fp-app-felles';
import { AVDELINGSLEDER_URL_NAME, FPSAK_URL_NAME, JOURNALFORING_URL_NAME } from '@navikt/fp-konstanter';
import { getAvdelingslederLenke, getJournalføringLenke } from '@navikt/fp-konstanter';
import { type DekoratorLenke } from '@navikt/fp-sak-dekorator';
import { notEmpty } from '@navikt/fp-utils';

Expand Down Expand Up @@ -44,15 +44,13 @@ export const Dekorator = (props: Props) => {
if (kanOppgavestyre) {
interneLenker.push({
tekst: intl.formatMessage({ id: 'Dekorator.Avdelingsleder' }),
callback: () =>
(globalThis.location.href = globalThis.location.href.replace(FPSAK_URL_NAME, AVDELINGSLEDER_URL_NAME)),
callback: () => (globalThis.location.href = getAvdelingslederLenke()),
});
}
if (kanSaksbehandle) {
interneLenker.push({
tekst: intl.formatMessage({ id: 'Dekorator.Journalforing' }),
callback: () =>
(globalThis.location.href = globalThis.location.href.replace(FPSAK_URL_NAME, JOURNALFORING_URL_NAME)),
callback: () => (globalThis.location.href = getJournalføringLenke()),
});
}
interneLenker.push({
Expand Down
5 changes: 2 additions & 3 deletions apps/fp-journalforing/src/app/Dekorator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useNavigate } from 'react-router-dom';
import type { Theme } from '@navikt/ds-react';

import { FellesDekorator, type QueryStrings } from '@navikt/fp-app-felles';
import { FPSAK_URL_NAME, JOURNALFORING_URL_NAME } from '@navikt/fp-konstanter';
import { getFpSakLenke } from '@navikt/fp-konstanter';
import { type DekoratorLenke } from '@navikt/fp-sak-dekorator';

interface Props {
Expand All @@ -24,8 +24,7 @@ export const Dekorator = (props: Props) => {
const interneLenker: DekoratorLenke[] = [
{
tekst: intl.formatMessage({ id: 'Dekorator.Foreldrepenger' }),
callback: () =>
(globalThis.location.href = globalThis.location.href.replace(JOURNALFORING_URL_NAME, FPSAK_URL_NAME)),
callback: () => (globalThis.location.href = getFpSakLenke()),
},
];

Expand Down
3 changes: 2 additions & 1 deletion apps/fp-journalforing/src/components/journalpost/innhold/SakDetaljer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ExternalLinkIcon } from '@navikt/aksel-icons';
import { Button, CopyButton, Detail, HStack, Label, Spacer, Tag, type TagProps, VStack } from '@navikt/ds-react';
import { dateFormat } from '@navikt/ft-utils';

import { getFpSakLenke } from '@navikt/fp-konstanter';
import type { FagsakStatus, FamilieHendelseType } from '@navikt/fp-types';

import type { FamilieHendelse, JournalFagsak } from '../../../typer/journalFagsakTsType';
Expand Down Expand Up @@ -74,7 +75,7 @@ export const SakDetaljer = ({ sak }: Props) => {
);
};

const velgSakLenke = (saksnummer: string): string => `/fagsak/${saksnummer}/`;
const velgSakLenke = (saksnummer: string): string => `${getFpSakLenke()}/fagsak/${saksnummer}/`;

const finnTagProps = (statusKode: FagsakStatus): TagProps | null => {
switch (statusKode) {
Expand Down
4 changes: 3 additions & 1 deletion apps/fp-journalforing/src/components/journalpost/modal/JournalførtSubmitModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import { CheckmarkCircleIcon } from '@navikt/aksel-icons';
import { BodyShort, Button, HStack, Link, Modal, VStack } from '@navikt/ds-react';
import { LoadingPanel } from '@navikt/ft-ui-komponenter';

import { getFpSakLenke } from '@navikt/fp-konstanter';

import type { SaksnummerType } from '../../../typer/saksnummerTsType';

import styles from './journalførtSubmitModal.module.css';

const velgSakLenke = (saksnummer: string): string => `/fagsak/${saksnummer}/`;
const velgSakLenke = (saksnummer: string): string => `${getFpSakLenke()}/fagsak/${saksnummer}/`;

type Props = Readonly<{
saksnummer?: SaksnummerType;
Expand Down
4 changes: 3 additions & 1 deletion packages/konstanter/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ export { ProsessStegCode } from './src/prosessStegCodes';
export { FaktaPanelCode } from './src/faktaPanelCodes';
export { ApiPollingStatus } from './src/apiPollingStatus';
export { skjermlenkeCodes, skjermlenkeCodesFpTilbake } from './src/skjermlenkeCodes';
export { JOURNALFORING_URL_NAME, FPSAK_URL_NAME, AVDELINGSLEDER_URL_NAME } from './src/appnavn';

export {
LINK_TIL_BESTE_BEREGNING_REGNEARK,
Expand All @@ -15,4 +14,7 @@ export {
getModiaUrl,
hentDokumentLenke,
hentVedtakDokumentLenke,
getFpSakLenke,
getJournalføringLenke,
getAvdelingslederLenke,
} from './src/eksterneLenker';
3 changes: 0 additions & 3 deletions packages/konstanter/src/appnavn.ts
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions packages/konstanter/src/eksterneLenker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,25 @@ export const hentDokumentLenke = (saksnummer: string, journalpostId: string, dok

export const hentVedtakDokumentLenke = (behandlingUuid: string): string =>
`/fpsak/api/vedtak/hent-vedtaksdokument?behandlingId=${behandlingUuid}`;

const FPSAK_URL_NAME = 'fpsak';
const AVDELINGSLEDER_URL_NAME = 'fpavdelingsleder';
const JOURNALFORING_URL_NAME = 'fpjournalforing';

export const getAvdelingslederLenke = () =>
removePathAndQuery(globalThis.location.href.replace(FPSAK_URL_NAME, AVDELINGSLEDER_URL_NAME));

export const getJournalføringLenke = () =>
removePathAndQuery(globalThis.location.href.replace(FPSAK_URL_NAME, JOURNALFORING_URL_NAME));

export const getFpSakLenke = () =>
removePathAndQuery(
globalThis.location.href
.replace(JOURNALFORING_URL_NAME, FPSAK_URL_NAME)
.replace(AVDELINGSLEDER_URL_NAME, FPSAK_URL_NAME),
);

const removePathAndQuery = (url: string): string => {
const urlObj = new URL(url);
return `${urlObj.protocol}//${urlObj.host}`;
};
Loading