diff --git a/app/client/src/git/hooks/useCommit.ts b/app/client/src/git/hooks/useCommit.ts index 6a468046a84b..3c20372f6121 100644 --- a/app/client/src/git/hooks/useCommit.ts +++ b/app/client/src/git/hooks/useCommit.ts @@ -14,13 +14,13 @@ export default function useCommit() { const commitState = useArtifactSelector(selectCommitState); const commit = useCallback( - (commitMessage: string) => { + (message: string) => { if (artifactDef && artifactId) { dispatch( gitArtifactActions.commitInit({ artifactId, artifactDef, - commitMessage, + message, doPush: true, }), ); diff --git a/app/client/src/git/requests/commitRequest.types.ts b/app/client/src/git/requests/commitRequest.types.ts index 68f8aeb2cedc..7485a66893b7 100644 --- a/app/client/src/git/requests/commitRequest.types.ts +++ b/app/client/src/git/requests/commitRequest.types.ts @@ -1,7 +1,7 @@ import type { ApiResponse } from "api/types"; export interface CommitRequestParams { - commitMessage: string; + message: string; doPush: boolean; } diff --git a/app/client/src/git/requests/fetchProtectedBranchesRequest.ts b/app/client/src/git/requests/fetchProtectedBranchesRequest.ts index 762f88038e71..2d959a8132af 100644 --- a/app/client/src/git/requests/fetchProtectedBranchesRequest.ts +++ b/app/client/src/git/requests/fetchProtectedBranchesRequest.ts @@ -14,7 +14,9 @@ async function fetchProtectedBranchesRequestNew( artifactType: GitArtifactType, baseArtifactId: string, ): AxiosPromise { - return Api.get(`${GIT_BASE_URL}/${artifactType}/${baseArtifactId}/protected`); + return Api.get( + `${GIT_BASE_URL}/${artifactType}/${baseArtifactId}/protected-branches`, + ); } export default async function fetchProtectedBranchesRequest( diff --git a/app/client/src/git/requests/gitImportRequest.ts b/app/client/src/git/requests/gitImportRequest.ts index 6d05dd543212..3ee6dcdfcba7 100644 --- a/app/client/src/git/requests/gitImportRequest.ts +++ b/app/client/src/git/requests/gitImportRequest.ts @@ -17,9 +17,7 @@ async function gitImportRequestNew( workspaceId: string, params: GitImportRequestParams, ): AxiosPromise { - return Api.post(`${GIT_BASE_URL}/artifacts/import`, params, { - params: { workspaceId }, - }); + return Api.post(`${GIT_BASE_URL}/artifacts/import`, params, { workspaceId }); } export default async function gitImportRequest( diff --git a/app/client/src/git/requests/updateProtectedBranchesRequest.ts b/app/client/src/git/requests/updateProtectedBranchesRequest.ts index 034126986789..c7135e2630ed 100644 --- a/app/client/src/git/requests/updateProtectedBranchesRequest.ts +++ b/app/client/src/git/requests/updateProtectedBranchesRequest.ts @@ -23,7 +23,7 @@ async function updateProtectedBranchesRequestNew( params: UpdateProtectedBranchesRequestParams, ): AxiosPromise { return Api.post( - `${GIT_BASE_URL}/${artifactType}/${baseArtifactId}/protected`, + `${GIT_BASE_URL}/${artifactType}/${baseArtifactId}/protected-branches`, params, ); } diff --git a/app/client/src/git/sagas/commitSaga.ts b/app/client/src/git/sagas/commitSaga.ts index 203baf485d36..9a0f058380d9 100644 --- a/app/client/src/git/sagas/commitSaga.ts +++ b/app/client/src/git/sagas/commitSaga.ts @@ -28,7 +28,7 @@ export default function* commitSaga( try { const params: CommitRequestParams = { - commitMessage: action.payload.commitMessage, + message: action.payload.message, doPush: action.payload.doPush, }; const isGitApiContractsEnabled: boolean = yield select(