1 files changed, 47 insertions, 17 deletions

diff --git a/app/assets/javascripts/issues/list/utils.js b/app/assets/javascripts/issues/list/utils.js
index 2f9ab9d62ee..b566e08731c 100644
--- a/app/assets/javascripts/issues/list/utils.js
+++ b/app/assets/javascripts/issues/list/utils.js
@@ -4,9 +4,10 @@ import { getParameterByName } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
 import {
   FILTERED_SEARCH_TERM,
-  OPERATOR_IS_NOT,
+  OPERATOR_NOT,
   OPERATOR_OR,
   TOKEN_TYPE_ASSIGNEE,
+  TOKEN_TYPE_AUTHOR,
   TOKEN_TYPE_CONFIDENTIAL,
   TOKEN_TYPE_ITERATION,
   TOKEN_TYPE_MILESTONE,
@@ -14,14 +15,19 @@ import {
   TOKEN_TYPE_TYPE,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import {
+  ALTERNATIVE_FILTER,
   API_PARAM,
   BLOCKING_ISSUES_ASC,
   BLOCKING_ISSUES_DESC,
+  CLOSED_AT_ASC,
+  CLOSED_AT_DESC,
   CREATED_ASC,
   CREATED_DESC,
   DUE_DATE_ASC,
   DUE_DATE_DESC,
   filters,
+  HEALTH_STATUS_ASC,
+  HEALTH_STATUS_DESC,
   LABEL_PRIORITY_ASC,
   LABEL_PRIORITY_DESC,
   MILESTONE_DUE_ASC,
@@ -44,8 +50,6 @@ import {
   urlSortParams,
   WEIGHT_ASC,
   WEIGHT_DESC,
-  CLOSED_ASC,
-  CLOSED_DESC,
 } from './constants';
 
 export const getInitialPageParams = (
@@ -66,7 +70,11 @@ export const getSortKey = (sort) =>
 
 export const isSortKey = (sort) => Object.keys(urlSortParams).includes(sort);
 
-export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature) => {
+export const getSortOptions = ({
+  hasBlockedIssuesFeature,
+  hasIssuableHealthStatusFeature,
+  hasIssueWeightsFeature,
+}) => {
   const sortOptions = [
     {
       id: 1,
@@ -96,8 +104,8 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
       id: 4,
       title: __('Closed date'),
       sortDirection: {
-        ascending: CLOSED_ASC,
-        descending: CLOSED_DESC,
+        ascending: CLOSED_AT_ASC,
+        descending: CLOSED_AT_DESC,
       },
     },
     {
@@ -150,6 +158,17 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
     },
   ];
 
+  if (hasIssuableHealthStatusFeature) {
+    sortOptions.push({
+      id: sortOptions.length + 1,
+      title: __('Health'),
+      sortDirection: {
+        ascending: HEALTH_STATUS_ASC,
+        descending: HEALTH_STATUS_DESC,
+      },
+    });
+  }
+
   if (hasIssueWeightsFeature) {
     sortOptions.push({
       id: sortOptions.length + 1,
@@ -223,13 +242,24 @@ export const getFilterTokens = (locationSearch) => {
   return tokens.length ? tokens : [createTerm()];
 };
 
-const getFilterType = (data, tokenType = '') => {
+const isSpecialFilter = (type, data) => {
   const isAssigneeIdParam =
-    tokenType === TOKEN_TYPE_ASSIGNEE &&
+    type === TOKEN_TYPE_ASSIGNEE &&
     isPositiveInteger(data) &&
     getParameterByName(PARAM_ASSIGNEE_ID) === data;
+  return specialFilterValues.includes(data) || isAssigneeIdParam;
+};
+
+const getFilterType = ({ type, value: { data, operator } }) => {
+  const isUnionedAuthor = type === TOKEN_TYPE_AUTHOR && operator === OPERATOR_OR;
 
-  return specialFilterValues.includes(data) || isAssigneeIdParam ? SPECIAL_FILTER : NORMAL_FILTER;
+  if (isUnionedAuthor) {
+    return ALTERNATIVE_FILTER;
+  }
+  if (isSpecialFilter(type, data)) {
+    return SPECIAL_FILTER;
+  }
+  return NORMAL_FILTER;
 };
 
 const wildcardTokens = [TOKEN_TYPE_ITERATION, TOKEN_TYPE_MILESTONE, TOKEN_TYPE_RELEASE];
@@ -258,10 +288,10 @@ export const convertToApiParams = (filterTokens) => {
   filterTokens
     .filter((token) => token.type !== FILTERED_SEARCH_TERM)
     .forEach((token) => {
-      const filterType = getFilterType(token.value.data, token.type);
-      const field = filters[token.type][API_PARAM][filterType];
+      const filterType = getFilterType(token);
+      const apiField = filters[token.type][API_PARAM][filterType];
       let obj;
-      if (token.value.operator === OPERATOR_IS_NOT) {
+      if (token.value.operator === OPERATOR_NOT) {
         obj = not;
       } else if (token.value.operator === OPERATOR_OR) {
         obj = or;
@@ -270,7 +300,7 @@ export const convertToApiParams = (filterTokens) => {
       }
       const data = formatData(token);
       Object.assign(obj, {
-        [field]: obj[field] ? [obj[field], data].flat() : data,
+        [apiField]: obj[apiField] ? [obj[apiField], data].flat() : data,
       });
     });
 
@@ -289,10 +319,10 @@ export const convertToUrlParams = (filterTokens) =>
   filterTokens
     .filter((token) => token.type !== FILTERED_SEARCH_TERM)
     .reduce((acc, token) => {
-      const filterType = getFilterType(token.value.data, token.type);
-      const param = filters[token.type][URL_PARAM][token.value.operator]?.[filterType];
+      const filterType = getFilterType(token);
+      const urlParam = filters[token.type][URL_PARAM][token.value.operator]?.[filterType];
       return Object.assign(acc, {
-        [param]: acc[param] ? [acc[param], token.value.data].flat() : token.value.data,
+        [urlParam]: acc[urlParam] ? [acc[urlParam], token.value.data].flat() : token.value.data,
       });
     }, {});
 
@@ -300,4 +330,4 @@ export const convertToSearchQuery = (filterTokens) =>
   filterTokens
     .filter((token) => token.type === FILTERED_SEARCH_TERM && token.value.data)
     .map((token) => token.value.data)
-    .join(' ');
+    .join(' ') || undefined;