diff --git a/app/src/components/integrations/containers/integrationInfoContainer/instancesSection/instancesSection.jsx b/app/src/components/integrations/containers/integrationInfoContainer/instancesSection/instancesSection.jsx index 48b8c65d6c..1e7f19df55 100644 --- a/app/src/components/integrations/containers/integrationInfoContainer/instancesSection/instancesSection.jsx +++ b/app/src/components/integrations/containers/integrationInfoContainer/instancesSection/instancesSection.jsx @@ -226,7 +226,7 @@ export class InstancesSection extends Component { cancelText: formatMessage(COMMON_LOCALE_KEYS.CANCEL), dangerConfirm: true, eventsInfo: { - confirmBtn: PLUGINS_PAGE_EVENTS.OK_BTN_UNINSTALL_PLUGIN_MODAL, + confirmBtn: PLUGINS_PAGE_EVENTS.clickConfirmUninstallPlugin(instanceType), closeIcon: PLUGINS_PAGE_EVENTS.CLOSE_ICON_UNINSTALL_PLUGIN_MODAL, cancelBtn: PLUGINS_PAGE_EVENTS.CANCEL_BTN_UNINSTALL_PLUGIN_MODAL, }, diff --git a/app/src/components/main/analytics/events/logPageEvents.js b/app/src/components/main/analytics/events/logPageEvents.js index ed766a708e..cad43da898 100644 --- a/app/src/components/main/analytics/events/logPageEvents.js +++ b/app/src/components/main/analytics/events/logPageEvents.js @@ -145,6 +145,11 @@ export const LOG_PAGE_EVENTS = { icon_name: `${viewMode}_mode`, status: isActive ? 'on' : 'off', }), + getClickOnLogMicrosecondPrecisionEvent: (isActive) => ({ + ...basicLogPageClickEventParameters, + element_name: 'microseconds', + switcher: isActive ? 'on' : 'off', + }), CLICK_JUMP_TO_ERROR_LOG: { ...basicLogPageClickEventParameters, place: 'stack_trace', diff --git a/app/src/components/main/analytics/events/pluginsPageEvents.js b/app/src/components/main/analytics/events/pluginsPageEvents.js index 4b561b1289..2f80f70343 100644 --- a/app/src/components/main/analytics/events/pluginsPageEvents.js +++ b/app/src/components/main/analytics/events/pluginsPageEvents.js @@ -77,6 +77,28 @@ export const PLUGINS_PAGE_EVENTS = { element_name: 'add_integration', type: normalizeEventParameter(type), }), + navigatedInPluginsFilterList: (filterName) => ({ + ...BASIC_PLUGINS_EVENT_PARAMS, + element_name: normalizeEventParameter(filterName), + }), + clickConfirmUninstallPlugin: (pluginName) => ({ + ...BASIC_PLUGINS_EVENT_PARAMS, + element_name: 'uninstall', + modal: 'uninstall_plugin', + type: normalizeEventParameter(pluginName), + }), + clickDisablePlugin: (pluginName) => ({ + ...BASIC_PLUGINS_EVENT_PARAMS, + element_name: 'disable', + modal: 'disable_plugin', + type: normalizeEventParameter(pluginName), + }), + clickEnablePlugin: (pluginName) => ({ + ...BASIC_PLUGINS_EVENT_PARAMS, + element_name: 'enable', + modal: 'enable_plugin', + type: normalizeEventParameter(pluginName), + }), // GA 3 CANCEL_BTN_UPLOAD_MODAL: { category: PLUGINS_MODAL, @@ -109,11 +131,6 @@ export const PLUGINS_PAGE_EVENTS = { action: 'Click on Btn Cancel on Modal "Uninstall Plugin"', label: 'Close Modal Uninstall Plugin', }, - OK_BTN_UNINSTALL_PLUGIN_MODAL: { - category: PLUGINS_MODAL, - action: 'Click on Btn Uninstall on Modal "Uninstall Plugin"', - label: 'Uninstall Plugin', - }, clickSaveEditAuthorizationBtn: getClickSaveBtnEditAuthorizationEvent(PLUGINS_MODAL), clickDeleteBtnRemoveIntegration: getClickDeleteBtnRemoveIntegrationEvent(PLUGINS_MODAL), pluginInstanceItemClick: getPluginInstanceItemClickEvent(PLUGINS_PAGE), diff --git a/app/src/components/main/analytics/events/uniqueErrorsPageEvents.js b/app/src/components/main/analytics/events/uniqueErrorsPageEvents.js index 9a097ff533..3a6cb8f596 100644 --- a/app/src/components/main/analytics/events/uniqueErrorsPageEvents.js +++ b/app/src/components/main/analytics/events/uniqueErrorsPageEvents.js @@ -74,6 +74,10 @@ export const UNIQUE_ERRORS_PAGE_EVENTS = { ...basicUniqueErrorsPageClickEventParameters, icon_name: 'expand_error', }, + CLICK_MATCHED_TESTS_HEADER_CELL: { + ...basicUniqueErrorsPageClickEventParameters, + icon_name: 'matched_tests', + }, TEST_ITEM_TABS_EVENTS: getClickOnTestItemsTabsEvents(UNIQUE_ERRORS_PAGE), getChangeItemStatusEvent: getChangeItemStatusEventCreator(UNIQUE_ERRORS_PAGE), POST_ISSUE_ACTION: getPostIssueActionEvent(UNIQUE_ERRORS_PAGE), diff --git a/app/src/pages/admin/pluginsPage/pluginsFilter/pluginsFilter.jsx b/app/src/pages/admin/pluginsPage/pluginsFilter/pluginsFilter.jsx index dac51f045f..7d093be566 100644 --- a/app/src/pages/admin/pluginsPage/pluginsFilter/pluginsFilter.jsx +++ b/app/src/pages/admin/pluginsPage/pluginsFilter/pluginsFilter.jsx @@ -14,49 +14,46 @@ * limitations under the License. */ -import React, { Component, Fragment } from 'react'; +import React from 'react'; import PropTypes from 'prop-types'; +import { useTracking } from 'react-tracking'; import classNames from 'classnames/bind'; import { getPluginsFilter } from 'common/constants/pluginsFilter'; +import { PLUGINS_PAGE_EVENTS } from 'components/main/analytics/events'; import styles from './pluginsFilter.scss'; const cx = classNames.bind(styles); -export class PluginsFilter extends Component { - static propTypes = { - filterItems: PropTypes.array.isRequired, - onFilterChange: PropTypes.func.isRequired, - activeItem: PropTypes.string.isRequired, - }; - - getFilterItems = () => getPluginsFilter(this.props.filterItems); +export const PluginsFilter = ({ filterItems, onFilterChange, activeItem }) => { + const { trackEvent } = useTracking(); + const getFilterItems = () => getPluginsFilter(filterItems); - changeFilterItem = (e) => { + const changeFilterItem = (e) => { e.preventDefault(); - this.props.onFilterChange(e.currentTarget.id); - }; - - generateItems = () => { - const { activeItem } = this.props; - - return ( -