Merge pull request #2 from navikt/dev

Dev

Author: AlexGaard

.github/workflows/main.yml

@@ -40,8 +40,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          docker build -t ${IMAGE}:${IMAGE_TAG} .
           docker login docker.pkg.github.com -u ${GITHUB_REPOSITORY} -p ${GITHUB_TOKEN}
+          docker build -t ${IMAGE}:${IMAGE_TAG} .
           docker push ${IMAGE}:${IMAGE_TAG}
 
   update-gh-pages:

Dockerfile

@@ -1,2 +1,2 @@
-FROM navikt/pus-nginx
-COPY build /usr/share/nginx/html/beslutteroversikt
+FROM docker.pkg.github.com/navikt/pus-fss-frontend/pus-fss-frontend
+COPY build /app

nais-q.yaml

@@ -8,12 +8,12 @@ metadata:
     team: pto
 spec:
   image: docker.pkg.github.com/navikt/beslutteroversikt/beslutteroversikt:{{version}}
-  port: 80
+  port: 8080
   liveness:
-    path: /isAlive
+    path: beslutteroversikt/internal/isAlive
     initialDelay: 15
   readiness:
-    path: /isReady
+    path: beslutteroversikt/internal/isReady
     initialDelay: 15
   replicas:
     min: 1
@@ -29,3 +29,5 @@ spec:
   ingresses:
     - https://beslutteroversikt-{{namespace}}.nais.preprod.local
     - https://app-{{namespace}}.adeo.no/beslutteroversikt
+  envFrom:
+    - configmap: pto-config

nais.yaml

@@ -8,12 +8,12 @@ metadata:
     team: pto
 spec:
   image: docker.pkg.github.com/navikt/beslutteroversikt/beslutteroversikt:{{version}}
-  port: 80
+  port: 8080
   liveness:
-    path: /isAlive
+    path: beslutteroversikt/internal/isAlive
     initialDelay: 15
   readiness:
-    path: /isReady
+    path: beslutteroversikt/internal/isReady
     initialDelay: 15
   replicas:
     min: 2
@@ -29,3 +29,5 @@ spec:
   ingresses:
     - https://beslutteroversikt.nais.adeo.no
     - https://app.adeo.no/beslutteroversikt
+  envFrom:
+    - configmap: pto-config

package-lock.json

@@ -35,17 +35,42 @@
   ],
   "dependencies": {
     "@craco/craco": "5.2.4",
+    "@navikt/fnrvalidator": "^1.1.0",
+    "@navikt/navspa": "^1.0.3",
     "classnames": "^2.2.6",
     "constate": "^1.3.2",
     "craco-less": "1.9.0",
     "dayjs": "^1.8.17",
-    "react": "^16.12.0",
+    "lodash.throttle": "^4.1.1",
+    "lodash.debounce": "^4.0.8",
+    "nav-frontend-alertstriper": "^3.0.11",
+    "nav-frontend-alertstriper-style": "^2.0.9",
+    "nav-frontend-chevron": "^1.0.10",
+    "nav-frontend-chevron-style": "^0.3.5",
+    "nav-frontend-core": "^4.0.11",
+    "nav-frontend-etiketter": "^1.0.30",
+    "nav-frontend-etiketter-style": "^0.3.19",
+    "nav-frontend-ikoner-assets": "^1.0.5",
+    "nav-frontend-js-utils": "^1.0.8",
+    "nav-frontend-lenker": "^1.0.33",
+    "nav-frontend-lenker-style": "^0.2.24",
+    "nav-frontend-paneler-style": "^0.3.17",
+    "nav-frontend-skjema": "^2.0.11",
+    "nav-frontend-skjema-style": "^2.0.3",
+    "nav-frontend-spinner": "^2.0.1",
+    "nav-frontend-spinner-style": "^0.2.5",
+    "nav-frontend-typografi": "^2.0.17",
+    "nav-frontend-typografi-style": "^1.0.18",
+    "prop-types": "^15.7.2",
+    "react": "^16.13.1",
     "react-dom": "^16.11.0",
     "react-scripts": "3.0.1",
+    "react-select": "^3.0.8",
     "typescript": "3.4.5"
   },
   "devDependencies": {
     "@types/classnames": "^2.2.9",
+    "@types/faker": "^4.1.10",
     "@types/jest": "^24.0.22",
     "@types/lodash.debounce": "^4.0.6",
     "@types/node": "^12.12.6",
@@ -54,6 +79,7 @@
     "@types/react-modal": "^3.10.0",
     "@types/react-select": "^3.0.8",
     "cross-env": "^7.0.0",
+    "faker": "^4.1.0",
     "husky": "^3.0.9",
     "lint-staged": "^9.4.2",
     "prettier": "^1.18.2",

package.json

@@ -5,8 +5,18 @@
         <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>
+
+        <link rel="stylesheet" href="/internarbeidsflatedecorator/v2/static/css/main.css" />
+        <script src="/internarbeidsflatedecorator/v2/static/js/head.v2.min.js"></script>
     </head>
-    <body class="beslutteroversikt">
+    <body class="beslutteroversikt app">
         <div id="root"/>
         <div id="modal-a11y-wrapper"></div>
     </body>

public/index.html

@@ -1,17 +1,18 @@
 import React from 'react';
-import { DataFetcher } from './components/datafetcher';
 import StoreProvider from './stores/store-provider';
-import './app.less';
+import { Header } from './components/header/header';
+import { InternflateDecorator } from './components/internflate-decorator/internflate-decorator';
+import { Hovedside } from './hovedside/hovedside';
+import { SokSync } from './components/sok-sync';
 
 function App() {
 	return (
-		<main>
-			<StoreProvider>
-				<DataFetcher>
-					<p>Hello world</p>
-				</DataFetcher>
-			</StoreProvider>
-		</main>
+		<StoreProvider>
+			<InternflateDecorator />
+			<Header />
+			<Hovedside />
+			<SokSync />
+		</StoreProvider>
 	);
 }
 

src/app.less

@@ -1,5 +1,34 @@
-import React from 'react';
+import React, { useEffect } from 'react';
+import { useDataFetcherStore } from '../stores/data-fetcher-store';
+import { hasAnyFailed, isAnyNotStartedOrPending, isNotStarted } from '../rest/utils';
+import { AlertStripeFeil } from 'nav-frontend-alertstriper';
+import Spinner from './felles/spinner/spinner';
 
 export function DataFetcher(props: { children: any }) {
+	const { innloggetVeilederFetcher, aktivEnhetFetcher } = useDataFetcherStore();
+
+	useEffect(() => {
+		if (isNotStarted(innloggetVeilederFetcher)) {
+			innloggetVeilederFetcher.fetch(null);
+		}
+
+		if (isNotStarted(aktivEnhetFetcher)) {
+			aktivEnhetFetcher.fetch(null);
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [innloggetVeilederFetcher]);
+
+	// Trenger ikke å sjekke om aktivEnhetFetcher er ferdig
+	if (isAnyNotStartedOrPending([innloggetVeilederFetcher])) {
+		return <Spinner />;
+	} else if (hasAnyFailed([innloggetVeilederFetcher])) {
+		return (
+			<AlertStripeFeil className="vedtaksstotte-alert">
+				Det oppnås for tiden ikke kontakt med alle baksystemer.
+				Vi jobber med å løse saken. Vennligst prøv igjen senere.
+			</AlertStripeFeil>
+		);
+	}
+
 	return props.children;
 }