From 9b7e2828eb134ada2c46509b9b60929683d2a9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Csneha122=E2=80=9D?= <“sneha@appsmith.com”> Date: Wed, 26 Mar 2025 13:36:31 +0530 Subject: [PATCH 1/2] fix: Datasource API split changes --- app/client/src/actions/datasourceActions.ts | 2 +- app/client/src/{ => ce}/api/DatasourcesApi.ts | 2 +- app/client/src/ce/sagas/ApplicationSagas.tsx | 2 +- app/client/src/ce/sagas/DatasourcesSagas.ts | 4 ++-- app/client/src/ee/api/DatasourcesApi.ts | 6 ++++++ .../Editor/IntegrationEditor/DBOrMostPopularPlugins.tsx | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) rename app/client/src/{ => ce}/api/DatasourcesApi.ts (99%) create mode 100644 app/client/src/ee/api/DatasourcesApi.ts diff --git a/app/client/src/actions/datasourceActions.ts b/app/client/src/actions/datasourceActions.ts index ce4a2a55d91e..876971a6fa4a 100644 --- a/app/client/src/actions/datasourceActions.ts +++ b/app/client/src/actions/datasourceActions.ts @@ -1,6 +1,6 @@ import type { ReduxAction, ReduxActionWithCallbacks } from "./ReduxActionTypes"; import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; -import type { CreateDatasourceConfig } from "api/DatasourcesApi"; +import type { CreateDatasourceConfig } from "ee/api/DatasourcesApi"; import type { AuthenticationStatus, Datasource, diff --git a/app/client/src/api/DatasourcesApi.ts b/app/client/src/ce/api/DatasourcesApi.ts similarity index 99% rename from app/client/src/api/DatasourcesApi.ts rename to app/client/src/ce/api/DatasourcesApi.ts index 3bbb8eedffb5..ddfefd7b8785 100644 --- a/app/client/src/api/DatasourcesApi.ts +++ b/app/client/src/ce/api/DatasourcesApi.ts @@ -1,9 +1,9 @@ import { DEFAULT_TEST_DATA_SOURCE_TIMEOUT_MS } from "ee/constants/ApiConstants"; import API from "api/Api"; -import type { ApiResponse } from "./ApiResponses"; import type { AxiosPromise } from "axios"; import type { Datasource, DatasourceStorage } from "entities/Datasource"; +import type { ApiResponse } from "api/ApiResponses"; export interface CreateDatasourceConfig { name: string; pluginId: string; diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx index b76555620691..283e52ea2f77 100644 --- a/app/client/src/ce/sagas/ApplicationSagas.tsx +++ b/app/client/src/ce/sagas/ApplicationSagas.tsx @@ -92,7 +92,7 @@ import { isEmpty, merge } from "lodash"; import { checkAndGetPluginFormConfigsSaga } from "sagas/PluginSagas"; import { getPageList, getPluginForm } from "ee/selectors/entitiesSelector"; import { getConfigInitialValues } from "components/formControls/utils"; -import DatasourcesApi from "api/DatasourcesApi"; +import DatasourcesApi from "ee/api/DatasourcesApi"; import type { SetDefaultPageActionPayload } from "actions/pageActions"; import { resetApplicationWidgets } from "actions/pageActions"; import { setCanvasCardsState } from "actions/editorActions"; diff --git a/app/client/src/ce/sagas/DatasourcesSagas.ts b/app/client/src/ce/sagas/DatasourcesSagas.ts index 5f41d17faf4a..75d2bf7ee88c 100644 --- a/app/client/src/ce/sagas/DatasourcesSagas.ts +++ b/app/client/src/ce/sagas/DatasourcesSagas.ts @@ -61,8 +61,8 @@ import { updateDatasourceSuccess, } from "actions/datasourceActions"; import type { ApiResponse } from "api/ApiResponses"; -import type { CreateDatasourceConfig } from "api/DatasourcesApi"; -import DatasourcesApi from "api/DatasourcesApi"; +import type { CreateDatasourceConfig } from "ee/api/DatasourcesApi"; +import DatasourcesApi from "ee/api/DatasourcesApi"; import type { Datasource, DatasourceStorage, diff --git a/app/client/src/ee/api/DatasourcesApi.ts b/app/client/src/ee/api/DatasourcesApi.ts new file mode 100644 index 000000000000..cdaa8a81e806 --- /dev/null +++ b/app/client/src/ee/api/DatasourcesApi.ts @@ -0,0 +1,6 @@ +export * from "ce/api/DatasourcesApi"; +import { default as CE_DatasourcesApi } from "ce/api/DatasourcesApi"; + +class DatasourcesApi extends CE_DatasourcesApi {} + +export default DatasourcesApi; diff --git a/app/client/src/pages/Editor/IntegrationEditor/DBOrMostPopularPlugins.tsx b/app/client/src/pages/Editor/IntegrationEditor/DBOrMostPopularPlugins.tsx index 83a17d71485e..f8bda312c234 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/DBOrMostPopularPlugins.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/DBOrMostPopularPlugins.tsx @@ -41,7 +41,7 @@ import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants"; import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo"; import scrollIntoView from "scroll-into-view-if-needed"; import { pluginSearchSelector } from "./CreateNewDatasourceHeader"; -import type { CreateDatasourceConfig } from "api/DatasourcesApi"; +import type { CreateDatasourceConfig } from "ee/api/DatasourcesApi"; import type { Datasource } from "entities/Datasource"; import type { AnyAction, Dispatch } from "redux"; import { From aa7ce516912040a1f289f74fb0b26006bbb72f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Csneha122=E2=80=9D?= <“sneha@appsmith.com”> Date: Thu, 27 Mar 2025 15:05:28 +0530 Subject: [PATCH 2/2] git sync cyclic dependency issue fixed --- app/client/src/git/types.ts | 12 ++++++++++++ app/client/src/reducers/uiReducers/gitSyncReducer.ts | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/client/src/git/types.ts b/app/client/src/git/types.ts index 074b73200f67..e0facc5199f5 100644 --- a/app/client/src/git/types.ts +++ b/app/client/src/git/types.ts @@ -58,3 +58,15 @@ export interface GitPackageArtifact { } export type GitArtifact = GitApplicationArtifact | GitPackageArtifact; + +export interface SSHKeyType { + keySize: number; + platFormSupported: string; + protocolName: string; +} + +export interface GetSSHKeyResponseData { + gitSupportedSSHKeyType: SSHKeyType[]; + docUrl: string; + publicKey?: string; +} diff --git a/app/client/src/reducers/uiReducers/gitSyncReducer.ts b/app/client/src/reducers/uiReducers/gitSyncReducer.ts index dfef740a6353..a760aef5b970 100644 --- a/app/client/src/reducers/uiReducers/gitSyncReducer.ts +++ b/app/client/src/reducers/uiReducers/gitSyncReducer.ts @@ -6,7 +6,7 @@ import { } from "ee/constants/ReduxActionConstants"; import type { GitConfig, MergeStatus } from "entities/GitSync"; import { GitSyncModalTab } from "entities/GitSync"; -import type { GetSSHKeyResponseData, SSHKeyType } from "actions/gitSyncActions"; +import type { GetSSHKeyResponseData, SSHKeyType } from "git/types"; import type { PageDefaultMeta } from "ee/api/ApplicationApi"; export enum GitSettingsTab {