Merge pull request #22 from navikt/dev

AlexGaard · web-flow · commit a6cdf2feff65 · 2021-02-01T14:15:01.000+01:00
Prodsetting
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,13 +35,14 @@
   "dependencies": {
     "@craco/craco": "^5.6.4",
     "@navikt/fnrvalidator": "^1.1.3",
+    "@navikt/frontendlogger": "^2.0.0",
     "@navikt/navspa": "^1.1.1",
     "classnames": "^2.2.6",
     "constate": "^3.0.1",
     "craco-less": "^1.17.0",
     "dayjs": "^1.8.36",
-    "lodash.throttle": "^4.1.1",
     "lodash.debounce": "^4.0.8",
+    "lodash.throttle": "^4.1.1",
     "nav-frontend-alertstriper": "^3.0.23",
     "nav-frontend-alertstriper-style": "^2.0.17",
     "nav-frontend-chevron": "^1.0.13",
diff --git a/public/index.html b/public/index.html
@@ -4,14 +4,7 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>Beslutteroversikt</title>
-
-        <script>
-            window.frontendlogger = {info: function(){}, warn: function(){}, error: function(){}, event: function(){}};
-            window.frontendlogger.appname = 'beslutteroversikt';
-        </script>
-
-        <script type="application/javascript" src="/frontendlogger/logger.js"></script>
+        <title>Kvalitetssikring 14a</title>
 
         <link rel="stylesheet" href="/internarbeidsflatedecorator/v2.1/static/css/main.css" />
         <script src="/internarbeidsflatedecorator/v2.1/static/js/head.v2.min.js"></script>
diff --git a/src/components/header/header.tsx b/src/components/header/header.tsx
@@ -5,7 +5,7 @@ import './header.less';
 export const Header = () => {
 	return (
 		<div className="header">
-			<Sidetittel>Beslutteroversikt</Sidetittel>
+			<Sidetittel>Kvalitetssikring 14a</Sidetittel>
 		</div>
 	);
 };
diff --git a/src/components/sok-sync.tsx b/src/components/sok-sync.tsx
@@ -4,9 +4,9 @@ import { lagBeslutterOversiktSok } from '../utils/sok-utils';
 import { useSokStore } from '../stores/sok-store';
 import { hasFinishedWithData } from '../rest/utils';
 import { usePrevious } from '../utils';
-import { frontendlogger } from '../utils/frontend-logger';
 import { BeslutteroversiktSok } from '../rest/api';
 import { PTO_VEDTAKSSTOTTE_PILOT } from '../rest/feature';
+import { logMetrikk } from '../utils/logger';
 
 function logSokMetrikker(sok: BeslutteroversiktSok, currentPage: number): void {
 	const filterMetrikker: any = {};
@@ -18,7 +18,7 @@ function logSokMetrikker(sok: BeslutteroversiktSok, currentPage: number): void {
 		filterMetrikker.visMineBrukere = sok.filter.visMineBrukere || false;
 	}
 
-	frontendlogger.logMetrikk('sok', {
+	logMetrikk('sok', {
 		page: currentPage,
 		orderByField: sok.orderByField,
 		orderByDirection: sok.orderByDirection,
diff --git a/src/components/user-table/header/user-table-header.tsx b/src/components/user-table/header/user-table-header.tsx
@@ -38,7 +38,7 @@ export const UserTableHeader = (props: UserTableHeaderProps) => {
 		    <HeaderField name={HeaderFieldName.BRUKER_FNR} text="Fødselsnummer" orderByData={orderByData} onOrderByChanged={handleOnOrderByChanged} />
 		    <HeaderField name={HeaderFieldName.VEDTAK_STARTET} text="Vedtak startet" orderByData={orderByData} onOrderByChanged={handleOnOrderByChanged} />
 		    <HeaderField name={HeaderFieldName.STATUS} text="Status" orderByData={orderByData} onOrderByChanged={handleOnOrderByChanged} />
-		    <HeaderField name={HeaderFieldName.BESLUTTER_NAVN} text="Beslutter" orderByData={orderByData} onOrderByChanged={handleOnOrderByChanged} />
+		    <HeaderField name={HeaderFieldName.BESLUTTER_NAVN} text="Kvalitetssikrer" orderByData={orderByData} onOrderByChanged={handleOnOrderByChanged} />
 		    <HeaderField name={HeaderFieldName.VEILEDER_NAVN} text="Veileder" orderByData={orderByData} onOrderByChanged={handleOnOrderByChanged} />
 		    <HeaderField name={HeaderFieldName.STATUS_ENDRET} text="Status endret" orderByData={orderByData} onOrderByChanged={handleOnOrderByChanged} />
 		    <HeaderField name={HeaderFieldName.BRUKER_OPPFOLGINGSENHET_NAVN} text="Enhet" orderByData={orderByData} onOrderByChanged={handleOnOrderByChanged} />
diff --git a/src/rest/use-fetch.ts b/src/rest/use-fetch.ts
@@ -1,20 +1,19 @@
 import { useCallback, useMemo, useState } from 'react';
 import { FetchInfo, FetchState, FetchStatus } from './utils';
-import { logger } from '../utils/logger';
 
 export interface Fetch<D = any, FP = any> extends FetchState<D> {
 	fetch: (fetchParams: FP, onFinished?: (fetchState: FetchState<D>) => void) => void;
 	reset: () => void;
 }
 
-const createInitialFetchState = (): FetchState<any> => ({
+const createInitialFetchState = (): FetchState => ({
 	status: FetchStatus.NOT_STARTED,
 	error: null,
 	data: null as any,
 	httpCode: -1
 });
 
-const createPendingFetchState = (): FetchState<any> => ({
+const createPendingFetchState = (): FetchState => ({
 	status: FetchStatus.PENDING,
 	error: null,
 	data: null as any,
@@ -59,10 +58,6 @@ const useFetch = <D = {}, FP = any>(createFetchInfo: (fetchParams: FP) => FetchI
 				return createFinishedFetchState(null as any, error, -1);
 			})
 			.then(state => {
-				if (state.httpCode >= 400) {
-					logger.error('API kall feilet', state);
-				}
-
 				if (onFinished) {
 					onFinished(state);
 				}
diff --git a/src/rest/utils.ts b/src/rest/utils.ts
@@ -1,4 +1,4 @@
-import { frontendlogger } from '../utils/frontend-logger';
+import { logError } from '../utils/logger';
 
 export type FetchInfo = RequestInit & { url: string };
 
@@ -62,7 +62,7 @@ export const fetchWithInfo = (fetchInfo: FetchInfo) => {
 			res.clone()
 				.text()
 				.then(txt => {
-					frontendlogger.logError({ error: txt });
+					logError({ error: txt });
 				})
 				.catch();
 
diff --git a/src/utils/frontend-logger.ts b/src/utils/frontend-logger.ts
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -44,11 +44,11 @@ export function lagBrukerNavn(fornavn: string, etternavn: string): string {
 export function mapBrukerStatusTilTekst(status: UtkastStatus): string {
 	switch (status) {
 		case UtkastStatus.TRENGER_BESLUTTER:
-			return 'Trenger beslutter';
+			return 'Trenger kvalitetssikring';
 		case UtkastStatus.KLAR_TIL_VEILEDER:
 			return 'Venter på veileder';
 		case UtkastStatus.KLAR_TIL_BESLUTTER:
-			return 'Venter på beslutter';
+			return 'Venter på tilbakemelding';
 		case UtkastStatus.GODKJENT_AV_BESLUTTER:
 			return 'Klar til utsendelse';
 		default:
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
@@ -1,35 +1,18 @@
-import env from './environment';
-import { frontendlogger } from './frontend-logger';
+import {
+	createFrontendLogger,
+	createMockFrontendLogger,
+	DEFAULT_FRONTENDLOGGER_API_URL
+} from '@navikt/frontendlogger/lib';
+import { APP_NAME } from './constants';
 
-export const log = (...args: any[]): void => {
-	if (env.isDevelopment) {
-		console.log(...args); // tslint:disable-line
-	}
-};
-
-export const warn = (...args: any[]): void => {
-	if (env.isDevelopment) {
-		console.warn(...args); // tslint:disable-line
-	}
-};
-
-export const info = (...args: any[]): void => {
-	if (env.isDevelopment) {
-		console.info(...args); // tslint:disable-line
-	}
-};
+export const logger = process.env.REACT_APP_DEV
+	? createMockFrontendLogger(APP_NAME)
+	: createFrontendLogger(APP_NAME, DEFAULT_FRONTENDLOGGER_API_URL);
 
-export const error = (...args: any[]): void => {
-	if (env.isDevelopment) {
-		console.error(...args); // tslint:disable-line
-	} else if (env.isProduction) {
-		frontendlogger.logError({ error: JSON.stringify(args) });
-	}
+export const logError = (fields?: {}, tags?: {}): void => {
+	logger.event(`${APP_NAME}.error`, fields, tags);
 };
 
-export const logger = {
-	log,
-	error,
-	warn,
-	info
+export const logMetrikk = (metrikkNavn: string, fields?: {}, tags?: {}): void => {
+	logger.event(`${APP_NAME}.metrikker.${metrikkNavn}`, fields, tags);
 };
