fix(discussions): answered discussions only available in GHES 3.12 or higher (#1665)

* fix(discussions): answered discussions only supported in GHSE 3.12 or higher

Signed-off-by: Adam Setch <[email protected]>

* fix(discussions): answered discussions only supported in GHSE 3.12 or higher

Signed-off-by: Adam Setch <[email protected]>

---------

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/renderer/typesGitHub.ts

@@ -500,7 +500,7 @@ export interface Discussion {
   number: number;
   title: string;
   stateReason: DiscussionStateType;
-  isAnswered: boolean;
+  isAnswered: boolean | null;
   url: Link;
   author: DiscussionAuthor;
   comments: DiscussionComments;

src/renderer/utils/api/client.ts

@@ -22,6 +22,7 @@ import type {
   Release,
   UserDetails,
 } from '../../typesGitHub';
+import { isAnsweredDiscussionFeatureSupported } from '../helpers';
 import { QUERY_SEARCH_DISCUSSIONS } from './graphql/discussions';
 import { formatAsGitHubSearchSyntax } from './graphql/utils';
 import { apiRequestAuth } from './request';
@@ -244,6 +245,9 @@ export async function searchDiscussions(
         firstDiscussions: 1,
         lastComments: 1,
         lastReplies: 1,
+        includeIsAnswered: isAnsweredDiscussionFeatureSupported(
+          notification.account,
+        ),
       },
     },
   );

src/renderer/utils/api/graphql/discussions.ts

@@ -27,14 +27,15 @@ export const QUERY_SEARCH_DISCUSSIONS = gql`
     $firstDiscussions: Int
     $lastComments: Int
     $lastReplies: Int
+    $includeIsAnswered: Boolean!
   ) {
     search(query: $queryStatement, type: DISCUSSION, first: $firstDiscussions) {
       nodes {
         ... on Discussion {
           number
           title
           stateReason
-          isAnswered
+          isAnswered @include(if: $includeIsAnswered)
           url
           author {
             ...AuthorFields

src/renderer/utils/helpers.test.ts

@@ -27,6 +27,7 @@ import {
   getChevronDetails,
   getFilterCount,
   getPlatformFromHostname,
+  isAnsweredDiscussionFeatureSupported,
   isEnterpriseServerHost,
   isMarkAsDoneFeatureSupported,
 } from './helpers';
@@ -110,6 +111,50 @@ describe('renderer/utils/helpers.ts', () => {
     });
   });
 
+  describe('isAnsweredDiscussionFeatureSupported', () => {
+    it('should return true for GitHub Cloud', () => {
+      expect(isAnsweredDiscussionFeatureSupported(mockGitHubCloudAccount)).toBe(
+        true,
+      );
+    });
+
+    it('should return false for GitHub Enterprise Server < v3.12', () => {
+      const account = {
+        ...mockGitHubEnterpriseServerAccount,
+        version: '3.11.0',
+      };
+
+      expect(isAnsweredDiscussionFeatureSupported(account)).toBe(false);
+    });
+
+    it('should return true for GitHub Enterprise Server >= v3.12', () => {
+      const account = {
+        ...mockGitHubEnterpriseServerAccount,
+        version: '3.12.3',
+      };
+
+      expect(isAnsweredDiscussionFeatureSupported(account)).toBe(true);
+    });
+
+    it('should return false for GitHub Enterprise Server when partial version available', () => {
+      const account = {
+        ...mockGitHubEnterpriseServerAccount,
+        version: '3',
+      };
+
+      expect(isAnsweredDiscussionFeatureSupported(account)).toBe(false);
+    });
+
+    it('should return false for GitHub Enterprise Server when no version available', () => {
+      const account = {
+        ...mockGitHubEnterpriseServerAccount,
+        version: null,
+      };
+
+      expect(isMarkAsDoneFeatureSupported(account)).toBe(false);
+    });
+  });
+
   describe('generateNotificationReferrerId', () => {
     it('should generate the notification_referrer_id', () => {
       const referrerId = generateNotificationReferrerId(mockSingleNotification);

src/renderer/utils/helpers.ts

@@ -27,9 +27,13 @@ export function isEnterpriseServerHost(hostname: Hostname): boolean {
   return !hostname.endsWith(Constants.DEFAULT_AUTH_OPTIONS.hostname);
 }
 
+/**
+ * Check if the "Mark as done" feature is supported for the given account.
+ *
+ * GitHub Cloud or GitHub Enterprise Server 3.13 or newer is required to support this feature.
+ */
 export function isMarkAsDoneFeatureSupported(account: Account): boolean {
   if (isEnterpriseServerHost(account.hostname)) {
-    // Support for "Mark as done" was added to GitHub Enterprise Server in v3.13 or newer
     if (account.version) {
       const version = account?.version.split('.').map(Number);
       return version[0] >= 3 && version[1] >= 13;
@@ -41,6 +45,26 @@ export function isMarkAsDoneFeatureSupported(account: Account): boolean {
   return true;
 }
 
+/**
+ * Check if the "answered" discussions are supported for the given account.
+ *
+ * GitHub Cloud or GitHub Enterprise Server 3.12 or newer is required to support this feature.
+ */
+export function isAnsweredDiscussionFeatureSupported(
+  account: Account,
+): boolean {
+  if (isEnterpriseServerHost(account.hostname)) {
+    if (account.version) {
+      const version = account?.version.split('.').map(Number);
+      return version[0] >= 3 && version[1] >= 12;
+    }
+
+    return false;
+  }
+
+  return true;
+}
+
 export function generateNotificationReferrerId(
   notification: Notification,
 ): string {