From 40f88f6abbe49a495f2a888c0349451e2744fef8 Mon Sep 17 00:00:00 2001 From: johannetronstad Date: Tue, 9 Jan 2024 15:48:45 +0100 Subject: [PATCH 1/5] =?UTF-8?q?lagt=20til=20arkiveringsslice,=20knapp=20fo?= =?UTF-8?q?r=20journalf=C3=B8ring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/amplitude/amplitude.ts | 2 +- src/api/arkivAPI.ts | 4 +++ src/environment.ts | 3 +++ src/moduler/verktoylinje/Navigasjonslinje.tsx | 15 ++++++++--- .../arkivering/arkivering-slice.ts | 27 +++++++++++++++++++ src/reducer.ts | 2 ++ 6 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 src/api/arkivAPI.ts create mode 100644 src/moduler/verktoylinje/arkivering/arkivering-slice.ts diff --git a/src/amplitude/amplitude.ts b/src/amplitude/amplitude.ts index bafc71425..e87cc0c1e 100644 --- a/src/amplitude/amplitude.ts +++ b/src/amplitude/amplitude.ts @@ -17,7 +17,7 @@ export function initAmplitude() { async function logAmplitudeEvent(event: AmplitudeEvent, extraData?: Record): Promise { 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); } diff --git a/src/api/arkivAPI.ts b/src/api/arkivAPI.ts new file mode 100644 index 000000000..03cfce4c0 --- /dev/null +++ b/src/api/arkivAPI.ts @@ -0,0 +1,4 @@ +import { ARKIV_BASE_URL } from '../environment'; +import { postAsJson } from './utils'; + +export const arkiver = () => postAsJson(`${ARKIV_BASE_URL}/arkiver`, {}); diff --git a/src/environment.ts b/src/environment.ts index 91a1a35d4..79ca5a1c0 100644 --- a/src/environment.ts +++ b/src/environment.ts @@ -23,3 +23,6 @@ export const VEILARBLEST_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarble export const PERSON_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarbperson/api'; export const MALVERK_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarbmalverk/api'; export const VEILEDER_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarbveileder/api'; + +// TODO fikse denne +export const ARKIV_BASE_URL = 'https://orkivar.intern.dev.nav.no'; diff --git a/src/moduler/verktoylinje/Navigasjonslinje.tsx b/src/moduler/verktoylinje/Navigasjonslinje.tsx index 2539a372c..4f3675688 100644 --- a/src/moduler/verktoylinje/Navigasjonslinje.tsx +++ b/src/moduler/verktoylinje/Navigasjonslinje.tsx @@ -1,11 +1,11 @@ -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'; @@ -13,6 +13,8 @@ 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(); @@ -20,6 +22,8 @@ function Navigasjonslinje() { const dispatch = useAppDispatch(); + const arkiverer = [Status.PENDING, Status.RELOADING].includes(useSelector(selectArkivStatus)); + useEffect(() => { const doHentDialog = () => dispatch(hentDialoger()); @@ -72,6 +76,11 @@ function Navigasjonslinje() { Skriv ut )} + {!ER_PROD ? ( + + ) : null} Aktivitetsplan diff --git a/src/moduler/verktoylinje/arkivering/arkivering-slice.ts b/src/moduler/verktoylinje/arkivering/arkivering-slice.ts new file mode 100644 index 000000000..dedc5bdb8 --- /dev/null +++ b/src/moduler/verktoylinje/arkivering/arkivering-slice.ts @@ -0,0 +1,27 @@ +import { createAsyncThunk } from '@reduxjs/toolkit'; + +import * as Api from '../../../api/arkivAPI'; +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; diff --git a/src/reducer.ts b/src/reducer.ts index aa5279f04..8a0a335e6 100644 --- a/src/reducer.ts +++ b/src/reducer.ts @@ -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({ @@ -33,6 +34,7 @@ const reducer = { tilgang: tilgangReducer, versjoner: versjonReducer, malverk: malverkReducer, + arkiv: arkivReducer, lest: lestReducer, auth: authReducer, veileder: veilederReducer, From b87ce4f282a09ab965c26746281319ed65a99206 Mon Sep 17 00:00:00 2001 From: johannetronstad Date: Tue, 9 Jan 2024 15:51:26 +0100 Subject: [PATCH 2/5] endret url --- src/environment.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/environment.ts b/src/environment.ts index 79ca5a1c0..f6087fe67 100644 --- a/src/environment.ts +++ b/src/environment.ts @@ -24,5 +24,4 @@ export const PERSON_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarbperson/ export const MALVERK_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarbmalverk/api'; export const VEILEDER_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarbveileder/api'; -// TODO fikse denne -export const ARKIV_BASE_URL = 'https://orkivar.intern.dev.nav.no'; +export const ARKIV_BASE_URL = '/orkivar'; From bf5ee1a7ececca1d8c6ce6aa442f63d5974263be Mon Sep 17 00:00:00 2001 From: johannetronstad Date: Tue, 16 Jan 2024 14:32:47 +0100 Subject: [PATCH 3/5] flyttet arkiveringskall til veilarbaktivitet --- src/api/aktivitetAPI.ts | 2 ++ src/api/arkivAPI.ts | 4 ---- src/environment.ts | 2 -- src/moduler/verktoylinje/Navigasjonslinje.tsx | 2 +- src/moduler/verktoylinje/arkivering/arkivering-slice.ts | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 src/api/arkivAPI.ts diff --git a/src/api/aktivitetAPI.ts b/src/api/aktivitetAPI.ts index 9287b2aa9..2ca1b3562 100644 --- a/src/api/aktivitetAPI.ts +++ b/src/api/aktivitetAPI.ts @@ -90,3 +90,5 @@ export const sendForhaandsorienteringArenaAktivitet = ( export const markerForhaandsorienteringSomLestArenaAktivitet = (aktivitetId: string): Promise => putAsJson(`${AKTIVITET_BASE_URL}/arena/forhaandsorientering/lest?aktivitetId=${aktivitetId}`); + +export const arkiver = () => postAsJson(`${AKTIVITET_BASE_URL}/arkiver`, {}); diff --git a/src/api/arkivAPI.ts b/src/api/arkivAPI.ts deleted file mode 100644 index 03cfce4c0..000000000 --- a/src/api/arkivAPI.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { ARKIV_BASE_URL } from '../environment'; -import { postAsJson } from './utils'; - -export const arkiver = () => postAsJson(`${ARKIV_BASE_URL}/arkiver`, {}); diff --git a/src/environment.ts b/src/environment.ts index f6087fe67..91a1a35d4 100644 --- a/src/environment.ts +++ b/src/environment.ts @@ -23,5 +23,3 @@ export const VEILARBLEST_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarble export const PERSON_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarbperson/api'; export const MALVERK_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarbmalverk/api'; export const VEILEDER_BASE_URL = stripPrependingSlash(BASE_URL) + '/veilarbveileder/api'; - -export const ARKIV_BASE_URL = '/orkivar'; diff --git a/src/moduler/verktoylinje/Navigasjonslinje.tsx b/src/moduler/verktoylinje/Navigasjonslinje.tsx index 4f3675688..0bc8627f2 100644 --- a/src/moduler/verktoylinje/Navigasjonslinje.tsx +++ b/src/moduler/verktoylinje/Navigasjonslinje.tsx @@ -78,7 +78,7 @@ function Navigasjonslinje() { )} {!ER_PROD ? ( ) : null} diff --git a/src/moduler/verktoylinje/arkivering/arkivering-slice.ts b/src/moduler/verktoylinje/arkivering/arkivering-slice.ts index dedc5bdb8..a9a7939a4 100644 --- a/src/moduler/verktoylinje/arkivering/arkivering-slice.ts +++ b/src/moduler/verktoylinje/arkivering/arkivering-slice.ts @@ -1,6 +1,6 @@ import { createAsyncThunk } from '@reduxjs/toolkit'; -import * as Api from '../../../api/arkivAPI'; +import * as Api from '../../../api/aktivitetAPI'; import createGenericSlice, { Status } from '../../../createGenericSlice'; import { RootState } from '../../../store'; From 6ec00819ae94d3a8dce65895e974374e322ec958 Mon Sep 17 00:00:00 2001 From: johannetronstad Date: Tue, 16 Jan 2024 16:09:24 +0100 Subject: [PATCH 4/5] fix endepunkt --- src/api/aktivitetAPI.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/aktivitetAPI.ts b/src/api/aktivitetAPI.ts index 2ca1b3562..9a04a727c 100644 --- a/src/api/aktivitetAPI.ts +++ b/src/api/aktivitetAPI.ts @@ -91,4 +91,4 @@ export const sendForhaandsorienteringArenaAktivitet = ( export const markerForhaandsorienteringSomLestArenaAktivitet = (aktivitetId: string): Promise => putAsJson(`${AKTIVITET_BASE_URL}/arena/forhaandsorientering/lest?aktivitetId=${aktivitetId}`); -export const arkiver = () => postAsJson(`${AKTIVITET_BASE_URL}/arkiver`, {}); +export const arkiver = () => postAsJson(`${AKTIVITET_BASE_URL}/arkivering`, {}); From 2bbba6feb99585475352ccc57c181f75f60a80da Mon Sep 17 00:00:00 2001 From: johannetronstad Date: Mon, 29 Jan 2024 09:19:07 +0100 Subject: [PATCH 5/5] =?UTF-8?q?endre=20navn=20p=C3=A5=20journalf=C3=B8ring?= =?UTF-8?q?sknapp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/moduler/verktoylinje/Navigasjonslinje.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/moduler/verktoylinje/Navigasjonslinje.tsx b/src/moduler/verktoylinje/Navigasjonslinje.tsx index 0bc8627f2..5a9dcad30 100644 --- a/src/moduler/verktoylinje/Navigasjonslinje.tsx +++ b/src/moduler/verktoylinje/Navigasjonslinje.tsx @@ -76,11 +76,13 @@ function Navigasjonslinje() { Skriv ut )} - {!ER_PROD ? ( - - ) : null} + {!ER_PROD + ? erVeileder && ( + + ) + : null} Aktivitetsplan