formbuilder-lhcforms 6.5.1 → 6.5.2

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 This project follows [Semantic Versioning](http://semver.org/).
 
+## [6.5.2]  2021-10-05
+### Fixed
+- Fixed a bug that fails to load forms after loading a form with ValueSet
+  having no terminology server.
+
 ## [6.5.1]  2021-09-30
 ### Fixed
 - Changed broken CTSS url.

package/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "formbuilder-lhcforms",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "main": [
     "client/app/app.js",
     "client/app/config.js",
@@ -51,7 +51,8 @@
     "ngSmoothScroll": "~2.0.0",
     "traverse": "0.6.7",
     "angular-spinner": "~0.8.0",
-    "fhir.js": "git://github.com/akanduru/fhir.js#ng-fhir"
+    "fhir.js": "git://github.com/akanduru/fhir.js#ng-fhir",
+    "fhirclient": "git://github.com/smart-on-fhir/client-js"
   },
   "overrides": {
     "jquery-ui": {

package/client/app/form-builder/form-builder.controller.js

@@ -197,23 +197,40 @@ angular.module('formBuilder')
        * @param jsonInput
        */
       function setPreviewData(jsonInput) {
-        $scope.previewSource['lforms'] = toJsonFilter(jsonInput, ['_', '$']);
-        var previewSrcObj = JSON.parse($scope.previewSource['lforms']);
+        $scope.previewSourceErrors = {};
+        $scope.previewSource.lforms = toJsonFilter(jsonInput, ['_', '$']);
+        const previewSrcObj = JSON.parse($scope.previewSource.lforms);
+        LForms.Util.setFHIRContext(FHIR.client({serverUrl: $scope.getFhirServer().endpoint}));
         $scope.formatList.slice(0, ($scope.formatList.length - 1)).forEach(function (ele) {
-          var fhirData = LForms.FHIR[ele.format].SDC.convertLFormsToQuestionnaire(previewSrcObj);
-          $scope.previewSource[ele.format] = toJsonFilter(fhirData, ['_', '$']);
+          $scope.previewSource[ele.format] = null;
+          $scope.previewSourceErrors[ele.format] = null;
+          try {
+            const fhirData = LForms.FHIR[ele.format].SDC.convertLFormsToQuestionnaire(previewSrcObj);
+            $scope.previewSource[ele.format] = toJsonFilter(fhirData, ['_', '$']);
+          } catch (e) {
+            $scope.previewSourceErrors[ele.format] = [e.message];
+          }
         });
         if(previewSrcObj.items.length > 0) {
-          $scope.previewLfData = new LForms.LFormsData(previewSrcObj);
-          if(previewSrcObj.id) {
-            $scope.previewLfData.id = previewSrcObj.id;
-          }
+          try {
+            $scope.previewLfData = new LForms.LFormsData(previewSrcObj);
+            if(previewSrcObj.id) {
+              $scope.previewLfData.id = previewSrcObj.id;
+            }
 
-          //Customize preview in formbuilder.
-          $scope.previewLfData.templateOptions = $scope.previewLfData.templateOptions || {};
-          $scope.previewLfData.templateOptions.showFormHeader = false;
-          $scope.previewLfData.templateOptions.hideFormControls = true;
-          $scope.previewLfData.templateOptions.viewMode = 'md';
+            //Customize preview in formbuilder.
+            $scope.previewLfData.templateOptions = $scope.previewLfData.templateOptions || {};
+            $scope.previewLfData.templateOptions.showFormHeader = false;
+            $scope.previewLfData.templateOptions.hideFormControls = true;
+            $scope.previewLfData.templateOptions.viewMode = 'md';
+            $scope.previewErrors = null;
+          }
+          catch(e) {
+            var err = 'Failed to create preview widget!';
+            $scope.previewErrors = [err];
+            $scope.previewErrors.push(e.message);
+            $scope.previewLfData = null;
+          }
         }
         else {
           $scope.previewLfData = null;
@@ -272,7 +289,7 @@ angular.module('formBuilder')
             // Use hidden anchor to do file download.
             var downloadLink = document.getElementById('exportAnchor');
             var urlFactory = (window.URL || window.webkitURL);
-            if(objectUrl != null) {
+            if(objectUrl !== null) {
               // First release any resources on existing object url
               urlFactory.revokeObjectURL(objectUrl);
             }
@@ -610,7 +627,7 @@ angular.module('formBuilder')
       $scope.isHeaderItem = function (lfData) {
         var ret = false;
         if(formBuilderService.isNodeFbLfItem(lfData)) {
-          var indexInfo = dataConstants.INITIAL_FIELD_INDICES['__itemType'];
+          var indexInfo = dataConstants.INITIAL_FIELD_INDICES.__itemType;
           ret = formBuilderService.getFormBuilderField(lfData[indexInfo.category].items, '__itemType').value.code === 'group';
         }
         return ret;

package/client/app/form-builder/form-builder.html

@@ -95,7 +95,10 @@
                       </div>
                     </md-tab-label>
                     <md-tab-body>
-                      <lforms lf-data="previewLfData"></lforms>
+                      <div ng-if="previewErrors" class="error-message">
+                        <div ng-repeat="e in previewErrors" class="message-box">{{e}}</div>
+                      </div>
+                      <lforms ng-if="previewLfData" lf-data="previewLfData"></lforms>
                     </md-tab-body>
                   </md-tab>
                   <md-tab>
@@ -112,7 +115,10 @@
                           </md-radio-button>
                         </md-radio-group>
                       </div>
-                      <pre class="formbuilder-pre">{{previewSource[selectedFormat.format]}}</pre>
+                      <div ng-if="previewSourceErrors[selectedFormat.format]" class="error-message">
+                        <div ng-repeat="e in previewSourceErrors[selectedFormat.format]" class="message-box">{{e}}</div>
+                      </div>
+                      <pre ng-if="previewSource[selectedFormat.format]" class="formbuilder-pre">{{previewSource[selectedFormat.format]}}</pre>
                     </md-tab-body>
                   </md-tab>
                 </md-tabs>

package/client/app/form-builder/formbuilder.css

@@ -418,4 +418,8 @@ md-menu-bar {
   color: red;
   font-weight: bold;
 }
+
+.message-box {
+  padding: 10px;
+}
 /* End of styles for the footer */

package/client/index.html.tpl

@@ -55,6 +55,7 @@
       <!-- endbower -->
     <script src="bower_components/lforms/app/scripts/fhir/STU3/lformsFHIR.js"></script>
     <script src="bower_components/lforms/app/scripts/fhir/R4/lformsFHIR.js"></script>
+    <script src="bower_components/fhirclient/dist/build/fhir-client.min.js"></script>
     <script src="app/lforms-updater.js"></script>
     <!-- endbuild -->
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formbuilder-lhcforms",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "Build LHC-Forms and FHIR Questionnaires",
   "main": "server/index.js",
   "homepage": "https://github.com/lhncbc/formbuilder-lhcforms",