Cleanup.

Author: boehlerlukas

demo/main.js

@@ -1,8 +1,11 @@
 const Gleap = window.Gleap;
 
-//Gleap.setFrameUrl("http://0.0.0.0:3001");
-//Gleap.setApiUrl("http://0.0.0.0:9000");
-Gleap.initialize("ogWhNhuiZcGWrva5nlDS8l7a78OfaLlV");
+Gleap.setFrameUrl("http://0.0.0.0:3001");
+Gleap.setApiUrl("http://0.0.0.0:9000");
+
+Gleap.setLanguage("de");
+
+Gleap.initialize("zhkMPoY1k41yhOus4BRwVKE7Qas5zbyA");
 //Gleap.setEnvironment("dev");
 
 /*Gleap.setUrlHandler((url, newTab) => {

src/Gleap.js

@@ -461,6 +461,10 @@ class Gleap {
    * @param {string} language country code with two letters
    */
   static setLanguage(language) {
+    if (Gleap.getInstance().initialized) {
+      console.warn("You must not change the language after Gleap is initialized. Please call this method before Gleap.initialize()");
+    }
+
     GleapTranslationManager.getInstance().setOverrideLanguage(language);
   }
 

src/GleapConfigManager.js

@@ -44,7 +44,7 @@ export default class GleapConfigManager {
    */
   start = () => {
     const session = GleapSession.getInstance();
-    const cachedConfig = loadFromGleapCache(`config-${session.sdkKey}`);
+    const cachedConfig = loadFromGleapCache(`config-${session.sdkKey}-${GleapTranslationManager.getInstance().getActiveLanguage()}`);
     if (cachedConfig) {
       this.applyConfig(cachedConfig);
       this.loadConfigFromServer().catch(function (e) { });
@@ -59,9 +59,10 @@ export default class GleapConfigManager {
     return new Promise(function (resolve, reject) {
       const session = GleapSession.getInstance();
       const http = new XMLHttpRequest();
+      const lang = GleapTranslationManager.getInstance().getActiveLanguage();
       http.open(
         "GET",
-        session.apiUrl + "/config/" + session.sdkKey
+        session.apiUrl + "/config/" + session.sdkKey + "?lang=" + lang,
       );
       http.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
       session.injectSession(http);
@@ -74,7 +75,7 @@ export default class GleapConfigManager {
             try {
               const config = JSON.parse(http.responseText);
               try {
-                saveToGleapCache(`config-${session.sdkKey}`, config);
+                saveToGleapCache(`config-${session.sdkKey}-lang`, config);
               } catch (exp) { }
               self.applyConfig(config);
               return resolve();

src/GleapFeedback.js

@@ -118,6 +118,17 @@ export default class GleapFeedback {
         return feedbackData;
     }
 
+    getTicketData() {
+        return new Promise((resolve, reject) => {
+            this.takeSnapshot().then(() => {
+                const dataToSend = this.getData();
+                resolve(dataToSend);
+            }).catch((exp) => {
+                reject();
+            });
+        });
+    }
+
     sendFeedback() {
         return new Promise((resolve, reject) => {
             this.takeSnapshot().then(() => {

src/GleapFrameManager.js

@@ -10,6 +10,11 @@ import Gleap, {
   GleapTranslationManager,
   GleapSession,
   GleapConfigManager,
+  GleapCustomDataManager,
+  GleapMetaDataManager,
+  GleapConsoleLogManager,
+  GleapNetworkIntercepter,
+  GleapTagManager,
 } from "./Gleap";
 import { widgetMaxHeight } from "./UI";
 import { runFunctionWhenDomIsReady } from "./GleapHelper";
@@ -429,6 +434,27 @@ export default class GleapFrameManager {
         }
       }
 
+      if (data.name === "collect-ticket-data") {
+        var ticketData = {
+          customData: GleapCustomDataManager.getInstance().getCustomData(),
+          metaData: GleapMetaDataManager.getInstance().getMetaData(),
+          consoleLog: GleapConsoleLogManager.getInstance().getLogs(),
+          networkLogs: GleapNetworkIntercepter.getInstance().getRequests(),
+          customEventLog: GleapStreamedEvent.getInstance().getEventArray()
+        };
+
+        // Add tags
+        const tags = GleapTagManager.getInstance().getTags();
+        if (tags && tags.length > 0) {
+          ticketData.tags = tags;
+        }
+
+        this.sendMessage({
+          name: "collect-ticket-data",
+          data: ticketData,
+        });
+      }
+
       if (data.name === "height-update") {
         this.frameHeight = data.data;
 

src/GleapSession.js

@@ -159,6 +159,10 @@ export default class GleapSession {
     this.notifySessionReady();
   };
 
+  updateSessionLanguage = (language) => {
+    console.log("Updating session language to: " + language);
+  };
+
   startSession = (attemp = 0) => {
     // Check if we already have a session cookie.
     try {

src/GleapTranslationManager.js

@@ -1,4 +1,4 @@
-import { GleapFrameManager, GleapFeedbackButtonManager } from "./Gleap";
+import { GleapFrameManager, GleapFeedbackButtonManager, GleapSession } from "./Gleap";
 
 export default class GleapTranslationManager {
   customTranslation = {};
@@ -28,8 +28,9 @@ export default class GleapTranslationManager {
    */
   setOverrideLanguage(language) {
     this.overrideLanguage = language;
-    GleapFrameManager.getInstance().sendConfigUpdate();
-    this.updateRTLSupport();
+    
+    //GleapFrameManager.getInstance().sendConfigUpdate();
+    //this.updateRTLSupport();
   }
 
   updateRTLSupport() {
@@ -60,6 +61,8 @@ export default class GleapTranslationManager {
   }
 
   static translateText(key) {
+    return key;
+
     if (!key) {
       return "";
     }

src/UI.js

@@ -61,6 +61,7 @@ export const injectStyledCSS = (
 
   var borderRadius = parseInt(borderRadius, 10);
   const buttonBorderRadius = Math.round(borderRadius * 1.05);
+  const containerRadius = Math.round(borderRadius * 0.8);
   const chatRadius = Math.round(borderRadius * 0.6);
   const formItemBorderRadius = Math.round(borderRadius * 0.4);
   const formItemSmallBorderRadius = Math.round(borderRadius * 0.25);
@@ -97,7 +98,7 @@ export const injectStyledCSS = (
       z-index: ${zIndexBase + 31};
       visibility: visible;
       box-shadow: 0px 5px 30px rgba(0, 0, 0, 0.16);
-      border-radius: ${borderRadius}px;
+      border-radius: ${containerRadius}px;
       overflow: hidden;
       animation-duration: .3s;
       animation-fill-mode: both;
@@ -188,7 +189,7 @@ export const injectStyledCSS = (
     .gleap-frame-container--survey-full .gleap-frame-container-inner {
       max-width: 640px !important;
       width: calc(100% - 24px);
-      border-radius: ${borderRadius}px;
+      border-radius: ${containerRadius}px;
       overflow: hidden;
     }
 
@@ -465,8 +466,8 @@ export const injectStyledCSS = (
       content: " ";
       position: absolute;
       width: 100%;
-      height: calc(100% - ${borderRadius}px);
-      top: ${borderRadius}px;
+      height: calc(100% - ${containerRadius}px);
+      top: ${containerRadius}px;
       background-color: ${backgroundColor};
       z-index: -1;
     }