Merge pull request #41077 from appsmithorg/release

03/07 Daily Promotion

Author: btsgh

app/client/cypress/support/Pages/AppSettings/AppSettings.ts

@@ -59,7 +59,7 @@ export class AppSettings {
       ".t--app-viewer-navigation-top-inline-more-dropdown-item",
     _scrollArrows: ".scroll-arrows",
     _getActivePage: (pageName: string) =>
-      `//span[contains(text(),"${pageName}")]//ancestor::a[contains(@class,'is-active')]`,
+      `//span[contains(text(),"${pageName}")]//ancestor::div[contains(@class,'is-active')]`,
     _importBtn: "[data-testid='t--app-setting-import-btn']",
   };
 

app/client/src/actions/pageActions.tsx

@@ -30,6 +30,7 @@ import type { PACKAGE_PULL_STATUS } from "ee/constants/ModuleConstants";
 import type { ApiResponse } from "api/ApiResponses";
 import type { EvaluationReduxAction } from "./EvaluationReduxActionTypes";
 import { appsmithTelemetry } from "instrumentation";
+import type { NavigateToAnotherPagePayload } from "sagas/ActionExecution/NavigateActionSaga/types";
 
 export interface FetchPageListPayload {
   applicationId: string;
@@ -696,3 +697,10 @@ export const setupPublishedPage = (
     pageWithMigratedDsl,
   },
 });
+
+export const navigateToAnotherPage = (
+  payload: NavigateToAnotherPagePayload,
+) => ({
+  type: ReduxActionTypes.NAVIGATE_TO_ANOTHER_PAGE,
+  payload,
+});

app/client/src/ce/constants/ReduxActionConstants.tsx

