laget pakke av form fields.

Author: PetterRuud

.gitignore

@@ -1,6 +1,7 @@
 /.idea/
 /node/
 /node_modules/
+/packages/*/node_modules/
 /src/client/public/*
 /bin/
 /.tmp/

eslint/eslintrc.common.js

@@ -2,11 +2,10 @@ var OFF = 0, ERROR = 2;
 
 const config = {
   root: true,
- 
   env: {
     es6: true,
     browser: true,
-    mocha: true
+    mocha: true,
   },
 
   extends: "airbnb",

eslint/eslintrc.dev.js

@@ -5,15 +5,15 @@ var OFF = 0;
 
 const config = {
   settings: {
-    "import/resolver": {
+    'import/resolver': {
       webpack: {
-        config: "./webpack/webpack.dev.js",
+        config: 'webpack/webpack.dev.js',
       },
     },
   },
 
   rules: {
-    "no-debugger": OFF,
+    'no-debugger': OFF,
   },
 };
 

lerna.json

@@ -2,5 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "independent"
+  "version": "independent",
+  "npmClient": "yarn",
+  "useWorkspaces": true
 }

package.json

@@ -2,14 +2,13 @@
   "name": "fpsak-frontend",
   "version": "1.0.0",
   "description": "Klient for Foreldrepenger",
-  "main": "index.js",
+  "main": "./target/index.js",
+  "private": true,
   "workspaces": [
     "packages/*"
   ],
   "dependencies": {
     "axios": "^0.18.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-runtime": "^6.26.0",
     "circular-dependency-plugin": "^5.0.2",
     "classnames": "^2.2.6",
     "history": "^4.6.3",
@@ -65,12 +64,15 @@
     "redux-thunk": "^2.3.0",
     "reselect": "^3.0.1",
     "vis": "^4.21.0",
-    "xregexp": "^4.2.0"
+    "xregexp": "^4.2.0",
+    "@fpsak-frontend/form": "1.0.0"
   },
   "devDependencies": {
     "axios-mock-adapter": "^1.15.0",
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.2.6",
+    "babel-polyfill": "^6.26.0",
+    "babel-runtime": "^6.26.0",
     "babel-loader": "^7.1.5",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-runtime": "^6.23.0",

packages/form/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "@fpsak-frontend/form",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "private": true,
+  "dependencies": {
+  },
+  "devDependencies": {
+  }
+}

packages/form/TestFormIndex.jsx packages/fpsak-frontend-form/TestFormIndex.jsx

@@ -4,7 +4,7 @@ import { Route, Switch } from 'react-router-dom';
 
 import FagsakIndex from 'fagsak/FagsakIndex';
 import { fagsakPath } from 'app/paths';
-import TestFormIndex from 'form/TestFormIndex';
+import TestFormIndex from '@fpsak-frontend/form/TestFormIndex';
 import Dashboard from './Dashboard';
 
 import 'styles/modigDesign.less';

packages/form/fields/CheckboxField.jsx packages/fpsak-frontend-form/fields/CheckboxField.jsx

@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import { expect } from 'chai';
 import sinon from 'sinon';
 
-import { InputField } from 'form/Fields';
+import { InputField } from '@fpsak-frontend/form';
 import { BehandlingFormFieldCleaner } from './BehandlingFormFieldCleaner';
 
 describe('BehandlingFormFieldCleaner', () => {

packages/form/fields/CheckboxField.spec.jsx packages/fpsak-frontend-form/fields/CheckboxField.spec.jsx

@@ -10,7 +10,7 @@ import aksjonspunktCodes from 'kodeverk/aksjonspunktCodes';
 import VerticalSpacer from 'sharedComponents/VerticalSpacer';
 import requireProps from 'app/data/requireProps';
 import Modal from 'sharedComponents/Modal';
-import { DatepickerField, SelectField } from 'form/Fields';
+import { DatepickerField, SelectField } from '@fpsak-frontend/form';
 import {
   ariaCheck, dateAfterOrEqualToToday, hasValidDate, required,
 } from 'utils/validation/validators';

packages/form/fields/CustomNavSelect.jsx packages/fpsak-frontend-form/fields/CustomNavSelect.jsx

@@ -5,7 +5,7 @@ import { expect } from 'chai';
 import moment from 'moment';
 
 import { Hovedknapp, Knapp } from 'nav-frontend-knapper';
-import { DatepickerField, SelectField } from 'form/Fields';
+import { DatepickerField, SelectField } from '@fpsak-frontend/form';
 import { SettBehandlingPaVentModal } from './SettBehandlingPaVentModal';
 
 describe('<SettBehandlingPaVentModal>', () => {

packages/form/fields/DatepickerField.jsx packages/fpsak-frontend-form/fields/DatepickerField.jsx

@@ -8,7 +8,7 @@ import Modal from 'sharedComponents/Modal';
 import { Hovedknapp, Knapp } from 'nav-frontend-knapper';
 import { Normaltekst } from 'nav-frontend-typografi';
 
-import { SelectField, TextAreaField } from 'form/Fields';
+import { SelectField, TextAreaField } from '@fpsak-frontend/form';
 import { maxLength, required, hasValidText } from 'utils/validation/validators';
 
 import Image from 'sharedComponents/Image';

packages/form/fields/DatepickerField.spec.jsx packages/fpsak-frontend-form/fields/DatepickerField.spec.jsx

@@ -11,7 +11,7 @@ import { isForeldrepengerFagsak } from 'fagsak/fagsakSelectors';
 import Image from 'sharedComponents/Image';
 import innvilgetImageUrl from 'images/innvilget_valgt.svg';
 import Modal from 'sharedComponents/Modal';
-import { CheckboxField, SelectField } from 'form/Fields';
+import { CheckboxField, SelectField } from '@fpsak-frontend/form';
 import { required } from 'utils/validation/validators';
 import VerticalSpacer from 'sharedComponents/VerticalSpacer';
 import kodeverkTyper from 'kodeverk/kodeverkTyper';

packages/form/fields/DecimalField.jsx packages/fpsak-frontend-form/fields/DecimalField.jsx

@@ -10,7 +10,7 @@ import { Hovedknapp, Knapp } from 'nav-frontend-knapper';
 import { Undertekst } from 'nav-frontend-typografi';
 
 import behandlingResultatType from 'kodeverk/behandlingResultatType';
-import { SelectField, TextAreaField } from 'form/Fields';
+import { SelectField, TextAreaField } from '@fpsak-frontend/form';
 import { maxLength, required, hasValidText } from 'utils/validation/validators';
 
 import styles from './shelveBehandlingModal.less';

packages/form/fields/InputField.jsx packages/fpsak-frontend-form/fields/InputField.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl, intlShape } from 'react-intl';
 
-import { TextAreaField } from 'form/Fields';
+import { TextAreaField } from '@fpsak-frontend/form';
 import {
   minLength, maxLength, requiredIfNotPristine, hasValidText,
 } from 'utils/validation/validators';

packages/form/fields/Label.jsx packages/fpsak-frontend-form/fields/Label.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { expect } from 'chai';
 
 import { shallowWithIntl, intlMock } from 'testHelpers/intl-enzyme-test-helper';
-import { TextAreaField } from 'form/Fields';
+import { TextAreaField } from '@fpsak-frontend/form';
 import BehandlingspunktBegrunnelseTextField from './BehandlingspunktBegrunnelseTextField';
 
 describe('<BehandlingspunktBegrunnelseTextField>', () => {

packages/form/fields/Label.spec.jsx packages/fpsak-frontend-form/fields/Label.spec.jsx

@@ -5,7 +5,7 @@ import { injectIntl, intlShape } from 'react-intl';
 import { Row, Column } from 'nav-frontend-grid';
 
 import { isSelectedBehandlingspunktOverrideReadOnly } from 'behandlingsprosess/behandlingsprosessSelectors';
-import { TextAreaField } from 'form/Fields';
+import { TextAreaField } from '@fpsak-frontend/form';
 import {
   minLength, maxLength, requiredIfNotPristine, hasValidText,
 } from 'utils/validation/validators';

packages/form/fields/NavFieldGroup.jsx packages/fpsak-frontend-form/fields/NavFieldGroup.jsx

@@ -8,7 +8,7 @@ import { toggleBehandlingspunktOverstyring } from 'behandlingsprosess/duck';
 import { getSelectedBehandlingspunkt, getSelectedBehandlingspunktAksjonspunkter, isSelectedBehandlingspunktOverrideReadOnly }
   from 'behandlingsprosess/behandlingsprosessSelectors';
 import { getRettigheter } from 'navAnsatt/duck';
-import CheckboxField from 'form/fields/CheckboxField';
+import { CheckboxField } from '@fpsak-frontend/form';
 import aksjonspunktPropType from 'behandling/proptypes/aksjonspunktPropType';
 
 const isOverridden = (aksjonspunkter, aksjonspunktCode) => aksjonspunkter.some(ap => ap.definisjon.kode === aksjonspunktCode);

packages/form/fields/OptionGrid.jsx packages/fpsak-frontend-form/fields/OptionGrid.jsx

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import moment from 'moment';
 import { createSelector } from 'reselect';
 
-import { InputField } from 'form/Fields';
+import { InputField } from '@fpsak-frontend/form';
 import Table from 'sharedComponents/Table';
 import TableRow from 'sharedComponents/TableRow';
 import TableColumn from 'sharedComponents/TableColumn';

packages/form/fields/PeriodpickerField.jsx packages/fpsak-frontend-form/fields/PeriodpickerField.jsx

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import { Element, Normaltekst } from 'nav-frontend-typografi';
 
 import { behandlingFormValueSelector } from 'behandling/behandlingForm';
-import { InputField } from 'form/Fields';
+import { InputField } from '@fpsak-frontend/form';
 import VerticalSpacer from 'sharedComponents/VerticalSpacer';
 import Table from 'sharedComponents/Table';
 import TableRow from 'sharedComponents/TableRow';

packages/form/fields/PeriodpickerField.spec.jsx packages/fpsak-frontend-form/fields/PeriodpickerField.spec.jsx

@@ -18,7 +18,7 @@ import ElementWrapper from 'sharedComponents/ElementWrapper';
 import BorderBox from 'sharedComponents/BorderBox';
 import { isAksjonspunktOpen } from 'kodeverk/aksjonspunktStatus';
 import periodeAarsak from 'kodeverk/periodeAarsak';
-import TextAreaField from 'form/fields/TextAreaField';
+import { TextAreaField } from '@fpsak-frontend/form';
 import BehandlingspunktSubmitButton from 'behandlingsprosess/components/BehandlingspunktSubmitButton';
 import {
   hasValidText, maxLength, minLength, required,

packages/form/fields/RadioGroupField.jsx packages/fpsak-frontend-form/fields/RadioGroupField.jsx

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { Element, Normaltekst } from 'nav-frontend-typografi';
 import { Column, Row } from 'nav-frontend-grid';
 
-import { InputField } from 'form/Fields';
+import { InputField } from '@fpsak-frontend/form';
 import VerticalSpacer from 'sharedComponents/VerticalSpacer';
 import { required } from 'utils/validation/validators';
 import aktivitetStatus from 'kodeverk/aktivitetStatus';

packages/form/fields/RadioOption.jsx packages/fpsak-frontend-form/fields/RadioOption.jsx

@@ -10,7 +10,7 @@ import {
 } from 'utils/validation/validators';
 import {
   InputField, RadioGroupField, RadioOption, TextAreaField,
-} from 'form/Fields';
+} from '@fpsak-frontend/form';
 import aksjonspunktCodes from 'kodeverk/aksjonspunktCodes';
 import { isAksjonspunktOpen } from 'kodeverk/aksjonspunktStatus';
 import { parseCurrencyInput, removeSpacesFromNumber, formatCurrencyNoKr } from 'utils/currencyUtils';

packages/form/fields/ReadOnlyField.jsx packages/fpsak-frontend-form/fields/ReadOnlyField.jsx

@@ -17,7 +17,7 @@ import VerticalSpacer from 'sharedComponents/VerticalSpacer';
 import {
   required, minValue, maxValue, hasValidInteger,
 } from 'utils/validation/validators';
-import { InputField } from 'form/Fields';
+import { InputField } from '@fpsak-frontend/form';
 import aksjonspunktCode from 'kodeverk/aksjonspunktCodes';
 import OverstyrVurderingChecker from 'behandlingsprosess/components/OverstyrVurderingChecker';
 import OverstyrConfirmationForm from 'behandlingsprosess/components/OverstyrConfirmationForm';

packages/form/fields/ReadOnlyField.spec.jsx packages/fpsak-frontend-form/fields/ReadOnlyField.spec.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl';
 import { Normaltekst, Undertekst } from 'nav-frontend-typografi';
 import { Column, Row } from 'nav-frontend-grid';
 
-import CheckboxField from 'form/fields/CheckboxField';
+import { CheckboxField } from '@fpsak-frontend/form';
 import Table from 'sharedComponents/Table';
 import TableRow from 'sharedComponents/TableRow';
 import TableColumn from 'sharedComponents/TableColumn';

packages/form/fields/SelectField.jsx packages/fpsak-frontend-form/fields/SelectField.jsx

@@ -16,7 +16,7 @@ import { getSelectedSaksnummer } from 'fagsak/fagsakSelectors';
 import { behandlingForm, behandlingFormValueSelector } from 'behandling/behandlingForm';
 import kodeverkTyper from 'kodeverk/kodeverkTyper';
 import { getKodeverk } from 'kodeverk/duck';
-import { DatepickerField, RadioGroupField, RadioOption } from 'form/Fields';
+import { DatepickerField, RadioGroupField, RadioOption } from '@fpsak-frontend/form';
 import { getRestApiData } from 'data/duck';
 import { FpsakApi } from 'data/fpsakApi';
 import {

packages/form/fields/TextAreaField.jsx packages/fpsak-frontend-form/fields/TextAreaField.jsx

@@ -6,9 +6,9 @@ import classNames from 'classnames';
 
 import FadingPanel from 'sharedComponents/FadingPanel';
 import klageVurderingType from 'kodeverk/klageVurdering';
-import { RadioGroupField, RadioOption } from 'form/Fields';
-import SelectField from 'form/fields/SelectField';
-import DatepickerField from 'form/fields/DatepickerField';
+import {
+  RadioGroupField, RadioOption, SelectField, DatepickerField,
+} from '@fpsak-frontend/form';
 import AksjonspunktHelpText from 'sharedComponents/AksjonspunktHelpText';
 import VerticalSpacer from 'sharedComponents/VerticalSpacer';
 import { required, hasValidDate } from 'utils/validation/validators';

packages/form/fields/datepickerField.less packages/fpsak-frontend-form/fields/datepickerField.less

@@ -9,7 +9,7 @@ import { Normaltekst, Undertekst, Undertittel } from 'nav-frontend-typografi';
 import { Hovedknapp } from 'nav-frontend-knapper';
 
 import FadingPanel from 'sharedComponents/FadingPanel';
-import { RadioGroupField, RadioOption, TextAreaField } from 'form/Fields';
+import { RadioGroupField, RadioOption, TextAreaField } from '@fpsak-frontend/form';
 import AksjonspunktHelpText from 'sharedComponents/AksjonspunktHelpText';
 import VerticalSpacer from 'sharedComponents/VerticalSpacer';
 import PropTypes from 'prop-types';

packages/form/fields/decimalField.spec.jsx packages/fpsak-frontend-form/fields/decimalField.spec.jsx

@@ -16,7 +16,7 @@ import { behandlingForm, behandlingFormValueSelector } from 'behandling/behandli
 import { getKodeverk } from 'kodeverk/duck';
 import kodeverkTyper from 'kodeverk/kodeverkTyper';
 import personstatusType from 'kodeverk/personstatusType';
-import { RadioGroupField, RadioOption } from 'form/Fields';
+import { RadioGroupField, RadioOption } from '@fpsak-frontend/form';
 import VerticalSpacer from 'sharedComponents/VerticalSpacer';
 import { required } from 'utils/validation/validators';
 import behandlingStatus from 'kodeverk/behandlingStatus';

packages/form/fields/inputField.spec.jsx packages/fpsak-frontend-form/fields/inputField.spec.jsx

@@ -14,7 +14,7 @@ import Panel from 'nav-frontend-paneler';
 import VerticalSpacer from 'sharedComponents/VerticalSpacer';
 import FadingPanel from 'sharedComponents/FadingPanel';
 import { DDMMYYYY_DATE_FORMAT } from 'utils/formats';
-import { DatepickerField, RadioGroupField, RadioOption } from 'form/Fields';
+import { DatepickerField, RadioGroupField, RadioOption } from '@fpsak-frontend/form';
 import { dateBeforeOrEqualToToday, hasValidDate, required } from 'utils/validation/validators';
 import { getSelectedBehandlingspunktAksjonspunkter } from 'behandlingsprosess/behandlingsprosessSelectors';
 import { getSoknad, getBehandlingUttaksperiodegrense } from 'behandling/behandlingSelectors';

packages/form/fields/label.less packages/fpsak-frontend-form/fields/label.less

@@ -5,7 +5,7 @@ import {
   hasValidDate, required, dateAfterOrEqual, dateBeforeOrEqual,
 } from 'utils/validation/validators';
 
-import { DatepickerField } from 'form/Fields';
+import { DatepickerField } from '@fpsak-frontend/form';
 import Modal from 'sharedComponents/Modal';
 import { Column, Row } from 'nav-frontend-grid';
 import { Hovedknapp, Knapp } from 'nav-frontend-knapper';

packages/form/fields/optionGrid.less packages/fpsak-frontend-form/fields/optionGrid.less

@@ -9,7 +9,7 @@ import kodeverkPropType from 'kodeverk/kodeverkPropType';
 import TableColumn from 'sharedComponents/TableColumn';
 import TableRow from 'sharedComponents/TableRow';
 import Table from 'sharedComponents/Table';
-import { SelectField, InputField, DecimalField } from 'form/Fields';
+import { SelectField, InputField, DecimalField } from '@fpsak-frontend/form';
 import uttakArbeidTypeKodeverk from 'kodeverk/uttakArbeidType';
 import {
   minValue, maxValue, hasValidInteger, maxLength, required, hasValidDecimal, notDash,

packages/form/fields/radioGroupField.less packages/fpsak-frontend-form/fields/radioGroupField.less

@@ -11,7 +11,7 @@ import { FlexContainer, FlexRow, FlexColumn } from 'sharedComponents/flexGrid';
 import { Hovedknapp } from 'nav-frontend-knapper';
 import { ISO_DATE_FORMAT, DDMMYYYY_DATE_FORMAT } from 'utils/formats';
 import VerticalSpacer from 'sharedComponents/VerticalSpacer';
-import { CheckboxField } from 'form/Fields';
+import { CheckboxField } from '@fpsak-frontend/form';
 import { behandlingFormValueSelector, getBehandlingFormPrefix } from 'behandling/behandlingForm';
 import {
   getBehandlingVersjon,

packages/form/fields/radioGroupField.spec.jsx packages/fpsak-frontend-form/fields/radioGroupField.spec.jsx

@@ -5,7 +5,7 @@ import { Row, Column } from 'nav-frontend-grid';
 import { FlexContainer, FlexColumn, FlexRow } from 'sharedComponents/flexGrid';
 import {
   RadioGroupField, RadioOption, TextAreaField, SelectField, CheckboxField,
-} from 'form/Fields';
+} from '@fpsak-frontend/form';
 import {
   minLength, maxLength, requiredIfNotPristine, hasValidText, required, notDash,
 } from 'utils/validation/validators';

packages/form/fields/readOnlyField.less packages/fpsak-frontend-form/fields/readOnlyField.less

@@ -7,7 +7,7 @@ import {
 import { getLanguageCodeFromSprakkode } from 'utils/languageUtils';
 import classNames from 'classnames';
 import { Column, Row } from 'nav-frontend-grid';
-import { TextAreaField } from 'form/Fields';
+import { TextAreaField } from '@fpsak-frontend/form';
 import ElementWrapper from 'sharedComponents/ElementWrapper';
 import { Undertittel } from 'nav-frontend-typografi';
 import styles from './vedtakForm.less';

packages/form/fields/renderNavField.jsx packages/fpsak-frontend-form/fields/renderNavField.jsx

@@ -8,7 +8,7 @@ import VerticalSpacer from 'sharedComponents/VerticalSpacer';
 import decodeHtmlEntity from 'utils/decodeHtmlEntityUtils';
 import vilkarUtfallType from 'kodeverk/vilkarUtfallType';
 import behandlingStatus from 'kodeverk/behandlingStatus';
-import { TextAreaField } from 'form/Fields';
+import { TextAreaField } from '@fpsak-frontend/form';
 import {
   minLength, maxLength, requiredIfNotPristine, hasValidText,
 } from 'utils/validation/validators';

packages/form/fields/renderNavField.spec.jsx packages/fpsak-frontend-form/fields/renderNavField.spec.jsx

@@ -19,7 +19,7 @@ import { getSelectedBehandlingId } from 'behandling/duck';
 import { isInnvilget, isAvslag } from 'kodeverk/behandlingResultatType';
 import { getFagsakYtelseType } from 'fagsak/fagsakSelectors';
 import { getRettigheter } from 'navAnsatt/duck';
-import { CheckboxField } from 'form/Fields';
+import { CheckboxField } from '@fpsak-frontend/form';
 import behandlingStatusCode from 'kodeverk/behandlingStatus';
 import FritekstBrevPanel from 'behandlingsprosess/components/vedtak/FritekstBrevPanel';
 import classNames from 'classnames';