From 1a699e05689853664880ca80d071e8b9723f3609 Mon Sep 17 00:00:00 2001 From: Ilya Hancharyk Date: Wed, 20 Dec 2023 21:12:01 +0300 Subject: [PATCH] EPMRPP-88599 || Make decision. Extend analytics --- .../common/testItemPages/modalEventsCreators.js | 2 ++ .../plugins/uiExtensions/createImportProps.js | 4 ++++ .../makeDecisionModal/makeDecisionModal.jsx | 3 +++ .../selectDefectManually.jsx | 17 ++++++++++++++++- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/src/components/main/analytics/events/common/testItemPages/modalEventsCreators.js b/app/src/components/main/analytics/events/common/testItemPages/modalEventsCreators.js index 9700332443..5d55547a7e 100644 --- a/app/src/components/main/analytics/events/common/testItemPages/modalEventsCreators.js +++ b/app/src/components/main/analytics/events/common/testItemPages/modalEventsCreators.js @@ -60,6 +60,7 @@ const getClickOnApplyEventCreator = (place) => ( itemDataIssueType, issueActionType, suggestedItems, + extraParams, ) => { const basicEventParameters = getBasicClickEventParametersMakeDecisionCreator( place, @@ -84,6 +85,7 @@ const getClickOnApplyEventCreator = (place) => ( switcher, icon_name: iconName, element_name: getMakeDecisionElementName(issueActionType), + ...extraParams, }; }; diff --git a/app/src/controllers/plugins/uiExtensions/createImportProps.js b/app/src/controllers/plugins/uiExtensions/createImportProps.js index 5c0cedda12..55552d3a5c 100644 --- a/app/src/controllers/plugins/uiExtensions/createImportProps.js +++ b/app/src/controllers/plugins/uiExtensions/createImportProps.js @@ -157,6 +157,7 @@ import { BTS_FIELDS_FORM, } from 'components/integrations/elements'; import { updateLaunchLocallyAction } from 'controllers/launch'; +import { withTooltip } from 'components/main/tooltips/tooltip'; import { getDefectTypeLabel } from 'components/main/analytics/events/common/utils'; import { formatAttribute } from 'common/utils/attributeUtils'; import { createNamespacedQuery } from 'common/utils/routingUtils'; @@ -242,6 +243,9 @@ export const createImportProps = (pluginName) => ({ BtsPropertiesForIssueForm, BubblesPreloader, }, + HOCs: { + withTooltip, + }, constants: { PLUGIN_UI_EXTENSION_ADMIN_PAGE, PROJECT_SETTINGS_TAB_PAGE, diff --git a/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx b/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx index afb1f2e421..41e8d83c12 100644 --- a/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx +++ b/app/src/pages/inside/stepPage/modals/makeDecisionModal/makeDecisionModal.jsx @@ -89,6 +89,7 @@ const MakeDecision = ({ data }) => { !item.issue.issueType.startsWith(TO_INVESTIGATE_LOCATOR_PREFIX), ), commentOption: isBulkOperation ? NOT_CHANGED_FOR_ALL : REPLACE_FOR_ALL, + extraAnalyticsParams: {}, }); const [activeTab, setActiveTab] = useState(SELECT_DEFECT_MANUALLY); const windowSize = useWindowResize(); @@ -313,6 +314,7 @@ const MakeDecision = ({ data }) => { selectManualChoice: { issue: { issueType }, }, + extraAnalyticsParams, } = modalState; const hasSuggestions = !!suggestedItems.length; @@ -335,6 +337,7 @@ const MakeDecision = ({ data }) => { itemData.issue.issueType, issueBtn, suggestedItems, + extraAnalyticsParams, ); }; diff --git a/app/src/pages/inside/stepPage/modals/makeDecisionModal/tabs/selectDefectManually/selectDefectManually.jsx b/app/src/pages/inside/stepPage/modals/makeDecisionModal/tabs/selectDefectManually/selectDefectManually.jsx index 150bd7ef83..33479bb006 100644 --- a/app/src/pages/inside/stepPage/modals/makeDecisionModal/tabs/selectDefectManually/selectDefectManually.jsx +++ b/app/src/pages/inside/stepPage/modals/makeDecisionModal/tabs/selectDefectManually/selectDefectManually.jsx @@ -77,6 +77,7 @@ export const SelectDefectManually = ({ const source = modalState.selectManualChoice; const handleManualChange = (value = {}) => { + console.log('Change in service UI'); const issue = { ...(modalState.decisionType === SELECT_DEFECT_MANUALLY ? source.issue : itemData.issue), ...value, @@ -190,6 +191,15 @@ export const SelectDefectManually = ({ const getDefectTypeNarrowView = () => width < SCREEN_SM_MAX && width > SCREEN_XS_MAX; + const updateExtraAnalyticsParams = (extraAnalyticsParams) => { + setModalState({ + extraAnalyticsParams: { + ...modalState.extraAnalyticsParams, + ...extraAnalyticsParams, + }, + }); + }; + const createDefectTypesBlock = (params = {}) => ( <> {!isBulkOperation && ( @@ -228,7 +238,11 @@ export const SelectDefectManually = ({
{!isBulkOperation && defectTypeExtensions.length ? defectTypeExtensions.map((extension) => ( - + {createDefectTypesBlock} )) @@ -258,6 +272,7 @@ export const SelectDefectManually = ({ onChangeComment={handleDefectCommentChange} comment={source.issue.comment} item={itemData} + updateExtraAnalyticsParams={updateExtraAnalyticsParams} /> ))}