diff --git a/apps/smart-forms-app/cypress/support/commands.ts b/apps/smart-forms-app/cypress/support/commands.ts index 0be7891b8..82bb5feec 100644 --- a/apps/smart-forms-app/cypress/support/commands.ts +++ b/apps/smart-forms-app/cypress/support/commands.ts @@ -62,12 +62,12 @@ Cypress.Commands.add('waitForPopulation', () => { }); Cypress.Commands.add('launchFromEHRProxy', () => { - const launchUrl = `${appUrl}/launch?iss=https%3A%2F%2Fproxy.smartforms.io%2Fv%2Fr4%2Ffhir&launch=WzAsInBhdC1zZiIsInByaW1hcnktcGV0ZXIiLCJBVVRPIiwwLDAsMCwiZmhpclVzZXIgb25saW5lX2FjY2VzcyBvcGVuaWQgcHJvZmlsZSBwYXRpZW50L0NvbmRpdGlvbi5ycyBwYXRpZW50L09ic2VydmF0aW9uLnJzIGxhdW5jaCBwYXRpZW50L0VuY291bnRlci5ycyBwYXRpZW50L1F1ZXN0aW9ubmFpcmVSZXNwb25zZS5jcnVkcyBwYXRpZW50L1BhdGllbnQucnMiLCJodHRwOi8vbG9jYWxob3N0OjUxNzMvIiwiMWZmN2JkYzItMzZiMi00MzAzLThjMDUtYzU3MzQyYzViMDQzIiwiIiwiIiwiIiwiIiwwLDEsIiIsZmFsc2Vd`; + const launchUrl = `${appUrl}/launch?iss=https%3A%2F%2Fproxy.smartforms.io%2Fv%2Fr4%2Ffhir&launch=WzAsInBhdC1zZiIsInByaW1hcnktcGV0ZXIiLCJBVVRPIiwwLDAsMCwiZmhpclVzZXIgb25saW5lX2FjY2VzcyBvcGVuaWQgcHJvZmlsZSBwYXRpZW50L0NvbmRpdGlvbi5ycyBwYXRpZW50L09ic2VydmF0aW9uLnJzIGxhdW5jaCBwYXRpZW50L0VuY291bnRlci5ycyBwYXRpZW50L1F1ZXN0aW9ubmFpcmVSZXNwb25zZS5jcnVkcyBwYXRpZW50L1BhdGllbnQucnMiLCJodHRwOi8vbG9jYWxob3N0OjQxNzMvIiwiYTU3ZDkwZTMtNWY2OS00YjkyLWFhMmUtMjk5MjE4MDg2M2MxIiwiIiwiIiwiIiwiIiwwLDEsIiIsZmFsc2Vd`; cy.visit(launchUrl); }); Cypress.Commands.add('launchFromEHRProxyQuesContext', () => { - const launchUrl = `${appUrl}/launch?iss=https%3A%2F%2Fproxy.smartforms.io%2Fv%2Fr4%2Ffhir&launch=WzAsInBhdC1zZiIsInByaW1hcnktcGV0ZXIiLCJBVVRPIiwwLDAsMCwiZmhpclVzZXIgb25saW5lX2FjY2VzcyBvcGVuaWQgcHJvZmlsZSBwYXRpZW50L0NvbmRpdGlvbi5ycyBwYXRpZW50L09ic2VydmF0aW9uLnJzIGxhdW5jaCBwYXRpZW50L0VuY291bnRlci5ycyBwYXRpZW50L1F1ZXN0aW9ubmFpcmVSZXNwb25zZS5jcnVkcyBwYXRpZW50L1BhdGllbnQucnMiLCJodHRwOi8vbG9jYWxob3N0OjUxNzMvIiwiMWZmN2JkYzItMzZiMi00MzAzLThjMDUtYzU3MzQyYzViMDQzIiwiIiwiIiwiIiwiIiwwLDEsIntcInJvbGVcIjpcInF1ZXN0aW9ubmFpcmUtcmVuZGVyLW9uLWxhdW5jaFwiLFwiY2Fub25pY2FsXCI6XCJodHRwOi8vd3d3LmhlYWx0aC5nb3YuYXUvYXNzZXNzbWVudHMvbWJzLzcxNXwwLjEuMC1hc3NlbWJsZWRcIixcInR5cGVcIjpcIlF1ZXN0aW9ubmFpcmVcIn0iLGZhbHNlXQ`; + const launchUrl = `${appUrl}/launch?iss=https%3A%2F%2Fproxy.smartforms.io%2Fv%2Fr4%2Ffhir&launch=WzAsInBhdC1zZiIsInByaW1hcnktcGV0ZXIiLCJBVVRPIiwwLDAsMCwiZmhpclVzZXIgb25saW5lX2FjY2VzcyBvcGVuaWQgcHJvZmlsZSBwYXRpZW50L0NvbmRpdGlvbi5ycyBwYXRpZW50L09ic2VydmF0aW9uLnJzIGxhdW5jaCBwYXRpZW50L0VuY291bnRlci5ycyBwYXRpZW50L1F1ZXN0aW9ubmFpcmVSZXNwb25zZS5jcnVkcyBwYXRpZW50L1BhdGllbnQucnMiLCJodHRwOi8vbG9jYWxob3N0OjQxNzMvIiwiYTU3ZDkwZTMtNWY2OS00YjkyLWFhMmUtMjk5MjE4MDg2M2MxIiwiIiwiIiwiIiwiIiwwLDEsIntcInJvbGVcIjpcInF1ZXN0aW9ubmFpcmUtcmVuZGVyLW9uLWxhdW5jaFwiLFwiY2Fub25pY2FsXCI6XCJodHRwOi8vd3d3LmhlYWx0aC5nb3YuYXUvYXNzZXNzbWVudHMvbWJzLzcxNXwwLjEuMC1hc3NlbWJsZWRcIixcInR5cGVcIjpcIlF1ZXN0aW9ubmFpcmVcIn0iLGZhbHNlXQ`; cy.visit(launchUrl); }); diff --git a/documentation/docs/api/sdc-populate/functions/populate.md b/documentation/docs/api/sdc-populate/functions/populate.md index 32225b623..51797b083 100644 --- a/documentation/docs/api/sdc-populate/functions/populate.md +++ b/documentation/docs/api/sdc-populate/functions/populate.md @@ -1,6 +1,6 @@ # Function: populate() -> **populate**(`parameters`, `fetchResourceCallback`, `requestConfig`): `Promise` \<[`OutputParameters`](../interfaces/OutputParameters.md) \| `OperationOutcome`\> +> **populate**(`parameters`, `fetchResourceCallback`, `fetchResourceRequestConfig`, `terminologyCallback`?, `terminologyRequestConfig`?): `Promise` \<[`OutputParameters`](../interfaces/OutputParameters.md) \| `OperationOutcome`\> Executes the SDC Populate Questionnaire operation - $populate. Input and output specific parameters conformant to the SDC populate specification. Can be deployed as a $populate microservice. @@ -13,7 +13,9 @@ This function expects a nice set of populate input parameters to go. If you do y | :------ | :------ | | `parameters` | [`InputParameters`](../interfaces/InputParameters.md) | | `fetchResourceCallback` | [`FetchResourceCallback`](../interfaces/FetchResourceCallback.md) | -| `requestConfig` | `any` | +| `fetchResourceRequestConfig` | `any` | +| `terminologyCallback`? | [`FetchResourceCallback`](../interfaces/FetchResourceCallback.md) | +| `terminologyRequestConfig`? | `any` | ## Returns diff --git a/documentation/docs/api/sdc-populate/interfaces/PopulateQuestionnaireParams.md b/documentation/docs/api/sdc-populate/interfaces/PopulateQuestionnaireParams.md index c7e7c9c8c..5fd87535f 100644 --- a/documentation/docs/api/sdc-populate/interfaces/PopulateQuestionnaireParams.md +++ b/documentation/docs/api/sdc-populate/interfaces/PopulateQuestionnaireParams.md @@ -42,6 +42,22 @@ Any request configuration to be passed to the fetchResourceCallback i.e. headers *** +### terminologyCallback? + +> `optional` **terminologyCallback**: [`FetchResourceCallback`](FetchResourceCallback.md) + +A callback function to fetch terminology resources, optional + +*** + +### terminologyRequestConfig? + +> `optional` **terminologyRequestConfig**: `any` + +Any request configuration to be passed to the terminologyCallback i.e. headers, auth etc., optional + +*** + ### user? > `optional` **user**: `Practitioner` diff --git a/documentation/docs/components/display.mdx b/documentation/docs/components/display.mdx index 6a299b967..3ee9d808e 100644 --- a/documentation/docs/components/display.mdx +++ b/documentation/docs/components/display.mdx @@ -30,6 +30,16 @@ import IframeContainer from '../../src/react/IframeContainer'; /> +#### Calculations with [cqf-expression](/docs/sdc/calculations#cqf-expression) styled with [rendering-style](/docs/sdc/advanced/display#rendering-style) + + +