2 files changed, 49 insertions, 22 deletions

diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue
index 11911adb401..0b424d105b9 100644
--- a/app/assets/javascripts/issues/list/components/issues_list_app.vue
+++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue
@@ -24,6 +24,7 @@ import axios from '~/lib/utils/axios_utils';
 import { isPositiveInteger } from '~/lib/utils/number_utils';
 import { scrollUp } from '~/lib/utils/scroll_utils';
 import { getParameterByName, joinPaths } from '~/lib/utils/url_utility';
+import { helpPagePath } from '~/helpers/help_page_helper';
 import {
   DEFAULT_NONE_ANY,
   OPERATOR_IS_ONLY,
@@ -37,6 +38,7 @@ import {
   TOKEN_TITLE_ORGANIZATION,
   TOKEN_TITLE_RELEASE,
   TOKEN_TITLE_TYPE,
+  FILTERED_SEARCH_TERM,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import IssuableList from '~/vue_shared/issuable/list/components/issuable_list_root.vue';
 import { IssuableListTabs, IssuableStates } from '~/vue_shared/issuable/list/constants';
@@ -462,6 +464,12 @@ export default {
         page_before: this.pageParams.beforeCursor ?? undefined,
       };
     },
+    issuesHelpPagePath() {
+      return helpPagePath('user/project/issues/index');
+    },
+    shouldDisableSomeFilters() {
+      return this.isAnonymousSearchDisabled && !this.isSignedIn;
+    },
   },
   watch: {
     $route(newValue, oldValue) {
@@ -578,13 +586,9 @@ export default {
       this.issuesError = null;
     },
     handleFilter(filter) {
-      if (this.isAnonymousSearchDisabled && !this.isSignedIn) {
-        this.showAnonymousSearchingMessage();
-        return;
-      }
+      this.setFilterTokens(filter);
 
       this.pageParams = getInitialPageParams(this.pageSize);
-      this.filterTokens = filter;
 
       this.$router.push({ query: this.urlParams });
     },
@@ -674,6 +678,28 @@ export default {
           Sentry.captureException(error);
         });
     },
+    setFilterTokens(filtersArg) {
+      const filters = this.removeDisabledSearchTerms(filtersArg);
+
+      this.filterTokens = filters;
+
+      // If we filtered something out, let's show a warning message
+      if (filters.length < filtersArg.length) {
+        this.showAnonymousSearchingMessage();
+      }
+    },
+    removeDisabledSearchTerms(filters) {
+      // If we shouldn't disable anything, let's return the same thing
+      if (!this.shouldDisableSomeFilters) {
+        return filters;
+      }
+
+      const filtersWithoutSearchTerms = filters.filter(
+        (token) => !(token.type === FILTERED_SEARCH_TERM && token.value?.data),
+      );
+
+      return filtersWithoutSearchTerms;
+    },
     showAnonymousSearchingMessage() {
       createFlash({
         message: this.$options.i18n.anonymousSearchingMessage,
@@ -720,17 +746,9 @@ export default {
         sortKey = defaultSortKey;
       }
 
-      const isSearchDisabled =
-        this.isAnonymousSearchDisabled &&
-        !this.isSignedIn &&
-        window.location.search.includes('search=');
-
-      if (isSearchDisabled) {
-        this.showAnonymousSearchingMessage();
-      }
-
       this.exportCsvPathWithQuery = this.getExportCsvPathWithQuery();
-      this.filterTokens = isSearchDisabled ? [] : getFilterTokens(window.location.search);
+      this.setFilterTokens(getFilterTokens(window.location.search));
+
       this.pageParams = getInitialPageParams(
         this.pageSize,
         isPositiveInteger(firstPageSize) ? parseInt(firstPageSize, 10) : undefined,
@@ -899,7 +917,9 @@ export default {
     <template v-else-if="isSignedIn">
       <gl-empty-state :title="$options.i18n.noIssuesSignedInTitle" :svg-path="emptyStateSvgPath">
         <template #description>
-          <p>{{ $options.i18n.noIssuesSignedInDescription }}</p>
+          <gl-link :href="issuesHelpPagePath" target="_blank">{{
+            $options.i18n.noIssuesSignedInDescription
+          }}</gl-link>
           <p v-if="canCreateProjects">
             <strong>{{ $options.i18n.noGroupIssuesSignedInDescription }}</strong>
           </p>
diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js
index 38fe4c33792..27738d7a3e6 100644
--- a/app/assets/javascripts/issues/list/constants.js
+++ b/app/assets/javascripts/issues/list/constants.js
@@ -41,12 +41,8 @@ export const i18n = {
   ),
   noOpenIssuesDescription: __('To keep this project going, create a new issue'),
   noOpenIssuesTitle: __('There are no open issues'),
-  noIssuesSignedInDescription: __(
-    'Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable.',
-  ),
-  noIssuesSignedInTitle: __(
-    'The Issue Tracker is the place to add things that need to be improved or solved in a project',
-  ),
+  noIssuesSignedInDescription: __('Learn more about issues.'),
+  noIssuesSignedInTitle: __('Use issues to collaborate on ideas, solve problems, and plan work'),
   noIssuesSignedOutButtonText: __('Register / Sign In'),
   noIssuesSignedOutDescription: __(
     'The Issue Tracker is the place to add things that need to be improved or solved in a project. You can register or sign in to create issues for this project.',
@@ -151,6 +147,7 @@ export const TOKEN_TYPE_EPIC = 'epic_id';
 export const TOKEN_TYPE_WEIGHT = 'weight';
 export const TOKEN_TYPE_CONTACT = 'crm_contact';
 export const TOKEN_TYPE_ORGANIZATION = 'crm_organization';
+export const TOKEN_TYPE_HEALTH = 'health_status';
 
 export const TYPE_TOKEN_TASK_OPTION = { icon: 'task-done', title: 'task', value: 'task' };
 
@@ -327,6 +324,16 @@ export const filters = {
       },
     },
   },
+  [TOKEN_TYPE_HEALTH]: {
+    [API_PARAM]: {
+      [NORMAL_FILTER]: 'healthStatus',
+    },
+    [URL_PARAM]: {
+      [OPERATOR_IS]: {
+        [NORMAL_FILTER]: 'health_status',
+      },
+    },
+  },
   [TOKEN_TYPE_CONTACT]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'crmContactId',