@@ -620,6 +620,7 @@ const PageActionTypes = {
   RESET_PAGE_LIST: "RESET_PAGE_LIST",
   SET_ONLOAD_ACTION_EXECUTED: "SET_ONLOAD_ACTION_EXECUTED",
   EXECUTE_REACTIVE_QUERIES: "EXECUTE_REACTIVE_QUERIES",
+  NAVIGATE_TO_ANOTHER_PAGE: "NAVIGATE_TO_ANOTHER_PAGE",
 };
 
 const PageActionErrorTypes = {
@@ -731,6 +732,9 @@ const ActionExecutionTypes = {
   CANCEL_ACTION_MODAL: "CANCEL_ACTION_MODAL",
   CONFIRM_ACTION_MODAL: "CONFIRM_ACTION_MODAL",
   EXECUTE_PAGE_LOAD_ACTIONS: "EXECUTE_PAGE_LOAD_ACTIONS",
+  EXECUTE_PAGE_UNLOAD_ACTIONS: "EXECUTE_PAGE_UNLOAD_ACTIONS",
+  EXECUTE_PAGE_UNLOAD_ACTIONS_SUCCESS: "EXECUTE_PAGE_UNLOAD_ACTIONS_SUCCESS",
+  EXECUTE_PAGE_UNLOAD_ACTIONS_ERROR: "EXECUTE_PAGE_UNLOAD_ACTIONS_ERROR",
   EXECUTE_PLUGIN_ACTION_REQUEST: "EXECUTE_PLUGIN_ACTION_REQUEST",
   EXECUTE_PLUGIN_ACTION_SUCCESS: "EXECUTE_PLUGIN_ACTION_SUCCESS",
   SET_ACTION_RESPONSE_DISPLAY_FORMAT: "SET_ACTION_RESPONSE_DISPLAY_FORMAT",

app/client/src/ce/entities/FeatureFlag.ts

@@ -62,6 +62,8 @@ export const FEATURE_FLAG = {
   license_ai_agent_instance_enabled: "license_ai_agent_instance_enabled",
   release_jsobjects_onpageunloadactions_enabled:
     "release_jsobjects_onpageunloadactions_enabled",
+  configure_block_event_tracking_for_anonymous_users:
+    "configure_block_event_tracking_for_anonymous_users",
 } as const;
 
 export type FeatureFlag = keyof typeof FEATURE_FLAG;
@@ -113,6 +115,7 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   release_reactive_actions_enabled: false,
   license_ai_agent_instance_enabled: false,
   release_jsobjects_onpageunloadactions_enabled: false,
+  configure_block_event_tracking_for_anonymous_users: false,
 };
 
 export const AB_TESTING_EVENT_KEYS = {

app/client/src/ce/sagas/userSagas.tsx

@@ -7,6 +7,7 @@ import {
   take,
   type TakeEffect,
 } from "redux-saga/effects";
+import type { SagaIterator } from "redux-saga";
 import type {
   ReduxAction,
   ReduxActionWithPromise,
@@ -88,6 +89,7 @@ import {
   segmentInitUncertain,
 } from "actions/analyticsActions";
 import { getSegmentState } from "selectors/analyticsSelectors";
+import { getOrganizationConfig } from "ee/selectors/organizationSelectors";
 
 export function* getCurrentUserSaga(action?: {
   payload?: { userProfile?: ApiResponse };
@@ -150,7 +152,28 @@ function* getSessionRecordingConfig() {
   };
 }
 
-function* initTrackers(currentUser: User) {
+function shouldTrackUser(
+  currentUser: User,
+  licenseActive: boolean,
+  featureFlag: boolean,
+): boolean {
+  try {
+    const isAnonymous =
+      currentUser?.isAnonymous || currentUser?.username === "anonymousUser";
+
+    if (!isAnonymous) {
+      return true;
+    }
+
+    const telemetryOn = currentUser?.enableTelemetry ?? false;
+
+    return isAnonymous && (licenseActive || (telemetryOn && !featureFlag));
+  } catch (error) {
+    return true;
+  }
+}
+
+function* initTrackers(currentUser: User): SagaIterator {
   try {
     const isFFFetched: boolean = yield select(getFeatureFlagsFetched);
 
@@ -162,7 +185,21 @@ function* initTrackers(currentUser: User) {
       getSessionRecordingConfig,
     );
 
-    yield call(AnalyticsUtil.initialize, currentUser, sessionRecordingConfig);
+    const featureFlags: FeatureFlags = yield select(selectFeatureFlags);
+    const organizationConfig = yield select(getOrganizationConfig);
+
+    const shouldTrack = shouldTrackUser(
+      currentUser,
+      organizationConfig.license.active,
+      featureFlags.configure_block_event_tracking_for_anonymous_users,
+    );
+
+    yield call(
+      AnalyticsUtil.initialize,
+      currentUser,
+      sessionRecordingConfig,
+      shouldTrack,
+    );
     yield put(segmentInitSuccess());
   } catch (e) {
     log.error(e);

app/client/src/ce/utils/AnalyticsUtil.tsx

@@ -30,13 +30,14 @@ let segmentAnalytics: SegmentSingleton | null = null;
 async function initialize(
   user: User,
   sessionRecordingConfig: SessionRecordingConfig,
+  shouldTrackUser: boolean,
 ) {
   // SentryUtil.init();
   await SmartlookUtil.init();
 
   segmentAnalytics = SegmentSingleton.getInstance();
 
-  await segmentAnalytics.init();
+  await segmentAnalytics.init(shouldTrackUser);
 
   // Mixpanel needs to be initialized after Segment
   await MixpanelSingleton.getInstance().init(sessionRecordingConfig);

app/client/src/entities/Action/index.ts

@@ -39,6 +39,7 @@ export enum ActionExecutionContext {
   PAGE_LOAD = "PAGE_LOAD",
   EVALUATION_ACTION_TRIGGER = "EVALUATION_ACTION_TRIGGER",
   REFRESH_ACTIONS_ON_ENV_CHANGE = "REFRESH_ACTIONS_ON_ENV_CHANGE",
+  PAGE_UNLOAD = "PAGE_UNLOAD",
 }
 
 export interface KeyValuePair {

app/client/src/pages/AppViewer/Navigation/components/MenuItem.styled.tsx

@@ -5,10 +5,9 @@ import {
   getMenuItemBackgroundColorWhenActive,
   getMenuItemTextColor,
 } from "pages/AppViewer/utils";
-import { NavLink } from "react-router-dom";
 import styled from "styled-components";
 
-export const StyledMenuItem = styled(NavLink)<{
+export const StyledMenuItem = styled.div<{
   borderRadius: string;
   primaryColor: string;
   navColorStyle: NavigationSetting["colorStyle"];