diff --git a/app/client/src/ce/sagas/analyticsSaga.ts b/app/client/src/ce/sagas/analyticsSaga.ts index 6cd7c5799da5..4807b6a4a821 100644 --- a/app/client/src/ce/sagas/analyticsSaga.ts +++ b/app/client/src/ce/sagas/analyticsSaga.ts @@ -4,14 +4,14 @@ import { call, select } from "redux-saga/effects"; import type { APP_MODE } from "entities/App"; import { getCurrentPageId } from "selectors/editorSelectors"; import type { TriggerMeta } from "ee/sagas/ActionExecution/ActionExecutionSagas"; -import { TriggerKind } from "constants/AppsmithActionConstants/ActionConstants"; import { isArray } from "lodash"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import { getAppMode } from "ee/selectors/entitiesSelector"; +import { getAllJSCollections, getAppMode } from "ee/selectors/entitiesSelector"; import type { AppState } from "ee/reducers"; import { getWidget } from "sagas/selectors"; import { getUserSource } from "ee/utils/AnalyticsUtil"; import { getCurrentApplication } from "ee/selectors/applicationSelectors"; +import type { JSCollectionData } from "ee/reducers/entityReducers/jsActionsReducer"; export interface UserAndAppDetails { pageId: string; @@ -58,8 +58,6 @@ export function* logDynamicTriggerExecution({ errors: unknown; triggerMeta: TriggerMeta; }) { - if (triggerMeta.triggerKind !== TriggerKind.EVENT_EXECUTION) return; - const isUnsuccessfulExecution = isArray(errors) && errors.length > 0; const { appId, @@ -75,6 +73,12 @@ export function* logDynamicTriggerExecution({ const widget: ReturnType | undefined = yield select( (state: AppState) => getWidget(state, triggerMeta.source?.id || ""), ); + const jsCollectionsData: JSCollectionData[] = + yield select(getAllJSCollections); + const jsCollectionData = (jsCollectionsData || []).find( + ({ config }) => config.id === triggerMeta?.source?.id || "", + ); + const jsCollection = jsCollectionData?.config; const dynamicPropertyPathList = widget?.dynamicPropertyPathList; const isJSToggled = !!dynamicPropertyPathList?.find( @@ -100,6 +104,7 @@ export function* logDynamicTriggerExecution({ propertyName: triggerMeta.triggerPropertyName, instanceId, isJSToggled, + isModuleInstance: Boolean(jsCollection?.moduleInstanceId), }); AnalyticsUtil.logEvent( @@ -125,6 +130,7 @@ export function* logDynamicTriggerExecution({ propertyName: triggerMeta.triggerPropertyName, instanceId, isJSToggled, + isModuleInstance: Boolean(jsCollection?.moduleInstanceId), }, ); }