Skip to content
Snippets Groups Projects
Unverified Commit ef9658f6 authored by Coung Ngo's avatar Coung Ngo :guitar: Committed by GitLab
Browse files

Merge branch '214541-cngo-remove-manual-sort-option' into 'master'

Remove Manual sort option from issues dashboard page

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169158



Merged-by: default avatarCoung Ngo <cngo@gitlab.com>
Approved-by: default avatarMartin Čavoj <mcavoj@gitlab.com>
Approved-by: default avatarScott de Jonge <sdejonge@gitlab.com>
Reviewed-by: default avatarCoung Ngo <cngo@gitlab.com>
Reviewed-by: default avatarMartin Čavoj <mcavoj@gitlab.com>
parents 86607c0f b853bf4b
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -354,6 +354,7 @@ export default {
hasBlockedIssuesFeature: this.hasBlockedIssuesFeature,
hasIssuableHealthStatusFeature: this.hasIssuableHealthStatusFeature,
hasIssueWeightsFeature: this.hasIssueWeightsFeature,
hasManualSort: false,
});
},
tabCounts() {
Loading
Loading
Loading
Loading
@@ -130,36 +130,55 @@ describe('IssuesDashboardApp component', () => {
await waitForPromises();
});
 
// quarantine: https://gitlab.com/gitlab-org/gitlab/-/issues/391722
// eslint-disable-next-line jest/no-disabled-tests
it.skip('renders IssuableList component', () => {
expect(findIssuableList().props()).toMatchObject({
currentTab: STATUS_OPEN,
hasNextPage: true,
hasPreviousPage: false,
hasScopedLabelsFeature: defaultProvide.hasScopedLabelsFeature,
initialSortBy: CREATED_DESC,
issuables: issuesQueryResponse.data.issues.nodes,
issuablesLoading: false,
namespace: 'dashboard',
recentSearchesStorageKey: 'issues',
showPaginationControls: true,
sortOptions: getSortOptions({
hasBlockedIssuesFeature: defaultProvide.hasBlockedIssuesFeature,
hasIssuableHealthStatusFeature: defaultProvide.hasIssuableHealthStatusFeature,
hasIssueWeightsFeature: defaultProvide.hasIssueWeightsFeature,
}),
tabCounts: {
describe('IssuableList component', () => {
it('renders', () => {
expect(findIssuableList().props()).toMatchObject({
currentTab: STATUS_OPEN,
hasNextPage: true,
hasPreviousPage: false,
hasScopedLabelsFeature: true,
initialSortBy: CREATED_DESC,
namespace: 'dashboard',
recentSearchesStorageKey: 'issues',
showPaginationControls: true,
showWorkItemTypeIcon: true,
truncateCounts: true,
useKeysetPagination: true,
});
});
it('renders issues', () => {
expect(findIssuableList().props('issuables')).toHaveLength(1);
});
it('renders sort options', () => {
expect(findIssuableList().props('sortOptions')).toEqual(
getSortOptions({
hasBlockedIssuesFeature: defaultProvide.hasBlockedIssuesFeature,
hasIssuableHealthStatusFeature: defaultProvide.hasIssuableHealthStatusFeature,
hasIssueWeightsFeature: defaultProvide.hasIssueWeightsFeature,
hasManualSort: false,
}),
);
});
it('renders tabs', () => {
expect(findIssuableList().props('tabs')).toEqual(IssuesDashboardApp.issuableListTabs);
});
it('renders tab counts', () => {
expect(findIssuableList().props('tabCounts')).toEqual({
opened: 1,
closed: 2,
all: 3,
},
tabs: IssuesDashboardApp.issuableListTabs,
urlParams: {
});
});
it('renders url params', () => {
expect(findIssuableList().props('urlParams')).toMatchObject({
sort: urlSortParams[CREATED_DESC],
state: STATUS_OPEN,
},
useKeysetPagination: true,
});
});
});
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment