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
069959ac
Commit
069959ac
authored
Jul 21, 2021
by
Kev
Committed by
Olena Horal-Koretska
Jul 21, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove extra margin above issue navigation tabs
Changelog: fixed
parent
9a049aac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
10 deletions
+20
-10
app/assets/javascripts/issues_list/components/jira_issues_import_status_app.vue
.../issues_list/components/jira_issues_import_status_app.vue
+4
-4
app/assets/javascripts/issues_list/index.js
app/assets/javascripts/issues_list/index.js
+12
-4
spec/frontend/issues_list/components/jira_issues_import_status_app_spec.js
...ues_list/components/jira_issues_import_status_app_spec.js
+4
-2
No files found.
app/assets/javascripts/issues_list/components/jira_issues_import_status_app.vue
View file @
069959ac
...
...
@@ -59,9 +59,6 @@ export default {
shouldShowInProgressAlert
:
isInProgress
(
project
.
jiraImportStatus
),
};
},
skip
()
{
return
!
this
.
isJiraConfigured
||
!
this
.
canEdit
;
},
},
},
computed
:
{
...
...
@@ -75,6 +72,9 @@ export default {
labelTarget
()
{
return
`
${
this
.
issuesPath
}
?label_name[]=
${
encodeURIComponent
(
this
.
jiraImport
.
label
.
title
)}
`
;
},
shouldRender
()
{
return
this
.
jiraImport
.
shouldShowInProgressAlert
||
this
.
jiraImport
.
shouldShowFinishedAlert
;
},
},
methods
:
{
hideFinishedAlert
()
{
...
...
@@ -89,7 +89,7 @@ export default {
</
script
>
<
template
>
<div
class=
"gl-my-5"
>
<div
v-if=
"shouldRender"
class=
"gl-my-5"
>
<gl-alert
v-if=
"jiraImport.shouldShowInProgressAlert"
@
dismiss=
"hideInProgressAlert"
>
{{
__
(
'
Import in progress. Refresh page to see newly added issues.
'
)
}}
</gl-alert>
...
...
app/assets/javascripts/issues_list/index.js
View file @
069959ac
...
...
@@ -13,6 +13,14 @@ export function mountJiraIssuesListApp() {
return
false
;
}
const
{
issuesPath
,
projectPath
}
=
el
.
dataset
;
const
canEdit
=
parseBoolean
(
el
.
dataset
.
canEdit
);
const
isJiraConfigured
=
parseBoolean
(
el
.
dataset
.
isJiraConfigured
);
if
(
!
isJiraConfigured
||
!
canEdit
)
{
return
false
;
}
Vue
.
use
(
VueApollo
);
const
defaultClient
=
createDefaultClient
();
...
...
@@ -26,10 +34,10 @@ export function mountJiraIssuesListApp() {
render
(
createComponent
)
{
return
createComponent
(
JiraIssuesImportStatusRoot
,
{
props
:
{
canEdit
:
parseBoolean
(
el
.
dataset
.
canEdit
)
,
isJiraConfigured
:
parseBoolean
(
el
.
dataset
.
isJiraConfigured
)
,
issuesPath
:
el
.
dataset
.
issuesPath
,
projectPath
:
el
.
dataset
.
projectPath
,
canEdit
,
isJiraConfigured
,
issuesPath
,
projectPath
,
},
});
},
...
...
spec/frontend/issues_list/components/jira_issues_import_status_app_spec.js
View file @
069959ac
...
...
@@ -43,10 +43,12 @@ describe('JiraIssuesImportStatus', () => {
wrapper
=
null
;
});
describe
(
'
when Jira import is n
ot in progress
'
,
()
=>
{
it
(
'
does not show an alert
'
,
()
=>
{
describe
(
'
when Jira import is n
either in progress nor finished
'
,
()
=>
{
beforeEach
(
()
=>
{
wrapper
=
mountComponent
();
});
it
(
'
does not show an alert
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlAlert
).
exists
()).
toBe
(
false
);
});
});
...
...
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