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
292a36c8
Commit
292a36c8
authored
Oct 12, 2020
by
Angelo Gulina
Committed by
Martin Wortschack
Oct 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tooltip for pipeline actions
parent
d63a0234
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
2 deletions
+52
-2
app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table_row.vue
...pelines/components/pipelines_list/pipelines_table_row.vue
+16
-2
changelogs/unreleased/222511-missing-tooltip-for-redeploy.yml
...gelogs/unreleased/222511-missing-tooltip-for-redeploy.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+5
-0
spec/frontend/pipelines/pipelines_table_spec.js
spec/frontend/pipelines/pipelines_table_spec.js
+26
-0
No files found.
app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table_row.vue
View file @
292a36c8
<
script
>
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
eventHub
from
'
../../event_hub
'
;
import
{
__
}
from
'
~/locale
'
;
import
PipelinesActionsComponent
from
'
./pipelines_actions.vue
'
;
import
PipelinesArtifactsComponent
from
'
./pipelines_artifacts.vue
'
;
import
CiBadge
from
'
~/vue_shared/components/ci_badge_link.vue
'
;
...
...
@@ -17,6 +18,13 @@ import { PIPELINES_TABLE } from '../../constants';
* Given the received object renders a table row in the pipelines' table.
*/
export
default
{
i18n
:
{
cancelTitle
:
__
(
'
Cancel
'
),
redeployTitle
:
__
(
'
Pipelines|Retry
'
),
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
components
:
{
PipelinesActionsComponent
,
PipelinesArtifactsComponent
,
...
...
@@ -342,8 +350,11 @@ export default {
<gl-button
v-if=
"pipeline.flags.retryable"
:loading=
"isRetrying"
v-gl-tooltip
.
hover
:aria-label=
"$options.i18n.redeployTitle"
:title=
"$options.i18n.redeployTitle"
:disabled=
"isRetrying"
:loading=
"isRetrying"
class=
"js-pipelines-retry-button btn-retry"
data-qa-selector=
"pipeline_retry_button"
icon=
"repeat"
...
...
@@ -354,6 +365,9 @@ export default {
<gl-button
v-if=
"pipeline.flags.cancelable"
v-gl-tooltip
.
hover
:aria-label=
"$options.i18n.cancelTitle"
:title=
"$options.i18n.cancelTitle"
:loading=
"isCancelling"
:disabled=
"isCancelling"
data-toggle=
"modal"
...
...
changelogs/unreleased/222511-missing-tooltip-for-redeploy.yml
0 → 100644
View file @
292a36c8
---
title
:
Add tooltip for pipeline actions
merge_request
:
44317
author
:
type
:
fixed
locale/gitlab.pot
View file @
292a36c8
...
...
@@ -8,6 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-12 08:34+0200\n"
"PO-Revision-Date: 2020-10-12 08:34+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
...
...
@@ -18995,6 +18997,9 @@ msgstr ""
msgid "Pipelines|Project cache successfully reset."
msgstr ""
msgid "Pipelines|Retry"
msgstr ""
msgid "Pipelines|Revoke"
msgstr ""
...
...
spec/frontend/pipelines/pipelines_table_spec.js
View file @
292a36c8
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
mount
}
from
'
@vue/test-utils
'
;
import
PipelinesTable
from
'
~/pipelines/components/pipelines_list/pipelines_table.vue
'
;
...
...
@@ -19,6 +20,7 @@ describe('Pipelines Table', () => {
});
};
const
findRows
=
()
=>
wrapper
.
findAll
(
'
.commit.gl-responsive-table-row
'
);
const
findGlButtons
=
()
=>
wrapper
.
findAll
(
GlButton
);
preloadFixtures
(
jsonFixtureName
);
...
...
@@ -63,4 +65,28 @@ describe('Pipelines Table', () => {
expect
(
findRows
()).
toHaveLength
(
1
);
});
});
describe
(
'
pipline actions
'
,
()
=>
{
it
(
'
should set the "Re-deploy" title
'
,
()
=>
{
const
pipelines
=
[{
...
pipeline
,
flags
:
{
cancelable
:
false
,
retryable
:
true
}
}];
createComponent
({
...
defaultProps
,
pipelines
});
expect
(
findGlButtons
().
length
).
toBe
(
1
);
expect
(
findGlButtons
()
.
at
(
0
)
.
attributes
(
'
title
'
),
).
toMatch
(
'
Retry
'
);
});
it
(
'
should set the "Cancel" title
'
,
()
=>
{
const
pipelines
=
[{
...
pipeline
,
flags
:
{
cancelable
:
true
,
retryable
:
false
}
}];
createComponent
({
...
defaultProps
,
pipelines
});
expect
(
findGlButtons
().
length
).
toBe
(
1
);
expect
(
findGlButtons
()
.
at
(
0
)
.
attributes
(
'
title
'
),
).
toMatch
(
'
Cancel
'
);
});
});
});
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