update sdc-qrf and fhir-react

Author: alexlipovka

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';