update sdc-qrf and fhir-react

shared/package.json

@@ -19,7 +19,7 @@
         "ajv": "^6.12.6",
         "ajv-errors": "^1.0.1",
         "ajv-keywords": "^3.5.2",
-        "aidbox-react": "^1.4.0",
+        "aidbox-react": "^1.12.0",
         "js-base64": "^3.6.0",
         "moment": "^2.29.1",
         "react-native-device-info": "^8.4.5"

shared/src/setupTests.ts

@@ -5,14 +5,8 @@ import {
 } from 'aidbox-react/lib/services/instance';
 import { withRootAccess } from 'aidbox-react/lib/utils/tests';
 
-import {
-    resetInstanceToken as resetFHIRInstanceToken,
-    setInstanceBaseURL as setFHIRInstanceBaseURL,
-} from 'fhir-react/lib/services/instance';
-
 beforeAll(async () => {
     setAidboxInstanceBaseURL('http://localhost:8181');
-    setFHIRInstanceBaseURL('http://localhost:8181/fhir');
 });
 
 let txId: string;
@@ -32,7 +26,6 @@ beforeEach(async () => {
 
 afterEach(async () => {
     resetAidboxInstanceToken();
-    resetFHIRInstanceToken();
     await withRootAccess(async () => {
         await axiosInstance({
             method: 'POST',

web/package.json

@@ -4,6 +4,8 @@
     "version": "0.3.16",
     "private": true,
     "dependencies": {
+        "@beda.software/aidbox-types": "link:../shared/src/contrib/aidbox-types",
+        "@beda.software/fhir-react": "^1.11.1",
         "@codemirror/commands": "^6.8.0",
         "@codemirror/lang-javascript": "^6.2.2",
         "@codemirror/lang-yaml": "^6.1.2",
@@ -33,13 +35,11 @@
         "@types/react-select": "^3.1.2",
         "@types/react-toastify": "^4.1.0",
         "@types/yaml": "^1.9.7",
-        "aidbox-react": "^1.4.0",
-        "@beda.software/aidbox-types": "link:../shared/src/contrib/aidbox-types",
+        "aidbox-react": "^1.12.0",
         "allotment": "^1.20.2",
         "babel-loader": "8.1.0",
         "babel-plugin-import": "^1.13.3",
         "classnames": "^2.3.1",
-        "fhir-react": "https://github.com/beda-software/fhir-react.git",
         "fhirpath": "^3.5.0",
         "final-form": "^4.20.4",
         "final-form-arrays": "^3.0.2",
@@ -58,7 +58,7 @@
         "react-select": "^5.4.0",
         "react-toastify": "^9.0.5",
         "sass": "^1.50.0",
-        "sdc-qrf": "^1.0.0-beta.21",
+        "sdc-qrf": "^1.1.0-alpha.11",
         "shared": "0.0.2",
         "ts-jest": "^27.1.4",
         "vitest": "^0.33.0",

web/src/components/BaseQuestionnaireResponseForm/components/date.tsx

@@ -1,8 +1,7 @@
+import { FHIRDateTimeFormat } from '@beda.software/fhir-react';
 import moment from 'moment';
 import { QuestionItemProps, useQuestionnaireResponseFormContext } from 'sdc-qrf';
 
-import { FHIRDateTimeFormat } from 'fhir-react/lib/utils/date';
-
 import { QuestionField } from './field';
 import { QuestionLabel } from './label';
 

web/src/components/BaseQuestionnaireResponseForm/components/reference/hooks.ts

@@ -1,13 +1,12 @@
+import { ResourcesMap } from '@beda.software/fhir-react';
+import { isSuccess } from '@beda.software/remote-data';
+import { buildQueryParams } from 'aidbox-react';
 import { Resource } from 'fhir/r4b';
 import fhirpath from 'fhirpath';
 import { ActionMeta, MultiValue, SingleValue } from 'react-select';
 import { AnswerValue, FormAnswerItems, parseFhirQueryExpression, QuestionItemProps } from 'sdc-qrf';
 import { loadResourceOptions } from 'web/src/services/questionnaire';
 
-import { isSuccess } from 'fhir-react/lib/libs/remoteData';
-import { ResourcesMap } from 'fhir-react/lib/services/fhir';
-import { buildQueryParams } from 'fhir-react/lib/services/instance';
-
 export type AnswerReferenceProps<R extends Resource, IR extends Resource> = QuestionItemProps & {
     overrideGetDisplay?: (resource: R, includedResources: ResourcesMap<R | IR>) => string;
     overrideGetLabel?: (o: AnswerValue) => React.ReactElement | string;

web/src/components/BaseQuestionnaireResponseForm/index.tsx

@@ -10,6 +10,7 @@ import {
     QuestionnaireResponseFormProvider,
     removeItemKey,
 } from 'sdc-qrf';
+import { fhirService } from 'web/src/services/initialize';
 
 import {
     Col,
@@ -88,6 +89,7 @@ export function BaseQuestionnaireResponseForm({ formData, onSubmit, readOnly, on
                     <QuestionnaireResponseFormProvider
                         formValues={values}
                         setFormValues={(newValues) => form.change('', newValues)}
+                        fhirService={fhirService}
                         groupItemComponent={Group}
                         itemControlGroupItemComponents={{ col: Col, row: Row, gtable: GTable }}
                         questionItemComponents={{

web/src/components/CachedRemoteData/index.tsx

@@ -1,4 +1,4 @@
-import { isLoading, RemoteData } from 'fhir-react';
+import { isLoading, RemoteData } from '@beda.software/remote-data';
 import { ReactElement, useEffect, useState } from 'react';
 
 export function CachedRemoteData<S, E>(props: {

web/src/components/CodeEditor/ContextMenu/index.tsx

@@ -1,10 +1,9 @@
+import { RemoteData } from '@beda.software/remote-data';
 import { QuestionnaireResponse, Parameters, Questionnaire } from 'fhir/r4b';
 import { useRef } from 'react';
 import { ModalExpression } from 'web/src/components/ModalExpression';
 import { SourceQueryDebugModal } from 'web/src/components/SourceQueryDebugModal';
 
-import { RemoteData } from 'fhir-react/lib/libs/remoteData';
-
 import s from './ContextMenu.module.scss';
 import { useContextMenu } from './useContextMenu';
 import { useMenuActions } from './useMenuActions';

web/src/components/LaunchContextEditor/index.tsx

@@ -1,10 +1,9 @@
+import { success } from '@beda.software/remote-data';
 import classNames from 'classnames';
 import { FhirResource, Parameters, ParametersParameter, Questionnaire } from 'fhir/r4b';
 import { useMemo, useState } from 'react';
 import { SingleValue } from 'react-select';
 
-import { success } from 'fhir-react/lib/libs/remoteData';
-
 import { groupLaunchContextParams } from './groupLaunchContextParams';
 import s from './LaunchContextEditor.module.scss';
 import { LaunchContext } from './types';

web/src/components/ModalExpression/hooks.ts

@@ -1,15 +1,14 @@
+import { useService } from '@beda.software/fhir-react';
+import { isSuccess } from '@beda.software/remote-data';
 import { QuestionnaireResponse } from 'fhir/r4b';
 import fhirpath from 'fhirpath';
 import yaml from 'js-yaml';
 import { useCallback, useContext, useEffect, useState } from 'react';
 import { extractParameterName } from 'web/src/components/ModalExpression/utils';
 import { ExpressionResultOutput } from 'web/src/containers/Main/types';
+import { service } from 'web/src/services/initialize';
 import YAML, { visitor } from 'yaml';
 
-import { useService } from 'fhir-react/lib/hooks/service';
-import { isSuccess } from 'fhir-react/lib/libs/remoteData';
-import { service } from 'fhir-react/lib/services/service';
-
 import { ModalExpressionProps } from './types';
 import { CodeEditorContext } from '../CodeEditor/context';
 

web/src/components/ModalExpression/index.tsx

@@ -1,12 +1,11 @@
+import { isSuccess, RemoteData } from '@beda.software/remote-data';
 import { QuestionnaireResponse } from 'fhir/r4b';
 import { Button } from 'web/src/components/Button';
 import { CodeEditor } from 'web/src/components/CodeEditor';
 import { InputField } from 'web/src/components/InputField';
 import { useExpressionModal } from 'web/src/components/ModalExpression/hooks';
 import { ResourceCodeDisplay } from 'web/src/components/ResourceCodeDisplay';
 
-import { isSuccess, RemoteData } from 'fhir-react/lib/libs/remoteData';
-
 import s from './ModalExpression.module.scss';
 import { ModalExpressionProps } from './types';
 import { ExpressionType } from '../CodeEditor/ContextMenu/types';

web/src/components/ModalExpression/types.ts

@@ -1,7 +1,6 @@
+import { RemoteData } from '@beda.software/remote-data';
 import { QuestionnaireResponse, Parameters } from 'fhir/r4b';
 
-import { RemoteData } from 'fhir-react/lib/libs/remoteData';
-
 import { CursorPosition, ExpressionType } from '../CodeEditor/ContextMenu/types';
 
 export interface ModalExpressionProps {

web/src/components/QRFormWrapper/index.tsx

@@ -1,3 +1,5 @@
+import { formatError } from '@beda.software/fhir-react';
+import { RemoteData, sequenceMap } from '@beda.software/remote-data';
 import {
     Questionnaire as FHIRQuestionnaire,
     QuestionnaireResponse as FHIRQuestionnaireResponse,
@@ -16,10 +18,6 @@ import {
 } from 'sdc-qrf';
 import { RenderRemoteData } from 'web/src/components/RenderRemoteData';
 
-import { RemoteData } from 'fhir-react/lib/libs/remoteData';
-import { sequenceMap } from 'fhir-react/lib/services/service';
-import { formatError } from 'fhir-react/lib/utils/error';
-
 import { BaseQuestionnaireResponseForm } from '../BaseQuestionnaireResponseForm';
 
 interface QRData {

web/src/components/RenderRemoteData.tsx

@@ -1,13 +1,12 @@
-import { ReactElement } from 'react';
-
+import { formatError } from '@beda.software/fhir-react';
 import {
     isFailure,
     isLoading,
     isNotAsked,
     isSuccess,
     RemoteData,
-} from 'fhir-react/lib/libs/remoteData';
-import { formatError } from 'fhir-react/lib/utils/error';
+} from '@beda.software/remote-data';
+import { ReactElement } from 'react';
 
 interface RenderRemoteDataProps<S, E = any> {
     remoteData: RemoteData<S, E>;

web/src/components/ResourceCodeDisplay/index.tsx

@@ -1,10 +1,9 @@
+import { RemoteData } from '@beda.software/remote-data';
 import { FhirResource } from 'fhir/r4b';
 import { memo } from 'react';
 import { CodeEditor } from 'web/src/components/CodeEditor';
 import { RenderRemoteData } from 'web/src/components/RenderRemoteData';
 
-import { RemoteData } from 'fhir-react/lib/libs/remoteData';
-
 interface ResourceDisplayBoxProps {
     resourceResponse: RemoteData<FhirResource>;
 }

web/src/components/ResourceCodeEditor/index.tsx

@@ -1,10 +1,9 @@
+import { RemoteData } from '@beda.software/remote-data';
 import { Parameters, Resource, QuestionnaireResponse } from 'fhir/r4b';
 import { YAMLException } from 'js-yaml';
 import _ from 'lodash';
 import { useEffect, useState } from 'react';
 
-import { RemoteData } from 'fhir-react/lib/libs/remoteData';
-
 import { usePreviousValue } from 'shared/src/hooks/previous-value';
 
 import s from './ResourceCodeEditor.module.scss';

web/src/components/ResourceSelect/index.tsx

@@ -1,14 +1,11 @@
+import { RenderRemoteData, WithId, SearchParams } from '@beda.software/fhir-react';
+import { isSuccess, RemoteData, mapSuccess } from '@beda.software/remote-data';
 import classNames from 'classnames';
 import { Bundle, Resource } from 'fhir/r4b';
 import _ from 'lodash';
 import { useCallback } from 'react';
 import { MultiValue, SingleValue } from 'react-select';
-
-import { RenderRemoteData } from 'fhir-react/lib/components/RenderRemoteData';
-import { isSuccess, RemoteData } from 'fhir-react/lib/libs/remoteData';
-import { getFHIRResources, WithId } from 'fhir-react/lib/services/fhir';
-import { SearchParams } from 'fhir-react/lib/services/search';
-import { mapSuccess } from 'fhir-react/lib/services/service';
+import { getFHIRResources } from 'web/src/services/initialize';
 
 import s from './ResourceSelect.module.scss';
 import { AsyncSelect } from '../Select';

web/src/components/SourceQueryDebugModal/__test__/sourceQueryDebugModal.test.ts

@@ -1,11 +1,10 @@
+import { ensure } from '@beda.software/fhir-react';
+import { isSuccess } from '@beda.software/remote-data';
 import { act, renderHook } from '@testing-library/react-hooks';
+import { axiosInstance } from 'aidbox-react';
 import { NutritionOrder, Patient } from 'fhir/r4b';
 import { useSourceQueryDebugModal } from 'web/src/components/SourceQueryDebugModal/hooks';
-
-import { isSuccess } from 'fhir-react/lib/libs/remoteData';
-import { saveFHIRResource } from 'fhir-react/lib/services/fhir';
-import { axiosInstance } from 'fhir-react/lib/services/instance';
-import { ensure } from 'fhir-react/lib/utils/tests';
+import { saveFHIRResource } from 'web/src/services/initialize';
 
 import {
     nutritionOrderData,

web/src/components/SourceQueryDebugModal/hooks.ts

@@ -1,13 +1,10 @@
+import { useService, formatError } from '@beda.software/fhir-react';
+import { isFailure, success, isSuccess, mapSuccess } from '@beda.software/remote-data';
 import { Questionnaire, Bundle, Resource } from 'fhir/r4b';
 import * as _ from 'lodash';
 import { useCallback, useState } from 'react';
 import { toast } from 'react-toastify';
-
-import { useService } from 'fhir-react/lib/hooks/service';
-import { isFailure, success, isSuccess } from 'fhir-react/lib/libs/remoteData';
-import { saveFHIRResource } from 'fhir-react/lib/services/fhir';
-import { mapSuccess, service } from 'fhir-react/lib/services/service';
-import { formatError } from 'fhir-react/lib/utils/error';
+import { saveFHIRResource, service } from 'web/src/services/initialize';
 
 import { Props } from './types';
 

web/src/components/SourceQueryDebugModal/index.tsx

@@ -1,8 +1,7 @@
+import { RenderRemoteData } from '@beda.software/fhir-react';
 import { Button } from 'web/src/components/Button';
 import { CodeEditor } from 'web/src/components/CodeEditor';
 
-import { RenderRemoteData } from 'fhir-react/lib/components/RenderRemoteData';
-
 import { useSourceQueryDebugModal } from './hooks';
 import s from './SourceQueryDebugModal.module.scss';
 import { Props } from './types';

web/src/components/TerminologyField/index.tsx

@@ -1,11 +1,10 @@
 import { Coding, ValueSet } from '@beda.software/aidbox-types';
+import { isSuccess, mapSuccess } from '@beda.software/remote-data';
 import _ from 'lodash';
 import { useCallback } from 'react';
 import { Field } from 'react-final-form';
 import AsyncSelect from 'react-select/async';
-
-import { isSuccess } from 'fhir-react/lib/libs/remoteData';
-import { mapSuccess, service } from 'fhir-react/lib/services/service';
+import { service } from 'web/src/services/initialize';
 
 import s from './TerminologyField.module.scss';
 

web/src/containers/App/index.tsx

@@ -1,13 +1,11 @@
 import { User } from '@beda.software/aidbox-types';
+import { RenderRemoteData, useService } from '@beda.software/fhir-react';
+import { success } from '@beda.software/remote-data';
 import queryString from 'query-string';
 import { useEffect, useRef } from 'react';
 import { Route, Routes, useLocation, Navigate } from 'react-router-dom';
 import { setData } from 'web/src/services/localStorage';
 
-import { RenderRemoteData } from 'fhir-react/lib/components/RenderRemoteData';
-import { useService } from 'fhir-react/lib/hooks/service';
-import { success } from 'fhir-react/lib/libs/remoteData';
-
 import {
     authorize,
     getToken,

web/src/containers/Main/MappingEditor/MappingEditorEditor/index.tsx

@@ -1,14 +1,13 @@
 import { Mapping } from '@beda.software/aidbox-types';
+import { WithId } from '@beda.software/fhir-react';
+import { isSuccess } from '@beda.software/remote-data';
 import classNames from 'classnames';
-import { WithId } from 'fhir-react';
 import _ from 'lodash';
 import { useBeforeUnload } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import { Button } from 'web/src/components/Button';
 import { ResourceCodeEditor } from 'web/src/components/ResourceCodeEditor';
 
-import { isSuccess } from 'fhir-react/lib/libs/remoteData';
-
 import { MappingEditorEditorProps } from '../interfaces';
 import s from '../MappingEditor.module.scss';
 

web/src/containers/Main/MappingEditor/MappingEditorError/index.tsx

@@ -1,7 +1,6 @@
+import { formatError } from '@beda.software/fhir-react';
 import { Button } from 'web/src/components/Button';
 
-import { formatError } from 'fhir-react/lib/utils/error';
-
 import { MappingEditorErrorProps } from '../interfaces';
 import s from '../MappingEditor.module.scss';
 

web/src/containers/Main/MappingEditor/MappingEditorSelect/index.tsx

@@ -1,13 +1,11 @@
+import { RenderRemoteData, formatError } from '@beda.software/fhir-react';
+import { isFailure, isSuccess } from '@beda.software/remote-data';
 import { SingleValue } from 'react-select';
 import { toast } from 'react-toastify';
 import { Button } from 'web/src/components/Button';
 import { ModalCreateMapper } from 'web/src/components/ModalCreateMapper';
 import { Select } from 'web/src/components/Select';
 
-import { RenderRemoteData } from 'fhir-react/lib/components/RenderRemoteData';
-import { isFailure, isSuccess } from 'fhir-react/lib/libs/remoteData';
-import { formatError } from 'fhir-react/lib/utils/error';
-
 import formStyles from '../../../../components/BaseQuestionnaireResponseForm/QuestionnaireResponseForm.module.scss';
 import { PromptForm } from '../../PromptForm';
 import { MappingEditorSelectProps } from '../interfaces';

web/src/containers/Main/MappingEditor/index.tsx

@@ -1,4 +1,4 @@
-import { RenderRemoteData } from 'fhir-react/lib/components/RenderRemoteData';
+import { RenderRemoteData } from '@beda.software/fhir-react';
 
 import { MappingEditorProps } from './interfaces';
 import s from './MappingEditor.module.scss';

web/src/containers/Main/MappingEditor/interfaces.ts

@@ -1,10 +1,9 @@
 import { Mapping } from '@beda.software/aidbox-types';
+import { WithId } from '@beda.software/fhir-react';
+import { RemoteData, RemoteDataResult } from '@beda.software/remote-data';
 import { Questionnaire, Parameters, QuestionnaireResponse } from 'fhir/r4b';
 import { YAMLException } from 'js-yaml';
 
-import { RemoteData, RemoteDataResult } from 'fhir-react/lib/libs/remoteData';
-import { WithId } from 'fhir-react/lib/services/fhir';
-
 export type EditorState = 'initial' | 'loading' | 'select' | 'ready';
 
 interface CommonMappingEditorProps {