Skip to content
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.

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

lagt til arkiveringsslice, knapp for journalføring #1241

Merged
merged 6 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/amplitude/amplitude.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function initAmplitude() {

async function logAmplitudeEvent(event: AmplitudeEvent, extraData?: Record<string, unknown>): Promise<void> {
try {
track(event.name, { ...('data' in event ? event.data : {}), ...extraData });
track(event.name, { ...('data' in event ? event.data : {}), ...extraData, app: 'aktivitetsplan' });
} catch (e) {
console.error(e);
}
Expand Down
2 changes: 2 additions & 0 deletions src/api/aktivitetAPI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,5 @@ export const sendForhaandsorienteringArenaAktivitet = (

export const markerForhaandsorienteringSomLestArenaAktivitet = (aktivitetId: string): Promise<ArenaAktivitet> =>
putAsJson(`${AKTIVITET_BASE_URL}/arena/forhaandsorientering/lest?aktivitetId=${aktivitetId}`);

export const arkiver = () => postAsJson(`${AKTIVITET_BASE_URL}/arkivering`, {});
17 changes: 14 additions & 3 deletions src/moduler/verktoylinje/Navigasjonslinje.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
import { Heading, Link } from '@navikt/ds-react';
import { Button, Heading, Link } from '@navikt/ds-react';
import { isAfter } from 'date-fns';
import React, { useEffect } from 'react';
import React, { useEffect, useState } from 'react';
import { shallowEqual, useSelector } from 'react-redux';
import { Link as ReactRouterLink } from 'react-router-dom';

import { fetchSistOppdatert } from '../../api/dialogAPI';
import { ARBEIDSRETTET_DIALOG_URL, MINSIDE_URL } from '../../constant';
import { ARBEIDSRETTET_DIALOG_URL, ER_PROD, MINSIDE_URL } from '../../constant';
import useAppDispatch from '../../felles-komponenter/hooks/useAppDispatch';
import loggEvent, { APNE_OM_TJENESTEN } from '../../felles-komponenter/utils/logging';
import { useErVeileder } from '../../Provider';
import { selectSistOppdatert } from '../dialog/dialog-selector';
import { hentDialoger } from '../dialog/dialog-slice';
import { selectCanPrint } from '../feilmelding/feil-selector';
import { logKlikkKnapp } from '../../amplitude/amplitude';
import { arkiver, selectArkivStatus } from './arkivering/arkivering-slice';
import { Status } from '../../createGenericSlice';

function Navigasjonslinje() {
const erVeileder = useErVeileder();
const sistOppdatert = useSelector(selectSistOppdatert, shallowEqual);

const dispatch = useAppDispatch();

const arkiverer = [Status.PENDING, Status.RELOADING].includes(useSelector(selectArkivStatus));

useEffect(() => {
const doHentDialog = () => dispatch(hentDialoger());

Expand Down Expand Up @@ -72,6 +76,13 @@ function Navigasjonslinje() {
Skriv ut
</ReactRouterLink>
)}
{!ER_PROD
? erVeileder && (
<Button disabled={arkiverer} variant="secondary" onClick={() => dispatch(arkiver())}>
Journalfør
</Button>
)
: null}
</div>
<Heading level="1" size="xlarge">
Aktivitetsplan
Expand Down
27 changes: 27 additions & 0 deletions src/moduler/verktoylinje/arkivering/arkivering-slice.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { createAsyncThunk } from '@reduxjs/toolkit';

import * as Api from '../../../api/aktivitetAPI';
import createGenericSlice, { Status } from '../../../createGenericSlice';
import { RootState } from '../../../store';

interface ArkivState {
status: Status;
}

const arkivSlice = createGenericSlice({
name: 'arkiv',
initialState: {
status: Status.NOT_STARTED,
} as ArkivState,
reducers: {},
});

export const arkiver = createAsyncThunk(`${arkivSlice.name}/arkiver`, async () => {
return await Api.arkiver();
});

export function selectArkivStatus(state: RootState) {
return state.data.arkiv.status;
}

export const arkivReducer = arkivSlice.reducer;
2 changes: 2 additions & 0 deletions src/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import oppfolgingReducer from './moduler/oppfolging-status/oppfolging-slice';
import tilgangReducer from './moduler/tilgang/tilgang-slice';
import eskaleringsvarselReducer from './moduler/varslinger/eskaleringsvarsel-slice';
import veilederReducer from './moduler/veileder/veileder-slice';
import { arkivReducer } from './moduler/verktoylinje/arkivering/arkivering-slice';

const reducer = {
data: combineReducers({
Expand All @@ -33,6 +34,7 @@ const reducer = {
tilgang: tilgangReducer,
versjoner: versjonReducer,
malverk: malverkReducer,
arkiv: arkivReducer,
lest: lestReducer,
auth: authReducer,
veileder: veilederReducer,
Expand Down
Loading