From e337913cbee13ac15e5cdaf9db12a0fac6784038 Mon Sep 17 00:00:00 2001
From: checktheroads <mtt.lov@gmail.com>
Date: Fri, 23 Aug 2019 08:47:19 -0700
Subject: [PATCH] get ajax timeout from user config [skip ci]

---
 hyperglass/configuration/models.py |  1 +
 hyperglass/static/hyperglass.es6   | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hyperglass/configuration/models.py b/hyperglass/configuration/models.py
index 78b6056..da23fcf 100644
--- a/hyperglass/configuration/models.py
+++ b/hyperglass/configuration/models.py
@@ -219,6 +219,7 @@ class General(BaseSettings):
     redis_host: Union[str, IPvAnyNetwork] = "localhost"
     redis_port: int = 6379
     requires_ipv6_cidr: List[str] = ["cisco_ios", "cisco_nxos"]
+    query_timeout: int = 15
 
 
 class Branding(BaseSettings):
diff --git a/hyperglass/static/hyperglass.es6 b/hyperglass/static/hyperglass.es6
index e5fc132..d95f3db 100644
--- a/hyperglass/static/hyperglass.es6
+++ b/hyperglass/static/hyperglass.es6
@@ -8,6 +8,7 @@ const animsition = require('animsition');
 const ClipboardJS = require('clipboard');
 const frontEndConfig = require('./frontend.json');
 
+const cfgGeneral = frontEndConfig.general;
 const inputMessages = frontEndConfig.messages;
 const pageContainer = $('#hg-page-container');
 const formContainer = $('#hg-form');
@@ -86,7 +87,7 @@ queryType.selectpicker({
 
 footerTermsBtn.popover({
   html: true,
-  trigger: 'focus',
+  trigger: 'focus click',
   template: footerPopoverTemplate,
   placement: 'top',
   content: $('#hg-footer-terms-html').html(),
@@ -94,7 +95,7 @@ footerTermsBtn.popover({
 
 footerHelpBtn.popover({
   html: true,
-  trigger: 'focus',
+  trigger: 'focus click',
   placement: 'top',
   template: footerPopoverTemplate,
   content: $('#hg-footer-help-html').html(),
@@ -102,7 +103,7 @@ footerHelpBtn.popover({
 
 footerCreditBtn.popover({
   html: true,
-  trigger: 'focus',
+  trigger: 'focus click',
   placement: 'top',
   title: $('#hg-footer-credit-title').html(),
   content: $('#hg-footer-credit-content').html(),
@@ -116,8 +117,8 @@ $(document).ready(() => {
   $('.animsition').animsition({
     inClass: 'fade-in',
     outClass: 'fade-out',
-    inDuration: 800,
-    outDuration: 800,
+    inDuration: 400,
+    outDuration: 400,
     transition: (url) => { window.location.href = url; },
   });
   formContainer.animsition('in');
@@ -215,7 +216,7 @@ const queryApp = (queryType, queryTypeName, locationList, queryTarget) => {
       contentType: 'application/json; charset=utf-8',
       context: document.body,
       async: true,
-      timeout: 15000,
+      timeout: cfgGeneral.query_timeout * 1000,
     })
       .done((data, textStatus, jqXHR) => {
         const displayHtml = `<pre>${jqXHR.responseText}</pre>`;