Skip to content

chore: fixes issue with pull redirection #39478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brayn003 merged 1 commit into from
Feb 27, 2025
Merged

chore: fixes issue with pull redirection #39478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions app/client/src/git/requests/pullRequest.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { ApiResponse } from "api/types";
import type { GitArtifact } from "git/types";

export interface PullResponseData {
artifact: GitArtifact;
mergeStatus: {
isMergeAble: boolean;
status: string; // pull merge status
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/git/sagas/pullSaga.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function* pullSaga(
yield put(
gitArtifactActions.pullSuccess({
artifactDef,
responseData: response.data,
responseData: response.data.artifact,
}),
);
}
Expand Down
4 changes: 3 additions & 1 deletion app/client/src/git/store/actions/pullActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ export const pullInitAction = createArtifactAction<PullInitPayload>((state) => {
return state;
});

export type PullSuccessPayload = GitAsyncSuccessPayload<PullResponseData>;
export type PullSuccessPayload = GitAsyncSuccessPayload<
PullResponseData["artifact"]
>;

export const pullSuccessAction = createArtifactAction<PullSuccessPayload>(
(state) => {
Expand Down
Loading