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
4fba6a57
Commit
4fba6a57
authored
Apr 28, 2021
by
Tom Quirk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify jira issues root logic
parent
6a368c33
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
43 deletions
+46
-43
app/assets/javascripts/issuable_list/components/issuable_list_root.vue
...vascripts/issuable_list/components/issuable_list_root.vue
+40
-37
ee/app/assets/javascripts/integrations/jira/issues_list/components/jira_issues_list_root.vue
...ons/jira/issues_list/components/jira_issues_list_root.vue
+5
-5
ee/spec/frontend/integrations/jira/issues_list/components/jira_issues_list_root_spec.js
...jira/issues_list/components/jira_issues_list_root_spec.js
+1
-1
No files found.
app/assets/javascripts/issuable_list/components/issuable_list_root.vue
View file @
4fba6a57
...
...
@@ -274,44 +274,47 @@ export default {
<gl-skeleton-loading
/>
</li>
</ul>
<component
:is=
"issuablesWrapper"
v-if=
"!issuablesLoading && issuables.length"
class=
"content-list issuable-list issues-list"
:class=
"{ 'manual-ordering': isManualOrdering }"
v-bind=
"$options.vueDraggableAttributes"
@
update=
"handleVueDraggableUpdate"
>
<issuable-item
v-for=
"issuable in issuables"
:key=
"issuableId(issuable)"
:class=
"{ 'gl-cursor-grab': isManualOrdering }"
:issuable-symbol=
"issuableSymbol"
:issuable=
"issuable"
:enable-label-permalinks=
"enableLabelPermalinks"
:label-filter-param=
"labelFilterParam"
:show-checkbox=
"showBulkEditSidebar"
:checked=
"issuableChecked(issuable)"
@
checked-input=
"handleIssuableCheckedInput(issuable, $event)"
<
template
v-else
>
<component
:is=
"issuablesWrapper"
v-if=
"issuables.length > 0"
class=
"content-list issuable-list issues-list"
:class=
"
{ 'manual-ordering': isManualOrdering }"
v-bind="$options.vueDraggableAttributes"
@update="handleVueDraggableUpdate"
>
<
template
#reference
>
<slot
name=
"reference"
:issuable=
"issuable"
></slot>
</
template
>
<
template
#author
>
<slot
name=
"author"
:author=
"issuable.author"
></slot>
</
template
>
<
template
#timeframe
>
<slot
name=
"timeframe"
:issuable=
"issuable"
></slot>
</
template
>
<
template
#status
>
<slot
name=
"status"
:issuable=
"issuable"
></slot>
</
template
>
<
template
#statistics
>
<slot
name=
"statistics"
:issuable=
"issuable"
></slot>
</
template
>
</issuable-item>
</component>
<slot
v-if=
"!issuablesLoading && !issuables.length"
name=
"empty-state"
></slot>
<issuable-item
v-for=
"issuable in issuables"
:key=
"issuableId(issuable)"
:class=
"
{ 'gl-cursor-grab': isManualOrdering }"
:issuable-symbol="issuableSymbol"
:issuable="issuable"
:enable-label-permalinks="enableLabelPermalinks"
:label-filter-param="labelFilterParam"
:show-checkbox="showBulkEditSidebar"
:checked="issuableChecked(issuable)"
@checked-input="handleIssuableCheckedInput(issuable, $event)"
>
<template
#reference
>
<slot
name=
"reference"
:issuable=
"issuable"
></slot>
</
template
>
<
template
#author
>
<slot
name=
"author"
:author=
"issuable.author"
></slot>
</
template
>
<
template
#timeframe
>
<slot
name=
"timeframe"
:issuable=
"issuable"
></slot>
</
template
>
<
template
#status
>
<slot
name=
"status"
:issuable=
"issuable"
></slot>
</
template
>
<
template
#statistics
>
<slot
name=
"statistics"
:issuable=
"issuable"
></slot>
</
template
>
</issuable-item>
</component>
<slot
v-else
name=
"empty-state"
></slot>
</template>
<gl-pagination
v-if=
"showPaginationControls"
:per-page=
"defaultPageSize"
...
...
ee/app/assets/javascripts/integrations/jira/issues_list/components/jira_issues_list_root.vue
View file @
4fba6a57
...
...
@@ -51,7 +51,7 @@ export default {
return
{
jiraLogo
,
issues
:
[],
issuesListLoading
:
fals
e
,
issuesListLoading
:
tru
e
,
issuesListLoadFailed
:
false
,
totalIssues
:
0
,
currentState
:
this
.
initialState
,
...
...
@@ -206,19 +206,19 @@ export default {
</
template
>
<
template
#reference=
"{ issuable }"
>
<span
v-safe-html=
"jiraLogo"
class=
"svg-container jira-logo-container"
></span>
<span>
{{
issuable
.
references
.
relative
}}
</span>
<span
v-if=
"issuable"
>
{{
issuable
.
references
.
relative
}}
</span>
</
template
>
<
template
#author=
"{ author }"
>
<gl-sprintf
message=
"%
{authorName} in Jira">
<template
#authorName
>
<gl-link
class=
"author-link js-user-link"
target=
"_blank"
:href=
"author.webUrl"
>
{{
author
.
name
}}
<gl-link
class=
"author-link js-user-link"
target=
"_blank"
:href=
"author.webUrl"
>
{{
author
.
name
}}
</gl-link>
</
template
>
</gl-sprintf>
</template>
<
template
#status=
"{ issuable }"
>
{{
issuable
.
status
}}
<template
v-if=
"issuable"
>
{{
issuable
.
status
}}
</
template
>
</template>
<
template
#empty-state
>
<jira-issues-list-empty-state
...
...
ee/spec/frontend/integrations/jira/issues_list/components/jira_issues_list_root_spec.js
View file @
4fba6a57
...
...
@@ -120,7 +120,7 @@ describe('JiraIssuesListRoot', () => {
describe
(
'
when request fails
'
,
()
=>
{
it
.
each
`
APIErrorMessage | expectedRenderedErrorMessage
${
'
API error
'
}
|
${
'
A
PI error
'
}
${
'
API error
'
}
|
${
'
A
n error occurred while loading issues
'
}
${
undefined
}
|
${
'
An error occurred while loading issues
'
}
`
(
'
calls `createFlash` with "$expectedRenderedErrorMessage" when API responds with "$APIErrorMessage"
'
,
...
...
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