[GH-993]: added support for subtasks in subscriptions (#1095)

* [GH-993]: added support for subtasks in subscriptions * [GH-993]: updated an additional condition of getting issueTypes * [GH-993]: Added types for the subtask parameter in getIssueType function
mattermost · Jul 25, 2024 · fe02ece · fe02ece
1 parent 98af6b8
commit fe02ece
Show file tree

Hide file tree

Showing 5 changed files with 993 additions and 2,020 deletions.
diff --git a/...onents/modals/channel_subscriptions/__snapshots__/edit_channel_subscription.test.tsx.snap b/...onents/modals/channel_subscriptions/__snapshots__/edit_channel_subscription.test.tsx.snap
@@ -432,6 +432,10 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
               "label": "Task",
               "value": "10002",
             },
+            Object {
+              "label": "Sub-task",
+              "value": "10003",
+            },
             Object {
               "label": "Story",
               "value": "10001",
@@ -522,6 +526,10 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                   "id": "10002",
                   "name": "Task",
                 },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
                 Object {
                   "id": "10001",
                   "name": "Story",
@@ -550,6 +558,10 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                   "id": "10002",
                   "name": "Task",
                 },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
                 Object {
                   "id": "10001",
                   "name": "Story",
@@ -583,6 +595,10 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                   "id": "10002",
                   "name": "Task",
                 },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
                 Object {
                   "id": "10001",
                   "name": "Story",
@@ -611,6 +627,10 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                   "id": "10002",
                   "name": "Task",
                 },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
                 Object {
                   "id": "10001",
                   "name": "Story",
@@ -649,6 +669,10 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                   "id": "10002",
                   "name": "Task",
                 },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
                 Object {
                   "id": "10001",
                   "name": "Story",
@@ -678,6 +702,10 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                   "id": "10002",
                   "name": "Task",
                 },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
                 Object {
                   "id": "10001",
                   "name": "Story",
@@ -715,6 +743,10 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                   "id": "10002",
                   "name": "Task",
                 },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
                 Object {
                   "id": "10001",
                   "name": "Story",
@@ -753,6 +785,10 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                   "id": "10002",
                   "name": "Task",
                 },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
                 Object {
                   "id": "10001",
                   "name": "Story",
@@ -790,6 +826,10 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                   "id": "10002",
                   "name": "Task",
                 },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
                 Object {
                   "id": "10001",
                   "name": "Story",

diff --git a/webapp/src/components/modals/channel_subscriptions/edit_channel_subscription.tsx b/webapp/src/components/modals/channel_subscriptions/edit_channel_subscription.tsx
@@ -349,7 +349,7 @@ export default class EditChannelSubscription extends PureComponent<Props, State>
     render(): JSX.Element {
         const style = getModalStyles(this.props.theme);
 
-        const issueTypes = getIssueTypes(this.state.jiraIssueMetadata, this.state.filters.projects[0]);
+        const issueTypes = getIssueTypes(this.state.jiraIssueMetadata, this.state.filters.projects[0], {includeSubtasks: true});
         const issueOptions = issueTypes.map((it) => ({label: it.name, value: it.id}));
 
         const customFields = getCustomFieldValuesForEvents(this.state.jiraIssueMetadata, this.state.filters.projects);