Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Update analytics to pass the correct source information in identify user call (#32591)

Browse Source 
## Description

Updating analytics to pass the correct source information

Fixes [#32266](https://github.com/appsmithorg/appsmith/issues/32266)

## Automation

/ok-to-test tags="@tag.Sanity"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/8750877755>
> Commit: 6fedefebd3867aee79877b7ed105c90888005cfd
> Cypress dashboard url: <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=8750877755&attempt=1"
target="_blank">Click here!</a>

<!-- end of auto-generated comment: Cypress test results  -->
This commit is contained in:
Ankita Kinger 2024-04-19 15:06:50 +05:30 committed by GitHub
parent 9660e59b67
commit 6244e28fed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
229 changed files with 260 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/AppErrorBoundry.tsx
View File

@ -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`

2
app/client/src/actions/pageActions.tsx
View File

@ -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,

2
app/client/src/ce/api/ApiUtils.ts
View File

@ -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";

2
app/client/src/ce/hooks/datasourceEditorHooks.tsx
View File

@ -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 {

2
app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx
View File

@ -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 {

2
app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx
View File

@ -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";

2
app/client/src/ce/pages/Applications/index.tsx
View File

@ -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";

2
app/client/src/ce/pages/workspace/InviteUsersForm.tsx
View File

@ -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 {

2
app/client/src/ce/sagas/ApplicationSagas.tsx
View File

@ -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,

2
app/client/src/ce/sagas/JSActionSagas.ts
View File

@ -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,

2
app/client/src/ce/sagas/NavigationSagas.ts
View File

@ -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";

2
app/client/src/ce/sagas/PageSagas.tsx
View File

@ -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";

2
app/client/src/ce/sagas/SuperUserSagas.tsx
View File

@ -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,

10
app/client/src/ce/sagas/analyticsSaga.ts
View File

@ -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;

2
app/client/src/ce/sagas/tenantSagas.tsx
View File

@ -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

2
app/client/src/ce/sagas/userSagas.tsx
View File

@ -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,

5
app/client/src/ce/selectors/tenantSelectors.tsx
View File

@ -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;

24
app/client/src/utils/AnalyticsUtil.tsx → app/client/src/ce/utils/AnalyticsUtil.tsx
View File

@ -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,

2
app/client/src/components/BottomBar/ManualUpgrades.tsx
View File

@ -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`

2
app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx
View File

@ -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,

2
app/client/src/components/editorComponents/ActionCreator/index.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/ActionRightPane/Connections.tsx
View File

@ -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,

2
app/client/src/components/editorComponents/ApiResponseView.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/CloseEditor.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/Analytics.ts
View File

@ -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) => {
/*

2
app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
View File

@ -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 {

2
app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/CodeEditor/index.tsx
View File

@ -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 {

2
app/client/src/components/editorComponents/Debugger/ActionLink.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx
View File

@ -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,

2
app/client/src/components/editorComponents/Debugger/DataSourceLink.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/Debugger/DebugCTA.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx
View File

@ -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`

2
app/client/src/components/editorComponents/Debugger/JSCollectionLink.tsx
View File

@ -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) {

2
app/client/src/components/editorComponents/Debugger/WidgetLink.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts
View File

@ -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";

2
app/client/src/components/editorComponents/EntityBottomTabs.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/EntityExplorerSidebar.tsx
View File

@ -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) =>

2
app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx
View File

@ -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)`

2
app/client/src/components/editorComponents/GlobalSearch/index.tsx
View File

@ -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 {

2
app/client/src/components/editorComponents/GlobalSearch/utils.tsx
View File

@ -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 {

2
app/client/src/components/editorComponents/NavBarItem.tsx
View File

@ -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 {

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/index.tsx
View File

@ -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 {

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/useTableOrSpreadsheet.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/useConnectData.ts
View File

@ -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";

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/useSheets.tsx
View File

@ -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() {

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/useColumnDropdown.tsx
View File

@ -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";

2
app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx
View File

@ -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;

2
app/client/src/components/featureWalkthrough/index.tsx
View File

@ -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";

2
app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx
View File

@ -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";

2
app/client/src/components/formControls/MultiFilePickerControl.tsx
View File

@ -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;

2
app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx
View File

@ -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;

2
app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx
View File

@ -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 {

2
app/client/src/constants/DocumentationLinks.ts
View File

@ -1,4 +1,4 @@
import AnalyticsUtil from "../utils/AnalyticsUtil";
import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
export enum DocsLink {
CAPTURE_DATA = "CAPTURE_DATA",

3
app/client/src/ee/utils/AnalyticsUtil.tsx Normal file
View File

@ -0,0 +1,3 @@
export * from "ce/utils/AnalyticsUtil";
import { default as CE_AnalyticsUtil } from "ce/utils/AnalyticsUtil";
export default CE_AnalyticsUtil;

2
app/client/src/entities/Engine/AppEditorEngine.ts
View File

@ -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,

2
app/client/src/layoutSystems/anvil/utils/paste/utils.ts
View File

@ -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";

2
app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/StarterBuildingBlocks.test.tsx
View File

@ -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(),
}));

2
app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/index.tsx
View File

@ -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,

2
app/client/src/layoutSystems/common/resizer/ModalResizableLayer.tsx
View File

@ -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";

2
app/client/src/layoutSystems/common/resizer/ResizableComponent.tsx
View File

@ -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,

2
app/client/src/layoutSystems/common/widgetName/index.tsx
View File

@ -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";

2
app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightOverlayLayer.tsx
View File

@ -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,

2
app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts
View File

@ -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";

2
app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx
View File

@ -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";

2
app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx
View File

@ -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";

2
app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx
View File

@ -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`

2
app/client/src/pages/AdminSettings/LeftPane.tsx
View File

@ -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";

2
app/client/src/pages/AdminSettings/SettingsForm.tsx
View File

@ -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,

2
app/client/src/pages/AppViewer/AppPage.tsx
View File

@ -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";

2
app/client/src/pages/AppViewer/Navigation/index.tsx
View File

@ -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();

2
app/client/src/pages/AppViewer/SideNavItem.tsx
View File

@ -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;

2
app/client/src/pages/Applications/loader.tsx
View File

@ -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";

2
app/client/src/pages/Editor/APIEditor/index.tsx
View File

@ -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";

2
app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx
View File

@ -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";

2
app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts
View File

@ -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,

2
app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx
View File

@ -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";

2
app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx
View File

@ -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,

2
app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx
View File

@ -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;

2
app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx
View File

@ -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 {

2
app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx
View File

@ -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(

2
app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx
View File

@ -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 {

2
app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx
View File

@ -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";

2
app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx
View File

@ -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;

2
app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx
View File

@ -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";

2
app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx
View File

@ -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";

2
app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
View File

@ -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";

2
app/client/src/pages/Editor/DataSourceEditor/hooks.ts
View File

@ -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";

2
app/client/src/pages/Editor/DataSourceEditor/index.tsx
View File

@ -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";

2
app/client/src/pages/Editor/DatasourceInfo/DatasourceEntity.tsx
View File

@ -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";

Some files were not shown because too many files have changed in this diff Show More