formbuilder-lhcforms 12.10.0 → 12.11.0

package/dist/formbuilder-lhcforms/3rdpartylicenses.txt

@@ -950,6 +950,9 @@ Awesome, nor vice versa. **Please do not use brand logos for any purpose except
 to represent the company, product, or service to which they refer.**
 
 
+@lhncbc/expression-editor
+SEE LICENSE IN LICENSE.md
+
 @lhncbc/ngx-schema-form
 MIT
 
@@ -2902,8 +2905,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-ngx-expression-editor
-
 object-inspect
 MIT
 MIT License

package/dist/formbuilder-lhcforms/assets/fhir-definitions.schema.json5

@@ -43,6 +43,29 @@
           "pattern": "^\\S*$",
           "type": "string"
         },
+        // The id and/or extensions of the primitive fields, copied from
+        // $.definitions.Extension in fhir.schema.json. Without them, the form drops e.g. a
+        // child extension's _valueString when the extension array is rebuilt.
+        "_url": {"description": "Extensions for url", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueBase64Binary": {"description": "Extensions for valueBase64Binary", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueBoolean": {"description": "Extensions for valueBoolean", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueCanonical": {"description": "Extensions for valueCanonical", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueCode": {"description": "Extensions for valueCode", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueDate": {"description": "Extensions for valueDate", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueDateTime": {"description": "Extensions for valueDateTime", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueDecimal": {"description": "Extensions for valueDecimal", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueId": {"description": "Extensions for valueId", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueInstant": {"description": "Extensions for valueInstant", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueInteger": {"description": "Extensions for valueInteger", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueMarkdown": {"description": "Extensions for valueMarkdown", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueOid": {"description": "Extensions for valueOid", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valuePositiveInt": {"description": "Extensions for valuePositiveInt", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueString": {"description": "Extensions for valueString", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueTime": {"description": "Extensions for valueTime", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueUnsignedInt": {"description": "Extensions for valueUnsignedInt", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueUri": {"description": "Extensions for valueUri", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueUrl": {"description": "Extensions for valueUrl", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
+        "_valueUuid": {"description": "Extensions for valueUuid", "$ref": "#/definitions/Element", "widget": {"id": "hidden"}},
         "valueBase64Binary": {
           "description": "Value of extension - must be one of a constrained set of the data types (see [Extensibility](extensibility.html) for a list).",
           "pattern": "^(\\s*([0-9a-zA-Z\\+/=]){4}\\s*)+$",

package/dist/formbuilder-lhcforms/assets/fl-fields-layout.json5

@@ -32,6 +32,7 @@
           { field:  "lastReviewDate", col:  12},
           { field:  "effectivePeriod", col:  12},
           { field:  "contained", "col": 12},
+          { field:  "__$templateExtract", "col": 12},
           { field:  "__$variable", col: 12},
           { field:  "__$extensionContainer", col: 12}
         ]
@@ -216,15 +217,15 @@
       "labelPosition": "left",
       "labelClasses": "col-sm-2 ps-0 pe-1",
       "controlClasses": "col-sm-10",
-      "addButtonLabel": "Add new ValueSet",
-      "addButtonTitle": "At present, only ValueSet is supported as contained resource.",
+      "addButtonLabel": "Add contained resource",
+      "addButtonTitle": "Create or import a contained FHIR resource.",
       "showFields": [
         // The fields here are canonical paths of FormProperty.
-        {"field": "resourceType", "col": 1, "nolabel": true},
-        {"field": "id", "col": 3, "nolabel": true},
-        {"field": "title", "col": 4, "nolabel": true},
-        {"field": "date", "col": 2, "nolabel": true},
-        {"field": "status", "col": 1, "nolabel": true}
+        {"field": "resourceType", "title": "Type", "col": 2, "nolabel": true},
+        {"field": "id", "title": "Id", "col": 3, "nolabel": true},
+        {"field": "__$resourceDisplay", "title": "Display", "col": 4, "nolabel": true},
+        {"field": "__$fhirVersionInfo.version", "title": "FHIR version", "col": 1, "nolabel": true},
+        {"field": "status", "title": "Status", "col": 1, "nolabel": true}
       ]
     },
     "__$extensionContainer": {

package/dist/formbuilder-lhcforms/assets/items-layout.json5

@@ -63,6 +63,7 @@
           { "field": "__$terminologyServer", "col": 12 },
           { "field": "__$observationLinkPeriod", "col": 12},
           { "field": "__$observationExtract", "col": 12},
+          { "field": "__$templateExtract", "col": 12},
           { "field": "__$extensionContainer", "col": 12 }
         ]
       }

package/dist/formbuilder-lhcforms/assets/ngx-fl.schema.json5

@@ -1357,10 +1357,47 @@
     "contained": {
       "description": "These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, and nor can they have their own independent transaction scope.",
       "items": {
-        "$ref": "#/definitions/ValueSet"
+        "description": "Any FHIR resource stored inline with the Questionnaire.",
+        "type": "object",
+        "properties": {
+          "resourceType": {
+            "description": "FHIR resource type.",
+            "type": "string"
+          },
+          "id": {
+            "description": "Logical id used for local references to the contained resource.",
+            "$ref": "#/definitions/id"
+          }
+        },
+        "required": ["resourceType"],
+        "additionalProperties": true
       },
       "type": "array"
     },
+    "__$templateExtract": {
+      "description": "Create extracted FHIR resources from the Questionnaire's existing contained resource templates.",
+      "title": "Template-based extraction",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Extension"
+      },
+      "widget": {
+        "id": "template-extract",
+        "addEditAction": true,
+        "addDefaultItemIfEmpty": false,
+        "addButtonLabel": "Add new template extraction",
+        "addButtonDisabledReason": "A contained resource is required before adding a template extraction. Add one under Contained resources above.",
+        "labelPosition": "left",
+        "labelClasses": "col-sm-2 ps-0 pe-1",
+        "controlClasses": "col-sm-10",
+        "showFields": [
+          {"field": "template", "col": 3, "title": "Template"},
+          {"field": "fullUrl", "col": 3, "title": "fullUrl"},
+          {"field": "resourceId", "col": 2, "title": "resourceId"},
+          {"field": "conditionalRequest", "col": 3, "title": "Conditional request"}
+        ]
+      }
+    },
     "__$variable": {
       "description": "Use to store values derived from calculations, references to other answers, or external data.",
       "title": "Variables",
@@ -1406,6 +1443,7 @@
         "description",
         "purpose",
         "__$terminologyServer",
+        "__$templateExtract",
         "__$variable",
         "__$extensionContainer"
       ]

package/dist/formbuilder-lhcforms/assets/ngx-item.schema.json5

@@ -2615,6 +2615,30 @@
         "type": ["$EXP$ target.value != 'display'"]
       }
     },
+    "__$templateExtract": {
+      "description": "Create extracted FHIR resources from the Questionnaire's existing contained resource templates.",
+      "title": "Template-based extraction",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Extension"
+      },
+      "widget": {
+        "id": "template-extract",
+        "addEditAction": true,
+        "addDefaultItemIfEmpty": false,
+        "addButtonLabel": "Add new template extraction",
+        "addButtonDisabledReason": "A contained resource is required before adding a template extraction. Add one under Contained resources in the form-level fields.",
+        "labelPosition": "left",
+        "labelClasses": "col-2 ps-0 pe-1",
+        "controlClasses": "col-10",
+        "showFields": [
+          {"field": "template", "col": 3, "title": "Template"},
+          {"field": "fullUrl", "col": 3, "title": "fullUrl"},
+          {"field": "resourceId", "col": 2, "title": "resourceId"},
+          {"field": "conditionalRequest", "col": 3, "title": "Conditional request"}
+        ]
+      }
+    },
     "__$extensionContainer": {
       "description": "May be used to represent additional information that is not part of the basic definition of the resource. To make the use of extensions safe and manageable, there is a strict set of governance  applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.",
       "title": "General Extensions",
@@ -3283,6 +3307,17 @@
         }
       ]
     },
+    {
+      "fields": [
+        "__$templateExtract"
+      ],
+      "showFields": [
+        {
+          "field": "__$templateExtract",
+          "col": 12
+        }
+      ]
+    },
     {
       "fields": ["id", "__$treeNodeId", "__$extensionContainer", "extension", "modifierExtension", "definition"]
     }