From 35854cb97dbe80d7a2308faee41dc3b33edad3b4 Mon Sep 17 00:00:00 2001 From: Rudraprasad Das Date: Thu, 13 Feb 2025 16:57:31 +0100 Subject: [PATCH] chore: remove cyclic deps --- .../git/artifact-helpers/application/applicationArtifact.ts | 2 +- .../application/applicationConnectToGitSaga.ts | 3 +-- .../artifact-helpers/ce/package/packageConnectToGitSaga.ts | 2 +- .../src/git/artifact-helpers/package/packageArtifact.ts | 2 +- app/client/src/git/components/GitContextProvider/index.tsx | 5 ++--- .../RepoLimitErrorModal/RepoLimitErrorModalView.tsx | 2 +- app/client/src/git/helpers/isAutocommitEnabled.ts | 2 +- app/client/src/git/helpers/isProtectedBranchesEnabled.ts | 2 +- app/client/src/git/hooks/useArtifactSelector.ts | 3 ++- app/client/src/git/hooks/useDisconnect.ts | 2 +- app/client/src/git/index.ts | 1 - app/client/src/git/sagas/disconnectSaga.ts | 3 ++- app/client/src/git/sagas/triggerAutocommitSaga.ts | 3 ++- app/client/src/git/store/actions/uiActions.ts | 3 ++- app/client/src/git/store/selectors/gitArtifactSelectors.ts | 3 ++- app/client/src/git/store/types.ts | 5 +---- app/client/src/git/types.ts | 6 ++++++ 17 files changed, 27 insertions(+), 22 deletions(-) diff --git a/app/client/src/git/artifact-helpers/application/applicationArtifact.ts b/app/client/src/git/artifact-helpers/application/applicationArtifact.ts index 7337db575ac6..bcb6432d1e01 100644 --- a/app/client/src/git/artifact-helpers/application/applicationArtifact.ts +++ b/app/client/src/git/artifact-helpers/application/applicationArtifact.ts @@ -1,5 +1,5 @@ import { GitArtifactType } from "git/constants/enums"; -import type { GitArtifactDef } from "git/store/types"; +import type { GitArtifactDef } from "git/types"; export default function applicationArtifact( baseApplicationId: string, diff --git a/app/client/src/git/artifact-helpers/application/applicationConnectToGitSaga.ts b/app/client/src/git/artifact-helpers/application/applicationConnectToGitSaga.ts index 564c36a66f5f..6437ff9631e8 100644 --- a/app/client/src/git/artifact-helpers/application/applicationConnectToGitSaga.ts +++ b/app/client/src/git/artifact-helpers/application/applicationConnectToGitSaga.ts @@ -4,8 +4,7 @@ import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import { getCurrentApplication } from "ee/selectors/applicationSelectors"; import type { ConnectResponse } from "git/requests/connectRequest.types"; import { gitArtifactActions } from "git/store/gitArtifactSlice"; -import type { GitArtifactDef } from "git/store/types"; -import type { GitApplicationArtifact } from "git/types"; +import type { GitApplicationArtifact, GitArtifactDef } from "git/types"; import { put, select } from "redux-saga/effects"; import { getCurrentPageId } from "selectors/editorSelectors"; import history from "utils/history"; diff --git a/app/client/src/git/artifact-helpers/ce/package/packageConnectToGitSaga.ts b/app/client/src/git/artifact-helpers/ce/package/packageConnectToGitSaga.ts index 2e2d367485a2..c6978432f37b 100644 --- a/app/client/src/git/artifact-helpers/ce/package/packageConnectToGitSaga.ts +++ b/app/client/src/git/artifact-helpers/ce/package/packageConnectToGitSaga.ts @@ -1,4 +1,4 @@ -import type { GitArtifactDef } from "git/store/types"; +import type { GitArtifactDef } from "git/types"; export default function* packageConnectToGitSaga( // need this to preserve interface diff --git a/app/client/src/git/artifact-helpers/package/packageArtifact.ts b/app/client/src/git/artifact-helpers/package/packageArtifact.ts index 9e4bbf4cc6de..1ef85aa7a397 100644 --- a/app/client/src/git/artifact-helpers/package/packageArtifact.ts +++ b/app/client/src/git/artifact-helpers/package/packageArtifact.ts @@ -1,5 +1,5 @@ import { GitArtifactType } from "git/constants/enums"; -import type { GitArtifactDef } from "git/store/types"; +import type { GitArtifactDef } from "git/types"; export default function packageArtifact(basePackageId: string): GitArtifactDef { return { diff --git a/app/client/src/git/components/GitContextProvider/index.tsx b/app/client/src/git/components/GitContextProvider/index.tsx index 971d72053604..88159a8d7048 100644 --- a/app/client/src/git/components/GitContextProvider/index.tsx +++ b/app/client/src/git/components/GitContextProvider/index.tsx @@ -1,11 +1,10 @@ import React, { createContext, useContext, useMemo } from "react"; import type { GitArtifactType } from "git/constants/enums"; import type { FetchStatusResponseData } from "git/requests/fetchStatusRequest.types"; -import type { GitArtifactDef } from "git/store/types"; -import type { StatusTreeStruct } from "../StatusChanges/types"; +import type { GitArtifact, GitArtifactDef } from "git/types"; +import type { StatusTreeStruct } from "git/components/StatusChanges/types"; import type { Workspace } from "ee/constants/workspaceConstants"; import { noop } from "lodash"; -import type { GitArtifact } from "git/types"; export interface GitContextValue { artifactDef: GitArtifactDef | null; diff --git a/app/client/src/git/components/RepoLimitErrorModal/RepoLimitErrorModalView.tsx b/app/client/src/git/components/RepoLimitErrorModal/RepoLimitErrorModalView.tsx index 84738efa6c34..d1f06f14fcf2 100644 --- a/app/client/src/git/components/RepoLimitErrorModal/RepoLimitErrorModalView.tsx +++ b/app/client/src/git/components/RepoLimitErrorModal/RepoLimitErrorModalView.tsx @@ -23,12 +23,12 @@ import { REVOKE_EXISTING_REPOSITORIES, } from "ee/constants/messages"; import AnalyticsUtil from "ee/utils/AnalyticsUtil"; -import type { GitArtifactDef } from "git/store/types"; import { noop } from "lodash"; import { applicationArtifact } from "git/artifact-helpers/application"; import type { GitApplicationArtifact, GitArtifact, + GitArtifactDef, GitPackageArtifact, } from "git/types"; diff --git a/app/client/src/git/helpers/isAutocommitEnabled.ts b/app/client/src/git/helpers/isAutocommitEnabled.ts index cabe194909a5..fdd689134e90 100644 --- a/app/client/src/git/helpers/isAutocommitEnabled.ts +++ b/app/client/src/git/helpers/isAutocommitEnabled.ts @@ -1,5 +1,5 @@ import { GitArtifactType } from "git/constants/enums"; -import type { GitArtifactDef } from "git/store/types"; +import type { GitArtifactDef } from "git/types"; // ? Temporary, will be removed when the feature is supported in packages function isAutocommitEnabled(artifactDef: GitArtifactDef) { diff --git a/app/client/src/git/helpers/isProtectedBranchesEnabled.ts b/app/client/src/git/helpers/isProtectedBranchesEnabled.ts index 624514f94edc..3cd81cd3879c 100644 --- a/app/client/src/git/helpers/isProtectedBranchesEnabled.ts +++ b/app/client/src/git/helpers/isProtectedBranchesEnabled.ts @@ -1,5 +1,5 @@ import { GitArtifactType } from "git/constants/enums"; -import type { GitArtifactDef } from "git/store/types"; +import type { GitArtifactDef } from "git/types"; // ? Temporary, will be removed when the feature is supported in packages function isProtectedBranchesEnabled(artifactDef: GitArtifactDef) { diff --git a/app/client/src/git/hooks/useArtifactSelector.ts b/app/client/src/git/hooks/useArtifactSelector.ts index dba2a0808bf3..60a5ce506a54 100644 --- a/app/client/src/git/hooks/useArtifactSelector.ts +++ b/app/client/src/git/hooks/useArtifactSelector.ts @@ -1,5 +1,6 @@ import { useGitContext } from "git/components/GitContextProvider"; -import type { GitArtifactDef, GitRootState } from "git/store/types"; +import type { GitRootState } from "git/store/types"; +import type { GitArtifactDef } from "git/types"; import { useSelector } from "react-redux"; import type { Tail } from "redux-saga/effects"; diff --git a/app/client/src/git/hooks/useDisconnect.ts b/app/client/src/git/hooks/useDisconnect.ts index 7df6fb5af127..66321d0cbffe 100644 --- a/app/client/src/git/hooks/useDisconnect.ts +++ b/app/client/src/git/hooks/useDisconnect.ts @@ -8,7 +8,7 @@ import { import { useCallback } from "react"; import { useDispatch } from "react-redux"; import useArtifactSelector from "./useArtifactSelector"; -import type { GitArtifactDef } from "git/store/types"; +import type { GitArtifactDef } from "git/types"; export default function useDisconnect() { const { artifactDef } = useGitContext(); diff --git a/app/client/src/git/index.ts b/app/client/src/git/index.ts index 81ca33f25a7b..ada22e2e13d3 100644 --- a/app/client/src/git/index.ts +++ b/app/client/src/git/index.ts @@ -31,7 +31,6 @@ export { // types export type { - GitArtifactDef, GitArtifactRootReduxState, GitGlobalReduxState, } from "./store/types"; diff --git a/app/client/src/git/sagas/disconnectSaga.ts b/app/client/src/git/sagas/disconnectSaga.ts index e3b8e44e3ac7..1770b076e177 100644 --- a/app/client/src/git/sagas/disconnectSaga.ts +++ b/app/client/src/git/sagas/disconnectSaga.ts @@ -6,11 +6,12 @@ import type { DisconnectResponse } from "git/requests/disconnectRequest.types"; import { gitArtifactActions } from "git/store/gitArtifactSlice"; import { selectDisconnectArtifactDef } from "git/store/selectors/gitArtifactSelectors"; import { selectGitApiContractsEnabled } from "git/store/selectors/gitFeatureFlagSelectors"; -import type { GitArtifactDef, GitArtifactPayloadAction } from "git/store/types"; +import type { GitArtifactPayloadAction } from "git/store/types"; import { call, put, select } from "redux-saga/effects"; import { validateResponse } from "sagas/ErrorSagas"; import history from "utils/history"; import handleApiErrors from "./helpers/handleApiErrors"; +import type { GitArtifactDef } from "git/types"; export default function* disconnectSaga(action: GitArtifactPayloadAction) { const { artifactDef } = action.payload; diff --git a/app/client/src/git/sagas/triggerAutocommitSaga.ts b/app/client/src/git/sagas/triggerAutocommitSaga.ts index a25b1d09ecac..a2f00ea1deb3 100644 --- a/app/client/src/git/sagas/triggerAutocommitSaga.ts +++ b/app/client/src/git/sagas/triggerAutocommitSaga.ts @@ -13,7 +13,7 @@ import type { import type { TriggerAutocommitInitPayload } from "git/store/actions/triggerAutocommitActions"; import { gitArtifactActions } from "git/store/gitArtifactSlice"; import { selectAutocommitEnabled } from "git/store/selectors/gitArtifactSelectors"; -import type { GitArtifactDef, GitArtifactPayloadAction } from "git/store/types"; +import type { GitArtifactPayloadAction } from "git/store/types"; import { call, cancel, @@ -27,6 +27,7 @@ import type { Task } from "redux-saga"; import { validateResponse } from "sagas/ErrorSagas"; import { selectGitApiContractsEnabled } from "git/store/selectors/gitFeatureFlagSelectors"; import handleApiErrors from "./helpers/handleApiErrors"; +import type { GitArtifactDef } from "git/types"; const AUTOCOMMIT_POLL_DELAY = 1000; const AUTOCOMMIT_WHITELISTED_STATES = [ diff --git a/app/client/src/git/store/actions/uiActions.ts b/app/client/src/git/store/actions/uiActions.ts index 486a391f8917..b08267ba95cc 100644 --- a/app/client/src/git/store/actions/uiActions.ts +++ b/app/client/src/git/store/actions/uiActions.ts @@ -1,7 +1,8 @@ import type { GitOpsTab, GitSettingsTab } from "git/constants/enums"; import { createArtifactAction } from "../helpers/createArtifactAction"; -import type { GitArtifactDef, GitGlobalReduxState } from "../types"; +import type { GitGlobalReduxState } from "../types"; import type { PayloadAction } from "@reduxjs/toolkit"; +import type { GitArtifactDef } from "git/types"; // connect modal export interface ToggleConnectModalPayload { diff --git a/app/client/src/git/store/selectors/gitArtifactSelectors.ts b/app/client/src/git/store/selectors/gitArtifactSelectors.ts index 303150028c6e..eb8f7aab0c49 100644 --- a/app/client/src/git/store/selectors/gitArtifactSelectors.ts +++ b/app/client/src/git/store/selectors/gitArtifactSelectors.ts @@ -1,4 +1,5 @@ -import type { GitArtifactDef, GitRootState } from "../types"; +import type { GitArtifactDef } from "git/types"; +import type { GitRootState } from "git/store/types"; export const selectGitArtifact = ( state: GitRootState, diff --git a/app/client/src/git/store/types.ts b/app/client/src/git/store/types.ts index c973bad2f411..e6d1231679fd 100644 --- a/app/client/src/git/store/types.ts +++ b/app/client/src/git/store/types.ts @@ -18,6 +18,7 @@ import type { } from "git/ee/store/types"; import type { FetchGlobalSSHKeyResponseData } from "git/requests/fetchGlobalSSHKeyRequest.types"; import type { FetchRefsResponseData } from "git/requests/fetchRefsRequest.types"; +import type { GitArtifactDef } from "git/types"; export interface GitApiError extends ApiResponseError { errorType?: string; @@ -82,10 +83,6 @@ export interface GitArtifactUIReduxState conflictErrorModalOpen: boolean; } -export interface GitArtifactDef { - artifactType: GitArtifactType; - baseArtifactId: string; -} export interface GitArtifactReduxState { ui: GitArtifactUIReduxState; apiResponses: GitArtifactAPIResponsesReduxState; diff --git a/app/client/src/git/types.ts b/app/client/src/git/types.ts index ebae37dc98a1..6e77c3ab04c7 100644 --- a/app/client/src/git/types.ts +++ b/app/client/src/git/types.ts @@ -1,5 +1,6 @@ import type { Package } from "ee/constants/PackageConstants"; import type { ApplicationPayload } from "entities/Application"; +import type { GitArtifactType } from "./constants/enums"; export interface GitRef { refName: string; @@ -12,6 +13,11 @@ export interface GitBranch { default: boolean; } +export interface GitArtifactDef { + artifactType: GitArtifactType; + baseArtifactId: string; +} + export type GitApplicationArtifact = ApplicationPayload; export type GitPackageArtifact = Package;