From 8e2d7a274f6ac3602c7fc47e688df17f9b7dae72 Mon Sep 17 00:00:00 2001 From: Boris Sekachev Date: Tue, 28 May 2024 15:45:52 +0300 Subject: [PATCH] Removed extra code --- cvat-core/src/event.ts | 16 ---------------- cvat-ui/src/utils/event-recorder.ts | 6 +++--- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/cvat-core/src/event.ts b/cvat-core/src/event.ts index b4079becf874..59a271796b0e 100644 --- a/cvat-core/src/event.ts +++ b/cvat-core/src/event.ts @@ -3,7 +3,6 @@ // // SPDX-License-Identifier: MIT -import { omit } from 'lodash'; import { detect } from 'detect-browser'; import PluginRegistry from './plugins'; import { EventScope } from './enums'; @@ -170,17 +169,6 @@ class EventWithExceptionInfo extends Event { } } -class EventWithControlsInfo extends Event { - public dump(): any { - this.payload = { - obj_val: this.payload?.text, - obj_name: this.payload?.classes, - ...omit(this.payload, ['text', 'classes']), - }; - return super.dump(); - } -} - export default function makeEvent(scope: EventScope, payload: JSONEventPayload): Event { const eventsWithCount = [ EventScope.deleteObject, @@ -199,9 +187,5 @@ export default function makeEvent(scope: EventScope, payload: JSONEventPayload): return new EventWithExceptionInfo(scope, payload); } - if (scope === EventScope.clickElement) { - return new EventWithControlsInfo(scope, payload); - } - return new Event(scope, payload); } diff --git a/cvat-ui/src/utils/event-recorder.ts b/cvat-ui/src/utils/event-recorder.ts index f787a12796dd..26ddced5591d 100644 --- a/cvat-ui/src/utils/event-recorder.ts +++ b/cvat-ui/src/utils/event-recorder.ts @@ -44,8 +44,8 @@ class EventRecorder { let toRecord = this.isEventToBeRecorded(element, classFilter); const logData = { - text: element.innerText, - classes: this.filterClassName(element.className), + obj_val: element.innerText, + obj_name: this.filterClassName(element.className), location: window.location.pathname, }; @@ -53,7 +53,7 @@ class EventRecorder { const parentElement = element?.parentElement; if (parentElement) { toRecord = this.isEventToBeRecorded(parentElement, parentClassFilter); - logData.classes = this.filterClassName(parentElement.className); + logData.obj_name = this.filterClassName(parentElement.className); } }