roll back

navikt · Jan 16, 2025 · a998983 · a998983
1 parent 13bec48
commit a998983
Show file tree

Hide file tree

Showing 50 changed files with 404 additions and 168 deletions.
diff --git a/.github/workflows/bygg-og-deploy-labs-test.yml b/.github/workflows/bygg-og-deploy-labs-test.yml
@@ -0,0 +1,74 @@
+name: Bygg og deploy KUN FOR LABS TEST
+# KUN FOR TESTING og DEBUGGING
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'labs-test'
+
+jobs:
+  build:
+    name: Bygg
+    permissions:
+      contents: read
+      id-token: write
+    outputs:
+      image: ${{ steps.docker-build-push.outputs.image }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Sjekk ut kode
+        uses: actions/checkout@v4
+      - name: Setup node.js
+        uses: actions/setup-node@v3
+        with:
+          registry-url: 'https://npm.pkg.github.com'
+      - name: Install
+        run: npm ci
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
+      - name: Server install
+        working-directory: ./server
+        run: npm ci
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
+      - name: Typescript
+        run: npm run ts
+      - name: Prettier
+        run: npm run prettier
+      - name: Kjør tester
+        run: npm run test
+      - name: Build
+        run: npm run build
+      - name: Server build
+        working-directory: ./server
+        run: npm run build
+      - name: Sentry release
+        run: npm run release
+      - name: Fjerne source maps
+        run: |
+          rm dist/client/assets/*.map
+      - name: Push docker image to GAR
+        uses: nais/docker-build-push@v0
+        id: docker-build-push
+        with:
+          team: arbeidsgiver
+          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+
+  deploy-dev-gcp-labs:
+    name: Deploy til dev-gcp (labs)
+    runs-on: ubuntu-latest
+    needs: build
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - name: Sjekk ut kode
+        uses: actions/checkout@v4
+      - name: Deploy til dev-gcp
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: nais/dev-gcp-labs.yaml
+          VARS: nais/dev-gcp-labs.json
+          VAR: image=${{ needs.build.outputs.image }}
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -17,13 +17,15 @@
         "@navikt/nav-dekoratoren-moduler": "^2.1.5",
         "@navikt/oasis": "^3.2.2",
         "axios": "1.7.7",
+        "compression": "^1.7.4",
         "cookie-parser": "1.4.7",
         "express": "4.21.1",
         "helmet": "8.0.0",
         "http-proxy-middleware": "3.0.3",
         "jsdom": "25.0.1"
     },
     "devDependencies": {
+        "@types/compression": "^1.7.5",
         "@types/cookie-parser": "^1.4.7",
         "@types/express": "5.0.0",
         "@types/jsdom": "^21.1.7",

diff --git a/server/src/proxy/labs-proxy.ts b/server/src/proxy/labs-proxy.ts
@@ -53,6 +53,7 @@ export const setup = (app: Express) => {
             target: `${apiUrl}/tiltaksgjennomforing-api/kodeverk`,
             ignorePath: true,
             changeOrigin: true,
+            proxyTimeout: 2000,
         }),
     );
 

diff --git a/server/src/routes.ts b/server/src/routes.ts
@@ -9,16 +9,19 @@ import * as decoratorEksternProxy from './proxy/decorator-ekstern-proxy';
 
 export function setupRoutes(server: Express) {
     if (IS_LABS) {
+        console.log('Bruker labs-proxy...');
         labsProxy.setup(server);
         return;
     }
 
     if (INTERN_INGRESS) {
+        console.log('Bruker intern-proxy...');
         apiProxy.azureSetup(server);
         decoratorInternProxy.setup(server);
         return;
     }
 
+    console.log('Bruker ekstern-proxy...');
     apiProxy.tokenxSetup(server);
     notifikasjonProxy.setup(server);
     decoratorEksternProxy.setup(server);

diff --git a/server/src/server.ts b/server/src/server.ts
@@ -9,6 +9,7 @@ import * as appMedModiaDekoratoren from './dekorator/appMedModiaDekoratoren';
 import * as appMedNavDekoratoren from './dekorator/appMedNavDekoratoren';
 import { initializePath, BASEPATH, STATIC_PATHS } from './paths/setupPath';
 import { setupRoutes } from './routes';
+import compression from 'compression';
 
 const indexPath = path.resolve(__dirname, '../client', 'index.html');
 
@@ -26,6 +27,7 @@ const eksternCspMiddleware = (): Handler => {
 
 const node: Express = express();
 node.use(cookieParser());
+node.use(compression());
 node.disable('x-powered-by');
 
 if (ENABLE_EXTERNAL_MENU) {
@@ -68,18 +70,21 @@ async function startServer(): Promise<void> {
 }
 
 async function startMedNavDekoratoren() {
+    console.log('Starter med nav-dekoratør...');
     node.get(['/tiltaksgjennomforing/', '/tiltaksgjennomforing/*'], (req, res) =>
         appMedNavDekoratoren.getNavdekoratoren(indexPath, req, res),
     );
 }
 
 async function startMedModiaDekoratoren() {
+    console.log('Starter med modia-dekoratør...');
     node.get(['/*', '/tiltaksgjennomforing/', '/tiltaksgjennomforing/*'], (req, res) =>
         appMedModiaDekoratoren.getModiaDekoratoren(indexPath, req, res),
     );
 }
 
 async function startLabs() {
+    console.log('Starter i labs-modus...');
     node.get(['/tiltaksgjennomforing/', '/tiltaksgjennomforing/*'], (_, res) => {
         res.sendFile(path.resolve(__dirname, '../client', 'index.html'));
     });

diff --git a/src/AvtaleSide/AvtaleStatus/ArbeidsgiverAvtaleStatus.tsx b/src/AvtaleSide/AvtaleStatus/ArbeidsgiverAvtaleStatus.tsx
@@ -1,4 +1,3 @@
-import { AvtaleContext } from '@/AvtaleProvider';
 import Avsluttet from '@/AvtaleSide/AvtaleStatus/Avsluttet';
 import Gjennomføres from '@/AvtaleSide/AvtaleStatus/Gjennomføres';
 import KlarForOppstart from '@/AvtaleSide/AvtaleStatus/KlarForOppstart';
@@ -42,7 +41,7 @@ const ArbeidsgiverAvtaleStatus: FunctionComponent<Props> = ({ avtale }) => {
         );
     }
 
-    switch (avtale.statusSomEnum) {
+    switch (avtale.status) {
         case 'ANNULLERT':
             return (
                 <StatusPanel

diff --git a/src/AvtaleSide/AvtaleStatus/DeltakerAvtaleStatus.tsx b/src/AvtaleSide/AvtaleStatus/DeltakerAvtaleStatus.tsx
@@ -11,7 +11,7 @@ import React, { FunctionComponent } from 'react';
 interface Props {
     avtale: Pick<
         Avtale,
-        | 'statusSomEnum'
+        | 'status'
         | 'annullertTidspunkt'
         | 'godkjentAvDeltaker'
         | 'godkjentAvArbeidsgiver'
@@ -24,7 +24,7 @@ interface Props {
 }
 
 const DeltakerAvtaleStatus: FunctionComponent<Props> = ({ avtale }) => {
-    switch (avtale.statusSomEnum) {
+    switch (avtale.status) {
         case 'ANNULLERT':
             return (
                 <StatusPanel

diff --git a/src/AvtaleSide/AvtaleStatus/MentorAvtaleStatus.tsx b/src/AvtaleSide/AvtaleStatus/MentorAvtaleStatus.tsx
@@ -9,14 +9,13 @@ import { BodyShort } from '@navikt/ds-react';
 import React, { FunctionComponent } from 'react';
 
 interface Props {
-    avtale: Pick<
-        Avtale,
-        'statusSomEnum' | 'annullertTidspunkt' | 'avtaleInngått' | 'annullertGrunn' | 'avbruttGrunn'
-    > & { gjeldendeInnhold: Pick<Avtaleinnhold, 'startDato' | 'sluttDato'> };
+    avtale: Pick<Avtale, 'status' | 'annullertTidspunkt' | 'avtaleInngått' | 'annullertGrunn' | 'avbruttGrunn'> & {
+        gjeldendeInnhold: Pick<Avtaleinnhold, 'startDato' | 'sluttDato'>;
+    };
 }
 
 const MentorAvtaleStatus: FunctionComponent<Props> = ({ avtale }) => {
-    switch (avtale.statusSomEnum) {
+    switch (avtale.status) {
         case 'ANNULLERT':
             return (
                 <StatusPanel

diff --git a/src/AvtaleSide/AvtaleStatus/VeilederAvtaleStatus.tsx b/src/AvtaleSide/AvtaleStatus/VeilederAvtaleStatus.tsx
@@ -144,7 +144,7 @@ function VeilederAvtaleStatus(props: Props) {
         );
     }
 
-    switch (avtale.statusSomEnum) {
+    switch (avtale.status) {
         case 'ANNULLERT':
             return (
                 <StatusPanel

diff --git a/src/AvtaleSide/steg/BeregningTilskudd/Arbeidsgiveravgift.tsx b/src/AvtaleSide/steg/BeregningTilskudd/Arbeidsgiveravgift.tsx
@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import { Column, Row } from '@/komponenter/NavGrid/Grid';
 import SelectInput from '@/komponenter/form/SelectInput';
-import { parseFloatIfFloatable } from '@/utils/lonnstilskuddUtregningUtils';
+import { parseFloatIfFloatable } from '@/utils';
 import { BEMWrapper } from '@/utils/bem';
 import { AvtaleContext } from '@/AvtaleProvider';
 

diff --git a/src/AvtaleSide/steg/BeregningTilskudd/Feriepenger.tsx b/src/AvtaleSide/steg/BeregningTilskudd/Feriepenger.tsx
@@ -3,7 +3,7 @@ import { Column, Row } from '@/komponenter/NavGrid/Grid';
 import { BEMWrapper } from '@/utils/bem';
 import { AvtaleContext } from '@/AvtaleProvider';
 import SelectInput from '@/komponenter/form/SelectInput';
-import { parseFloatIfFloatable } from '@/utils/lonnstilskuddUtregningUtils';
+import { parseFloatIfFloatable } from '@/utils';
 
 interface Props {
     cls: BEMWrapper;

diff --git a/src/AvtaleSide/steg/BeregningTilskudd/UtregningPanel.tsx b/src/AvtaleSide/steg/BeregningTilskudd/UtregningPanel.tsx
@@ -12,11 +12,12 @@ import VerticalSpacer from '@/komponenter/layout/VerticalSpacer';
 import { Beregningsgrunnlag } from '@/types/avtale';
 import BEMHelper from '@/utils/bem';
 import { formatterDato, NORSK_DATO_FORMAT } from '@/utils/datoUtils';
-import { formatterPenger } from '@/utils/PengeUtils';
+import { formaterPenger } from '@/utils/PengeUtils';
 import { Accordion, Label } from '@navikt/ds-react';
 import { FunctionComponent, useContext } from 'react';
 import './UtregningPanel.less';
 import Utregningsrad from './Utregningsrad';
+import { formaterNorskeTall } from '@/utils';
 
 const UtregningPanel: FunctionComponent<Beregningsgrunnlag> = (props) => {
     const cls = BEMHelper('utregningspanel');
@@ -45,7 +46,7 @@ const UtregningPanel: FunctionComponent<Beregningsgrunnlag> = (props) => {
                             labelIkon={<StillingsprosentIkon />}
                             labelTekst="Stillingsprosent"
                             verdiOperator={<ProsentTegn />}
-                            verdi={props.stillingprosent || 0}
+                            verdi={props.stillingprosent ? formaterNorskeTall(props.stillingprosent) : 0}
                             ikkePenger
                         />
                         <Utregningsrad
@@ -96,7 +97,7 @@ const UtregningPanel: FunctionComponent<Beregningsgrunnlag> = (props) => {
                         <Utregningsrad
                             labelTekst="Sum tilskudd for en måned"
                             tekstType="element"
-                            verdi={`Inntil ${formatterPenger(props.sumLonnstilskudd || 0)}`}
+                            verdi={`Inntil ${formaterPenger(props.sumLonnstilskudd || 0)}`}
                         />
                         {props.datoForRedusertProsent && (
                             <>
@@ -115,7 +116,7 @@ const UtregningPanel: FunctionComponent<Beregningsgrunnlag> = (props) => {
                                 <Utregningsrad
                                     labelTekst="Sum tilskudd for en måned"
                                     tekstType="element"
-                                    verdi={`Inntil ${formatterPenger(props.sumLønnstilskuddRedusert || 0)}`}
+                                    verdi={`Inntil ${formaterPenger(props.sumLønnstilskuddRedusert || 0)}`}
                                 />
                             </>
                         )}

diff --git a/src/AvtaleSide/steg/BeregningTilskudd/Utregningsrad.tsx b/src/AvtaleSide/steg/BeregningTilskudd/Utregningsrad.tsx
@@ -1,8 +1,7 @@
-import { visSatsMedEttDesimal } from '@/utils/lonnstilskuddUtregningUtils';
+import { formaterNorskeTall, formaterPenger } from '@/utils';
 import { BodyShort, Label, Heading } from '@navikt/ds-react';
 import React, { FunctionComponent, ReactNode } from 'react';
 import BEMHelper from '../../../utils/bem';
-import { formatterPenger } from '../../../utils/PengeUtils';
 import './UtregningPanel.less';
 
 interface Props {
@@ -32,13 +31,13 @@ const Utregningsrad: FunctionComponent<Props> = (props: Props) => {
     const setLabelSats = (sats?: number) =>
         sats !== undefined && sats !== null ? (
             <BodyShort size="small" className={cls.element('label-sats')}>
-                ({visSatsMedEttDesimal(sats)}%)
+                ({formaterNorskeTall(sats * 100)}%)
             </BodyShort>
         ) : null;
 
     const parseVerdi = (verdi: string | number) => {
         const verdiSomNumber = parseInt(verdi.toString(), 10);
-        return !isNaN(verdiSomNumber) && !props.ikkePenger ? formatterPenger(verdiSomNumber) : verdi;
+        return !isNaN(verdiSomNumber) && !props.ikkePenger ? formaterPenger(verdiSomNumber) : verdi;
     };
 
     return (