Updates provider library and adds mergeable state values/permissions fix

Author: axosoft-ramint

package.json

@@ -20117,7 +20117,7 @@
 	},
 	"dependencies": {
 		"@gitkraken/gitkraken-components": "10.7.0",
-		"@gitkraken/provider-apis": "0.26.1",
+		"@gitkraken/provider-apis": "0.26.2",
 		"@gitkraken/shared-web-components": "0.1.1-rc.15",
 		"@gk-nzaytsev/fast-string-truncated-width": "1.1.0",
 		"@lit-labs/signals": "0.1.1",

pnpm-lock.yaml

@@ -120,6 +120,8 @@ export const enum PullRequestMergeableState {
 	Unknown = 'Unknown',
 	Mergeable = 'Mergeable',
 	Conflicting = 'Conflicting',
+	FailingChecks = 'FailingChecks',
+	BlockedByPolicy = 'BlockedByPolicy',
 }
 
 export const enum PullRequestStatusCheckRollupState {

src/git/models/pullRequest.ts

@@ -296,6 +296,10 @@ export function toGitHubPullRequestMergeableState(
 			return 'MERGEABLE';
 		case PullRequestMergeableState.Conflicting:
 			return 'CONFLICTING';
+		case PullRequestMergeableState.FailingChecks:
+			return 'UNKNOWN';
+		case PullRequestMergeableState.BlockedByPolicy:
+			return 'UNKNOWN';
 		case PullRequestMergeableState.Unknown:
 			return 'UNKNOWN';
 	}

src/plus/integrations/providers/github/models.ts

@@ -701,14 +701,17 @@ export const toProviderPullRequestMergeableState = {
 	[PullRequestMergeableState.Mergeable]: GitPullRequestMergeableState.Mergeable,
 	[PullRequestMergeableState.Conflicting]: GitPullRequestMergeableState.Conflicts,
 	[PullRequestMergeableState.Unknown]: GitPullRequestMergeableState.Unknown,
+	[PullRequestMergeableState.FailingChecks]: GitPullRequestMergeableState.FailingChecks,
+	[PullRequestMergeableState.BlockedByPolicy]: GitPullRequestMergeableState.Blocked,
 };
 
 export const fromProviderPullRequestMergeableState = {
 	[GitPullRequestMergeableState.Mergeable]: PullRequestMergeableState.Mergeable,
 	[GitPullRequestMergeableState.Conflicts]: PullRequestMergeableState.Conflicting,
+	[GitPullRequestMergeableState.Blocked]: PullRequestMergeableState.BlockedByPolicy,
+	[GitPullRequestMergeableState.FailingChecks]: PullRequestMergeableState.FailingChecks,
 	[GitPullRequestMergeableState.Unknown]: PullRequestMergeableState.Unknown,
 	[GitPullRequestMergeableState.Behind]: PullRequestMergeableState.Unknown,
-	[GitPullRequestMergeableState.Blocked]: PullRequestMergeableState.Unknown,
 	[GitPullRequestMergeableState.UnknownAndBlocked]: PullRequestMergeableState.Unknown,
 	[GitPullRequestMergeableState.Unstable]: PullRequestMergeableState.Unknown,
 };
@@ -870,16 +873,19 @@ export function toProviderPullRequest(pr: PullRequest): ProviderPullRequest {
 						],
 				  }
 				: null,
-		permissions: {
-			canMerge:
-				pr.viewerCanUpdate === true &&
-				pr.repository.accessLevel != null &&
-				pr.repository.accessLevel >= RepositoryAccessLevel.Write,
-			canMergeAndBypassProtections:
-				pr.viewerCanUpdate === true &&
-				pr.repository.accessLevel != null &&
-				pr.repository.accessLevel >= RepositoryAccessLevel.Admin,
-		},
+		permissions:
+			pr.viewerCanUpdate == null
+				? null
+				: {
+						canMerge:
+							pr.viewerCanUpdate === true &&
+							pr.repository.accessLevel != null &&
+							pr.repository.accessLevel >= RepositoryAccessLevel.Write,
+						canMergeAndBypassProtections:
+							pr.viewerCanUpdate === true &&
+							pr.repository.accessLevel != null &&
+							pr.repository.accessLevel >= RepositoryAccessLevel.Admin,
+				  },
 		mergeableState: pr.mergeableState
 			? toProviderPullRequestMergeableState[pr.mergeableState]
 			: GitPullRequestMergeableState.Unknown,