Merge branch 'master' into production

requestly · May 21, 2024 · 6ba3116 · 6ba3116
2 parents 85161fa + 8be50b1
commit 6ba3116
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/app/src/components/misc/PersonaSurvey/utils.ts b/app/src/components/misc/PersonaSurvey/utils.ts
@@ -12,6 +12,7 @@ const OldSurveyPageMap = {
  2: SurveyPage.RECOMMENDATIONS,
 };
 
+// duplicate of the function in app/src/features/onboarding/utils.ts
 export const shouldShowOnboarding = async (appMode: string) => {
  if (
  window.location.href.includes(PATHS.AUTH.DEKSTOP_SIGN_IN.RELATIVE) ||

diff --git a/app/src/features/onboarding/utils.ts b/app/src/features/onboarding/utils.ts
@@ -1,7 +1,9 @@
 import PATHS from "config/constants/sub/paths";
+import { isAutomationEnabled } from "utils/EnvUtils";
 
 export const shouldShowOnboarding = () => {
  if (
+ isAutomationEnabled() ||
  window.location.href.includes(PATHS.AUTH.SIGN_IN.RELATIVE) ||
  window.location.href.includes(PATHS.AUTH.SIGN_UP.RELATIVE) ||
  window.location.href.includes(PATHS.AUTH.DEKSTOP_SIGN_IN.RELATIVE) ||

diff --git a/app/src/modules/analytics/index.js b/app/src/modules/analytics/index.js
@@ -3,6 +3,7 @@ import { SYNCING } from "./events/features/constants";
 import Logger from "lib/logger";
 import posthogIntegration from "./integrations/posthog";
 import localIntegration from "./integrations/local";
+import { isAutomationEnabled } from "utils/EnvUtils";
 
 // These are mostly not user-triggered
 const BLACKLISTED_EVENTS = [
@@ -23,7 +24,7 @@ export const trackEvent = (name, params, config) => {
  const newParams = { ...params };
  newParams.rq_app_mode = app_mode;
  newParams.rq_app_version = app_version;
- newParams.automation_enabled = window.navigator.webdriver === true;
+ newParams.automation_enabled = isAutomationEnabled();
  newParams.workspace = window.currentlyActiveWorkspaceTeamId ? "team" : "personal";
  newParams.workspaceId = window.currentlyActiveWorkspaceTeamId ? window.currentlyActiveWorkspaceTeamId : null;
  newParams.workspaceMembersCount = window.workspaceMembersCount ?? null;

diff --git a/app/src/utils/EnvUtils.js b/app/src/utils/EnvUtils.js
@@ -20,3 +20,7 @@ export const isEnvBeta = () => {
 export const isEnvDevWithBeta = () => {
  return process.env.NODE_ENV === "development" && !isEnvEmulator();
 };
+
+export const isAutomationEnabled = () => {
+ return window.navigator.webdriver === true;
+};