fix custom events reporting

allure-framework · Jun 19, 2023 · a530173 · a530173
1 parent da87a8e
commit a530173
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 10 deletions.
diff --git a/allure-generator/src/main/java/io/qameta/allure/DummyReportGenerator.java b/allure-generator/src/main/java/io/qameta/allure/DummyReportGenerator.java
@@ -23,6 +23,7 @@
 import io.qameta.allure.context.JacksonContext;
 import io.qameta.allure.context.MarkdownContext;
 import io.qameta.allure.context.RandomUidContext;
+import io.qameta.allure.context.ReportInfoContext;
 import io.qameta.allure.core.AttachmentsPlugin;
 import io.qameta.allure.core.Configuration;
 import io.qameta.allure.core.LaunchResults;
@@ -81,6 +82,7 @@ public final class DummyReportGenerator {
     private static final List<Extension> EXTENSIONS = Arrays.asList(
             new JacksonContext(),
             new MarkdownContext(),
+            new ReportInfoContext("dev"),
             new FreemarkerContext(),
             new RandomUidContext(),
             new MarkdownDescriptionsPlugin(),

diff --git a/allure-generator/src/main/javascript/behaviors/GaBehavior.js b/allure-generator/src/main/javascript/behaviors/GaBehavior.js
@@ -22,6 +22,6 @@ export default class GaBehavior extends Behavior {
         return { [gaKey]: value };
       })
       .reduce((a, b) => Object.assign(a, b), {});
-    gtag({ ...eventParams, event });
+    gtag(event, eventParams);
   }
 }
diff --git a/allure-generator/src/main/javascript/components/language-select/LanguageSelectView.js b/allure-generator/src/main/javascript/components/language-select/LanguageSelectView.js
@@ -35,7 +35,7 @@ class LanguageSelectView extends PopoverView {
     const langId = this.$(e.currentTarget).data("id");
     settings.setLanguage(langId);
     i18next.changeLanguage(langId);
-    gtag({ event: "language_change", language: langId });
+    gtag( "language_change", { language: langId });
   }
 }
 

diff --git a/allure-generator/src/main/javascript/components/marks-toggle/MarksToggleView.js b/allure-generator/src/main/javascript/components/marks-toggle/MarksToggleView.js
@@ -34,7 +34,7 @@ class MarksToggleView extends View {
     const checked = el.hasClass("n-label-mark");
     const marks = this.settings.getVisibleMarks();
     this.settings.setVisibleMarks(Object.assign({}, marks, { [name]: checked }));
-    gtag({ event: "marks_toggle_click", status: name, checked });
+    gtag("marks_toggle_click", { status: name, checked });
   }
 }
 

diff --git a/allure-generator/src/main/javascript/components/node-search/NodeSearchView.js b/allure-generator/src/main/javascript/components/node-search/NodeSearchView.js
@@ -21,7 +21,7 @@ class NodeSearchView extends View {
   @on("input input")
   onChangeSorting(e) {
     this.state.set(SEARCH_QUERY_KEY, e.target.value);
-    gtag({ event: "search" });
+    gtag("search");
   }
 
   close() {

diff --git a/allure-generator/src/main/javascript/components/side-by-side/SideBySideView.js b/allure-generator/src/main/javascript/components/side-by-side/SideBySideView.js
@@ -21,7 +21,7 @@ class SideBySideView extends View {
       onDragEnd: function() {
         const sizes = splitter.getSizes();
         settings.setSideBySidePosition(sizes);
-        gtag({ event: "side-by-side-resize", sizes });
+        gtag("side-by-side-resize", { sizes });
       },
     });
   }

diff --git a/allure-generator/src/main/javascript/components/status-toggle/StatusToggleView.js b/allure-generator/src/main/javascript/components/status-toggle/StatusToggleView.js
@@ -35,7 +35,7 @@ class StatusToggleView extends View {
     const checked = el.hasClass("n-label");
     const statuses = this.settings.getVisibleStatuses();
     this.settings.setVisibleStatuses(Object.assign({}, statuses, { [name]: checked }));
-    gtag({ event: "status_toggle_click", status: name, checked });
+    gtag("status_toggle_click", { status: name, checked });
   }
 }
 

diff --git a/allure-generator/src/main/javascript/components/tree-view-container/TreeViewContainer.js b/allure-generator/src/main/javascript/components/tree-view-container/TreeViewContainer.js
@@ -44,7 +44,7 @@ class TreeViewContainer extends View {
   onInfoClick() {
     const show = this.settings.isShowGroupInfo();
     this.settings.setShowGroupInfo(!show);
-    gtag({ event: "tree_info_click", enable: !show });
+    gtag("tree_info_click", { enable: !show });
   }
 
   onRender() {

diff --git a/allure-generator/src/main/javascript/utils/gtag.js b/allure-generator/src/main/javascript/utils/gtag.js
@@ -1,4 +1,8 @@
-export default function gtag() {
+export default function gtag(event, params) {
+  add("event", event, params);
+}
+
+function add() {
   window.dataLayer = Array.isArray(window.dataLayer) ? window.dataLayer : [];
   window.dataLayer.push(arguments);
 }
diff --git a/allure-generator/src/main/javascript/utils/translation.js b/allure-generator/src/main/javascript/utils/translation.js
@@ -35,7 +35,7 @@ export function initTranslations() {
       },
       (err) => (err ? reject(err) : resolve()),
     );
-    gtag({ event: "init_language", language: language || "en" });
+    gtag("init_language", { language: language || "en" });
   });
 }
 

diff --git a/allure-generator/src/main/resources/tpl/index.html.ftl b/allure-generator/src/main/resources/tpl/index.html.ftl
@@ -32,7 +32,7 @@
     window.dataLayer = window.dataLayer || [];
     function gtag(){dataLayer.push(arguments);}
     gtag('js', new Date());
-    gtag('config', 'G-FVWC4GKEYS');
+    gtag('config', 'G-FVWC4GKEYS', { 'debug_mode':true });
     gtag('allureVersion', '${allureVersion}')
     gtag('reportUuid', '${reportUuid}')
 </script>