v6.8.7

GleapSDK · Mar 21, 2022 · 1d7f441 · 1d7f441
1 parent c6027fb
commit 1d7f441
Show file tree

Hide file tree

Showing 9 changed files with 209 additions and 205 deletions.
diff --git a/build/index.js b/build/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gleap",
-  "version": "6.8.6",
+  "version": "6.8.7",
   "main": "build/index.js",
   "scripts": {
     "start": "webpack serve",

diff --git a/published/6.8.6/index.js b/published/6.8.6/index.js
diff --git a/published/6.8.7/appwidget.min.css b/published/6.8.7/appwidget.min.css
diff --git a/published/6.8.7/index.js b/published/6.8.7/index.js
diff --git a/published/6.8.7/index.min.css b/published/6.8.7/index.min.css
diff --git a/published/latest/index.js b/published/latest/index.js
diff --git a/src/AutoConfig.js b/src/AutoConfig.js
@@ -1,21 +1,19 @@
-import Gleap from "./Gleap";
 import { loadFromGleapCache, saveToGleapCache } from "./GleapHelper";
 import Session from "./Session";
 
 export default class AutoConfig {
   static run = () => {
-    /*const cachedConfig = loadFromGleapCache("config");
+    const cachedConfig = loadFromGleapCache("config");
     if (cachedConfig) {
-      AutoConfig.applyConfig(cachedConfig);
-      AutoConfig.loadConfigFromServer(false);
-      return Promise.resolve();
-    }*/
+      AutoConfig.loadConfigFromServer();
+      return Promise.resolve(cachedConfig);
+    }
 
-    return AutoConfig.loadConfigFromServer(true);
+    return AutoConfig.loadConfigFromServer();
   };
 
-  static loadConfigFromServer = (updateConfig = false) => {
-    return new Promise(function (resolve) {
+  static loadConfigFromServer = () => {
+    return new Promise(function (resolve, reject) {
       const session = Session.getInstance();
       const http = new XMLHttpRequest();
       http.open(
@@ -25,7 +23,7 @@ export default class AutoConfig {
       http.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
       session.injectSession(http);
       http.onerror = function () {
-        resolve();
+        reject();
       };
       http.onreadystatechange = function (e) {
         if (http.readyState === XMLHttpRequest.DONE) {
@@ -35,198 +33,13 @@ export default class AutoConfig {
               try {
                 saveToGleapCache("config", config);
               } catch (exp) {}
-              if (updateConfig) {
-                AutoConfig.applyConfig(config);
-              }
+              return resolve(config);
             } catch (e) {}
           }
-          resolve();
+          reject();
         }
       };
       http.send();
     });
   };
-
-  static applyConfig(config) {
-    try {
-      const flowConfig = config.flowConfig;
-      const projectActions = config.projectActions;
-
-      const instance = Gleap.getInstance();
-      if (flowConfig.logo && flowConfig.logo.length > 0) {
-        Gleap.setLogoUrl(flowConfig.logo);
-      }
-
-      if (flowConfig.color) {
-        Gleap.setStyles({
-          primaryColor: flowConfig.color,
-          headerColor: flowConfig.headerColor,
-          buttonColor: flowConfig.buttonColor,
-          borderRadius: flowConfig.borderRadius,
-          backgroundColor: flowConfig.backgroundColor
-            ? flowConfig.backgroundColor
-            : "#FFFFFF",
-        });
-      }
-
-      if (flowConfig.hideBranding) {
-        Gleap.enablePoweredBy();
-      }
-
-      if (flowConfig.networkLogPropsToIgnore) {
-        Gleap.setNetworkLogFilters(flowConfig.networkLogPropsToIgnore);
-      }
-
-      if (!flowConfig.enableConsoleLogs) {
-        Gleap.disableConsoleLogOverwrite();
-      }
-
-      if (
-        typeof flowConfig.enableCrashDetector !== "undefined" &&
-        flowConfig.enableCrashDetector
-      ) {
-        Gleap.enableCrashDetector(true, flowConfig.enableCrashDetector);
-      }
-
-      if (
-        typeof flowConfig.enableRageClickDetector !== "undefined" &&
-        flowConfig.enableRageClickDetector
-      ) {
-        Gleap.enableRageClickDetector(flowConfig.rageClickDetectorIsSilent);
-      }
-
-      if (flowConfig.customTranslations) {
-        Gleap.setCustomTranslation(flowConfig.customTranslations);
-      }
-
-      if (
-        typeof flowConfig.feedbackButtonPosition !== "undefined" &&
-        flowConfig.feedbackButtonPosition.length > 0
-      ) {
-        Gleap.setButtonType(flowConfig.feedbackButtonPosition);
-      }
-
-      if (
-        typeof flowConfig.widgetButtonText !== "undefined" &&
-        flowConfig.widgetButtonText.length > 0
-      ) {
-        Gleap.setFeedbackButtonText(flowConfig.widgetButtonText);
-      }
-
-      if (
-        typeof flowConfig.hideWavingHandAfterName !== "undefined" &&
-        flowConfig.hideWavingHandAfterName
-      ) {
-        Gleap.setWelcomeIcon("");
-      }
-
-      if (
-        typeof flowConfig.hideUsersName !== "undefined" &&
-        flowConfig.hideUsersName
-      ) {
-        Gleap.setShowUserName(false);
-      }
-
-      if (flowConfig.widgetInfoTitle && flowConfig.widgetInfoTitle.length > 0) {
-        Gleap.setWidgetInfo({
-          title: flowConfig.widgetInfoTitle,
-        });
-      }
-
-      if (
-        flowConfig.widgetInfoSubtitle &&
-        flowConfig.widgetInfoSubtitle.length > 0
-      ) {
-        Gleap.setWidgetInfo({
-          subtitle: flowConfig.widgetInfoSubtitle,
-        });
-      }
-
-      if (
-        flowConfig.widgetInfoDialogSubtitle &&
-        flowConfig.widgetInfoDialogSubtitle.length > 0
-      ) {
-        Gleap.setWidgetInfo({
-          dialogSubtitle: flowConfig.widgetInfoDialogSubtitle,
-        });
-      }
-
-      if (
-        flowConfig.enableMenu &&
-        flowConfig.menuItems &&
-        flowConfig.menuItems.length > 0
-      ) {
-        let menuItems = [];
-        for (let i = 0; i < flowConfig.menuItems.length; i++) {
-          let menuItem = flowConfig.menuItems[i];
-          let actionFlow = null;
-          let action = null;
-
-          if (menuItem.actionType === "OPEN_INTERCOM") {
-            action = function () {
-              if (instance.widgetCallback) {
-                return;
-              }
-              if (typeof Intercom !== "undefined") {
-                Intercom("showNewMessage");
-              }
-            };
-          } else if (menuItem.actionType === "REDIRECT_URL") {
-            if (instance.widgetCallback) {
-              action = function () {
-                instance.widgetCallback("openExternalURL", {
-                  url: menuItem.actionBody,
-                });
-              };
-            } else {
-              if (menuItem.actionOpenInNewTab) {
-                action = function () {
-                  window.open(menuItem.actionBody, "_blank").focus();
-                };
-              } else {
-                action = function () {
-                  window.location.href = menuItem.actionBody;
-                };
-              }
-            }
-          } else if (menuItem.actionType === "CUSTOM_ACTION") {
-            action = function () {
-              Gleap.triggerCustomAction(menuItem.actionBody);
-            };
-          } else {
-            actionFlow = menuItem.actionType;
-          }
-
-          // Action flow
-          if (actionFlow != null || action != null) {
-            var item = {
-              title: menuItem.title,
-              description: menuItem.description,
-              icon: menuItem.icon,
-              color: menuItem.color,
-            };
-            if (actionFlow) {
-              item["actionFlow"] = actionFlow;
-            }
-            if (action) {
-              item["action"] = action;
-            }
-            menuItems.push(item);
-          }
-        }
-
-        Gleap.setMenuOptions(menuItems);
-      }
-
-      if (projectActions) {
-        Gleap.setFeedbackActions(projectActions);
-      }
-
-      if (flowConfig.buttonLogo && flowConfig.buttonLogo.length > 0) {
-        Gleap.setButtonLogoUrl(flowConfig.buttonLogo);
-      }
-    } catch (e) {
-      console.log(e);
-    }
-  }
 }