[MM-891]: Added reporter and assignee fields in subscription filters

server/issue.go

@@ -28,6 +28,7 @@ const (
 	priorityField      = "priority"
 	descriptionField   = "description"
 	resolutionField    = "resolution"
+	assigneeField      = "assignee"
 	securityLevelField = "security"
 
 	QueryParamInstanceID = "instance_id"
@@ -794,6 +795,10 @@ func getIssueFieldValue(issue *jira.Issue, key string) StringSet {
 		if issue.Fields.Priority != nil {
 			return NewStringSet(issue.Fields.Priority.ID)
 		}
+	case reporterField:
+		return NewStringSet(issue.Fields.Reporter.AccountID)
+	case assigneeField:
+		return NewStringSet(issue.Fields.Assignee.AccountID)
 	case "fixversions":
 		result := NewStringSet()
 		for _, v := range issue.Fields.FixVersions {

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

@@ -50,6 +50,10 @@ exports[`components/ChannelSubscriptionFilter should match snapshot 1`] = `
                 "label": "Affects versions",
                 "value": "versions",
               },
+              Object {
+                "label": "Assignee",
+                "value": "assignee",
+              },
               Object {
                 "label": "Epic Link",
                 "value": "customfield_10014",
@@ -82,6 +86,10 @@ exports[`components/ChannelSubscriptionFilter should match snapshot 1`] = `
                 "label": "MJK - Select List 3",
                 "value": "customfield_10076",
               },
+              Object {
+                "label": "MJK - User Picker",
+                "value": "customfield_10080",
+              },
               Object {
                 "label": "Priority",
                 "value": "priority",

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

@@ -520,6 +520,36 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                 },
               ],
             },
