fix issue when mergeResult object is missing

spaduret · Jan 18, 2022 · 2af9267 · 2af9267
1 parent 6262076
commit 2af9267
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/app/components/pull-request-view/pull-request.component.ts b/src/app/components/pull-request-view/pull-request.component.ts
@@ -29,7 +29,7 @@ export class PullRequestComponent implements OnInit {
 
     this.needsWork = this.pullRequest.reviewers.some(r => r.status === PullRequestStatus.NeedsWork);
     this.approved = !this.needsWork && this.pullRequest.reviewers.some(r => r.status === PullRequestStatus.Approved);
-    this.hasConflicts = this.pullRequest.properties.mergeResult.outcome === BitbucketMergeResultOutcome.Conflicted;
+    this.hasConflicts = this.pullRequest.properties.mergeResult?.outcome === BitbucketMergeResultOutcome.Conflicted;
 
     this.status = this.needsWork && 'NEEDS WORK'
       || this.hasConflicts && 'HAS CONFLICTS'

diff --git a/src/app/models/models.ts b/src/app/models/models.ts
@@ -122,7 +122,7 @@ export class BitbucketComment {
 }
 
 export class Properties {
-  mergeResult!: MergeResult;
+  mergeResult?: MergeResult;
   commentCount?: number;
 }
 

diff --git a/src/app/services/bitbucket-pr-rules.ts b/src/app/services/bitbucket-pr-rules.ts
@@ -53,8 +53,8 @@ export function CommentRule(a: PullRequestActivity, lastDataFetchingTimestamp: n
  * pr merge result moved to conflicted state
  */
 export function ConflictedRule(before: PullRequest, now: PullRequest) {
-  return before.properties.mergeResult.outcome !== BitbucketMergeResultOutcome.Conflicted
-    && now.properties.mergeResult.outcome === BitbucketMergeResultOutcome.Conflicted;
+  return before.properties.mergeResult?.outcome !== BitbucketMergeResultOutcome.Conflicted
+    && now.properties.mergeResult?.outcome === BitbucketMergeResultOutcome.Conflicted;
 }
 
 /**

diff --git a/src/manifest.json b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Pull Request Notifications",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Display notifications for Bitbucket pull requests.",
   "icons": {
     "64": "icon64.png",