Merge pull request #411 from fyvon/fix/swagger_dom_update

Waiting for Swagger DOM elements to appear rather than using timeout.

catalog/static/catalog/pgs.js

@@ -1422,3 +1422,32 @@ class PGSPieChartTiny extends PGSPieChart {
       .text(label);
   }
 }
+
+
+/**
+ * This function returns a Promise which resolves when an element matching the given
+ * selector is found in the given parent node.
+ * @param selector A selector for the future wanted element.
+ * @param [parent=document.body] Only monitor within this node and children, or the whole document if not defined.
+ * @returns {Promise<Element>} A Promise which resolves when the element is found.
+ */
+function wait_for_element(selector, parent = document.body) {
+    return new Promise(resolve => {
+        if (parent.querySelector(selector)) {
+            // It's already present, just return it.
+            return resolve(parent.querySelector(selector));
+        }
+
+        const observer = new MutationObserver(mutations => {
+            if (parent.querySelector(selector)) {
+                observer.disconnect();
+                resolve(parent.querySelector(selector));
+            }
+        });
+
+        observer.observe(parent, {
+            childList: true,
+            subtree: true
+        });
+    });
+}

rest_api/templates/rest_api/rest_doc.html

@@ -63,11 +63,9 @@
         var topbar = document.getElementsByClassName("topbar")[0];
         topbar.parentNode.removeChild(topbar);
 
-        // Remove the list of servers
-        setTimeout(function(){
+        wait_for_element('hgroup', document.getElementById('swagger-ui')).then(function(hgroup){
 
           // Add Swagger logo
-          var hgroup = document.getElementsByTagName("hgroup")[0];
           // Create 'div' class and add it ti the hgroup
           var title_div = document.createElement("div");
           title_div.classList.add('clearfix');
@@ -165,7 +163,8 @@
           });
 
           $('[data-toggle="tooltip"]').tooltip();
-        }, 150);
+        });
+
       }
     </script>
   </head>