From 7832c1a6ddb802c2b166d536ebf7f7b78037b84b Mon Sep 17 00:00:00 2001 From: mksglu Date: Sun, 1 Nov 2020 17:32:10 +0300 Subject: [PATCH 1/9] [event-groups] improvements --- .../javascripts/countly/countly.event.js | 22 +++++----------- .../javascripts/countly/countly.views.js | 26 +++++++------------ 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/frontend/express/public/javascripts/countly/countly.event.js b/frontend/express/public/javascripts/countly/countly.event.js index edc5098b1bd..9959474c12c 100644 --- a/frontend/express/public/javascripts/countly/countly.event.js +++ b/frontend/express/public/javascripts/countly/countly.event.js @@ -125,25 +125,15 @@ return _eventGroups; }; - countlyEvent.getEventGroupsTable = function() { + countlyEvent.getEventGroupsTable = function(getStatus) { + if (!!getStatus === getStatus) { + _eventGroupsTable = _eventGroupsTable.filter(function(x) { + return x.status === getStatus; + }); + } return _eventGroupsTable; }; - countlyEvent.refreshEventGroupsTable = function() { - return $.when($.ajax({ - type: "GET", - url: countlyCommon.API_PARTS.data.r, - data: { - "app_id": countlyCommon.ACTIVE_APP_ID, - "method": "get_event_groups" - }, - dataType: "json", - success: function(groups_json) { - return groups_json; - } - })); - }; - countlyEvent.getOverviewList = function() { if (_activeEvents && _activeEvents.overview) { return _activeEvents.overview; diff --git a/frontend/express/public/javascripts/countly/countly.views.js b/frontend/express/public/javascripts/countly/countly.views.js index 81c59e9f04c..86fbbd9143c 100644 --- a/frontend/express/public/javascripts/countly/countly.views.js +++ b/frontend/express/public/javascripts/countly/countly.views.js @@ -5041,15 +5041,9 @@ window.EventsBlueprintView = countlyView.extend({ self.eventGroupsTable.find("tbody td .edit-box").click(function() { self.eventGroupDrawer.resetForm(); self.eventGroupDrawer.open(); - - // var _id = "[CLY]_group_1b12f7ebfcabde5e8209630effd09f6a"; countlyEvent.getEventGroupById($(this).attr("data-event-group-id"), function(result) { self.loadEventGroupDrawerSetting(result); }); - //Pass the settings variable here - // self.setEventBlueprintDrawerSettings(); - // $(".cly-drawer").removeClass("open editing"); - // $("#events-blueprint-drawer").addClass("open"); }); }, resetSelection: function() { @@ -5804,17 +5798,17 @@ window.EventsBlueprintView = countlyView.extend({ } }); CountlyHelpers.refreshTable(self.dtable, self.tableData); - countlyEvent.refreshEventGroupsTable(self.eventGroupFilter).then(function(res) { - if (!!self.eventGroupFilter === self.eventGroupFilter) { - res = res.filter(function(x) { - return x.status === self.eventGroupFilter; - }); + CountlyHelpers.refreshTable(self.eventGroupsTable, countlyEvent.getEventGroupsTable(self.eventGroupFilter)); + self.rightButttonsEventGroups(); + self.eventGroupSettingMenu(); + var events = countlyEvent.getEvents(true); + var tableData = []; + for (var i = 0; i < events.length; i++) { + if (!events[i].is_event_group && events[i].is_visible) { + tableData.push({value: events[i].key, name: events[i].name}); } - // self.rightButttonsEventGroups() - CountlyHelpers.refreshTable(self.eventGroupsTable, res); - self.rightButttonsEventGroups(); - self.eventGroupSettingMenu(); - }); + } + $("#event-group-include-events-dropdown").clyMultiSelectSetItems(tableData); $('#select-all-events').addClass("fa-square-o"); $('#select-all-events').removeClass("fa-check-square"); From b341052e7d9f543e3e95682a3f51d5a6bea600b5 Mon Sep 17 00:00:00 2001 From: mksglu Date: Sun, 1 Nov 2020 17:42:49 +0300 Subject: [PATCH 2/9] [event-groups] improvements --- frontend/express/public/javascripts/countly/countly.event.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/express/public/javascripts/countly/countly.event.js b/frontend/express/public/javascripts/countly/countly.event.js index 9959474c12c..367a4e23863 100644 --- a/frontend/express/public/javascripts/countly/countly.event.js +++ b/frontend/express/public/javascripts/countly/countly.event.js @@ -127,7 +127,7 @@ countlyEvent.getEventGroupsTable = function(getStatus) { if (!!getStatus === getStatus) { - _eventGroupsTable = _eventGroupsTable.filter(function(x) { + return _eventGroupsTable.filter(function(x) { return x.status === getStatus; }); } From 83d0abe060a8f9becc818d442181ea94097c69e8 Mon Sep 17 00:00:00 2001 From: mksglu Date: Sun, 1 Nov 2020 19:01:25 +0300 Subject: [PATCH 3/9] [event-groups] improvements --- .../express/public/javascripts/countly/countly.views.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/express/public/javascripts/countly/countly.views.js b/frontend/express/public/javascripts/countly/countly.views.js index 86fbbd9143c..e6650d2cd19 100644 --- a/frontend/express/public/javascripts/countly/countly.views.js +++ b/frontend/express/public/javascripts/countly/countly.views.js @@ -5021,8 +5021,8 @@ window.EventsBlueprintView = countlyView.extend({ //$(this).find(".cly-list-options").removeClass('cly-list-options-row'); $(this).find(".edit-event").css({"visibility": "hidden"}); }); - self.dtable.find("tbody td .edit-box").click(function() { - self.setEventBlueprintDrawerSettings(); + self.dtable.find("tbody td .edit-event").click(function() { + self.setEventBlueprintDrawerSettings(self.getEventBlueprintDrawerSettings()); $(".cly-drawer").removeClass("open editing"); $("#events-blueprint-drawer").addClass("open"); }); @@ -5598,7 +5598,7 @@ window.EventsBlueprintView = countlyView.extend({ event_map[settings.key] = settings; var omitted_segments = {}; omitted_segments[settings.key] = settings.omit_list; - if (self.compare_arrays(omitted_segments[settings.key], self.activeEvent.omittedSegments) && omitted_segments[settings.key].length > 0) { + if (self.compare_arrays(omitted_segments[settings.key], self.activeEvent.omittedSegments || []) && omitted_segments[settings.key].length > 0) { CountlyHelpers.confirm(jQuery.i18n.map["event.edit.omitt-warning"], "red", function(result) { if (!result) { return true; From 33809ca3da83fe863eec0d5e6c393f2f0c7fbe07 Mon Sep 17 00:00:00 2001 From: mksglu Date: Sun, 1 Nov 2020 19:07:04 +0300 Subject: [PATCH 4/9] [event-groups] improvements --- frontend/express/public/javascripts/countly/countly.views.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/frontend/express/public/javascripts/countly/countly.views.js b/frontend/express/public/javascripts/countly/countly.views.js index e6650d2cd19..a727fd34ca3 100644 --- a/frontend/express/public/javascripts/countly/countly.views.js +++ b/frontend/express/public/javascripts/countly/countly.views.js @@ -5021,11 +5021,6 @@ window.EventsBlueprintView = countlyView.extend({ //$(this).find(".cly-list-options").removeClass('cly-list-options-row'); $(this).find(".edit-event").css({"visibility": "hidden"}); }); - self.dtable.find("tbody td .edit-event").click(function() { - self.setEventBlueprintDrawerSettings(self.getEventBlueprintDrawerSettings()); - $(".cly-drawer").removeClass("open editing"); - $("#events-blueprint-drawer").addClass("open"); - }); }, rightButttonsEventGroups: function() { var self = this; From 8bd9c52f39d35095a56880969df29a5e091a0612 Mon Sep 17 00:00:00 2001 From: mksglu Date: Sun, 1 Nov 2020 19:12:49 +0300 Subject: [PATCH 5/9] [event-groups] improvements --- frontend/express/public/javascripts/countly/countly.views.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/express/public/javascripts/countly/countly.views.js b/frontend/express/public/javascripts/countly/countly.views.js index a727fd34ca3..83182c53ae7 100644 --- a/frontend/express/public/javascripts/countly/countly.views.js +++ b/frontend/express/public/javascripts/countly/countly.views.js @@ -5538,11 +5538,11 @@ window.EventsBlueprintView = countlyView.extend({ $("#eb-multi-omit-segments-drop").clyMultiSelectSetSelection(omittedSegments || []); if ($(this).data('event').is_visible) { - $('#eb-event-visibility .on-off-switch input').attr('checked', 'checked'); + $('#eb-event-visibility .on-off-switch input').attr('checked', true); $('#eb-event-visibility > div.on-off-switch > span').html(jQuery.i18n.map["events.edit.event-visible"]); } else { - $('#eb-event-visibility .on-off-switch input').removeAttr('checked'); + $('#eb-event-visibility .on-off-switch input').removeAttr('checked', false); $('#eb-event-visibility > div.on-off-switch > span').html(); } From 110cd575ee03ae0063a7479370c0137602743a96 Mon Sep 17 00:00:00 2001 From: mksglu Date: Sun, 1 Nov 2020 19:36:27 +0300 Subject: [PATCH 6/9] [event-groups] improvements --- frontend/express/public/javascripts/countly/countly.views.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/express/public/javascripts/countly/countly.views.js b/frontend/express/public/javascripts/countly/countly.views.js index 83182c53ae7..43b8e735228 100644 --- a/frontend/express/public/javascripts/countly/countly.views.js +++ b/frontend/express/public/javascripts/countly/countly.views.js @@ -5534,6 +5534,7 @@ window.EventsBlueprintView = countlyView.extend({ for (var k = 0; k < $(this).data('event').omittedSegments.length; k++) { omittedSegments.push({name: $(this).data('event').omittedSegments[k], value: $(this).data('event').omittedSegments[k]}); } + self.activeEvent.omittedSegments = $(this).data('event').omittedSegments; $("#eb-multi-omit-segments-drop").clyMultiSelectSetItems(segments); $("#eb-multi-omit-segments-drop").clyMultiSelectSetSelection(omittedSegments || []); From 627f0e4502bf5ed9dd0d86c1bbe1e933cd0353a3 Mon Sep 17 00:00:00 2001 From: mksglu Date: Mon, 2 Nov 2020 05:04:07 +0300 Subject: [PATCH 7/9] [event-groups] tooltips --- .../javascripts/countly/countly.views.js | 30 +++++++++++++++++++ .../dashboard/dashboard.properties | 5 ++++ frontend/express/views/dashboard.html | 6 ++-- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/frontend/express/public/javascripts/countly/countly.views.js b/frontend/express/public/javascripts/countly/countly.views.js index 43b8e735228..a640071e2dc 100644 --- a/frontend/express/public/javascripts/countly/countly.views.js +++ b/frontend/express/public/javascripts/countly/countly.views.js @@ -5009,6 +5009,26 @@ window.EventsBlueprintView = countlyView.extend({ $(event.target).removeClass("active").addClass("disabled"); } }); + $(".eb-event-group-include-events-tooltip").tooltipster({ + theme: ['tooltipster-borderless', 'tooltipster-borderless-customized'], + contentCloning: true, + interactive: true, + trigger: 'hover', + side: 'right', + zIndex: 10001, + maxWidth: 250, + content: $.i18n.map["events.blueprint-event-groups-include-events-tooltip"] + }); + $(".eb-event-group-properties-events-tooltip").tooltipster({ + theme: ['tooltipster-borderless', 'tooltipster-borderless-customized'], + contentCloning: true, + interactive: true, + trigger: 'hover', + side: 'right', + zIndex: 10001, + maxWidth: 250, + content: $.i18n.map["events.blueprint-event-groups-properties-tooltip"] + }); }, rightButtonsEvents: function() { var self = this; @@ -5638,6 +5658,16 @@ window.EventsBlueprintView = countlyView.extend({ $(this).parent().find(".text").replaceWith('' + jQuery.i18n.map["events.edit.event-invisible"] + ''); } }); + $(".eb-event-properties-tooltip").tooltipster({ + theme: ['tooltipster-borderless', 'tooltipster-borderless-customized'], + contentCloning: true, + interactive: true, + trigger: 'hover', + side: 'right', + zIndex: 10001, + maxWidth: 250, + content: $.i18n.map["events.blueprint-events-properties-tooltip"] + }); }, getEventBlueprintDrawerSettings: function() { var keyName = $("#eb-key-name").val(); diff --git a/frontend/express/public/localization/dashboard/dashboard.properties b/frontend/express/public/localization/dashboard/dashboard.properties index 7ea464f1f21..183c8bd64cc 100644 --- a/frontend/express/public/localization/dashboard/dashboard.properties +++ b/frontend/express/public/localization/dashboard/dashboard.properties @@ -401,6 +401,11 @@ events.blueprint-event-group-show.hidden = Hidden Groups events.blueprint-events-show.all = All Events events.blueprint-events-show.hidden = Hidden Events events.blueprint-events-show.visible = Visible Events + +events.blueprint-events-properties-tooltip = Event Properties Tooltip +events.blueprint-event-groups-include-events-tooltip = Event Groups Include Events Tooltip +events.blueprint-event-groups-properties-tooltip = Event Groups Properties Tooltip + events.blueprint-event-group-included-events = INCLUDED EVENTS events.blueprint-eventgroups-tab-title = EVENT GROUPS events.blueprint-edit = Edit diff --git a/frontend/express/views/dashboard.html b/frontend/express/views/dashboard.html index 94cf783b770..28a0fd70064 100644 --- a/frontend/express/views/dashboard.html +++ b/frontend/express/views/dashboard.html @@ -1418,7 +1418,7 @@

{{value.title}}

- +
@@ -1508,7 +1508,7 @@

{{value.title}}

- +
@@ -1549,7 +1549,7 @@

{{value.title}}

- +
From 02db6385d4bd9642ae86b4bde0726e7e4afc4ad4 Mon Sep 17 00:00:00 2001 From: mksglu Date: Mon, 2 Nov 2020 08:50:04 +0300 Subject: [PATCH 8/9] [event-groups] ordered event groups --- frontend/express/public/javascripts/countly/countly.event.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/express/public/javascripts/countly/countly.event.js b/frontend/express/public/javascripts/countly/countly.event.js index 367a4e23863..2cc45c26087 100644 --- a/frontend/express/public/javascripts/countly/countly.event.js +++ b/frontend/express/public/javascripts/countly/countly.event.js @@ -746,6 +746,7 @@ } if (eventMap[mapKey].is_visible || get_hidden) { arrayToUse.push({ + "order": _eventGroups[events[i]] ? i : null, "key": events[i], "name": _eventGroups[events[i]] ? _eventGroups[events[i]].label : (eventMap[mapKey].name || events[i]), "description": eventMap[mapKey].description || "", @@ -762,6 +763,7 @@ } else { arrayToUse.push({ + "order": _eventGroups[events[i]] ? i : null, "key": events[i], "name": _eventGroups[events[i]] ? _eventGroups[events[i]].label : events[i], "description": "", @@ -781,7 +783,7 @@ return eventOrder.indexOf(event.key); }); eventsWithoutOrder = _.sortBy(eventsWithoutOrder, function(event) { - return event.key; + return event.order || event.key; }); return eventsWithOrder.concat(eventsWithoutOrder); From a3870a74a58847c414efd99ee73bc439fd2511f3 Mon Sep 17 00:00:00 2001 From: mksglu Date: Mon, 2 Nov 2020 12:23:52 +0300 Subject: [PATCH 9/9] [event-groups] tooltips locales --- .../public/localization/dashboard/dashboard.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/express/public/localization/dashboard/dashboard.properties b/frontend/express/public/localization/dashboard/dashboard.properties index 183c8bd64cc..2b1a0f7a22c 100644 --- a/frontend/express/public/localization/dashboard/dashboard.properties +++ b/frontend/express/public/localization/dashboard/dashboard.properties @@ -402,9 +402,9 @@ events.blueprint-events-show.all = All Events events.blueprint-events-show.hidden = Hidden Events events.blueprint-events-show.visible = Visible Events -events.blueprint-events-properties-tooltip = Event Properties Tooltip -events.blueprint-event-groups-include-events-tooltip = Event Groups Include Events Tooltip -events.blueprint-event-groups-properties-tooltip = Event Groups Properties Tooltip +events.blueprint-events-properties-tooltip = Edited properties of this event will be updated on All Events and other plugins. +events.blueprint-event-groups-include-events-tooltip = Select at least 2 events to create an Event Group. New Event Groups will automatically sum all the selected event properties and report them. +events.blueprint-event-groups-properties-tooltip = Edited properties in this Event Group will be updated across All Events and other plugins. events.blueprint-event-group-included-events = INCLUDED EVENTS events.blueprint-eventgroups-tab-title = EVENT GROUPS