+            Object {
+              "issueTypes": Array [
+                Object {
+                  "id": "10002",
+                  "name": "Task",
+                },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
+                Object {
+                  "id": "10001",
+                  "name": "Story",
+                },
+                Object {
+                  "id": "10004",
+                  "name": "Bug",
+                },
+                Object {
+                  "id": "10000",
+                  "name": "Epic",
+                },
+              ],
+              "key": "assignee",
+              "name": "Assignee",
+              "schema": Object {
+                "system": "assignee",
+                "type": "user",
+              },
+            },
             Object {
               "issueTypes": Array [
                 Object {
@@ -820,6 +850,37 @@ exports[`components/EditChannelSubscription should match snapshot after fetching
                 },
               ],
             },
+            Object {
+              "issueTypes": Array [
+                Object {
+                  "id": "10002",
+                  "name": "Task",
+                },
+                Object {
+                  "id": "10003",
+                  "name": "Sub-task",
+                },
+                Object {
+                  "id": "10001",
+                  "name": "Story",
+                },
+                Object {
+                  "id": "10004",
+                  "name": "Bug",
+                },
+                Object {
+                  "id": "10000",
+                  "name": "Epic",
+                },
+              ],
+              "key": "customfield_10080",
+              "name": "MJK - User Picker",
+              "schema": Object {
+                "custom": "com.atlassian.jira.plugin.system.customfieldtypes:userpicker",
+                "customId": 10080,
+                "type": "user",
+              },
+            },
             Object {
               "issueTypes": Array [
                 Object {

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

@@ -11,6 +11,7 @@ import {
     isLabelField,
     isMultiSelectField,
     isSecurityLevelField,
+    isUserField,
 } from 'utils/jira_issue_metadata';
 import {
     FilterField,
@@ -307,6 +308,15 @@ export default class ChannelSubscriptionFilter extends React.PureComponent<Props
                     onChange={this.handleEpicLinkChange}
                 />
             );
+        } else if (isUserField(field)) {
+            valueSelector = (
+                <JiraAutoCompleteSelector
+                    {...selectProps}
+                    fieldName={field.name}
+                    value={value.values}
+                    onChange={this.handleEpicLinkChange}
+                />
+            );
         } else {
             valueSelector = (
                 <ReactSelectSetting

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

@@ -224,6 +224,7 @@ exports[`components/CreateIssue should match snapshot with error 1`] = `
           Array [
             "project",
             "issuetype",
+            "reporter",
             "priority",
             "description",
             "summary",
@@ -3212,6 +3213,7 @@ exports[`components/CreateIssue should match snapshot with form filled 1`] = `
           Array [
             "project",
             "issuetype",
+            "reporter",
             "priority",
             "description",
             "summary",

webapp/src/components/modals/create_issue/create_issue_form.tsx

@@ -32,6 +32,7 @@ import JiraInstanceAndProjectSelector from 'components/jira_instance_and_project
 const allowedFields: string[] = [
     JiraFieldTypeEnums.PROJECT,
     JiraFieldTypeEnums.ISSUE_TYPE,
+    JiraFieldTypeEnums.REPORTER,
     JiraFieldTypeEnums.PRIORITY,
     JiraFieldTypeEnums.DESCRIPTION,
     JiraFieldTypeEnums.SUMMARY,

webapp/src/types/model.ts

@@ -95,6 +95,7 @@ export type SavedFieldValues = {
 export enum JiraFieldTypeEnums {
     PROJECT = 'project',
     ISSUE_TYPE = 'issuetype',
+    REPORTER = 'reporter',
     PRIORITY = 'priority',
     DESCRIPTION = 'description',
     SUMMARY = 'summary',

webapp/src/utils/jira_issue_metadata.tsx

@@ -176,8 +176,16 @@ const allowedArrayTypes = [
     'option', // multiselect
     'string', // labels
     'version', // fix and affects versions
+    'user',
 ];
 
+const allowedFieldTypes = [
+    'user',
+    'option',
+];
+
+const jiraSystemCustomFieldTypesKey = 'com.atlassian.jira.plugin.system.customfieldtypes';
+
 const avoidedCustomTypesForFilters: string[] = [
     JiraFieldCustomTypeEnums.SPRINT,
 ];
@@ -194,7 +202,7 @@ function isValidFieldForFilter(field: JiraField): boolean {
     }
 
     return allowedTypes.includes(type) || (custom && acceptedCustomTypesForFilters.includes(custom)) ||
-    type === 'option' || // single select
+    allowedFieldTypes.includes(type) ||
     (type === 'array' && typeof items !== 'undefined' && allowedArrayTypes.includes(items));
 }
 
@@ -255,6 +263,18 @@ export function getCustomFieldFiltersForProjects(metadata: IssueMetadata | null,
         } as FilterField;
     });
 
+    const userFields = fields.filter((field) => field.schema.type === 'user' && !field.allowedValues) as (StringArrayField & FieldWithInfo)[];
+    const populatedUserFields = userFields.map((field) => {
+        return {
+            key: field.key,
+            name: field.name,
+            schema: field.schema,
+            issueTypes: field.validIssueTypes,
+        } as FilterField;
+    });
+
+    const userResult = populatedFields.concat(populatedUserFields);
+
     const stringArrayFields = fields.filter((field) => field.schema.type === 'array' && field.schema.items === 'string' && !field.allowedValues) as (StringArrayField & FieldWithInfo)[];
     const userDefinedFields = stringArrayFields.map((field) => {
         return {
@@ -266,7 +286,7 @@ export function getCustomFieldFiltersForProjects(metadata: IssueMetadata | null,
         } as FilterField;
     });
 
-    const result = populatedFields.concat(userDefinedFields);
+    const result = userResult.concat(userDefinedFields);
     const epicLinkField = fields.find(isEpicLinkField);
     if (epicLinkField) {
         result.unshift({
@@ -322,7 +342,11 @@ export function isEpicLinkField(field: JiraField | FilterField): boolean {
 }
 
 export function isLabelField(field: JiraField | FilterField): boolean {
-    return field.schema.system === 'labels' || field.schema.custom === 'com.atlassian.jira.plugin.system.customfieldtypes:labels';
+    return field.schema.system === 'labels' || field.schema.custom === `${jiraSystemCustomFieldTypesKey}:labels`;
+}
+
+export function isUserField(field: JiraField | FilterField): boolean {
+    return field.schema.type === 'user' || field.schema.custom === `${jiraSystemCustomFieldTypesKey}:userpicker`;
 }
 
 export function isEpicIssueType(issueType: IssueType): boolean {