Add latest changes from gitlab-org/gitlab@master

4 files changed, 90 insertions, 6 deletions

diff --git a/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue b/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue
index 5e2bd096534..b9d876ef72f 100644
--- a/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue
+++ b/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue
@@ -13,13 +13,31 @@ import {
   urlSortParams,
 } from '~/issues/list/constants';
 import setSortPreferenceMutation from '~/issues/list/queries/set_sort_preference.mutation.graphql';
-import { getInitialPageParams, getSortKey, getSortOptions, isSortKey } from '~/issues/list/utils';
+import {
+  convertToApiParams,
+  convertToSearchQuery,
+  convertToUrlParams,
+  getFilterTokens,
+  getInitialPageParams,
+  getSortKey,
+  getSortOptions,
+  isSortKey,
+} from '~/issues/list/utils';
+import axios from '~/lib/utils/axios_utils';
 import { scrollUp } from '~/lib/utils/scroll_utils';
 import { getParameterByName } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
+import {
+  TOKEN_TITLE_ASSIGNEE,
+  TOKEN_TITLE_AUTHOR,
+  TOKEN_TYPE_ASSIGNEE,
+  TOKEN_TYPE_AUTHOR,
+} 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';
 
+const UserToken = () => import('~/vue_shared/components/filtered_search_bar/tokens/user_token.vue');
+
 export default {
   i18n: {
     calendarButtonText: __('Subscribe to calendar'),
@@ -66,11 +84,11 @@ export default {
     const sortKey = dashboardSortKey || graphQLSortKey || defaultSortKey;
 
     return {
+      filterTokens: getFilterTokens(window.location.search),
       issues: [],
       issuesError: null,
       pageInfo: {},
       pageParams: getInitialPageParams(),
-      searchTokens: [],
       sortKey,
       state: state || IssuableStates.Opened,
     };
@@ -82,9 +100,11 @@ export default {
         return {
           hideUsers: this.isPublicVisibilityRestricted && !this.isSignedIn,
           isSignedIn: this.isSignedIn,
+          search: this.searchQuery,
           sort: this.sortKey,
           state: this.state,
           ...this.pageParams,
+          ...this.apiFilterParams,
         };
       },
       update(data) {
@@ -97,9 +117,52 @@ export default {
         this.issuesError = this.$options.i18n.errorFetchingIssues;
         Sentry.captureException(error);
       },
+      debounce: 200,
     },
   },
   computed: {
+    apiFilterParams() {
+      return convertToApiParams(this.filterTokens);
+    },
+    searchQuery() {
+      return convertToSearchQuery(this.filterTokens);
+    },
+    searchTokens() {
+      const preloadedUsers = [];
+
+      if (gon.current_user_id) {
+        preloadedUsers.push({
+          id: gon.current_user_id,
+          name: gon.current_user_fullname,
+          username: gon.current_username,
+          avatar_url: gon.current_user_avatar_url,
+        });
+      }
+
+      const tokens = [
+        {
+          type: TOKEN_TYPE_ASSIGNEE,
+          title: TOKEN_TITLE_ASSIGNEE,
+          icon: 'user',
+          token: UserToken,
+          fetchUsers: this.fetchUsers,
+          preloadedUsers,
+          recentSuggestionsStorageKey: 'dashboard-issues-recent-tokens-assignee',
+        },
+        {
+          type: TOKEN_TYPE_AUTHOR,
+          title: TOKEN_TITLE_AUTHOR,
+          icon: 'pencil',
+          token: UserToken,
+          fetchUsers: this.fetchUsers,
+          defaultUsers: [],
+          preloadedUsers,
+          recentSuggestionsStorageKey: 'dashboard-issues-recent-tokens-author',
+        },
+      ];
+
+      return tokens;
+    },
     showPaginationControls() {
       return this.issues.length > 0 && (this.pageInfo.hasNextPage || this.pageInfo.hasPreviousPage);
     },
@@ -110,14 +173,22 @@ export default {
         hasIssueWeightsFeature: this.hasIssueWeightsFeature,
       });
     },
+    urlFilterParams() {
+      return convertToUrlParams(this.filterTokens);
+    },
     urlParams() {
       return {
+        search: this.searchQuery,
         sort: urlSortParams[this.sortKey],
         state: this.state,
+        ...this.urlFilterParams,
       };
     },
   },
   methods: {
+    fetchUsers(search) {
+      return axios.get('/-/autocomplete/users.json', { params: { active: true, search } });
+    },
     getStatus(issue) {
       if (issue.state === IssuableStatus.Closed && issue.moved) {
         return this.$options.i18n.closedMoved;
@@ -131,12 +202,16 @@ export default {
       if (this.state === state) {
         return;
       }
-      this.pageParams = getInitialPageParams();
       this.state = state;
+      this.pageParams = getInitialPageParams();
     },
     handleDismissAlert() {
       this.issuesError = null;
     },
+    handleFilter(tokens) {
+      this.filterTokens = tokens;
+      this.pageParams = getInitialPageParams();
+    },
     handleNextPage() {
       this.pageParams = {
         afterCursor: this.pageInfo.endCursor,
@@ -156,8 +231,8 @@ export default {
         return;
       }
 
-      this.pageParams = getInitialPageParams();
       this.sortKey = sortKey;
+      this.pageParams = getInitialPageParams();
 
       if (this.isSignedIn) {
         this.saveSortPreference(sortKey);
@@ -189,6 +264,7 @@ export default {
     :has-next-page="pageInfo.hasNextPage"
     :has-previous-page="pageInfo.hasPreviousPage"
     :has-scoped-labels-feature="hasScopedLabelsFeature"
+    :initial-filter-value="filterTokens"
     :initial-sort-by="sortKey"
     :issuables="issues"
     :issuables-loading="$apollo.queries.issues.loading"
@@ -197,12 +273,14 @@ export default {
     :search-input-placeholder="$options.i18n.searchInputPlaceholder"
     :search-tokens="searchTokens"
     :show-pagination-controls="showPaginationControls"
+    show-work-item-type-icon
     :sort-options="sortOptions"
     :tabs="$options.IssuableListTabs"
     :url-params="urlParams"
     use-keyset-pagination
     @click-tab="handleClickTab"
     @dismiss-alert="handleDismissAlert"
+    @filter="handleFilter"
     @next-page="handleNextPage"
     @previous-page="handlePreviousPage"
     @sort="handleSort"
diff --git a/app/assets/javascripts/issues/dashboard/queries/get_issues.query.graphql b/app/assets/javascripts/issues/dashboard/queries/get_issues.query.graphql
index 6d0c7139068..8ffcb456755 100644
--- a/app/assets/javascripts/issues/dashboard/queries/get_issues.query.graphql
+++ b/app/assets/javascripts/issues/dashboard/queries/get_issues.query.graphql
@@ -4,16 +4,22 @@
 query getDashboardIssues(
   $hideUsers: Boolean = false
   $isSignedIn: Boolean = false
+  $search: String
   $sort: IssueSort
   $state: IssuableState
+  $assigneeUsernames: [String!]
+  $authorUsername: String
   $afterCursor: String
   $beforeCursor: String
   $firstPageSize: Int
   $lastPageSize: Int
 ) {
   issues(
+    search: $search
     sort: $sort
     state: $state
+    assigneeUsernames: $assigneeUsernames
+    authorUsername: $authorUsername
     after: $afterCursor
     before: $beforeCursor
     first: $firstPageSize
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 b4066fff3c6..12a83f06453 100644
--- a/app/assets/javascripts/issues/list/components/issues_list_app.vue
+++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue
@@ -286,7 +286,7 @@ export default {
       return convertToUrlParams(this.filterTokens);
     },
     searchQuery() {
-      return convertToSearchQuery(this.filterTokens) || undefined;
+      return convertToSearchQuery(this.filterTokens);
     },
     searchTokens() {
       const preloadedUsers = [];
diff --git a/app/assets/javascripts/issues/list/utils.js b/app/assets/javascripts/issues/list/utils.js
index b20827a22c7..b566e08731c 100644
--- a/app/assets/javascripts/issues/list/utils.js
+++ b/app/assets/javascripts/issues/list/utils.js
@@ -330,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;