diff --git a/app/client/src/AppErrorBoundry.tsx b/app/client/src/AppErrorBoundry.tsx index 45ce37dbd1..c195bc8c5e 100644 --- a/app/client/src/AppErrorBoundry.tsx +++ b/app/client/src/AppErrorBoundry.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import AppCrashImage from "assets/images/404-image.png"; import * as Sentry from "@sentry/react"; import log from "loglevel"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Button } from "design-system"; const Wrapper = styled.div` diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx index 6c7a7e63ed..71037cc7ca 100644 --- a/app/client/src/actions/pageActions.tsx +++ b/app/client/src/actions/pageActions.tsx @@ -12,7 +12,7 @@ import { ReplayReduxActionTypes, } from "@appsmith/constants/ReduxActionConstants"; import type { DynamicPath } from "utils/DynamicBindingUtils"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { WidgetOperation } from "widgets/BaseWidget"; import type { FetchPageRequest, diff --git a/app/client/src/ce/api/ApiUtils.ts b/app/client/src/ce/api/ApiUtils.ts index 46586826f9..b7e139a6db 100644 --- a/app/client/src/ce/api/ApiUtils.ts +++ b/app/client/src/ce/api/ApiUtils.ts @@ -21,7 +21,7 @@ import { AUTH_LOGIN_URL } from "constants/routes"; import { getCurrentGitBranch } from "selectors/gitSyncSelectors"; import getQueryParamsObject from "utils/getQueryParamsObject"; import { UserCancelledActionExecutionError } from "sagas/ActionExecution/errorUtils"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getAppsmithConfigs } from "@appsmith/configs"; import * as Sentry from "@sentry/react"; import { CONTENT_TYPE_HEADER_KEY } from "constants/ApiEditorConstants/CommonApiConstants"; diff --git a/app/client/src/ce/hooks/datasourceEditorHooks.tsx b/app/client/src/ce/hooks/datasourceEditorHooks.tsx index 7b754d869c..b2795eb614 100644 --- a/app/client/src/ce/hooks/datasourceEditorHooks.tsx +++ b/app/client/src/ce/hooks/datasourceEditorHooks.tsx @@ -9,7 +9,7 @@ import { GENERATE_NEW_PAGE_BUTTON_TEXT, createMessage, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import history from "utils/history"; import { generateTemplateFormURL } from "@appsmith/RouteBuilder"; import { diff --git a/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx b/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx index 77304e7609..b557f5b90e 100644 --- a/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx +++ b/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx @@ -33,7 +33,7 @@ import { templatesCountSelector, } from "selectors/templatesSelectors"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { StartWithTemplatesHeader } from "../StartWithTemplatesWrapper"; interface CreateNewAppFromTemplatesModalProps { diff --git a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx index 7599c32c27..34a34dc3ad 100644 --- a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx +++ b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx @@ -18,7 +18,7 @@ import { getApplicationsOfWorkspace } from "@appsmith/selectors/selectedWorkspac import { default as React, useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import history from "utils/history"; import { builderURL } from "@appsmith/RouteBuilder"; import { getDatasource, getPlugin } from "@appsmith/selectors/entitiesSelector"; diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx index 4c60950206..56dd724ed0 100644 --- a/app/client/src/ce/pages/Applications/index.tsx +++ b/app/client/src/ce/pages/Applications/index.tsx @@ -122,7 +122,7 @@ import SharedUserList from "pages/common/SharedUserList"; import GitSyncModal from "pages/Editor/gitSync/GitSyncModal"; import ReconnectDatasourceModal from "pages/Editor/gitSync/ReconnectDatasourceModal"; import RepoLimitExceededErrorModal from "pages/Editor/gitSync/RepoLimitExceededErrorModal"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useIsMobileDevice } from "utils/hooks/useDeviceDetect"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import CreateNewAppFromTemplatesWrapper from "./CreateNewAppFromTemplateModal/CreateNewAppFromTemplatesWrapper"; diff --git a/app/client/src/ce/pages/workspace/InviteUsersForm.tsx b/app/client/src/ce/pages/workspace/InviteUsersForm.tsx index 2b8ec4249d..a35f8e0671 100644 --- a/app/client/src/ce/pages/workspace/InviteUsersForm.tsx +++ b/app/client/src/ce/pages/workspace/InviteUsersForm.tsx @@ -26,7 +26,7 @@ import { CUSTOM_ROLE_TEXT, } from "@appsmith/constants/messages"; import { isEmail } from "utils/formhelpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { SelectOptionProps } from "design-system"; import { Callout, Checkbox } from "design-system"; import { diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx index a67f66f829..8f7697be74 100644 --- a/app/client/src/ce/sagas/ApplicationSagas.tsx +++ b/app/client/src/ce/sagas/ApplicationSagas.tsx @@ -57,7 +57,7 @@ import { updateApplicationThemeSettingAction, fetchAllApplicationsOfWorkspace, } from "@appsmith/actions/applicationActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { createMessage, ERROR_IMPORTING_APPLICATION_TO_WORKSPACE, diff --git a/app/client/src/ce/sagas/JSActionSagas.ts b/app/client/src/ce/sagas/JSActionSagas.ts index d247decfe1..18a5cc7772 100644 --- a/app/client/src/ce/sagas/JSActionSagas.ts +++ b/app/client/src/ce/sagas/JSActionSagas.ts @@ -59,7 +59,7 @@ import type { CreateJSCollectionRequest } from "@appsmith/api/JSActionAPI"; import * as log from "loglevel"; import { builderURL, jsCollectionIdURL } from "@appsmith/RouteBuilder"; import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { checkAndLogErrorsIfCyclicDependency, getFromServerWhenNoPrefetchedResult, diff --git a/app/client/src/ce/sagas/NavigationSagas.ts b/app/client/src/ce/sagas/NavigationSagas.ts index a7547c2304..17b898fef8 100644 --- a/app/client/src/ce/sagas/NavigationSagas.ts +++ b/app/client/src/ce/sagas/NavigationSagas.ts @@ -2,7 +2,7 @@ import { fork, put, select, call } from "redux-saga/effects"; import type { RouteChangeActionPayload } from "actions/focusHistoryActions"; import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity"; import log from "loglevel"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getRecentEntityIds } from "selectors/globalSearchSelectors"; import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants"; import { getCurrentThemeDetails } from "selectors/themeSelectors"; diff --git a/app/client/src/ce/sagas/PageSagas.tsx b/app/client/src/ce/sagas/PageSagas.tsx index 28896754fe..6e82fc8cfc 100644 --- a/app/client/src/ce/sagas/PageSagas.tsx +++ b/app/client/src/ce/sagas/PageSagas.tsx @@ -100,7 +100,7 @@ import log from "loglevel"; import { migrateIncorrectDynamicBindingPathLists } from "utils/migrations/IncorrectDynamicBindingPathLists"; import * as Sentry from "@sentry/react"; import { ERROR_CODES } from "@appsmith/constants/ApiConstants"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import DEFAULT_TEMPLATE from "templates/default"; import { getAppMode } from "@appsmith/selectors/applicationSelectors"; diff --git a/app/client/src/ce/sagas/SuperUserSagas.tsx b/app/client/src/ce/sagas/SuperUserSagas.tsx index 0ef6294012..303b4a7170 100644 --- a/app/client/src/ce/sagas/SuperUserSagas.tsx +++ b/app/client/src/ce/sagas/SuperUserSagas.tsx @@ -24,7 +24,7 @@ import { getCurrentUser } from "selectors/usersSelectors"; import { EMAIL_SETUP_DOC } from "constants/ThirdPartyConstants"; import { getCurrentTenant } from "@appsmith/actions/tenantActions"; import { toast } from "design-system"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { MIGRATION_STATUS, RESTART_POLL_INTERVAL, diff --git a/app/client/src/ce/sagas/analyticsSaga.ts b/app/client/src/ce/sagas/analyticsSaga.ts index e2bbbcb537..cba8509da8 100644 --- a/app/client/src/ce/sagas/analyticsSaga.ts +++ b/app/client/src/ce/sagas/analyticsSaga.ts @@ -1,6 +1,5 @@ import { getCurrentUser } from "selectors/usersSelectors"; import { getInstanceId } from "@appsmith/selectors/tenantSelectors"; -import { getAppsmithConfigs } from "@appsmith/configs"; import { call, select } from "redux-saga/effects"; import type { APP_MODE } from "entities/App"; import { @@ -10,16 +9,11 @@ import { import type { TriggerMeta } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas"; import { TriggerKind } from "constants/AppsmithActionConstants/ActionConstants"; import { isArray } from "lodash"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getAppMode } from "@appsmith/selectors/entitiesSelector"; import type { AppState } from "@appsmith/reducers"; import { getWidget } from "sagas/selectors"; - -export function getUserSource() { - const { cloudHosting } = getAppsmithConfigs(); - const source = cloudHosting ? "cloud" : "ce"; - return source; -} +import { getUserSource } from "@appsmith/utils/AnalyticsUtil"; export interface UserAndAppDetails { pageId: string; diff --git a/app/client/src/ce/sagas/tenantSagas.tsx b/app/client/src/ce/sagas/tenantSagas.tsx index 9bf9969bd0..626e5de72f 100644 --- a/app/client/src/ce/sagas/tenantSagas.tsx +++ b/app/client/src/ce/sagas/tenantSagas.tsx @@ -12,7 +12,7 @@ import { safeCrashAppRequest } from "actions/errorActions"; import { ERROR_CODES } from "@appsmith/constants/ApiConstants"; import { defaultBrandingConfig as CE_defaultBrandingConfig } from "@appsmith/reducers/tenantReducer"; import { toast } from "design-system"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getFromServerWhenNoPrefetchedResult } from "sagas/helper"; // On CE we don't expose tenant config so this shouldn't make any API calls and should just return necessary permissions for the user diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx index 0ce8d7d41a..216637e6c0 100644 --- a/app/client/src/ce/sagas/userSagas.tsx +++ b/app/client/src/ce/sagas/userSagas.tsx @@ -40,7 +40,7 @@ import { fetchProductAlertFailure, fetchFeatureFlagsInit, } from "actions/userActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { INVITE_USERS_TO_WORKSPACE_FORM } from "@appsmith/constants/forms"; import PerformanceTracker, { PerformanceTransactionName, diff --git a/app/client/src/ce/selectors/tenantSelectors.tsx b/app/client/src/ce/selectors/tenantSelectors.tsx index d74c446251..10d102d976 100644 --- a/app/client/src/ce/selectors/tenantSelectors.tsx +++ b/app/client/src/ce/selectors/tenantSelectors.tsx @@ -49,8 +49,11 @@ export const getIsFormLoginEnabled = (state: AppState): boolean => export const getInstanceId = (state: AppState): string => state.tenant?.instanceId; -// eslint-disable-next-line +// eslint-disable-next-line @typescript-eslint/no-unused-vars export const shouldShowLicenseBanner = (state: AppState) => false; export const getHideWatermark = (state: AppState): boolean => state.tenant?.tenantConfiguration?.hideWatermark; + +// eslint-disable-next-line @typescript-eslint/no-unused-vars +export const isFreePlan = (state: AppState) => true; diff --git a/app/client/src/utils/AnalyticsUtil.tsx b/app/client/src/ce/utils/AnalyticsUtil.tsx similarity index 94% rename from app/client/src/utils/AnalyticsUtil.tsx rename to app/client/src/ce/utils/AnalyticsUtil.tsx index 28823a1c99..0249c56dbc 100644 --- a/app/client/src/utils/AnalyticsUtil.tsx +++ b/app/client/src/ce/utils/AnalyticsUtil.tsx @@ -8,6 +8,11 @@ import { ANONYMOUS_USERNAME } from "constants/userConstants"; import { sha256 } from "js-sha256"; import type { EventName } from "@appsmith/utils/analyticsUtilTypes"; +export function getUserSource() { + const { cloudHosting, segment } = getAppsmithConfigs(); + const source = cloudHosting || segment.apiKey ? "cloud" : "ce"; + return source; +} declare global { interface Window { // Zipy is added via script tags in index.html @@ -18,7 +23,7 @@ declare global { } } -const parentContextTypeTokens = ["pkg", "workflow"]; +export const parentContextTypeTokens = ["pkg", "workflow"]; /** * Function to check the current URL and return the parent context. @@ -27,7 +32,7 @@ const parentContextTypeTokens = ["pkg", "workflow"]; * @param location current location object based on URL * @returns object {id, type} where type is either pkg or workflow and id is the id of the pkg or workflow */ -function getParentContextFromURL(location: Location) { +export function getParentContextFromURL(location: Location) { const pathSplit = location.pathname.split("/"); let type = parentContextTypeTokens[0]; const editorIndex = pathSplit.findIndex((path) => @@ -42,7 +47,7 @@ function getParentContextFromURL(location: Location) { } } -function getApplicationId(location: Location) { +export function getApplicationId(location: Location) { const pathSplit = location.pathname.split("/"); const applicationsIndex = pathSplit.findIndex( (path) => path === "applications", @@ -170,13 +175,13 @@ class AnalyticsUtil { const appId = getApplicationId(windowDoc.location); const { appVersion, segment } = getAppsmithConfigs(); if (userData) { + const source = getUserSource(); let user: any = {}; if (segment.apiKey) { user = { userId: userData.username, email: userData.email, appId, - source: "cloud", }; } else { const userId = userData.username; @@ -186,12 +191,12 @@ class AnalyticsUtil { } user = { userId: AnalyticsUtil.cachedAnonymoustId, - source: "ce", }; } finalEventData = { ...eventData, - userData: user.userId === ANONYMOUS_USERNAME ? undefined : user, + userData: + user.userId === ANONYMOUS_USERNAME ? undefined : { ...user, source }, }; } finalEventData = { @@ -214,13 +219,14 @@ class AnalyticsUtil { const windowDoc: any = window; const userId = userData.username; if (windowDoc.analytics) { + const source = getUserSource(); // This flag is only set on Appsmith Cloud. In this case, we get more detailed analytics of the user if (segment.apiKey) { const userProperties = { + userId: userId, + source, email: userData.email, name: userData.name, - userId: userId, - source: "cloud", emailVerified: userData.emailVerified, }; AnalyticsUtil.user = userData; @@ -234,7 +240,7 @@ class AnalyticsUtil { } const userProperties = { userId: AnalyticsUtil.cachedAnonymoustId, - source: "ce", + source, ...(sendAdditionalData ? { id: AnalyticsUtil.cachedAnonymoustId, diff --git a/app/client/src/components/BottomBar/ManualUpgrades.tsx b/app/client/src/components/BottomBar/ManualUpgrades.tsx index d9a26823fd..90d04be592 100644 --- a/app/client/src/components/BottomBar/ManualUpgrades.tsx +++ b/app/client/src/components/BottomBar/ManualUpgrades.tsx @@ -25,7 +25,7 @@ import { import styled from "styled-components"; import { createMessage, CLEAN_URL_UPDATE } from "@appsmith/constants/messages"; import { useLocation } from "react-router"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import classNames from "classnames"; const StyledList = styled.ul` diff --git a/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx b/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx index 96eefe33c8..1a54859547 100644 --- a/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx +++ b/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx @@ -5,7 +5,7 @@ import { useSelector, useDispatch } from "react-redux"; import { getIsGitConnected } from "selectors/gitSyncSelectors"; import { setIsGitSyncModalOpen } from "actions/gitSyncActions"; import { GitSyncModalTab } from "entities/GitSync"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { CONNECT_TO_GIT_OPTION, CURRENT_DEPLOY_PREVIEW_OPTION, diff --git a/app/client/src/components/editorComponents/ActionCreator/index.tsx b/app/client/src/components/editorComponents/ActionCreator/index.tsx index 351a60306b..e44b10de81 100644 --- a/app/client/src/components/editorComponents/ActionCreator/index.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/index.tsx @@ -12,7 +12,7 @@ import { useSelector } from "react-redux"; import { selectEvaluationVersion } from "@appsmith/selectors/applicationSelectors"; import { generateReactKey } from "../../../utils/generators"; import { useApisQueriesAndJsActionOptions } from "./helpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getActionTypeLabel } from "./viewComponents/ActionBlockTree/utils"; import { AppsmithFunction } from "./constants"; diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx index 4619233f24..9a8ed830be 100644 --- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx +++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx @@ -9,7 +9,7 @@ import type { TActionBlock, VariantType } from "../../types"; import { chainableFns } from "../../utils"; import ActionCard from "./ActionCard"; import ActionSelector from "./ActionSelector"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getActionTypeLabel } from "../ActionBlockTree/utils"; import classNames from "classnames"; import type { AdditionalDynamicDataTree } from "utils/autocomplete/customTreeTypeDefCreator"; diff --git a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx index c55de05104..1fb7927df0 100644 --- a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx +++ b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx @@ -3,7 +3,7 @@ import { Text, TextType } from "design-system-old"; import styled from "styled-components"; import LongArrowSVG from "assets/images/long-arrow-bottom.svg"; import { useEntityLink } from "../Debugger/hooks/debuggerHooks"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { createMessage, INCOMING_ENTITIES, diff --git a/app/client/src/components/editorComponents/ApiResponseView.tsx b/app/client/src/components/editorComponents/ApiResponseView.tsx index c1fff76120..0c3530f776 100644 --- a/app/client/src/components/editorComponents/ApiResponseView.tsx +++ b/app/client/src/components/editorComponents/ApiResponseView.tsx @@ -22,7 +22,7 @@ import NoResponseSVG from "assets/images/no-response.svg"; import DebuggerLogs from "./Debugger/DebuggerLogs"; import ErrorLogs from "./Debugger/Errors"; import Resizer, { ResizerCSS } from "./Debugger/Resizer"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Classes, TAB_MIN_HEIGHT, Text, TextType } from "design-system-old"; import { Button, Callout, Flex, SegmentedControl } from "design-system"; import type { BottomTab } from "./EntityBottomTabs"; diff --git a/app/client/src/components/editorComponents/CloseEditor.tsx b/app/client/src/components/editorComponents/CloseEditor.tsx index f2c4878d3d..6caf88de27 100644 --- a/app/client/src/components/editorComponents/CloseEditor.tsx +++ b/app/client/src/components/editorComponents/CloseEditor.tsx @@ -12,7 +12,7 @@ import { } from "@appsmith/RouteBuilder"; import { useSelector } from "react-redux"; import { getCurrentPageId } from "selectors/editorSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Link } from "design-system"; import styled from "styled-components"; import type { AppsmithLocationState } from "../../utils/history"; diff --git a/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/Analytics.ts b/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/Analytics.ts index bdba6b2c98..ca59286be3 100644 --- a/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/Analytics.ts +++ b/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/Analytics.ts @@ -1,5 +1,5 @@ import type { MouseEventHandler } from "react"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; export const objectCollapseAnalytics: MouseEventHandler = (ev) => { /* diff --git a/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts b/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts index 5df7b042a4..b0b8bf95fd 100644 --- a/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts +++ b/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts @@ -6,7 +6,7 @@ import type { import type { CommandsCompletion } from "utils/autocomplete/CodemirrorTernService"; import { generateQuickCommands } from "./generateQuickCommands"; import type { Datasource } from "entities/Datasource"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import log from "loglevel"; import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import { diff --git a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx index 2200ce1a92..45b07da3d4 100644 --- a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx @@ -12,7 +12,7 @@ import type { FeatureFlags } from "@appsmith/entities/FeatureFlag"; import { Button, Icon } from "design-system"; import { APPSMITH_AI } from "@appsmith/components/editorComponents/GPT/trigger"; import { DatasourceCreateEntryPoints } from "constants/Datasource"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import BetaCard from "../BetaCard"; import type { NavigationData } from "selectors/navigationSelectors"; import type { AIEditorContext } from "@appsmith/components/editorComponents/GPT"; diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx index 9e1a649a2d..d1bcd03655 100644 --- a/app/client/src/components/editorComponents/CodeEditor/index.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx @@ -37,7 +37,7 @@ import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import type { EvaluationSubstitutionType } from "@appsmith/entities/DataTree/types"; import type { DataTree } from "entities/DataTree/dataTreeTypes"; import { Skin } from "constants/DefaultTheme"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import "components/editorComponents/CodeEditor/sql/customMimes"; import "components/editorComponents/CodeEditor/modes"; import type { diff --git a/app/client/src/components/editorComponents/Debugger/ActionLink.tsx b/app/client/src/components/editorComponents/Debugger/ActionLink.tsx index 97e0d0b303..b72838423f 100644 --- a/app/client/src/components/editorComponents/Debugger/ActionLink.tsx +++ b/app/client/src/components/editorComponents/Debugger/ActionLink.tsx @@ -4,7 +4,7 @@ import React, { useCallback } from "react"; import { useDispatch, useSelector } from "react-redux"; import type { AppState } from "@appsmith/reducers"; import { getAction } from "@appsmith/selectors/entitiesSelector"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { navigateToEntity } from "actions/editorActions"; import { DebuggerEntityLink, type EntityLinkProps } from "./DebuggerEntityLink"; diff --git a/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx b/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx index 373df1ba1d..0973db9c1e 100644 --- a/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx +++ b/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx @@ -4,7 +4,7 @@ import type { Dispatch } from "redux"; import { useDispatch } from "react-redux"; import type { Message, SourceEntity } from "entities/AppsmithConsole"; import { PropertyEvaluationErrorType } from "utils/DynamicBindingUtils"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getAppsmithConfigs } from "@appsmith/configs"; import { createMessage, diff --git a/app/client/src/components/editorComponents/Debugger/DataSourceLink.tsx b/app/client/src/components/editorComponents/Debugger/DataSourceLink.tsx index 11761a696a..88892999fc 100644 --- a/app/client/src/components/editorComponents/Debugger/DataSourceLink.tsx +++ b/app/client/src/components/editorComponents/Debugger/DataSourceLink.tsx @@ -1,5 +1,5 @@ import React from "react"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { DebuggerEntityLink, type EntityLinkProps } from "./DebuggerEntityLink"; import { useSelector } from "react-redux"; import type { AppState } from "@appsmith/reducers"; diff --git a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx index 2a6448a727..6018efdeea 100644 --- a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx +++ b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import { setDebuggerSelectedTab, showDebugger } from "actions/debuggerActions"; import { useDispatch, useSelector } from "react-redux"; import { getAppMode } from "@appsmith/selectors/applicationSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getTypographyByKey } from "design-system-old"; import type { Message } from "entities/AppsmithConsole"; import ContextualMenu from "./ContextualMenu"; diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx index aa3f1f161f..e18a565cd7 100644 --- a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx +++ b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx @@ -21,7 +21,7 @@ import bootIntercom from "utils/bootIntercom"; import type { Theme } from "constants/DefaultTheme"; import { thinScrollbar } from "constants/DefaultTheme"; import type { IconName } from "@blueprintjs/core"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getDebuggerSelectedFilter } from "selectors/debuggerSelectors"; import { setDebuggerSelectedFilter } from "actions/debuggerActions"; diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx index 6ecf5f9fb0..4904540189 100644 --- a/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx +++ b/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx @@ -13,7 +13,7 @@ import { getErrorCount, getResponsePaneHeight, } from "selectors/debuggerSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import Errors from "./Errors"; import Resizer, { ResizerCSS } from "./Resizer"; import EntityDeps from "./EntityDependecies"; diff --git a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx index ea24274a3b..c5cd690430 100644 --- a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx +++ b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx @@ -15,7 +15,7 @@ import { } from "@appsmith/constants/messages"; import { getDependenciesFromInverseDependencies } from "./helpers"; import { useSelectedEntity, useEntityLink } from "./hooks/debuggerHooks"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { thinScrollbar } from "constants/DefaultTheme"; import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils"; import { useGetEntityInfo } from "./hooks/useGetEntityInfo"; diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx index aa592b728e..95e5ba1548 100644 --- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx +++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx @@ -11,7 +11,7 @@ import LogAdditionalInfo from "./components/LogAdditionalInfo"; import LogEntityLink from "./components/LogEntityLink"; import LogTimeStamp from "./components/LogTimeStamp"; import { getLogIcon } from "../helpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import moment from "moment"; import LogHelper from "./components/LogHelper"; import { toggleExpandErrorLogItem } from "actions/debuggerActions"; diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx index 8c1f6c9489..471213228b 100644 --- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx +++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx @@ -4,7 +4,7 @@ import type { SourceEntity } from "entities/AppsmithConsole"; import type LOG_TYPE from "entities/AppsmithConsole/logtype"; import React from "react"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import ContextualMenu from "../../ContextualMenu"; const ContextWrapper = styled.div` diff --git a/app/client/src/components/editorComponents/Debugger/JSCollectionLink.tsx b/app/client/src/components/editorComponents/Debugger/JSCollectionLink.tsx index 675a3d7e0a..b7f4d1db44 100644 --- a/app/client/src/components/editorComponents/Debugger/JSCollectionLink.tsx +++ b/app/client/src/components/editorComponents/Debugger/JSCollectionLink.tsx @@ -2,7 +2,7 @@ import React, { useDispatch } from "react-redux"; import { DebuggerEntityLink, type EntityLinkProps } from "./DebuggerEntityLink"; import { useCallback } from "react"; import { navigateToEntity } from "actions/editorActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils"; export default function JSCollectionLink(props: EntityLinkProps) { diff --git a/app/client/src/components/editorComponents/Debugger/WidgetLink.tsx b/app/client/src/components/editorComponents/Debugger/WidgetLink.tsx index 90069d3911..696c2faa0d 100644 --- a/app/client/src/components/editorComponents/Debugger/WidgetLink.tsx +++ b/app/client/src/components/editorComponents/Debugger/WidgetLink.tsx @@ -1,7 +1,7 @@ import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils"; import React, { useCallback } from "react"; import { useDispatch } from "react-redux"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { navigateToEntity } from "actions/editorActions"; import { DebuggerEntityLink, type EntityLinkProps } from "./DebuggerEntityLink"; diff --git a/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts b/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts index f186805c33..4136d5c5d6 100644 --- a/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts +++ b/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts @@ -1,7 +1,7 @@ import { useLocation } from "react-router"; import { DEBUGGER_TAB_KEYS } from "../helpers"; import { setCanvasDebuggerState } from "actions/debuggerActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { FocusEntityInfo } from "navigation/FocusEntity"; import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity"; import { setJsPaneDebuggerState } from "actions/jsPaneActions"; diff --git a/app/client/src/components/editorComponents/EntityBottomTabs.tsx b/app/client/src/components/editorComponents/EntityBottomTabs.tsx index 28c16a544c..cd6e69463d 100644 --- a/app/client/src/components/editorComponents/EntityBottomTabs.tsx +++ b/app/client/src/components/editorComponents/EntityBottomTabs.tsx @@ -1,6 +1,6 @@ import React from "react"; import type { CollapsibleTabProps } from "design-system-old"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers"; import { Tab, TabPanel, Tabs, TabsList } from "design-system"; import styled from "styled-components"; diff --git a/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx b/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx index c2bc512f7c..b36633c695 100644 --- a/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx +++ b/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx @@ -25,7 +25,7 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { SIDEBAR_ID } from "constants/Explorer"; import styled from "styled-components"; import moment from "moment"; -import AnalyticsUtil from "../../utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const StyledResizer = styled.div<{ resizing: boolean }>` ${(props) => diff --git a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx index 8003aff778..37b3b6b10f 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx @@ -5,7 +5,7 @@ import { getTypographyByKey, Text, TextType } from "design-system-old"; import { Icon } from "design-system"; import { setGlobalSearchCategory } from "actions/globalSearchActions"; import { HELPBAR_PLACEHOLDER } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { modText } from "utils/helpers"; import { filterCategories, SEARCH_CATEGORY_ID } from "./utils"; import { protectedModeSelector } from "selectors/gitSyncSelectors"; diff --git a/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx b/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx index 0b8d491a2f..08916c0777 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import NoSearchDataImage from "assets/images/no_search_data.png"; import { NO_SEARCH_DATA_TEXT } from "@appsmith/constants/messages"; import { getTypographyByKey } from "design-system-old"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { isAirgapped } from "@appsmith/utils/airgapHelpers"; import { importSvg } from "design-system-old"; import { DISCORD_URL } from "constants/ThirdPartyConstants"; diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx index 829f118fbf..df30d1f9f5 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { ModalBody, ModalContent, Modal } from "design-system"; const StyledDocsSearchModal = styled(ModalContent)` diff --git a/app/client/src/components/editorComponents/GlobalSearch/index.tsx b/app/client/src/components/editorComponents/GlobalSearch/index.tsx index 092db01929..59281199cb 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/index.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/index.tsx @@ -42,7 +42,7 @@ import { import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers"; import type { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; import { getLastSelectedWidget } from "selectors/ui"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import useRecentEntities from "./useRecentEntities"; import { noop } from "lodash"; import { diff --git a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx index b56bc41074..b2651f0a63 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx @@ -24,7 +24,7 @@ import history from "utils/history"; import { curlImportPageURL } from "@appsmith/RouteBuilder"; import { isMacOrIOS, modText, shiftText } from "utils/helpers"; import { FocusEntity } from "navigation/FocusEntity"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Icon } from "design-system"; import type { ActionParentEntityTypeInterface } from "@appsmith/entities/Engine/actionHelpers"; import { diff --git a/app/client/src/components/editorComponents/NavBarItem.tsx b/app/client/src/components/editorComponents/NavBarItem.tsx index 02923c931b..677fc50c35 100644 --- a/app/client/src/components/editorComponents/NavBarItem.tsx +++ b/app/client/src/components/editorComponents/NavBarItem.tsx @@ -3,7 +3,7 @@ import React from "react"; import styled from "styled-components"; import { NavLink } from "react-router-dom"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Colors } from "constants/Colors"; interface MenuBarItemProps { diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/index.tsx index 468e77a19f..6f949c5823 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/index.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/index.tsx @@ -2,7 +2,7 @@ import React, { useContext, useEffect, useMemo } from "react"; import { useSelector } from "react-redux"; import { getPluginImages } from "@appsmith/selectors/entitiesSelector"; import { getisOneClickBindingConnectingForWidget } from "selectors/oneClickBindingSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getWidget } from "sagas/selectors"; import type { AppState } from "@appsmith/reducers"; import { diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx index 9844049330..9a4c2e1826 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx @@ -9,7 +9,7 @@ import { import WidgetFactory from "WidgetProvider/factory"; import { DatasourceImage, ImageWrapper } from "../../../styles"; import { getDatatype } from "utils/AppsmithUtils"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { DropdownOptionType } from "../../../types"; import type { WidgetProps } from "widgets/BaseWidget"; import { WidgetQueryGeneratorFormContext } from "components/editorComponents/WidgetQueryGeneratorForm"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx index a593b4960f..1c6efda1c7 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx @@ -18,7 +18,7 @@ import { fetchDatasourceStructure, fetchGheetSpreadsheets, } from "actions/datasourceActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { invert } from "lodash"; import { DatasourceCreateEntryPoints } from "constants/Datasource"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx index 28c4615b24..1cc9cb9fd1 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx @@ -3,7 +3,7 @@ import { Icon } from "design-system"; import history from "utils/history"; import { integrationEditorURL } from "@appsmith/RouteBuilder"; import { INTEGRATION_TABS } from "constants/routes"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { DatasourceCreateEntryPoints } from "constants/Datasource"; import { useParams } from "react-router"; import type { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/useTableOrSpreadsheet.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/useTableOrSpreadsheet.tsx index 7c312f9c5f..67ea4e2e68 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/useTableOrSpreadsheet.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/useTableOrSpreadsheet.tsx @@ -21,7 +21,7 @@ import type { AppState } from "@appsmith/reducers"; import { DropdownOption as Option } from "../DatasourceDropdown/DropdownOption"; import type { DropdownOptionType } from "../../types"; import { getisOneClickBindingConnectingForWidget } from "selectors/oneClickBindingSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getWidget } from "sagas/selectors"; import type { DatasourceStructure } from "entities/Datasource"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/useConnectData.ts b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/useConnectData.ts index a433adf739..171779b7f0 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/useConnectData.ts +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/useConnectData.ts @@ -3,7 +3,7 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { getWidget } from "sagas/selectors"; import { getPluginPackageFromDatasourceId } from "@appsmith/selectors/entitiesSelector"; import { getisOneClickBindingConnectingForWidget } from "selectors/oneClickBindingSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { isValidGsheetConfig } from "../utils"; import { useContext, useMemo } from "react"; import { WidgetQueryGeneratorFormContext } from "../index"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/useSheets.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/useSheets.tsx index 5683f860a2..628da67078 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/useSheets.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/useSheets.tsx @@ -12,7 +12,7 @@ import { } from "selectors/datasourceSelectors"; import { getDatasource } from "@appsmith/selectors/entitiesSelector"; import type { AppState } from "@appsmith/reducers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getWidget } from "sagas/selectors"; export function useSheets() { diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/useColumnDropdown.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/useColumnDropdown.tsx index af051218ad..baaaa4b8d2 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/useColumnDropdown.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/useColumnDropdown.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from "react"; import { PluginPackageName } from "entities/Action"; import { get, isArray } from "lodash"; import { ALLOWED_SEARCH_DATATYPE } from "pages/Editor/GeneratePage/components/constants"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { DropdownOption as Option } from "../../CommonControls/DatasourceDropdown/DropdownOption"; import type { DropdownOptionType } from "../../types"; diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx index 9ed0b7be41..b81e758cfd 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx @@ -24,7 +24,7 @@ import { } from "@appsmith/constants/messages"; import type { AppState } from "@appsmith/reducers"; import { getWidget } from "sagas/selectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; export interface OneClickDropdownFieldProps { label: string; diff --git a/app/client/src/components/featureWalkthrough/index.tsx b/app/client/src/components/featureWalkthrough/index.tsx index 9dd792b4a6..6a9cf7abd9 100644 --- a/app/client/src/components/featureWalkthrough/index.tsx +++ b/app/client/src/components/featureWalkthrough/index.tsx @@ -5,7 +5,7 @@ import WalkthroughContext from "./walkthroughContext"; import { createPortal } from "react-dom"; import { retryPromise } from "utils/AppsmithUtils"; import { useLocation } from "react-router-dom"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { isElementVisible } from "./utils"; import { hideIndicator } from "components/utils/Indicator"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; diff --git a/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx b/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx index 7d73a39513..c2151d5f94 100644 --- a/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx +++ b/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx @@ -10,7 +10,7 @@ import type { import WalkthroughContext, { isFeatureFooterDetails, } from "./walkthroughContext"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { showIndicator } from "components/utils/Indicator"; const CLIPID = "clip__feature"; diff --git a/app/client/src/components/formControls/MultiFilePickerControl.tsx b/app/client/src/components/formControls/MultiFilePickerControl.tsx index dc2b5fc2c1..a49dc2fd47 100644 --- a/app/client/src/components/formControls/MultiFilePickerControl.tsx +++ b/app/client/src/components/formControls/MultiFilePickerControl.tsx @@ -17,7 +17,7 @@ import { get, isArray } from "lodash"; import { formatFileSize } from "./utils"; import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors"; import { getPlugin } from "@appsmith/selectors/entitiesSelector"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const HiddenFileInput = styled.input` visibility: hidden; diff --git a/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx b/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx index 4a2e880251..6541e68c8d 100644 --- a/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx +++ b/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx @@ -9,7 +9,7 @@ import { CUSTOM_WIDGET_FEATURE, createMessage, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; interface ButtonControlState { showInput: boolean; diff --git a/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx b/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx index 9d8ae60f0b..504f711be4 100644 --- a/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx +++ b/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx @@ -10,7 +10,7 @@ import { } from "@appsmith/constants/messages"; import CustomWidgetBuilderService from "utils/CustomWidgetBuilderService"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { xor } from "lodash"; interface ButtonControlState { diff --git a/app/client/src/constants/DocumentationLinks.ts b/app/client/src/constants/DocumentationLinks.ts index f2de90e9e6..2f243dba14 100644 --- a/app/client/src/constants/DocumentationLinks.ts +++ b/app/client/src/constants/DocumentationLinks.ts @@ -1,4 +1,4 @@ -import AnalyticsUtil from "../utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; export enum DocsLink { CAPTURE_DATA = "CAPTURE_DATA", diff --git a/app/client/src/ee/utils/AnalyticsUtil.tsx b/app/client/src/ee/utils/AnalyticsUtil.tsx new file mode 100644 index 0000000000..46fb527986 --- /dev/null +++ b/app/client/src/ee/utils/AnalyticsUtil.tsx @@ -0,0 +1,3 @@ +export * from "ce/utils/AnalyticsUtil"; +import { default as CE_AnalyticsUtil } from "ce/utils/AnalyticsUtil"; +export default CE_AnalyticsUtil; diff --git a/app/client/src/entities/Engine/AppEditorEngine.ts b/app/client/src/entities/Engine/AppEditorEngine.ts index 9e16000bee..092f856a2c 100644 --- a/app/client/src/entities/Engine/AppEditorEngine.ts +++ b/app/client/src/entities/Engine/AppEditorEngine.ts @@ -32,7 +32,7 @@ import { } from "sagas/InitSagas"; import { getCurrentApplication } from "selectors/editorSelectors"; import { getCurrentGitBranch } from "selectors/gitSyncSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import history from "utils/history"; import PerformanceTracker, { PerformanceTransactionName, diff --git a/app/client/src/layoutSystems/anvil/utils/paste/utils.ts b/app/client/src/layoutSystems/anvil/utils/paste/utils.ts index 522c6eed03..dfeaa4278e 100644 --- a/app/client/src/layoutSystems/anvil/utils/paste/utils.ts +++ b/app/client/src/layoutSystems/anvil/utils/paste/utils.ts @@ -5,7 +5,7 @@ import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidg import { select } from "redux-saga/effects"; import { getNextWidgetName } from "sagas/WidgetOperationUtils"; import { getDataTree } from "selectors/dataTreeSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { generateReactKey } from "utils/generators"; import type { CopiedWidgetData } from "./types"; import type { LayoutProps, WidgetLayoutProps } from "../anvilTypes"; diff --git a/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/StarterBuildingBlocks.test.tsx b/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/StarterBuildingBlocks.test.tsx index 096f9a7fb9..8ed160f717 100644 --- a/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/StarterBuildingBlocks.test.tsx +++ b/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/StarterBuildingBlocks.test.tsx @@ -19,7 +19,7 @@ jest.mock("actions/templateActions", () => ({ importStarterBuildingBlockIntoApplication: jest.fn(), showTemplatesModal: jest.fn(), })); -jest.mock("utils/AnalyticsUtil", () => ({ +jest.mock("@appsmith/utils/AnalyticsUtil", () => ({ logEvent: jest.fn(), })); diff --git a/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/index.tsx b/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/index.tsx index d4ed73c3d4..5f64495d59 100644 --- a/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/index.tsx +++ b/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/index.tsx @@ -23,7 +23,7 @@ import { getCurrentApplicationId, } from "selectors/editorSelectors"; import { isImportingStarterBuildingBlockToAppSelector } from "selectors/templatesSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { IconContainer, TemplateLayoutContainer, diff --git a/app/client/src/layoutSystems/common/resizer/ModalResizableLayer.tsx b/app/client/src/layoutSystems/common/resizer/ModalResizableLayer.tsx index ad5b71af17..70826d2c76 100644 --- a/app/client/src/layoutSystems/common/resizer/ModalResizableLayer.tsx +++ b/app/client/src/layoutSystems/common/resizer/ModalResizableLayer.tsx @@ -2,7 +2,7 @@ import React, { useContext, useMemo } from "react"; import type { ReactNode } from "react"; import { get, omit } from "lodash"; import type { BaseWidgetProps } from "widgets/BaseWidgetHOC/withBaseWidgetHOC"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useWidgetDragResize } from "utils/hooks/dragResizeHooks"; import { useSelector } from "react-redux"; import type { AppState } from "@appsmith/reducers"; diff --git a/app/client/src/layoutSystems/common/resizer/ResizableComponent.tsx b/app/client/src/layoutSystems/common/resizer/ResizableComponent.tsx index 98571639de..86904b9d85 100644 --- a/app/client/src/layoutSystems/common/resizer/ResizableComponent.tsx +++ b/app/client/src/layoutSystems/common/resizer/ResizableComponent.tsx @@ -28,7 +28,7 @@ import { isMultiSelectedWidget, isWidgetSelected, } from "selectors/widgetSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { ResponsiveBehavior } from "layoutSystems/common/utils/constants"; import { getWidgetHeight, diff --git a/app/client/src/layoutSystems/common/widgetName/index.tsx b/app/client/src/layoutSystems/common/widgetName/index.tsx index 0b17fac744..0cc82b228a 100644 --- a/app/client/src/layoutSystems/common/widgetName/index.tsx +++ b/app/client/src/layoutSystems/common/widgetName/index.tsx @@ -14,7 +14,7 @@ import { } from "selectors/editorSelectors"; import { getIsTableFilterPaneVisible } from "selectors/tableFilterSelectors"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import PerformanceTracker, { PerformanceTransactionName, } from "utils/PerformanceTracker"; diff --git a/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightOverlayLayer.tsx b/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightOverlayLayer.tsx index 293c86bada..d923f934fd 100644 --- a/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightOverlayLayer.tsx +++ b/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightOverlayLayer.tsx @@ -3,7 +3,7 @@ import AutoHeightOverlayContainer from "layoutSystems/fixedlayout/common/autoHei import { EditorContext } from "components/editorComponents/EditorContextProvider"; import { GridDefaults } from "constants/WidgetConstants"; import React, { useContext } from "react"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { BaseWidgetProps } from "widgets/BaseWidgetHOC/withBaseWidgetHOC"; import { getWidgetMaxAutoHeight, diff --git a/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts b/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts index d84d375e4f..3ff1def523 100644 --- a/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts +++ b/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts @@ -19,7 +19,7 @@ import { useDispatch, useSelector } from "react-redux"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { EditorContext } from "components/editorComponents/EditorContextProvider"; import { useWidgetSelection } from "utils/hooks/useWidgetSelection"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { snapToGrid } from "utils/helpers"; import { stopReflowAction } from "actions/reflowActions"; import type { DragDetails } from "reducers/uiReducers/dragResizeReducer"; diff --git a/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx b/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx index 2506379e76..cfc62db4a9 100644 --- a/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx +++ b/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx @@ -13,7 +13,7 @@ import { } from "@appsmith/constants/messages"; import { Button, Callout, Divider, Icon, Text, Tooltip } from "design-system"; import { adminSettingsCategoryUrl } from "@appsmith/RouteBuilder"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import useOnUpgrade from "utils/hooks/useOnUpgrade"; import { RampFeature, RampSection } from "utils/ProductRamps/RampsControlList"; import EnterpriseTag from "components/EnterpriseTag"; diff --git a/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx b/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx index 6128a4e31c..46d520f935 100644 --- a/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx +++ b/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx @@ -26,7 +26,7 @@ import { ColorInput } from "pages/AdminSettings/FormGroup/ColorInput"; import { ImageInput } from "pages/AdminSettings/FormGroup/ImageInput"; import { logoImageValidator, faivconImageValidator } from "utils/BrandingUtils"; import { useBrandingForm } from "@appsmith/pages/AdminSettings/Branding/useBrandingForm"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import styled from "styled-components"; import { HelperText } from "pages/AdminSettings/components"; diff --git a/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx b/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx index 7a9cebe56b..0aee861f10 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx @@ -1,7 +1,7 @@ import React, { useMemo } from "react"; import styled from "styled-components"; import copy from "copy-to-clipboard"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Icon, Input, Text, toast, Tooltip } from "design-system"; export const BodyContainer = styled.div` diff --git a/app/client/src/pages/AdminSettings/LeftPane.tsx b/app/client/src/pages/AdminSettings/LeftPane.tsx index bf5e495694..fe901f7746 100644 --- a/app/client/src/pages/AdminSettings/LeftPane.tsx +++ b/app/client/src/pages/AdminSettings/LeftPane.tsx @@ -7,7 +7,7 @@ import { } from "@appsmith/pages/AdminSettings/config/types"; import { adminSettingsCategoryUrl } from "@appsmith/RouteBuilder"; import { useParams } from "react-router"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Link, Text } from "design-system"; import { useDispatch, useSelector } from "react-redux"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; diff --git a/app/client/src/pages/AdminSettings/SettingsForm.tsx b/app/client/src/pages/AdminSettings/SettingsForm.tsx index f224afe58f..550fa776c5 100644 --- a/app/client/src/pages/AdminSettings/SettingsForm.tsx +++ b/app/client/src/pages/AdminSettings/SettingsForm.tsx @@ -33,7 +33,7 @@ import { isTenantConfig, saveAllowed, } from "@appsmith/utils/adminSettingsHelpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Wrapper, BottomSpace, diff --git a/app/client/src/pages/AppViewer/AppPage.tsx b/app/client/src/pages/AppViewer/AppPage.tsx index 7771618103..5bcf6874e4 100644 --- a/app/client/src/pages/AppViewer/AppPage.tsx +++ b/app/client/src/pages/AppViewer/AppPage.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useMemo } from "react"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useDynamicAppLayout } from "utils/hooks/useDynamicAppLayout"; import type { CanvasWidgetStructure } from "WidgetProvider/constants"; import { useSelector } from "react-redux"; diff --git a/app/client/src/pages/AppViewer/Navigation/index.tsx b/app/client/src/pages/AppViewer/Navigation/index.tsx index 7baa04f897..1abfc39264 100644 --- a/app/client/src/pages/AppViewer/Navigation/index.tsx +++ b/app/client/src/pages/AppViewer/Navigation/index.tsx @@ -23,7 +23,7 @@ import Sidebar from "./Sidebar"; import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors"; import { useIsMobileDevice } from "utils/hooks/useDeviceDetect"; import { setAppViewHeaderHeight } from "actions/appViewActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; export function Navigation() { const { search } = useLocation(); diff --git a/app/client/src/pages/AppViewer/SideNavItem.tsx b/app/client/src/pages/AppViewer/SideNavItem.tsx index c880bdc17a..9f18de0862 100644 --- a/app/client/src/pages/AppViewer/SideNavItem.tsx +++ b/app/client/src/pages/AppViewer/SideNavItem.tsx @@ -3,7 +3,7 @@ import React from "react"; import styled from "styled-components"; import { NavLink, useRouteMatch } from "react-router-dom"; import { MenuItem, Classes } from "@blueprintjs/core"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const Content = styled.div<{ collapsed: boolean }>` display: flex; diff --git a/app/client/src/pages/Applications/loader.tsx b/app/client/src/pages/Applications/loader.tsx index 7401d62374..9a311c07a5 100644 --- a/app/client/src/pages/Applications/loader.tsx +++ b/app/client/src/pages/Applications/loader.tsx @@ -4,7 +4,7 @@ import { retryPromise } from "utils/AppsmithUtils"; import PerformanceTracker, { PerformanceTransactionName, } from "utils/PerformanceTracker"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { connect } from "react-redux"; import { showDebugger } from "actions/debuggerActions"; diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx index 430b2c28c1..16b85945bf 100644 --- a/app/client/src/pages/Editor/APIEditor/index.tsx +++ b/app/client/src/pages/Editor/APIEditor/index.tsx @@ -9,7 +9,7 @@ import { getPlugins, } from "@appsmith/selectors/entitiesSelector"; import { deleteAction, runAction } from "actions/pluginActionActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import Editor from "./Editor"; import BackToCanvas from "components/common/BackToCanvas"; import MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx index 5a0591087f..a3a73e7f85 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx @@ -19,7 +19,7 @@ import { PERMISSION_TYPE, } from "@appsmith/utils/permissionHelpers"; import MakeApplicationForkable from "./MakeApplicationForkable"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { getEmbedSnippetTab } from "@appsmith/utils/BusinessFeatures/privateEmbedHelpers"; diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts index 63f3007630..f49800737c 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts @@ -3,7 +3,7 @@ import type { StringsFromNavigationSetting, } from "constants/AppConstants"; import { keysOfNavigationSetting } from "constants/AppConstants"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { APP_NAVIGATION_SETTING, createMessage, diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx index 9983c7bc82..6174af0947 100644 --- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx +++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx @@ -29,7 +29,7 @@ import { Colors } from "constants/Colors"; import EmbedSettings from "./EmbedSettings"; import NavigationSettings from "./NavigationSettings"; import { updateAppSettingsPaneSelectedTabAction } from "actions/appSettingsPaneActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Divider } from "design-system"; import { ImportAppSettings } from "./ImportAppSettings"; import BetaCard from "components/editorComponents/BetaCard"; diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx index 70ba1d87a1..15c0c17879 100644 --- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx +++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx @@ -8,7 +8,7 @@ import React, { useEffect, useMemo, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { getCurrentApplication } from "selectors/editorSelectors"; import { getCurrentUser } from "selectors/usersSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { PublishPageAppSettingContainer, PublishPageBodyContainer, diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx index 8d7e0b22c5..d5ae0f46da 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx @@ -22,7 +22,7 @@ import { CUSTOM_WIDGET_FEATURE, createMessage, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const StyledButton = styled(Button)` height: 32px !important; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx index 92838e7d8b..96ba040b8e 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx @@ -7,7 +7,7 @@ import { CUSTOM_WIDGET_FEATURE, createMessage, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const StyledSegmentedControl = styled(SegmentedControl)` & .ads-v2-icon { diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx index 000b87c214..7bf196094b 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx @@ -6,7 +6,7 @@ import { CUSTOM_WIDGET_FEATURE, createMessage, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; export default function ReferenceTrigger() { const { isReferenceOpen, toggleReference, widgetId } = useContext( diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx index 8cbe5d6332..0dd95f6999 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx @@ -14,7 +14,7 @@ import { CUSTOM_WIDGET_FEATURE, createMessage, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const StyledLazyCodeEditorWrapper = styled.div` .CodeMirror-line.CodeMirror-line { diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx index 97d582351d..9df1c99b24 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx @@ -11,7 +11,7 @@ import { CUSTOM_WIDGET_FEATURE, createMessage, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const LOCAL_STORAGE_KEYS_IS_DEBUGGER_OPEN = "custom-widget-builder-context-state-is-debugger-open"; diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx index 1ea085b46a..65491c111d 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx @@ -16,7 +16,7 @@ import { type CustomWidgetBuilderContextType, } from "./types"; import { compileSrcDoc } from "./utility"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; let connectionTimeout: number; diff --git a/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx b/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx index 851ac0ac48..3855f2d644 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx @@ -2,7 +2,7 @@ import React from "react"; import styled from "styled-components"; import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil"; import { builderURL, generateTemplateFormURL } from "@appsmith/RouteBuilder"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useSelector } from "react-redux"; import { getCurrentPageId } from "selectors/editorSelectors"; import { Link } from "design-system"; diff --git a/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx b/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx index 3892634ca4..0d56f41db4 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx @@ -10,7 +10,7 @@ import { EDIT, createMessage, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useDispatch, useSelector } from "react-redux"; import { deleteDatasource } from "actions/datasourceActions"; import { debounce } from "lodash"; diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx index 58246322cb..017778aa2b 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx @@ -4,7 +4,7 @@ import { DATASOURCE_REST_API_FORM } from "@appsmith/constants/forms"; import type { Datasource } from "entities/Datasource"; import type { InjectedFormProps } from "redux-form"; import { getFormMeta, reduxForm } from "redux-form"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import FormControl from "pages/Editor/FormControl"; import { StyledInfo } from "components/formControls/InputTextControl"; import { connect } from "react-redux"; diff --git a/app/client/src/pages/Editor/DataSourceEditor/hooks.ts b/app/client/src/pages/Editor/DataSourceEditor/hooks.ts index c56d86da81..0fb97c8752 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/hooks.ts +++ b/app/client/src/pages/Editor/DataSourceEditor/hooks.ts @@ -1,7 +1,7 @@ import { executeDatasourceQuery } from "actions/datasourceActions"; import type { Datasource, QueryTemplate } from "entities/Datasource"; import { useCallback, useState } from "react"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useDispatch, useSelector } from "react-redux"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { PluginName } from "entities/Action"; diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx index 83479fc539..8115be6413 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx @@ -92,7 +92,7 @@ import type { CalloutKind } from "design-system"; import type { FeatureFlags } from "@appsmith/entities/FeatureFlag"; import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { setCurrentEditingEnvironmentID } from "@appsmith/actions/environmentAction"; import { getCurrentEnvironmentDetails } from "@appsmith/selectors/environmentSelectors"; import { isGACEnabled } from "@appsmith/utils/planHelpers"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceEntity.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceEntity.tsx index cc70e8f931..8c2ad916c3 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceEntity.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceEntity.tsx @@ -15,7 +15,7 @@ import { datasourcesEditorIdURL, saasEditorDatasourceIdURL, } from "@appsmith/RouteBuilder"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useLocation } from "react-router"; import omit from "lodash/omit"; import { getQueryParams } from "utils/URLUtils"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx index 057d4d7b00..1132b4ed70 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx @@ -13,7 +13,7 @@ import { getPagePermissions } from "selectors/editorSelectors"; import { Menu, MenuTrigger, Button, Tooltip, MenuContent } from "design-system"; import { SHOW_TEMPLATES, createMessage } from "@appsmith/constants/messages"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { Plugin } from "api/PluginApi"; import { omit } from "lodash"; import { Virtuoso } from "react-virtuoso"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx index e8cca7337c..67de9f4500 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx @@ -15,7 +15,7 @@ import { useDispatch, useSelector } from "react-redux"; import type { AppState } from "@appsmith/reducers"; import ItemLoadingIndicator from "./ItemLoadingIndicator"; import DatasourceStructureNotFound from "./DatasourceStructureNotFound"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { PluginName } from "entities/Action"; import { DatasourceStructureSearchContainer } from "./SchemaViewModeCSS"; import { refreshDatasourceStructure } from "actions/datasourceActions"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx index 7244cf92dc..dbc59c0565 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx @@ -4,7 +4,7 @@ import styled from "styled-components"; import { Text, Button } from "design-system"; import type { APIResponseError } from "api/ApiResponses"; import { EDIT_DATASOURCE, createMessage } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { DatasourceEditEntryPoints } from "constants/Datasource"; import history from "utils/history"; import { getQueryParams } from "utils/URLUtils"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx index e032630ff5..3f2e78e3a1 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx @@ -31,7 +31,7 @@ import type { import { DatasourceStructureContext } from "entities/Datasource"; import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors"; import type { AppState } from "@appsmith/reducers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { diff --git a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx index 20c8850faf..00c73c5b6b 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx @@ -21,7 +21,7 @@ import { DATASOURCE_GENERATE_PAGE_BUTTON, GSHEET_SEARCH_PLACEHOLDER, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors"; import type { AppState } from "@appsmith/reducers"; import { getDatasource } from "@appsmith/selectors/entitiesSelector"; diff --git a/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx b/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx index 9cbb29e781..693b7e7983 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx @@ -27,7 +27,7 @@ import { change, getFormValues } from "redux-form"; import { QUERY_EDITOR_FORM_NAME } from "@appsmith/constants/forms"; import { diff } from "deep-diff"; import { UndoRedoToastContext, showUndoRedoToast } from "utils/replayHelpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { FEATURE_WALKTHROUGH_KEYS } from "constants/WalkthroughConstants"; import { SUGGESTED_TAG, createMessage } from "@appsmith/constants/messages"; import { transformTextToSentenceCase } from "pages/Editor/utils"; diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx index b22b83010d..90ed664442 100644 --- a/app/client/src/pages/Editor/EditorHeader.tsx +++ b/app/client/src/pages/Editor/EditorHeader.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useEffect, useState } from "react"; import { ThemeProvider } from "styled-components"; import AppInviteUsersForm from "pages/workspace/AppInviteUsersForm"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getCurrentApplicationId, getCurrentPageId, diff --git a/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx b/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx index 66fa172c19..1a39c654b8 100644 --- a/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx +++ b/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx @@ -11,7 +11,7 @@ import { import type { noop } from "lodash"; import type { CommonComponentProps } from "design-system-old"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { MenuTypes } from "./types"; export interface MenuItemData { diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx index 7853565b7c..d837d29f40 100644 --- a/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx +++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx @@ -15,7 +15,7 @@ import type { Action, StoredDatasource } from "entities/Action"; import { PluginType } from "entities/Action"; import { keyBy } from "lodash"; import { getActionConfig } from "./helpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useLocation } from "react-router"; import type { Datasource } from "entities/Datasource"; import { diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx index bbbe840a79..195c5d078f 100644 --- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx +++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx @@ -30,7 +30,7 @@ import { } from "selectors/editorSelectors"; import { INTEGRATION_TABS } from "constants/routes"; import { Colors } from "constants/Colors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { STARTER_BUILDING_BLOCK_TEMPLATE_NAME } from "constants/TemplatesConstants"; import { useAppWideAndOtherDatasource } from "@appsmith/pages/Editor/Explorer/hooks"; diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx index 0f843ca526..be97ef96b3 100644 --- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx +++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx @@ -10,7 +10,7 @@ import type { AppState } from "@appsmith/reducers"; import classNames from "classnames"; import styled from "styled-components"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { EntityClassNames } from "."; import { Button } from "design-system"; import { getEntityProperties } from "@appsmith/pages/Editor/Explorer/Entity/getEntityProperties"; diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx index a9c11aa16b..cec5a80246 100644 --- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx +++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx @@ -13,7 +13,7 @@ import { EntityClassNames } from "."; import { Tooltip, Icon } from "design-system"; import { COPY_ELEMENT, createMessage } from "@appsmith/constants/messages"; import CollapseToggle from "./CollapseToggle"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { EntityProperty as EntityPropertyType } from "@appsmith/pages/Editor/Explorer/Entity/getEntityProperties"; const Wrapper = styled.div` diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx index c66d8caeed..a5d8592d14 100644 --- a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx +++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx @@ -23,7 +23,7 @@ import { import { fetchWorkspace } from "@appsmith/actions/workspaceActions"; import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors"; import { importSvg } from "design-system-old"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { EntityExplorerWrapper } from "./Common/EntityExplorerWrapper"; import { getCurrentApplicationId } from "selectors/editorSelectors"; import { FilesContextProvider } from "./Files/FilesContextProvider"; diff --git a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx index fa3ede47e0..b558c7611b 100644 --- a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx +++ b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx @@ -9,7 +9,7 @@ import type { JSCollection } from "entities/JSCollection"; import { JsFileIconV2 } from "../ExplorerIcons"; import type { PluginType } from "entities/Action"; import { jsCollectionIdURL } from "@appsmith/RouteBuilder"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useLocation } from "react-router"; import { getHasDeleteActionPermission, diff --git a/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx b/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx index 1d04e4aa93..0a28f79431 100644 --- a/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx +++ b/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx @@ -37,7 +37,7 @@ import type { AppState } from "@appsmith/reducers"; import { installLibraryInit } from "actions/JSLibraryActions"; import classNames from "classnames"; import type { JSLibrary } from "workers/common/JSLibrary"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { EntityClassNames } from "pages/Editor/Explorer/Entity"; const Wrapper = styled.div` diff --git a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx index fe65060e65..03d6a15731 100644 --- a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx @@ -16,7 +16,7 @@ import { CREATE_PAGE, GENERATE_PAGE_ACTION_TITLE, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { ButtonSizes } from "design-system"; import { Menu, diff --git a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx index 45ba4de068..c2c6fa847c 100644 --- a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from "react"; import React, { useCallback, useMemo, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { initExplorerEntityNameEdit } from "actions/explorerActions"; import { clonePageInit, diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx index e66d809e30..bd39c177a5 100644 --- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx +++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx @@ -9,7 +9,7 @@ import type { CanvasStructure } from "reducers/uiReducers/pageCanvasStructureRed import { getLastSelectedWidget, getSelectedWidgets } from "selectors/ui"; import { useNavigateToWidget } from "./useNavigateToWidget"; import WidgetIcon from "./WidgetIcon"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { builderURL } from "@appsmith/RouteBuilder"; import { useLocation } from "react-router"; import { getPagePermissions } from "selectors/editorSelectors"; diff --git a/app/client/src/pages/Editor/Explorer/index.tsx b/app/client/src/pages/Editor/Explorer/index.tsx index e184180d3a..ae9144d346 100644 --- a/app/client/src/pages/Editor/Explorer/index.tsx +++ b/app/client/src/pages/Editor/Explorer/index.tsx @@ -8,7 +8,7 @@ import type { AppState } from "@appsmith/reducers"; import { builderURL } from "@appsmith/RouteBuilder"; import { getCurrentPageId } from "selectors/editorSelectors"; import { getIsFirstTimeUserOnboardingEnabled } from "selectors/onboardingSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { trimQueryString } from "utils/helpers"; import history from "utils/history"; import EntityExplorer from "./EntityExplorer"; diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx index 61c4dfdf49..a02cb9b022 100644 --- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx +++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx @@ -26,7 +26,7 @@ import { isAirgapped } from "@appsmith/utils/airgapHelpers"; import { deleteCanvasCardsState } from "actions/editorActions"; import styled from "styled-components"; import { showAnonymousDataPopup } from "actions/onboardingActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const Wrapper = styled.div` margin: ${(props) => diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx index b133aa7723..00ec5c9082 100644 --- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx +++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx @@ -27,7 +27,7 @@ import { getSignpostingStepStateByStep, isWidgetActionConnectionPresent, } from "selectors/onboardingSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { forceOpenWidgetPanel } from "actions/widgetSidebarActions"; import { bindDataOnCanvas } from "actions/pluginActionActions"; import { diff --git a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx index fb9670a87e..83b8a8149d 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx @@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react"; import styled from "styled-components"; import { connect, useDispatch } from "react-redux"; import type { AppState } from "@appsmith/reducers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Button, Text, diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx index 12d2cda4c8..c43f0f508d 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx @@ -40,7 +40,7 @@ import { useSheetColumnHeaders, useS3BucketList, } from "./hooks"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { AppState } from "@appsmith/reducers"; import type { DropdownOptions, diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts index 14d4489460..f7753ff04b 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts +++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts @@ -9,7 +9,7 @@ import type { DropdownOption } from "design-system-old"; import { useDispatch, useSelector } from "react-redux"; import { PluginPackageName } from "entities/Action"; import { getCurrentEnvironmentId } from "@appsmith/selectors/environmentSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; export const FAKE_DATASOURCE_OPTION = { CONNECT_NEW_DATASOURCE_OPTION: { diff --git a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx index 1f5d31f31b..ce9557b9c9 100644 --- a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx +++ b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx @@ -16,7 +16,7 @@ import { setGlobalSearchCategory } from "actions/globalSearchActions"; import { getSelectedText, isMacOrIOS } from "utils/helpers"; import { getLastSelectedWidget, getSelectedWidgets } from "selectors/ui"; import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { WIDGETS_SEARCH_ID } from "constants/Explorer"; import { resetSnipingMode as resetSnipingModeAction } from "actions/propertyPaneActions"; diff --git a/app/client/src/pages/Editor/HelpButton.tsx b/app/client/src/pages/Editor/HelpButton.tsx index f1eaba5b8b..f0cdce0613 100644 --- a/app/client/src/pages/Editor/HelpButton.tsx +++ b/app/client/src/pages/Editor/HelpButton.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import { HELP_MODAL_WIDTH } from "constants/HelpConstants"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getCurrentUser } from "selectors/usersSelectors"; import { useDispatch, useSelector } from "react-redux"; import bootIntercom, { updateIntercomProperties } from "utils/bootIntercom"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx index 4e0bec6a99..ab11ffdb65 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx @@ -21,7 +21,7 @@ import { StyledEntity } from "pages/Editor/Explorer/Common/components"; import { toValidPageName } from "utils/helpers"; import { updatePage } from "actions/pageActions"; import { useGetPageFocusUrl } from "pages/Editor/IDE/hooks"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { toggleInOnboardingWidgetSelection } from "actions/onboardingActions"; import history, { NavigationMethod } from "utils/history"; diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx index 54e4bbc6e1..2a0eda156a 100644 --- a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx +++ b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx @@ -18,7 +18,7 @@ import styled from "styled-components"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { getIDEViewMode, getIsSideBySideEnabled } from "selectors/ideSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { setIdeEditorViewMode } from "actions/ideActions"; const Container = styled(Flex)` diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx index 7e9f96c929..fc5f292fd9 100644 --- a/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx +++ b/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx @@ -15,7 +15,7 @@ import { MINIMIZE_BUTTON_TOOLTIP, createMessage, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const FullScreenTabs = () => { const dispatch = useDispatch(); diff --git a/app/client/src/pages/Editor/IDE/Header/index.tsx b/app/client/src/pages/Editor/IDE/Header/index.tsx index 061783dd8f..8ec3fbddc9 100644 --- a/app/client/src/pages/Editor/IDE/Header/index.tsx +++ b/app/client/src/pages/Editor/IDE/Header/index.tsx @@ -66,7 +66,7 @@ import { protectedModeSelector, } from "selectors/gitSyncSelectors"; import { showConnectGitModal } from "actions/gitSyncActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { NavigationSetting } from "constants/AppConstants"; import { useHref } from "pages/Editor/utils"; import { viewerURL } from "@appsmith/RouteBuilder"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/AIDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/AIDataSources.tsx index 0400acea18..a54879b248 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/AIDataSources.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/AIDataSources.tsx @@ -4,7 +4,7 @@ import styled from "styled-components"; import { createTempDatasourceFromForm } from "actions/datasourceActions"; import type { AppState } from "@appsmith/reducers"; import type { Plugin } from "api/PluginApi"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { PluginType } from "entities/Action"; import { getAssetUrl } from "@appsmith/utils/airgapHelpers"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx index b63eaebf2f..eb28da0163 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx @@ -17,7 +17,7 @@ import { Button, MenuContent, MenuItem, MenuTrigger } from "design-system"; import { deleteDatasource } from "actions/datasourceActions"; import { getGenerateCRUDEnabledPluginMap } from "@appsmith/selectors/entitiesSelector"; import type { GenerateCRUDEnabledPluginMap, Plugin } from "api/PluginApi"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import NewActionButton from "../DataSourceEditor/NewActionButton"; import { datasourcesEditorIdURL, diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx index 868145b3ca..880cf92155 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx @@ -14,7 +14,7 @@ import { createTempDatasourceFromForm, } from "actions/datasourceActions"; import type { AppState } from "@appsmith/reducers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors"; import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants"; import { getQueryParams } from "utils/URLUtils"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx index 539699b380..7a21ca10da 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx @@ -28,7 +28,7 @@ import Debugger, { ResizerMainContainer, } from "../DataSourceEditor/Debugger"; import { showDebuggerFlag } from "selectors/debuggerSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { DatasourceCreateEntryPoints } from "constants/Datasource"; import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors"; import { isGACEnabled } from "@appsmith/utils/planHelpers"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx index ee89b54f22..472a6d00cb 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx @@ -7,7 +7,7 @@ import { addMockDatasourceToWorkspace } from "actions/datasourceActions"; import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors"; import { getQueryParams } from "utils/URLUtils"; import type { AppState } from "@appsmith/reducers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getAssetUrl } from "@appsmith/utils/airgapHelpers"; import { DatasourceCreateEntryPoints } from "constants/Datasource"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx index 3b8af46e69..dd1f1c83f7 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx @@ -9,7 +9,7 @@ import type { AppState } from "@appsmith/reducers"; import CurlLogo from "assets/images/Curl-logo.svg"; import PlusLogo from "assets/images/Plus-logo.svg"; import type { GenerateCRUDEnabledPluginMap, Plugin } from "api/PluginApi"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { CURL } from "constants/AppsmithActionConstants/ActionConstants"; import { PluginPackageName, PluginType } from "entities/Action"; import { getQueryParams } from "utils/URLUtils"; diff --git a/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx b/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx index 3f11764083..c085a3e4c9 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx @@ -9,7 +9,7 @@ import { ModalFooter, } from "design-system"; import { UNSUPPORTED_PLUGIN_DIALOG_MAIN_HEADING } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { UNSUPPORTED_PLUGIN_DIALOG_TITLE, UNSUPPORTED_PLUGIN_DIALOG_SUBTITLE, diff --git a/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx b/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx index d544768162..5e8a669c49 100644 --- a/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx +++ b/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx @@ -18,7 +18,7 @@ import { autoIndentCode, getAutoIndentShortcutKeyText, } from "components/editorComponents/CodeEditor/utils/autoIndentUtils"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { updateJSCollectionBody } from "actions/jsPaneActions"; import type { IconName } from "@blueprintjs/icons"; diff --git a/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx b/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx index 63ff46b820..f2f9d53385 100644 --- a/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx +++ b/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx @@ -7,7 +7,7 @@ import type { JSAction } from "entities/JSCollection"; import React, { useCallback, useState } from "react"; import styled from "styled-components"; import { CONFIRM_BEFORE_CALLING_HEADING, SETTINGS_HEADINGS } from "./constants"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Icon, Tooltip, Switch } from "design-system"; import RemoveConfirmationModal from "./RemoveConfirmBeforeCallingDialog"; diff --git a/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx b/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx index 38dd36c546..b84b07a55d 100644 --- a/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx +++ b/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx @@ -5,7 +5,7 @@ import styled from "styled-components"; import { useSelector } from "react-redux"; import { INTEGRATION_EDITOR_MODES, INTEGRATION_TABS } from "constants/routes"; import history from "utils/history"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { WidgetType } from "constants/WidgetConstants"; import { integrationEditorURL } from "@appsmith/RouteBuilder"; import { getCurrentPageId } from "selectors/editorSelectors"; diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx index a8cf1391d2..1fc0f6bc63 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx @@ -8,7 +8,7 @@ import { ToggleButton, Tooltip, Button } from "design-system"; import PropertyControlFactory from "utils/PropertyControlFactory"; import PropertyHelpLabel from "pages/Editor/PropertyPane/PropertyHelpLabel"; import { useDispatch, useSelector } from "react-redux"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { UpdateWidgetPropertyPayload } from "actions/controlActions"; import { batchUpdateMultipleWidgetProperties, diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx index 547fc556b2..c4338c91a1 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx @@ -18,7 +18,7 @@ import type { Log } from "entities/AppsmithConsole"; import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils"; import { DebugButton } from "components/editorComponents/Debugger/DebugCTA"; import { showDebugger } from "actions/debuggerActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { InteractionAnalyticsEventDetail } from "utils/AppsmithUtils"; import { interactionAnalyticsEvent, diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx index 9c186f8a64..b6868a7241 100644 --- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx +++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx @@ -21,7 +21,7 @@ import type { WidgetType } from "constants/WidgetConstants"; import { WIDGET_ID_SHOW_WALKTHROUGH } from "constants/WidgetConstants"; import type { InteractionAnalyticsEventDetail } from "utils/AppsmithUtils"; import { INTERACTION_ANALYTICS_EVENT } from "utils/AppsmithUtils"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { buildDeprecationWidgetMessage, isWidgetDeprecated } from "../utils"; import { Button, Callout } from "design-system"; import WidgetFactory from "WidgetProvider/factory"; diff --git a/app/client/src/pages/Editor/PropertyPane/propertyPaneSearch.ts b/app/client/src/pages/Editor/PropertyPane/propertyPaneSearch.ts index 3eee21c19e..9d72945aea 100644 --- a/app/client/src/pages/Editor/PropertyPane/propertyPaneSearch.ts +++ b/app/client/src/pages/Editor/PropertyPane/propertyPaneSearch.ts @@ -4,7 +4,7 @@ import type { PropertyPaneSectionConfig, } from "constants/PropertyControlConstants"; import { debounce } from "lodash"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; interface SearchResultType { section: { diff --git a/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx b/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx index 9f49a67960..69cdd04853 100644 --- a/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx +++ b/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx @@ -5,7 +5,7 @@ import { setGlobalSearchQuery, toggleShowGlobalSearchModal, } from "actions/globalSearchActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import WidgetFactory from "WidgetProvider/factory"; import { getSelectedWidget } from "sagas/selectors"; import { Icon } from "design-system"; diff --git a/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx b/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx index db8db78f0a..90d1b81a5a 100644 --- a/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx +++ b/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx @@ -28,7 +28,7 @@ import { getWidgets } from "sagas/selectors"; import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsStructureReducer"; import { WDS_V2_WIDGET_MAP } from "widgets/wds/constants"; import { getNextWidgetName } from "sagas/WidgetOperationUtils"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { addSuggestedWidget } from "actions/widgetActions"; import { getDataTree } from "selectors/dataTreeSelectors"; import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants"; diff --git a/app/client/src/pages/Editor/QueryEditor/Editor.tsx b/app/client/src/pages/Editor/QueryEditor/Editor.tsx index 7dab744921..05b4717b8a 100644 --- a/app/client/src/pages/Editor/QueryEditor/Editor.tsx +++ b/app/client/src/pages/Editor/QueryEditor/Editor.tsx @@ -33,7 +33,7 @@ import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper"; import PerformanceTracker, { PerformanceTransactionName, } from "utils/PerformanceTracker"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { initFormEvaluations } from "actions/evaluationActions"; import { getUIComponent } from "./helpers"; import type { Diff } from "deep-diff"; diff --git a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx b/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx index 6f692f14f6..18d851e80a 100644 --- a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx +++ b/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx @@ -16,7 +16,7 @@ import { JsonWrapper } from "components/editorComponents/Debugger/ErrorLogs/comp import { Callout, Flex, SegmentedControl } from "design-system"; import styled from "styled-components"; import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { setActionResponseDisplayFormat } from "actions/pluginActionActions"; import { getUpdateTimestamp } from "components/editorComponents/Debugger/ErrorLogs/ErrorLogItem"; import type { SourceEntity } from "entities/AppsmithConsole"; diff --git a/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx b/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx index 685b32817f..5954645aa8 100644 --- a/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx +++ b/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import { connect } from "react-redux"; import type { AppState } from "@appsmith/reducers"; import { getPluginTemplates } from "@appsmith/selectors/entitiesSelector"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const Container = styled.div` display: flex; diff --git a/app/client/src/pages/Editor/QueryEditor/index.tsx b/app/client/src/pages/Editor/QueryEditor/index.tsx index 54f39afd37..2569239180 100644 --- a/app/client/src/pages/Editor/QueryEditor/index.tsx +++ b/app/client/src/pages/Editor/QueryEditor/index.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from "react"; import { useDispatch, useSelector } from "react-redux"; import type { RouteComponentProps } from "react-router"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import Editor from "./Editor"; import history from "utils/history"; import MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu"; diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx index 0bd9f0b522..89d0996bbc 100644 --- a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx +++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx @@ -80,7 +80,7 @@ import DSDataFilter from "@appsmith/components/DSDataFilter"; import { DSEditorWrapper } from "../DataSourceEditor"; import type { DatasourceFilterState } from "../DataSourceEditor"; import { getQueryParams } from "utils/URLUtils"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getDefaultEnvironmentId } from "@appsmith/selectors/environmentSelectors"; import { DEFAULT_ENV_ID } from "@appsmith/api/ApiUtils"; import { diff --git a/app/client/src/pages/Editor/SaaSEditor/GoogleSheetFilePicker.tsx b/app/client/src/pages/Editor/SaaSEditor/GoogleSheetFilePicker.tsx index 94d23556f5..1bb68a828a 100644 --- a/app/client/src/pages/Editor/SaaSEditor/GoogleSheetFilePicker.tsx +++ b/app/client/src/pages/Editor/SaaSEditor/GoogleSheetFilePicker.tsx @@ -4,7 +4,7 @@ import { FilePickerActionStatus } from "entities/Datasource"; import { useDispatch } from "react-redux"; import { filePickerCallbackAction } from "actions/datasourceActions"; import { GOOGLE_SHEET_FILE_PICKER_OVERLAY_CLASS } from "constants/Datasource"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { createMessage, GOOGLE_SHEETS_FILE_PICKER_TITLE, diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx index 53e6e97e98..09c007f9bd 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx @@ -14,7 +14,7 @@ import { getAppThemingStack, } from "selectors/appThemingSelectors"; import type { AppTheme } from "entities/AppTheming"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import DeleteThemeModal from "./DeleteThemeModal"; import { getComplementaryGrayscaleColor } from "widgets/WidgetUtils"; import { getCurrentApplicationId } from "selectors/editorSelectors"; diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx index 635ddbcabc..4909c1d55c 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx @@ -16,7 +16,7 @@ import { } from "actions/appThemingActions"; import SettingSection from "./SettingSection"; import type { AppTheme } from "entities/AppTheming"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import ThemeFontControl from "./controls/ThemeFontControl"; import ThemeColorControl from "./controls/ThemeColorControl"; import { Classes as CsClasses } from "design-system-old"; diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/EmptyCanvasPrompts.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/EmptyCanvasPrompts.tsx index a489a079d1..71dfa584ba 100644 --- a/app/client/src/pages/Editor/WidgetsEditor/components/EmptyCanvasPrompts.tsx +++ b/app/client/src/pages/Editor/WidgetsEditor/components/EmptyCanvasPrompts.tsx @@ -6,7 +6,7 @@ import { selectURLSlugs, showCanvasTopSectionSelector, } from "selectors/editorSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import history from "utils/history"; import { generateTemplateFormURL } from "@appsmith/RouteBuilder"; import { useParams } from "react-router"; diff --git a/app/client/src/pages/Editor/WidgetsEditor/index.tsx b/app/client/src/pages/Editor/WidgetsEditor/index.tsx index 10030e8d6b..52c5728558 100644 --- a/app/client/src/pages/Editor/WidgetsEditor/index.tsx +++ b/app/client/src/pages/Editor/WidgetsEditor/index.tsx @@ -5,7 +5,7 @@ import { getCurrentPageId, getCurrentPageName, } from "selectors/editorSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import PerformanceTracker, { PerformanceTransactionName, } from "utils/PerformanceTracker"; diff --git a/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx b/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx index a2e5322e3e..d5c3f3713f 100644 --- a/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx +++ b/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx @@ -23,7 +23,7 @@ import { getIsAutocommitModalOpen, getIsAutocommitToggling, } from "selectors/gitSyncSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; function DisableAutocommitModal() { const isAutocommitModalOpen = useSelector(getIsAutocommitModalOpen); diff --git a/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx b/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx index 8414c89c5b..1ff0469160 100644 --- a/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx +++ b/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx @@ -31,7 +31,7 @@ import { NONE_REVERSIBLE_MESSAGE, REVOKE, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Space } from "./components/StyledComponents"; import { GitSettingsTab } from "reducers/uiReducers/gitSyncReducer"; diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx index d60210847e..e2347acced 100644 --- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx @@ -14,7 +14,7 @@ import styled from "styled-components"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { useAppsmithEnterpriseLink } from "./hooks"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const Container = styled.div` padding-top: 8px; diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx index 870b9fb670..aee7db6069 100644 --- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx @@ -22,7 +22,7 @@ import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { useAppsmithEnterpriseLink } from "./hooks"; import { REMOTE_BRANCH_PREFIX } from "../../constants"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { DOCS_BRANCH_PROTECTION_URL } from "constants/ThirdPartyConstants"; const Container = styled.div` diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks.ts b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks.ts index 9ef7608e7c..03dd575fc5 100644 --- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks.ts +++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks.ts @@ -1,13 +1,16 @@ -import { getInstanceId } from "@appsmith/selectors/tenantSelectors"; -import { getAppsmithConfigs } from "@appsmith/configs"; +import { getInstanceId, isFreePlan } from "@appsmith/selectors/tenantSelectors"; import { useSelector } from "react-redux"; import { ENTERPRISE_PRICING_PAGE } from "constants/ThirdPartyConstants"; import { useMemo } from "react"; +import { getUserSource } from "@appsmith/utils/AnalyticsUtil"; export const useAppsmithEnterpriseLink = (feature: string) => { const instanceId = useSelector(getInstanceId); - const { cloudHosting } = getAppsmithConfigs(); - const source = cloudHosting ? "cloud" : "ce"; + const freePlan = useSelector(isFreePlan); + let source = getUserSource(); + if (source === "ee" && freePlan) { + source = "ce"; + } const constructedUrl = useMemo(() => { const url = new URL(ENTERPRISE_PRICING_PAGE); if (source) url.searchParams.append("source", source); diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx index 1bc145dea8..856fe0c7d0 100644 --- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx @@ -26,7 +26,7 @@ import { getIsAutocommitToggling, } from "selectors/gitSyncSelectors"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { useHasConnectToGitPermission, diff --git a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx index 8715a75e08..772421dbad 100644 --- a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx @@ -15,7 +15,7 @@ import GitConnection from "../Tabs/GitConnection"; import GitErrorPopup from "../components/GitErrorPopup"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Modal, ModalContent, ModalHeader } from "design-system"; import { createMessage, diff --git a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx index 9b10a061ae..5030b00171 100644 --- a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx +++ b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx @@ -22,7 +22,7 @@ import { MERGE, IMPORT_APP, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Modal, ModalContent, ModalHeader } from "design-system"; import GitConnectionV2 from "../Tabs/GitConnectionV2"; import { GitSyncModalTab } from "entities/GitSync"; diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx index 01797f4145..16a9fd459e 100644 --- a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx +++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx @@ -12,9 +12,9 @@ import { protectedModeSelector, showBranchPopupSelector, } from "selectors/gitSyncSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Button, Icon, Tooltip } from "design-system"; -import { isEllipsisActive } from "../../../../utils/helpers"; +import { isEllipsisActive } from "utils/helpers"; import { importRemixIcon } from "design-system-old"; import { setShowBranchPopupAction } from "actions/gitSyncActions"; diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx index f16f434e53..ec6d3ef6b1 100644 --- a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx +++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx @@ -42,7 +42,7 @@ import { import SpinnerLoader from "pages/common/SpinnerLoader"; import { getTypographyByKey } from "design-system-old"; import { Button, Icon, Tooltip } from "design-system"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import AutocommitStatusbar from "./AutocommitStatusbar"; diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx index 6a732e4095..0fd36d8264 100644 --- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx +++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx @@ -40,7 +40,7 @@ import { } from "@appsmith/actions/applicationActions"; import type { Datasource } from "entities/Datasource"; import DatasourceForm from "../DataSourceEditor"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useQuery } from "../utils"; import ListItemWrapper from "./components/DatasourceListItem"; import { getDefaultPageId } from "@appsmith/sagas/ApplicationSagas"; diff --git a/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx b/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx index ff8d4f52c3..48bf2a92cc 100644 --- a/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx +++ b/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx @@ -39,7 +39,7 @@ import { } from "@appsmith/selectors/applicationSelectors"; import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { Space } from "./components/StyledComponents"; import { getFetchedWorkspaces } from "@appsmith/selectors/workspaceSelectors"; import { getApplicationsOfWorkspace } from "@appsmith/selectors/selectedWorkspaceSelectors"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx b/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx index 94c99d2343..c42128858d 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx @@ -19,7 +19,7 @@ import React, { useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; import styled from "styled-components"; import { getCurrentAppGitMetaData } from "@appsmith/selectors/applicationSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { GitSettingsTab } from "reducers/uiReducers/gitSyncReducer"; const Container = styled.div``; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx index 626f692f9d..f7170da190 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx @@ -56,7 +56,7 @@ import GitChangesList from "../components/GitChangesList"; import ConflictInfo from "../components/ConflictInfo"; import { isEllipsisActive, isMacOrIOS } from "utils/helpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getApplicationLastDeployedAt, getCurrentApplication, diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx index c6f778846a..1fec4247b1 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx @@ -68,7 +68,7 @@ import { ModalBody, ModalFooter, } from "design-system"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { GIT_DOC_URLs, isValidGitRemoteUrl } from "../utils"; import { useGitConnect, useSSHKeyPair } from "../hooks"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx index bca05c7d55..8435c34e61 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx @@ -23,7 +23,7 @@ import { } from "design-system"; import styled from "styled-components"; import { CopyButton } from "../../components/CopyButton"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { ADD_DEPLOY_KEY_STEP_TITLE, CONSENT_ADDED_DEPLOY_KEY, diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx index 02e7657649..be2e1158ec 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx @@ -41,7 +41,7 @@ import { NEED_EMPTY_REPO_MESSAGE, createMessage, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getCurrentApplicationId } from "selectors/editorSelectors"; const WellInnerContainer = styled.div` diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx index 8204c2c034..7c351d9b91 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx @@ -24,7 +24,7 @@ import { createMessage, } from "@appsmith/constants/messages"; import GitSyncStatusbar from "../../components/Statusbar"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const StyledModalBody = styled(ModalBody)` flex: 1; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx index 4b5dc872a2..27e8c0ebd6 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx @@ -52,7 +52,7 @@ import { ModalFooter, ModalBody, } from "design-system"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { Theme } from "constants/DefaultTheme"; const Row = styled.div` diff --git a/app/client/src/pages/Editor/gitSync/components/BranchList.tsx b/app/client/src/pages/Editor/gitSync/components/BranchList.tsx index 9dad11ebaf..62b9348456 100644 --- a/app/client/src/pages/Editor/gitSync/components/BranchList.tsx +++ b/app/client/src/pages/Editor/gitSync/components/BranchList.tsx @@ -44,7 +44,7 @@ import { isRemoteBranch, removeSpecialChars, } from "pages/Editor/gitSync/utils"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useActiveHoverIndex, useFilteredBranches } from "../hooks"; import { BranchListItemContainer } from "./BranchListItemContainer"; import { RemoteBranchList } from "./RemoteBranchList"; diff --git a/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx b/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx index 10abb2abfc..8aa97261f9 100644 --- a/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx +++ b/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx @@ -1,5 +1,5 @@ import React from "react"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { deleteBranchInit } from "actions/gitSyncActions"; import { useDispatch, useSelector } from "react-redux"; import { diff --git a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx index 81ee3a17ea..a4645db410 100644 --- a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx +++ b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx @@ -13,7 +13,7 @@ import { } from "@appsmith/constants/messages"; import SuccessTick from "pages/common/SuccessTick"; import { howMuchTimeBeforeText } from "utils/helpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { viewerURL } from "@appsmith/RouteBuilder"; import { Link, Text } from "design-system"; import { importSvg } from "design-system-old"; diff --git a/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx b/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx index 5c6c43d0fa..54e9730bb6 100644 --- a/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx +++ b/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx @@ -5,7 +5,7 @@ import { } from "@appsmith/constants/messages"; import React, { useCallback, useState } from "react"; import { Space } from "pages/Editor/gitSync/components/StyledComponents"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useSSHKeyPair } from "../../hooks"; import { DeployedKeyContainer, diff --git a/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx b/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx index c35b78e3d7..84f1f3a2b6 100644 --- a/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx +++ b/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx @@ -12,7 +12,7 @@ import { SearchInput, Text } from "design-system"; import Fuse from "fuse.js"; import { debounce } from "lodash"; import React, { useEffect, useMemo, useRef, useState } from "react"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { groupWidgetCardsByTags } from "../utils"; import UIEntityTagGroup from "./UIEntityTagGroup"; import { useUIExplorerItems } from "./hooks"; diff --git a/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx b/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx index ebcf2c804e..9b85e1bc0f 100644 --- a/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx +++ b/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx @@ -2,7 +2,7 @@ import React from "react"; import type { WidgetCardProps } from "widgets/BaseWidget"; import styled from "styled-components"; import { useWidgetDragResize } from "utils/hooks/dragResizeHooks"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { generateReactKey } from "utils/generators"; import { Text } from "design-system"; diff --git a/app/client/src/pages/Templates/Template/RequestTemplate.tsx b/app/client/src/pages/Templates/Template/RequestTemplate.tsx index 883de232d1..d5adee2d27 100644 --- a/app/client/src/pages/Templates/Template/RequestTemplate.tsx +++ b/app/client/src/pages/Templates/Template/RequestTemplate.tsx @@ -10,7 +10,7 @@ import { REQUEST_TEMPLATE, REQUEST_BUILDING_BLOCK, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const Wrapper = styled.div` border: 1px solid var(--ads-v2-color-border); diff --git a/app/client/src/pages/Templates/TemplateFilters/index.tsx b/app/client/src/pages/Templates/TemplateFilters/index.tsx index 6aa81c4b0f..e5e21e418e 100644 --- a/app/client/src/pages/Templates/TemplateFilters/index.tsx +++ b/app/client/src/pages/Templates/TemplateFilters/index.tsx @@ -13,7 +13,7 @@ import { getTemplateSearchQuery, isFetchingTemplatesSelector, } from "selectors/templatesSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { FilterCategoryWrapper, FilterItemText, diff --git a/app/client/src/pages/Templates/TemplateView.tsx b/app/client/src/pages/Templates/TemplateView.tsx index d71fa5717b..56434dab01 100644 --- a/app/client/src/pages/Templates/TemplateView.tsx +++ b/app/client/src/pages/Templates/TemplateView.tsx @@ -18,7 +18,7 @@ import type { AppState } from "@appsmith/reducers"; import history from "utils/history"; import { TEMPLATES_PATH } from "constants/routes"; import { Colors } from "constants/Colors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import ReconnectDatasourceModal from "pages/Editor/gitSync/ReconnectDatasourceModal"; import TemplateDescription from "./Template/TemplateDescription"; import SimilarTemplates from "./Template/SimilarTemplates"; diff --git a/app/client/src/pages/Templates/TemplatesLayoutWithFilters.tsx b/app/client/src/pages/Templates/TemplatesLayoutWithFilters.tsx index bfb09e9ce7..e630f739b7 100644 --- a/app/client/src/pages/Templates/TemplatesLayoutWithFilters.tsx +++ b/app/client/src/pages/Templates/TemplatesLayoutWithFilters.tsx @@ -9,7 +9,7 @@ import { isImportingTemplateToAppSelector, } from "selectors/templatesSelectors"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { TemplateContent } from "./TemplateContent"; import TemplateFilters from "./TemplateFilters"; diff --git a/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx b/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx index 33a8658e3c..6f02844b91 100644 --- a/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx +++ b/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx @@ -16,7 +16,7 @@ import React, { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { getCurrentApplicationId } from "selectors/editorSelectors"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const Wrapper = styled.div` width: 280px; diff --git a/app/client/src/pages/UserAuth/Login.tsx b/app/client/src/pages/UserAuth/Login.tsx index 712bda3d41..a84f458cdf 100644 --- a/app/client/src/pages/UserAuth/Login.tsx +++ b/app/client/src/pages/UserAuth/Login.tsx @@ -37,7 +37,7 @@ import { FormActions, EmailFormWrapper, } from "pages/UserAuth/StyledComponents"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { LOGIN_SUBMIT_PATH } from "@appsmith/constants/ApiConstants"; import PerformanceTracker, { PerformanceTransactionName, diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx index 327deafb07..47e28cfd44 100644 --- a/app/client/src/pages/UserAuth/SignUp.tsx +++ b/app/client/src/pages/UserAuth/SignUp.tsx @@ -34,7 +34,7 @@ import { Button, Link, Callout } from "design-system"; import { isEmail, isStrongPassword, isEmptyString } from "utils/formhelpers"; import type { SignupFormValues } from "pages/UserAuth/helpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { SIGNUP_SUBMIT_PATH } from "@appsmith/constants/ApiConstants"; import { connect, useSelector } from "react-redux"; diff --git a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx index 9f9e9bc705..9c537e567b 100644 --- a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx +++ b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import type { SocialLoginType } from "@appsmith/constants/SocialLogin"; import { getSocialLoginButtonProps } from "@appsmith/constants/SocialLogin"; import type { EventName } from "@appsmith/utils/analyticsUtilTypes"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useLocation } from "react-router-dom"; import PerformanceTracker, { PerformanceTransactionName, diff --git a/app/client/src/pages/UserAuth/VerificationError.tsx b/app/client/src/pages/UserAuth/VerificationError.tsx index 37ac93e508..3845603b15 100644 --- a/app/client/src/pages/UserAuth/VerificationError.tsx +++ b/app/client/src/pages/UserAuth/VerificationError.tsx @@ -13,7 +13,7 @@ import { import { useResendEmailVerification } from "./helpers"; import type { RouteComponentProps } from "react-router-dom"; import styled from "styled-components"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; const Body = styled.div` display: flex; diff --git a/app/client/src/pages/common/ErrorPages/PageNotFound.tsx b/app/client/src/pages/common/ErrorPages/PageNotFound.tsx index 504ad25ed1..f3a4edd550 100644 --- a/app/client/src/pages/common/ErrorPages/PageNotFound.tsx +++ b/app/client/src/pages/common/ErrorPages/PageNotFound.tsx @@ -9,7 +9,7 @@ import { PAGE_NOT_FOUND, PAGE_NOT_FOUND_TITLE, } from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import Page from "./Page"; diff --git a/app/client/src/pages/common/ImportModal.tsx b/app/client/src/pages/common/ImportModal.tsx index 38b342934d..45459262a6 100644 --- a/app/client/src/pages/common/ImportModal.tsx +++ b/app/client/src/pages/common/ImportModal.tsx @@ -16,7 +16,7 @@ import { setIsGitSyncModalOpen } from "actions/gitSyncActions"; import { GitSyncModalTab } from "entities/GitSync"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import Statusbar from "pages/Editor/gitSync/components/Statusbar"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { Theme } from "constants/DefaultTheme"; import { Icon, Modal, ModalContent, ModalHeader, Text } from "design-system"; import useMessages from "@appsmith/hooks/importModal/useMessages"; diff --git a/app/client/src/pages/common/datasourceAuth/index.tsx b/app/client/src/pages/common/datasourceAuth/index.tsx index 74d12c09f4..fadc56b5e7 100644 --- a/app/client/src/pages/common/datasourceAuth/index.tsx +++ b/app/client/src/pages/common/datasourceAuth/index.tsx @@ -10,7 +10,7 @@ import { toggleSaveActionFlag, updateDatasourceAuthState, } from "actions/datasourceActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getCurrentApplicationId } from "selectors/editorSelectors"; import { useParams, useLocation, useHistory } from "react-router"; import type { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers"; diff --git a/app/client/src/pages/setup/SignupSuccess.tsx b/app/client/src/pages/setup/SignupSuccess.tsx index cbb679e7fd..531e763df8 100644 --- a/app/client/src/pages/setup/SignupSuccess.tsx +++ b/app/client/src/pages/setup/SignupSuccess.tsx @@ -14,7 +14,7 @@ import { Spinner } from "design-system"; import { isValidLicense } from "@appsmith/selectors/tenantSelectors"; import { redirectUserAfterSignup } from "@appsmith/utils/signupHelpers"; import { setUserSignedUpFlag } from "utils/storage"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; export function SignupSuccess() { const dispatch = useDispatch(); diff --git a/app/client/src/pages/setup/UserWelcomeScreen.tsx b/app/client/src/pages/setup/UserWelcomeScreen.tsx index 300e350e81..d6a606977b 100644 --- a/app/client/src/pages/setup/UserWelcomeScreen.tsx +++ b/app/client/src/pages/setup/UserWelcomeScreen.tsx @@ -6,7 +6,7 @@ import { WELCOME_HEADER, } from "@appsmith/constants/messages"; import NonSuperUserProfilingQuestions from "./NonSuperUserProfilingQuestions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import WelcomeBackground from "./WelcomeBackground"; import SetupForm from "./SetupForm"; diff --git a/app/client/src/pages/workspace/AppInviteUsersForm.tsx b/app/client/src/pages/workspace/AppInviteUsersForm.tsx index 53b131545a..f43b491066 100644 --- a/app/client/src/pages/workspace/AppInviteUsersForm.tsx +++ b/app/client/src/pages/workspace/AppInviteUsersForm.tsx @@ -22,7 +22,7 @@ import { } from "@appsmith/constants/messages"; import { hasInviteUserToApplicationPermission } from "@appsmith/utils/permissionHelpers"; import { Button, Icon, Switch, Tooltip } from "design-system"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; diff --git a/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts b/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts index 3773cd13e1..70835fcdd0 100644 --- a/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts @@ -5,7 +5,7 @@ import { ReduxActionTypes, type Page, } from "@appsmith/constants/ReduxActionConstants"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getAppMode } from "@appsmith/selectors/applicationSelectors"; import { APP_MODE } from "entities/App"; import { getQueryStringfromObject } from "@appsmith/entities/URLRedirect/URLAssembly"; diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts index 2a7b8c1aaa..7dd0708a29 100644 --- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts +++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts @@ -76,7 +76,7 @@ import { validateResponse, } from "sagas/ErrorSagas"; import type { EventName } from "@appsmith/utils/analyticsUtilTypes"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { Action } from "entities/Action"; import { ActionExecutionContext } from "entities/Action"; import { PluginType } from "entities/Action"; diff --git a/app/client/src/sagas/ActionExecution/errorUtils.ts b/app/client/src/sagas/ActionExecution/errorUtils.ts index 20315cd414..fef6c8a931 100644 --- a/app/client/src/sagas/ActionExecution/errorUtils.ts +++ b/app/client/src/sagas/ActionExecution/errorUtils.ts @@ -8,12 +8,9 @@ import type { Types } from "utils/TypeHelpers"; import type { ActionTriggerKeys } from "@appsmith/workers/Evaluation/fns/index"; import { getActionTriggerFunctionNames } from "@appsmith/workers/Evaluation/fns/index"; import { getAppMode } from "@appsmith/selectors/applicationSelectors"; -import AnalyticsUtil from "../../utils/AnalyticsUtil"; -import { - setDebuggerSelectedTab, - showDebugger, -} from "../../actions/debuggerActions"; -import { DEBUGGER_TAB_KEYS } from "../../components/editorComponents/Debugger/helpers"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; +import { setDebuggerSelectedTab, showDebugger } from "actions/debuggerActions"; +import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers"; import store from "store"; import showToast from "sagas/ToastSagas"; import { call } from "redux-saga/effects"; diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts index 54d5ee8d34..f9c42c3ee8 100644 --- a/app/client/src/sagas/ActionSagas.ts +++ b/app/client/src/sagas/ActionSagas.ts @@ -49,7 +49,7 @@ import { getDynamicBindingsChangesSaga } from "utils/DynamicBindingUtils"; import { validateResponse } from "./ErrorSagas"; import { transformRestAction } from "transformers/RestActionTransformer"; import { getCurrentPageId } from "selectors/editorSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { Action, ActionViewMode, diff --git a/app/client/src/sagas/AnalyticsSaga.ts b/app/client/src/sagas/AnalyticsSaga.ts index e814b159c8..1790faaad8 100644 --- a/app/client/src/sagas/AnalyticsSaga.ts +++ b/app/client/src/sagas/AnalyticsSaga.ts @@ -3,7 +3,7 @@ import { type ReduxActionType, } from "@appsmith/constants/ReduxActionConstants"; import type { Action } from "entities/Action"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { RequestPayloadAnalyticsPath, cleanValuesInObjectForHashing, diff --git a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts index 6b85ab7cd0..c891ec2071 100644 --- a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts +++ b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts @@ -50,7 +50,7 @@ import { getOccupiedSpacesSelectorForContainer, } from "selectors/editorSelectors"; import { getLayoutSystemType } from "selectors/layoutSystemSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { collisionCheckPostReflow } from "utils/reflowHookUtils"; import type { WidgetProps } from "widgets/BaseWidget"; diff --git a/app/client/src/sagas/CurlImportSagas.ts b/app/client/src/sagas/CurlImportSagas.ts index 25cd9d3809..8a95b6f6b6 100644 --- a/app/client/src/sagas/CurlImportSagas.ts +++ b/app/client/src/sagas/CurlImportSagas.ts @@ -8,7 +8,7 @@ import { validateResponse } from "sagas/ErrorSagas"; import type { CurlImportRequest } from "api/ImportApi"; import CurlImportApi from "api/ImportApi"; import type { ApiResponse } from "api/ApiResponses"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors"; import transformCurlImport from "transformers/CurlImportTransformer"; import history from "utils/history"; diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts index 96ba39d369..3102b5d87e 100644 --- a/app/client/src/sagas/DatasourcesSagas.ts +++ b/app/client/src/sagas/DatasourcesSagas.ts @@ -94,7 +94,7 @@ import { DATASOURCE_REST_API_FORM, } from "@appsmith/constants/forms"; import { validateResponse } from "./ErrorSagas"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { GetFormData } from "selectors/formSelectors"; import { getFormData } from "selectors/formSelectors"; import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors"; diff --git a/app/client/src/sagas/DebuggerSagas.ts b/app/client/src/sagas/DebuggerSagas.ts index ec52960bb0..7e476ef697 100644 --- a/app/client/src/sagas/DebuggerSagas.ts +++ b/app/client/src/sagas/DebuggerSagas.ts @@ -43,7 +43,9 @@ import { getConfigTree } from "selectors/dataTreeSelectors"; import { createLogTitleString } from "components/editorComponents/Debugger/helpers"; import AppsmithConsole from "utils/AppsmithConsole"; import { getWidget } from "./selectors"; -import AnalyticsUtil, { AnalyticsEventType } from "utils/AnalyticsUtil"; +import AnalyticsUtil, { + AnalyticsEventType, +} from "@appsmith/utils/AnalyticsUtil"; import type { Plugin } from "api/PluginApi"; import { getCurrentPageId } from "selectors/editorSelectors"; import type { WidgetProps } from "widgets/BaseWidget"; diff --git a/app/client/src/sagas/EvalErrorHandler.ts b/app/client/src/sagas/EvalErrorHandler.ts index 0dde75ec27..cfcdf524c8 100644 --- a/app/client/src/sagas/EvalErrorHandler.ts +++ b/app/client/src/sagas/EvalErrorHandler.ts @@ -18,7 +18,7 @@ import LOG_TYPE from "entities/AppsmithConsole/logtype"; import { select } from "redux-saga/effects"; import AppsmithConsole from "utils/AppsmithConsole"; import * as Sentry from "@sentry/react"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { createMessage, ERROR_EVAL_ERROR_GENERIC, diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts index 2456c74035..88c513f915 100644 --- a/app/client/src/sagas/EvaluationsSaga.ts +++ b/app/client/src/sagas/EvaluationsSaga.ts @@ -103,7 +103,7 @@ import { parseUpdatesAndDeleteUndefinedUpdates } from "./EvaluationSaga.utils"; import { getFeatureFlagsFetched } from "selectors/usersSelectors"; import { getIsCurrentEditorWorkflowType } from "@appsmith/selectors/workflowSelectors"; import { evalErrorHandler } from "./EvalErrorHandler"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { endSpan, startRootSpan } from "UITelemetry/generateTraces"; const APPSMITH_CONFIGS = getAppsmithConfigs(); diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts index 7a67d29c1f..2a2dd3af51 100644 --- a/app/client/src/sagas/InitSagas.ts +++ b/app/client/src/sagas/InitSagas.ts @@ -62,7 +62,7 @@ import { } from "@appsmith/pages/Editor/Explorer/helpers"; import { APP_MODE } from "../entities/App"; import { GIT_BRANCH_QUERY_KEY, matchViewerPath } from "../constants/routes"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getAppMode } from "@appsmith/selectors/applicationSelectors"; import { getDebuggerErrors } from "selectors/debuggerSelectors"; import { deleteErrorLog } from "actions/debuggerActions"; diff --git a/app/client/src/sagas/JSLibrarySaga.ts b/app/client/src/sagas/JSLibrarySaga.ts index 4eb5c3eda7..142509941e 100644 --- a/app/client/src/sagas/JSLibrarySaga.ts +++ b/app/client/src/sagas/JSLibrarySaga.ts @@ -28,7 +28,7 @@ import { EvalWorker } from "./EvaluationsSaga"; import log from "loglevel"; import { APP_MODE } from "entities/App"; import { getAppMode } from "@appsmith/selectors/applicationSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { JSLibrary } from "workers/common/JSLibrary"; import { getUsedActionNames } from "selectors/actionSelectors"; import AppsmithConsole from "utils/AppsmithConsole"; diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts index 155c48e7f5..d6ba81658f 100644 --- a/app/client/src/sagas/JSPaneSagas.ts +++ b/app/client/src/sagas/JSPaneSagas.ts @@ -87,7 +87,7 @@ import { ModalType } from "reducers/uiReducers/modalActionReducer"; import { requestModalConfirmationSaga } from "sagas/UtilSagas"; import { UserCancelledActionExecutionError } from "sagas/ActionExecution/errorUtils"; import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { checkAndLogErrorsIfCyclicDependency } from "./helper"; import { toast } from "design-system"; import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers"; diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts index ba944376be..8f5abb4eff 100644 --- a/app/client/src/sagas/OnboardingSagas.ts +++ b/app/client/src/sagas/OnboardingSagas.ts @@ -34,7 +34,7 @@ import { getCurrentApplicationId, getIsEditorInitialized, } from "selectors/editorSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { User } from "constants/userConstants"; import { builderURL } from "@appsmith/RouteBuilder"; import type { SIGNPOSTING_STEP } from "pages/Editor/FirstTimeUserOnboarding/Utils"; diff --git a/app/client/src/sagas/OneClickBindingSaga.ts b/app/client/src/sagas/OneClickBindingSaga.ts index da4006121c..78a996514d 100644 --- a/app/client/src/sagas/OneClickBindingSaga.ts +++ b/app/client/src/sagas/OneClickBindingSaga.ts @@ -44,7 +44,7 @@ import type { ApiResponse } from "api/ApiResponses"; import type { ActionCreateUpdateResponse } from "api/ActionAPI"; import ActionAPI from "api/ActionAPI"; import { validateResponse } from "./ErrorSagas"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import AppsmithConsole from "utils/AppsmithConsole"; import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils"; import { fetchActions, runAction } from "actions/pluginActionActions"; diff --git a/app/client/src/sagas/PostEvaluationSagas.ts b/app/client/src/sagas/PostEvaluationSagas.ts index 189850cc74..76d19182ff 100644 --- a/app/client/src/sagas/PostEvaluationSagas.ts +++ b/app/client/src/sagas/PostEvaluationSagas.ts @@ -26,7 +26,7 @@ import LOG_TYPE from "entities/AppsmithConsole/logtype"; import { call, put, select } from "redux-saga/effects"; import type { AnyReduxAction } from "@appsmith/constants/ReduxActionConstants"; import AppsmithConsole from "utils/AppsmithConsole"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { createMessage, JS_EXECUTION_FAILURE, diff --git a/app/client/src/sagas/QueryPaneSagas.ts b/app/client/src/sagas/QueryPaneSagas.ts index dd757fac7c..7f6a4f1d86 100644 --- a/app/client/src/sagas/QueryPaneSagas.ts +++ b/app/client/src/sagas/QueryPaneSagas.ts @@ -60,7 +60,7 @@ import { import { updateReplayEntity } from "actions/pageActions"; import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils"; import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { datasourcesEditorIdURL, generateTemplateFormURL, diff --git a/app/client/src/sagas/ReplaySaga.ts b/app/client/src/sagas/ReplaySaga.ts index aafd1b98fe..50d9557f57 100644 --- a/app/client/src/sagas/ReplaySaga.ts +++ b/app/client/src/sagas/ReplaySaga.ts @@ -30,7 +30,7 @@ import { scrollWidgetIntoView, switchTab, } from "utils/replayHelpers"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getCurrentApplicationId, snipingModeSelector, diff --git a/app/client/src/sagas/SnapshotSagas.ts b/app/client/src/sagas/SnapshotSagas.ts index e95fc19624..e26893bdd8 100644 --- a/app/client/src/sagas/SnapshotSagas.ts +++ b/app/client/src/sagas/SnapshotSagas.ts @@ -15,7 +15,7 @@ import { getLogToSentryFromResponse } from "utils/helpers"; import { validateResponse } from "./ErrorSagas"; import { updateApplicationLayoutType } from "./AutoLayoutUpdateSagas"; import { LayoutSystemTypes } from "layoutSystems/types"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getLayoutSystemType } from "selectors/layoutSystemSelectors"; //Saga to create application snapshot diff --git a/app/client/src/sagas/SnipingModeSagas.ts b/app/client/src/sagas/SnipingModeSagas.ts index fb848b56b7..f4fdfd7c56 100644 --- a/app/client/src/sagas/SnipingModeSagas.ts +++ b/app/client/src/sagas/SnipingModeSagas.ts @@ -8,7 +8,7 @@ import { batchUpdateWidgetDynamicProperty, batchUpdateWidgetProperty, } from "actions/controlActions"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { SNIPING_NOT_SUPPORTED, diff --git a/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts b/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts index e6082344df..282ac0f45d 100644 --- a/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts +++ b/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts @@ -12,7 +12,7 @@ import { removeVersionUpdateState, setVersionUpdateState, } from "utils/storage"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; enum UpdateStateEvent { PROMPT_SHOWN = "PROMPT_SHOWN", diff --git a/app/client/src/sagas/WidgetDeletionSagas.ts b/app/client/src/sagas/WidgetDeletionSagas.ts index 96244746ed..9dfb8110c9 100644 --- a/app/client/src/sagas/WidgetDeletionSagas.ts +++ b/app/client/src/sagas/WidgetDeletionSagas.ts @@ -26,7 +26,7 @@ import { getIsAutoLayoutMobileBreakPoint, } from "selectors/editorSelectors"; import { getSelectedWidgets } from "selectors/ui"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import AppsmithConsole from "utils/AppsmithConsole"; import type { WidgetProps } from "widgets/BaseWidget"; import { diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx index ea3795c1d9..fd4b3a3a28 100644 --- a/app/client/src/sagas/WidgetOperationSagas.tsx +++ b/app/client/src/sagas/WidgetOperationSagas.tsx @@ -41,7 +41,7 @@ import { getIsAutoLayout, getIsAutoLayoutMobileBreakPoint, } from "selectors/editorSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { convertToString } from "utils/AppsmithUtils"; import type { BatchUpdateDynamicPropertyUpdates, diff --git a/app/client/src/sagas/WidgetSelectionSagas.ts b/app/client/src/sagas/WidgetSelectionSagas.ts index 7fb857de20..ab2d5fb154 100644 --- a/app/client/src/sagas/WidgetSelectionSagas.ts +++ b/app/client/src/sagas/WidgetSelectionSagas.ts @@ -58,7 +58,7 @@ import { import { getModalWidgetType } from "selectors/widgetSelectors"; import { getWidgetSelectorByWidgetId } from "selectors/layoutSystemSelectors"; import { getAppViewerPageIdFromPath } from "@appsmith/pages/Editor/Explorer/helpers"; -import AnalyticsUtil from "../utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getIsAnvilLayout } from "layoutSystems/anvil/integrations/selectors"; // The following is computed to be used in the entity explorer diff --git a/app/client/src/sagas/layoutConversionSagas.ts b/app/client/src/sagas/layoutConversionSagas.ts index df131641d8..7d5c4d4712 100644 --- a/app/client/src/sagas/layoutConversionSagas.ts +++ b/app/client/src/sagas/layoutConversionSagas.ts @@ -25,7 +25,7 @@ import { getPageList, } from "selectors/editorSelectors"; import { updateApplicationLayoutType } from "./AutoLayoutUpdateSagas"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { nestDSL } from "@shared/dsl"; /** diff --git a/app/client/src/usagePulse/utils.ts b/app/client/src/usagePulse/utils.ts index 292478d2a6..57c2b6e733 100644 --- a/app/client/src/usagePulse/utils.ts +++ b/app/client/src/usagePulse/utils.ts @@ -4,7 +4,7 @@ import { isNil } from "lodash"; import nanoid from "nanoid"; import { getAppMode } from "@appsmith/selectors/entitiesSelector"; import store from "store"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { FALLBACK_KEY } from "@appsmith/constants/UsagePulse"; //TODO (Dipyaman): We should return a promise that will get resolved only on success or rejected after the retries diff --git a/app/client/src/utils/AppsmithUtils.tsx b/app/client/src/utils/AppsmithUtils.tsx index 605853a8d0..4ec0106e3f 100644 --- a/app/client/src/utils/AppsmithUtils.tsx +++ b/app/client/src/utils/AppsmithUtils.tsx @@ -10,7 +10,7 @@ import * as log from "loglevel"; import { osName } from "react-device-detect"; import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import type { JSCollectionData } from "@appsmith/reducers/entityReducers/jsActionsReducer"; -import AnalyticsUtil from "./AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import type { CreateNewActionKeyInterface } from "@appsmith/entities/Engine/actionHelpers"; import { CreateNewActionKey } from "@appsmith/entities/Engine/actionHelpers"; diff --git a/app/client/src/utils/autocomplete/CodemirrorTernService.ts b/app/client/src/utils/autocomplete/CodemirrorTernService.ts index 3a7ef92cca..19059ebec2 100644 --- a/app/client/src/utils/autocomplete/CodemirrorTernService.ts +++ b/app/client/src/utils/autocomplete/CodemirrorTernService.ts @@ -18,7 +18,7 @@ import { getCodeMirrorNamespaceFromDoc, getCodeMirrorNamespaceFromEditor, } from "../getCodeMirrorNamespace"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { findIndex, isString } from "lodash"; import { renderTernTooltipContent } from "./ternDocTooltip"; diff --git a/app/client/src/utils/hooks/useOnUpgrade.ts b/app/client/src/utils/hooks/useOnUpgrade.ts index 1ac5c0a8a1..acf4548da1 100644 --- a/app/client/src/utils/hooks/useOnUpgrade.ts +++ b/app/client/src/utils/hooks/useOnUpgrade.ts @@ -5,7 +5,7 @@ import { PRICING_PAGE_URL, } from "constants/ThirdPartyConstants"; import type { EventName } from "@appsmith/utils/analyticsUtilTypes"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { getAppsmithConfigs } from "@appsmith/configs"; import { pricingPageUrlSource } from "@appsmith/utils/licenseHelpers"; import type { diff --git a/app/client/src/widgets/CustomWidget/component/index.tsx b/app/client/src/widgets/CustomWidget/component/index.tsx index 8d796d9a30..9099f70913 100644 --- a/app/client/src/widgets/CustomWidget/component/index.tsx +++ b/app/client/src/widgets/CustomWidget/component/index.tsx @@ -21,7 +21,7 @@ import { connect } from "react-redux"; import type { AppState } from "@appsmith/reducers"; import { combinedPreviewModeSelector } from "selectors/editorSelectors"; import { getWidgetPropsForPropertyPane } from "selectors/propertyPaneSelectors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { EVENTS } from "./customWidgetscript"; import { DynamicHeight } from "utils/WidgetFeatures"; import { getAppsmithConfigs } from "@appsmith/configs"; diff --git a/app/client/src/widgets/CustomWidget/widget/index.tsx b/app/client/src/widgets/CustomWidget/widget/index.tsx index b829d3ebd6..58f7a3320a 100644 --- a/app/client/src/widgets/CustomWidget/widget/index.tsx +++ b/app/client/src/widgets/CustomWidget/widget/index.tsx @@ -32,7 +32,7 @@ import { Link } from "design-system"; import styled from "styled-components"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { Colors } from "constants/Colors"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { DynamicHeight, type WidgetFeatures } from "utils/WidgetFeatures"; const StyledLink = styled(Link)` diff --git a/app/client/src/widgets/JSONFormWidget/widget/helper.ts b/app/client/src/widgets/JSONFormWidget/widget/helper.ts index 87d07dd8a7..28f19ec728 100644 --- a/app/client/src/widgets/JSONFormWidget/widget/helper.ts +++ b/app/client/src/widgets/JSONFormWidget/widget/helper.ts @@ -1,7 +1,7 @@ import equal from "fast-deep-equal/es6"; import { difference, isEmpty } from "lodash"; import log from "loglevel"; -import AnalyticsUtil from "utils/AnalyticsUtil"; +import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil"; import { isDynamicValue } from "utils/DynamicBindingUtils"; import type { MetaInternalFieldState } from ".";