Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/client/src/actions/datasourceActions.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/ce/sagas/ApplicationSagas.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions app/client/src/ce/sagas/DatasourcesSagas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 6 additions & 0 deletions app/client/src/ee/api/DatasourcesApi.ts
Original file line number Diff line number Diff line change
@@ -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;
12 changes: 12 additions & 0 deletions app/client/src/git/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/reducers/uiReducers/gitSyncReducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading