Merge branch 'develop' into feature/EPMRPP-114875-Test-Executions-Promotion

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: vahesamsonyan

app/src/components/integrations/elements/integrationSettings/connectionSection/connectionSection.jsx

@@ -29,6 +29,7 @@ import TrashBin from 'common/img/newIcons/bin-inline.svg';
 import Tick from 'common/img/newIcons/tick-inline.svg';
 import ErrorIcon from 'common/img/newIcons/error-inline.svg';
 import styles from './connectionSection.scss';
+import { IntegrationAnalyticsContext } from 'components/integrations/integrationAnalyticsContext';
 
 const cx = classNames.bind(styles);
 
@@ -108,6 +109,8 @@ export class ConnectionSection extends Component {
     pluginName: null,
   };
 
+  static contextType = IntegrationAnalyticsContext;
+
   removeIntegrationHandler = () => {
     const {
       intl: { formatMessage },
@@ -118,6 +121,9 @@ export class ConnectionSection extends Component {
       id: 'deleteIntegrationModal',
       data: {
         onConfirm: this.props.onRemoveIntegration,
+        onConfirmTrackEvent: this.context?.deleteConfirmEvent
+          ? () => this.context.deleteConfirmEvent(this.props.pluginName)
+          : undefined,
         modalTitle: formatMessage(messages.deleteIntegrationTitle, { name: data.name }),
         description: formatMessage(messages.deleteIntegrationDescription, { name: data.name }),
       },

app/src/components/integrations/elements/integrationSettings/integrationForm/integrationForm.jsx

@@ -24,6 +24,7 @@ import { COMMON_LOCALE_KEYS } from 'common/constants/localization';
 import { Button } from '@reportportal/ui-kit';
 import { isIntegrationSupportsMultipleInstances } from 'components/integrations/utils';
 import { PLUGINS_PAGE_EVENTS } from 'components/main/analytics/events';
+import { IntegrationAnalyticsContext } from 'components/integrations/integrationAnalyticsContext';
 import { removeNoneValues } from 'components/fields/dynamicFieldsSection/utils';
 import { trimStringValues } from 'common/utils';
 import styles from './integrationForm.scss';
@@ -74,6 +75,8 @@ export class IntegrationForm extends Component {
     isGlobal: false,
   };
 
+  static contextType = IntegrationAnalyticsContext;
+
   state = {
     disabled: !this.props.isEmptyConfiguration,
     metaData: {},
@@ -99,9 +102,13 @@ export class IntegrationForm extends Component {
       this.state.metaData,
     );
 
-    this.props.tracking.trackEvent(
-      PLUGINS_PAGE_EVENTS.pluginConfigureClickSubmit(this.props.pluginName),
-    );
+    if (this.context?.submitEvent) {
+      this.context.submitEvent(this.props.pluginName);
+    } else {
+      this.props.tracking.trackEvent(
+        PLUGINS_PAGE_EVENTS.pluginConfigureClickSubmit(this.props.pluginName),
+      );
+    }
   };
 
   updateMetaData = (metaData) => {

app/src/components/integrations/integrationAnalyticsContext.ts

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2026 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createContext } from 'react';
+
+interface IntegrationAnalyticsContextValue {
+  submitEvent: (pluginName: string) => void;
+  deleteConfirmEvent: (pluginName: string) => void;
+}
+
+export const IntegrationAnalyticsContext = createContext<IntegrationAnalyticsContextValue | null>(
+  null,
+);

app/src/components/integrations/integrationProviders/emailIntegration/emailSettings/emailSettings.tsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { useEffect, useState, useMemo, useCallback, ReactNode } from 'react';
+import { useEffect, useState, useMemo, useCallback, useContext, ReactNode } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { redirect } from 'redux-first-router';
 import { useIntl, defineMessages } from 'react-intl';
@@ -47,6 +47,7 @@ import { NamedIntegrations } from 'pages/inside/common/integrations/types';
 import { messages as integrationsMessages } from 'pages/inside/common/integrations/messages';
 import { DeleteIntegrationModal } from 'components/integrations/modals/deleteIntegrationModal';
 import AddIntegrationModal from 'components/integrations/modals/addIntegrationModal/addIntegrationModal';
+import { IntegrationAnalyticsContext } from 'components/integrations/integrationAnalyticsContext';
 
 import { IntegrationData } from '../types';
 import { EmailDetailsCard } from '../emailDetailsCard';
@@ -94,6 +95,7 @@ export function EmailSettings({
 }: EmailSettingsProps) {
   const dispatch = useDispatch();
   const { formatMessage } = useIntl();
+  const analyticsContext = useContext(IntegrationAnalyticsContext);
   const [connected, setConnected] = useState(true);
   const [loading, setLoading] = useState(true);
 
@@ -202,6 +204,9 @@ export function EmailSettings({
 
     const modalData = {
       onConfirm: removeIntegration,
+      onConfirmTrackEvent: analyticsContext?.deleteConfirmEvent
+        ? () => analyticsContext.deleteConfirmEvent(data.integrationType?.name)
+        : undefined,
       modalTitle: formatMessage(messages.deleteIntegrationTitle),
       description: getDescription(),
     };

app/src/components/integrations/modals/deleteIntegrationModal/deleteIntegrationModal.tsx

@@ -32,6 +32,7 @@ const cx = createClassnames(styles);
 
 interface DeleteIntegrationModalData {
   onConfirm: () => void;
+  onConfirmTrackEvent?: () => void;
   modalTitle: ReactNode | string;
   description: ReactNode | string;
   okButtonLabel?: ReactNode | string;
@@ -44,6 +45,7 @@ const DeleteIntegrationModal = ({ data }: UseModalData<DeleteIntegrationModalDat
 
   const onDelete = () => {
     data.onConfirm();
+    data.onConfirmTrackEvent?.();
     dispatch(hideModalAction());
   };
 

app/src/components/main/analytics/events/ga4Events/projectSettingsPageEvents.js

@@ -260,10 +260,32 @@ export const PROJECT_SETTINGS_INTEGRATION = {
     type: normalizeEventString(type),
   }),
 
-  CLICK_RESET_TO_GLOBAL_INTEGRATION: {
+  CLICK_SUBMIT_CONFIGURATION: (type) => ({
+    ...BASIC_EVENT_PARAMETERS_INTEGRATIONS,
+    element_name: 'submit',
+    place: 'configuration_view',
+    type: normalizeEventParameter(type),
+  }),
+
+  CLICK_RESET_TO_GLOBAL_INTEGRATION: (type) => ({
     ...BASIC_EVENT_PARAMETERS_INTEGRATIONS,
     element_name: 'button_reset',
-  },
+    type: normalizeEventParameter(type),
+  }),
+
+  CLICK_RESET_CONFIRM: (type) => ({
+    ...BASIC_EVENT_PARAMETERS_INTEGRATIONS,
+    element_name: 'button_reset',
+    modal: 'reset_to_global_integration',
+    type: normalizeEventParameter(type),
+  }),
+
+  CLICK_DELETE_CONFIRM: (type) => ({
+    ...BASIC_EVENT_PARAMETERS_INTEGRATIONS,
+    element_name: 'button_delete',
+    modal: 'delete_integration',
+    type: normalizeEventParameter(type),
+  }),
 };
 
 export const PROJECT_SETTINGS_PATTERN_ANALYSIS_EVENTS = {

app/src/pages/inside/projectSettingsPageContainer/content/integrations/integrationsList/integrationInfo/integrationInfo.jsx

@@ -45,6 +45,7 @@ import { ExtensionLoader } from 'components/extensionLoader';
 import { INTEGRATIONS_SETTINGS_COMPONENTS_MAP } from 'components/integrations/settingsComponentsMap';
 import { EmptyStatePage } from 'pages/inside/common/emptyStatePage';
 import { PROJECT_SETTINGS_INTEGRATION } from 'analyticsEvents/projectSettingsPageEvents';
+import { IntegrationAnalyticsContext } from 'components/integrations/integrationAnalyticsContext';
 import { INTEGRATIONS } from 'common/constants/settingsTabs';
 import { EMAIL } from 'common/constants/pluginNames';
 import { combineNameAndEmailToFrom, fetch } from 'common/utils';
@@ -64,6 +65,16 @@ export const IntegrationInfo = (props) => {
   const [updatedParameters, setUpdatedParameters] = useState({});
   const { formatMessage } = useIntl();
   const { trackEvent } = useTracking();
+
+  const integrationAnalyticsContextValue = useMemo(
+    () => ({
+      submitEvent: (pluginName) =>
+        trackEvent(PROJECT_SETTINGS_INTEGRATION.CLICK_SUBMIT_CONFIGURATION(pluginName)),
+      deleteConfirmEvent: (pluginName) =>
+        trackEvent(PROJECT_SETTINGS_INTEGRATION.CLICK_DELETE_CONFIRM(pluginName)),
+    }),
+    [trackEvent],
+  );
   const settingsExtensions = useSelector(uiExtensionIntegrationSettingsSelector);
   const { canUpdateSettings } = useUserPermissions();
   const globalIntegrations = useSelector(namedGlobalIntegrationsSelector);
@@ -299,6 +310,8 @@ export const IntegrationInfo = (props) => {
         id: 'deleteIntegrationModal',
         data: {
           onConfirm: resetProjectIntegrations,
+          onConfirmTrackEvent: () =>
+            trackEvent(PROJECT_SETTINGS_INTEGRATION.CLICK_RESET_CONFIRM(pluginName)),
           modalTitle: showOrganizationalIntegrations
             ? formatMessage(messages.resetIntegrationsToOrganizational)
             : formatMessage(messages.resetIntegrations),
@@ -309,7 +322,7 @@ export const IntegrationInfo = (props) => {
         },
       }),
     );
-    trackEvent(PROJECT_SETTINGS_INTEGRATION.CLICK_RESET_TO_GLOBAL_INTEGRATION);
+    trackEvent(PROJECT_SETTINGS_INTEGRATION.CLICK_RESET_TO_GLOBAL_INTEGRATION(pluginName));
   };
 
   const handleDocumentationClick = () => {
@@ -420,16 +433,18 @@ export const IntegrationInfo = (props) => {
             documentationLinkEvent={integrationDetailDocumentationLinkEvent}
           />
           <div className={cx('integration-settings-block')}>
-            <IntegrationSettingsComponent
-              data={updatedData}
-              onUpdate={onUpdate}
-              goToPreviousPage={goToPluginIntegrationList}
-              extension={integrationSettingsExtension}
-              withPreloader
-              silentOnError={false}
-              isGlobal={integrationInfo.isGlobal}
-              isOrganizational={integrationInfo.isOrganizational}
-            />
+            <IntegrationAnalyticsContext.Provider value={integrationAnalyticsContextValue}>
+              <IntegrationSettingsComponent
+                data={updatedData}
+                onUpdate={onUpdate}
+                goToPreviousPage={goToPluginIntegrationList}
+                extension={integrationSettingsExtension}
+                withPreloader
+                silentOnError={false}
+                isGlobal={integrationInfo.isGlobal}
+                isOrganizational={integrationInfo.isOrganizational}
+              />
+            </IntegrationAnalyticsContext.Provider>
           </div>
         </>
       )}