LT-67; OHIF-78: Merging server configuration and CINE dialog changes from downstream (Ascend)

Packages/worklist/client/lib/switchToTab.js

@@ -34,6 +34,11 @@ switchToTab = function(contentId) {
     var container;
     if (contentId === 'worklistTab') {
         container = $('.tab-content').find('#worklistTab').get(0);
+
+        if (!container) {
+            return;
+        }
+
         var worklistContainer = document.createElement('div');
         worklistContainer.classList.add('worklistContainer');
         container.appendChild(worklistContainer);

Packages/worklist/client/lib/worklist.js

@@ -1,3 +1,6 @@
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+
 Worklist = {
     functions: {},
     callbacks: {}
@@ -10,4 +13,19 @@ function dblClickOnStudy(data) {
     // Use the formatPN template helper to clean up the patient name
     var title = formatPN(data.patientName);
     openNewTab(data.studyInstanceUid, title);
-}
+}
+
+let currentServerChangeHandlerFirstRun = true;
+const currentServerChangeHandler = () => {
+    if (currentServerChangeHandlerFirstRun) {
+        currentServerChangeHandlerFirstRun = false;
+        return;
+    }
+
+    switchToTab('worklistTab');
+};
+
+CurrentServer.find().observe({
+    added: currentServerChangeHandler,
+    changed: currentServerChangeHandler
+});