From 30cc83c0336cc19b05e432b4597ee405641fa3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 5 Jun 2020 12:56:20 -0400
Subject: [PATCH] fix: #8374, revert event delete

---
 .../language/en-GB/admin/advanced/events.json |  1 +
 public/src/admin/advanced/events.js           | 20 +++++++++++++++++++
 src/socket.io/admin.js                        |  8 ++++++++
 src/views/admin/advanced/events.tpl           |  8 ++++++++
 4 files changed, 37 insertions(+)

diff --git a/public/language/en-GB/admin/advanced/events.json b/public/language/en-GB/admin/advanced/events.json
index aa9e87e0e4..56d9457971 100644
--- a/public/language/en-GB/admin/advanced/events.json
+++ b/public/language/en-GB/admin/advanced/events.json
@@ -2,6 +2,7 @@
 	"events": "Events",
 	"no-events": "There are no events",
 	"control-panel": "Events Control Panel",
+	"delete-events": "Delete Events",
 	"filters": "Filters",
 	"filters-apply": "Apply Filters",
 	"filter-type": "Event Type",
diff --git a/public/src/admin/advanced/events.js b/public/src/admin/advanced/events.js
index 333e74cf0a..147ad193e5 100644
--- a/public/src/admin/advanced/events.js
+++ b/public/src/admin/advanced/events.js
@@ -5,6 +5,26 @@ define('admin/advanced/events', function () {
 	var	Events = {};
 
 	Events.init = function () {
+		$('[data-action="clear"]').on('click', function () {
+			socket.emit('admin.deleteAllEvents', function (err) {
+				if (err) {
+					return app.alertError(err.message);
+				}
+				$('.events-list').empty();
+			});
+		});
+
+		$('.delete-event').on('click', function () {
+			var parentEl = $(this).parents('[data-eid]');
+			var eid = parentEl.attr('data-eid');
+			socket.emit('admin.deleteEvents', [eid], function (err) {
+				if (err) {
+					return app.alertError(err.message);
+				}
+				parentEl.remove();
+			});
+		});
+
 		$('#apply').on('click', Events.refresh);
 	};
 
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index 2c06be484c..ee2c5dd52b 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -77,6 +77,14 @@ SocketAdmin.fireEvent = function (socket, data, callback) {
 	callback();
 };
 
+SocketAdmin.deleteEvents = function (socket, eids, callback) {
+	events.deleteEvents(eids, callback);
+};
+
+SocketAdmin.deleteAllEvents = function (socket, data, callback) {
+	events.deleteAll(callback);
+};
+
 SocketAdmin.getSearchDict = async function (socket) {
 	const settings = await user.getSettings(socket.uid);
 	const lang = settings.userLang || meta.config.defaultLang || 'en-GB';
diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl
index 154d3d7e11..f7a4a94c3c 100644
--- a/src/views/admin/advanced/events.tpl
+++ b/src/views/admin/advanced/events.tpl
@@ -21,6 +21,7 @@
 						<!-- ENDIF events.user.picture -->
 					</a>
 					<a href="{config.relative_path}/user/{events.user.userslug}" target="_blank">{events.user.username}</a>
+					<span class="pull-right delete-event"><i class="fa fa-trash-o"></i></span>
 					<span class="pull-right">{events.timestampISO}</span>
 					<pre class="well">{events.jsonString}</pre>
 				</div>
@@ -59,5 +60,12 @@
 				</form>
 			</div>
 		</div>
+		<div class="panel panel-default">
+			<div class="panel-body">
+				<button class="btn btn-block btn-danger" data-action="clear">
+					<i class="fa fa-eraser"></i> [[admin/advanced/events:delete-events]]
+				</button>
+			</div>
+		</div>
 	</div>
 </div>