Skip to content

Commit b0eba88

Browse files
Revert "feat(demo-mode): analytics (#89720)"
This reverts commit fcc4460. Co-authored-by: obostjancic <86684834+obostjancic@users.noreply.github.com>
1 parent 33246e5 commit b0eba88

File tree

5 files changed

+35
-71
lines changed

5 files changed

+35
-71
lines changed

src/sentry/demo_mode/utils.py

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from sentry import options
44
from sentry.models.organization import Organization
5-
from sentry.organizations.services.organization import organization_service
65
from sentry.users.models.user import User
76

87
READONLY_SCOPES = frozenset(
@@ -42,29 +41,15 @@ def get_demo_org():
4241
if not is_demo_mode_enabled():
4342
return None
4443

45-
demo_orgs = options.get("demo-mode.orgs")
46-
47-
if demo_orgs is None or len(demo_orgs) == 0:
48-
return None
49-
50-
org_id = demo_orgs[0]
51-
52-
return organization_service.get_org_by_id(
53-
id=org_id,
54-
)
44+
org_id = options.get("demo-mode.orgs")[0]
45+
return Organization.objects.get(id=org_id)
5546

5647

5748
def get_demo_user():
5849
if not is_demo_mode_enabled():
5950
return None
6051

61-
demo_users = options.get("demo-mode.users")
62-
63-
if demo_users is None or len(demo_users) == 0:
64-
return None
65-
66-
user_id = demo_users[0]
67-
52+
user_id = options.get("demo-mode.users")[0]
6853
return User.objects.get(id=user_id)
6954

7055

src/sentry/templates/sentry/layout.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
{% load sentry_features %}
55
{% load sentry_helpers %}
66
{% load sentry_status %}
7-
{% load sentry_demo_mode %}
87
{% get_sentry_version %}
98
<!DOCTYPE html>
109
<html lang="en">
@@ -71,9 +70,6 @@
7170
{% asset_url 'sentry' 'js/ads.js' as asset_url %}
7271
{% script src=asset_url crossorigin="anonymous" %}{% endscript %}
7372
{% endblock %}
74-
75-
{% init_demo_analytics %}
76-
7773
</head>
7874

7975

src/sentry/templatetags/sentry_demo_mode.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

static/app/utils/demoMode/utils.tsx

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import * as Sentry from '@sentry/react';
2+
13
import {setForceHide} from 'sentry/actionCreators/guides';
24
import {demoSignupModal} from 'sentry/actionCreators/modal';
35
import type {Client} from 'sentry/api';
@@ -23,6 +25,7 @@ export function initDemoMode(api: Client) {
2325
if (!isDemoModeActive()) {
2426
return;
2527
}
28+
initDemoAnalytics();
2629
captureEmail(api);
2730
}
2831

@@ -54,3 +57,31 @@ async function captureEmail(api: Client) {
5457
setForceHide(false);
5558
}
5659
}
60+
61+
function initDemoAnalytics() {
62+
if (!isDemoModeActive()) {
63+
return;
64+
}
65+
66+
if (document.getElementById('plausible-script')) {
67+
return;
68+
}
69+
70+
try {
71+
const mainScript = document.createElement('script');
72+
mainScript.id = 'plausible-script';
73+
mainScript.defer = true;
74+
mainScript.setAttribute('data-domain', window.location.hostname);
75+
mainScript.src = 'https://plausible.io/js/script.pageview-props.tagged-events.js';
76+
77+
const queueScript = document.createElement('script');
78+
queueScript.id = 'plausible-queue-script';
79+
queueScript.textContent =
80+
'window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }';
81+
82+
document.head.appendChild(mainScript);
83+
document.head.appendChild(queueScript);
84+
} catch (error) {
85+
Sentry.captureException(error);
86+
}
87+
}

tests/sentry/demo_mode/test_utils.py

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,6 @@ def test_get_demo_user_demo_mode_disabled():
7979
assert get_demo_user() is None
8080

8181

82-
@override_options({"demo-mode.enabled": True, "demo-mode.users": None})
83-
@django_db_all
84-
def test_get_demo_user_demo_mode_enabled_users_none():
85-
assert get_demo_user() is None
86-
87-
88-
@override_options({"demo-mode.enabled": True, "demo-mode.users": []})
89-
@django_db_all
90-
def test_get_demo_user_demo_mode_enabled_users_empty():
91-
assert get_demo_user() is None
92-
93-
9482
@override_options({"demo-mode.enabled": True, "demo-mode.users": [1]})
9583
@django_db_all
9684
def test_get_demo_user_demo_mode_enabled():
@@ -110,20 +98,6 @@ def test_get_demo_org_demo_mode_disabled():
11098
@django_db_all
11199
def test_get_demo_org_demo_mode_enabled():
112100
org = Factories.create_organization(id=1)
113-
with patch(
114-
"sentry.demo_mode.utils.organization_service.get_org_by_id", return_value=org
115-
) as mock_org_get:
101+
with patch("sentry.demo_mode.utils.Organization.objects.get", return_value=org) as mock_org_get:
116102
assert get_demo_org() == org
117103
mock_org_get.assert_called_once_with(id=1)
118-
119-
120-
@override_options({"demo-mode.enabled": True, "demo-mode.orgs": []})
121-
@django_db_all
122-
def test_get_demo_org_demo_mode_enabled_not_set():
123-
assert get_demo_org() is None
124-
125-
126-
@override_options({"demo-mode.enabled": True, "demo-mode.orgs": None})
127-
@django_db_all
128-
def test_get_demo_org_demo_mode_enabled_orgs_none():
129-
assert get_demo_org() is None

0 commit comments

Comments
 (0)