[GH-862] Added issue status field in subscription modal

server/client.go

@@ -57,6 +57,7 @@ type ProjectService interface {
 	GetProject(key string) (*jira.Project, error)
 	ListProjects(query string, limit int, expandIssueTypes bool) (jira.ProjectList, error)
 	GetIssueTypes(projectID string) ([]jira.IssueType, error)
+	ListProjectStatuses(projectID string) ([]*IssueTypeWithStatuses, error)
 }
 
 // SearchService is the interface for search-related APIs.

server/client_cloud.go

@@ -5,6 +5,7 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 	"strconv"
 
 	jira "github.com/andygrunwald/go-jira"
@@ -16,6 +17,11 @@ type jiraCloudClient struct {
 	JiraClient
 }
 
+type IssueTypeWithStatuses struct {
+	*jira.IssueType
+	Statuses []*jira.Status `json:"statuses"`
+}
+
 func newCloudClient(jiraClient *jira.Client) Client {
 	return &jiraCloudClient{
 		JiraClient: JiraClient{
@@ -132,3 +138,12 @@ func (client jiraCloudClient) GetIssueTypes(projectID string) ([]jira.IssueType,
 
 	return result, nil
 }
+
+func (client jiraCloudClient) ListProjectStatuses(projectID string) ([]*IssueTypeWithStatuses, error) {
+	var result []*IssueTypeWithStatuses
+	if err := client.RESTGet(fmt.Sprintf("3/project/%s/statuses", projectID), nil, &result); err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}

server/client_server.go

@@ -208,3 +208,12 @@ func (client jiraServerClient) GetIssueTypes(projectID string) ([]jira.IssueType
 
 	return result.IssueTypes, nil
 }
+
+func (client jiraServerClient) ListProjectStatuses(projectID string) ([]*IssueTypeWithStatuses, error) {
+	var result []*IssueTypeWithStatuses
+	if err := client.RESTGet(fmt.Sprintf("2/project/%s/statuses", projectID), nil, &result); err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}

server/issue.go

@@ -29,8 +29,16 @@ const (
 	descriptionField   = "description"
 	resolutionField    = "resolution"
 	securityLevelField = "security"
+
+	QueryParamInstanceID = "instance_id"
+	QueryParamProjectID  = "project_id"
 )
 
+type CreateMetaInfo struct {
+	*jira.CreateMetaInfo
+	IssueTypesWithStatuses []*IssueTypeWithStatuses `json:"issue_types_with_statuses"`
+}
+
 func makePost(userID, channelID, message string) *model.Post {
 	return &model.Post{
 		UserId:    userID,
@@ -372,16 +380,29 @@ func (p *Plugin) httpGetCreateIssueMetadataForProjects(w http.ResponseWriter, r
 	return respondJSON(w, cimd)
 }
 
-func (p *Plugin) GetCreateIssueMetadataForProjects(instanceID, mattermostUserID types.ID, projectKeys string) (*jira.CreateMetaInfo, error) {
+func (p *Plugin) GetCreateIssueMetadataForProjects(instanceID, mattermostUserID types.ID, projectKeys string) (*CreateMetaInfo, error) {
 	client, _, _, err := p.getClient(instanceID, mattermostUserID)
 	if err != nil {
 		return nil, err
 	}
 
-	return client.GetCreateMetaInfo(p.API, &jira.GetQueryOptions{
+	projectStatuses, err := client.ListProjectStatuses(projectKeys)
+	if err != nil {
+		return nil, err
+	}
+
+	metaInfo, err := client.GetCreateMetaInfo(p.API, &jira.GetQueryOptions{
 		Expand:      "projects.issuetypes.fields",
 		ProjectKeys: projectKeys,
 	})
+	if err != nil {
+		return nil, err
+	}
+
+	return &CreateMetaInfo{
+		metaInfo,
+		projectStatuses,
+	}, nil
 }
 
 func (p *Plugin) httpGetSearchIssues(w http.ResponseWriter, r *http.Request) (int, error) {

webapp/src/components/data_selectors/jira_epic_selector/__snapshots__/jira_epic_selector.test.tsx.snap

@@ -9,6 +9,11 @@ exports[`components/JiraEpicSelector should match snapshot 1`] = `
   issueMetadata={
     Object {
       "expand": "projects",
+      "issue_types_with_statuses": Array [
+        Object {
+          "statuses": Array [],
+        },
+      ],
       "projects": Array [
         Object {
           "expand": "issuetypes",

webapp/src/components/modals/channel_subscriptions/__snapshots__/channel_subscription_filters.test.tsx.snap

@@ -101,6 +101,7 @@ exports[`components/ChannelSubscriptionFilters should match snapshot 1`] = `
         instanceID="https://something.atlassian.net"
         issueMetadata={
           Object {
+            "issue_types_with_statuses": Array [],
             "projects": Array [
               Object {
                 "issuetypes": Array [
@@ -218,6 +219,7 @@ exports[`components/ChannelSubscriptionFilters should match snapshot 1`] = `
         }
         issueMetadata={
           Object {
+            "issue_types_with_statuses": Array [],
             "projects": Array [
               Object {
                 "issuetypes": Array [

webapp/src/components/modals/channel_subscriptions/__snapshots__/edit_channel_subscription.test.tsx.snap

@@ -843,6 +843,11 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
         issueMetadata={
           Object {
             "expand": "projects",
+            "issue_types_with_statuses": Array [
+              Object {
+                "statuses": Array [],
+              },
+            ],
             "projects": Array [
               Object {
                 "expand": "issuetypes",

webapp/src/components/modals/channel_subscriptions/channel_subscription_filter.test.tsx

@@ -14,7 +14,7 @@ import {getCustomFieldFiltersForProjects, isEpicLinkField} from 'utils/jira_issu
 import ChannelSubscriptionFilter, {Props} from './channel_subscription_filter';
 
 describe('components/ChannelSubscriptionFilter', () => {
-    const fields = getCustomFieldFiltersForProjects(issueMetadata, [issueMetadata.projects[0].key]);
+    const fields = getCustomFieldFiltersForProjects(issueMetadata, [issueMetadata.projects[0].key], []);
     const baseProps: Props = {
         theme: {},
         fields,

webapp/src/components/modals/channel_subscriptions/channel_subscription_filter.tsx

@@ -5,7 +5,7 @@ import {Theme} from 'mattermost-redux/types/preferences';
 import ReactSelectSetting from 'components/react_select_setting';
 import JiraEpicSelector from 'components/data_selectors/jira_epic_selector';
 
-import {isEpicLinkField, isMultiSelectField, isLabelField, isSecurityLevelField} from 'utils/jira_issue_metadata';
+import {isEpicLinkField, isMultiSelectField, isLabelField, isSecurityLevelField, FIELD_KEY_STATUS} from 'utils/jira_issue_metadata';
 import {FilterField, FilterValue, ReactSelectOption, IssueMetadata, IssueType, FilterFieldInclusion} from 'types/model';
 import ConfirmModal from 'components/confirm_modal';
 import JiraAutoCompleteSelector from 'components/data_selectors/jira_autocomplete_selector';
@@ -199,6 +199,13 @@ export default class ChannelSubscriptionFilter extends React.PureComponent<Props
             ];
         }
 
+        if (field.key === FIELD_KEY_STATUS) {
+            inclusionSelectOptions = [
+                {label: 'Include', value: FilterFieldInclusion.INCLUDE_ANY},
+                {label: 'Exclude', value: FilterFieldInclusion.EXCLUDE_ANY},
+            ];
+        }
+
         if (!isMultiSelectField(field)) {
             const includeAllIndex = inclusionSelectOptions.findIndex((opt) => opt.value === FilterFieldInclusion.INCLUDE_ALL);
             inclusionSelectOptions.splice(includeAllIndex, 1);

webapp/src/components/modals/channel_subscriptions/channel_subscription_filters.test.tsx

@@ -46,7 +46,7 @@ describe('components/ChannelSubscriptionFilters', () => {
 
     const baseProps: Props = {
         theme: {},
-        fields: getCustomFieldFiltersForProjects(issueMetadata, [issueMetadata.projects[0].key]),
+        fields: getCustomFieldFiltersForProjects(issueMetadata, [issueMetadata.projects[0].key], []),
         values: [{
             key: 'priority',
             inclusion: FilterFieldInclusion.INCLUDE_ANY,

webapp/src/components/modals/channel_subscriptions/edit_channel_subscription.tsx

@@ -187,7 +187,7 @@ export default class EditChannelSubscription extends PureComponent<Props, State>
 
         let conflictingFields = null;
         if (finalValue.length > this.state.filters.issue_types.length) {
-            const filterFields = getCustomFieldFiltersForProjects(this.state.jiraIssueMetadata, this.state.filters.projects);
+            const filterFields = getCustomFieldFiltersForProjects(this.state.jiraIssueMetadata, this.state.filters.projects, this.state.filters.issue_types);
             conflictingFields = getConflictingFields(
                 filterFields,
                 finalValue,
@@ -227,7 +227,7 @@ export default class EditChannelSubscription extends PureComponent<Props, State>
                 state.getMetaDataErr = `The project ${projectKeys[0]} is unavailable. Please contact your system administrator.`;
             }
 
-            const filterFields = getCustomFieldFiltersForProjects(jiraIssueMetadata, this.state.filters.projects);
+            const filterFields = getCustomFieldFiltersForProjects(jiraIssueMetadata, this.state.filters.projects, this.state.filters.issue_types);
             for (const v of this.state.filters.fields) {
                 if (!filterFields.find((f) => f.key === v.key)) {
                     state.error = 'A field in this subscription has been removed from Jira, so the subscription is invalid. When this form is submitted, the configured field will be removed from the subscription to make the subscription valid again.';
@@ -296,7 +296,7 @@ export default class EditChannelSubscription extends PureComponent<Props, State>
             return;
         }
 
-        const filterFields = getCustomFieldFiltersForProjects(this.state.jiraIssueMetadata, this.state.filters.projects);
+        const filterFields = getCustomFieldFiltersForProjects(this.state.jiraIssueMetadata, this.state.filters.projects, this.state.filters.issue_types);
         const configuredFields = this.state.filters.fields.concat([]);
         for (const v of this.state.filters.fields) {
             if (!filterFields.find((f) => f.key === v.key)) {
@@ -345,7 +345,7 @@ export default class EditChannelSubscription extends PureComponent<Props, State>
         const issueOptions = issueTypes.map((it) => ({label: it.name, value: it.id}));
 
         const customFields = getCustomFieldValuesForEvents(this.state.jiraIssueMetadata, this.state.filters.projects);
-        const filterFields = getCustomFieldFiltersForProjects(this.state.jiraIssueMetadata, this.state.filters.projects);
+        const filterFields = getCustomFieldFiltersForProjects(this.state.jiraIssueMetadata, this.state.filters.projects, this.state.filters.issue_types);
 
         const eventOptions = JiraEventOptions.concat(customFields);
 

webapp/src/components/modals/create_issue/__snapshots__/create_issue_form.test.tsx.snap

@@ -781,6 +781,11 @@ exports[`components/CreateIssue should match snapshot with error 1`] = `
         issueMetadata={
           Object {
             "expand": "projects",
+            "issue_types_with_statuses": Array [
+              Object {
+                "statuses": Array [],
+              },
+            ],
             "projects": Array [
               Object {
                 "expand": "issuetypes",
@@ -4239,6 +4244,11 @@ exports[`components/CreateIssue should match snapshot with form filled 1`] = `
         issueMetadata={
           Object {
             "expand": "projects",
+            "issue_types_with_statuses": Array [
+              Object {
+                "statuses": Array [],
+              },
+            ],
             "projects": Array [
               Object {
                 "expand": "issuetypes",

webapp/src/testdata/cloud-get-create-issue-metadata-for-project-many-fields.json

@@ -1,5 +1,10 @@
 {
   "expand": "projects",
+  "issue_types_with_statuses": [
+    {
+      "statuses": []
+    }
+  ],
   "projects": [{
     "expand": "issuetypes",
     "self": "https://mmtest.atlassian.net/rest/api/2/project/10008",

webapp/src/testdata/cloud-get-create-issue-metadata-for-project.json

@@ -1,5 +1,10 @@
 {
   "expand": "projects",
+  "issue_types_with_statuses": [
+    {
+      "statuses": []
+    }
+  ],
   "projects": [
     {
       "expand": "issuetypes",

webapp/src/testdata/jira-issue-metadata-helpers.ts

@@ -15,5 +15,6 @@ export const useFieldForIssueMetadata = (field: JiraField, key: string): IssueMe
                 }],
             },
         ],
+        issue_types_with_statuses: [],
     };
 };

webapp/src/testdata/server-get-create-issue-metadata-for-project-many-fields.json

@@ -1,5 +1,10 @@
 {
     "expand": "projects",
+    "issue_types_with_statuses": [
+      {
+        "statuses": []
+      }
+    ],
     "projects": [{
       "expand": "issuetypes",
       "self": "http://localhost:8080/rest/api/2/project/10401",

webapp/src/types/model.ts

@@ -65,8 +65,20 @@ export type Project = {
     issuetypes: IssueType[];
 }
 
+export type IssueTypeWithStatuses = {
+    id: string;
+    name: string;
+    statuses: Status[];
+}
+
 export type IssueMetadata = {
     projects: Project[];
+    issue_types_with_statuses: IssueTypeWithStatuses[];
+}
+
+export type Status = {
+    id: string;
+    name: string;
 }
 
 export type ProjectMetadata = {