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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
3945e181
Commit
3945e181
authored
May 01, 2019
by
Enrique Alcantara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE-backport track uninstall button clicks
parent
f9875875
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
4 deletions
+26
-4
app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue
...s/components/uninstall_application_confirmation_modal.vue
+9
-1
app/assets/javascripts/clusters/mixins/track_uninstall_button_click.js
...vascripts/clusters/mixins/track_uninstall_button_click.js
+5
-0
spec/frontend/clusters/components/uninstall_application_confirmation_modal_spec.js
...mponents/uninstall_application_confirmation_modal_spec.js
+12
-3
No files found.
app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue
View file @
3945e181
<
script
>
<
script
>
import
{
GlModal
}
from
'
@gitlab/ui
'
;
import
{
GlModal
}
from
'
@gitlab/ui
'
;
import
{
sprintf
,
s__
}
from
'
~/locale
'
;
import
{
sprintf
,
s__
}
from
'
~/locale
'
;
import
trackUninstallButtonClickMixin
from
'
ee_else_ce/clusters/mixins/track_uninstall_button_click
'
;
import
{
INGRESS
,
CERT_MANAGER
,
PROMETHEUS
,
RUNNER
,
KNATIVE
,
JUPYTER
}
from
'
../constants
'
;
import
{
INGRESS
,
CERT_MANAGER
,
PROMETHEUS
,
RUNNER
,
KNATIVE
,
JUPYTER
}
from
'
../constants
'
;
const
CUSTOM_APP_WARNING_TEXT
=
{
const
CUSTOM_APP_WARNING_TEXT
=
{
...
@@ -20,6 +21,7 @@ export default {
...
@@ -20,6 +21,7 @@ export default {
components
:
{
components
:
{
GlModal
,
GlModal
,
},
},
mixins
:
[
trackUninstallButtonClickMixin
],
props
:
{
props
:
{
application
:
{
application
:
{
type
:
String
,
type
:
String
,
...
@@ -51,6 +53,12 @@ export default {
...
@@ -51,6 +53,12 @@ export default {
return
`uninstall-
${
this
.
application
}
`
;
return
`uninstall-
${
this
.
application
}
`
;
},
},
},
},
methods
:
{
confirmUninstall
()
{
this
.
trackUninstallButtonClick
(
this
.
application
);
this
.
$emit
(
'
confirm
'
);
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
@@ -60,7 +68,7 @@ export default {
...
@@ -60,7 +68,7 @@ export default {
:ok-title=
"title"
:ok-title=
"title"
:modal-id=
"modalId"
:modal-id=
"modalId"
:title=
"title"
:title=
"title"
@
ok=
"
$emit('confirm'
)"
@
ok=
"
confirmUninstall(
)"
>
{{
warningText
}}
{{
customAppWarningText
}}
</gl-modal
>
{{
warningText
}}
{{
customAppWarningText
}}
</gl-modal
>
>
</
template
>
</
template
>
app/assets/javascripts/clusters/mixins/track_uninstall_button_click.js
0 → 100644
View file @
3945e181
export
default
{
methods
:
{
trackUninstallButtonClick
:
()
=>
{},
},
};
spec/frontend/clusters/components/uninstall_application_confirmation_modal_spec.js
View file @
3945e181
...
@@ -29,12 +29,21 @@ describe('UninstallApplicationConfirmationModal', () => {
...
@@ -29,12 +29,21 @@ describe('UninstallApplicationConfirmationModal', () => {
expect
(
wrapper
.
find
(
GlModal
).
attributes
(
'
ok-title
'
)).
toEqual
(
`Uninstall
${
appTitle
}
`
);
expect
(
wrapper
.
find
(
GlModal
).
attributes
(
'
ok-title
'
)).
toEqual
(
`Uninstall
${
appTitle
}
`
);
});
});
it
(
'
triggers confirm event when ok button is clicked
'
,
()
=>
{
describe
(
'
when ok button is clicked
'
,
()
=>
{
beforeEach
(()
=>
{
jest
.
spyOn
(
wrapper
.
vm
,
'
trackUninstallButtonClick
'
);
wrapper
.
find
(
GlModal
).
vm
.
$emit
(
'
ok
'
);
wrapper
.
find
(
GlModal
).
vm
.
$emit
(
'
ok
'
);
});
it
(
'
emits confirm event
'
,
()
=>
{
expect
(
wrapper
.
emitted
(
'
confirm
'
)).
toBeTruthy
();
expect
(
wrapper
.
emitted
(
'
confirm
'
)).
toBeTruthy
();
});
});
it
(
'
calls track uninstall button click mixin
'
,
()
=>
{
expect
(
wrapper
.
vm
.
trackUninstallButtonClick
).
toHaveBeenCalledWith
(
INGRESS
);
});
});
it
(
'
displays a warning text indicating the app will be uninstalled
'
,
()
=>
{
it
(
'
displays a warning text indicating the app will be uninstalled
'
,
()
=>
{
expect
(
wrapper
.
text
()).
toContain
(
`You are about to uninstall
${
appTitle
}
from your cluster.`
);
expect
(
wrapper
.
text
()).
toContain
(
`You are about to uninstall
${
appTitle
}
from your cluster.`
);
});
});
...
...
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