(null);
-
- useEffect(() => {
- if (active && newDatasourceRef.current) {
- scrollIntoView(newDatasourceRef.current, {
- behavior: "smooth",
- scrollMode: "always",
- block: "start",
- boundary: document.getElementById("new-integrations-wrapper"),
- });
- }
- }, [active]);
-
- const isAirgappedInstance = isAirgapped();
-
- return (
-
-
- {showMostPopularPlugins
- ? createMessage(CREATE_NEW_DATASOURCE_MOST_POPULAR_HEADER)
- : createMessage(CREATE_NEW_DATASOURCE_DATABASE_HEADER)}
-
-
-
- );
-}
-
-function CreateNewSaasIntegration({
- active,
- isCreating,
- isPremiumDatasourcesViewEnabled,
- pageId,
- showUnsupportedPluginDialog, // TODO: Fix this the next time the file is edited
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
-}: any) {
- const newSaasAPIRef = useRef(null);
- const isMounted = useRef(false);
- const isAirgappedInstance = isAirgapped();
-
- useEffect(() => {
- if (active && newSaasAPIRef.current) {
- isMounted.current &&
- scrollIntoView(newSaasAPIRef.current, {
- behavior: "smooth",
- scrollMode: "always",
- block: "start",
- boundary: document.getElementById("new-integrations-wrapper"),
- });
- } else {
- isMounted.current = true;
- }
- }, [active]);
-
- return !isAirgappedInstance ? (
- <>
-
-
-
SaaS integrations
-
- {isPremiumDatasourcesViewEnabled && }
-
-
-
- {createMessage(CREATE_NEW_DATASOURCE_REST_API)}
-
-
- {/*@ts-expect-error Fix this the next time the file is edited*/}
- {isCreating && }
-
- ) : null
- ) : (
-
+ {plugins.map((plugin, idx) => {
+ return plugin.type === PluginType.API ? (
+ !!showMostPopularPlugins ? (
+ {
- AnalyticsUtil.logEvent("CREATE_DATA_SOURCE_CLICK", {
- appName: currentApplication?.name,
- pluginName: plugin.name,
- pluginPackageName: plugin.packageName,
- });
- this.goToCreateDatasource(plugin.id, plugin.name, {
- packageName: plugin.packageName,
- });
- }}
- >
-
- })
- {plugin.name}
-
-
- );
- })}
-
-
+ name={createMessage(CREATE_NEW_DATASOURCE_REST_API)}
+ />
+ ) : null
+ ) : (
+ {
+ AnalyticsUtil.logEvent("CREATE_DATA_SOURCE_CLICK", {
+ appName: currentApplication?.name,
+ pluginName: plugin.name,
+ pluginPackageName: plugin.packageName,
+ });
+ this.goToCreateDatasource(plugin.id, plugin.name, {
+ packageName: plugin.packageName,
+ type: plugin.type,
+ });
+ }}
+ icon={getAssetUrl(pluginImages[plugin.id])}
+ key={`${plugin.id}_${idx}`}
+ name={plugin.name}
+ rightSibling={
+ isCreating &&
+ }
+ />
+ );
+ })}
+
);
}
}
+function CreateDBOrMostPopularPlugins(props: CreateDBOrMostPopularPluginsType) {
+ const editorType = useEditorType(location.pathname);
+ const { editorId, parentEntityId, parentEntityType } =
+ useParentEntityInfo(editorType);
+ const newDatasourceRef = useRef(null);
+
+ useEffect(() => {
+ if (props.active && newDatasourceRef.current) {
+ scrollIntoView(newDatasourceRef.current, {
+ behavior: "smooth",
+ scrollMode: "always",
+ block: "start",
+ boundary: document.getElementById("new-integrations-wrapper"),
+ });
+ }
+ }, [props.active]);
+
+ if (props.plugins.length === 0) return null;
+
+ return (
+ <>
+ {props.addDivider && }
+
+
+ {props.showMostPopularPlugins
+ ? createMessage(CREATE_NEW_DATASOURCE_MOST_POPULAR_HEADER)
+ : createMessage(CREATE_NEW_DATASOURCE_DATABASE_HEADER)}
+
+
+
+
+ );
+}
+
const mapStateToProps = (
state: AppState,
- props: { showMostPopularPlugins?: boolean; isAirgappedInstance?: boolean },
+ props: {
+ active?: boolean;
+ pageId: string;
+ showMostPopularPlugins?: boolean;
+ isOnboardingScreen?: boolean;
+ isCreating?: boolean;
+ },
) => {
const { datasources } = state.entities;
const mostPopularPlugins = getMostPopularPlugins(state);
- const filteredMostPopularPlugins: Plugin[] = !!props?.isAirgappedInstance
+ const isAirgappedInstance = isAirgapped();
+ const searchedPlugin = (
+ pluginSearchSelector(state, "search") || ""
+ ).toLocaleLowerCase();
+ const filteredMostPopularPlugins: Plugin[] = !!isAirgappedInstance
? mostPopularPlugins.filter(
(plugin: Plugin) =>
plugin?.packageName !== PluginPackageName.GOOGLE_SHEETS,
)
: mostPopularPlugins;
+ let plugins = !!props?.showMostPopularPlugins
+ ? filteredMostPopularPlugins
+ : getDBPlugins(state);
+
+ plugins = plugins.filter((plugin) =>
+ plugin.name.toLocaleLowerCase().includes(searchedPlugin),
+ );
+
return {
pluginImages: getPluginImages(state),
- plugins: !!props?.showMostPopularPlugins
- ? filteredMostPopularPlugins
- : getDBPlugins(state),
+ plugins,
currentApplication: getCurrentApplication(state),
isSaving: datasources.loading,
generateCRUDSupportedPlugin: getGenerateCRUDEnabledPluginMap(state),
};
};
-// TODO: Fix this the next time the file is edited
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const mapDispatchToProps = (dispatch: any) => {
+const mapDispatchToProps = (dispatch: Dispatch) => {
return {
- // TODO: Fix this the next time the file is edited
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- initializeForm: (data: Record) =>
+ initializeForm: (data: Record) =>
dispatch(initialize(DATASOURCE_DB_FORM, data)),
- // TODO: Fix this the next time the file is edited
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- createDatasource: (data: any) => dispatch(createDatasourceFromForm(data)),
- // TODO: Fix this the next time the file is edited
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- createTempDatasource: (data: any) =>
+ createDatasource: (data: CreateDatasourceConfig & Datasource) =>
+ dispatch(createDatasourceFromForm(data)),
+ createTempDatasource: (data: { pluginId: string; type: PluginType }) =>
dispatch(createTempDatasourceFromForm(data)),
createNewApiActionBasedOnEditorType: (
editorType: string,
@@ -362,4 +364,4 @@ const mapDispatchToProps = (dispatch: any) => {
export default connect(
mapStateToProps,
mapDispatchToProps,
-)(DatasourceHomeScreen);
+)(CreateDBOrMostPopularPlugins);
diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceItem.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceItem.tsx
new file mode 100644
index 000000000000..698d6c7ce9c5
--- /dev/null
+++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceItem.tsx
@@ -0,0 +1,64 @@
+import React, { type ReactNode } from "react";
+import {
+ DatasourceCard,
+ DatasourceDescription,
+ DatasourceImage,
+ DatasourceName,
+ DatasourceNameWrapper,
+} from "./IntegrationStyledComponents";
+
+interface DatasourceItem {
+ className?: string;
+ name: string;
+ icon: string;
+ description?: string;
+ handleOnClick: () => unknown;
+ rightSibling?: ReactNode;
+ dataNameTestId?: string;
+ dataCardTestId?: string;
+ dataCardWrapperTestId?: string;
+ dataCardDescriptionTestId?: string;
+ dataCardImageTestId?: string;
+}
+
+export default function DatasourceItem({
+ className = "",
+ dataCardDescriptionTestId = "datasource-description",
+ dataCardImageTestId = "datasource-image",
+ dataCardTestId = "datasource-card",
+ dataCardWrapperTestId = "datasource-content-wrapper",
+ dataNameTestId = "datasource-name",
+ description,
+ handleOnClick,
+ icon,
+ name,
+ rightSibling,
+}: DatasourceItem) {
+ return (
+
+
+
+
+ {name}
+
+
+ {description}
+
+
+ {rightSibling}
+
+ );
+}
diff --git a/app/client/src/pages/Editor/IntegrationEditor/EmptySearchedPlugins.tsx b/app/client/src/pages/Editor/IntegrationEditor/EmptySearchedPlugins.tsx
new file mode 100644
index 000000000000..e035d2bd7f6c
--- /dev/null
+++ b/app/client/src/pages/Editor/IntegrationEditor/EmptySearchedPlugins.tsx
@@ -0,0 +1,61 @@
+import React from "react";
+import { Flex, Text } from "@appsmith/ads";
+import { getAssetUrl } from "ee/utils/airgapHelpers";
+import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants";
+import {
+ CREATE_NEW_DATASOURCE_AUTHENTICATED_REST_API,
+ createMessage,
+ EMPTY_SEARCH_DATASOURCES_DESCRIPTION,
+ EMPTY_SEARCH_DATASOURCES_TITLE,
+} from "ee/constants/messages";
+import { useSelector } from "react-redux";
+import { pluginSearchSelector } from "./CreateNewDatasourceHeader";
+import { getPlugins } from "ee/selectors/entitiesSelector";
+import { PREMIUM_INTEGRATIONS } from "./PremiumDatasources/Constants";
+import styled from "styled-components";
+
+const EmptyImage = styled.img`
+ margin-bottom: var(--ads-v2-spaces-6);
+ width: 96px;
+`;
+
+export default function EmptySearchedPlugins({
+ isPremiumDatasourcesViewEnabled,
+}: {
+ isPremiumDatasourcesViewEnabled: boolean;
+}) {
+ let searchedPlugin = useSelector((state) =>
+ pluginSearchSelector(state, "search"),
+ );
+
+ searchedPlugin = (searchedPlugin || "").toLocaleLowerCase();
+ const plugins = useSelector(getPlugins);
+ let searchedItems = plugins.some((p) =>
+ p.name.toLocaleLowerCase().includes(searchedPlugin),
+ );
+
+ searchedItems =
+ searchedItems ||
+ createMessage(CREATE_NEW_DATASOURCE_AUTHENTICATED_REST_API)
+ .toLocaleLowerCase()
+ .includes(searchedPlugin) ||
+ (isPremiumDatasourcesViewEnabled &&
+ PREMIUM_INTEGRATIONS.some((p) =>
+ p.name.toLocaleLowerCase().includes(searchedPlugin),
+ ));
+
+ if (searchedItems) return null;
+
+ return (
+
+
+
+ {createMessage(EMPTY_SEARCH_DATASOURCES_TITLE)}
+
+ {createMessage(EMPTY_SEARCH_DATASOURCES_DESCRIPTION)}
+
+ );
+}
diff --git a/app/client/src/pages/Editor/IntegrationEditor/IntegrationStyledComponents.tsx b/app/client/src/pages/Editor/IntegrationEditor/IntegrationStyledComponents.tsx
new file mode 100644
index 000000000000..1c23de9d1d34
--- /dev/null
+++ b/app/client/src/pages/Editor/IntegrationEditor/IntegrationStyledComponents.tsx
@@ -0,0 +1,73 @@
+import { Divider, Text } from "@appsmith/ads";
+import styled from "styled-components";
+
+export const StyledDivider = styled(Divider)`
+ margin-bottom: var(--ads-spaces-7);
+ border-color: var(--ads-v2-color-bg-muted);
+`;
+
+export const DatasourceSection = styled.div`
+ gap: var(--ads-v2-spaces-5);
+ display: flex;
+ flex-direction: column;
+`;
+
+export const DatasourceSectionHeading = styled(Text)`
+ font-size: var(--ads-v2-font-size-10);
+`;
+
+export const DatasourceContainer = styled.div`
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(218.25px, 1fr));
+ gap: var(--ads-v2-spaces-5);
+ min-width: 150px;
+ border-radius: 4px;
+ align-items: center;
+`;
+
+export const DatasourceCard = styled.div`
+ display: flex;
+ align-items: center;
+ gap: var(--ads-v2-spaces-4);
+ padding: var(--ads-v2-spaces-4);
+ cursor: pointer;
+ border-radius: var(--ads-v2-border-radius);
+ .cta {
+ display: none;
+ margin-right: var(--ads-v2-spaces-9);
+ }
+
+ &:hover {
+ background-color: var(--ads-v2-color-bg-subtle);
+ .cta {
+ display: flex;
+ }
+ }
+`;
+
+export const DatasourceImage = styled.img`
+ height: 34px;
+ width: auto;
+ max-width: 100%;
+ flex-shrink: 0;
+`;
+
+export const DatasourceNameWrapper = styled.div`
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+`;
+
+export const DatasourceName = styled(Text)`
+ font-size: var(--ads-v2-font-size-6);
+ font-weight: var(--ads-v2-font-weight-normal);
+ line-height: var(--ads-v2-line-height-4);
+ color: var(--ads-v2-color-fg);
+`;
+
+export const DatasourceDescription = styled.div`
+ color: var(--ads-v2-color-fg-muted);
+ font-size: var(--ads-v2-font-size-3);
+ font-weight: var(--ads-v2-font-weight-normal);
+ line-height: var(--ads-v2-line-height-2);
+`;
diff --git a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
index a9eee513e65a..4acceb548c77 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
@@ -1,5 +1,4 @@
import React from "react";
-import styled from "styled-components";
import { useDispatch, useSelector } from "react-redux";
import type { MockDatasource } from "entities/Datasource";
import { getPluginImages } from "ee/selectors/entitiesSelector";
@@ -10,90 +9,27 @@ import type { AppState } from "ee/reducers";
import AnalyticsUtil from "ee/utils/AnalyticsUtil";
import { getAssetUrl } from "ee/utils/airgapHelpers";
import { DatasourceCreateEntryPoints } from "constants/Datasource";
-
-const MockDataSourceWrapper = styled.div`
- overflow: auto;
- display: grid;
- grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
- gap: 16px;
- min-width: 150px;
- align-items: center;
- margin-top: 8px;
-`;
-
-const Description = styled.div`
- color: var(--ads-v2-color-fg-muted);
- font-size: 13px;
- font-weight: 400;
- line-height: 17px;
- letter-spacing: -0.24px;
-`;
-
-function MockDataSources(props: { mockDatasources: MockDatasource[] }) {
- const workspaceId = useSelector(getCurrentWorkspaceId);
-
- return (
-
- {props.mockDatasources.map((datasource: MockDatasource, idx) => {
- return (
-
- );
- })}
-
- );
-}
-
-export default MockDataSources;
-
-const CardWrapper = styled.div`
- display: flex;
- align-items: center;
- justify-content: space-between;
- height: 64px;
- border-radius: var(--ads-v2-border-radius);
- &:hover {
- background-color: var(--ads-v2-color-bg-subtle);
- cursor: pointer;
- }
-`;
-
-const DatasourceImage = styled.img`
- height: 34px;
- width: auto;
- margin: 0 auto;
- max-width: 100%;
-`;
-
-const DatasourceName = styled.span`
- font-size: 16px;
- font-weight: 400;
- line-height: 24px;
- letter-spacing: -0.24px;
- color: var(--ads-v2-color-fg);
-`;
-
-const DatasourceCardHeader = styled.div`
- display: flex;
- align-items: center;
- gap: 13px;
- padding-left: 13.5px;
-`;
-
-const DatasourceNameWrapper = styled.div`
- display: flex;
- flex-direction: column;
-`;
+import {
+ DatasourceContainer,
+ DatasourceSection,
+ DatasourceSectionHeading,
+ StyledDivider,
+} from "./IntegrationStyledComponents";
+import DatasourceItem from "./DatasourceItem";
+import {
+ createMessage,
+ SAMPLE_DATASOURCE_SUBHEADING,
+ SAMPLE_DATASOURCES,
+} from "ee/constants/messages";
+import { pluginSearchSelector } from "./CreateNewDatasourceHeader";
+import { Flex, Text } from "@appsmith/ads";
interface MockDatasourceCardProps {
datasource: MockDatasource;
workspaceId: string;
}
-export function MockDatasourceCard(props: MockDatasourceCardProps) {
+function MockDatasourceCard(props: MockDatasourceCardProps) {
const { datasource, workspaceId } = props;
const dispatch = useDispatch();
const pluginImages = useSelector(getPluginImages);
@@ -137,22 +73,67 @@ export function MockDatasourceCard(props: MockDatasourceCardProps) {
};
return (
-
-
-
-
-
- {datasource.name}
-
-
- {datasource.description}
-
-
-
-
+
+ );
+}
+
+interface MockDataSourcesProps {
+ mockDatasources: MockDatasource[];
+ preDivider?: boolean;
+ postDivider?: boolean;
+}
+
+export default function MockDataSources({
+ mockDatasources,
+ postDivider,
+ preDivider,
+}: MockDataSourcesProps) {
+ const workspaceId = useSelector(getCurrentWorkspaceId);
+ let searchedPlugin = useSelector((state) =>
+ pluginSearchSelector(state, "search"),
+ );
+
+ searchedPlugin = (searchedPlugin || "").toLocaleLowerCase();
+
+ const filteredDatasources = mockDatasources.filter((m) =>
+ m.name.toLocaleLowerCase().includes(searchedPlugin),
+ );
+
+ if (filteredDatasources.length === 0) return null;
+
+ return (
+ <>
+ {preDivider && }
+
+
+
+ {createMessage(SAMPLE_DATASOURCES)}
+
+ {createMessage(SAMPLE_DATASOURCE_SUBHEADING)}
+
+
+ {filteredDatasources.map((datasource: MockDatasource, idx) => {
+ return (
+
+ );
+ })}
+
+
+ {postDivider && }
+
);
}
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
deleted file mode 100644
index 3326d907619c..000000000000
--- a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
+++ /dev/null
@@ -1,350 +0,0 @@
-import React, { useCallback, useEffect, useState, type ReactNode } from "react";
-import { connect, useSelector } from "react-redux";
-import styled from "styled-components";
-import {
- createDatasourceFromForm,
- createTempDatasourceFromForm,
-} from "actions/datasourceActions";
-import type { AppState } from "ee/reducers";
-import PlusLogo from "assets/images/Plus-logo.svg";
-import GraphQLLogo from "assets/images/Graphql-logo.svg";
-import type { GenerateCRUDEnabledPluginMap, Plugin } from "api/PluginApi";
-import AnalyticsUtil from "ee/utils/AnalyticsUtil";
-import { PluginPackageName, PluginType } from "entities/Action";
-import { getQueryParams } from "utils/URLUtils";
-import { getGenerateCRUDEnabledPluginMap } from "ee/selectors/entitiesSelector";
-import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
-import { getAssetUrl } from "ee/utils/airgapHelpers";
-import { Spinner } from "@appsmith/ads";
-import { useEditorType } from "ee/hooks";
-import { useParentEntityInfo } from "ee/hooks/datasourceEditorHooks";
-import { createNewApiActionBasedOnEditorType } from "ee/actions/helpers";
-import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
-
-export const StyledContainer = styled.div`
- flex: 1;
- margin-top: 8px;
- .textBtn {
- font-size: 16px;
- line-height: 24px;
- margin: 0;
- justify-content: center;
- text-align: center;
- letter-spacing: -0.24px;
- color: var(--ads-v2-color-fg);
- font-weight: 400;
- text-decoration: none !important;
- flex-wrap: wrap;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- @media (min-width: 2500px) {
- .textBtn {
- font-size: 18px;
- }
- }
- @media (min-width: 2500px) {
- .eachCard {
- width: 240px;
- height: 200px;
- }
- .apiImage {
- margin-top: 25px;
- margin-bottom: 20px;
- height: 80px;
- }
- .curlImage {
- width: 100px;
- }
- .createIcon {
- height: 70px;
- }
- }
-`;
-
-export const ApiCardsContainer = styled.div`
- display: grid;
- grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
- gap: 16px;
- text-align: center;
- min-width: 150px;
- border-radius: 4px;
- align-items: center;
-
- .create-new-api {
- &:hover {
- cursor: pointer;
- }
- }
-`;
-
-export const ApiCard = styled.div`
- display: flex;
- align-items: center;
- justify-content: space-between;
- height: 64px;
- border-radius: var(--ads-v2-border-radius);
-
- &:hover {
- background-color: var(--ads-v2-color-bg-subtle);
- cursor: pointer;
- }
-
- .content-icon {
- height: 34px;
- width: auto;
- margin: 0 auto;
- max-width: 100%;
- }
-
- .cta {
- display: none;
- margin-right: 32px;
- }
-
- &:hover {
- .cta {
- display: flex;
- }
- }
-`;
-
-export const CardContentWrapper = styled.div`
- display: flex;
- align-items: center;
- gap: 13px;
- padding-left: 13.5px;
-`;
-
-interface ApiHomeScreenProps {
- location: {
- search: string;
- };
- pageId: string;
- plugins: Plugin[];
- // TODO: Fix this the next time the file is edited
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- createDatasourceFromForm: (data: any) => void;
- isCreating: boolean;
- // TODO: Fix this the next time the file is edited
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- showUnsupportedPluginDialog: (callback: any) => void;
- // TODO: Fix this the next time the file is edited
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- createTempDatasourceFromForm: (data: any) => void;
- showSaasAPIs: boolean; // If this is true, only SaaS APIs will be shown
- createNewApiActionBasedOnEditorType: (
- editorType: string,
- editorId: string,
- parentEntityId: string,
- parentEntityType: ActionParentEntityTypeInterface,
- apiType: string,
- ) => void;
- isOnboardingScreen?: boolean;
- children?: ReactNode;
-}
-
-type Props = ApiHomeScreenProps;
-
-export const API_ACTION = {
- IMPORT_CURL: "IMPORT_CURL",
- CREATE_NEW_API: "CREATE_NEW_API",
- CREATE_NEW_GRAPHQL_API: "CREATE_NEW_GRAPHQL_API",
- CREATE_DATASOURCE_FORM: "CREATE_DATASOURCE_FORM",
- AUTH_API: "AUTH_API",
-};
-
-function NewApiScreen(props: Props) {
- const { isCreating, isOnboardingScreen, pageId, plugins, showSaasAPIs } =
- props;
- const editorType = useEditorType(location.pathname);
- const { editorId, parentEntityId, parentEntityType } =
- useParentEntityInfo(editorType);
- const generateCRUDSupportedPlugin: GenerateCRUDEnabledPluginMap = useSelector(
- getGenerateCRUDEnabledPluginMap,
- );
- const [authApiPlugin, setAuthAPiPlugin] = useState();
-
- useEffect(() => {
- const plugin = plugins.find((p) => p.name === "REST API");
-
- setAuthAPiPlugin(plugin);
- }, [plugins]);
-
- const handleCreateAuthApiDatasource = useCallback(() => {
- if (authApiPlugin) {
- AnalyticsUtil.logEvent("CREATE_DATA_SOURCE_AUTH_API_CLICK", {
- pluginId: authApiPlugin.id,
- });
- AnalyticsUtil.logEvent("CREATE_DATA_SOURCE_CLICK", {
- pluginName: authApiPlugin.name,
- pluginPackageName: authApiPlugin.packageName,
- });
- props.createTempDatasourceFromForm({
- pluginId: authApiPlugin.id,
- });
- }
- }, [authApiPlugin, props.createTempDatasourceFromForm]);
-
- const handleCreateNew = (source: string) => {
- AnalyticsUtil.logEvent("CREATE_DATA_SOURCE_CLICK", {
- source,
- });
- props.createNewApiActionBasedOnEditorType(
- editorType,
- editorId,
- // Set parentEntityId as (parentEntityId or if it is onboarding screen then set it as pageId) else empty string
- parentEntityId || (isOnboardingScreen && pageId) || "",
- parentEntityType,
- source === API_ACTION.CREATE_NEW_GRAPHQL_API
- ? PluginPackageName.GRAPHQL
- : PluginPackageName.REST_API,
- );
- };
-
- // On click of any API card, handleOnClick action should be called to check if user came from generate-page flow.
- // if yes then show UnsupportedDialog for the API which are not supported to generate CRUD page.
- // TODO: Fix this the next time the file is edited
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- const handleOnClick = (actionType: string, params?: any) => {
- const queryParams = getQueryParams();
- const isGeneratePageInitiator = getIsGeneratePageInitiator(
- queryParams.isGeneratePageMode,
- );
-
- if (
- isGeneratePageInitiator &&
- !params?.skipValidPluginCheck &&
- !generateCRUDSupportedPlugin[params?.pluginId]
- ) {
- // show modal informing user that this will break the generate flow.
- props?.showUnsupportedPluginDialog(() =>
- handleOnClick(actionType, { skipValidPluginCheck: true, ...params }),
- );
-
- return;
- }
-
- switch (actionType) {
- case API_ACTION.CREATE_NEW_API:
- case API_ACTION.CREATE_NEW_GRAPHQL_API:
- handleCreateNew(actionType);
- break;
- case API_ACTION.CREATE_DATASOURCE_FORM: {
- props.createTempDatasourceFromForm({
- pluginId: params.pluginId,
- type: params.type,
- });
- break;
- }
- case API_ACTION.AUTH_API: {
- handleCreateAuthApiDatasource();
- break;
- }
- default:
- }
- };
-
- // Api plugins with Graphql
- const API_PLUGINS = plugins.filter((p) =>
- !showSaasAPIs
- ? p.packageName === PluginPackageName.GRAPHQL
- : p.type === PluginType.SAAS ||
- p.type === PluginType.REMOTE ||
- p.type === PluginType.EXTERNAL_SAAS,
- );
-
- return (
-
-
- {!showSaasAPIs && (
- <>
- handleOnClick(API_ACTION.CREATE_NEW_API)}
- >
-
-
- REST API
-
- {/*@ts-expect-error Fix this the next time the file is edited*/}
- {isCreating && }
-
- handleOnClick(API_ACTION.CREATE_NEW_GRAPHQL_API)}
- >
-
- 
- GraphQL API
-
-
- {authApiPlugin && (
- handleOnClick(API_ACTION.AUTH_API)}
- >
-
- })
- Authenticated API
-
-
- )}
-
- )}
- {API_PLUGINS.map((p) => (
- {
- AnalyticsUtil.logEvent("CREATE_DATA_SOURCE_CLICK", {
- pluginName: p.name,
- pluginPackageName: p.packageName,
- });
- handleOnClick(API_ACTION.CREATE_DATASOURCE_FORM, {
- pluginId: p.id,
- });
- }}
- >
-
- })
- {p.name}
-
-
- ))}
- {props.children}
-
-
- );
-}
-
-const mapStateToProps = (state: AppState) => ({
- plugins: state.entities.plugins.list,
-});
-
-const mapDispatchToProps = {
- createDatasourceFromForm,
- createTempDatasourceFromForm,
- createNewApiActionBasedOnEditorType,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(NewApiScreen);
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
deleted file mode 100644
index 15ea740854db..000000000000
--- a/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from "react";
-import styled from "styled-components";
-import DataSourceHome from "./DatasourceHome";
-import type { ActionParentEntityTypeInterface } from "ee/entities/Engine/actionHelpers";
-
-const QueryHomePage = styled.div`
- display: flex;
- flex-direction: column;
- margin-top: 8px;
- .sectionHeader {
- font-weight: ${(props) => props.theme.fontWeights[2]};
- font-size: ${(props) => props.theme.fontSizes[4]}px;
- margin-top: 10px;
- }
-`;
-
-interface QueryHomeScreenProps {
- editorId: string;
- editorType: string;
- parentEntityId: string;
- parentEntityType: ActionParentEntityTypeInterface;
- isCreating: boolean;
- location: {
- search: string;
- };
- showMostPopularPlugins?: boolean;
- // TODO: Fix this the next time the file is edited
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- showUnsupportedPluginDialog: (callback: any) => void;
- isAirgappedInstance?: boolean;
-}
-
-class QueryHomeScreen extends React.Component {
- render() {
- const {
- editorId,
- editorType,
- isAirgappedInstance,
- isCreating,
- location,
- parentEntityId,
- parentEntityType,
- showMostPopularPlugins,
- showUnsupportedPluginDialog,
- } = this.props;
-
- return (
-
-
-
- );
- }
-}
-
-export default QueryHomeScreen;
diff --git a/app/client/src/constants/PremiumDatasourcesConstants.ts b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Constants.ts
similarity index 77%
rename from app/client/src/constants/PremiumDatasourcesConstants.ts
rename to app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Constants.ts
index dba0034d1a02..ab1a78b51b74 100644
--- a/app/client/src/constants/PremiumDatasourcesConstants.ts
+++ b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Constants.ts
@@ -1,7 +1,7 @@
import { getAssetUrl } from "ee/utils/airgapHelpers";
-import { ASSETS_CDN_URL } from "./ThirdPartyConstants";
+import { ASSETS_CDN_URL } from "../../../../constants/ThirdPartyConstants";
-interface PremiumIntegration {
+export interface PremiumIntegration {
name: string;
icon: string;
}
@@ -13,7 +13,7 @@ export const PREMIUM_INTEGRATIONS: PremiumIntegration[] = [
},
{
name: "Salesforce",
- icon: getAssetUrl(`${ASSETS_CDN_URL}/salesforce-icon.png`),
+ icon: getAssetUrl(`${ASSETS_CDN_URL}/salesforce-image.png`),
},
{
name: "Slack",
diff --git a/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/ContactForm.tsx b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/ContactForm.tsx
index 63f265df3fed..4989bb154107 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/ContactForm.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/ContactForm.tsx
@@ -27,8 +27,8 @@ import {
handleLearnMoreClick,
handleSubmitEvent,
shouldLearnMoreButtonBeVisible,
-} from "utils/PremiumDatasourcesHelpers";
-import { PREMIUM_INTEGRATION_CONTACT_FORM } from "constants/PremiumDatasourcesConstants";
+} from "./Helpers";
+import { PREMIUM_INTEGRATION_CONTACT_FORM } from "./Constants";
const FormWrapper = styled.form`
display: flex;
diff --git a/app/client/src/utils/PremiumDatasourcesHelpers.ts b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Helpers.ts
similarity index 97%
rename from app/client/src/utils/PremiumDatasourcesHelpers.ts
rename to app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Helpers.ts
index ef33d6db3e3f..d4938be71b8c 100644
--- a/app/client/src/utils/PremiumDatasourcesHelpers.ts
+++ b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Helpers.ts
@@ -1,4 +1,4 @@
-import { SCHEDULE_CALL_URL } from "constants/PremiumDatasourcesConstants";
+import { SCHEDULE_CALL_URL } from "./Constants";
import { createMessage, PREMIUM_DATASOURCES } from "ee/constants/messages";
import AnalyticsUtil from "ee/utils/AnalyticsUtil";
import { isRelevantEmail } from "utils/formhelpers";
diff --git a/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/index.tsx b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/index.tsx
index e3b52ff4e61b..d585771198b1 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/index.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/index.tsx
@@ -1,16 +1,13 @@
import React, { useState } from "react";
-import { ApiCard, CardContentWrapper } from "../NewApi";
import { getAssetUrl } from "ee/utils/airgapHelpers";
-import { Modal, ModalContent, Tag, Text } from "@appsmith/ads";
+import { Modal, ModalContent, Tag } from "@appsmith/ads";
import styled from "styled-components";
import ContactForm from "./ContactForm";
-import { PREMIUM_INTEGRATIONS } from "constants/PremiumDatasourcesConstants";
-import {
- getTagText,
- handlePremiumDatasourceClick,
-} from "utils/PremiumDatasourcesHelpers";
+import { getTagText, handlePremiumDatasourceClick } from "./Helpers";
import { isFreePlan } from "ee/selectors/tenantSelectors";
import { useSelector } from "react-redux";
+import DatasourceItem from "../DatasourceItem";
+import type { PremiumIntegration } from "./Constants";
const ModalContentWrapper = styled(ModalContent)`
max-width: 518px;
@@ -35,7 +32,9 @@ const PremiumTag = styled(Tag)<{ isBusinessOrEnterprise: boolean }>`
}
`;
-export default function PremiumDatasources() {
+export default function PremiumDatasources(props: {
+ plugins: PremiumIntegration[];
+}) {
const [selectedIntegration, setSelectedIntegration] = useState("");
const isFreePlanInstance = useSelector(isFreePlan);
const handleOnClick = (name: string) => {
@@ -51,23 +50,16 @@ export default function PremiumDatasources() {
return (
<>
- {PREMIUM_INTEGRATIONS.map((integration) => (
- (
+ {
+ handleOnClick={() => {
handleOnClick(integration.name);
}}
- >
-
- })
-
- {integration.name}
-
+ icon={getAssetUrl(integration.icon)}
+ key={integration.name}
+ name={integration.name}
+ rightSibling={
{getTagText(!isFreePlanInstance)}
-
-
+ }
+ />
))}
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSEditorToolbar.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSEditorToolbar.tsx
index 6bde0b971347..10fd5f3f9f09 100644
--- a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSEditorToolbar.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSEditorToolbar.tsx
@@ -3,7 +3,7 @@ import { IDEToolbar, ToolbarSettingsPopover } from "IDE";
import { JSFunctionRun } from "./components/JSFunctionRun";
import type { JSActionDropdownOption } from "./types";
import type { SaveActionNameParams } from "PluginActionEditor";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import type { JSAction, JSCollection } from "entities/JSCollection";
import type { DropdownOnSelect } from "@appsmith/ads-old";
import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSHeader.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSHeader.tsx
index 35465e7e8e0f..adff92647f4a 100644
--- a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSHeader.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSHeader.tsx
@@ -3,7 +3,7 @@ import { JSFunctionRun } from "./components/JSFunctionRun";
import type { JSActionDropdownOption } from "./types";
import { ActionButtons, NameWrapper, StyledFormRow } from "../styledComponents";
import type { SaveActionNameParams } from "PluginActionEditor";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import type { JSAction, JSCollection } from "entities/JSCollection";
import type { DropdownOnSelect } from "@appsmith/ads-old";
import { JSObjectNameEditor } from "./JSObjectNameEditor";
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/JSObjectNameEditor.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/JSObjectNameEditor.tsx
index 58835f23f1c0..8b573866d645 100644
--- a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/JSObjectNameEditor.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/JSObjectNameEditor.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from "react";
import { useDispatch, useSelector } from "react-redux";
import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { getSavingStatusForJSObjectName } from "selectors/actionSelectors";
import { getAssetUrl } from "ee/utils/airgapHelpers";
import { Text as ADSText, Flex } from "@appsmith/ads";
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/old/JSObjectNameEditor.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/old/JSObjectNameEditor.tsx
index 53e1e920850a..cc1a07af7a38 100644
--- a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/old/JSObjectNameEditor.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/JSObjectNameEditor/old/JSObjectNameEditor.tsx
@@ -24,7 +24,7 @@ import NameEditorComponent, {
NameWrapper,
} from "components/utils/NameEditorComponent";
import { getSavingStatusForJSObjectName } from "selectors/actionSelectors";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import type { SaveActionNameParams } from "PluginActionEditor";
export interface JSObjectNameEditorProps {
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx b/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx
index 88d21b626452..1e2f67a8a63e 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryEditorContext.tsx
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import type { SaveActionNameParams } from "PluginActionEditor";
import React, { createContext, useMemo } from "react";
diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx
index a0dbc1228e79..14254403c8fe 100644
--- a/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList/StaticChange.tsx
@@ -15,7 +15,6 @@ const TitleText = styled(Text)`
export enum StaticChangeKind {
SETTINGS = "SETTINGS",
THEME = "THEME",
- PACKAGES = "PACKAGES",
MODULES = "MODULES",
REMOTE_AHEAD = "REMOTE_AHEAD",
REMOTE_BEHIND = "REMOTE_BEHIND",
@@ -56,17 +55,10 @@ const allStaticChangeDefs: Record<
message: "Theme modified",
iconName: "sip-line",
}),
- [StaticChangeKind.PACKAGES]: (status: GitStatusData) => ({
- condition: (status.modifiedPackages ?? 0) > 0,
- message: `${status.modifiedPackages ?? 0} ${
- (status.modifiedPackages ?? 0) > 0 ? "packages" : "package"
- } modified`,
- iconName: "package",
- }),
[StaticChangeKind.MODULES]: (status: GitStatusData) => ({
- condition: (status.modifiedModules ?? 0) > 0,
- message: `${status.modifiedModules ?? 0} ${
- (status.modifiedModules ?? 0) > 0 ? "modules" : "module"
+ condition: (status.modifiedSourceModules ?? 0) > 0,
+ message: `${status.modifiedSourceModules ?? 0} ${
+ (status.modifiedSourceModules ?? 0) > 0 ? "modules" : "module"
} modified`,
iconName: "package",
}),
diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.test.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.test.tsx
index f87d3a095b5a..2b756d7c2691 100644
--- a/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.test.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.test.tsx
@@ -342,39 +342,10 @@ describe("GitChangesList", () => {
expect(getByTestId("t--status-change-THEME")).toBeInTheDocument();
});
- it("should render Package related changes", () => {
- const store = getMockStore({
- gitStatus: {
- modifiedPackages: 2,
- },
- });
-
- const { getByTestId, queryByTestId } = render(
-
-
- ,
- );
-
- expect(
- queryByTestId("t--status-change-DATASOURCES"),
- ).not.toBeInTheDocument();
- expect(queryByTestId("t--status-change-JSLIBS")).not.toBeInTheDocument();
- expect(
- queryByTestId("t--status-change-REMOTE_AHEAD"),
- ).not.toBeInTheDocument();
- expect(
- queryByTestId("t--status-change-REMOTE_BEHIND"),
- ).not.toBeInTheDocument();
- expect(getByTestId("t--status-change-PACKAGES")).toBeInTheDocument();
- expect(queryByTestId("t--status-change-MODULES")).not.toBeInTheDocument();
- expect(queryByTestId("t--status-change-SETTINGS")).not.toBeInTheDocument();
- expect(queryByTestId("t--status-change-THEME")).not.toBeInTheDocument();
- });
-
it("should render Module related changes", () => {
const store = getMockStore({
gitStatus: {
- modifiedModules: 2,
+ modifiedSourceModules: 2,
},
});
diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.tsx
index bbb0ee34c58b..f850a6ea5797 100644
--- a/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList/index.tsx
@@ -50,7 +50,6 @@ export default function GitChangesList() {
-
{status?.migrationMessage ? (
diff --git a/app/client/src/reducers/entityReducers/appReducer.ts b/app/client/src/reducers/entityReducers/appReducer.ts
index 601443022038..63f00a927a9a 100644
--- a/app/client/src/reducers/entityReducers/appReducer.ts
+++ b/app/client/src/reducers/entityReducers/appReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { User } from "constants/userConstants";
import type { APP_MODE } from "entities/App";
diff --git a/app/client/src/reducers/entityReducers/autoHeightReducers/autoHeightLayoutTreeReducer.ts b/app/client/src/reducers/entityReducers/autoHeightReducers/autoHeightLayoutTreeReducer.ts
index 98467b227753..74abdcf150da 100644
--- a/app/client/src/reducers/entityReducers/autoHeightReducers/autoHeightLayoutTreeReducer.ts
+++ b/app/client/src/reducers/entityReducers/autoHeightReducers/autoHeightLayoutTreeReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { TreeNode } from "utils/autoHeight/constants";
import { xor } from "lodash";
@@ -12,6 +12,7 @@ export interface AutoHeightLayoutTreePayload {
export interface AutoHeightLayoutTreeReduxState {
[widgetId: string]: TreeNode;
}
+
const initialState: AutoHeightLayoutTreeReduxState = {};
const autoHeightLayoutTreeReducer = createImmerReducer(initialState, {
diff --git a/app/client/src/reducers/entityReducers/autoHeightReducers/canvasLevelsReducer.ts b/app/client/src/reducers/entityReducers/autoHeightReducers/canvasLevelsReducer.ts
index 763affe1dbef..62528eeb532f 100644
--- a/app/client/src/reducers/entityReducers/autoHeightReducers/canvasLevelsReducer.ts
+++ b/app/client/src/reducers/entityReducers/autoHeightReducers/canvasLevelsReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { AutoHeightLayoutTreePayload } from "./autoHeightLayoutTreeReducer";
diff --git a/app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts b/app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts
index 912c74bb5268..ccebf9e51b9b 100644
--- a/app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts
+++ b/app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { WidgetProps } from "widgets/BaseWidget";
import { uniq, get, set } from "lodash";
diff --git a/app/client/src/reducers/entityReducers/canvasWidgetsStructureReducer.ts b/app/client/src/reducers/entityReducers/canvasWidgetsStructureReducer.ts
index ac9b4fc21a0b..cf0d1bcaa565 100644
--- a/app/client/src/reducers/entityReducers/canvasWidgetsStructureReducer.ts
+++ b/app/client/src/reducers/entityReducers/canvasWidgetsStructureReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { WidgetProps } from "widgets/BaseWidget";
import type { WidgetType } from "constants/WidgetConstants";
diff --git a/app/client/src/reducers/entityReducers/datasourceReducer.ts b/app/client/src/reducers/entityReducers/datasourceReducer.ts
index 245afe5b48ae..67944ee64d15 100644
--- a/app/client/src/reducers/entityReducers/datasourceReducer.ts
+++ b/app/client/src/reducers/entityReducers/datasourceReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/reducers/entityReducers/metaReducer/index.ts b/app/client/src/reducers/entityReducers/metaReducer/index.ts
index d15a4ca181b0..26f0db37810b 100644
--- a/app/client/src/reducers/entityReducers/metaReducer/index.ts
+++ b/app/client/src/reducers/entityReducers/metaReducer/index.ts
@@ -6,7 +6,7 @@ import type {
BatchUpdateWidgetMetaPropertyPayload,
} from "actions/metaActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
WidgetReduxActionTypes,
diff --git a/app/client/src/reducers/entityReducers/metaReducer/metaReducer.test.ts b/app/client/src/reducers/entityReducers/metaReducer/metaReducer.test.ts
index 8881e2b94805..f63fb8e61408 100644
--- a/app/client/src/reducers/entityReducers/metaReducer/metaReducer.test.ts
+++ b/app/client/src/reducers/entityReducers/metaReducer/metaReducer.test.ts
@@ -1,6 +1,6 @@
import metaReducer, { initialState } from "./index";
import { updateMetaState } from "actions/metaActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
let currentMetaState = initialState;
diff --git a/app/client/src/reducers/entityReducers/metaReducer/metaReducerUtils.ts b/app/client/src/reducers/entityReducers/metaReducer/metaReducerUtils.ts
index 900f212c2245..43ca882f5101 100644
--- a/app/client/src/reducers/entityReducers/metaReducer/metaReducerUtils.ts
+++ b/app/client/src/reducers/entityReducers/metaReducer/metaReducerUtils.ts
@@ -4,7 +4,7 @@ import type {
PropertyOverrideDependency,
} from "ee/entities/DataTree/types";
import type { MetaState, WidgetMetaState } from ".";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import type { EvalMetaUpdates } from "ee/workers/common/DataTreeEvaluator/types";
import produce from "immer";
import { set, unset } from "lodash";
diff --git a/app/client/src/reducers/entityReducers/metaWidgetsReducer.ts b/app/client/src/reducers/entityReducers/metaWidgetsReducer.ts
index 36b96298e18b..fa2624860652 100644
--- a/app/client/src/reducers/entityReducers/metaWidgetsReducer.ts
+++ b/app/client/src/reducers/entityReducers/metaWidgetsReducer.ts
@@ -2,7 +2,7 @@ import { get, set, split, unset } from "lodash";
import { klona } from "klona";
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { WidgetProps } from "widgets/BaseWidget";
import type { BatchPropertyUpdatePayload } from "actions/controlActions";
@@ -39,6 +39,7 @@ export interface UpdateMetaWidgetPropertyPayload {
widgetId: string;
creatorId?: string;
}
+
export interface DeleteMetaWidgetsPayload {
creatorIds: string[];
}
diff --git a/app/client/src/reducers/entityReducers/pageListReducer.tsx b/app/client/src/reducers/entityReducers/pageListReducer.tsx
index 7ad83177412d..c8786f318475 100644
--- a/app/client/src/reducers/entityReducers/pageListReducer.tsx
+++ b/app/client/src/reducers/entityReducers/pageListReducer.tsx
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
@@ -16,6 +16,11 @@ import { sortBy } from "lodash";
import type { DSL } from "reducers/uiReducers/pageCanvasStructureReducer";
import { createReducer } from "utils/ReducerUtils";
import type { Page } from "entities/Page";
+import type { SupportedLayouts } from "./types";
+
+// exporting it as well so that existing imports are not affected
+// TODO: remove this once all imports are updated
+export type { SupportedLayouts };
const initialState: PageListReduxState = {
pages: [],
@@ -313,13 +318,6 @@ export const pageListReducer = createReducer(initialState, {
},
});
-export type SupportedLayouts =
- | "DESKTOP"
- | "TABLET_LARGE"
- | "TABLET"
- | "MOBILE"
- | "FLUID";
-
export interface AppLayoutConfig {
type: SupportedLayouts;
}
diff --git a/app/client/src/reducers/entityReducers/pluginsReducer.ts b/app/client/src/reducers/entityReducers/pluginsReducer.ts
index 52ba0e1938be..906f20f18bc8 100644
--- a/app/client/src/reducers/entityReducers/pluginsReducer.ts
+++ b/app/client/src/reducers/entityReducers/pluginsReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/reducers/entityReducers/types.ts b/app/client/src/reducers/entityReducers/types.ts
new file mode 100644
index 000000000000..dfddb2a6eac0
--- /dev/null
+++ b/app/client/src/reducers/entityReducers/types.ts
@@ -0,0 +1,6 @@
+export type SupportedLayouts =
+ | "DESKTOP"
+ | "TABLET_LARGE"
+ | "TABLET"
+ | "MOBILE"
+ | "FLUID";
diff --git a/app/client/src/reducers/evaluationReducers/dependencyReducer.ts b/app/client/src/reducers/evaluationReducers/dependencyReducer.ts
index b8800ba7ec66..47eee92a0277 100644
--- a/app/client/src/reducers/evaluationReducers/dependencyReducer.ts
+++ b/app/client/src/reducers/evaluationReducers/dependencyReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { DependencyMap } from "utils/DynamicBindingUtils";
diff --git a/app/client/src/reducers/evaluationReducers/formEvaluationReducer.ts b/app/client/src/reducers/evaluationReducers/formEvaluationReducer.ts
index 9dc18ab90faf..ffee81261c4e 100644
--- a/app/client/src/reducers/evaluationReducers/formEvaluationReducer.ts
+++ b/app/client/src/reducers/evaluationReducers/formEvaluationReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { FormConfigType } from "components/formControls/BaseControl";
import type { FetchPageActionPayload } from "actions/pageActions";
diff --git a/app/client/src/reducers/evaluationReducers/loadingEntitiesReducer.ts b/app/client/src/reducers/evaluationReducers/loadingEntitiesReducer.ts
index 05e6da8aea0b..6460a22c87d5 100644
--- a/app/client/src/reducers/evaluationReducers/loadingEntitiesReducer.ts
+++ b/app/client/src/reducers/evaluationReducers/loadingEntitiesReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { isEqual } from "lodash";
diff --git a/app/client/src/reducers/evaluationReducers/treeReducer.ts b/app/client/src/reducers/evaluationReducers/treeReducer.ts
index 5702cdd4442f..53f6c5034dbe 100644
--- a/app/client/src/reducers/evaluationReducers/treeReducer.ts
+++ b/app/client/src/reducers/evaluationReducers/treeReducer.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { applyChange } from "deep-diff";
import type { DataTree } from "entities/DataTree/dataTreeTypes";
diff --git a/app/client/src/reducers/evaluationReducers/triggerReducer.ts b/app/client/src/reducers/evaluationReducers/triggerReducer.ts
index 3902fe97e74c..96f1269f147f 100644
--- a/app/client/src/reducers/evaluationReducers/triggerReducer.ts
+++ b/app/client/src/reducers/evaluationReducers/triggerReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type {
ConditionalOutput,
diff --git a/app/client/src/reducers/uiReducers/actionSelectorReducer.ts b/app/client/src/reducers/uiReducers/actionSelectorReducer.ts
index 9ba1b470b75a..3644b1b1ba2e 100644
--- a/app/client/src/reducers/uiReducers/actionSelectorReducer.ts
+++ b/app/client/src/reducers/uiReducers/actionSelectorReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
export type ActionSelectorReduxState = Record<
diff --git a/app/client/src/reducers/uiReducers/activeFieldEditorReducer.ts b/app/client/src/reducers/uiReducers/activeFieldEditorReducer.ts
index e33b2abaf5a7..62c6dbc62631 100644
--- a/app/client/src/reducers/uiReducers/activeFieldEditorReducer.ts
+++ b/app/client/src/reducers/uiReducers/activeFieldEditorReducer.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { createReducer } from "utils/ReducerUtils";
diff --git a/app/client/src/reducers/uiReducers/analyticsReducer.ts b/app/client/src/reducers/uiReducers/analyticsReducer.ts
new file mode 100644
index 000000000000..c14cba65bb20
--- /dev/null
+++ b/app/client/src/reducers/uiReducers/analyticsReducer.ts
@@ -0,0 +1,35 @@
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import { createReducer } from "utils/ReducerUtils";
+
+export type SegmentState = "INIT_SUCCESS" | "INIT_UNCERTAIN";
+export const initialState: AnalyticsReduxState = {
+ telemetry: {},
+};
+
+export interface AnalyticsReduxState {
+ telemetry: {
+ segmentState?: SegmentState;
+ };
+}
+
+export const handlers = {
+ [ReduxActionTypes.SEGMENT_INITIALIZED]: (
+ state: AnalyticsReduxState,
+ ): AnalyticsReduxState => ({
+ ...state,
+ telemetry: {
+ ...state.telemetry,
+ segmentState: "INIT_SUCCESS",
+ },
+ }),
+ [ReduxActionTypes.SEGMENT_INIT_UNCERTAIN]: (
+ state: AnalyticsReduxState,
+ ): AnalyticsReduxState => ({
+ ...state,
+ telemetry: {
+ ...state.telemetry,
+ segmentState: "INIT_UNCERTAIN",
+ },
+ }),
+};
+export default createReducer(initialState, handlers);
diff --git a/app/client/src/reducers/uiReducers/appSettingsPaneReducer.ts b/app/client/src/reducers/uiReducers/appSettingsPaneReducer.ts
index 63c40b18a2e0..c49045b8bfcd 100644
--- a/app/client/src/reducers/uiReducers/appSettingsPaneReducer.ts
+++ b/app/client/src/reducers/uiReducers/appSettingsPaneReducer.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { AppSettingsTabs } from "pages/Editor/AppSettingsPane/AppSettings";
import { createReducer } from "utils/ReducerUtils";
diff --git a/app/client/src/reducers/uiReducers/appThemingReducer.ts b/app/client/src/reducers/uiReducers/appThemingReducer.ts
index 3646c7035a28..c7cc3508d241 100644
--- a/app/client/src/reducers/uiReducers/appThemingReducer.ts
+++ b/app/client/src/reducers/uiReducers/appThemingReducer.ts
@@ -1,7 +1,7 @@
import type { AppTheme } from "entities/AppTheming";
import type { AppThemingMode } from "selectors/appThemingSelectors";
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
export interface AppThemingState {
diff --git a/app/client/src/reducers/uiReducers/appViewReducer.tsx b/app/client/src/reducers/uiReducers/appViewReducer.tsx
index 05ffcdbfcad3..57ca1d59a63d 100644
--- a/app/client/src/reducers/uiReducers/appViewReducer.tsx
+++ b/app/client/src/reducers/uiReducers/appViewReducer.tsx
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/reducers/uiReducers/autoHeightReducer.ts b/app/client/src/reducers/uiReducers/autoHeightReducer.ts
index c84ba1cc9f03..87fabc24fe6f 100644
--- a/app/client/src/reducers/uiReducers/autoHeightReducer.ts
+++ b/app/client/src/reducers/uiReducers/autoHeightReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
export interface AutoHeightUIStatePayload {
diff --git a/app/client/src/reducers/uiReducers/buildingBlockReducer.ts b/app/client/src/reducers/uiReducers/buildingBlockReducer.ts
index dd89ed2e951f..b4dfdf5b2345 100644
--- a/app/client/src/reducers/uiReducers/buildingBlockReducer.ts
+++ b/app/client/src/reducers/uiReducers/buildingBlockReducer.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts b/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
index 19e1b0359234..90b3256aa0f5 100644
--- a/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
+++ b/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
import type { XYCord } from "layoutSystems/common/canvasArenas/ArenaTypes";
diff --git a/app/client/src/reducers/uiReducers/crudInfoModalReducer.ts b/app/client/src/reducers/uiReducers/crudInfoModalReducer.ts
index 1ff69b6f5519..f33a39f7cc74 100644
--- a/app/client/src/reducers/uiReducers/crudInfoModalReducer.ts
+++ b/app/client/src/reducers/uiReducers/crudInfoModalReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { SetCrudInfoModalOpenPayload } from "actions/crudInfoModalActions";
diff --git a/app/client/src/reducers/uiReducers/datasourceNameReducer.ts b/app/client/src/reducers/uiReducers/datasourceNameReducer.ts
index 526125af2f30..dc6cd46a13ba 100644
--- a/app/client/src/reducers/uiReducers/datasourceNameReducer.ts
+++ b/app/client/src/reducers/uiReducers/datasourceNameReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/reducers/uiReducers/datasourcePaneReducer.ts b/app/client/src/reducers/uiReducers/datasourcePaneReducer.ts
index 0790740e1fca..29c137943c55 100644
--- a/app/client/src/reducers/uiReducers/datasourcePaneReducer.ts
+++ b/app/client/src/reducers/uiReducers/datasourcePaneReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { Datasource } from "entities/Datasource";
import _ from "lodash";
diff --git a/app/client/src/reducers/uiReducers/debuggerReducer.ts b/app/client/src/reducers/uiReducers/debuggerReducer.ts
index e86f1b6d61e0..136d8d769f44 100644
--- a/app/client/src/reducers/uiReducers/debuggerReducer.ts
+++ b/app/client/src/reducers/uiReducers/debuggerReducer.ts
@@ -1,6 +1,6 @@
import { createImmerReducer } from "utils/ReducerUtils";
import type { Log } from "entities/AppsmithConsole";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { omit, isUndefined, isEmpty } from "lodash";
import equal from "fast-deep-equal";
diff --git a/app/client/src/reducers/uiReducers/dragResizeReducer.ts b/app/client/src/reducers/uiReducers/dragResizeReducer.ts
index a90cffb23897..00d728b9bf45 100644
--- a/app/client/src/reducers/uiReducers/dragResizeReducer.ts
+++ b/app/client/src/reducers/uiReducers/dragResizeReducer.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
import { createImmerReducer } from "utils/ReducerUtils";
@@ -181,6 +181,7 @@ export interface DraggingGroupCenter {
top?: number;
left?: number;
}
+
export interface DragDetails {
dragGroupActualParent?: string;
draggingGroupCenter?: DraggingGroupCenter;
diff --git a/app/client/src/reducers/uiReducers/errorReducer.tsx b/app/client/src/reducers/uiReducers/errorReducer.tsx
index edbca32b4f19..f62b5930b172 100644
--- a/app/client/src/reducers/uiReducers/errorReducer.tsx
+++ b/app/client/src/reducers/uiReducers/errorReducer.tsx
@@ -1,8 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type {
- ReduxAction,
- ReduxActionErrorPayload,
-} from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { ERROR_CODES } from "ee/constants/ApiConstants";
import _ from "lodash";
@@ -13,6 +10,13 @@ const initialState: ErrorReduxState = {
currentError: { sourceAction: "", message: "", stackTrace: "" },
};
+interface ReduxActionErrorPayload {
+ message: string;
+ source?: string;
+ code?: ERROR_CODES;
+ stackTrace?: string;
+}
+
const errorReducer = createReducer(initialState, {
[ReduxActionTypes.SAFE_CRASH_APPSMITH]: (
state: ErrorReduxState,
diff --git a/app/client/src/reducers/uiReducers/gitSyncReducer.ts b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
index b1a740bec61b..dfef740a6353 100644
--- a/app/client/src/reducers/uiReducers/gitSyncReducer.ts
+++ b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
@@ -754,8 +754,7 @@ export interface GitStatusData {
modifiedJSObjects: number;
modifiedQueries: number;
modifiedJSLibs: number;
- modifiedPackages?: number;
- modifiedModules?: number;
+ modifiedSourceModules?: number;
modifiedModuleInstances?: number;
}
diff --git a/app/client/src/reducers/uiReducers/globalSearchReducer.ts b/app/client/src/reducers/uiReducers/globalSearchReducer.ts
index 9bcffb5d7510..3eac13cb0571 100644
--- a/app/client/src/reducers/uiReducers/globalSearchReducer.ts
+++ b/app/client/src/reducers/uiReducers/globalSearchReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type {
RecentEntity,
diff --git a/app/client/src/reducers/uiReducers/helpReducer.ts b/app/client/src/reducers/uiReducers/helpReducer.ts
index 23b782fbd1d5..1dec5b375a26 100644
--- a/app/client/src/reducers/uiReducers/helpReducer.ts
+++ b/app/client/src/reducers/uiReducers/helpReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
const initialState: HelpReduxState = {
diff --git a/app/client/src/reducers/uiReducers/ideReducer.ts b/app/client/src/reducers/uiReducers/ideReducer.ts
index 5b6d03c3d1f6..d95153394e25 100644
--- a/app/client/src/reducers/uiReducers/ideReducer.ts
+++ b/app/client/src/reducers/uiReducers/ideReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { EditorEntityTab, EditorViewMode } from "ee/entities/IDE/constants";
import { klona } from "klona";
diff --git a/app/client/src/reducers/uiReducers/importReducer.ts b/app/client/src/reducers/uiReducers/importReducer.ts
index 34d2d79ebb87..35382b6edd6d 100644
--- a/app/client/src/reducers/uiReducers/importReducer.ts
+++ b/app/client/src/reducers/uiReducers/importReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/reducers/uiReducers/jsObjectNameReducer.tsx b/app/client/src/reducers/uiReducers/jsObjectNameReducer.tsx
index 99cec7cff05b..dd3a14807542 100644
--- a/app/client/src/reducers/uiReducers/jsObjectNameReducer.tsx
+++ b/app/client/src/reducers/uiReducers/jsObjectNameReducer.tsx
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/reducers/uiReducers/jsPaneReducer.ts b/app/client/src/reducers/uiReducers/jsPaneReducer.ts
index c8d8af615f60..79fbcb633bc7 100644
--- a/app/client/src/reducers/uiReducers/jsPaneReducer.ts
+++ b/app/client/src/reducers/uiReducers/jsPaneReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/reducers/uiReducers/layoutConversionReducer.ts b/app/client/src/reducers/uiReducers/layoutConversionReducer.ts
index 0f64d0ac65b9..8804cc204281 100644
--- a/app/client/src/reducers/uiReducers/layoutConversionReducer.ts
+++ b/app/client/src/reducers/uiReducers/layoutConversionReducer.ts
@@ -1,6 +1,6 @@
import { createImmerReducer } from "utils/ReducerUtils";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
export enum AlertType {
SUCCESS = "SUCCESS",
diff --git a/app/client/src/reducers/uiReducers/libraryReducer.ts b/app/client/src/reducers/uiReducers/libraryReducer.ts
index 23baf043507c..58451ef005eb 100644
--- a/app/client/src/reducers/uiReducers/libraryReducer.ts
+++ b/app/client/src/reducers/uiReducers/libraryReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/reducers/uiReducers/mainCanvasReducer.ts b/app/client/src/reducers/uiReducers/mainCanvasReducer.ts
index cc40d8631a6b..a86bf9c07170 100644
--- a/app/client/src/reducers/uiReducers/mainCanvasReducer.ts
+++ b/app/client/src/reducers/uiReducers/mainCanvasReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import {
layoutConfigurations,
diff --git a/app/client/src/reducers/uiReducers/modalActionReducer.ts b/app/client/src/reducers/uiReducers/modalActionReducer.ts
index 3ae0df906523..42e4115f6bb3 100644
--- a/app/client/src/reducers/uiReducers/modalActionReducer.ts
+++ b/app/client/src/reducers/uiReducers/modalActionReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
const initialState: ModalActionReduxState = {
@@ -30,6 +30,7 @@ export interface ModalInfo {
modalOpen: boolean;
modalType: ModalType;
}
+
export interface ModalActionReduxState {
modals: ModalInfo[];
}
diff --git a/app/client/src/reducers/uiReducers/onBoardingReducer.ts b/app/client/src/reducers/uiReducers/onBoardingReducer.ts
index 2b86d144cfd3..7f3c295713ac 100644
--- a/app/client/src/reducers/uiReducers/onBoardingReducer.ts
+++ b/app/client/src/reducers/uiReducers/onBoardingReducer.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { SIGNPOSTING_STEP } from "pages/Editor/FirstTimeUserOnboarding/Utils";
import { createReducer } from "utils/ReducerUtils";
diff --git a/app/client/src/reducers/uiReducers/oneClickBindingReducer.ts b/app/client/src/reducers/uiReducers/oneClickBindingReducer.ts
index 42540ebaf5ef..b9c423f68450 100644
--- a/app/client/src/reducers/uiReducers/oneClickBindingReducer.ts
+++ b/app/client/src/reducers/uiReducers/oneClickBindingReducer.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { createReducer } from "utils/ReducerUtils";
import type { WidgetQueryGenerationFormConfig } from "WidgetQueryGenerators/types";
diff --git a/app/client/src/reducers/uiReducers/pageCanvasStructureReducer.ts b/app/client/src/reducers/uiReducers/pageCanvasStructureReducer.ts
index a786443e9923..14fd81652b84 100644
--- a/app/client/src/reducers/uiReducers/pageCanvasStructureReducer.ts
+++ b/app/client/src/reducers/uiReducers/pageCanvasStructureReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
@@ -18,6 +18,7 @@ export interface CanvasStructure {
export interface DSL extends WidgetProps {
children?: DSL[];
}
+
export interface PageCanvasStructureReduxState {
[pageId: string]: CanvasStructure;
}
diff --git a/app/client/src/reducers/uiReducers/pageWidgetsReducer.ts b/app/client/src/reducers/uiReducers/pageWidgetsReducer.ts
index 731580563674..51b922586f2d 100644
--- a/app/client/src/reducers/uiReducers/pageWidgetsReducer.ts
+++ b/app/client/src/reducers/uiReducers/pageWidgetsReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { FlattenedDSL } from "@shared/dsl";
diff --git a/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx b/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx
index e5d92495b65d..a69a679ce5e5 100644
--- a/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx
+++ b/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { DEFAULT_PROPERTY_PANE_WIDTH } from "constants/AppConstants";
import { createImmerReducer } from "utils/ReducerUtils";
diff --git a/app/client/src/reducers/uiReducers/reflowReducer.ts b/app/client/src/reducers/uiReducers/reflowReducer.ts
index 43631db5d73b..222767b4911c 100644
--- a/app/client/src/reducers/uiReducers/reflowReducer.ts
+++ b/app/client/src/reducers/uiReducers/reflowReducer.ts
@@ -1,8 +1,6 @@
import { createReducer } from "utils/ReducerUtils";
-import {
- type ReduxAction,
- ReduxActionTypes,
-} from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import { type ReduxAction } from "actions/ReduxActionTypes";
import type { ReflowedSpaceMap } from "reflow/reflowTypes";
const initialState: widgetReflow = {
diff --git a/app/client/src/reducers/uiReducers/releasesReducer.ts b/app/client/src/reducers/uiReducers/releasesReducer.ts
index 87cf6f73eab8..8a48a294a9c4 100644
--- a/app/client/src/reducers/uiReducers/releasesReducer.ts
+++ b/app/client/src/reducers/uiReducers/releasesReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
const initialState: ReleasesState = {
diff --git a/app/client/src/reducers/uiReducers/tableFilterPaneReducer.tsx b/app/client/src/reducers/uiReducers/tableFilterPaneReducer.tsx
index bc79a65c482f..fa1f3ad61f09 100644
--- a/app/client/src/reducers/uiReducers/tableFilterPaneReducer.tsx
+++ b/app/client/src/reducers/uiReducers/tableFilterPaneReducer.tsx
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { ShowPropertyPanePayload } from "actions/propertyPaneActions";
diff --git a/app/client/src/reducers/uiReducers/templateReducer.ts b/app/client/src/reducers/uiReducers/templateReducer.ts
index bb193d12b43a..ce267b8df792 100644
--- a/app/client/src/reducers/uiReducers/templateReducer.ts
+++ b/app/client/src/reducers/uiReducers/templateReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/reducers/uiReducers/themeReducer.ts b/app/client/src/reducers/uiReducers/themeReducer.ts
index fde0a11ba78f..0c922d7e66fd 100644
--- a/app/client/src/reducers/uiReducers/themeReducer.ts
+++ b/app/client/src/reducers/uiReducers/themeReducer.ts
@@ -1,5 +1,5 @@
import { createImmerReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { dark, light, theme } from "constants/DefaultTheme";
import { ThemeMode } from "selectors/themeSelectors";
diff --git a/app/client/src/reducers/uiReducers/tourReducer.ts b/app/client/src/reducers/uiReducers/tourReducer.ts
index 3842411982af..d5c445248066 100644
--- a/app/client/src/reducers/uiReducers/tourReducer.ts
+++ b/app/client/src/reducers/uiReducers/tourReducer.ts
@@ -1,5 +1,5 @@
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { TourType } from "entities/Tour";
diff --git a/app/client/src/reducers/uiReducers/usersReducer.ts b/app/client/src/reducers/uiReducers/usersReducer.ts
index ff21366257a5..9582e6fad805 100644
--- a/app/client/src/reducers/uiReducers/usersReducer.ts
+++ b/app/client/src/reducers/uiReducers/usersReducer.ts
@@ -1,6 +1,6 @@
import _ from "lodash";
import { createReducer } from "utils/ReducerUtils";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
index a6dc1fcd9efc..9a7d323d49eb 100644
--- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
@@ -21,7 +21,7 @@ import {
import { handleExecuteJSFunctionSaga } from "sagas/JSPaneSagas";
import type { ApplicationPayload } from "entities/Application";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index 92e2a26ef931..3fffd65284af 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -51,10 +51,7 @@ import {
ERROR_ACTION_MOVE_FAIL,
ERROR_ACTION_RENAME_FAIL,
} from "ee/constants/messages";
-import type {
- EvaluationReduxAction,
- ReduxAction,
-} from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
@@ -148,6 +145,7 @@ import {
RequestPayloadAnalyticsPath,
} from "./helper";
import { handleQueryEntityRedirect } from "./IDESaga";
+import type { EvaluationReduxAction } from "actions/EvaluationReduxActionTypes";
export const DEFAULT_PREFIX = {
QUERY: "Query",
diff --git a/app/client/src/sagas/AnalyticsSaga.ts b/app/client/src/sagas/AnalyticsSaga.ts
index 3d9c0ce5c300..87477f4407a1 100644
--- a/app/client/src/sagas/AnalyticsSaga.ts
+++ b/app/client/src/sagas/AnalyticsSaga.ts
@@ -1,7 +1,5 @@
-import {
- ReduxActionTypes,
- type ReduxActionType,
-} from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import type { ReduxActionType } from "actions/ReduxActionTypes";
import type { Action } from "entities/Action";
import AnalyticsUtil from "ee/utils/AnalyticsUtil";
import {
diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts
index c25e8f1942ac..696b5137f378 100644
--- a/app/client/src/sagas/ApiPaneSagas.ts
+++ b/app/client/src/sagas/ApiPaneSagas.ts
@@ -7,7 +7,7 @@ import { all, call, put, select, take, takeEvery } from "redux-saga/effects";
import type {
ReduxAction,
ReduxActionWithMeta,
-} from "ee/constants/ReduxActionConstants";
+} from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/AppThemingSaga.tsx b/app/client/src/sagas/AppThemingSaga.tsx
index 3f57b894e4bc..283a0fcc5a3b 100644
--- a/app/client/src/sagas/AppThemingSaga.tsx
+++ b/app/client/src/sagas/AppThemingSaga.tsx
@@ -6,7 +6,7 @@ import type {
UpdateSelectedAppThemeAction,
} from "actions/appThemingActions";
import { updateisBetaCardShownAction } from "actions/appThemingActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/AutoLayoutUpdateSagas.tsx b/app/client/src/sagas/AutoLayoutUpdateSagas.tsx
index d1229900c6bb..6a317e21f0ec 100644
--- a/app/client/src/sagas/AutoLayoutUpdateSagas.tsx
+++ b/app/client/src/sagas/AutoLayoutUpdateSagas.tsx
@@ -1,5 +1,5 @@
import { updateAndSaveLayout } from "actions/pageActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/BatchSagas.tsx b/app/client/src/sagas/BatchSagas.tsx
index 346724c780ca..3ee3c623de60 100644
--- a/app/client/src/sagas/BatchSagas.tsx
+++ b/app/client/src/sagas/BatchSagas.tsx
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
import _ from "lodash";
import { put, debounce, takeEvery, all } from "redux-saga/effects";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { batchActionSuccess } from "actions/batchActions";
import * as log from "loglevel";
diff --git a/app/client/src/sagas/BuildingBlockSagas/BuildingBlockAdditionSagas.ts b/app/client/src/sagas/BuildingBlockSagas/BuildingBlockAdditionSagas.ts
index 056151e804e2..527471df9bf7 100644
--- a/app/client/src/sagas/BuildingBlockSagas/BuildingBlockAdditionSagas.ts
+++ b/app/client/src/sagas/BuildingBlockSagas/BuildingBlockAdditionSagas.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/BuildingBlockSagas/tests/AddAndMoveBuildingBlockTests.test.ts b/app/client/src/sagas/BuildingBlockSagas/tests/AddAndMoveBuildingBlockTests.test.ts
index 03ed20ce5729..b3188c5e52c7 100644
--- a/app/client/src/sagas/BuildingBlockSagas/tests/AddAndMoveBuildingBlockTests.test.ts
+++ b/app/client/src/sagas/BuildingBlockSagas/tests/AddAndMoveBuildingBlockTests.test.ts
@@ -1,7 +1,5 @@
-import {
- ReduxActionTypes,
- type ReduxAction,
-} from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import { type ReduxAction } from "actions/ReduxActionTypes";
import { getAction } from "ee/selectors/entitiesSelector";
import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors";
import type { WidgetAddChild } from "actions/pageActions";
diff --git a/app/client/src/sagas/BuildingBlockSagas/tests/fixtures.ts b/app/client/src/sagas/BuildingBlockSagas/tests/fixtures.ts
index 09ca8be2bb87..f3aaa8044e75 100644
--- a/app/client/src/sagas/BuildingBlockSagas/tests/fixtures.ts
+++ b/app/client/src/sagas/BuildingBlockSagas/tests/fixtures.ts
@@ -1,5 +1,5 @@
import type { WidgetAddChild } from "actions/pageActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import type { WidgetDraggingUpdateParams } from "layoutSystems/common/canvasArenas/ArenaTypes";
import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
import { PaginationType, PluginType, type Action } from "entities/Action";
diff --git a/app/client/src/sagas/CanvasSagas/AutoLayoutDraggingSagas.ts b/app/client/src/sagas/CanvasSagas/AutoLayoutDraggingSagas.ts
index 42a2d26d5dc2..7eafa1795143 100644
--- a/app/client/src/sagas/CanvasSagas/AutoLayoutDraggingSagas.ts
+++ b/app/client/src/sagas/CanvasSagas/AutoLayoutDraggingSagas.ts
@@ -1,6 +1,6 @@
import type { WidgetAddChild } from "actions/pageActions";
import { updateAndSaveLayout } from "actions/pageActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
index 87d01793e2fa..85dcd1e0bdb7 100644
--- a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
+++ b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/CanvasSagas/SelectionCanvasSagas.ts b/app/client/src/sagas/CanvasSagas/SelectionCanvasSagas.ts
index 250d71eb20be..45cac5cae258 100644
--- a/app/client/src/sagas/CanvasSagas/SelectionCanvasSagas.ts
+++ b/app/client/src/sagas/CanvasSagas/SelectionCanvasSagas.ts
@@ -1,6 +1,6 @@
import { selectWidgetInitAction } from "actions/widgetSelectionActions";
import type { OccupiedSpace } from "constants/CanvasEditorConstants";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
import equal from "fast-deep-equal/es6";
diff --git a/app/client/src/sagas/CommunityTemplatesSagas.tsx b/app/client/src/sagas/CommunityTemplatesSagas.tsx
index 449fd6e36ef9..f2f6934b9431 100644
--- a/app/client/src/sagas/CommunityTemplatesSagas.tsx
+++ b/app/client/src/sagas/CommunityTemplatesSagas.tsx
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/CurlImportSagas.ts b/app/client/src/sagas/CurlImportSagas.ts
index 631b040469b2..3850e8bb8f7f 100644
--- a/app/client/src/sagas/CurlImportSagas.ts
+++ b/app/client/src/sagas/CurlImportSagas.ts
@@ -1,5 +1,5 @@
import { takeLatest, put, all, select } from "redux-saga/effects";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/sagas/DebuggerSagas.ts b/app/client/src/sagas/DebuggerSagas.ts
index 820bee5e241b..826159989860 100644
--- a/app/client/src/sagas/DebuggerSagas.ts
+++ b/app/client/src/sagas/DebuggerSagas.ts
@@ -8,7 +8,7 @@ import {
debuggerLogInit,
deleteErrorLog,
} from "actions/debuggerActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type {
Log,
diff --git a/app/client/src/sagas/ErrorSagas.tsx b/app/client/src/sagas/ErrorSagas.tsx
index 1669fb5c4cad..3e9426fe7daa 100644
--- a/app/client/src/sagas/ErrorSagas.tsx
+++ b/app/client/src/sagas/ErrorSagas.tsx
@@ -1,9 +1,7 @@
import { get } from "lodash";
+import { type ReduxAction } from "actions/ReduxActionTypes";
import {
- type ReduxAction,
toastMessageErrorTypes,
-} from "ee/constants/ReduxActionConstants";
-import {
ReduxActionTypes,
ReduxActionErrorTypes,
} from "ee/constants/ReduxActionConstants";
@@ -183,6 +181,7 @@ export interface ErrorPayloadType {
message?: string;
crash?: boolean;
}
+
const ActionErrorDisplayMap: {
[key: string]: (error: ErrorPayloadType) => string;
} = {
diff --git a/app/client/src/sagas/EvaluationsSaga.test.ts b/app/client/src/sagas/EvaluationsSaga.test.ts
index 0513f4a3e336..87686bb4a3a1 100644
--- a/app/client/src/sagas/EvaluationsSaga.test.ts
+++ b/app/client/src/sagas/EvaluationsSaga.test.ts
@@ -13,7 +13,7 @@ import { getSelectedAppTheme } from "selectors/appThemingSelectors";
import { getAppMode } from "ee/selectors/applicationSelectors";
import * as log from "loglevel";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts
index 8c3c497ed5ce..f0b067526904 100644
--- a/app/client/src/sagas/EvaluationsSaga.ts
+++ b/app/client/src/sagas/EvaluationsSaga.ts
@@ -12,11 +12,10 @@ import {
} from "redux-saga/effects";
import type {
- EvaluationReduxAction,
ReduxAction,
ReduxActionType,
AnyReduxAction,
-} from "ee/constants/ReduxActionConstants";
+} from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import {
getDataTree,
@@ -104,7 +103,6 @@ import { waitForWidgetConfigBuild } from "./InitSagas";
import { logDynamicTriggerExecution } from "ee/sagas/analyticsSaga";
import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors";
import { fetchFeatureFlagsInit } from "actions/userActions";
-import type { AffectedJSObjects } from "./EvaluationsSagaUtils";
import {
getAffectedJSObjectIdsFromAction,
parseUpdatesAndDeleteUndefinedUpdates,
@@ -121,6 +119,10 @@ import {
getCurrentPageId,
} from "selectors/editorSelectors";
import { getInstanceId } from "ee/selectors/tenantSelectors";
+import type {
+ AffectedJSObjects,
+ EvaluationReduxAction,
+} from "actions/EvaluationReduxActionTypes";
const APPSMITH_CONFIGS = getAppsmithConfigs();
diff --git a/app/client/src/sagas/EvaluationsSagaUtils.test.ts b/app/client/src/sagas/EvaluationsSagaUtils.test.ts
index 380bff5bf12c..3c773c94e4fa 100644
--- a/app/client/src/sagas/EvaluationsSagaUtils.test.ts
+++ b/app/client/src/sagas/EvaluationsSagaUtils.test.ts
@@ -8,14 +8,12 @@ import {
} from "actions/jsActionActions";
import { updateJSCollectionBodySuccess } from "actions/jsPaneActions";
import type { JSCollection } from "entities/JSCollection";
-import type {
- BufferedReduxAction,
- ReduxAction,
-} from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
} from "ee/constants/ReduxActionConstants";
+import type { BufferedReduxAction } from "actions/EvaluationReduxActionTypes";
describe("getAffectedJSObjectIdsFromAction", () => {
const jsObject1 = { id: "1234" } as JSCollection;
diff --git a/app/client/src/sagas/EvaluationsSagaUtils.ts b/app/client/src/sagas/EvaluationsSagaUtils.ts
index a6f936c456ec..dfa4e96227b2 100644
--- a/app/client/src/sagas/EvaluationsSagaUtils.ts
+++ b/app/client/src/sagas/EvaluationsSagaUtils.ts
@@ -1,10 +1,11 @@
-import type {
- BufferedReduxAction,
- ReduxAction,
-} from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { AFFECTED_JS_OBJECTS_FNS } from "ee/sagas/InferAffectedJSObjects";
import log from "loglevel";
import type { DiffWithNewTreeState } from "workers/Evaluation/helpers";
+import type {
+ AffectedJSObjects,
+ BufferedReduxAction,
+} from "actions/EvaluationReduxActionTypes";
export const parseUpdatesAndDeleteUndefinedUpdates = (
updates: string,
@@ -53,11 +54,6 @@ export const parseUpdatesAndDeleteUndefinedUpdates = (
return consolidatedUpdates;
};
-export interface AffectedJSObjects {
- ids: string[];
- isAllAffected: boolean;
-}
-
const mergeAffectedJSObjects = (
action: ReduxAction | BufferedReduxAction,
) => {
diff --git a/app/client/src/sagas/FormEvaluationSaga.ts b/app/client/src/sagas/FormEvaluationSaga.ts
index 548adba699a1..224d6a71f1a8 100644
--- a/app/client/src/sagas/FormEvaluationSaga.ts
+++ b/app/client/src/sagas/FormEvaluationSaga.ts
@@ -1,6 +1,6 @@
import type { ActionPattern } from "redux-saga/effects";
import { call, take, select, put, actionChannel } from "redux-saga/effects";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import log from "loglevel";
import * as Sentry from "@sentry/react";
diff --git a/app/client/src/sagas/GitSyncSagas.ts b/app/client/src/sagas/GitSyncSagas.ts
index 8b4d9340aef6..f00e60ac941e 100644
--- a/app/client/src/sagas/GitSyncSagas.ts
+++ b/app/client/src/sagas/GitSyncSagas.ts
@@ -1,7 +1,7 @@
import type {
ReduxAction,
ReduxActionWithCallbacks,
-} from "ee/constants/ReduxActionConstants";
+} from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/GlobalSearchSagas.ts b/app/client/src/sagas/GlobalSearchSagas.ts
index 93e29c0b29dc..f758a41b819f 100644
--- a/app/client/src/sagas/GlobalSearchSagas.ts
+++ b/app/client/src/sagas/GlobalSearchSagas.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import {
all,
diff --git a/app/client/src/sagas/IDESaga.tsx b/app/client/src/sagas/IDESaga.tsx
index 83161b0badbd..539b42af8ab7 100644
--- a/app/client/src/sagas/IDESaga.tsx
+++ b/app/client/src/sagas/IDESaga.tsx
@@ -18,7 +18,7 @@ import type { EntityItem } from "ee/entities/IDE/constants";
import { getQueryEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/Query/utils";
import { getJSEntityItemUrl } from "ee/pages/Editor/IDE/EditorPane/JS/utils";
import log from "loglevel";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { EditorViewMode } from "ee/entities/IDE/constants";
import { retrieveIDEViewMode, storeIDEViewMode } from "utils/storage";
@@ -120,6 +120,7 @@ export enum RedirectAction {
LIST = "LIST", // Navigate to a creation URL
ITEM = "ITEM", // Navigate to this item
}
+
interface RedirectActionDescription {
action: RedirectAction;
payload?: EntityItem;
diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts
index 76cc2c4ce722..c12e5f74739d 100644
--- a/app/client/src/sagas/InitSagas.ts
+++ b/app/client/src/sagas/InitSagas.ts
@@ -15,7 +15,7 @@ import {
import type {
ReduxAction,
ReduxActionWithoutPayload,
-} from "ee/constants/ReduxActionConstants";
+} from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { resetApplicationWidgets, resetPageList } from "actions/pageActions";
import { resetCurrentApplication } from "ee/actions/applicationActions";
@@ -102,6 +102,7 @@ export interface ReduxURLChangeAction {
type: typeof URL_CHANGE_ACTIONS;
payload: ApplicationPagePayload | ApplicationPayload | Page;
}
+
export interface DeployConsolidatedApi {
productAlert: ApiResponse;
tenantConfig: ApiResponse;
@@ -115,6 +116,7 @@ export interface DeployConsolidatedApi {
currentTheme: ApiResponse;
themes: ApiResponse;
}
+
export interface EditConsolidatedApi {
productAlert: ApiResponse;
tenantConfig: ApiResponse;
@@ -136,7 +138,9 @@ export interface EditConsolidatedApi {
unpublishedActionCollections: ApiResponse;
packagePullStatus: ApiResponse;
}
+
export type InitConsolidatedApi = DeployConsolidatedApi | EditConsolidatedApi;
+
export function* failFastApiCalls(
triggerActions: Array | ReduxActionWithoutPayload>,
successActions: string[],
diff --git a/app/client/src/sagas/JSLibrarySaga.ts b/app/client/src/sagas/JSLibrarySaga.ts
index 37132863d9a5..69caf878d1a8 100644
--- a/app/client/src/sagas/JSLibrarySaga.ts
+++ b/app/client/src/sagas/JSLibrarySaga.ts
@@ -1,7 +1,7 @@
import type { ApiResponse } from "api/ApiResponses";
import LibraryApi from "api/LibraryAPI";
import { createMessage, customJSLibraryMessages } from "ee/constants/messages";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts
index f9f96f59c059..ecc912888db0 100644
--- a/app/client/src/sagas/JSPaneSagas.ts
+++ b/app/client/src/sagas/JSPaneSagas.ts
@@ -8,7 +8,7 @@ import {
take,
takeLatest,
} from "redux-saga/effects";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/sagas/LintingSagas.ts b/app/client/src/sagas/LintingSagas.ts
index 8228073c51ae..c0f315d9b194 100644
--- a/app/client/src/sagas/LintingSagas.ts
+++ b/app/client/src/sagas/LintingSagas.ts
@@ -1,5 +1,5 @@
import { setLintingErrors } from "actions/lintingActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { APP_MODE } from "entities/App";
import { call, put, select, takeEvery } from "redux-saga/effects";
diff --git a/app/client/src/sagas/ModalSagas.ts b/app/client/src/sagas/ModalSagas.ts
index 60c9616e52a6..ebf04c2c5391 100644
--- a/app/client/src/sagas/ModalSagas.ts
+++ b/app/client/src/sagas/ModalSagas.ts
@@ -15,7 +15,7 @@ import {
GridDefaults,
MAIN_CONTAINER_WIDGET_ID,
} from "constants/WidgetConstants";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/NavigationSagas.ts b/app/client/src/sagas/NavigationSagas.ts
index a1f1d73c447c..6234182cabb5 100644
--- a/app/client/src/sagas/NavigationSagas.ts
+++ b/app/client/src/sagas/NavigationSagas.ts
@@ -1,5 +1,5 @@
import { all, call, takeEvery } from "redux-saga/effects";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import EntityNavigationFactory from "pages/Editor/EntityNavigation/factory";
import type { EntityInfo } from "pages/Editor/EntityNavigation/types";
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index 17dd41e1b5b1..3e8389329478 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import {
all,
diff --git a/app/client/src/sagas/OneClickBindingSaga.ts b/app/client/src/sagas/OneClickBindingSaga.ts
index c7409189dfe0..145d86335d42 100644
--- a/app/client/src/sagas/OneClickBindingSaga.ts
+++ b/app/client/src/sagas/OneClickBindingSaga.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts b/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts
index 54841ccb4290..1822e79dfee1 100644
--- a/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts
+++ b/app/client/src/sagas/PartialImportExportSagas/PartialExportSagas.ts
@@ -2,7 +2,7 @@ import ApplicationApi, {
type exportApplicationRequest,
} from "ee/api/ApplicationApi";
import type { ApplicationPayload } from "entities/Application";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/PartialImportExportSagas/PartialImportSagas.ts b/app/client/src/sagas/PartialImportExportSagas/PartialImportSagas.ts
index 2133227595f6..e49f8c5b773e 100644
--- a/app/client/src/sagas/PartialImportExportSagas/PartialImportSagas.ts
+++ b/app/client/src/sagas/PartialImportExportSagas/PartialImportSagas.ts
@@ -3,7 +3,7 @@ import {
initDatasourceConnectionDuringImportRequest,
} from "ee/actions/applicationActions";
import ApplicationApi from "ee/api/ApplicationApi";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionErrorTypes } from "ee/constants/ReduxActionConstants";
import type { AppState } from "ee/reducers";
import { areEnvironmentsFetched } from "ee/selectors/environmentSelectors";
diff --git a/app/client/src/sagas/PluginSagas.ts b/app/client/src/sagas/PluginSagas.ts
index 215c7511bf4b..e356e0d5dfca 100644
--- a/app/client/src/sagas/PluginSagas.ts
+++ b/app/client/src/sagas/PluginSagas.ts
@@ -1,5 +1,5 @@
import { all, takeEvery, call, put, select } from "redux-saga/effects";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionTypes,
ReduxActionErrorTypes,
diff --git a/app/client/src/sagas/PostEvaluationSagas.ts b/app/client/src/sagas/PostEvaluationSagas.ts
index ab989b915faf..02bdc286931e 100644
--- a/app/client/src/sagas/PostEvaluationSagas.ts
+++ b/app/client/src/sagas/PostEvaluationSagas.ts
@@ -21,7 +21,7 @@ import { getEvalErrorPath } from "utils/DynamicBindingUtils";
import { find, get, some } from "lodash";
import LOG_TYPE from "entities/AppsmithConsole/logtype";
import { call, put, select } from "redux-saga/effects";
-import type { AnyReduxAction } from "ee/constants/ReduxActionConstants";
+import type { AnyReduxAction } from "actions/ReduxActionTypes";
import AppsmithConsole from "utils/AppsmithConsole";
import AnalyticsUtil from "ee/utils/AnalyticsUtil";
import { createMessage, JS_EXECUTION_FAILURE } from "ee/constants/messages";
diff --git a/app/client/src/sagas/QueryPaneSagas.ts b/app/client/src/sagas/QueryPaneSagas.ts
index 8fb02f41bed1..8ad91aed7bd7 100644
--- a/app/client/src/sagas/QueryPaneSagas.ts
+++ b/app/client/src/sagas/QueryPaneSagas.ts
@@ -11,7 +11,7 @@ import type { ApplicationPayload } from "entities/Application";
import type {
ReduxAction,
ReduxActionWithMeta,
-} from "ee/constants/ReduxActionConstants";
+} from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/ReplaySaga.ts b/app/client/src/sagas/ReplaySaga.ts
index 942c4f880d9f..23d9fc83b153 100644
--- a/app/client/src/sagas/ReplaySaga.ts
+++ b/app/client/src/sagas/ReplaySaga.ts
@@ -17,7 +17,7 @@ import {
} from "selectors/propertyPaneSelectors";
import { closePropertyPane } from "actions/widgetActions";
import { selectWidgetInitAction } from "actions/widgetSelectionActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { flashElementsById } from "utils/helpers";
import {
diff --git a/app/client/src/sagas/SaaSPaneSagas.ts b/app/client/src/sagas/SaaSPaneSagas.ts
index 38fb823aea99..0800f6aa7b53 100644
--- a/app/client/src/sagas/SaaSPaneSagas.ts
+++ b/app/client/src/sagas/SaaSPaneSagas.ts
@@ -1,6 +1,6 @@
import { all, call, put, select, takeEvery } from "redux-saga/effects";
import type { ApplicationPayload } from "entities/Application";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import history from "utils/history";
import {
diff --git a/app/client/src/sagas/SnipingModeSagas.ts b/app/client/src/sagas/SnipingModeSagas.ts
index 8a0f6c9e9cdc..639febedfef3 100644
--- a/app/client/src/sagas/SnipingModeSagas.ts
+++ b/app/client/src/sagas/SnipingModeSagas.ts
@@ -1,5 +1,5 @@
import { all, call, put, select, takeLeading } from "redux-saga/effects";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { snipingModeBindToSelector } from "selectors/editorSelectors";
import type { ActionData } from "ee/reducers/entityReducers/actionsReducer";
diff --git a/app/client/src/sagas/TemplatesSagas.ts b/app/client/src/sagas/TemplatesSagas.ts
index 204bb78dee35..90014cf35d2b 100644
--- a/app/client/src/sagas/TemplatesSagas.ts
+++ b/app/client/src/sagas/TemplatesSagas.ts
@@ -4,7 +4,7 @@ import {
showReconnectDatasourceModal,
} from "ee/actions/applicationActions";
import type { ApplicationPayload } from "entities/Application";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/TernSaga.ts b/app/client/src/sagas/TernSaga.ts
index af7c02edfe27..e7130d7f4015 100644
--- a/app/client/src/sagas/TernSaga.ts
+++ b/app/client/src/sagas/TernSaga.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { getActions, getJSCollections } from "ee/selectors/entitiesSelector";
import type { AppState } from "ee/reducers";
diff --git a/app/client/src/sagas/ThemeSaga.tsx b/app/client/src/sagas/ThemeSaga.tsx
index 8ddb5c9c3b02..e5250fd20dfb 100644
--- a/app/client/src/sagas/ThemeSaga.tsx
+++ b/app/client/src/sagas/ThemeSaga.tsx
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { select, takeLatest } from "redux-saga/effects";
import localStorage from "utils/localStorage";
diff --git a/app/client/src/sagas/WidgetAdditionSagas.ts b/app/client/src/sagas/WidgetAdditionSagas.ts
index 21bb7d015fba..7fd5792b583d 100644
--- a/app/client/src/sagas/WidgetAdditionSagas.ts
+++ b/app/client/src/sagas/WidgetAdditionSagas.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/WidgetDeletionSagas.ts b/app/client/src/sagas/WidgetDeletionSagas.ts
index e0b7333a50a8..f718af6802ef 100644
--- a/app/client/src/sagas/WidgetDeletionSagas.ts
+++ b/app/client/src/sagas/WidgetDeletionSagas.ts
@@ -5,7 +5,7 @@ import type {
} from "actions/pageActions";
import { closePropertyPane, closeTableFilterPane } from "actions/widgetActions";
import { selectWidgetInitAction } from "actions/widgetSelectionActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/WidgetLoadingSaga.ts b/app/client/src/sagas/WidgetLoadingSaga.ts
index 7d1355781a78..17fc4d3c54c1 100644
--- a/app/client/src/sagas/WidgetLoadingSaga.ts
+++ b/app/client/src/sagas/WidgetLoadingSaga.ts
@@ -10,7 +10,7 @@ import type {
ActionData,
ActionDataState,
} from "ee/reducers/entityReducers/actionsReducer";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index 561a5ba7ec1f..b2591033d4c5 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -1,7 +1,4 @@
-import type {
- ReduxAction,
- ReduxActionType,
-} from "ee/constants/ReduxActionConstants";
+import type { ReduxAction, ReduxActionType } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/WidgetSelectionSagas.ts b/app/client/src/sagas/WidgetSelectionSagas.ts
index 013239ee734d..29bb3025556e 100644
--- a/app/client/src/sagas/WidgetSelectionSagas.ts
+++ b/app/client/src/sagas/WidgetSelectionSagas.ts
@@ -1,5 +1,5 @@
import { widgetURL } from "ee/RouteBuilder";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import {
ReduxActionErrorTypes,
ReduxActionTypes,
diff --git a/app/client/src/sagas/__tests__/initSagas.test.ts b/app/client/src/sagas/__tests__/initSagas.test.ts
index 759e542afdad..c6b2a0393c5e 100644
--- a/app/client/src/sagas/__tests__/initSagas.test.ts
+++ b/app/client/src/sagas/__tests__/initSagas.test.ts
@@ -1,7 +1,5 @@
-import {
- type ReduxAction,
- ReduxActionTypes,
-} from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import { type ReduxAction } from "actions/ReduxActionTypes";
import { APP_MODE } from "entities/App";
import AppEngineFactory from "entities/Engine/factory";
import { getInitResponses } from "sagas/InitSagas";
diff --git a/app/client/src/sagas/autoHeightSagas/batcher.ts b/app/client/src/sagas/autoHeightSagas/batcher.ts
index f1a7d09097c0..9060ce248022 100644
--- a/app/client/src/sagas/autoHeightSagas/batcher.ts
+++ b/app/client/src/sagas/autoHeightSagas/batcher.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { UpdateWidgetAutoHeightPayload } from "actions/autoHeightActions";
import { updateAndSaveLayout } from "actions/pageActions";
diff --git a/app/client/src/sagas/autoHeightSagas/containers.ts b/app/client/src/sagas/autoHeightSagas/containers.ts
index cf8015fb67a7..1bc664ba1b91 100644
--- a/app/client/src/sagas/autoHeightSagas/containers.ts
+++ b/app/client/src/sagas/autoHeightSagas/containers.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import { GridDefaults } from "constants/WidgetConstants";
import log from "loglevel";
diff --git a/app/client/src/sagas/autoHeightSagas/index.ts b/app/client/src/sagas/autoHeightSagas/index.ts
index 3291807d4b9b..c1a007c914dc 100644
--- a/app/client/src/sagas/autoHeightSagas/index.ts
+++ b/app/client/src/sagas/autoHeightSagas/index.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import {
all,
diff --git a/app/client/src/sagas/autoHeightSagas/layoutTree.ts b/app/client/src/sagas/autoHeightSagas/layoutTree.ts
index 9994b3b64bea..eae50f8ca3b8 100644
--- a/app/client/src/sagas/autoHeightSagas/layoutTree.ts
+++ b/app/client/src/sagas/autoHeightSagas/layoutTree.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import {
checkContainersForAutoHeightAction,
diff --git a/app/client/src/sagas/autoHeightSagas/widgets.ts b/app/client/src/sagas/autoHeightSagas/widgets.ts
index 26e64f299356..11203cfb6ea6 100644
--- a/app/client/src/sagas/autoHeightSagas/widgets.ts
+++ b/app/client/src/sagas/autoHeightSagas/widgets.ts
@@ -38,7 +38,7 @@ import {
} from "selectors/autoHeightSelectors";
import { getLayoutTree } from "./layoutTree";
import WidgetFactory from "WidgetProvider/factory";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import type { TreeNode } from "utils/autoHeight/constants";
import { directlyMutateDOMNodes } from "utils/autoHeight/mutateDOM";
import { getAppMode } from "ee/selectors/entitiesSelector";
diff --git a/app/client/src/sagas/editorContextSagas.ts b/app/client/src/sagas/editorContextSagas.ts
index c007a6c06ba4..eb3d89a12137 100644
--- a/app/client/src/sagas/editorContextSagas.ts
+++ b/app/client/src/sagas/editorContextSagas.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import {
setPanelPropertySectionState,
diff --git a/app/client/src/sagas/helper.ts b/app/client/src/sagas/helper.ts
index bdb6cfc7406e..7839552f9daf 100644
--- a/app/client/src/sagas/helper.ts
+++ b/app/client/src/sagas/helper.ts
@@ -15,10 +15,8 @@ import type { Log } from "entities/AppsmithConsole";
import { LOG_CATEGORY, Severity } from "entities/AppsmithConsole";
import { ENTITY_TYPE, PLATFORM_ERROR } from "ee/entities/AppsmithConsole/utils";
import { toast } from "@appsmith/ads";
-import {
- ReduxActionTypes,
- type ReduxActionType,
-} from "ee/constants/ReduxActionConstants";
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import type { ReduxActionType } from "actions/ReduxActionTypes";
import type { Action } from "entities/Action";
import get from "lodash/get";
import set from "lodash/set";
diff --git a/app/client/src/sagas/layoutConversionSagas.ts b/app/client/src/sagas/layoutConversionSagas.ts
index 376e65893c6c..adbacd11616b 100644
--- a/app/client/src/sagas/layoutConversionSagas.ts
+++ b/app/client/src/sagas/layoutConversionSagas.ts
@@ -1,7 +1,7 @@
import { setLayoutConversionStateAction } from "actions/autoLayoutActions";
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
import type { Page } from "entities/Page";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import type { AppState } from "ee/reducers";
import { LayoutSystemTypes } from "layoutSystems/types";
import type { SupportedLayouts } from "reducers/entityReducers/pageListReducer";
diff --git a/app/client/src/selectors/analyticsSelectors.ts b/app/client/src/selectors/analyticsSelectors.ts
new file mode 100644
index 000000000000..0f3eb5ba64bd
--- /dev/null
+++ b/app/client/src/selectors/analyticsSelectors.ts
@@ -0,0 +1,4 @@
+import type { AppState } from "ee/reducers";
+
+export const getSegmentState = (state: AppState) =>
+ state.ui.analytics.telemetry.segmentState;
diff --git a/app/client/src/selectors/explorerSelector.ts b/app/client/src/selectors/explorerSelector.ts
index 58df2735748b..609c77d95559 100644
--- a/app/client/src/selectors/explorerSelector.ts
+++ b/app/client/src/selectors/explorerSelector.ts
@@ -34,3 +34,5 @@ export const getExplorerActive = (state: AppState) => {
export const getUpdatingEntity = (state: AppState) => {
return state.ui.explorer.entity.updatingEntity;
};
+export const getEditingEntityName = (state: AppState) =>
+ state.ui.explorer.entity.editingEntityName;
diff --git a/app/client/src/selectors/gitSyncSelectors.tsx b/app/client/src/selectors/gitSyncSelectors.tsx
index bf3b009667bf..e7ed0fc869aa 100644
--- a/app/client/src/selectors/gitSyncSelectors.tsx
+++ b/app/client/src/selectors/gitSyncSelectors.tsx
@@ -146,10 +146,10 @@ export const getCountOfChangesToCommit = (state: AppState) => {
modifiedDatasources = 0,
modifiedJSLibs = 0,
modifiedJSObjects = 0,
- modifiedModules = 0,
- modifiedPackages = 0,
+ modifiedModuleInstances = 0,
modifiedPages = 0,
modifiedQueries = 0,
+ modifiedSourceModules = 0,
} = gitStatus || {};
const themeCount = modified.includes("theme.json") ? 1 : 0;
const settingsCount = modified.includes("application.json") ? 1 : 0;
@@ -159,8 +159,8 @@ export const getCountOfChangesToCommit = (state: AppState) => {
modifiedDatasources +
modifiedJSLibs +
modifiedJSObjects +
- modifiedModules +
- modifiedPackages +
+ modifiedSourceModules +
+ modifiedModuleInstances +
modifiedPages +
modifiedQueries +
themeCount +
diff --git a/app/client/src/utils/AppsmithConsole.ts b/app/client/src/utils/AppsmithConsole.ts
index 568dd41a3c8c..725b784dd6f5 100644
--- a/app/client/src/utils/AppsmithConsole.ts
+++ b/app/client/src/utils/AppsmithConsole.ts
@@ -4,7 +4,7 @@ import {
debuggerLogInit,
deleteErrorLogsInit,
} from "actions/debuggerActions";
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import type { LogActionPayload, Log } from "entities/AppsmithConsole";
import { Severity, LOG_CATEGORY } from "entities/AppsmithConsole";
import store from "store";
diff --git a/app/client/src/utils/ReducerUtils.ts b/app/client/src/utils/ReducerUtils.ts
index bf1390380840..9a25f1dcfd0e 100644
--- a/app/client/src/utils/ReducerUtils.ts
+++ b/app/client/src/utils/ReducerUtils.ts
@@ -1,4 +1,4 @@
-import type { ReduxAction } from "ee/constants/ReduxActionConstants";
+import type { ReduxAction } from "actions/ReduxActionTypes";
import produce from "immer";
export const createReducer = (
diff --git a/app/client/src/utils/autocomplete/defCreatorUtils.ts b/app/client/src/utils/autocomplete/defCreatorUtils.ts
index 409f5f7a6527..a8bdab67c4f7 100644
--- a/app/client/src/utils/autocomplete/defCreatorUtils.ts
+++ b/app/client/src/utils/autocomplete/defCreatorUtils.ts
@@ -7,8 +7,9 @@ import type { Def } from "tern";
import { Types, getType } from "utils/TypeHelpers";
import { shouldAddSetter } from "workers/Evaluation/evaluate";
import { typeToTernType } from "workers/common/JSLibrary/ternDefinitionGenerator";
+import type { ExtraDef } from "./types";
-export type ExtraDef = Record;
+export type { ExtraDef };
export const flattenDef = (def: Def, entityName: string): Def => {
const flattenedDef = def;
diff --git a/app/client/src/utils/autocomplete/types.ts b/app/client/src/utils/autocomplete/types.ts
index 538163a93d53..0a054c4db8fd 100644
--- a/app/client/src/utils/autocomplete/types.ts
+++ b/app/client/src/utils/autocomplete/types.ts
@@ -1,3 +1,5 @@
+import type { Def } from "tern";
+
export enum TernWorkerAction {
INIT = "INIT",
ADD_FILE = "ADD_FILE",
@@ -12,3 +14,5 @@ export enum TernWorkerAction {
// TODO: Fix this the next time the file is edited
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type CallbackFn = (...args: any) => any;
+
+export type ExtraDef = Record;
diff --git a/app/client/src/widgets/MapWidget/widget/index.tsx b/app/client/src/widgets/MapWidget/widget/index.tsx
index 40457a6216ae..4ea6674c395a 100644
--- a/app/client/src/widgets/MapWidget/widget/index.tsx
+++ b/app/client/src/widgets/MapWidget/widget/index.tsx
@@ -90,8 +90,8 @@ class MapWidget extends BaseWidget {
zoomLevel: 50,
enablePickLocation: true,
allowZoom: true,
- mapCenter: { lat: 25.122, long: 50.132 },
- defaultMarkers: [{ lat: 25.122, long: 50.132, title: "Location1" }],
+ mapCenter: { lat: 40.7128, long: -74.006 },
+ defaultMarkers: [{ lat: 40.7128, long: -74.006, title: "New York" }],
isClickedMarkerCentered: true,
version: 1,
animateLoading: true,
diff --git a/app/client/src/widgets/PhoneInputWidget/widget/index.test.tsx b/app/client/src/widgets/PhoneInputWidget/widget/index.test.tsx
index 60f571e7e3d9..6b26d040fac2 100644
--- a/app/client/src/widgets/PhoneInputWidget/widget/index.test.tsx
+++ b/app/client/src/widgets/PhoneInputWidget/widget/index.test.tsx
@@ -1,5 +1,6 @@
import type { PhoneInputWidgetProps } from "./index";
import { defaultValueValidation } from "./index";
+import PhoneInputWidget from "./index";
import _ from "lodash";
describe("defaultValueValidation", () => {
@@ -38,3 +39,27 @@ describe("defaultValueValidation", () => {
});
});
});
+
+describe("PhoneInputWidget methods", () => {
+ describe("getSetterConfig", () => {
+ it("should return correct setter config with setText", () => {
+ const setterConfig = PhoneInputWidget.getSetterConfig();
+
+ expect(setterConfig.__setters).toHaveProperty("setText");
+
+ expect(setterConfig.__setters.setText).toEqual({
+ path: "defaultText",
+ type: "string",
+ });
+ });
+
+ it("should include all required setters", () => {
+ const setterConfig = PhoneInputWidget.getSetterConfig();
+ const expectedSetters = ["setVisibility", "setDisabled", "setText"];
+
+ expectedSetters.forEach((setter) => {
+ expect(setterConfig.__setters).toHaveProperty(setter);
+ });
+ });
+ });
+});
diff --git a/app/client/src/widgets/PhoneInputWidget/widget/index.tsx b/app/client/src/widgets/PhoneInputWidget/widget/index.tsx
index eb98d80917ad..05c9b650ddd4 100644
--- a/app/client/src/widgets/PhoneInputWidget/widget/index.tsx
+++ b/app/client/src/widgets/PhoneInputWidget/widget/index.tsx
@@ -476,6 +476,10 @@ class PhoneInputWidget extends BaseInputWidget<
path: "isDisabled",
type: "boolean",
},
+ setText: {
+ path: "defaultText",
+ type: "string",
+ },
},
};
}
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx
index 1eff4dfb08b7..078f968f8b8d 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/SelectCell.tsx
@@ -204,7 +204,7 @@ export const SelectCell = (props: SelectProps) => {
return selectedOption
? selectedOption[TableSelectColumnOptionKeys.LABEL]
- : "";
+ : value;
}, [value, options]);
if (isEditable && isCellEditable && isCellEditMode) {
diff --git a/app/client/src/workers/Evaluation/types.ts b/app/client/src/workers/Evaluation/types.ts
index 3f150490c0dd..97adaa6fc2b4 100644
--- a/app/client/src/workers/Evaluation/types.ts
+++ b/app/client/src/workers/Evaluation/types.ts
@@ -16,8 +16,8 @@ import type { WorkerRequest } from "ee/workers/common/types";
import type { DataTreeDiff } from "ee/workers/Evaluation/evaluationUtils";
import type { APP_MODE } from "entities/App";
import type { WebworkerSpanData, Attributes } from "instrumentation/types";
-import type { AffectedJSObjects } from "sagas/EvaluationsSagaUtils";
import type { ICacheProps } from "../common/AppComputationCache/types";
+import type { AffectedJSObjects } from "actions/EvaluationReduxActionTypes";
// TODO: Fix this the next time the file is edited
// eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/app/client/src/workers/common/DataTreeEvaluator/index.ts b/app/client/src/workers/common/DataTreeEvaluator/index.ts
index ecadcb2e4c7b..8f2eb2f09557 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/index.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/index.ts
@@ -145,7 +145,6 @@ import {
profileAsyncFn,
profileFn,
} from "instrumentation/generateWebWorkerTraces";
-import type { AffectedJSObjects } from "sagas/EvaluationsSagaUtils";
import generateOverrideContext from "ee/workers/Evaluation/generateOverrideContext";
import appComputationCache from "../AppComputationCache";
import {
@@ -155,6 +154,7 @@ import {
import { getDataTreeContext } from "ee/workers/Evaluation/Actions";
import { WorkerEnv } from "workers/Evaluation/handlers/workerEnv";
import type { WebworkerSpanData, Attributes } from "instrumentation/types";
+import type { AffectedJSObjects } from "actions/EvaluationReduxActionTypes";
type SortedDependencies = Array;
export interface EvalProps {
diff --git a/app/client/src/workers/common/DataTreeEvaluator/utils.ts b/app/client/src/workers/common/DataTreeEvaluator/utils.ts
index 65dd36a0ca35..146e80767e14 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/utils.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/utils.ts
@@ -23,7 +23,8 @@ import type {
JSActionEntity,
} from "ee/entities/DataTree/types";
import { isObject } from "lodash";
-import type { AffectedJSObjects } from "sagas/EvaluationsSagaUtils";
+
+import type { AffectedJSObjects } from "actions/EvaluationReduxActionTypes";
export function getFixedTimeDifference(endTime: number, startTime: number) {
return (endTime - startTime).toFixed(2) + " ms";
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java
index 624dabcebab8..a1be0d583302 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java
@@ -10,6 +10,7 @@
import com.appsmith.external.dtos.MergeStatusDTO;
import com.appsmith.external.git.constants.GitSpan;
import com.appsmith.external.git.constants.ce.RefType;
+import com.appsmith.external.git.dtos.FetchRemoteDTO;
import com.appsmith.external.git.handler.FSGitHandler;
import com.appsmith.external.helpers.Stopwatch;
import com.appsmith.git.configurations.GitServiceConfig;
@@ -33,7 +34,6 @@
import org.eclipse.jgit.api.ResetCommand;
import org.eclipse.jgit.api.Status;
import org.eclipse.jgit.api.TransportConfigCallback;
-import org.eclipse.jgit.api.errors.CheckoutConflictException;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.BranchTrackingStatus;
import org.eclipse.jgit.lib.PersonIdent;
@@ -42,6 +42,7 @@
import org.eclipse.jgit.merge.MergeStrategy;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.RefSpec;
+import org.eclipse.jgit.transport.TagOpt;
import org.eclipse.jgit.util.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.util.FileSystemUtils;
@@ -92,6 +93,11 @@ public class FSGitHandlerCEImpl implements FSGitHandler {
private final Scheduler scheduler = Schedulers.boundedElastic();
+ private static final String BRANCH_REF_REMOTE_SRC = "refs/heads/";
+ private static final String BRANCH_REF_LOCAL_DST = "refs/remotes/origin/";
+ private static final String SRC_DST_DELIMITER = ":";
+ private static final String TAG_REF = "refs/tags/";
+
private static final String SUCCESS_MERGE_STATUS = "This branch has no conflicts with the base branch.";
/**
@@ -846,15 +852,14 @@ public Mono mergeBranch(Path repoSuffix, String sourceBranch, String des
git -> Mono.fromCallable(() -> {
Stopwatch processStopwatch = StopwatchHelpers.startStopwatch(
repoSuffix, AnalyticsEvents.GIT_MERGE.getEventName());
- log.debug(Thread.currentThread().getName() + ": Merge branch " + sourceBranch
- + " on " + destinationBranch);
- try {
- // checkout the branch on which the merge command is run
- git.checkout()
- .setName(destinationBranch)
- .setCreateBranch(false)
- .call();
+ log.info(
+ "{}: Merge branch {} on {}",
+ Thread.currentThread().getName(),
+ sourceBranch,
+ destinationBranch);
+
+ try {
MergeResult mergeResult = git.merge()
.include(git.getRepository().findRef(sourceBranch))
.setStrategy(MergeStrategy.RECURSIVE)
@@ -934,9 +939,7 @@ public Mono fetchRemote(
@Override
public Mono fetchRemote(
- Path repoSuffix, String publicKey, String privateKey, boolean isRepoPath, String... branchNames) {
- Stopwatch processStopwatch =
- StopwatchHelpers.startStopwatch(repoSuffix, AnalyticsEvents.GIT_FETCH.getEventName());
+ Path repoSuffix, boolean isRepoPath, FetchRemoteDTO fetchRemoteDTO, String publicKey, String privateKey) {
Path repoPath = TRUE.equals(isRepoPath) ? repoSuffix : createRepoPath(repoSuffix);
return Mono.using(
() -> Git.open(repoPath.toFile()),
@@ -945,21 +948,35 @@ public Mono fetchRemote(
new SshTransportConfigCallback(privateKey, publicKey);
String fetchMessages;
+ List refNames = fetchRemoteDTO.getRefNames();
+ RefType refType = fetchRemoteDTO.getRefType();
+
List refSpecs = new ArrayList<>();
- for (String branchName : branchNames) {
- RefSpec ref = new RefSpec(
- "refs/heads/" + branchName + ":refs/remotes/origin/" + branchName);
- refSpecs.add(ref);
+ if (RefType.tag.equals(refType)) {
+ for (String tagName : refNames) {
+ RefSpec refSpec = new RefSpec(TAG_REF + tagName + ":" + TAG_REF + tagName);
+ refSpecs.add(refSpec);
+ }
+ } else {
+ for (String refName : refNames) {
+ RefSpec ref = new RefSpec(BRANCH_REF_REMOTE_SRC
+ + refName
+ + SRC_DST_DELIMITER
+ + BRANCH_REF_LOCAL_DST
+ + refName);
+ refSpecs.add(ref);
+ }
}
fetchMessages = git.fetch()
.setRefSpecs(refSpecs.toArray(new RefSpec[0]))
.setRemoveDeletedRefs(true)
+ .setTagOpt(TagOpt.NO_TAGS) // no tags would mean that tags are fetched
+ // explicitly
.setTransportConfigCallback(config)
.call()
.getMessages();
- processStopwatch.stopAndLogTimeInMillis();
return fetchMessages;
})
.onErrorResume(error -> {
@@ -980,30 +997,13 @@ public Mono isMergeBranch(Path repoSuffix, String sourceBranch,
return Mono.using(
() -> Git.open(createRepoPath(repoSuffix).toFile()),
git -> Mono.fromCallable(() -> {
- log.debug(
- Thread.currentThread().getName()
- + ": Check mergeability for repo {} with src: {}, dest: {}",
+ log.info(
+ "{}: Check merge-ability for repo {} with source: {}, destination: {}",
+ Thread.currentThread().getName(),
repoSuffix,
sourceBranch,
destinationBranch);
- // checkout the branch on which the merge command is run
- try {
- git.checkout()
- .setName(destinationBranch)
- .setCreateBranch(false)
- .call();
- } catch (GitAPIException e) {
- if (e instanceof CheckoutConflictException) {
- MergeStatusDTO mergeStatus = new MergeStatusDTO();
- mergeStatus.setMergeAble(false);
- mergeStatus.setConflictingFiles(
- ((CheckoutConflictException) e).getConflictingPaths());
- processStopwatch.stopAndLogTimeInMillis();
- return mergeStatus;
- }
- }
-
MergeResult mergeResult = git.merge()
.include(git.getRepository().findRef(sourceBranch))
.setFastForward(MergeCommand.FastForwardMode.NO_FF)
@@ -1054,6 +1054,19 @@ public Mono isMergeBranch(Path repoSuffix, String sourceBranch,
return Mono.error(e);
}
})
+ .onErrorResume(error -> {
+ MergeStatusDTO mergeStatusDTO = new MergeStatusDTO();
+ mergeStatusDTO.setMergeAble(false);
+ mergeStatusDTO.setMessage(error.getMessage());
+ mergeStatusDTO.setReferenceDoc(ErrorReferenceDocUrl.GIT_MERGE_CONFLICT.getDocUrl());
+ try {
+ return resetToLastCommit(repoSuffix, destinationBranch)
+ .thenReturn(mergeStatusDTO);
+ } catch (GitAPIException | IOException e) {
+ log.error("Error while hard resetting to latest commit {0}", e);
+ return Mono.error(e);
+ }
+ })
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS)),
Git::close)
.subscribeOn(scheduler);
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/dtos/FetchRemoteDTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/dtos/FetchRemoteDTO.java
new file mode 100644
index 000000000000..eba9e1fe7c7b
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/dtos/FetchRemoteDTO.java
@@ -0,0 +1,29 @@
+package com.appsmith.external.git.dtos;
+
+import com.appsmith.external.git.constants.ce.RefType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FetchRemoteDTO {
+
+ /**
+ * List of references which is to be fetched from remote.
+ */
+ List refNames;
+
+ /**
+ * Assumption is that we fetch only one type of refs at once.
+ */
+ RefType refType;
+
+ /**
+ * fetch all the remotes
+ */
+ Boolean isFetchAll;
+}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/handler/FSGitHandler.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/handler/FSGitHandler.java
index b1eb6d68a303..8ff45d21cbad 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/handler/FSGitHandler.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/handler/FSGitHandler.java
@@ -5,6 +5,7 @@
import com.appsmith.external.dtos.GitRefDTO;
import com.appsmith.external.dtos.GitStatusDTO;
import com.appsmith.external.dtos.MergeStatusDTO;
+import com.appsmith.external.git.dtos.FetchRemoteDTO;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.BranchTrackingStatus;
import reactor.core.publisher.Mono;
@@ -135,6 +136,8 @@ Mono pullApplication(
Mono getStatus(Path repoPath, String branchName);
/**
+ * This method merges source branch into destination branch for a git repository which is present on the partial
+ * path provided. This assumes that the branch on which the merge will happen is already checked out
* @param repoSuffix suffixedPath used to generate the base repo path this includes orgId, defaultAppId, repoName
* @param sourceBranch name of the branch whose commits will be referred amd merged to destinationBranch
* @param destinationBranch Merge operation is performed on this branch
@@ -158,7 +161,7 @@ Mono fetchRemote(
boolean isFetchAll);
Mono fetchRemote(
- Path repoSuffix, String publicKey, String privateKey, boolean isRepoPath, String... branchNames);
+ Path repoSuffix, boolean isRepoPath, FetchRemoteDTO fetchRemoteDTO, String publicKey, String privateKey);
/**
*
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/GitArtifactMetadataCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/GitArtifactMetadataCE.java
index caa3653826fe..fa21a5bde92d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/GitArtifactMetadataCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/GitArtifactMetadataCE.java
@@ -26,9 +26,11 @@ public class GitArtifactMetadataCE implements AppsmithDomain {
@JsonView(Views.Public.class)
String branchName;
+ @Transient
@JsonView(Views.Internal.class)
RefType refType;
+ @Transient
@JsonView(Views.Internal.class)
String refName;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java
index ccadec5b3c63..752dced6f13b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java
@@ -3,6 +3,7 @@
import com.appsmith.external.dtos.GitBranchDTO;
import com.appsmith.external.dtos.GitRefDTO;
import com.appsmith.external.dtos.GitStatusDTO;
+import com.appsmith.external.dtos.MergeStatusDTO;
import com.appsmith.external.git.constants.ce.RefType;
import com.appsmith.git.dto.CommitDTO;
import com.appsmith.server.constants.ArtifactType;
@@ -13,6 +14,7 @@
import com.appsmith.server.dtos.AutoCommitResponseDTO;
import com.appsmith.server.dtos.GitConnectDTO;
import com.appsmith.server.dtos.GitDocsDTO;
+import com.appsmith.server.dtos.GitMergeDTO;
import com.appsmith.server.dtos.GitPullDTO;
import reactor.core.publisher.Mono;
@@ -45,6 +47,12 @@ Mono fetchRemoteChanges(
GitType gitType,
RefType refType);
+ Mono mergeBranch(
+ String branchedArtifactId, ArtifactType artifactType, GitMergeDTO gitMergeDTO, GitType gitType);
+
+ Mono isBranchMergable(
+ String branchedArtifactId, ArtifactType artifactType, GitMergeDTO gitMergeDTO, GitType gitType);
+
Mono discardChanges(String branchedArtifactId, ArtifactType artifactType, GitType gitType);
Mono getStatus(
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
index db895a42bb83..a8471e978b27 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
@@ -9,6 +9,7 @@
import com.appsmith.external.git.constants.GitConstants;
import com.appsmith.external.git.constants.GitSpan;
import com.appsmith.external.git.constants.ce.RefType;
+import com.appsmith.external.git.dtos.FetchRemoteDTO;
import com.appsmith.external.models.Datasource;
import com.appsmith.external.models.DatasourceStorage;
import com.appsmith.git.dto.CommitDTO;
@@ -34,6 +35,7 @@
import com.appsmith.server.dtos.AutoCommitResponseDTO;
import com.appsmith.server.dtos.GitConnectDTO;
import com.appsmith.server.dtos.GitDocsDTO;
+import com.appsmith.server.dtos.GitMergeDTO;
import com.appsmith.server.dtos.GitPullDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
@@ -59,6 +61,7 @@
import io.micrometer.observation.ObservationRegistry;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.InvalidRemoteException;
import org.eclipse.jgit.api.errors.RefNotFoundException;
import org.eclipse.jgit.api.errors.TransportException;
@@ -519,8 +522,8 @@ private Mono checkoutRemoteReference(
if (baseRefName.equals(finalRemoteRefName)) {
/*
in this case, user deleted the initial default branch and now wants to check out to that branch.
- as we didn't delete the application object but only the branch from git repo,
- we can just use this existing application without creating a new one.
+ as we didn't delete the artifact object but only the branch from git repo,
+ we can just use this existing artifact without creating a new one.
*/
artifactMono = Mono.just(baseArtifact);
} else {
@@ -529,7 +532,7 @@ private Mono checkoutRemoteReference(
}
Mono checkedOutRemoteArtifactMono = gitHandlingService
- .fetchRemoteChanges(jsonTransformationDTO, baseGitMetadata.getGitAuth(), false)
+ .fetchRemoteReferences(jsonTransformationDTO, baseGitMetadata.getGitAuth(), false)
.onErrorResume(error -> Mono.error(
new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "checkout branch", error.getMessage())))
.flatMap(ignoreRemoteChanges -> {
@@ -624,7 +627,8 @@ protected Mono createReference(
baseGitMetadata.getDefaultArtifactId(),
GitConstants.GitCommandConstants.CREATE_BRANCH,
FALSE);
- Mono fetchRemoteMono = gitHandlingService.fetchRemoteChanges(jsonTransformationDTO, baseGitAuth, TRUE);
+ Mono fetchRemoteMono =
+ gitHandlingService.fetchRemoteReferences(jsonTransformationDTO, baseGitAuth, TRUE);
Mono createBranchMono = acquireGitLockMono
.flatMap(ignoreLockAcquisition -> fetchRemoteMono.onErrorResume(
@@ -1139,10 +1143,10 @@ public Mono commitArtifact(
GitType gitType,
Boolean isFileLock) {
/*
- 1. Check if application exists and user have sufficient permissions
+ 1. Check if artifact exists and user have sufficient permissions
2. Check if branch name exists in git metadata
- 3. Save application to the existing local repo
- 4. Commit application : git add, git commit (Also check if git init required)
+ 3. Save artifact to the existing local repo
+ 4. Commit artifact : git add, git commit (Also check if git init required)
*/
String commitMessage = commitDTO.getMessage();
@@ -1390,7 +1394,7 @@ private Mono commitArtifact(
/**
* Method to remove all the git metadata for the artifact and connected resources. This will remove:
* - local repo
- * - all the branched applications present in DB except for default application
+ * - all the branched artifacts present in DB except for default artifact
*
* @param branchedArtifactId : id of any branched artifact for the given repo
* @param artifactType : type of artifact
@@ -1443,7 +1447,7 @@ public Mono detachRemote(
jsonTransformationDTO.setArtifactType(baseArtifact.getArtifactType());
jsonTransformationDTO.setRefName(gitArtifactMetadata.getRefName());
- // Remove the parent application branch name from the list
+ // Remove the parent artifact branch name from the list
Mono removeRepoMono = gitHandlingService.removeRepository(jsonTransformationDTO);
Mono updatedArtifactMono = gitArtifactHelper.saveArtifact(baseArtifact);
@@ -1583,7 +1587,7 @@ protected Mono getStatus(
hence we don't need to do that manually
*/
log.error(
- "Error to get status for application: {}, branch: {}",
+ "Error to get status for artifact: {}, branch: {}",
baseArtifactId,
finalBranchName,
throwable);
@@ -1693,11 +1697,11 @@ protected Mono pullArtifact(Artifact baseArtifact, Artifact branched
}
/**
- * Method to pull the files from remote repo and rehydrate the application
+ * Method to pull the files from remote repo and rehydrate the artifact
*
* @param baseArtifact : base artifact
* @param branchedArtifact : a branch created from branches of base artifact
- * @return pull DTO with updated application
+ * @return pull DTO with updated artifact
*/
private Mono pullAndRehydrateArtifact(
Artifact baseArtifact, Artifact branchedArtifact, GitType gitType) {
@@ -1706,7 +1710,7 @@ private Mono pullAndRehydrateArtifact(
2. Do git pull after
On Merge conflict - throw exception and ask user to resolve these conflicts on remote
TODO create new branch and push the changes to remote and ask the user to resolve it on github/gitlab UI
- 3. Rehydrate the application from filesystem so that the latest changes from remote are rendered to the application
+ 3. Rehydrate the artifact from filesystem so that the latest changes from remote are rendered to the artifact
*/
ArtifactType artifactType = baseArtifact.getArtifactType();
@@ -1821,7 +1825,7 @@ public Mono fetchRemoteChanges(
// current user mono has been zipped just to run in parallel.
Mono fetchRemoteMono = acquireGitLockMono
- .then(Mono.defer(() -> gitHandlingService.fetchRemoteChanges(
+ .then(Mono.defer(() -> gitHandlingService.fetchRemoteReferences(
jsonTransformationDTO, baseArtifactGitData.getGitAuth(), FALSE)))
.flatMap(fetchedRemoteStatusString -> {
return gitRedisUtils
@@ -1834,7 +1838,7 @@ public Mono fetchRemoteChanges(
hence we don't need to do that manually
*/
log.error(
- "Error to fetch from remote for application: {}, branch: {}, git type {}",
+ "Error to fetch from remote for artifact: {}, ref: {}, git type {}",
baseArtifactId,
refArtifactGitData.getRefName(),
gitType,
@@ -1964,9 +1968,9 @@ private Mono updateArtifactWithGitMetadataGivenPermission(
}
artifact.setGitArtifactMetadata(gitMetadata);
- // For default application we expect a GitAuth to be a part of gitMetadata. We are using save method to leverage
+ // For base artifact we expect a GitAuth to be a part of gitMetadata. We are using save method to leverage
// @Encrypted annotation used for private SSH keys
- // applicationService.save sets the transient fields so no need to set it again from this method
+ // saveArtifact method sets the transient fields so no need to set it again from this method
return gitArtifactHelperResolver
.getArtifactHelper(artifact.getArtifactType())
.saveArtifact(artifact);
@@ -2245,8 +2249,8 @@ private Flux updateDefaultBranchName(
private Mono> handleRepoNotFoundException(
ArtifactJsonTransformationDTO jsonTransformationDTO, GitType gitType) {
- // clone application to the local filesystem again and update the defaultBranch for the application
- // list branch and compare with branch applications and checkout if not exists
+ // clone artifact to the local git system again and update the defaultBranch for the artifact
+ // list branch and compare with branch artifacts and checkout if not exists
GitHandlingService gitHandlingService = gitHandlingServiceResolver.getGitHandlingService(gitType);
GitArtifactHelper gitArtifactHelper =
@@ -2356,7 +2360,7 @@ private Mono> getBranchListWithDefaultBranchName(
if (TRUE.equals(pruneBranches)) {
return gitHandlingService
- .fetchRemoteChanges(jsonTransformationDTO, baseGitData.getGitAuth(), TRUE)
+ .fetchRemoteReferences(jsonTransformationDTO, baseGitData.getGitAuth(), TRUE)
.then(listBranchesMono);
}
return listBranchesMono;
@@ -2593,4 +2597,420 @@ public Mono> getGitDocUrls() {
}
return Mono.just(gitDocsDTOList);
}
+
+ @Override
+ public Mono mergeBranch(
+ String branchedArtifactId, ArtifactType artifactType, GitMergeDTO gitMergeDTO, GitType gitType) {
+ /*
+ * 1.Dehydrate the artifact from Mongodb so that the file system has the latest artifact data for both the source and destination branch artifact
+ * 2.Do git checkout destinationBranch ---> git merge sourceBranch after the rehydration
+ * On Merge conflict - create new branch and push the changes to remote and ask the user to resolve it on Github/Gitlab UI
+ * 3.Then rehydrate from the file system to mongodb so that the latest changes from remote are rendered to the artifact
+ * 4.Get the latest artifact mono from the mongodb and send it back to client
+ * */
+
+ final String sourceBranch = gitMergeDTO.getSourceBranch();
+ final String destinationBranch = gitMergeDTO.getDestinationBranch();
+
+ if (!hasText(sourceBranch) || !hasText(destinationBranch)) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
+ } else if (sourceBranch.startsWith(ORIGIN)) {
+ return Mono.error(
+ new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION_FOR_REMOTE_BRANCH, sourceBranch));
+ } else if (destinationBranch.startsWith(ORIGIN)) {
+ return Mono.error(
+ new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION_FOR_REMOTE_BRANCH, destinationBranch));
+ }
+
+ GitArtifactHelper gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
+ AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+ Mono> baseAndBranchedArtifactsMono =
+ getBaseAndBranchedArtifacts(branchedArtifactId, artifactType).cache();
+
+ Mono destinationArtifactMono = baseAndBranchedArtifactsMono.flatMap(artifactTuples -> {
+ Artifact baseArtifact = artifactTuples.getT1();
+ if (destinationBranch.equals(baseArtifact.getGitArtifactMetadata().getRefName())) {
+ return Mono.just(baseArtifact);
+ }
+
+ return gitArtifactHelper.getArtifactByBaseIdAndBranchName(
+ baseArtifact.getId(), destinationBranch, artifactEditPermission);
+ });
+
+ Mono mergeMono = baseAndBranchedArtifactsMono
+ .zipWith(destinationArtifactMono)
+ .flatMap(artifactTuples -> {
+ Artifact baseArtifact = artifactTuples.getT1().getT1();
+ Artifact sourceArtifact = artifactTuples.getT1().getT2();
+ Artifact destinationArtifact = artifactTuples.getT2();
+
+ GitArtifactMetadata baseGitMetadata = baseArtifact.getGitArtifactMetadata();
+ if (isBaseGitMetadataInvalid(baseArtifact.getGitArtifactMetadata(), gitType)) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
+ }
+
+ final String workspaceId = baseArtifact.getWorkspaceId();
+ final String baseArtifactId = baseGitMetadata.getDefaultArtifactId();
+ final String repoName = baseGitMetadata.getRepoName();
+
+ // 1. Hydrate from db to git system for both ref Artifacts
+ // Update function call
+ return Mono.usingWhen(
+ gitRedisUtils.acquireGitLock(
+ artifactType, baseArtifactId, GitConstants.GitCommandConstants.MERGE_BRANCH, TRUE),
+ ignoreLock -> {
+ ArtifactJsonTransformationDTO jsonTransformationDTO =
+ new ArtifactJsonTransformationDTO(workspaceId, baseArtifactId, repoName);
+ jsonTransformationDTO.setArtifactType(artifactType);
+
+ FetchRemoteDTO fetchRemoteDTO = new FetchRemoteDTO();
+ fetchRemoteDTO.setRefNames(List.of(sourceBranch, destinationBranch));
+
+ GitHandlingService gitHandlingService =
+ gitHandlingServiceResolver.getGitHandlingService(gitType);
+
+ Mono fetchingRemoteMono = gitHandlingService.fetchRemoteReferences(
+ jsonTransformationDTO, fetchRemoteDTO, baseGitMetadata.getGitAuth());
+
+ Mono> statusTupleMono = fetchingRemoteMono
+ .flatMap(remoteSpecs -> {
+ Mono sourceBranchStatusMono = Mono.defer(() -> getStatus(
+ baseArtifact, sourceArtifact, false, false, gitType)
+ .flatMap(srcBranchStatus -> {
+ if (srcBranchStatus.getIsClean()) {
+ return Mono.just(srcBranchStatus);
+ }
+
+ AppsmithException statusFailureException;
+
+ if (!Integer.valueOf(0)
+ .equals(srcBranchStatus.getBehindCount())) {
+ statusFailureException = new AppsmithException(
+ AppsmithError.GIT_MERGE_FAILED_REMOTE_CHANGES,
+ srcBranchStatus.getBehindCount(),
+ sourceBranch);
+ } else {
+ statusFailureException = new AppsmithException(
+ AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES,
+ sourceBranch);
+ }
+
+ return Mono.error(statusFailureException);
+ }));
+
+ Mono destinationBranchStatusMono = Mono.defer(() -> getStatus(
+ baseArtifact, destinationArtifact, false, false, gitType)
+ .flatMap(destinationBranchStatus -> {
+ if (destinationBranchStatus.getIsClean()) {
+ Mono.just(destinationBranchStatus);
+ }
+
+ AppsmithException statusFailureException;
+
+ if (!Integer.valueOf(0)
+ .equals(destinationBranchStatus.getBehindCount())) {
+ statusFailureException = new AppsmithException(
+ AppsmithError.GIT_MERGE_FAILED_REMOTE_CHANGES,
+ destinationBranchStatus.getBehindCount(),
+ destinationBranch);
+ } else {
+ statusFailureException = new AppsmithException(
+ AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES,
+ destinationBranch);
+ }
+
+ return Mono.error(statusFailureException);
+ }));
+
+ return sourceBranchStatusMono.zipWith(destinationBranchStatusMono);
+ })
+ .onErrorResume(error -> {
+ log.error(
+ "Error in repo status check for artifact: {}, Details: {}",
+ branchedArtifactId,
+ error.getMessage());
+
+ if (error instanceof AppsmithException) {
+ Mono.error(error);
+ }
+
+ return Mono.error(new AppsmithException(
+ AppsmithError.GIT_ACTION_FAILED, "status", error));
+ });
+
+ return statusTupleMono
+ .flatMap(statusTuples -> {
+ GitMergeDTO mergeDTO = new GitMergeDTO();
+ mergeDTO.setSourceBranch(sourceBranch);
+ mergeDTO.setDestinationBranch(destinationBranch);
+
+ Mono mergeBranchesMono =
+ gitHandlingService.mergeBranches(jsonTransformationDTO, mergeDTO);
+
+ return mergeBranchesMono.onErrorResume(error -> gitAnalyticsUtils
+ .addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_MERGE,
+ baseArtifact,
+ error.getClass().getName(),
+ error.getMessage(),
+ baseGitMetadata.getIsRepoPrivate())
+ .flatMap(artifact -> {
+ if (error instanceof GitAPIException) {
+ return Mono.error(new AppsmithException(
+ AppsmithError.GIT_MERGE_CONFLICTS,
+ error.getMessage()));
+ }
+
+ return Mono.error(new AppsmithException(
+ AppsmithError.GIT_ACTION_FAILED,
+ "merge",
+ error.getMessage()));
+ }));
+ })
+ .zipWhen(mergeStatus -> {
+ ArtifactJsonTransformationDTO constructJsonDTO =
+ new ArtifactJsonTransformationDTO(
+ workspaceId, baseArtifactId, repoName);
+ constructJsonDTO.setArtifactType(artifactType);
+ constructJsonDTO.setRefName(destinationBranch);
+ return gitHandlingService.reconstructArtifactJsonFromGitRepository(
+ constructJsonDTO);
+ })
+ .flatMap(tuple2 -> {
+ ArtifactExchangeJson artifactExchangeJson = tuple2.getT2();
+ MergeStatusDTO mergeStatusDTO = new MergeStatusDTO();
+ mergeStatusDTO.setStatus(tuple2.getT1());
+ mergeStatusDTO.setMergeAble(TRUE);
+
+ // 4. Get the latest artifact mono with all the changes
+ return importService
+ .importArtifactInWorkspaceFromGit(
+ workspaceId,
+ destinationArtifact.getId(),
+ artifactExchangeJson,
+ destinationBranch.replaceFirst(
+ ORIGIN, REMOTE_NAME_REPLACEMENT))
+ .flatMap(importedDestinationArtifact -> {
+ CommitDTO commitDTO = new CommitDTO();
+ commitDTO.setMessage(DEFAULT_COMMIT_MESSAGE
+ + GitDefaultCommitMessage.SYNC_REMOTE_AFTER_MERGE
+ .getReason()
+ + sourceBranch);
+
+ return commitArtifact(
+ commitDTO,
+ importedDestinationArtifact.getId(),
+ artifactType,
+ gitType)
+ .then(gitAnalyticsUtils.addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_MERGE,
+ importedDestinationArtifact,
+ importedDestinationArtifact
+ .getGitArtifactMetadata()
+ .getIsRepoPrivate()))
+ .thenReturn(mergeStatusDTO);
+ });
+ });
+ },
+ ignoreLock -> gitRedisUtils.releaseFileLock(artifactType, baseArtifactId, TRUE));
+ })
+ .name(GitSpan.OPS_MERGE_BRANCH)
+ .tap(Micrometer.observation(observationRegistry));
+
+ return Mono.create(sink -> mergeMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+ }
+
+ @Override
+ public Mono isBranchMergable(
+ String branchedArtifactId, ArtifactType artifactType, GitMergeDTO gitMergeDTO, GitType gitType) {
+
+ final String sourceBranch = gitMergeDTO.getSourceBranch();
+ final String destinationBranch = gitMergeDTO.getDestinationBranch();
+
+ if (!hasText(sourceBranch) || !hasText(destinationBranch)) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
+ } else if (sourceBranch.startsWith(ORIGIN)) {
+ return Mono.error(
+ new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION_FOR_REMOTE_BRANCH, sourceBranch));
+ } else if (destinationBranch.startsWith(ORIGIN)) {
+ return Mono.error(
+ new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION_FOR_REMOTE_BRANCH, destinationBranch));
+ }
+
+ GitArtifactHelper gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
+ AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+ Mono> baseAndBranchedArtifactsMono =
+ getBaseAndBranchedArtifacts(branchedArtifactId, artifactType).cache();
+
+ Mono destinationArtifactMono = baseAndBranchedArtifactsMono.flatMap(artifactTuples -> {
+ Artifact baseArtifact = artifactTuples.getT1();
+ if (destinationBranch.equals(baseArtifact.getGitArtifactMetadata().getRefName())) {
+ return Mono.just(baseArtifact);
+ }
+
+ return gitArtifactHelper.getArtifactByBaseIdAndBranchName(
+ baseArtifact.getId(), destinationBranch, artifactEditPermission);
+ });
+
+ Mono mergeableStatusMono = baseAndBranchedArtifactsMono
+ .zipWith(destinationArtifactMono)
+ .flatMap(artifactTuples -> {
+ Artifact baseArtifact = artifactTuples.getT1().getT1();
+ Artifact sourceArtifact = artifactTuples.getT1().getT2();
+ Artifact destinationArtifact = artifactTuples.getT2();
+
+ GitArtifactMetadata baseGitMetadata = baseArtifact.getGitArtifactMetadata();
+ if (isBaseGitMetadataInvalid(baseArtifact.getGitArtifactMetadata(), gitType)) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
+ }
+
+ final String workspaceId = baseArtifact.getWorkspaceId();
+ final String baseArtifactId = baseGitMetadata.getDefaultArtifactId();
+ final String repoName = baseGitMetadata.getRepoName();
+
+ // 1. Hydrate from db to git system for both ref Artifacts
+ // Update function call
+ return Mono.usingWhen(
+ gitRedisUtils.acquireGitLock(
+ artifactType, baseArtifactId, GitConstants.GitCommandConstants.MERGE_BRANCH, TRUE),
+ ignoreLock -> {
+ ArtifactJsonTransformationDTO jsonTransformationDTO =
+ new ArtifactJsonTransformationDTO(workspaceId, baseArtifactId, repoName);
+ jsonTransformationDTO.setArtifactType(artifactType);
+
+ FetchRemoteDTO fetchRemoteDTO = new FetchRemoteDTO();
+ fetchRemoteDTO.setRefNames(List.of(sourceBranch, destinationBranch));
+
+ GitHandlingService gitHandlingService =
+ gitHandlingServiceResolver.getGitHandlingService(gitType);
+
+ Mono fetchRemoteReferencesMono = gitHandlingService.fetchRemoteReferences(
+ jsonTransformationDTO, fetchRemoteDTO, baseGitMetadata.getGitAuth());
+
+ Mono> statusTupleMono = fetchRemoteReferencesMono
+ .flatMap(remoteSpecs -> {
+ Mono sourceBranchStatusMono = Mono.defer(() -> getStatus(
+ baseArtifact, sourceArtifact, false, false, gitType)
+ .flatMap(srcBranchStatus -> {
+ if (srcBranchStatus.getIsClean()) {
+ return Mono.just(srcBranchStatus);
+ }
+
+ AppsmithError uncleanStatusError;
+ AppsmithException uncleanStatusException;
+
+ if (!Integer.valueOf(0)
+ .equals(srcBranchStatus.getBehindCount())) {
+ uncleanStatusError =
+ AppsmithError.GIT_MERGE_FAILED_REMOTE_CHANGES;
+ uncleanStatusException = new AppsmithException(
+ uncleanStatusError,
+ srcBranchStatus.getBehindCount(),
+ sourceBranch);
+ } else {
+ uncleanStatusError =
+ AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES;
+ uncleanStatusException = new AppsmithException(
+ uncleanStatusError, sourceBranch);
+ }
+
+ return gitAnalyticsUtils
+ .addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_MERGE_CHECK,
+ baseArtifact,
+ uncleanStatusError.name(),
+ uncleanStatusException.getMessage(),
+ baseGitMetadata.getIsRepoPrivate(),
+ false,
+ false)
+ .then(Mono.error(uncleanStatusException));
+ }));
+
+ Mono destinationBranchStatusMono = Mono.defer(() -> getStatus(
+ baseArtifact, destinationArtifact, false, false, gitType)
+ .flatMap(destinationBranchStatus -> {
+ if (destinationBranchStatus.getIsClean()) {
+ return Mono.just(destinationBranchStatus);
+ }
+
+ AppsmithError uncleanStatusError;
+ AppsmithException uncleanStatusException;
+
+ if (!Integer.valueOf(0)
+ .equals(destinationBranchStatus.getBehindCount())) {
+ uncleanStatusError =
+ AppsmithError.GIT_MERGE_FAILED_REMOTE_CHANGES;
+ uncleanStatusException = new AppsmithException(
+ uncleanStatusError,
+ destinationBranchStatus.getBehindCount(),
+ destinationBranch);
+ } else {
+ uncleanStatusError =
+ AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES;
+ uncleanStatusException = new AppsmithException(
+ uncleanStatusError, destinationBranch);
+ }
+
+ return gitAnalyticsUtils
+ .addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_MERGE_CHECK,
+ baseArtifact,
+ uncleanStatusError.name(),
+ uncleanStatusException.getMessage(),
+ baseGitMetadata.getIsRepoPrivate(),
+ false,
+ false)
+ .then(Mono.error(uncleanStatusException));
+ }));
+
+ return sourceBranchStatusMono.zipWith(destinationBranchStatusMono);
+ })
+ .onErrorResume(error -> {
+ log.error(
+ "Error in merge status check for baseArtifact {} ",
+ baseArtifactId,
+ error);
+ if (error instanceof AppsmithException) {
+ Mono.error(error);
+ }
+
+ return Mono.error(new AppsmithException(
+ AppsmithError.GIT_ACTION_FAILED, "status", error));
+ });
+
+ return statusTupleMono.flatMap(statusTuple -> {
+ GitMergeDTO mergeDTO = new GitMergeDTO();
+ mergeDTO.setSourceBranch(sourceBranch);
+ mergeDTO.setDestinationBranch(destinationBranch);
+
+ Mono isBranchMergable =
+ gitHandlingService.isBranchMergable(jsonTransformationDTO, mergeDTO);
+
+ return isBranchMergable.onErrorResume(error -> {
+ MergeStatusDTO mergeStatus = new MergeStatusDTO();
+ mergeStatus.setMergeAble(false);
+ mergeStatus.setStatus("Merge check failed!");
+ mergeStatus.setMessage(error.getMessage());
+
+ return gitAnalyticsUtils
+ .addAnalyticsForGitOperation(
+ AnalyticsEvents.GIT_MERGE_CHECK,
+ baseArtifact,
+ error.getClass().getName(),
+ error.getMessage(),
+ baseGitMetadata.getIsRepoPrivate(),
+ false,
+ false)
+ .thenReturn(mergeStatus);
+ });
+ });
+ },
+ ignoreLock -> gitRedisUtils.releaseFileLock(artifactType, baseArtifactId, TRUE));
+ });
+
+ return Mono.create(
+ sink -> mergeableStatusMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java
index 43459bd9682a..473d5f81ec36 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java
@@ -3,12 +3,14 @@
import com.appsmith.external.dtos.GitRefDTO;
import com.appsmith.external.dtos.GitStatusDTO;
import com.appsmith.external.dtos.MergeStatusDTO;
+import com.appsmith.external.git.dtos.FetchRemoteDTO;
import com.appsmith.git.dto.CommitDTO;
import com.appsmith.server.domains.Artifact;
import com.appsmith.server.domains.GitArtifactMetadata;
import com.appsmith.server.domains.GitAuth;
import com.appsmith.server.dtos.ArtifactExchangeJson;
import com.appsmith.server.dtos.GitConnectDTO;
+import com.appsmith.server.dtos.GitMergeDTO;
import com.appsmith.server.git.dtos.ArtifactJsonTransformationDTO;
import reactor.core.publisher.Mono;
import reactor.util.function.Tuple2;
@@ -70,9 +72,16 @@ Mono prepareChangesToBeCommitted(
Mono> commitArtifact(
Artifact branchedArtifact, CommitDTO commitDTO, ArtifactJsonTransformationDTO jsonTransformationDTO);
- Mono fetchRemoteChanges(
+ Mono fetchRemoteReferences(
ArtifactJsonTransformationDTO jsonTransformationDTO, GitAuth gitAuth, Boolean isFetchAll);
+ Mono fetchRemoteReferences(
+ ArtifactJsonTransformationDTO jsonTransformationDTO, FetchRemoteDTO fetchRemoteDTO, GitAuth gitAuth);
+
+ Mono mergeBranches(ArtifactJsonTransformationDTO jsonTransformationDTO, GitMergeDTO gitMergeDTO);
+
+ Mono isBranchMergable(ArtifactJsonTransformationDTO JsonTransformationDTO, GitMergeDTO gitMergeDTO);
+
Mono recreateArtifactJsonFromLastCommit(
ArtifactJsonTransformationDTO jsonTransformationDTO);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java
index aefef9970fe6..9adf691c24d8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java
@@ -3,6 +3,7 @@
import com.appsmith.external.dtos.GitBranchDTO;
import com.appsmith.external.dtos.GitRefDTO;
import com.appsmith.external.dtos.GitStatusDTO;
+import com.appsmith.external.dtos.MergeStatusDTO;
import com.appsmith.external.git.constants.ce.RefType;
import com.appsmith.external.views.Views;
import com.appsmith.git.dto.CommitDTO;
@@ -14,6 +15,7 @@
import com.appsmith.server.dtos.AutoCommitResponseDTO;
import com.appsmith.server.dtos.BranchProtectionRequestDTO;
import com.appsmith.server.dtos.GitConnectDTO;
+import com.appsmith.server.dtos.GitMergeDTO;
import com.appsmith.server.dtos.GitPullDTO;
import com.appsmith.server.dtos.ResponseDTO;
import com.appsmith.server.git.autocommit.AutoCommitService;
@@ -148,6 +150,34 @@ public Mono> fetchRemoteChanges(
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
}
+ @JsonView(Views.Public.class)
+ @PostMapping("/{branchedApplicationId}/merge")
+ public Mono> merge(
+ @PathVariable String branchedApplicationId, @RequestBody GitMergeDTO gitMergeDTO) {
+ log.debug(
+ "Going to merge branch {} with branch {} for application {}",
+ gitMergeDTO.getSourceBranch(),
+ gitMergeDTO.getDestinationBranch(),
+ branchedApplicationId);
+ return centralGitService
+ .mergeBranch(branchedApplicationId, ARTIFACT_TYPE, gitMergeDTO, GIT_TYPE)
+ .map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
+ }
+
+ @JsonView(Views.Public.class)
+ @PostMapping("/{branchedApplicationId}/merge/status")
+ public Mono> mergeStatus(
+ @PathVariable String branchedApplicationId, @RequestBody GitMergeDTO gitMergeDTO) {
+ log.info(
+ "Check if branch {} can be merged with branch {} for application {}",
+ gitMergeDTO.getSourceBranch(),
+ gitMergeDTO.getDestinationBranch(),
+ branchedApplicationId);
+ return centralGitService
+ .isBranchMergable(branchedApplicationId, ARTIFACT_TYPE, gitMergeDTO, GIT_TYPE)
+ .map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
+ }
+
@JsonView(Views.Public.class)
@DeleteMapping("/{baseArtifactId}/ref")
public Mono> deleteBranch(
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitArtifactControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitArtifactControllerCE.java
index 71215783c16e..d2fd03b8ad04 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitArtifactControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitArtifactControllerCE.java
@@ -4,7 +4,7 @@
import com.appsmith.server.constants.ArtifactType;
import com.appsmith.server.constants.Url;
import com.appsmith.server.domains.GitAuth;
-import com.appsmith.server.dtos.ApplicationImportDTO;
+import com.appsmith.server.dtos.ArtifactImportDTO;
import com.appsmith.server.dtos.GitConnectDTO;
import com.appsmith.server.dtos.GitDeployKeyDTO;
import com.appsmith.server.dtos.GitDocsDTO;
@@ -38,13 +38,12 @@ public class GitArtifactControllerCE {
@JsonView(Views.Public.class)
@PostMapping("/import")
- public Mono> importApplicationFromGit(
+ public Mono> importArtifactFromGit(
@RequestParam String workspaceId, @RequestBody GitConnectDTO gitConnectDTO) {
// TODO: remove artifact type from methods.
return centralGitService
.importArtifactFromGit(workspaceId, gitConnectDTO, ArtifactType.APPLICATION, GIT_TYPE)
- .map(artifactImportDTO -> (ApplicationImportDTO) artifactImportDTO)
.map(result -> new ResponseDTO<>(HttpStatus.CREATED.value(), result, null));
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/dtos/ArtifactJsonTransformationDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/dtos/ArtifactJsonTransformationDTO.java
index f6d3d1ef5ace..a4a1470ffeae 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/dtos/ArtifactJsonTransformationDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/dtos/ArtifactJsonTransformationDTO.java
@@ -2,7 +2,9 @@
import com.appsmith.external.git.constants.ce.RefType;
import com.appsmith.server.constants.ArtifactType;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
// TODO: Find a better name for this DTO
@@ -11,6 +13,8 @@
* this is also responsible for traversing paths for fs ops
*/
@Data
+@NoArgsConstructor
+@AllArgsConstructor
public class ArtifactJsonTransformationDTO {
String workspaceId;
@@ -24,4 +28,10 @@ public class ArtifactJsonTransformationDTO {
ArtifactType artifactType;
RefType refType;
+
+ public ArtifactJsonTransformationDTO(String workspaceId, String baseArtifactId, String repoName) {
+ this.workspaceId = workspaceId;
+ this.baseArtifactId = baseArtifactId;
+ this.repoName = repoName;
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java
index 598147b8f81b..541c57058ceb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java
@@ -8,6 +8,7 @@
import com.appsmith.external.git.constants.GitConstants;
import com.appsmith.external.git.constants.GitSpan;
import com.appsmith.external.git.constants.ce.RefType;
+import com.appsmith.external.git.dtos.FetchRemoteDTO;
import com.appsmith.external.git.handler.FSGitHandler;
import com.appsmith.git.dto.CommitDTO;
import com.appsmith.server.configurations.EmailConfig;
@@ -19,6 +20,7 @@
import com.appsmith.server.domains.GitDeployKeys;
import com.appsmith.server.dtos.ArtifactExchangeJson;
import com.appsmith.server.dtos.GitConnectDTO;
+import com.appsmith.server.dtos.GitMergeDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.exports.internal.ExportService;
@@ -29,6 +31,7 @@
import com.appsmith.server.git.resolver.GitArtifactHelperResolver;
import com.appsmith.server.git.utils.GitAnalyticsUtils;
import com.appsmith.server.git.utils.GitProfileUtils;
+import com.appsmith.server.helpers.CollectionUtils;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.GitUtils;
@@ -579,7 +582,7 @@ private Mono pushArtifactErrorRecovery(String pushResult, Artifact artif
* @return : returns string for remote fetch
*/
@Override
- public Mono fetchRemoteChanges(
+ public Mono fetchRemoteReferences(
ArtifactJsonTransformationDTO jsonTransformationDTO, GitAuth gitAuth, Boolean isFetchAll) {
String workspaceId = jsonTransformationDTO.getWorkspaceId();
@@ -600,6 +603,57 @@ public Mono fetchRemoteChanges(
return fetchRemoteMono.flatMap(remoteFetched -> checkoutBranchMono.thenReturn(remoteFetched));
}
+ @Override
+ public Mono fetchRemoteReferences(
+ ArtifactJsonTransformationDTO jsonTransformationDTO, FetchRemoteDTO fetchRemoteDTO, GitAuth gitAuth) {
+ String workspaceId = jsonTransformationDTO.getWorkspaceId();
+ String baseArtifactId = jsonTransformationDTO.getBaseArtifactId();
+ String repoName = jsonTransformationDTO.getRepoName();
+
+ ArtifactType artifactType = jsonTransformationDTO.getArtifactType();
+ GitArtifactHelper gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
+ Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(workspaceId, baseArtifactId, repoName);
+
+ String publicKey = gitAuth.getPublicKey();
+ String privateKey = gitAuth.getPrivateKey();
+
+ if (CollectionUtils.isNullOrEmpty(fetchRemoteDTO.getRefNames())) {
+ return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION));
+ }
+
+ return fsGitHandler.fetchRemote(repoSuffix, false, fetchRemoteDTO, publicKey, privateKey);
+ }
+
+ @Override
+ public Mono mergeBranches(ArtifactJsonTransformationDTO jsonTransformationDTO, GitMergeDTO gitMergeDTO) {
+ String workspaceId = jsonTransformationDTO.getWorkspaceId();
+ String baseArtifactId = jsonTransformationDTO.getBaseArtifactId();
+ String repoName = jsonTransformationDTO.getRepoName();
+
+ ArtifactType artifactType = jsonTransformationDTO.getArtifactType();
+ GitArtifactHelper gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
+ Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(workspaceId, baseArtifactId, repoName);
+
+ // At this point the assumption is that the repository has already checked out the destination branch
+ return fsGitHandler.mergeBranch(repoSuffix, gitMergeDTO.getSourceBranch(), gitMergeDTO.getDestinationBranch());
+ }
+
+ @Override
+ public Mono isBranchMergable(
+ ArtifactJsonTransformationDTO jsonTransformationDTO, GitMergeDTO gitMergeDTO) {
+ String workspaceId = jsonTransformationDTO.getWorkspaceId();
+ String baseArtifactId = jsonTransformationDTO.getBaseArtifactId();
+ String repoName = jsonTransformationDTO.getRepoName();
+
+ ArtifactType artifactType = jsonTransformationDTO.getArtifactType();
+ GitArtifactHelper gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
+ Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(workspaceId, baseArtifactId, repoName);
+
+ // At this point the assumption is that the repository has already checked out the destination branch
+ return fsGitHandler.isMergeBranch(
+ repoSuffix, gitMergeDTO.getSourceBranch(), gitMergeDTO.getDestinationBranch());
+ }
+
@Override
public Mono recreateArtifactJsonFromLastCommit(
ArtifactJsonTransformationDTO jsonTransformationDTO) {
})
+