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
141ecbee
Commit
141ecbee
authored
Oct 22, 2020
by
amandakhughes
Committed by
Dheeraj Joshi
Oct 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated cycle analytics button to use glbutton
parent
5639d043
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
12 deletions
+21
-12
ee/app/assets/javascripts/analytics/cycle_analytics/components/custom_stage_form.vue
...nalytics/cycle_analytics/components/custom_stage_form.vue
+13
-8
ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/custom_stage_form_spec.js.snap
...s/components/__snapshots__/custom_stage_form_spec.js.snap
+8
-4
No files found.
ee/app/assets/javascripts/analytics/cycle_analytics/components/custom_stage_form.vue
View file @
141ecbee
...
@@ -10,6 +10,7 @@ import {
...
@@ -10,6 +10,7 @@ import {
GlDropdownSectionHeader
,
GlDropdownSectionHeader
,
GlDropdownItem
,
GlDropdownItem
,
GlSprintf
,
GlSprintf
,
GlButton
,
}
from
'
@gitlab/ui
'
;
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
convertObjectPropsToSnakeCase
}
from
'
~/lib/utils/common_utils
'
;
import
{
convertObjectPropsToSnakeCase
}
from
'
~/lib/utils/common_utils
'
;
...
@@ -80,6 +81,7 @@ export default {
...
@@ -80,6 +81,7 @@ export default {
GlDropdownSectionHeader
,
GlDropdownSectionHeader
,
GlDropdownItem
,
GlDropdownItem
,
GlSprintf
,
GlSprintf
,
GlButton
,
},
},
props
:
{
props
:
{
events
:
{
events
:
{
...
@@ -363,23 +365,26 @@ export default {
...
@@ -363,23 +365,26 @@ export default {
</div>
</div>
</div>
</div>
<div
class=
"custom-stage-form-actions"
>
<div
class=
"custom-stage-form-actions"
>
<button
<
gl-
button
:disabled=
"!isDirty"
:disabled=
"!isDirty"
class=
"btn btn-cancel js-save-stage-cancel"
category=
"primary"
type=
"button"
class=
"js-save-stage-cancel"
type=
"gl-button"
@
click=
"handleCancel"
@
click=
"handleCancel"
>
>
{{ __('Cancel') }}
{{ __('Cancel') }}
</button>
</
gl-
button>
<button
<
gl-
button
:disabled=
"!isComplete || !isDirty"
:disabled=
"!isComplete || !isDirty"
type=
"button"
variant=
"success"
class=
"js-save-stage btn btn-success"
category=
"primary"
class=
"js-save-stage"
type=
"gl-button"
@
click=
"handleSave"
@
click=
"handleSave"
>
>
<gl-loading-icon
v-if=
"isSavingCustomStage"
size=
"sm"
inline
/>
<gl-loading-icon
v-if=
"isSavingCustomStage"
size=
"sm"
inline
/>
{{ saveStageText }}
{{ saveStageText }}
</button>
</
gl-
button>
</div>
</div>
<div
class=
"mt-2"
>
<div
class=
"mt-2"
>
<gl-sprintf
<gl-sprintf
...
...
ee/spec/frontend/analytics/cycle_analytics/components/__snapshots__/custom_stage_form_spec.js.snap
View file @
141ecbee
// Jest Snapshot v1, https://goo.gl/fbAQLP
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`CustomStageForm Editing a custom stage isSavingCustomStage=true displays a loading icon 1`] = `
exports[`CustomStageForm Editing a custom stage isSavingCustomStage=true displays a loading icon 1`] = `
"<button disabled=\\"disabled\\" type=\\"button\\" class=\\"js-save-stage btn btn-success\\"><span class=\\"gl-spinner-container\\"><span aria-label=\\"Loading\\" class=\\"align-text-bottom gl-spinner gl-spinner-orange gl-spinner-sm\\"></span></span>
"<button type=\\"gl-button\\" disabled=\\"disabled\\" class=\\"btn js-save-stage btn-success btn-md disabled gl-button\\">
<!---->
<!----> <span class=\\"gl-button-text\\"><span class=\\"gl-spinner-container\\"><span aria-label=\\"Loading\\" class=\\"align-text-bottom gl-spinner gl-spinner-orange gl-spinner-sm\\"></span></span>
Update stage
Update stage
</button>"
</span>
</button>"
`;
`;
exports[`CustomStageForm isSavingCustomStage=true displays a loading icon 1`] = `
exports[`CustomStageForm isSavingCustomStage=true displays a loading icon 1`] = `
"<button disabled=\\"disabled\\" type=\\"button\\" class=\\"js-save-stage btn btn-success\\"><span class=\\"gl-spinner-container\\"><span aria-label=\\"Loading\\" class=\\"align-text-bottom gl-spinner gl-spinner-orange gl-spinner-sm\\"></span></span>
"<button type=\\"gl-button\\" disabled=\\"disabled\\" class=\\"btn js-save-stage btn-success btn-md disabled gl-button\\">
<!---->
<!----> <span class=\\"gl-button-text\\"><span class=\\"gl-spinner-container\\"><span aria-label=\\"Loading\\" class=\\"align-text-bottom gl-spinner gl-spinner-orange gl-spinner-sm\\"></span></span>
Add stage
Add stage
</button>"
</span>
</button>"
`;
`;
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