formbuilder-lhcforms 10.2.1 → 10.3.1

package/dist/formbuilder-lhcforms/assets/fhir-questionnaire.schema.json

@@ -20,6 +20,13 @@
       "$ref": "#/definitions/Meta",
       "title": "Meta"
     },
+    "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/ResourceList"
+      },
+      "type": "array"
+    },
     "implicitRules": {
       "description": "A reference to a set of rules that were followed when the resource was constructed, and which must be understood when processing the content. Often, this is a reference to an implementation guide that defines the special rules along with other profiles etc.",
       "$ref": "#/definitions/uri",

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

@@ -26,16 +26,20 @@
           { field:  "copyright", col:  12},
           { field:  "approvalDate", col:  12},
           { field:  "lastReviewDate", col:  12},
+          { field:  "contained", "col": 12},
           { field:  "__$variable", col: 12}
         ]
       }
     ],
     "targetPage": "formLevel"
   },
+  // Please note that the jsonpath expression paths in the keys
   overridePropertyLabels: {
-    '/properties/name': 'Questionnaire name',
-    '/properties/date': 'Revision date',
-    '/properties/meta/properties/tag': 'Tags',
+    '$.properties.contained': 'Contained resources',
+    '$.properties.name': 'Questionnaire name',
+    '$.properties.date': 'Revision date',
+    '$.properties.meta.properties.tag': 'Tags',
+    '$.definitions.ValueSet.properties.resourceType': 'Type',
   },
   // Specify widget layout.
   // id is widget schema registry defined in lforms-widget-registry.ts
@@ -87,6 +91,51 @@
         {"field": "system", "col": 4, "nolabel": true}
       ]
     },
+    contained: {
+      "id": "contained",
+      "addEditAction": true,
+      "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.",
+      "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}
+      ]
+    },
+    valueSet: {
+      "id": "value-set",
+      "nolabel": true,
+      "controlClasses": "col-sm-12",
+      "showFields": [
+        // The fields here are canonical paths of FormProperty.
+        {
+          "field": "id",
+          "col": 2,
+          "nolabel": true
+        },
+        {
+          "field": "meta/tag",
+          "col": 4,
+          "nolabel": true
+        },
+        {
+          "field": "meta/tag",
+          "col": 3,
+          "nolabel": true
+        },
+        {
+          "field": "meta/tag",
+          "col": 3,
+          "nolabel": true
+        }
+      ]
+    },
     "__$variable": {
       "id": "variable",
       "expressionUri":  "http://hl7.org/fhir/StructuredDefinition/variable",
@@ -113,37 +162,43 @@
       ]
     }
   },
-  // Map property: Each widget type is mapped to fields with json pointers of its schema.
+  // Map property: Each widget type is mapped to fields with jsonpath of its schema.
   widgetsMap: {
     // List of fields implementing this widget.
     inputBox: [
-      '/properties/url',
-      '/properties/implicitRules',
-      '/properties/version',
-      '/properties/title',
-      '/properties/name',
-      '/properties/publisher',
-      '/properties/description',
-      '/properties/purpose',
+      '$.properties.url',
+      '$.properties.implicitRules',
+      '$.properties.version',
+      '$.properties.title',
+      '$.properties.name',
+      '$.properties.publisher',
+      '$.properties.description',
+      '$.properties.purpose',
     ],
     textArea: [
-      '/properties/copyright',
+      '$.properties.copyright',
     ],
     inputDate: [
-      '/properties/approvalDate',
-      '/properties/lastReviewDate'
+      '$.properties.approvalDate',
+      '$.properties.lastReviewDate'
     ],
     inputDateTime: [
-      '/properties/date'
+      '$.properties.date'
     ],
     __$terminologyServer: [
-      '/properties/__$terminologyServer'
+      '$.properties.__$terminologyServer'
     ],
     coding: [
-      '/properties/meta/properties/tag'
+      '$.properties.meta.properties.tag',
+    ],
+    contained: [
+      '$.properties.contained'
+    ],
+    valueSet: [
+      '$.definitions.ValueSet'
     ],
     __$variable: [
-      '/properties/__$variable'
+      '$.properties.__$variable'
     ]
   }
 }

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

@@ -1297,6 +1297,13 @@
       "title": "Terminology server",
       "type": "string"
     },
+    "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"
+      },
+      "type": "array"
+    },
     "__$variable": {
       "description": "Use to store values derived from calculations, references to other answers, or external data.",
       "title": "Variables",
@@ -1445,7 +1452,8 @@
         "copyright",
         "approvalDate",
         "lastReviewDate",
-        "effectivePeriod"
+        "effectivePeriod",
+        "contained"
       ]
     },
     {