LT-240: Add studyListFunctionsEnabled property (false as default) in public.ui object in settings file to enable/disable import / export / anonymize functions

LT-239: Error handling on the import process (WIP)

Packages/viewerbase/client/components/basic/progressDialog/progressDialog.html

@@ -9,6 +9,7 @@
                     {{progressStatus}}
                 </div>
             </div>
+            <div class="message">{{progressMessage}}</div>
         </div>
     </div>
 </template>

Packages/viewerbase/client/components/basic/progressDialog/progressDialog.js

@@ -18,6 +18,11 @@ progressDialog = {
         Session.set("progressDialogSettings", { title: "", numberOfCompleted: 0, numberOfTotal: 1 });
         $('#progressDialog').css('display', 'none');
     },
+    'setMessage': function(message) {
+        var progressDialogSettings = Session.get("progressDialogSettings");
+        progressDialogSettings.message = message;
+        Session.set("progressDialogSettings", progressDialogSettings);
+    }
 };
 
 Template.progressDialog.helpers({
@@ -40,5 +45,12 @@ Template.progressDialog.helpers({
         }
 
         return parseInt((numberOfCompleted / numberofTotal) * 100) + "%";
+    },
+    'progressMessage': function() {
+        var progressDialogSettings = Session.get("progressDialogSettings");
+        if (progressDialogSettings && progressDialogSettings.message) {
+            return progressDialogSettings.message;
+        }
+        return;
     }
 });

Packages/viewerbase/lib/importStudies.js

@@ -6,7 +6,10 @@ importStudies = function(filesToImport, importCallback) {
     if (filesToImport.length < 1) {
         return;
     }
-    var fileUploadStatus = { numberOfFilesUploaded: 0, numberOfFilesFailed: 0 };
+    var fileUploadStatus = {
+        numberOfFilesUploaded: 0,
+        numberOfFilesFailed: 0
+    };
 
     var numberOfFilesToUpload = filesToImport.length;
     var studiesToImport = [];
@@ -60,8 +63,11 @@ function updateFileUploadStatus(fileUploadStatus, isSuccess) {
         fileUploadStatus.numberOfFilesUploaded++;
     }
 }
-
 function importStudiesInternal(studiesToImport, importCallback) {
+    if (!studiesToImport) {
+        return;
+    }
+
     var numberOfStudiesToImport = studiesToImport.length;
 
     progressDialog.show("Importing Studies...", numberOfStudiesToImport);
@@ -69,7 +75,9 @@ function importStudiesInternal(studiesToImport, importCallback) {
     //  Create/Insert a new study import status item
     Meteor.call("createStudyImportStatus", function(err, studyImportStatusId) {
         if (err) {
-            console.log(err);
+            // Hide dialog
+            progressDialog.close();
+            console.log(err.message);
             return;
         }
 
@@ -82,6 +90,12 @@ function importStudiesInternal(studiesToImport, importCallback) {
 
                 var numberOfStudiesProcessedToImport = studyImportStatus.numberOfStudiesImported + studyImportStatus.numberOfStudiesFailed;
 
+                // Show failed message in the dialog
+                if (studyImportStatus.numberOfStudiesFailed > 0) {
+                    var failMessage = "Failed to import " + studyImportStatus.numberOfStudiesFailed + " of " + numberOfStudiesToImport + " files";
+                    progressDialog.setMessage(failMessage);
+                }
+
                 progressDialog.update(numberOfStudiesProcessedToImport);
 
                 if (numberOfStudiesProcessedToImport == numberOfStudiesToImport) {
@@ -90,7 +104,10 @@ function importStudiesInternal(studiesToImport, importCallback) {
 
                     if (studyImportStatus.numberOfStudiesFailed > 0) {
                         //TODO: Some files failed to import, so let user know
-                        console.log("Failed to import " + studyImportStatus.numberOfStudiesFailed + " of " + numberOfStudiesToImport + " files");
+                        // Update progress dialog message
+                        var failMessage = "Failed to import " + studyImportStatus.numberOfStudiesFailed + " of " + numberOfStudiesToImport + " files";
+                        progressDialog.setMessage(failMessage);
+                        console.log(failMessage);
                     }
 
                     //  Let the caller know that import operation is completed

Packages/viewerbase/server/methods/importStudies.js

@@ -49,6 +49,10 @@ Meteor.methods({
      * @param studyImportStatusId Study import status collection id to track import status
      */
     importStudies: function(studiesToImport, studyImportStatusId) {
+        if (!studiesToImport || !studyImportStatusId) {
+            return;
+        }
+
         if (Meteor.settings.dicomWeb && Meteor.settings.defaultServiceType === 'dicomWeb') {
             //TODO: Support importing studies into dicomWeb
             console.log('Importing studies into dicomWeb is currently not supported.');
@@ -76,24 +80,41 @@ Meteor.methods({
 });
 
 function importStudiesDIMSE(studiesToImport, studyImportStatusId) {
+    if (!studiesToImport || !studyImportStatusId) {
+        return;
+    }
     //  Perform C-Store to import studies and handle the callbacks to update import status
     DIMSE.storeInstances(studiesToImport, function(err, file) {
-        //  Use fiber to be able to modify meteor collection in callback
-        fiber(function() {
-            //  Update the import status
-            if (err) {
-                StudyImportStatus.update({_id: studyImportStatusId}, {$inc: {'numberOfStudiesFailed': 1}});
-                console.log("Failed to import study via DIMSE: ", file, err);
-            } else {
-                StudyImportStatus.update({_id: studyImportStatusId}, {$inc: {'numberOfStudiesImported': 1}});
-                console.log("Study successfully imported via DIMSE: ", file);
-            }
+        try {
+            //  Use fiber to be able to modify meteor collection in callback
+            fiber(function() {
+                try {
+                    //  Update the import status
+                    if (err) {
+                        StudyImportStatus.update({_id: studyImportStatusId}, {$inc: {'numberOfStudiesFailed': 1}});
+                        console.log("Failed to import study via DIMSE: ", file, err);
+                    } else {
+                        StudyImportStatus.update({_id: studyImportStatusId}, {$inc: {'numberOfStudiesImported': 1}});
+                        console.log("Study successfully imported via DIMSE: ", file);
+                    }
+
+                } catch(error) {
+
+                    StudyImportStatus.update({_id: studyImportStatusId}, {$inc: {'numberOfStudiesFailed': 1}});
+                    console.log("Failed to import study via DIMSE: ", file, error);
+                } finally {
+                    //  The import operation of this file is completed, so delete it if still exists
+                    if (fileExists(file)) {
+                        fs.unlink(file);
+                    }
+                }
+
+            }).run();
+        } catch(error) {
+            StudyImportStatus.update({_id: studyImportStatusId}, {$inc: {'numberOfStudiesFailed': 1}});
+            console.log("Failed to import study via DIMSE: ", file, error);
+        }
 
-            //  The import operation of this file is completed, so delete it if still exists
-            if (fileExists(file)) {
-                fs.unlink(file);
-            }
-        }).run();
     });
 }