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
0cedbce3
Commit
0cedbce3
authored
Oct 22, 2021
by
Alper Akgun
Committed by
Kushal Pandya
Oct 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tracking for hand raise lead modal
parent
111a131a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
170 additions
and
16 deletions
+170
-16
ee/app/assets/javascripts/hand_raise_leads/hand_raise_lead/components/hand_raise_lead_button.vue
...ads/hand_raise_lead/components/hand_raise_lead_button.vue
+11
-0
ee/config/events/groups__billings_controller_hand_raise_form_canceled.yml
.../groups__billings_controller_hand_raise_form_canceled.yml
+23
-0
ee/config/events/groups__billings_controller_hand_raise_form_viewed.yml
...ts/groups__billings_controller_hand_raise_form_viewed.yml
+23
-0
ee/config/events/groups__billings_controller_hand_raise_submit_form_failed.yml
...ps__billings_controller_hand_raise_submit_form_failed.yml
+23
-0
ee/config/events/groups__billings_controller_hand_raise_submit_form_succeeded.yml
..._billings_controller_hand_raise_submit_form_succeeded.yml
+23
-0
ee/spec/frontend/hand_raise_leads/components/hand_raise_lead_button_spec.js
...and_raise_leads/components/hand_raise_lead_button_spec.js
+67
-16
No files found.
ee/app/assets/javascripts/hand_raise_leads/hand_raise_lead/components/hand_raise_lead_button.vue
View file @
0cedbce3
...
@@ -11,6 +11,7 @@ import {
...
@@ -11,6 +11,7 @@ import {
import
*
as
SubscriptionsApi
from
'
ee/api/subscriptions_api
'
;
import
*
as
SubscriptionsApi
from
'
ee/api/subscriptions_api
'
;
import
createFlash
,
{
FLASH_TYPES
}
from
'
~/flash
'
;
import
createFlash
,
{
FLASH_TYPES
}
from
'
~/flash
'
;
import
{
sprintf
}
from
'
~/locale
'
;
import
{
sprintf
}
from
'
~/locale
'
;
import
Tracking
from
'
~/tracking
'
;
import
countriesQuery
from
'
ee/subscriptions/graphql/queries/countries.query.graphql
'
;
import
countriesQuery
from
'
ee/subscriptions/graphql/queries/countries.query.graphql
'
;
import
statesQuery
from
'
ee/subscriptions/graphql/queries/states.query.graphql
'
;
import
statesQuery
from
'
ee/subscriptions/graphql/queries/states.query.graphql
'
;
import
autofocusonshow
from
'
~/vue_shared/directives/autofocusonshow
'
;
import
autofocusonshow
from
'
~/vue_shared/directives/autofocusonshow
'
;
...
@@ -30,6 +31,7 @@ export default {
...
@@ -30,6 +31,7 @@ export default {
GlModal
:
GlModalDirective
,
GlModal
:
GlModalDirective
,
autofocusonshow
,
autofocusonshow
,
},
},
mixins
:
[
Tracking
.
mixin
()],
props
:
{
props
:
{
namespaceId
:
{
namespaceId
:
{
type
:
Number
,
type
:
Number
,
...
@@ -102,6 +104,11 @@ export default {
...
@@ -102,6 +104,11 @@ export default {
text
:
this
.
$options
.
i18n
.
modalCancel
,
text
:
this
.
$options
.
i18n
.
modalCancel
,
};
};
},
},
tracking
()
{
return
{
label
:
'
hand_raise_lead_form
'
,
};
},
showState
()
{
showState
()
{
return
!
this
.
$apollo
.
loading
.
states
&&
this
.
states
&&
this
.
country
&&
this
.
mustEnterState
;
return
!
this
.
$apollo
.
loading
.
states
&&
this
.
states
&&
this
.
country
&&
this
.
mustEnterState
;
},
},
...
@@ -167,6 +174,7 @@ export default {
...
@@ -167,6 +174,7 @@ export default {
type
:
FLASH_TYPES
.
SUCCESS
,
type
:
FLASH_TYPES
.
SUCCESS
,
});
});
this
.
clearForm
();
this
.
clearForm
();
this
.
track
(
'
hand_raise_submit_form_succeeded
'
);
})
})
.
catch
((
error
)
=>
{
.
catch
((
error
)
=>
{
createFlash
({
createFlash
({
...
@@ -174,6 +182,7 @@ export default {
...
@@ -174,6 +182,7 @@ export default {
captureError
:
true
,
captureError
:
true
,
error
,
error
,
});
});
this
.
track
(
'
hand_raise_submit_form_failed
'
);
})
})
.
finally
(()
=>
{
.
finally
(()
=>
{
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
...
@@ -202,6 +211,8 @@ export default {
...
@@ -202,6 +211,8 @@ export default {
:action-primary=
"actionPrimary"
:action-primary=
"actionPrimary"
:action-cancel=
"actionCancel"
:action-cancel=
"actionCancel"
@
primary=
"submit"
@
primary=
"submit"
@
cancel=
"track('hand_raise_form_canceled')"
@
change=
"track('hand_raise_form_viewed')"
>
>
{{
modalHeaderText
}}
{{
modalHeaderText
}}
<div
class=
"combined d-flex gl-mt-5"
>
<div
class=
"combined d-flex gl-mt-5"
>
...
...
ee/config/events/groups__billings_controller_hand_raise_form_canceled.yml
0 → 100644
View file @
0cedbce3
---
description
:
Hand raise form cancelled
category
:
default
action
:
hand_raise_form_canceled
label_description
:
hand_raise_lead_form
property_description
:
value_description
:
extra_properties
:
identifiers
:
#- project
#- user
#- namespace
product_section
:
dev
product_stage
:
fulfillment
product_group
:
group::conversion
product_category
:
billing
milestone
:
"
14.5"
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72725
distributions
:
-
ee
tiers
:
-
premium
-
ultimate
ee/config/events/groups__billings_controller_hand_raise_form_viewed.yml
0 → 100644
View file @
0cedbce3
---
description
:
Hand raise form viewed
category
:
default
action
:
hand_raise_form_viewed
label_description
:
hand_raise_lead_form
property_description
:
value_description
:
extra_properties
:
identifiers
:
#- project
#- user
#- namespace
product_section
:
dev
product_stage
:
fulfillment
product_group
:
group::conversion
product_category
:
billing
milestone
:
"
14.5"
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72725
distributions
:
-
ee
tiers
:
-
premium
-
ultimate
ee/config/events/groups__billings_controller_hand_raise_submit_form_failed.yml
0 → 100644
View file @
0cedbce3
---
description
:
Hand raise submit form failed
category
:
default
action
:
hand_raise_submit_form_failed
label_description
:
hand_raise_lead_form
property_description
:
value_description
:
extra_properties
:
identifiers
:
#- project
#- user
#- namespace
product_section
:
dev
product_stage
:
fulfillment
product_group
:
group::conversion
product_category
:
billing
milestone
:
"
14.5"
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72725
distributions
:
-
ee
tiers
:
-
premium
-
ultimate
ee/config/events/groups__billings_controller_hand_raise_submit_form_succeeded.yml
0 → 100644
View file @
0cedbce3
---
description
:
Hand raise submit form succeeded
category
:
default
action
:
hand_raise_submit_form_succeeded
label_description
:
hand_raise_lead_form
property_description
:
value_description
:
extra_properties
:
identifiers
:
#- project
#- user
#- namespace
product_section
:
dev
product_stage
:
fulfillment
product_group
:
group::conversion
product_category
:
billing
milestone
:
"
14.5"
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72725
distributions
:
-
ee
tiers
:
-
premium
-
ultimate
ee/spec/frontend/hand_raise_leads/components/hand_raise_lead_button_spec.js
View file @
0cedbce3
...
@@ -4,6 +4,7 @@ import VueApollo from 'vue-apollo';
...
@@ -4,6 +4,7 @@ import VueApollo from 'vue-apollo';
import
{
sprintf
}
from
'
~/locale
'
;
import
{
sprintf
}
from
'
~/locale
'
;
import
{
shallowMountExtended
}
from
'
helpers/vue_test_utils_helper
'
;
import
{
shallowMountExtended
}
from
'
helpers/vue_test_utils_helper
'
;
import
createMockApollo
from
'
helpers/mock_apollo_helper
'
;
import
createMockApollo
from
'
helpers/mock_apollo_helper
'
;
import
{
mockTracking
}
from
'
helpers/tracking_helper
'
;
import
HandRaiseLeadButton
from
'
ee/hand_raise_leads/hand_raise_lead/components/hand_raise_lead_button.vue
'
;
import
HandRaiseLeadButton
from
'
ee/hand_raise_leads/hand_raise_lead/components/hand_raise_lead_button.vue
'
;
import
{
i18n
}
from
'
ee/hand_raise_leads/hand_raise_lead/constants
'
;
import
{
i18n
}
from
'
ee/hand_raise_leads/hand_raise_lead/constants
'
;
import
*
as
SubscriptionsApi
from
'
ee/api/subscriptions_api
'
;
import
*
as
SubscriptionsApi
from
'
ee/api/subscriptions_api
'
;
...
@@ -15,6 +16,7 @@ localVue.use(VueApollo);
...
@@ -15,6 +16,7 @@ localVue.use(VueApollo);
describe
(
'
HandRaiseLeadButton
'
,
()
=>
{
describe
(
'
HandRaiseLeadButton
'
,
()
=>
{
let
wrapper
;
let
wrapper
;
let
fakeApollo
;
let
fakeApollo
;
let
trackingSpy
;
const
createComponent
=
(
props
=
{})
=>
{
const
createComponent
=
(
props
=
{})
=>
{
const
mockResolvers
=
{
const
mockResolvers
=
{
...
@@ -52,6 +54,7 @@ describe('HandRaiseLeadButton', () => {
...
@@ -52,6 +54,7 @@ describe('HandRaiseLeadButton', () => {
describe
(
'
rendering
'
,
()
=>
{
describe
(
'
rendering
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
wrapper
=
createComponent
();
wrapper
=
createComponent
();
trackingSpy
=
mockTracking
(
undefined
,
wrapper
.
element
,
jest
.
spyOn
);
});
});
it
(
'
does not have loading icon
'
,
()
=>
{
it
(
'
does not have loading icon
'
,
()
=>
{
...
@@ -91,6 +94,14 @@ describe('HandRaiseLeadButton', () => {
...
@@ -91,6 +94,14 @@ describe('HandRaiseLeadButton', () => {
text
:
i18n
.
modalCancel
,
text
:
i18n
.
modalCancel
,
});
});
});
});
it
(
'
tracks modal view
'
,
async
()
=>
{
await
findModal
().
vm
.
$emit
(
'
change
'
);
expect
(
trackingSpy
).
toHaveBeenCalledWith
(
undefined
,
'
hand_raise_form_viewed
'
,
{
label
:
'
hand_raise_lead_form
'
,
});
});
});
});
describe
(
'
submit button
'
,
()
=>
{
describe
(
'
submit button
'
,
()
=>
{
...
@@ -129,32 +140,72 @@ describe('HandRaiseLeadButton', () => {
...
@@ -129,32 +140,72 @@ describe('HandRaiseLeadButton', () => {
});
});
});
});
describe
(
'
form
submission
'
,
()
=>
{
describe
(
'
form
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(
async
()
=>
{
wrapper
=
createComponent
();
wrapper
=
createComponent
();
trackingSpy
=
mockTracking
(
undefined
,
wrapper
.
element
,
jest
.
spyOn
);
wrapper
.
setData
({
countries
,
states
,
country
:
'
US
'
,
...
formData
,
comment
:
'
comment
'
});
});
});
it
(
'
primary submits the valid form
'
,
async
()
=>
{
describe
(
'
successful submission
'
,
()
=>
{
jest
.
spyOn
(
SubscriptionsApi
,
'
sendHandRaiseLead
'
).
mockResolvedValue
(
1
);
beforeEach
(
async
()
=>
{
jest
.
spyOn
(
SubscriptionsApi
,
'
sendHandRaiseLead
'
).
mockResolvedValue
();
wrapper
.
setData
({
countries
,
states
,
country
:
'
US
'
,
...
formData
,
comment
:
'
comment
'
});
findModal
().
vm
.
$emit
(
'
primary
'
);
});
await
wrapper
.
vm
.
$nextTick
();
it
(
'
primary submits the valid form
'
,
async
()
=>
{
expect
(
SubscriptionsApi
.
sendHandRaiseLead
).
toHaveBeenCalledWith
({
namespaceId
:
1
,
comment
:
'
comment
'
,
...
formData
,
});
});
findModal
().
vm
.
$emit
(
'
primary
'
);
it
(
'
clears the form after submission
'
,
async
()
=>
{
[
'
first-name
'
,
'
last-name
'
,
'
company-name
'
,
'
phone-number
'
].
forEach
((
f
)
=>
expect
(
wrapper
.
findByTestId
(
f
).
attributes
(
'
value
'
)).
toBe
(
''
),
);
await
wrapper
.
vm
.
$nextTick
();
[
'
company-size
'
,
'
country
'
].
forEach
((
f
)
=>
expect
(
wrapper
.
findByTestId
(
f
).
attributes
(
'
value
'
)).
toBe
(
undefined
),
);
expect
(
SubscriptionsApi
.
sendHandRaiseLead
).
toHaveBeenCalledWith
({
expect
(
wrapper
.
findByTestId
(
'
state
'
).
exists
()).
toBe
(
false
);
namespaceId
:
1
,
comment
:
'
comment
'
,
...
formData
,
});
});
[
'
firstName
'
,
'
lastName
'
,
'
companyName
'
,
'
phoneNumber
'
].
forEach
((
f
)
=>
it
(
'
tracks successful submission
'
,
async
()
=>
{
expect
(
wrapper
.
vm
[
f
]).
toBe
(
''
),
expect
(
trackingSpy
).
toHaveBeenCalledWith
(
undefined
,
'
hand_raise_submit_form_succeeded
'
,
{
);
label
:
'
hand_raise_lead_form
'
,
[
'
companySize
'
,
'
country
'
,
'
state
'
].
forEach
((
f
)
=>
expect
(
wrapper
.
vm
[
f
]).
toBe
(
null
));
});
});
});
describe
(
'
failed submission
'
,
()
=>
{
beforeEach
(
async
()
=>
{
jest
.
spyOn
(
SubscriptionsApi
,
'
sendHandRaiseLead
'
).
mockRejectedValue
();
findModal
().
vm
.
$emit
(
'
primary
'
);
});
it
(
'
tracks failed submission
'
,
async
()
=>
{
expect
(
trackingSpy
).
toHaveBeenCalledWith
(
undefined
,
'
hand_raise_submit_form_failed
'
,
{
label
:
'
hand_raise_lead_form
'
,
});
});
});
describe
(
'
form cancel
'
,
()
=>
{
beforeEach
(
async
()
=>
{
findModal
().
vm
.
$emit
(
'
cancel
'
);
});
it
(
'
tracks failed submission
'
,
async
()
=>
{
expect
(
trackingSpy
).
toHaveBeenCalledWith
(
undefined
,
'
hand_raise_form_canceled
'
,
{
label
:
'
hand_raise_lead_form
'
,
});
});
});
});
});
});
});
});
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