Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fc5f69a0
Commit
fc5f69a0
authored
May 27, 2021
by
Coung Ngo
Committed by
Phil Hughes
May 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert issues page refactor to use GraphQL
parent
968ec8f7
Changes
17
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
569 additions
and
459 deletions
+569
-459
app/assets/javascripts/issuable_list/components/issuable_item.vue
...ts/javascripts/issuable_list/components/issuable_item.vue
+11
-5
app/assets/javascripts/issuable_list/components/issuable_list_root.vue
...vascripts/issuable_list/components/issuable_list_root.vue
+2
-1
app/assets/javascripts/issues_list/components/issue_card_time_info.vue
...vascripts/issues_list/components/issue_card_time_info.vue
+5
-2
app/assets/javascripts/issues_list/components/issues_list_app.vue
...ts/javascripts/issues_list/components/issues_list_app.vue
+81
-74
app/assets/javascripts/issues_list/constants.js
app/assets/javascripts/issues_list/constants.js
+41
-178
app/assets/javascripts/issues_list/index.js
app/assets/javascripts/issues_list/index.js
+8
-3
app/assets/javascripts/issues_list/queries/get_issues.query.graphql
.../javascripts/issues_list/queries/get_issues.query.graphql
+45
-0
app/assets/javascripts/issues_list/queries/issue_info.fragment.graphql
...vascripts/issues_list/queries/issue_info.fragment.graphql
+51
-0
app/assets/javascripts/issues_list/utils.js
app/assets/javascripts/issues_list/utils.js
+41
-9
app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/iteration_token.vue
...components/filtered_search_bar/tokens/iteration_token.vue
+3
-3
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+0
-1
ee/app/assets/javascripts/issues_list/queries/get_issues.query.graphql
.../javascripts/issues_list/queries/get_issues.query.graphql
+56
-0
spec/frontend/issues_list/components/issue_card_time_info_spec.js
...ntend/issues_list/components/issue_card_time_info_spec.js
+4
-6
spec/frontend/issues_list/components/issues_list_app_spec.js
spec/frontend/issues_list/components/issues_list_app_spec.js
+113
-136
spec/frontend/issues_list/mock_data.js
spec/frontend/issues_list/mock_data.js
+97
-25
spec/frontend/issues_list/utils_spec.js
spec/frontend/issues_list/utils_spec.js
+11
-15
spec/helpers/issues_helper_spec.rb
spec/helpers/issues_helper_spec.rb
+0
-1
No files found.
app/assets/javascripts/issuable_list/components/issuable_item.vue
View file @
fc5f69a0
...
@@ -50,6 +50,9 @@ export default {
...
@@ -50,6 +50,9 @@ export default {
},
},
},
},
computed
:
{
computed
:
{
issuableId
()
{
return
getIdFromGraphQLId
(
this
.
issuable
.
id
);
},
createdInPastDay
()
{
createdInPastDay
()
{
const
createdSecondsAgo
=
differenceInSeconds
(
new
Date
(
this
.
issuable
.
createdAt
),
new
Date
());
const
createdSecondsAgo
=
differenceInSeconds
(
new
Date
(
this
.
issuable
.
createdAt
),
new
Date
());
return
createdSecondsAgo
<
SECONDS_IN_DAY
;
return
createdSecondsAgo
<
SECONDS_IN_DAY
;
...
@@ -61,7 +64,7 @@ export default {
...
@@ -61,7 +64,7 @@ export default {
return
this
.
issuable
.
gitlabWebUrl
||
this
.
issuable
.
webUrl
;
return
this
.
issuable
.
gitlabWebUrl
||
this
.
issuable
.
webUrl
;
},
},
authorId
()
{
authorId
()
{
return
getIdFromGraphQLId
(
`
${
this
.
author
.
id
}
`
);
return
getIdFromGraphQLId
(
this
.
author
.
id
);
},
},
isIssuableUrlExternal
()
{
isIssuableUrlExternal
()
{
return
isExternal
(
this
.
webUrl
);
return
isExternal
(
this
.
webUrl
);
...
@@ -70,10 +73,10 @@ export default {
...
@@ -70,10 +73,10 @@ export default {
return
this
.
issuable
.
labels
?.
nodes
||
this
.
issuable
.
labels
||
[];
return
this
.
issuable
.
labels
?.
nodes
||
this
.
issuable
.
labels
||
[];
},
},
labelIdsString
()
{
labelIdsString
()
{
return
JSON
.
stringify
(
this
.
labels
.
map
((
label
)
=>
label
.
id
));
return
JSON
.
stringify
(
this
.
labels
.
map
((
label
)
=>
getIdFromGraphQLId
(
label
.
id
)
));
},
},
assignees
()
{
assignees
()
{
return
this
.
issuable
.
assignees
||
[];
return
this
.
issuable
.
assignees
?.
nodes
||
this
.
issuable
.
assignees
||
[];
},
},
createdAt
()
{
createdAt
()
{
return
sprintf
(
__
(
'
created %{timeAgo}
'
),
{
return
sprintf
(
__
(
'
created %{timeAgo}
'
),
{
...
@@ -81,6 +84,9 @@ export default {
...
@@ -81,6 +84,9 @@ export default {
});
});
},
},
updatedAt
()
{
updatedAt
()
{
if
(
!
this
.
issuable
.
updatedAt
)
{
return
''
;
}
return
sprintf
(
__
(
'
updated %{timeAgo}
'
),
{
return
sprintf
(
__
(
'
updated %{timeAgo}
'
),
{
timeAgo
:
getTimeago
().
format
(
this
.
issuable
.
updatedAt
),
timeAgo
:
getTimeago
().
format
(
this
.
issuable
.
updatedAt
),
});
});
...
@@ -157,7 +163,7 @@ export default {
...
@@ -157,7 +163,7 @@ export default {
<
template
>
<
template
>
<li
<li
:id=
"`issuable_$
{issuable
.i
d}`"
:id=
"`issuable_$
{issuable
I
d}`"
class="issue gl-px-5!"
class="issue gl-px-5!"
:class="{ closed: issuable.closedAt, today: createdInPastDay }"
:class="{ closed: issuable.closedAt, today: createdInPastDay }"
:data-labels="labelIdsString"
:data-labels="labelIdsString"
...
@@ -167,7 +173,7 @@ export default {
...
@@ -167,7 +173,7 @@ export default {
<gl-form-checkbox
<gl-form-checkbox
class=
"gl-mr-0"
class=
"gl-mr-0"
:checked=
"checked"
:checked=
"checked"
:data-id=
"issuable
.i
d"
:data-id=
"issuable
I
d"
@
input=
"$emit('checked-input', $event)"
@
input=
"$emit('checked-input', $event)"
>
>
<span
class=
"gl-sr-only"
>
{{
issuable
.
title
}}
</span>
<span
class=
"gl-sr-only"
>
{{
issuable
.
title
}}
</span>
...
...
app/assets/javascripts/issuable_list/components/issuable_list_root.vue
View file @
fc5f69a0
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
import
{
GlSkeletonLoading
,
GlPagination
}
from
'
@gitlab/ui
'
;
import
{
GlSkeletonLoading
,
GlPagination
}
from
'
@gitlab/ui
'
;
import
{
uniqueId
}
from
'
lodash
'
;
import
{
uniqueId
}
from
'
lodash
'
;
import
{
getIdFromGraphQLId
}
from
'
~/graphql_shared/utils
'
;
import
{
updateHistory
,
setUrlParams
}
from
'
~/lib/utils/url_utility
'
;
import
{
updateHistory
,
setUrlParams
}
from
'
~/lib/utils/url_utility
'
;
import
FilteredSearchBar
from
'
~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
'
;
import
FilteredSearchBar
from
'
~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
'
;
...
@@ -211,7 +212,7 @@ export default {
...
@@ -211,7 +212,7 @@ export default {
},
},
methods
:
{
methods
:
{
issuableId
(
issuable
)
{
issuableId
(
issuable
)
{
return
issuable
.
id
||
issuable
.
iid
||
uniqueId
();
return
getIdFromGraphQLId
(
issuable
.
id
)
||
issuable
.
iid
||
uniqueId
();
},
},
issuableChecked
(
issuable
)
{
issuableChecked
(
issuable
)
{
return
this
.
checkedIssuables
[
this
.
issuableId
(
issuable
)]?.
checked
;
return
this
.
checkedIssuables
[
this
.
issuableId
(
issuable
)]?.
checked
;
...
...
app/assets/javascripts/issues_list/components/issue_card_time_info.vue
View file @
fc5f69a0
...
@@ -42,6 +42,9 @@ export default {
...
@@ -42,6 +42,9 @@ export default {
}
}
return
__
(
'
Milestone
'
);
return
__
(
'
Milestone
'
);
},
},
milestoneLink
()
{
return
this
.
issue
.
milestone
.
webPath
||
this
.
issue
.
milestone
.
webUrl
;
},
dueDate
()
{
dueDate
()
{
return
this
.
issue
.
dueDate
&&
dateInWords
(
new
Date
(
this
.
issue
.
dueDate
),
true
);
return
this
.
issue
.
dueDate
&&
dateInWords
(
new
Date
(
this
.
issue
.
dueDate
),
true
);
},
},
...
@@ -49,7 +52,7 @@ export default {
...
@@ -49,7 +52,7 @@ export default {
return
isInPast
(
new
Date
(
this
.
issue
.
dueDate
));
return
isInPast
(
new
Date
(
this
.
issue
.
dueDate
));
},
},
timeEstimate
()
{
timeEstimate
()
{
return
this
.
issue
.
timeStats
?.
humanTimeEstimate
;
return
this
.
issue
.
humanTimeEstimate
||
this
.
issue
.
timeStats
?.
humanTimeEstimate
;
},
},
showHealthStatus
()
{
showHealthStatus
()
{
return
this
.
hasIssuableHealthStatusFeature
&&
this
.
issue
.
healthStatus
;
return
this
.
hasIssuableHealthStatusFeature
&&
this
.
issue
.
healthStatus
;
...
@@ -85,7 +88,7 @@ export default {
...
@@ -85,7 +88,7 @@ export default {
class=
"issuable-milestone gl-display-none gl-sm-display-inline-block! gl-mr-3"
class=
"issuable-milestone gl-display-none gl-sm-display-inline-block! gl-mr-3"
data-testid=
"issuable-milestone"
data-testid=
"issuable-milestone"
>
>
<gl-link
v-gl-tooltip
:href=
"
issue.milestone.webUrl
"
:title=
"milestoneDate"
>
<gl-link
v-gl-tooltip
:href=
"
milestoneLink
"
:title=
"milestoneDate"
>
<gl-icon
name=
"clock"
/>
<gl-icon
name=
"clock"
/>
{{
issue
.
milestone
.
title
}}
{{
issue
.
milestone
.
title
}}
</gl-link>
</gl-link>
...
...
app/assets/javascripts/issues_list/components/issues_list_app.vue
View file @
fc5f69a0
...
@@ -9,24 +9,21 @@ import {
...
@@ -9,24 +9,21 @@ import {
GlTooltipDirective
,
GlTooltipDirective
,
}
from
'
@gitlab/ui
'
;
}
from
'
@gitlab/ui
'
;
import
fuzzaldrinPlus
from
'
fuzzaldrin-plus
'
;
import
fuzzaldrinPlus
from
'
fuzzaldrin-plus
'
;
import
{
toNumber
}
from
'
lodash
'
;
import
getIssuesQuery
from
'
ee_else_ce/issues_list/queries/get_issues.query.graphql
'
;
import
createFlash
from
'
~/flash
'
;
import
createFlash
from
'
~/flash
'
;
import
CsvImportExportButtons
from
'
~/issuable/components/csv_import_export_buttons.vue
'
;
import
CsvImportExportButtons
from
'
~/issuable/components/csv_import_export_buttons.vue
'
;
import
IssuableByEmail
from
'
~/issuable/components/issuable_by_email.vue
'
;
import
IssuableByEmail
from
'
~/issuable/components/issuable_by_email.vue
'
;
import
IssuableList
from
'
~/issuable_list/components/issuable_list_root.vue
'
;
import
IssuableList
from
'
~/issuable_list/components/issuable_list_root.vue
'
;
import
{
IssuableListTabs
,
IssuableStates
}
from
'
~/issuable_list/constants
'
;
import
{
IssuableListTabs
,
IssuableStates
}
from
'
~/issuable_list/constants
'
;
import
{
import
{
API_PARAM
,
apiSortParams
,
CREATED_DESC
,
CREATED_DESC
,
i18n
,
i18n
,
MAX_LIST_SIZE
,
MAX_LIST_SIZE
,
PAGE_SIZE
,
PAGE_SIZE
,
PARAM_DUE_DATE
,
PARAM_DUE_DATE
,
PARAM_PAGE
,
PARAM_SORT
,
PARAM_SORT
,
PARAM_STATE
,
PARAM_STATE
,
RELATIVE_POSITION_
DE
SC
,
RELATIVE_POSITION_
A
SC
,
TOKEN_TYPE_ASSIGNEE
,
TOKEN_TYPE_ASSIGNEE
,
TOKEN_TYPE_AUTHOR
,
TOKEN_TYPE_AUTHOR
,
TOKEN_TYPE_CONFIDENTIAL
,
TOKEN_TYPE_CONFIDENTIAL
,
...
@@ -37,19 +34,19 @@ import {
...
@@ -37,19 +34,19 @@ import {
TOKEN_TYPE_MILESTONE
,
TOKEN_TYPE_MILESTONE
,
TOKEN_TYPE_WEIGHT
,
TOKEN_TYPE_WEIGHT
,
UPDATED_DESC
,
UPDATED_DESC
,
URL_PARAM
,
urlSortParams
,
urlSortParams
,
}
from
'
~/issues_list/constants
'
;
}
from
'
~/issues_list/constants
'
;
import
{
import
{
convertToParams
,
convertTo
Api
Params
,
convertToSearchQuery
,
convertToSearchQuery
,
convertToUrlParams
,
getDueDateValue
,
getDueDateValue
,
getFilterTokens
,
getFilterTokens
,
getSortKey
,
getSortKey
,
getSortOptions
,
getSortOptions
,
}
from
'
~/issues_list/utils
'
;
}
from
'
~/issues_list/utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
{
convertObjectPropsToCamelCase
,
getParameterByName
}
from
'
~/lib/utils/common_utils
'
;
import
{
getParameterByName
}
from
'
~/lib/utils/common_utils
'
;
import
{
import
{
DEFAULT_NONE_ANY
,
DEFAULT_NONE_ANY
,
OPERATOR_IS_ONLY
,
OPERATOR_IS_ONLY
,
...
@@ -107,9 +104,6 @@ export default {
...
@@ -107,9 +104,6 @@ export default {
emptyStateSvgPath
:
{
emptyStateSvgPath
:
{
default
:
''
,
default
:
''
,
},
},
endpoint
:
{
default
:
''
,
},
exportCsvPath
:
{
exportCsvPath
:
{
default
:
''
,
default
:
''
,
},
},
...
@@ -173,15 +167,53 @@ export default {
...
@@ -173,15 +167,53 @@ export default {
dueDateFilter
:
getDueDateValue
(
getParameterByName
(
PARAM_DUE_DATE
)),
dueDateFilter
:
getDueDateValue
(
getParameterByName
(
PARAM_DUE_DATE
)),
exportCsvPathWithQuery
:
this
.
getExportCsvPathWithQuery
(),
exportCsvPathWithQuery
:
this
.
getExportCsvPathWithQuery
(),
filterTokens
:
getFilterTokens
(
window
.
location
.
search
),
filterTokens
:
getFilterTokens
(
window
.
location
.
search
),
isLoading
:
false
,
issues
:
[],
issues
:
[],
page
:
toNumber
(
getParameterByName
(
PARAM_PAGE
))
||
1
,
page
:
1
,
pageInfo
:
{},
pageParams
:
{
firstPageSize
:
PAGE_SIZE
,
},
showBulkEditSidebar
:
false
,
showBulkEditSidebar
:
false
,
sortKey
:
getSortKey
(
getParameterByName
(
PARAM_SORT
))
||
defaultSortKey
,
sortKey
:
getSortKey
(
getParameterByName
(
PARAM_SORT
))
||
defaultSortKey
,
state
:
state
||
IssuableStates
.
Opened
,
state
:
state
||
IssuableStates
.
Opened
,
totalIssues
:
0
,
totalIssues
:
0
,
};
};
},
},
apollo
:
{
issues
:
{
query
:
getIssuesQuery
,
variables
()
{
const
filterParams
=
{
...
this
.
apiFilterParams
,
};
if
(
filterParams
.
epicId
)
{
filterParams
.
epicId
=
filterParams
.
epicId
.
split
(
'
::&
'
).
pop
();
}
else
if
(
filterParams
.
not
?.
epicId
)
{
filterParams
.
not
.
epicId
=
filterParams
.
not
.
epicId
.
split
(
'
::&
'
).
pop
();
}
return
{
projectPath
:
this
.
projectPath
,
search
:
this
.
searchQuery
,
sort
:
this
.
sortKey
,
state
:
this
.
state
,
...
this
.
pageParams
,
...
filterParams
,
};
},
update
:
({
project
})
=>
project
.
issues
.
nodes
,
result
({
data
})
{
this
.
pageInfo
=
data
.
project
.
issues
.
pageInfo
;
this
.
totalIssues
=
data
.
project
.
issues
.
count
;
this
.
exportCsvPathWithQuery
=
this
.
getExportCsvPathWithQuery
();
},
error
()
{
createFlash
({
message
:
this
.
$options
.
i18n
.
errorFetchingIssues
});
},
debounce
:
200
,
},
},
computed
:
{
computed
:
{
hasSearch
()
{
hasSearch
()
{
return
this
.
searchQuery
||
Object
.
keys
(
this
.
urlFilterParams
).
length
;
return
this
.
searchQuery
||
Object
.
keys
(
this
.
urlFilterParams
).
length
;
...
@@ -190,16 +222,22 @@ export default {
...
@@ -190,16 +222,22 @@ export default {
return
this
.
showBulkEditSidebar
||
!
this
.
issues
.
length
;
return
this
.
showBulkEditSidebar
||
!
this
.
issues
.
length
;
},
},
isManualOrdering
()
{
isManualOrdering
()
{
return
this
.
sortKey
===
RELATIVE_POSITION_
DE
SC
;
return
this
.
sortKey
===
RELATIVE_POSITION_
A
SC
;
},
},
isOpenTab
()
{
isOpenTab
()
{
return
this
.
state
===
IssuableStates
.
Opened
;
return
this
.
state
===
IssuableStates
.
Opened
;
},
},
nextPage
()
{
return
Number
(
this
.
pageInfo
.
hasNextPage
);
},
previousPage
()
{
return
Number
(
this
.
pageInfo
.
hasPreviousPage
);
},
apiFilterParams
()
{
apiFilterParams
()
{
return
convertTo
Params
(
this
.
filterTokens
,
API_PARAM
);
return
convertTo
ApiParams
(
this
.
filterTokens
);
},
},
urlFilterParams
()
{
urlFilterParams
()
{
return
convertTo
Params
(
this
.
filterTokens
,
URL_PARAM
);
return
convertTo
UrlParams
(
this
.
filterTokens
);
},
},
searchQuery
()
{
searchQuery
()
{
return
convertToSearchQuery
(
this
.
filterTokens
)
||
undefined
;
return
convertToSearchQuery
(
this
.
filterTokens
)
||
undefined
;
...
@@ -214,6 +252,7 @@ export default {
...
@@ -214,6 +252,7 @@ export default {
dataType
:
'
user
'
,
dataType
:
'
user
'
,
unique
:
true
,
unique
:
true
,
defaultAuthors
:
[],
defaultAuthors
:
[],
operators
:
OPERATOR_IS_ONLY
,
fetchAuthors
:
this
.
fetchUsers
,
fetchAuthors
:
this
.
fetchUsers
,
},
},
{
{
...
@@ -240,7 +279,7 @@ export default {
...
@@ -240,7 +279,7 @@ export default {
title
:
TOKEN_TITLE_LABEL
,
title
:
TOKEN_TITLE_LABEL
,
icon
:
'
labels
'
,
icon
:
'
labels
'
,
token
:
LabelToken
,
token
:
LabelToken
,
defaultLabels
:
[]
,
defaultLabels
:
DEFAULT_NONE_ANY
,
fetchLabels
:
this
.
fetchLabels
,
fetchLabels
:
this
.
fetchLabels
,
},
},
];
];
...
@@ -333,10 +372,9 @@ export default {
...
@@ -333,10 +372,9 @@ export default {
return
{
return
{
due_date
:
this
.
dueDateFilter
,
due_date
:
this
.
dueDateFilter
,
page
:
this
.
page
,
search
:
this
.
searchQuery
,
search
:
this
.
searchQuery
,
sort
:
urlSortParams
[
this
.
sortKey
],
state
:
this
.
state
,
state
:
this
.
state
,
...
urlSortParams
[
this
.
sortKey
],
...
filterParams
,
...
filterParams
,
};
};
},
},
...
@@ -346,7 +384,6 @@ export default {
...
@@ -346,7 +384,6 @@ export default {
},
},
mounted
()
{
mounted
()
{
eventHub
.
$on
(
'
issuables:toggleBulkEdit
'
,
this
.
toggleBulkEditSidebar
);
eventHub
.
$on
(
'
issuables:toggleBulkEdit
'
,
this
.
toggleBulkEditSidebar
);
this
.
fetchIssues
();
},
},
beforeDestroy
()
{
beforeDestroy
()
{
eventHub
.
$off
(
'
issuables:toggleBulkEdit
'
,
this
.
toggleBulkEditSidebar
);
eventHub
.
$off
(
'
issuables:toggleBulkEdit
'
,
this
.
toggleBulkEditSidebar
);
...
@@ -386,59 +423,19 @@ export default {
...
@@ -386,59 +423,19 @@ export default {
return
this
.
fetchWithCache
(
this
.
projectMilestonesPath
,
'
milestones
'
,
'
title
'
,
search
,
true
);
return
this
.
fetchWithCache
(
this
.
projectMilestonesPath
,
'
milestones
'
,
'
title
'
,
search
,
true
);
},
},
fetchIterations
(
search
)
{
fetchIterations
(
search
)
{
return
axios
.
get
(
this
.
projectIterationsPath
,
{
params
:
{
search
}
});
const
number
=
Number
(
search
);
return
!
search
||
Number
.
isNaN
(
number
)
?
axios
.
get
(
this
.
projectIterationsPath
,
{
params
:
{
search
}
})
:
axios
.
get
(
this
.
projectIterationsPath
,
{
params
:
{
id
:
number
}
});
},
},
fetchUsers
(
search
)
{
fetchUsers
(
search
)
{
return
axios
.
get
(
this
.
autocompleteUsersPath
,
{
params
:
{
search
}
});
return
axios
.
get
(
this
.
autocompleteUsersPath
,
{
params
:
{
search
}
});
},
},
fetchIssues
()
{
if
(
!
this
.
hasProjectIssues
)
{
return
undefined
;
}
this
.
isLoading
=
true
;
const
filterParams
=
{
...
this
.
apiFilterParams
,
};
if
(
filterParams
.
epic_id
)
{
filterParams
.
epic_id
=
filterParams
.
epic_id
.
split
(
'
::&
'
).
pop
();
}
else
if
(
filterParams
[
'
not[epic_id]
'
])
{
filterParams
[
'
not[epic_id]
'
]
=
filterParams
[
'
not[epic_id]
'
].
split
(
'
::&
'
).
pop
();
}
return
axios
.
get
(
this
.
endpoint
,
{
params
:
{
due_date
:
this
.
dueDateFilter
,
page
:
this
.
page
,
per_page
:
PAGE_SIZE
,
search
:
this
.
searchQuery
,
state
:
this
.
state
,
with_labels_details
:
true
,
...
apiSortParams
[
this
.
sortKey
],
...
filterParams
,
},
})
.
then
(({
data
,
headers
})
=>
{
this
.
page
=
Number
(
headers
[
'
x-page
'
]);
this
.
totalIssues
=
Number
(
headers
[
'
x-total
'
]);
this
.
issues
=
data
.
map
((
issue
)
=>
convertObjectPropsToCamelCase
(
issue
,
{
deep
:
true
}));
this
.
exportCsvPathWithQuery
=
this
.
getExportCsvPathWithQuery
();
})
.
catch
(()
=>
{
createFlash
({
message
:
this
.
$options
.
i18n
.
errorFetchingIssues
});
})
.
finally
(()
=>
{
this
.
isLoading
=
false
;
});
},
getExportCsvPathWithQuery
()
{
getExportCsvPathWithQuery
()
{
return
`
${
this
.
exportCsvPath
}${
window
.
location
.
search
}
`
;
return
`
${
this
.
exportCsvPath
}${
window
.
location
.
search
}
`
;
},
},
getStatus
(
issue
)
{
getStatus
(
issue
)
{
if
(
issue
.
closedAt
&&
issue
.
moved
ToId
)
{
if
(
issue
.
closedAt
&&
issue
.
moved
)
{
return
this
.
$options
.
i18n
.
closedMoved
;
return
this
.
$options
.
i18n
.
closedMoved
;
}
}
if
(
issue
.
closedAt
)
{
if
(
issue
.
closedAt
)
{
...
@@ -469,18 +466,30 @@ export default {
...
@@ -469,18 +466,30 @@ export default {
},
},
handleClickTab
(
state
)
{
handleClickTab
(
state
)
{
if
(
this
.
state
!==
state
)
{
if
(
this
.
state
!==
state
)
{
this
.
pageParams
=
{
firstPageSize
:
PAGE_SIZE
,
};
this
.
page
=
1
;
this
.
page
=
1
;
}
}
this
.
state
=
state
;
this
.
state
=
state
;
this
.
fetchIssues
();
},
},
handleFilter
(
filter
)
{
handleFilter
(
filter
)
{
this
.
filterTokens
=
filter
;
this
.
filterTokens
=
filter
;
this
.
fetchIssues
();
},
},
handlePageChange
(
page
)
{
handlePageChange
(
page
)
{
if
(
page
>
this
.
page
)
{
this
.
pageParams
=
{
afterCursor
:
this
.
pageInfo
.
endCursor
,
firstPageSize
:
PAGE_SIZE
,
};
}
else
{
this
.
pageParams
=
{
beforeCursor
:
this
.
pageInfo
.
startCursor
,
lastPageSize
:
PAGE_SIZE
,
};
}
this
.
page
=
page
;
this
.
page
=
page
;
this
.
fetchIssues
();
},
},
handleReorder
({
newIndex
,
oldIndex
})
{
handleReorder
({
newIndex
,
oldIndex
})
{
const
issueToMove
=
this
.
issues
[
oldIndex
];
const
issueToMove
=
this
.
issues
[
oldIndex
];
...
@@ -517,7 +526,6 @@ export default {
...
@@ -517,7 +526,6 @@ export default {
},
},
handleSort
(
value
)
{
handleSort
(
value
)
{
this
.
sortKey
=
value
;
this
.
sortKey
=
value
;
this
.
fetchIssues
();
},
},
toggleBulkEditSidebar
(
showBulkEditSidebar
)
{
toggleBulkEditSidebar
(
showBulkEditSidebar
)
{
this
.
showBulkEditSidebar
=
showBulkEditSidebar
;
this
.
showBulkEditSidebar
=
showBulkEditSidebar
;
...
@@ -541,14 +549,13 @@ export default {
...
@@ -541,14 +549,13 @@ export default {
:tabs=
"$options.IssuableListTabs"
:tabs=
"$options.IssuableListTabs"
:current-tab=
"state"
:current-tab=
"state"
:tab-counts=
"tabCounts"
:tab-counts=
"tabCounts"
:issuables-loading=
"
isL
oading"
:issuables-loading=
"
$apollo.l
oading"
:is-manual-ordering=
"isManualOrdering"
:is-manual-ordering=
"isManualOrdering"
:show-bulk-edit-sidebar=
"showBulkEditSidebar"
:show-bulk-edit-sidebar=
"showBulkEditSidebar"
:show-pagination-controls=
"showPaginationControls"
:show-pagination-controls=
"showPaginationControls"
:total-items=
"totalIssues"
:current-page=
"page"
:current-page=
"page"
:previous-page=
"p
age - 1
"
:previous-page=
"p
reviousPage
"
:next-page=
"
page + 1
"
:next-page=
"
nextPage
"
:url-params=
"urlParams"
:url-params=
"urlParams"
@
click-tab=
"handleClickTab"
@
click-tab=
"handleClickTab"
@
filter=
"handleFilter"
@
filter=
"handleFilter"
...
@@ -631,7 +638,7 @@ export default {
...
@@ -631,7 +638,7 @@ export default {
</li>
</li>
<blocking-issues-count
<blocking-issues-count
class=
"gl-display-none gl-sm-display-block"
class=
"gl-display-none gl-sm-display-block"
:blocking-issues-count=
"issuable.block
ingIssues
Count"
:blocking-issues-count=
"issuable.block
edBy
Count"
:is-list-item=
"true"
:is-list-item=
"true"
/>
/>
</
template
>
</
template
>
...
...
app/assets/javascripts/issues_list/constants.js
View file @
fc5f69a0
...
@@ -101,7 +101,6 @@ export const i18n = {
...
@@ -101,7 +101,6 @@ export const i18n = {
export
const
JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY
=
'
jira-import-success-alert-hide-map
'
;
export
const
JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY
=
'
jira-import-success-alert-hide-map
'
;
export
const
PARAM_DUE_DATE
=
'
due_date
'
;
export
const
PARAM_DUE_DATE
=
'
due_date
'
;
export
const
PARAM_PAGE
=
'
page
'
;
export
const
PARAM_SORT
=
'
sort
'
;
export
const
PARAM_SORT
=
'
sort
'
;
export
const
PARAM_STATE
=
'
state
'
;
export
const
PARAM_STATE
=
'
state
'
;
...
@@ -125,21 +124,21 @@ export const CREATED_ASC = 'CREATED_ASC';
...
@@ -125,21 +124,21 @@ export const CREATED_ASC = 'CREATED_ASC';
export
const
CREATED_DESC
=
'
CREATED_DESC
'
;
export
const
CREATED_DESC
=
'
CREATED_DESC
'
;
export
const
DUE_DATE_ASC
=
'
DUE_DATE_ASC
'
;
export
const
DUE_DATE_ASC
=
'
DUE_DATE_ASC
'
;
export
const
DUE_DATE_DESC
=
'
DUE_DATE_DESC
'
;
export
const
DUE_DATE_DESC
=
'
DUE_DATE_DESC
'
;
export
const
LABEL_PRIORITY_ASC
=
'
LABEL_PRIORITY_ASC
'
;
export
const
LABEL_PRIORITY_DESC
=
'
LABEL_PRIORITY_DESC
'
;
export
const
LABEL_PRIORITY_DESC
=
'
LABEL_PRIORITY_DESC
'
;
export
const
MILESTONE_DUE_ASC
=
'
MILESTONE_DUE_ASC
'
;
export
const
MILESTONE_DUE_ASC
=
'
MILESTONE_DUE_ASC
'
;
export
const
MILESTONE_DUE_DESC
=
'
MILESTONE_DUE_DESC
'
;
export
const
MILESTONE_DUE_DESC
=
'
MILESTONE_DUE_DESC
'
;
export
const
POPULARITY_ASC
=
'
POPULARITY_ASC
'
;
export
const
POPULARITY_ASC
=
'
POPULARITY_ASC
'
;
export
const
POPULARITY_DESC
=
'
POPULARITY_DESC
'
;
export
const
POPULARITY_DESC
=
'
POPULARITY_DESC
'
;
export
const
PRIORITY_ASC
=
'
PRIORITY_ASC
'
;
export
const
PRIORITY_DESC
=
'
PRIORITY_DESC
'
;
export
const
PRIORITY_DESC
=
'
PRIORITY_DESC
'
;
export
const
RELATIVE_POSITION_
DESC
=
'
RELATIVE_POSITION_DE
SC
'
;
export
const
RELATIVE_POSITION_
ASC
=
'
RELATIVE_POSITION_A
SC
'
;
export
const
UPDATED_ASC
=
'
UPDATED_ASC
'
;
export
const
UPDATED_ASC
=
'
UPDATED_ASC
'
;
export
const
UPDATED_DESC
=
'
UPDATED_DESC
'
;
export
const
UPDATED_DESC
=
'
UPDATED_DESC
'
;
export
const
WEIGHT_ASC
=
'
WEIGHT_ASC
'
;
export
const
WEIGHT_ASC
=
'
WEIGHT_ASC
'
;
export
const
WEIGHT_DESC
=
'
WEIGHT_DESC
'
;
export
const
WEIGHT_DESC
=
'
WEIGHT_DESC
'
;
const
SORT_ASC
=
'
asc
'
;
const
PRIORITY_ASC_SORT
=
'
priority_asc
'
;
const
SORT_DESC
=
'
desc
'
;
const
CREATED_DATE_SORT
=
'
created_date
'
;
const
CREATED_DATE_SORT
=
'
created_date
'
;
const
CREATED_ASC_SORT
=
'
created_asc
'
;
const
CREATED_ASC_SORT
=
'
created_asc
'
;
const
UPDATED_DESC_SORT
=
'
updated_desc
'
;
const
UPDATED_DESC_SORT
=
'
updated_desc
'
;
...
@@ -147,129 +146,30 @@ const UPDATED_ASC_SORT = 'updated_asc';
...
@@ -147,129 +146,30 @@ const UPDATED_ASC_SORT = 'updated_asc';
const
MILESTONE_SORT
=
'
milestone
'
;
const
MILESTONE_SORT
=
'
milestone
'
;
const
MILESTONE_DUE_DESC_SORT
=
'
milestone_due_desc
'
;
const
MILESTONE_DUE_DESC_SORT
=
'
milestone_due_desc
'
;
const
DUE_DATE_DESC_SORT
=
'
due_date_desc
'
;
const
DUE_DATE_DESC_SORT
=
'
due_date_desc
'
;
const
LABEL_PRIORITY_ASC_SORT
=
'
label_priority_asc
'
;
const
POPULARITY_ASC_SORT
=
'
popularity_asc
'
;
const
POPULARITY_ASC_SORT
=
'
popularity_asc
'
;
const
WEIGHT_DESC_SORT
=
'
weight_desc
'
;
const
WEIGHT_DESC_SORT
=
'
weight_desc
'
;
const
BLOCKING_ISSUES_DESC_SORT
=
'
blocking_issues_desc
'
;
const
BLOCKING_ISSUES_DESC_SORT
=
'
blocking_issues_desc
'
;
const
BLOCKING_ISSUES
=
'
blocking_issues
'
;
export
const
apiSortParams
=
{
[
PRIORITY_DESC
]:
{
order_by
:
PRIORITY
,
sort
:
SORT_DESC
,
},
[
CREATED_ASC
]:
{
order_by
:
CREATED_AT
,
sort
:
SORT_ASC
,
},
[
CREATED_DESC
]:
{
order_by
:
CREATED_AT
,
sort
:
SORT_DESC
,
},
[
UPDATED_ASC
]:
{
order_by
:
UPDATED_AT
,
sort
:
SORT_ASC
,
},
[
UPDATED_DESC
]:
{
order_by
:
UPDATED_AT
,
sort
:
SORT_DESC
,
},
[
MILESTONE_DUE_ASC
]:
{
order_by
:
MILESTONE_DUE
,
sort
:
SORT_ASC
,
},
[
MILESTONE_DUE_DESC
]:
{
order_by
:
MILESTONE_DUE
,
sort
:
SORT_DESC
,
},
[
DUE_DATE_ASC
]:
{
order_by
:
DUE_DATE
,
sort
:
SORT_ASC
,
},
[
DUE_DATE_DESC
]:
{
order_by
:
DUE_DATE
,
sort
:
SORT_DESC
,
},
[
POPULARITY_ASC
]:
{
order_by
:
POPULARITY
,
sort
:
SORT_ASC
,
},
[
POPULARITY_DESC
]:
{
order_by
:
POPULARITY
,
sort
:
SORT_DESC
,
},
[
LABEL_PRIORITY_DESC
]:
{
order_by
:
LABEL_PRIORITY
,
sort
:
SORT_DESC
,
},
[
RELATIVE_POSITION_DESC
]:
{
order_by
:
RELATIVE_POSITION
,
per_page
:
100
,
sort
:
SORT_ASC
,
},
[
WEIGHT_ASC
]:
{
order_by
:
WEIGHT
,
sort
:
SORT_ASC
,
},
[
WEIGHT_DESC
]:
{
order_by
:
WEIGHT
,
sort
:
SORT_DESC
,
},
[
BLOCKING_ISSUES_DESC
]:
{
order_by
:
BLOCKING_ISSUES
,
sort
:
SORT_DESC
,
},
};
export
const
urlSortParams
=
{
export
const
urlSortParams
=
{
[
PRIORITY_DESC
]:
{
[
PRIORITY_ASC
]:
PRIORITY_ASC_SORT
,
sort
:
PRIORITY
,
[
PRIORITY_DESC
]:
PRIORITY
,
},
[
CREATED_ASC
]:
CREATED_ASC_SORT
,
[
CREATED_ASC
]:
{
[
CREATED_DESC
]:
CREATED_DATE_SORT
,
sort
:
CREATED_ASC_SORT
,
[
UPDATED_ASC
]:
UPDATED_ASC_SORT
,
},
[
UPDATED_DESC
]:
UPDATED_DESC_SORT
,
[
CREATED_DESC
]:
{
[
MILESTONE_DUE_ASC
]:
MILESTONE_SORT
,
sort
:
CREATED_DATE_SORT
,
[
MILESTONE_DUE_DESC
]:
MILESTONE_DUE_DESC_SORT
,
},
[
DUE_DATE_ASC
]:
DUE_DATE
,
[
UPDATED_ASC
]:
{
[
DUE_DATE_DESC
]:
DUE_DATE_DESC_SORT
,
sort
:
UPDATED_ASC_SORT
,
[
POPULARITY_ASC
]:
POPULARITY_ASC_SORT
,
},
[
POPULARITY_DESC
]:
POPULARITY
,
[
UPDATED_DESC
]:
{
[
LABEL_PRIORITY_ASC
]:
LABEL_PRIORITY_ASC_SORT
,
sort
:
UPDATED_DESC_SORT
,
[
LABEL_PRIORITY_DESC
]:
LABEL_PRIORITY
,
},
[
RELATIVE_POSITION_ASC
]:
RELATIVE_POSITION
,
[
MILESTONE_DUE_ASC
]:
{
[
WEIGHT_ASC
]:
WEIGHT
,
sort
:
MILESTONE_SORT
,
[
WEIGHT_DESC
]:
WEIGHT_DESC_SORT
,
},
[
BLOCKING_ISSUES_DESC
]:
BLOCKING_ISSUES_DESC_SORT
,
[
MILESTONE_DUE_DESC
]:
{
sort
:
MILESTONE_DUE_DESC_SORT
,
},
[
DUE_DATE_ASC
]:
{
sort
:
DUE_DATE
,
},
[
DUE_DATE_DESC
]:
{
sort
:
DUE_DATE_DESC_SORT
,
},
[
POPULARITY_ASC
]:
{
sort
:
POPULARITY_ASC_SORT
,
},
[
POPULARITY_DESC
]:
{
sort
:
POPULARITY
,
},
[
LABEL_PRIORITY_DESC
]:
{
sort
:
LABEL_PRIORITY
,
},
[
RELATIVE_POSITION_DESC
]:
{
sort
:
RELATIVE_POSITION
,
per_page
:
100
,
},
[
WEIGHT_ASC
]:
{
sort
:
WEIGHT
,
},
[
WEIGHT_DESC
]:
{
sort
:
WEIGHT_DESC_SORT
,
},
[
BLOCKING_ISSUES_DESC
]:
{
sort
:
BLOCKING_ISSUES_DESC_SORT
,
},
};
};
export
const
MAX_LIST_SIZE
=
10
;
export
const
MAX_LIST_SIZE
=
10
;
...
@@ -294,12 +194,7 @@ export const TOKEN_TYPE_WEIGHT = 'weight';
...
@@ -294,12 +194,7 @@ export const TOKEN_TYPE_WEIGHT = 'weight';
export
const
filters
=
{
export
const
filters
=
{
[
TOKEN_TYPE_AUTHOR
]:
{
[
TOKEN_TYPE_AUTHOR
]:
{
[
API_PARAM
]:
{
[
API_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
authorUsername
'
,
[
NORMAL_FILTER
]:
'
author_username
'
,
},
[
OPERATOR_IS_NOT
]:
{
[
NORMAL_FILTER
]:
'
not[author_username]
'
,
},
},
},
[
URL_PARAM
]:
{
[
URL_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
OPERATOR_IS
]:
{
...
@@ -312,13 +207,8 @@ export const filters = {
...
@@ -312,13 +207,8 @@ export const filters = {
},
},
[
TOKEN_TYPE_ASSIGNEE
]:
{
[
TOKEN_TYPE_ASSIGNEE
]:
{
[
API_PARAM
]:
{
[
API_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
assigneeUsernames
'
,
[
NORMAL_FILTER
]:
'
assignee_username
'
,
[
SPECIAL_FILTER
]:
'
assigneeId
'
,
[
SPECIAL_FILTER
]:
'
assignee_id
'
,
},
[
OPERATOR_IS_NOT
]:
{
[
NORMAL_FILTER
]:
'
not[assignee_username]
'
,
},
},
},
[
URL_PARAM
]:
{
[
URL_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
OPERATOR_IS
]:
{
...
@@ -333,12 +223,7 @@ export const filters = {
...
@@ -333,12 +223,7 @@ export const filters = {
},
},
[
TOKEN_TYPE_MILESTONE
]:
{
[
TOKEN_TYPE_MILESTONE
]:
{
[
API_PARAM
]:
{
[
API_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
milestoneTitle
'
,
[
NORMAL_FILTER
]:
'
milestone
'
,
},
[
OPERATOR_IS_NOT
]:
{
[
NORMAL_FILTER
]:
'
not[milestone]
'
,
},
},
},
[
URL_PARAM
]:
{
[
URL_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
OPERATOR_IS
]:
{
...
@@ -351,16 +236,13 @@ export const filters = {
...
@@ -351,16 +236,13 @@ export const filters = {
},
},
[
TOKEN_TYPE_LABEL
]:
{
[
TOKEN_TYPE_LABEL
]:
{
[
API_PARAM
]:
{
[
API_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
labelName
'
,
[
NORMAL_FILTER
]:
'
labels
'
,
[
SPECIAL_FILTER
]:
'
labelName
'
,
},
[
OPERATOR_IS_NOT
]:
{
[
NORMAL_FILTER
]:
'
not[labels]
'
,
},
},
},
[
URL_PARAM
]:
{
[
URL_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
label_name[]
'
,
[
NORMAL_FILTER
]:
'
label_name[]
'
,
[
SPECIAL_FILTER
]:
'
label_name[]
'
,
},
},
[
OPERATOR_IS_NOT
]:
{
[
OPERATOR_IS_NOT
]:
{
[
NORMAL_FILTER
]:
'
not[label_name][]
'
,
[
NORMAL_FILTER
]:
'
not[label_name][]
'
,
...
@@ -369,10 +251,8 @@ export const filters = {
...
@@ -369,10 +251,8 @@ export const filters = {
},
},
[
TOKEN_TYPE_MY_REACTION
]:
{
[
TOKEN_TYPE_MY_REACTION
]:
{
[
API_PARAM
]:
{
[
API_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
myReactionEmoji
'
,
[
NORMAL_FILTER
]:
'
my_reaction_emoji
'
,
[
SPECIAL_FILTER
]:
'
myReactionEmoji
'
,
[
SPECIAL_FILTER
]:
'
my_reaction_emoji
'
,
},
},
},
[
URL_PARAM
]:
{
[
URL_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
OPERATOR_IS
]:
{
...
@@ -383,9 +263,7 @@ export const filters = {
...
@@ -383,9 +263,7 @@ export const filters = {
},
},
[
TOKEN_TYPE_CONFIDENTIAL
]:
{
[
TOKEN_TYPE_CONFIDENTIAL
]:
{
[
API_PARAM
]:
{
[
API_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
confidential
'
,
[
NORMAL_FILTER
]:
'
confidential
'
,
},
},
},
[
URL_PARAM
]:
{
[
URL_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
OPERATOR_IS
]:
{
...
@@ -395,33 +273,23 @@ export const filters = {
...
@@ -395,33 +273,23 @@ export const filters = {
},
},
[
TOKEN_TYPE_ITERATION
]:
{
[
TOKEN_TYPE_ITERATION
]:
{
[
API_PARAM
]:
{
[
API_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
iterationId
'
,
[
NORMAL_FILTER
]:
'
iteration_title
'
,
[
SPECIAL_FILTER
]:
'
iterationWildcardId
'
,
[
SPECIAL_FILTER
]:
'
iteration_id
'
,
},
[
OPERATOR_IS_NOT
]:
{
[
NORMAL_FILTER
]:
'
not[iteration_title]
'
,
},
},
},
[
URL_PARAM
]:
{
[
URL_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
iteration_
title
'
,
[
NORMAL_FILTER
]:
'
iteration_
id
'
,
[
SPECIAL_FILTER
]:
'
iteration_id
'
,
[
SPECIAL_FILTER
]:
'
iteration_id
'
,
},
},
[
OPERATOR_IS_NOT
]:
{
[
OPERATOR_IS_NOT
]:
{
[
NORMAL_FILTER
]:
'
not[iteration_
title
]
'
,
[
NORMAL_FILTER
]:
'
not[iteration_
id
]
'
,
},
},
},
},
},
},
[
TOKEN_TYPE_EPIC
]:
{
[
TOKEN_TYPE_EPIC
]:
{
[
API_PARAM
]:
{
[
API_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
epicId
'
,
[
NORMAL_FILTER
]:
'
epic_id
'
,
[
SPECIAL_FILTER
]:
'
epicId
'
,
[
SPECIAL_FILTER
]:
'
epic_id
'
,
},
[
OPERATOR_IS_NOT
]:
{
[
NORMAL_FILTER
]:
'
not[epic_id]
'
,
},
},
},
[
URL_PARAM
]:
{
[
URL_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
OPERATOR_IS
]:
{
...
@@ -435,13 +303,8 @@ export const filters = {
...
@@ -435,13 +303,8 @@ export const filters = {
},
},
[
TOKEN_TYPE_WEIGHT
]:
{
[
TOKEN_TYPE_WEIGHT
]:
{
[
API_PARAM
]:
{
[
API_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
NORMAL_FILTER
]:
'
weight
'
,
[
NORMAL_FILTER
]:
'
weight
'
,
[
SPECIAL_FILTER
]:
'
weight
'
,
[
SPECIAL_FILTER
]:
'
weight
'
,
},
[
OPERATOR_IS_NOT
]:
{
[
NORMAL_FILTER
]:
'
not[weight]
'
,
},
},
},
[
URL_PARAM
]:
{
[
URL_PARAM
]:
{
[
OPERATOR_IS
]:
{
[
OPERATOR_IS
]:
{
...
...
app/assets/javascripts/issues_list/index.js
View file @
fc5f69a0
...
@@ -73,6 +73,13 @@ export function mountIssuesListApp() {
...
@@ -73,6 +73,13 @@ export function mountIssuesListApp() {
return
false
;
return
false
;
}
}
Vue
.
use
(
VueApollo
);
const
defaultClient
=
createDefaultClient
({},
{
assumeImmutableResults
:
true
});
const
apolloProvider
=
new
VueApollo
({
defaultClient
,
});
const
{
const
{
autocompleteAwardEmojisPath
,
autocompleteAwardEmojisPath
,
autocompleteUsersPath
,
autocompleteUsersPath
,
...
@@ -83,7 +90,6 @@ export function mountIssuesListApp() {
...
@@ -83,7 +90,6 @@ export function mountIssuesListApp() {
email
,
email
,
emailsHelpPagePath
,
emailsHelpPagePath
,
emptyStateSvgPath
,
emptyStateSvgPath
,
endpoint
,
exportCsvPath
,
exportCsvPath
,
groupEpicsPath
,
groupEpicsPath
,
hasBlockedIssuesFeature
,
hasBlockedIssuesFeature
,
...
@@ -115,14 +121,13 @@ export function mountIssuesListApp() {
...
@@ -115,14 +121,13 @@ export function mountIssuesListApp() {
el
,
el
,
// Currently does not use Vue Apollo, but need to provide {} for now until the
// Currently does not use Vue Apollo, but need to provide {} for now until the
// issue is fixed upstream in https://github.com/vuejs/vue-apollo/pull/1153
// issue is fixed upstream in https://github.com/vuejs/vue-apollo/pull/1153
apolloProvider
:
{}
,
apolloProvider
,
provide
:
{
provide
:
{
autocompleteAwardEmojisPath
,
autocompleteAwardEmojisPath
,
autocompleteUsersPath
,
autocompleteUsersPath
,
calendarPath
,
calendarPath
,
canBulkUpdate
:
parseBoolean
(
canBulkUpdate
),
canBulkUpdate
:
parseBoolean
(
canBulkUpdate
),
emptyStateSvgPath
,
emptyStateSvgPath
,
endpoint
,
groupEpicsPath
,
groupEpicsPath
,
hasBlockedIssuesFeature
:
parseBoolean
(
hasBlockedIssuesFeature
),
hasBlockedIssuesFeature
:
parseBoolean
(
hasBlockedIssuesFeature
),
hasIssuableHealthStatusFeature
:
parseBoolean
(
hasIssuableHealthStatusFeature
),
hasIssuableHealthStatusFeature
:
parseBoolean
(
hasIssuableHealthStatusFeature
),
...
...
app/assets/javascripts/issues_list/queries/get_issues.query.graphql
0 → 100644
View file @
fc5f69a0
#import "~/graphql_shared/fragments/pageInfo.fragment.graphql"
#import "./issue_info.fragment.graphql"
query
getProjectIssues
(
$projectPath
:
ID
!
$search
:
String
$sort
:
IssueSort
$state
:
IssuableState
$assigneeId
:
String
$authorUsername
:
String
$assigneeUsernames
:
[
String
!]
$milestoneTitle
:
[
String
]
$labelName
:
[
String
]
$not
:
NegatedIssueFilterInput
$beforeCursor
:
String
$afterCursor
:
String
$firstPageSize
:
Int
$lastPageSize
:
Int
)
{
project
(
fullPath
:
$projectPath
)
{
issues
(
search
:
$search
sort
:
$sort
state
:
$state
assigneeId
:
$assigneeId
authorUsername
:
$authorUsername
assigneeUsernames
:
$assigneeUsernames
milestoneTitle
:
$milestoneTitle
labelName
:
$labelName
not
:
$not
before
:
$beforeCursor
after
:
$afterCursor
first
:
$firstPageSize
last
:
$lastPageSize
)
{
count
pageInfo
{
...
PageInfo
}
nodes
{
...
IssueInfo
}
}
}
}
app/assets/javascripts/issues_list/queries/issue_info.fragment.graphql
0 → 100644
View file @
fc5f69a0
fragment
IssueInfo
on
Issue
{
id
iid
closedAt
confidential
createdAt
downvotes
dueDate
humanTimeEstimate
moved
title
updatedAt
upvotes
userDiscussionsCount
webUrl
assignees
{
nodes
{
id
avatarUrl
name
username
webUrl
}
}
author
{
id
avatarUrl
name
username
webUrl
}
labels
{
nodes
{
id
color
title
description
}
}
milestone
{
id
dueDate
startDate
webPath
title
}
taskCompletionStatus
{
completedCount
count
}
}
app/assets/javascripts/issues_list/utils.js
View file @
fc5f69a0
import
{
import
{
API_PARAM
,
BLOCKING_ISSUES_DESC
,
BLOCKING_ISSUES_DESC
,
CREATED_ASC
,
CREATED_ASC
,
CREATED_DESC
,
CREATED_DESC
,
...
@@ -6,29 +7,36 @@ import {
...
@@ -6,29 +7,36 @@ import {
DUE_DATE_DESC
,
DUE_DATE_DESC
,
DUE_DATE_VALUES
,
DUE_DATE_VALUES
,
filters
,
filters
,
LABEL_PRIORITY_ASC
,
LABEL_PRIORITY_DESC
,
LABEL_PRIORITY_DESC
,
MILESTONE_DUE_ASC
,
MILESTONE_DUE_ASC
,
MILESTONE_DUE_DESC
,
MILESTONE_DUE_DESC
,
NORMAL_FILTER
,
NORMAL_FILTER
,
POPULARITY_ASC
,
POPULARITY_ASC
,
POPULARITY_DESC
,
POPULARITY_DESC
,
PRIORITY_ASC
,
PRIORITY_DESC
,
PRIORITY_DESC
,
RELATIVE_POSITION_
DE
SC
,
RELATIVE_POSITION_
A
SC
,
SPECIAL_FILTER
,
SPECIAL_FILTER
,
SPECIAL_FILTER_VALUES
,
SPECIAL_FILTER_VALUES
,
TOKEN_TYPE_ASSIGNEE
,
TOKEN_TYPE_ASSIGNEE
,
TOKEN_TYPE_ITERATION
,
UPDATED_ASC
,
UPDATED_ASC
,
UPDATED_DESC
,
UPDATED_DESC
,
URL_PARAM
,
urlSortParams
,
urlSortParams
,
WEIGHT_ASC
,
WEIGHT_ASC
,
WEIGHT_DESC
,
WEIGHT_DESC
,
}
from
'
~/issues_list/constants
'
;
}
from
'
~/issues_list/constants
'
;
import
{
isPositiveInteger
}
from
'
~/lib/utils/number_utils
'
;
import
{
isPositiveInteger
}
from
'
~/lib/utils/number_utils
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
FILTERED_SEARCH_TERM
}
from
'
~/vue_shared/components/filtered_search_bar/constants
'
;
import
{
FILTERED_SEARCH_TERM
,
OPERATOR_IS_NOT
,
}
from
'
~/vue_shared/components/filtered_search_bar/constants
'
;
export
const
getSortKey
=
(
sort
)
=>
export
const
getSortKey
=
(
sort
)
=>
Object
.
keys
(
urlSortParams
).
find
((
key
)
=>
urlSortParams
[
key
]
.
sort
===
sort
);
Object
.
keys
(
urlSortParams
).
find
((
key
)
=>
urlSortParams
[
key
]
===
sort
);
export
const
getDueDateValue
=
(
value
)
=>
(
DUE_DATE_VALUES
.
includes
(
value
)
?
value
:
undefined
);
export
const
getDueDateValue
=
(
value
)
=>
(
DUE_DATE_VALUES
.
includes
(
value
)
?
value
:
undefined
);
...
@@ -38,7 +46,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
...
@@ -38,7 +46,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
id
:
1
,
id
:
1
,
title
:
__
(
'
Priority
'
),
title
:
__
(
'
Priority
'
),
sortDirection
:
{
sortDirection
:
{
ascending
:
PRIORITY_
DE
SC
,
ascending
:
PRIORITY_
A
SC
,
descending
:
PRIORITY_DESC
,
descending
:
PRIORITY_DESC
,
},
},
},
},
...
@@ -86,7 +94,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
...
@@ -86,7 +94,7 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
id
:
7
,
id
:
7
,
title
:
__
(
'
Label priority
'
),
title
:
__
(
'
Label priority
'
),
sortDirection
:
{
sortDirection
:
{
ascending
:
LABEL_PRIORITY_
DE
SC
,
ascending
:
LABEL_PRIORITY_
A
SC
,
descending
:
LABEL_PRIORITY_DESC
,
descending
:
LABEL_PRIORITY_DESC
,
},
},
},
},
...
@@ -94,8 +102,8 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
...
@@ -94,8 +102,8 @@ export const getSortOptions = (hasIssueWeightsFeature, hasBlockedIssuesFeature)
id
:
8
,
id
:
8
,
title
:
__
(
'
Manual
'
),
title
:
__
(
'
Manual
'
),
sortDirection
:
{
sortDirection
:
{
ascending
:
RELATIVE_POSITION_
DE
SC
,
ascending
:
RELATIVE_POSITION_
A
SC
,
descending
:
RELATIVE_POSITION_
DE
SC
,
descending
:
RELATIVE_POSITION_
A
SC
,
},
},
},
},
];
];
...
@@ -178,12 +186,36 @@ const getFilterType = (data, tokenType = '') =>
...
@@ -178,12 +186,36 @@ const getFilterType = (data, tokenType = '') =>
?
SPECIAL_FILTER
?
SPECIAL_FILTER
:
NORMAL_FILTER
;
:
NORMAL_FILTER
;
export
const
convertToParams
=
(
filterTokens
,
paramType
)
=>
const
isIterationSpecialValue
=
(
tokenType
,
value
)
=>
tokenType
===
TOKEN_TYPE_ITERATION
&&
SPECIAL_FILTER_VALUES
.
includes
(
value
);
export
const
convertToApiParams
=
(
filterTokens
)
=>
{
const
params
=
{};
const
not
=
{};
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
obj
=
token
.
value
.
operator
===
OPERATOR_IS_NOT
?
not
:
params
;
const
data
=
isIterationSpecialValue
(
token
.
type
,
token
.
value
.
data
)
?
token
.
value
.
data
.
toUpperCase
()
:
token
.
value
.
data
;
Object
.
assign
(
obj
,
{
[
field
]:
obj
[
field
]
?
[
obj
[
field
],
data
].
flat
()
:
data
,
});
});
return
Object
.
keys
(
not
).
length
?
Object
.
assign
(
params
,
{
not
})
:
params
;
};
export
const
convertToUrlParams
=
(
filterTokens
)
=>
filterTokens
filterTokens
.
filter
((
token
)
=>
token
.
type
!==
FILTERED_SEARCH_TERM
)
.
filter
((
token
)
=>
token
.
type
!==
FILTERED_SEARCH_TERM
)
.
reduce
((
acc
,
token
)
=>
{
.
reduce
((
acc
,
token
)
=>
{
const
filterType
=
getFilterType
(
token
.
value
.
data
,
token
.
type
);
const
filterType
=
getFilterType
(
token
.
value
.
data
,
token
.
type
);
const
param
=
filters
[
token
.
type
][
paramType
][
token
.
value
.
operator
]?.[
filterType
];
const
param
=
filters
[
token
.
type
][
URL_PARAM
][
token
.
value
.
operator
]?.[
filterType
];
return
Object
.
assign
(
acc
,
{
return
Object
.
assign
(
acc
,
{
[
param
]:
acc
[
param
]
?
[
acc
[
param
],
token
.
value
.
data
].
flat
()
:
token
.
value
.
data
,
[
param
]:
acc
[
param
]
?
[
acc
[
param
],
token
.
value
.
data
].
flat
()
:
token
.
value
.
data
,
});
});
...
...
app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/iteration_token.vue
View file @
fc5f69a0
...
@@ -39,7 +39,7 @@ export default {
...
@@ -39,7 +39,7 @@ export default {
return
this
.
value
.
data
;
return
this
.
value
.
data
;
},
},
activeIteration
()
{
activeIteration
()
{
return
this
.
iterations
.
find
((
iteration
)
=>
iteration
.
title
===
this
.
currentValue
);
return
this
.
iterations
.
find
((
iteration
)
=>
iteration
.
id
===
Number
(
this
.
currentValue
)
);
},
},
},
},
watch
:
{
watch
:
{
...
@@ -99,8 +99,8 @@ export default {
...
@@ -99,8 +99,8 @@ export default {
<template
v-else
>
<template
v-else
>
<gl-filtered-search-suggestion
<gl-filtered-search-suggestion
v-for=
"iteration in iterations"
v-for=
"iteration in iterations"
:key=
"iteration.
title
"
:key=
"iteration.
id
"
:value=
"
iteration.title
"
:value=
"
String(iteration.id)
"
>
>
{{
iteration
.
title
}}
{{
iteration
.
title
}}
</gl-filtered-search-suggestion>
</gl-filtered-search-suggestion>
...
...
app/helpers/issues_helper.rb
View file @
fc5f69a0
...
@@ -190,7 +190,6 @@ module IssuesHelper
...
@@ -190,7 +190,6 @@ module IssuesHelper
email:
current_user
&
.
notification_email
,
email:
current_user
&
.
notification_email
,
emails_help_page_path:
help_page_path
(
'development/emails'
,
anchor:
'email-namespace'
),
emails_help_page_path:
help_page_path
(
'development/emails'
,
anchor:
'email-namespace'
),
empty_state_svg_path:
image_path
(
'illustrations/issues.svg'
),
empty_state_svg_path:
image_path
(
'illustrations/issues.svg'
),
endpoint:
expose_path
(
api_v4_projects_issues_path
(
id:
project
.
id
)),
export_csv_path:
export_csv_project_issues_path
(
project
),
export_csv_path:
export_csv_project_issues_path
(
project
),
has_project_issues:
project_issues
(
project
).
exists?
.
to_s
,
has_project_issues:
project_issues
(
project
).
exists?
.
to_s
,
import_csv_issues_path:
import_csv_namespace_project_issues_path
,
import_csv_issues_path:
import_csv_namespace_project_issues_path
,
...
...
ee/app/assets/javascripts/issues_list/queries/get_issues.query.graphql
0 → 100644
View file @
fc5f69a0
#import "~/graphql_shared/fragments/pageInfo.fragment.graphql"
#import "~/issues_list/queries/issue_info.fragment.graphql"
query
getProjectIssues
(
$projectPath
:
ID
!
$search
:
String
$sort
:
IssueSort
$state
:
IssuableState
$assigneeId
:
String
$authorUsername
:
String
$assigneeUsernames
:
[
String
!]
$milestoneTitle
:
[
String
]
$labelName
:
[
String
]
$iterationId
:
[
ID
]
$iterationWildcardId
:
IterationWildcardId
$epicId
:
String
$weight
:
String
$not
:
NegatedIssueFilterInput
$beforeCursor
:
String
$afterCursor
:
String
$firstPageSize
:
Int
$lastPageSize
:
Int
)
{
project
(
fullPath
:
$projectPath
)
{
issues
(
search
:
$search
sort
:
$sort
state
:
$state
assigneeId
:
$assigneeId
authorUsername
:
$authorUsername
assigneeUsernames
:
$assigneeUsernames
milestoneTitle
:
$milestoneTitle
labelName
:
$labelName
iterationId
:
$iterationId
iterationWildcardId
:
$iterationWildcardId
epicId
:
$epicId
weight
:
$weight
not
:
$not
before
:
$beforeCursor
after
:
$afterCursor
first
:
$firstPageSize
last
:
$lastPageSize
)
{
count
pageInfo
{
...
PageInfo
}
nodes
{
...
IssueInfo
blockedByCount
healthStatus
weight
}
}
}
}
spec/frontend/issues_list/components/issue_card_time_info_spec.js
View file @
fc5f69a0
...
@@ -13,12 +13,10 @@ describe('IssuesListApp component', () => {
...
@@ -13,12 +13,10 @@ describe('IssuesListApp component', () => {
dueDate
:
'
2020-12-17
'
,
dueDate
:
'
2020-12-17
'
,
startDate
:
'
2020-12-10
'
,
startDate
:
'
2020-12-10
'
,
title
:
'
My milestone
'
,
title
:
'
My milestone
'
,
web
Url
:
'
/milestone/webUrl
'
,
web
Path
:
'
/milestone/webPath
'
,
},
},
dueDate
:
'
2020-12-12
'
,
dueDate
:
'
2020-12-12
'
,
timeStats
:
{
humanTimeEstimate
:
'
1w
'
,
humanTimeEstimate
:
'
1w
'
,
},
};
};
const
findMilestone
=
()
=>
wrapper
.
find
(
'
[data-testid="issuable-milestone"]
'
);
const
findMilestone
=
()
=>
wrapper
.
find
(
'
[data-testid="issuable-milestone"]
'
);
...
@@ -56,7 +54,7 @@ describe('IssuesListApp component', () => {
...
@@ -56,7 +54,7 @@ describe('IssuesListApp component', () => {
expect
(
milestone
.
text
()).
toBe
(
issue
.
milestone
.
title
);
expect
(
milestone
.
text
()).
toBe
(
issue
.
milestone
.
title
);
expect
(
milestone
.
find
(
GlIcon
).
props
(
'
name
'
)).
toBe
(
'
clock
'
);
expect
(
milestone
.
find
(
GlIcon
).
props
(
'
name
'
)).
toBe
(
'
clock
'
);
expect
(
milestone
.
find
(
GlLink
).
attributes
(
'
href
'
)).
toBe
(
issue
.
milestone
.
web
Url
);
expect
(
milestone
.
find
(
GlLink
).
attributes
(
'
href
'
)).
toBe
(
issue
.
milestone
.
web
Path
);
});
});
describe
.
each
`
describe
.
each
`
...
@@ -102,7 +100,7 @@ describe('IssuesListApp component', () => {
...
@@ -102,7 +100,7 @@ describe('IssuesListApp component', () => {
const
timeEstimate
=
wrapper
.
find
(
'
[data-testid="time-estimate"]
'
);
const
timeEstimate
=
wrapper
.
find
(
'
[data-testid="time-estimate"]
'
);
expect
(
timeEstimate
.
text
()).
toBe
(
issue
.
timeStats
.
humanTimeEstimate
);
expect
(
timeEstimate
.
text
()).
toBe
(
issue
.
humanTimeEstimate
);
expect
(
timeEstimate
.
attributes
(
'
title
'
)).
toBe
(
'
Estimate
'
);
expect
(
timeEstimate
.
attributes
(
'
title
'
)).
toBe
(
'
Estimate
'
);
expect
(
timeEstimate
.
find
(
GlIcon
).
props
(
'
name
'
)).
toBe
(
'
timer
'
);
expect
(
timeEstimate
.
find
(
GlIcon
).
props
(
'
name
'
)).
toBe
(
'
timer
'
);
});
});
...
...
spec/frontend/issues_list/components/issues_list_app_spec.js
View file @
fc5f69a0
This diff is collapsed.
Click to expand it.
spec/frontend/issues_list/mock_data.js
View file @
fc5f69a0
...
@@ -3,6 +3,76 @@ import {
...
@@ -3,6 +3,76 @@ import {
OPERATOR_IS_NOT
,
OPERATOR_IS_NOT
,
}
from
'
~/vue_shared/components/filtered_search_bar/constants
'
;
}
from
'
~/vue_shared/components/filtered_search_bar/constants
'
;
export
const
getIssuesQueryResponse
=
{
data
:
{
project
:
{
issues
:
{
count
:
1
,
pageInfo
:
{
hasNextPage
:
false
,
hasPreviousPage
:
false
,
startCursor
:
'
startcursor
'
,
endCursor
:
'
endcursor
'
,
},
nodes
:
[
{
id
:
'
gid://gitlab/Issue/123456
'
,
iid
:
'
789
'
,
blockedByCount
:
1
,
closedAt
:
null
,
confidential
:
false
,
createdAt
:
'
2021-05-22T04:08:01Z
'
,
downvotes
:
2
,
dueDate
:
'
2021-05-29
'
,
healthStatus
:
null
,
humanTimeEstimate
:
null
,
moved
:
false
,
title
:
'
Issue title
'
,
updatedAt
:
'
2021-05-22T04:08:01Z
'
,
upvotes
:
3
,
userDiscussionsCount
:
4
,
webUrl
:
'
project/-/issues/789
'
,
weight
:
5
,
assignees
:
{
nodes
:
[
{
id
:
'
gid://gitlab/User/234
'
,
avatarUrl
:
'
avatar/url
'
,
name
:
'
Marge Simpson
'
,
username
:
'
msimpson
'
,
webUrl
:
'
url/msimpson
'
,
},
],
},
author
:
{
id
:
'
gid://gitlab/User/456
'
,
avatarUrl
:
'
avatar/url
'
,
name
:
'
Homer Simpson
'
,
username
:
'
hsimpson
'
,
webUrl
:
'
url/hsimpson
'
,
},
labels
:
{
nodes
:
[
{
id
:
'
gid://gitlab/ProjectLabel/456
'
,
color
:
'
#333
'
,
title
:
'
Label title
'
,
description
:
'
Label description
'
,
},
],
},
milestone
:
null
,
taskCompletionStatus
:
{
completedCount
:
1
,
count
:
2
,
},
},
],
},
},
},
};
export
const
locationSearch
=
[
export
const
locationSearch
=
[
'
?search=find+issues
'
,
'
?search=find+issues
'
,
'
author_username=homer
'
,
'
author_username=homer
'
,
...
@@ -19,8 +89,8 @@ export const locationSearch = [
...
@@ -19,8 +89,8 @@ export const locationSearch = [
'
not[label_name][]=drama
'
,
'
not[label_name][]=drama
'
,
'
my_reaction_emoji=thumbsup
'
,
'
my_reaction_emoji=thumbsup
'
,
'
confidential=no
'
,
'
confidential=no
'
,
'
iteration_
title=season:+%23
4
'
,
'
iteration_
id=
4
'
,
'
not[iteration_
title]=season:+%23
20
'
,
'
not[iteration_
id]=
20
'
,
'
epic_id=gitlab-org%3A%3A%2612
'
,
'
epic_id=gitlab-org%3A%3A%2612
'
,
'
not[epic_id]=gitlab-org%3A%3A%2634
'
,
'
not[epic_id]=gitlab-org%3A%3A%2634
'
,
'
weight=1
'
,
'
weight=1
'
,
...
@@ -51,8 +121,8 @@ export const filteredTokens = [
...
@@ -51,8 +121,8 @@ export const filteredTokens = [
{
type
:
'
labels
'
,
value
:
{
data
:
'
drama
'
,
operator
:
OPERATOR_IS_NOT
}
},
{
type
:
'
labels
'
,
value
:
{
data
:
'
drama
'
,
operator
:
OPERATOR_IS_NOT
}
},
{
type
:
'
my_reaction_emoji
'
,
value
:
{
data
:
'
thumbsup
'
,
operator
:
OPERATOR_IS
}
},
{
type
:
'
my_reaction_emoji
'
,
value
:
{
data
:
'
thumbsup
'
,
operator
:
OPERATOR_IS
}
},
{
type
:
'
confidential
'
,
value
:
{
data
:
'
no
'
,
operator
:
OPERATOR_IS
}
},
{
type
:
'
confidential
'
,
value
:
{
data
:
'
no
'
,
operator
:
OPERATOR_IS
}
},
{
type
:
'
iteration
'
,
value
:
{
data
:
'
season: #
4
'
,
operator
:
OPERATOR_IS
}
},
{
type
:
'
iteration
'
,
value
:
{
data
:
'
4
'
,
operator
:
OPERATOR_IS
}
},
{
type
:
'
iteration
'
,
value
:
{
data
:
'
season: #
20
'
,
operator
:
OPERATOR_IS_NOT
}
},
{
type
:
'
iteration
'
,
value
:
{
data
:
'
20
'
,
operator
:
OPERATOR_IS_NOT
}
},
{
type
:
'
epic_id
'
,
value
:
{
data
:
'
gitlab-org::&12
'
,
operator
:
OPERATOR_IS
}
},
{
type
:
'
epic_id
'
,
value
:
{
data
:
'
gitlab-org::&12
'
,
operator
:
OPERATOR_IS
}
},
{
type
:
'
epic_id
'
,
value
:
{
data
:
'
gitlab-org::&34
'
,
operator
:
OPERATOR_IS_NOT
}
},
{
type
:
'
epic_id
'
,
value
:
{
data
:
'
gitlab-org::&34
'
,
operator
:
OPERATOR_IS_NOT
}
},
{
type
:
'
weight
'
,
value
:
{
data
:
'
1
'
,
operator
:
OPERATOR_IS
}
},
{
type
:
'
weight
'
,
value
:
{
data
:
'
1
'
,
operator
:
OPERATOR_IS
}
},
...
@@ -71,30 +141,32 @@ export const filteredTokensWithSpecialValues = [
...
@@ -71,30 +141,32 @@ export const filteredTokensWithSpecialValues = [
];
];
export
const
apiParams
=
{
export
const
apiParams
=
{
author_username
:
'
homer
'
,
authorUsername
:
'
homer
'
,
'
not[author_username]
'
:
'
marge
'
,
assigneeUsernames
:
[
'
bart
'
,
'
lisa
'
],
assignee_username
:
[
'
bart
'
,
'
lisa
'
],
milestoneTitle
:
'
season 4
'
,
'
not[assignee_username]
'
:
[
'
patty
'
,
'
selma
'
],
labelName
:
[
'
cartoon
'
,
'
tv
'
],
milestone
:
'
season 4
'
,
myReactionEmoji
:
'
thumbsup
'
,
'
not[milestone]
'
:
'
season 20
'
,
labels
:
[
'
cartoon
'
,
'
tv
'
],
'
not[labels]
'
:
[
'
live action
'
,
'
drama
'
],
my_reaction_emoji
:
'
thumbsup
'
,
confidential
:
'
no
'
,
confidential
:
'
no
'
,
iteration_title
:
'
season: #4
'
,
iterationId
:
'
4
'
,
'
not[iteration_title]
'
:
'
season: #20
'
,
epicId
:
'
gitlab-org::&12
'
,
epic_id
:
'
12
'
,
'
not[epic_id]
'
:
'
gitlab-org::&34
'
,
weight
:
'
1
'
,
weight
:
'
1
'
,
'
not[weight]
'
:
'
3
'
,
not
:
{
authorUsername
:
'
marge
'
,
assigneeUsernames
:
[
'
patty
'
,
'
selma
'
],
milestoneTitle
:
'
season 20
'
,
labelName
:
[
'
live action
'
,
'
drama
'
],
iterationId
:
'
20
'
,
epicId
:
'
gitlab-org::&34
'
,
weight
:
'
3
'
,
},
};
};
export
const
apiParamsWithSpecialValues
=
{
export
const
apiParamsWithSpecialValues
=
{
assignee
_i
d
:
'
123
'
,
assignee
I
d
:
'
123
'
,
assignee
_username
:
'
bart
'
,
assignee
Usernames
:
'
bart
'
,
my
_reaction_e
moji
:
'
None
'
,
my
ReactionE
moji
:
'
None
'
,
iteration
_id
:
'
Current
'
,
iteration
WildcardId
:
'
CURRENT
'
,
epic
_i
d
:
'
None
'
,
epic
I
d
:
'
None
'
,
weight
:
'
None
'
,
weight
:
'
None
'
,
};
};
...
@@ -109,8 +181,8 @@ export const urlParams = {
...
@@ -109,8 +181,8 @@ export const urlParams = {
'
not[label_name][]
'
:
[
'
live action
'
,
'
drama
'
],
'
not[label_name][]
'
:
[
'
live action
'
,
'
drama
'
],
my_reaction_emoji
:
'
thumbsup
'
,
my_reaction_emoji
:
'
thumbsup
'
,
confidential
:
'
no
'
,
confidential
:
'
no
'
,
iteration_
title
:
'
season: #
4
'
,
iteration_
id
:
'
4
'
,
'
not[iteration_
title]
'
:
'
season: #
20
'
,
'
not[iteration_
id]
'
:
'
20
'
,
epic_id
:
'
gitlab-org%3A%3A%2612
'
,
epic_id
:
'
gitlab-org%3A%3A%2612
'
,
'
not[epic_id]
'
:
'
gitlab-org::&34
'
,
'
not[epic_id]
'
:
'
gitlab-org::&34
'
,
weight
:
'
1
'
,
weight
:
'
1
'
,
...
...
spec/frontend/issues_list/utils_spec.js
View file @
fc5f69a0
...
@@ -8,19 +8,20 @@ import {
...
@@ -8,19 +8,20 @@ import {
urlParams
,
urlParams
,
urlParamsWithSpecialValues
,
urlParamsWithSpecialValues
,
}
from
'
jest/issues_list/mock_data
'
;
}
from
'
jest/issues_list/mock_data
'
;
import
{
API_PARAM
,
DUE_DATE_VALUES
,
URL_PARAM
,
urlSortParams
}
from
'
~/issues_list/constants
'
;
import
{
DUE_DATE_VALUES
,
urlSortParams
}
from
'
~/issues_list/constants
'
;
import
{
import
{
convertToParams
,
convertTo
Url
Params
,
convertToSearchQuery
,
convertToSearchQuery
,
getDueDateValue
,
getDueDateValue
,
getFilterTokens
,
getFilterTokens
,
getSortKey
,
getSortKey
,
getSortOptions
,
getSortOptions
,
convertToApiParams
,
}
from
'
~/issues_list/utils
'
;
}
from
'
~/issues_list/utils
'
;
describe
(
'
getSortKey
'
,
()
=>
{
describe
(
'
getSortKey
'
,
()
=>
{
it
.
each
(
Object
.
keys
(
urlSortParams
))(
'
returns %s given the correct inputs
'
,
(
sortKey
)
=>
{
it
.
each
(
Object
.
keys
(
urlSortParams
))(
'
returns %s given the correct inputs
'
,
(
sortKey
)
=>
{
const
{
sort
}
=
urlSortParams
[
sortKey
];
const
sort
=
urlSortParams
[
sortKey
];
expect
(
getSortKey
(
sort
)).
toBe
(
sortKey
);
expect
(
getSortKey
(
sort
)).
toBe
(
sortKey
);
});
});
});
});
...
@@ -80,31 +81,26 @@ describe('getFilterTokens', () => {
...
@@ -80,31 +81,26 @@ describe('getFilterTokens', () => {
});
});
});
});
describe
(
'
convertToParams
'
,
()
=>
{
describe
(
'
convertTo
Api
Params
'
,
()
=>
{
it
(
'
returns api params given filtered tokens
'
,
()
=>
{
it
(
'
returns api params given filtered tokens
'
,
()
=>
{
expect
(
convertToParams
(
filteredTokens
,
API_PARAM
)).
toEqual
({
expect
(
convertToApiParams
(
filteredTokens
)).
toEqual
(
apiParams
);
...
apiParams
,
epic_id
:
'
gitlab-org::&12
'
,
});
});
});
it
(
'
returns api params given filtered tokens with special values
'
,
()
=>
{
it
(
'
returns api params given filtered tokens with special values
'
,
()
=>
{
expect
(
convertToParams
(
filteredTokensWithSpecialValues
,
API_PARAM
)).
toEqual
(
expect
(
convertToApiParams
(
filteredTokensWithSpecialValues
)).
toEqual
(
apiParamsWithSpecialValues
);
apiParamsWithSpecialValues
,
);
});
});
});
describe
(
'
convertToUrlParams
'
,
()
=>
{
it
(
'
returns url params given filtered tokens
'
,
()
=>
{
it
(
'
returns url params given filtered tokens
'
,
()
=>
{
expect
(
convertTo
Params
(
filteredTokens
,
URL_PARAM
)).
toEqual
({
expect
(
convertTo
UrlParams
(
filteredTokens
)).
toEqual
({
...
urlParams
,
...
urlParams
,
epic_id
:
'
gitlab-org::&12
'
,
epic_id
:
'
gitlab-org::&12
'
,
});
});
});
});
it
(
'
returns url params given filtered tokens with special values
'
,
()
=>
{
it
(
'
returns url params given filtered tokens with special values
'
,
()
=>
{
expect
(
convertToParams
(
filteredTokensWithSpecialValues
,
URL_PARAM
)).
toEqual
(
expect
(
convertToUrlParams
(
filteredTokensWithSpecialValues
)).
toEqual
(
urlParamsWithSpecialValues
);
urlParamsWithSpecialValues
,
);
});
});
});
});
...
...
spec/helpers/issues_helper_spec.rb
View file @
fc5f69a0
...
@@ -302,7 +302,6 @@ RSpec.describe IssuesHelper do
...
@@ -302,7 +302,6 @@ RSpec.describe IssuesHelper do
email:
current_user
&
.
notification_email
,
email:
current_user
&
.
notification_email
,
emails_help_page_path:
help_page_path
(
'development/emails'
,
anchor:
'email-namespace'
),
emails_help_page_path:
help_page_path
(
'development/emails'
,
anchor:
'email-namespace'
),
empty_state_svg_path:
'#'
,
empty_state_svg_path:
'#'
,
endpoint:
expose_path
(
api_v4_projects_issues_path
(
id:
project
.
id
)),
export_csv_path:
export_csv_project_issues_path
(
project
),
export_csv_path:
export_csv_project_issues_path
(
project
),
has_project_issues:
project_issues
(
project
).
exists?
.
to_s
,
has_project_issues:
project_issues
(
project
).
exists?
.
to_s
,
import_csv_issues_path:
'#'
,
import_csv_issues_path:
'#'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment