merge fix

package.json

@@ -61,6 +61,7 @@
     "@types/dompurify": "^2.0.1",
     "@types/enzyme": "^3.10.13",
     "@types/enzyme-to-json": "^1.5.4",
+    "@types/fhir": "^0.0.41",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.0",
     "@types/marked": "^3.0.0",

src/actions/form.ts

@@ -1,4 +1,4 @@
-import { Questionnaire, QuestionnaireResponse } from '../types/fhir';
+import { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
 
 export type SET_SKJEMA_DEFINITION = 'refero/SET_SKJEMA_DEFINITION';
 export const SET_SKJEMA_DEFINITION: SET_SKJEMA_DEFINITION = 'refero/SET_SKJEMA_DEFINITION';

src/actions/generateQuestionnaireResponse.ts

@@ -4,7 +4,7 @@ import {
   QuestionnaireResponseItem,
   QuestionnaireResponseItemAnswer,
   Questionnaire,
-} from '../types/fhir';
+} from 'fhir/r4';
 
 import Constants from '../constants/index';
 import itemType from '../constants/itemType';

src/actions/newValue.ts

@@ -1,8 +1,7 @@
+import { Coding, QuestionnaireItem, Attachment, QuestionnaireResponseItem, Quantity } from 'fhir/r4';
 import { Action } from 'redux';
 import { ThunkDispatch } from 'redux-thunk';
 
-import { Coding, QuestionnaireItem, Attachment, QuestionnaireResponseItem, Quantity } from '../types/fhir';
-
 import { GlobalState } from '../reducers';
 import { Path } from '../util/refero-core';
 

src/actions/syncQuestionnaireResponse.ts

@@ -4,7 +4,7 @@ import {
   QuestionnaireItem,
   QuestionnaireResponseItem,
   QuestionnaireResponseItemAnswer,
-} from '../types/fhir';
+} from 'fhir/r4';
 
 import { createQuestionnaireResponseItem } from './generateQuestionnaireResponse';
 import ItemType from '../constants/itemType';

src/components/RenderFormItems.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
+import { QuestionnaireItem, QuestionnaireResponseItem, QuestionnaireResponseItemAnswer } from 'fhir/r4';
 import { connect } from 'react-redux';
 import { ThunkDispatch } from 'redux-thunk';
 
-import { QuestionnaireItem, QuestionnaireResponseItem, QuestionnaireResponseItemAnswer } from '../types/fhir';
 import { ReferoProps } from '../types/referoProps';
 
 import { RepeatButton } from './formcomponents/repeat/repeat-button';

src/components/formcomponents/attachment/attachment.tsx

@@ -1,15 +1,9 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, QuestionnaireResponseItemAnswer, Attachment, QuestionnaireResponseItem, Questionnaire } from 'fhir/r4';
 import { connect } from 'react-redux';
 import { ThunkDispatch } from 'redux-thunk';
 
-import {
-  QuestionnaireItem,
-  QuestionnaireResponseItemAnswer,
-  Attachment,
-  QuestionnaireResponseItem,
-  Questionnaire,
-} from '../../../types/fhir';
 import { ValidationProps } from '../../../types/formTypes/validation';
 import { Resources } from '../../../types/resources';
 import { TextMessage } from '../../../types/text-message';

src/components/formcomponents/attachment/attachmenthtml.tsx

@@ -1,9 +1,10 @@
 import * as React from 'react';
 
+import { QuestionnaireItem } from 'fhir/r4';
 import { useFormContext } from 'react-hook-form';
 
-import { QuestionnaireItem } from '../../../types/fhir';
 import { ValidationProps } from '../../../types/formTypes/validation';
+import { Resources } from '../../../types/resources';
 import { TextMessage } from '../../../types/text-message';
 
 import NotificationPanel from '@helsenorge/designsystem-react/components/NotificationPanel';
@@ -16,7 +17,6 @@ import { sizeIsValid, mimeTypeIsValid } from '@helsenorge/file-upload/components
 import constants, { VALID_FILE_TYPES } from '../../../constants';
 import { getId } from '../../../util';
 import { getValidationTextExtension } from '../../../util/extension';
-import { Resources } from '../../../types/resources';
 
 interface Props {
   onUpload: (files: Array<File>, cb: (success: boolean, errormessage: TextMessage | null, uploadedFile?: UploadedFile) => void) => void;

src/components/formcomponents/boolean/boolean.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireResponseItem, Questionnaire } from 'fhir/r4';
 import { useFormContext } from 'react-hook-form';
 import { connect } from 'react-redux';
 import { ThunkDispatch } from 'redux-thunk';
 
-import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireResponseItem, Questionnaire } from '../../../types/fhir';
 import { ValidationProps } from '../../../types/formTypes/validation';
 import { Resources } from '../../../types/resources';
 

src/components/formcomponents/boolean/pdf.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { QuestionnaireItem } from '../../../types/fhir';
+import { QuestionnaireItem } from 'fhir/r4';
 
 import { renderPrefix, getText } from '../../../util/index';
 

src/components/formcomponents/boolean/utils.ts

@@ -1,4 +1,4 @@
-import { QuestionnaireItem, QuestionnaireResponseItemAnswer } from '../../../types/fhir';
+import { QuestionnaireItem, QuestionnaireResponseItemAnswer } from 'fhir/r4';
 
 export const getBooleanValue = (answer: QuestionnaireResponseItemAnswer, item: QuestionnaireItem): boolean => {
   if (answer && answer.valueBoolean !== undefined) {

src/components/formcomponents/choice-common/autosuggest-view.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react';
 
+import { ValueSet, QuestionnaireItem, Questionnaire, Coding, QuestionnaireResponseItemAnswer } from 'fhir/r4';
 import { Collapse } from 'react-collapse';
 import { useFormContext } from 'react-hook-form';
 
 import { AutoSuggestProps } from '../../../types/autoSuggestProps';
-import { ValueSet, QuestionnaireItem, Questionnaire, Coding, QuestionnaireResponseItemAnswer } from '../../../types/fhir';
 import { Resources } from '../../../types/resources';
 
 import Loader from '@helsenorge/designsystem-react/components/Loader';
@@ -204,7 +204,6 @@ const AutosuggestView: React.FC<AutosuggestViewProps> = props => {
             {...register(props.item.linkId, {
               required: isRequired(props.item),
               onChange: (e: React.FormEvent<HTMLInputElement>, params: { newValue: string; method: string }) => onChangeInput(e, params),
-              onBlur: onBlur,
             })}
             id={getId(props.id)}
             label={

src/components/formcomponents/choice/checkbox-view.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, Questionnaire } from 'fhir/r4';
 import { Collapse } from 'react-collapse';
 import { useFormContext } from 'react-hook-form';
 
-import { QuestionnaireItem, Questionnaire } from '../../../types/fhir';
 import { Options } from '../../../types/formTypes/radioGroupOptions';
 import { Resources } from '../../../types/resources';
 

src/components/formcomponents/choice/choice.tsx

@@ -1,17 +1,10 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, QuestionnaireResponseItemAnswer, Resource, Coding, QuestionnaireResponseItem, ValueSet } from 'fhir/r4';
 import { connect } from 'react-redux';
 import { ThunkDispatch } from 'redux-thunk';
 
 import { AutoSuggestProps } from '../../../types/autoSuggestProps';
-import {
-  QuestionnaireItem,
-  QuestionnaireResponseItemAnswer,
-  Resource,
-  Coding,
-  QuestionnaireResponseItem,
-  ValueSet,
-} from '../../../types/fhir';
 import { Options } from '../../../types/formTypes/radioGroupOptions';
 import { ValidationProps } from '../../../types/formTypes/validation';
 import { OrgenhetHierarki } from '../../../types/orgenhetHierarki';
@@ -75,7 +68,7 @@ const Choice = (props: ChoiceProps & ValidationProps): JSX.Element | null => {
         }
       });
     } else if (answer && !Array.isArray(answer) && answer.valueCoding && answer.valueCoding.code) {
-      if (answer.valueCoding?.code === item.initial?.[0].valueCoding.code && answer.valueCoding?.display === undefined) {
+      if (answer.valueCoding?.code === item.initial?.[0].valueCoding?.code && answer.valueCoding?.display === undefined) {
         resetInitialAnswer(answer.valueCoding.code);
       }
       return [answer.valueCoding.code];

src/components/formcomponents/choice/dropdown-view.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, Questionnaire } from 'fhir/r4';
 import { Collapse } from 'react-collapse';
 import { useFormContext } from 'react-hook-form';
 
-import { QuestionnaireItem, Questionnaire } from '../../../types/fhir';
 import { Options } from '../../../types/formTypes/radioGroupOptions';
 import { Resources } from '../../../types/resources';
 

src/components/formcomponents/choice/radio-view.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, Questionnaire } from 'fhir/r4';
 import { Collapse } from 'react-collapse';
 import { useFormContext } from 'react-hook-form';
 
