Merge branch 'master' of https://github.com/hapi-server/server-ui

Author: rweigel

index.htm

@@ -272,7 +272,7 @@
           </a>
         </p>
         <p>
-          Auto-generated scripts are available from an <a href="/api">API</a>.
+          Auto-generated scripts are available from an <a href="api/">API</a>.
         </p>
         <br>
       </details>

js/index.js

@@ -416,26 +416,6 @@ function parameters (cb) {
     url = util.hapi2to3(url)
   }
 
-  const getOptions = {
-    url,
-    dataType: 'json',
-    timeout: window.HAPIUI.options.metadataTimeout,
-    requestURLElement: '#parametersRequestURL',
-    timer: {
-      element: '#parametersRequestTiming'
-    }
-  }
-
-  $('#parametersRequestError').empty().hide()
-  get(getOptions, function (err, res) {
-    if (err) {
-      $('#parametersRequestError').html(err).show()
-      return
-    }
-    $('#datasetinfo').show()
-    process(res, url)
-  })
-
   parameters.id = 'parameters'
   parameters.label = 'Parameters'
   parameters.allowEmptyValue = true
@@ -495,6 +475,27 @@ function parameters (cb) {
     }
   }
 
+  const getOptions = {
+    url,
+    dataType: 'json',
+    timeout: window.HAPIUI.options.metadataTimeout,
+    requestURLElement: '#parametersRequestURL',
+    timer: {
+      element: '#parametersRequestTiming'
+    }
+  }
+
+  // N.B. Call to get() must go last because cb() function requires above to be set.
+  $('#parametersRequestError').empty().hide()
+  get(getOptions, function (err, res) {
+    if (err) {
+      $('#parametersRequestError').html(err).show()
+      return
+    }
+    $('#datasetinfo').show()
+    process(res, url)
+  })
+
   function process (res, url) {
     $('#datasetinfo ul').append(`<li>id: <code>${selected('dataset')}</code></li>`)
 

js/shared/defaultDate.js

@@ -22,8 +22,6 @@ function stop (meta, end) {
 
   const cadenceString = meta.cadence || 'PT1M'
   const cadenceMillis = dayjs.duration(cadenceString).$ms
-  //console.log(cadenceString)
-  //console.log(cadenceMillis)
   let startDate = meta.startDate
   if (startDate.length === 11 && startDate.endsWith('Z')) {
     // Safari date parsing workaround. 1999-01-01Z -> 1999-01-01