DEVPROD-937: Allow settings Jira ticket type in Project Settings (eve…

…rgreen-ci#2156)
khelif96 · Nov 22, 2023 · 48ed54c · 48ed54c
1 parent ecacc78
commit 48ed54c
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 1 deletion.
diff --git a/src/components/Notifications/form/notification.ts b/src/components/Notifications/form/notification.ts
@@ -1,5 +1,6 @@
 import { FieldRow } from "components/SpruceForm/FieldTemplates";
 import { SpruceFormProps } from "components/SpruceForm/types";
+import { JiraTicketType } from "types/jira";
 import {
   SubscriptionMethodOption,
   NotificationMethods,
@@ -193,7 +194,7 @@ export const getNotificationSchema = (
         "ui:data-cy": "project-input",
       },
       issueInput: {
-        "ui:placeholder": "Build Failure",
+        "ui:placeholder": JiraTicketType.BuildFailure,
         "ui:data-cy": "issue-input",
       },
     },

diff --git a/src/gql/fragments/projectSettings/plugins.graphql b/src/gql/fragments/projectSettings/plugins.graphql
@@ -1,5 +1,6 @@
 fragment ProjectPluginsSettings on Project {
   buildBaronSettings {
+    ticketCreateIssueType
     ticketCreateProject
     ticketSearchProjects
   }
@@ -23,6 +24,7 @@ fragment ProjectPluginsSettings on Project {
 
 fragment RepoPluginsSettings on RepoRef {
   buildBaronSettings {
+    ticketCreateIssueType
     ticketCreateProject
     ticketSearchProjects
   }

diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
@@ -3676,6 +3676,7 @@ export type ProjectSettingsFieldsFragment = {
     }> | null;
     buildBaronSettings: {
       __typename?: "BuildBaronSettings";
+      ticketCreateIssueType: string;
       ticketCreateProject: string;
       ticketSearchProjects?: Array<string> | null;
     };
@@ -3875,6 +3876,7 @@ export type RepoSettingsFieldsFragment = {
     }> | null;
     buildBaronSettings: {
       __typename?: "BuildBaronSettings";
+      ticketCreateIssueType: string;
       ticketCreateProject: string;
       ticketSearchProjects?: Array<string> | null;
     };
@@ -4135,6 +4137,7 @@ export type ProjectPluginsSettingsFragment = {
   perfEnabled?: boolean | null;
   buildBaronSettings: {
     __typename?: "BuildBaronSettings";
+    ticketCreateIssueType: string;
     ticketCreateProject: string;
     ticketSearchProjects?: Array<string> | null;
   };
@@ -4164,6 +4167,7 @@ export type RepoPluginsSettingsFragment = {
   perfEnabled: boolean;
   buildBaronSettings: {
     __typename?: "BuildBaronSettings";
+    ticketCreateIssueType: string;
     ticketCreateProject: string;
     ticketSearchProjects?: Array<string> | null;
   };
@@ -4272,6 +4276,7 @@ export type ProjectEventSettingsFragment = {
     }> | null;
     buildBaronSettings: {
       __typename?: "BuildBaronSettings";
+      ticketCreateIssueType: string;
       ticketCreateProject: string;
       ticketSearchProjects?: Array<string> | null;
     };
@@ -6733,6 +6738,7 @@ export type ProjectEventLogsQuery = {
           }> | null;
           buildBaronSettings: {
             __typename?: "BuildBaronSettings";
+            ticketCreateIssueType: string;
             ticketCreateProject: string;
             ticketSearchProjects?: Array<string> | null;
           };
@@ -6944,6 +6950,7 @@ export type ProjectEventLogsQuery = {
           }> | null;
           buildBaronSettings: {
             __typename?: "BuildBaronSettings";
+            ticketCreateIssueType: string;
             ticketCreateProject: string;
             ticketSearchProjects?: Array<string> | null;
           };
@@ -7237,6 +7244,7 @@ export type ProjectSettingsQuery = {
       }> | null;
       buildBaronSettings: {
         __typename?: "BuildBaronSettings";
+        ticketCreateIssueType: string;
         ticketCreateProject: string;
         ticketSearchProjects?: Array<string> | null;
       };
@@ -7487,6 +7495,7 @@ export type RepoEventLogsQuery = {
           }> | null;
           buildBaronSettings: {
             __typename?: "BuildBaronSettings";
+            ticketCreateIssueType: string;
             ticketCreateProject: string;
             ticketSearchProjects?: Array<string> | null;
           };
@@ -7698,6 +7707,7 @@ export type RepoEventLogsQuery = {
           }> | null;
           buildBaronSettings: {
             __typename?: "BuildBaronSettings";
+            ticketCreateIssueType: string;
             ticketCreateProject: string;
             ticketSearchProjects?: Array<string> | null;
           };
@@ -7914,6 +7924,7 @@ export type RepoSettingsQuery = {
       }> | null;
       buildBaronSettings: {
         __typename?: "BuildBaronSettings";
+        ticketCreateIssueType: string;
         ticketCreateProject: string;
         ticketSearchProjects?: Array<string> | null;
       };

diff --git a/src/pages/projectSettings/CopyProjectModal.test.tsx b/src/pages/projectSettings/CopyProjectModal.test.tsx
@@ -303,6 +303,7 @@ const projectSettingsMock: ApolloMock<
             ticketCreateProject: "suv",
             ticketSearchProjects: ["suv"],
             __typename: "BuildBaronSettings",
+            ticketCreateIssueType: "",
           },
           taskAnnotationSettings: {
             jiraCustomFields: null,

diff --git a/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.test.tsx b/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.test.tsx
@@ -113,6 +113,7 @@ const projectEventsQuery: ProjectEventLogsQuery = {
               ticketCreateProject: "EVG",
               ticketSearchProjects: ["EVG"],
               __typename: "BuildBaronSettings",
+              ticketCreateIssueType: "",
             },
             taskAnnotationSettings: {
               jiraCustomFields: null,
@@ -198,6 +199,7 @@ const projectEventsQuery: ProjectEventLogsQuery = {
               ticketCreateProject: "EVG",
               ticketSearchProjects: ["EVG"],
               __typename: "BuildBaronSettings",
+              ticketCreateIssueType: "",
             },
             taskAnnotationSettings: {
               jiraCustomFields: null,

diff --git a/src/pages/projectSettings/tabs/PluginsTab/getFormSchema.tsx b/src/pages/projectSettings/tabs/PluginsTab/getFormSchema.tsx
@@ -2,6 +2,7 @@ import { InlineCode } from "@leafygreen-ui/typography";
 import { GetFormSchema } from "components/SpruceForm";
 import { CardFieldTemplate } from "components/SpruceForm/FieldTemplates";
 import widgets from "components/SpruceForm/Widgets";
+import { JiraTicketType } from "types/jira";
 import { form } from "../utils";
 import { PluginsFormState } from "./types";
 
@@ -128,6 +129,23 @@ export const getFormSchema = (
                       },
                     },
                   },
+                  ticketCreateIssueType: {
+                    type: "object" as "object",
+                    title: "Ticket Create Issue Type",
+                    properties: {
+                      issueType: {
+                        type: "string" as "string",
+                        title: "",
+                        oneOf: Object.values(JiraTicketType).map(
+                          (r: string) => ({
+                            type: "string" as "string",
+                            title: r,
+                            enum: [r],
+                          })
+                        ),
+                      },
+                    },
+                  },
                 },
               },
               {
@@ -237,6 +255,13 @@ export const getFormSchema = (
           "ui:label": false,
         },
       },
+      ticketCreateIssueType: {
+        "ui:description":
+          "Specify a JIRA issue type for tickets created by the File Ticket button.",
+        issueType: {
+          "ui:allowDeselect": false,
+        },
+      },
       ticketCreateProject: {
         "ui:description": (
           <>

diff --git a/src/pages/projectSettings/tabs/PluginsTab/transformers.test.ts b/src/pages/projectSettings/tabs/PluginsTab/transformers.test.ts
@@ -34,6 +34,9 @@ const projectForm: PluginsFormState = {
     ticketCreateProject: {
       createProject: null,
     },
+    ticketCreateIssueType: {
+      issueType: "Epic",
+    },
     ticketSearchProjects: [],
     useBuildBaron: false,
     taskAnnotationSettings: {
@@ -87,6 +90,9 @@ const repoForm: PluginsFormState = {
     ticketCreateProject: {
       createProject: "EVG",
     },
+    ticketCreateIssueType: {
+      issueType: "Epic",
+    },
     useBuildBaron: false,
     taskAnnotationSettings: {
       jiraCustomFields: [

diff --git a/src/pages/projectSettings/tabs/PluginsTab/transformers.ts b/src/pages/projectSettings/tabs/PluginsTab/transformers.ts
@@ -1,5 +1,6 @@
 import { ProjectSettingsTabRoutes } from "constants/routes";
 import { ProjectInput } from "gql/generated/types";
+import { JiraTicketType } from "types/jira";
 import { FormToGqlFunction, GqlToFormFunction } from "../types";
 
 type Tab = ProjectSettingsTabRoutes.Plugins;
@@ -32,6 +33,11 @@ export const gqlToForm = ((data) => {
       ticketCreateProject: {
         createProject: projectRef?.buildBaronSettings?.ticketCreateProject,
       },
+      ticketCreateIssueType: {
+        issueType:
+          projectRef?.buildBaronSettings?.ticketCreateIssueType ||
+          JiraTicketType.BuildFailure,
+      },
       fileTicketWebhook: {
         endpoint:
           projectRef?.taskAnnotationSettings?.fileTicketWebhook?.endpoint,
@@ -82,6 +88,9 @@ export const buildBaronIf = (useBuildBaron: boolean, buildBaronSettings: any) =>
       ticketSearchProjects: buildBaronSettings.ticketSearchProjects
         .map(({ searchProject }) => searchProject)
         .filter((str) => !!str),
+      ticketCreateIssueType:
+        buildBaronSettings.ticketCreateIssueType?.issueType ||
+        JiraTicketType.BuildFailure,
     },
   };
 

diff --git a/src/pages/projectSettings/tabs/PluginsTab/types.ts b/src/pages/projectSettings/tabs/PluginsTab/types.ts
@@ -16,6 +16,9 @@ export interface PluginsFormState {
     ticketCreateProject: {
       createProject: string;
     };
+    ticketCreateIssueType: {
+      issueType: string;
+    };
     fileTicketWebhook: {
       endpoint: string;
       secret: string;

diff --git a/src/pages/projectSettings/tabs/testData.ts b/src/pages/projectSettings/tabs/testData.ts
@@ -5,6 +5,7 @@ import {
   RepoSettingsQuery,
   MergeQueue,
 } from "gql/generated/types";
+import { JiraTicketType } from "types/jira";
 
 const projectBase: ProjectSettingsQuery["projectSettings"] = {
   githubWebhooksEnabled: true,
@@ -69,6 +70,7 @@ const projectBase: ProjectSettingsQuery["projectSettings"] = {
     buildBaronSettings: {
       ticketCreateProject: null,
       ticketSearchProjects: [],
+      ticketCreateIssueType: JiraTicketType.Epic,
     },
     taskAnnotationSettings: {
       jiraCustomFields: [],
@@ -196,6 +198,7 @@ const repoBase: RepoSettingsQuery["repoSettings"] = {
     buildBaronSettings: {
       ticketCreateProject: "EVG",
       ticketSearchProjects: ["EVG"],
+      ticketCreateIssueType: JiraTicketType.Epic,
     },
     taskAnnotationSettings: {
       jiraCustomFields: [

diff --git a/src/types/jira.ts b/src/types/jira.ts
@@ -0,0 +1,8 @@
+export enum JiraTicketType {
+  Investigation = "Investigation",
+  Bug = "Bug",
+  Task = "Task",
+  BuildFailure = "Build Failure",
+  Epic = "Epic",
+  Incident = "Incident",
+}