Merge branch 'master' into dependabot/npm_and_yarn/babel-b5931ee402

navikt · Nov 13, 2023 · 93f7685 · 93f7685
2 parents 75c7ab2 + 02ac91e
commit 93f7685
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/lint-tscheck-build.yml b/.github/workflows/lint-tscheck-build.yml
@@ -36,7 +36,10 @@ jobs:
       - name: Typescript-sjekk
         run: yarn ts-check
 
-      - name: Linting
+      - name: Eslint
+        run: yarn lint
+
+      - name: CSS-lint
         run: yarn css:lint
 
       - name: Sjekker at koden bygger

diff --git a/packages/form/src/DecimalField.tsx b/packages/form/src/DecimalField.tsx
@@ -23,12 +23,12 @@ interface DecimalFieldProps {
 }
 
 const createNormalizeOnBlurField = WrappedNavFieldComponent => {
-  interface FieldComponent {
+  interface FieldComponentProps {
     normalizeOnBlur: (value: any) => void;
     component?: () => reduxFormField;
   }
-  class FieldComponent extends Component<FieldComponent & WrappedComponentProps> {
-    constructor(props: FieldComponent & WrappedComponentProps) {
+  class FieldComponent extends Component<FieldComponentProps & WrappedComponentProps> {
+    constructor(props: FieldComponentProps & WrappedComponentProps) {
       super(props);
       this.blurHandler = this.blurHandler.bind(this);
     }

diff --git a/packages/prosess-felles/src/vilkar/VilkarResultPickerPeriodisert.tsx b/packages/prosess-felles/src/vilkar/VilkarResultPickerPeriodisert.tsx
@@ -266,6 +266,12 @@ VilkarResultPicker.transformValues = (values: FormValues, periodeFom?: string, p
           tom: values.valgtPeriodeTom,
         },
       };
+    default:
+      return {
+        erVilkarOk: null,
+        avslagskode: null,
+        periode: null,
+      };
   }
 };