feat(ui): show GitLab merge request status in walkthrough, git view and work status
This commit is contained in:
@@ -59,6 +59,7 @@ import { InProgressOperationBanner } from './git/InProgressOperationBanner';
|
||||
import { BranchIntegrationSection, type OperationLogEntry } from './git/BranchIntegrationSection';
|
||||
import { deriveBaseBranch } from './git/baseBranch';
|
||||
import { getFreshestPrStatusForBranch, useGitHubPrStatusStore } from '@/stores/useGitHubPrStatusStore';
|
||||
import { useGitLabMrForBranch } from '@/lib/gitlabMrStatus';
|
||||
import { createGitIndexMutationQueue, type GitIndexMutationDirection, type GitIndexMutationQueue } from './git/gitIndexMutationQueue';
|
||||
import type { GitRemote } from '@/lib/gitApi';
|
||||
import { getRootBranch } from '@/lib/worktrees/worktreeStatus';
|
||||
@@ -304,6 +305,7 @@ export const GitView: React.FC<GitViewProps> = ({ isActive }) => {
|
||||
const openContextSurface = useUIStore((state) => state.openContextSurface);
|
||||
|
||||
const prStatusBranch = status?.current ?? null;
|
||||
const { mr: gitLabMr } = useGitLabMrForBranch(currentDirectory, prStatusBranch);
|
||||
const prChipStatus = useGitHubPrStatusStore((state) => {
|
||||
if (!currentDirectory || !prStatusBranch) {
|
||||
return null;
|
||||
@@ -2361,6 +2363,10 @@ export const GitView: React.FC<GitViewProps> = ({ isActive }) => {
|
||||
onOpenPullRequest={
|
||||
currentDirectory ? () => openContextSurface(currentDirectory, 'pr') : undefined
|
||||
}
|
||||
gitLabMr={gitLabMr}
|
||||
onOpenGitLabMr={
|
||||
currentDirectory ? () => openContextSurface(currentDirectory, 'pr') : undefined
|
||||
}
|
||||
/>
|
||||
|
||||
{/* In-progress operation banner */}
|
||||
|
||||
Reference in New Issue
Block a user