-import { QuestionnaireItem, Questionnaire } from '../../../types/fhir';
 import { Options } from '../../../types/formTypes/radioGroupOptions';
 import { Resources } from '../../../types/resources';
 
@@ -26,13 +26,13 @@ interface Props {
   getErrorMessage: (val: string) => string;
   renderDeleteButton: (className: string) => JSX.Element | undefined;
   repeatButton: JSX.Element;
-
+  children?: React.ReactNode;
   renderHelpButton: () => JSX.Element;
   renderHelpElement: () => JSX.Element;
   onRenderMarkdown?: (item: QuestionnaireItem, markdown: string) => string;
 }
 
-const RadioView: React.SFC<Props> = ({
+const RadioView = ({
   options,
   item,
   questionnaire,
@@ -41,13 +41,12 @@ const RadioView: React.SFC<Props> = ({
   selected,
   resources,
   children,
-  getErrorMessage,
   repeatButton,
   renderDeleteButton,
   renderHelpButton,
   renderHelpElement,
   onRenderMarkdown,
-}) => {
+}: Props): JSX.Element | null => {
   if (!options) {
     return null;
   }

src/components/formcomponents/choice/slider-view.tsx

@@ -1,9 +1,8 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, QuestionnaireItemAnswerOption } from 'fhir/r4';
 import { ChangeHandler, useFormContext } from 'react-hook-form';
 
-import { QuestionnaireItem, QuestionnaireItemAnswerOption } from '../../../types/fhir';
-
 import { Slider, SliderStep } from '@helsenorge/designsystem-react/components/Slider';
 
 import ExtensionConstants from '../../../constants/extensions';
@@ -34,7 +33,7 @@ const SliderView: React.FC<SliderProps> = ({ item, handleChange, children }) =>
 
   const onValueChange = (index: number): void => {
     console.log('index', index);
-    const code = item.answerOption?.[index]?.valueCoding.code;
+    const code = item.answerOption?.[index]?.valueCoding?.code;
     console.log('code', code);
     if (code) {
       handleChange(code);
@@ -66,7 +65,7 @@ function mapToSliderStep(answerOption: QuestionnaireItemAnswerOption): SliderSte
 }
 
 function getLeftRightLabels(answerOptions: QuestionnaireItemAnswerOption[]): LeftRightLabels | undefined {
-  const displayLabels = answerOptions.map(option => option.valueCoding.display).filter(display => display) as string[];
+  const displayLabels = answerOptions.map(option => option.valueCoding?.display).filter(display => display) as string[];
 
   if (displayLabels.length > 1) {
     const leftRightLabels: LeftRightLabels = [displayLabels[0], displayLabels[displayLabels.length - 1]];

src/components/formcomponents/date/date-day-input.tsx

@@ -1,8 +1,9 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireItemInitial } from 'fhir/r4';
 import moment, { Moment } from 'moment';
 
-import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireItemInitial } from '../../../types/fhir';
+import { Resources } from '../../../types/resources';
 
 import Validation from '@helsenorge/designsystem-react/components/Validation';
 
@@ -15,7 +16,6 @@ import Constants from '../../../constants/index';
 import { getId, isRequired } from '../../../util';
 import { getPlaceholder, getValidationTextExtension } from '../../../util/extension';
 import { isReadOnly } from '../../../util/index';
-import { Resources } from '../../../types/resources';
 import TextView from '../textview';
 
 interface DateDayInputProps {

src/components/formcomponents/date/date-month-input.tsx

@@ -1,8 +1,9 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, QuestionnaireResponseItemAnswer } from 'fhir/r4';
 import moment, { Moment } from 'moment';
 
-import { QuestionnaireItem, QuestionnaireResponseItemAnswer } from '../../../types/fhir';
+import { Resources } from '../../../types/resources';
 
 import Validation from '@helsenorge/designsystem-react/components/Validation';
 
@@ -11,7 +12,6 @@ import { YearMonthResources, YearMonthInput, YearMonthValue } from '@helsenorge/
 
 import { getId, isReadOnly, isRequired } from '../../../util';
 import { getPlaceholder, getValidationTextExtension } from '../../../util/extension';
-import { Resources } from '../../../types/resources';
 import TextView from '../textview';
 
 interface DateYearMonthInputProps {

src/components/formcomponents/date/date-time.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireResponseItem, Questionnaire } from 'fhir/r4';
 import moment, { Moment } from 'moment';
 import { connect } from 'react-redux';
 import { ThunkDispatch } from 'redux-thunk';
 
-import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireResponseItem, Questionnaire } from '../../../types/fhir';
 import { ValidationProps } from '../../../types/formTypes/validation';
 import { Resources } from '../../../types/resources';
 

src/components/formcomponents/date/date-year-input.tsx

@@ -1,8 +1,9 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, QuestionnaireResponseItemAnswer } from 'fhir/r4';
 import { Moment } from 'moment';
 
-import { QuestionnaireItem, QuestionnaireResponseItemAnswer } from '../../../types/fhir';
+import { Resources } from '../../../types/resources';
 
 import Validation from '@helsenorge/designsystem-react/components/Validation';
 
@@ -11,7 +12,6 @@ import { YearErrorResources, YearInput } from '@helsenorge/date-time/components/
 import { getId, isReadOnly, isRequired } from '../../../util';
 import { createDateFromYear } from '../../../util/createDateFromYear';
 import { getPlaceholder, getValidationTextExtension } from '../../../util/extension';
-import { Resources } from '../../../types/resources';
 import TextView from '../textview';
 
 interface Props {

src/components/formcomponents/date/time.tsx

@@ -1,11 +1,12 @@
 import * as React from 'react';
 
+import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireResponseItem, Questionnaire } from 'fhir/r4';
 import moment from 'moment';
 import { connect } from 'react-redux';
 import { ThunkDispatch } from 'redux-thunk';
 
-import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireResponseItem, Questionnaire } from '../../../types/fhir';
 import { ValidationProps } from '../../../types/formTypes/validation';
+import { Resources } from '../../../types/resources';
 
 import Validation from '@helsenorge/designsystem-react/components/Validation';
 
@@ -20,7 +21,6 @@ import { getExtension, getValidationTextExtension } from '../../../util/extensio
 import { isReadOnly, isRequired, getId, getSublabelText } from '../../../util/index';
 import { mapStateToProps, mergeProps, mapDispatchToProps } from '../../../util/map-props';
 import { Path } from '../../../util/refero-core';
-import { Resources } from '../../../types/resources';
 import withCommonFunctions, { WithCommonFunctionsProps } from '../../with-common-functions';
 import Label from '../label';
 import SubLabel from '../sublabel';
@@ -191,16 +191,6 @@ const Time: React.FC<TimeProps & ValidationProps> = props => {
     return '';
   };
 
-  // React.useMemo(() => {
-  //   const responseItemHasChanged = props.responseItem !== props.responseItem;
-  //   const helpItemHasChanged = props.isHelpOpen !== props.isHelpOpen;
-  //   const answerHasChanged = props.answer !== props.answer;
-  //   const resourcesHasChanged = JSON.stringify(props.resources) !== JSON.stringify(props.resources);
-  //   const repeats = props.item.repeats ?? false;
-
-  //   return responseItemHasChanged || helpItemHasChanged || resourcesHasChanged || repeats || answerHasChanged;
-  // }, [props.responseItem, props.isHelpOpen, props.answer, props.resources, props.item]);
-
   const { pdf, item, renderFieldset, id, onRenderMarkdown } = props;
   const subLabelText = getSublabelText(props.item, props.onRenderMarkdown, props.questionnaire, props.resources);
 

src/components/formcomponents/decimal/decimal.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react';
 
+import { Questionnaire, QuestionnaireItem, QuestionnaireResponseItemAnswer } from 'fhir/r4';
 import { ValidationRule, useForm, useFormContext } from 'react-hook-form';
 import { connect } from 'react-redux';
 import { ThunkDispatch } from 'redux-thunk';
 
-import { Questionnaire, QuestionnaireItem, QuestionnaireResponseItemAnswer } from '../../../types/fhir';
 import { ValidationProps } from '../../../types/formTypes/validation';
 import { Resources } from '../../../types/resources';
 

src/components/formcomponents/display/display.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 
 import DOMPurify from 'dompurify';
+import { Questionnaire, QuestionnaireItem } from 'fhir/r4';
 import { connect } from 'react-redux';
 
-import { Questionnaire, QuestionnaireItem } from '../../../types/fhir';
 import { Resources } from '../../../types/resources';
 
 import designsystemtypography from '@helsenorge/designsystem-react/scss/typography.module.scss';