Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/sentry/features/temporary.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
manager.add("organizations:detailed-data-for-seer", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
# Enable GenAI features such as Autofix and Issue Summary
manager.add("organizations:autofix-seer-preferences", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
# Enables Chonk UI
manager.add("organizations:chonk-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
# Enables Chonk UI
manager.add("organizations:chonk-ui-enforce", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
# Enables Route Preloading
manager.add("organizations:route-intent-preloading", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
# Enables Chonk UI Feedback button
manager.add("organizations:chonk-ui-feedback", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
# Enable Prevent AI code review to run per commit
manager.add("organizations:code-review-run-per-commit", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
# Enabled for orgs that participated in the code review beta
Expand Down
18 changes: 0 additions & 18 deletions src/sentry/templates/sentry/partial/loader.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{% load sentry_assets sentry_helpers %}

{% if prefers_chonk_ui %}
<div class="splash-loader">
<div class="loading-mask"></div>

Expand Down Expand Up @@ -133,20 +132,3 @@
</script>
</div>
</div>

{% else %}

<div class="loading triangle">
<div class="loading-mask"></div>

<div class="loading-indicator" data-test-id="loading-indicator">
<img src="{% asset_url 'sentry' 'images/sentry-loader.svg' %}">
</div>

<div class="loading-message">
<p>{% loading_message %}</p>
<p><small>You may need to disable adblocking extensions to load Sentry.</small></p>
</div>
</div>

{% endif %}
2 changes: 0 additions & 2 deletions src/sentry/users/api/endpoints/user_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ class UserOptionsSerializer(serializers.Serializer[UserOption]):
required=False,
)
prefersIssueDetailsStreamlinedUI = serializers.BooleanField(required=False)
prefersChonkUI = serializers.BooleanField(required=False)


class BaseUserSerializer(CamelSnakeModelSerializer[User]):
Expand Down Expand Up @@ -304,7 +303,6 @@ def put(self, request: Request, user: User) -> Response:
"defaultIssueEvent": "default_issue_event",
"clock24Hours": "clock_24_hours",
"prefersIssueDetailsStreamlinedUI": "prefers_issue_details_streamlined_ui",
"prefersChonkUI": "prefers_chonk_ui",
}

options_result = serializer_options.validated_data
Expand Down
2 changes: 0 additions & 2 deletions src/sentry/users/api/serializers/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ class _UserOptions(TypedDict):
timezone: str
clock24Hours: bool
prefersIssueDetailsStreamlinedUI: bool | None
prefersChonkUI: bool | None


class UserSerializerResponseOptional(TypedDict, total=False):
Expand Down Expand Up @@ -215,7 +214,6 @@ def serialize(
"prefersIssueDetailsStreamlinedUI": options.get(
"prefers_issue_details_streamlined_ui"
),
"prefersChonkUI": options.get("prefers_chonk_ui"),
}

d["flags"] = {"newsletter_consent_prompt": bool(obj.flags.newsletter_consent_prompt)}
Comment on lines 214 to 219

This comment was marked as outdated.

Expand Down
2 changes: 0 additions & 2 deletions src/sentry/users/models/user_option.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@ class UserOption(Model):
- unused
- prefers_issue_details_streamlined_ui
- Whether the user prefers the new issue details experience (boolean)
- prefers_chonk_ui
- Whether the user prefers the new Chonk UI experience (boolean)
- language
- which language to display the app in
- mail:email
Expand Down
13 changes: 0 additions & 13 deletions src/sentry/web/frontend/react_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,6 @@ def handle_react(
):
user_theme = f"theme-{react_config['user']['options']['theme']}"

prefers_chonk_ui = False
if organization is not None and features.has("organizations:chonk-ui", organization):
if features.has("organizations:chonk-ui-enforce", organization):
prefers_chonk_ui = True

if (
prefers_chonk_ui is False
and react_config.get("user", None)
and react_config["user"].get("options", {}).get("prefersChonkUI", False)
):
prefers_chonk_ui = react_config["user"]["options"]["prefersChonkUI"]

context = {
"CSRF_COOKIE_NAME": settings.CSRF_COOKIE_NAME,
"meta_tags": [
Expand All @@ -127,7 +115,6 @@ def handle_react(
"org_context": org_context,
"react_config": react_config,
"user_theme": user_theme,
"prefers_chonk_ui": prefers_chonk_ui,
}

# Force a new CSRF token to be generated and set in user's
Expand Down
3 changes: 0 additions & 3 deletions tests/sentry/users/api/endpoints/test_user_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ def test_lookup_self(self) -> None:
assert resp.data["options"]["stacktraceOrder"] == int(StacktraceOrder.DEFAULT)
assert not resp.data["options"]["clock24Hours"]
assert not resp.data["options"]["prefersIssueDetailsStreamlinedUI"]
assert not resp.data["options"]["prefersChonkUI"]

def test_superuser_simple(self) -> None:
self.login_as(user=self.superuser, superuser=True)
Expand Down Expand Up @@ -120,7 +119,6 @@ def test_simple(self) -> None:
"clock24Hours": True,
"extra": True,
"prefersIssueDetailsStreamlinedUI": True,
"prefersChonkUI": True,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only frontend change which will be removed once the dependent PR is merged

},
)

Expand All @@ -143,7 +141,6 @@ def test_simple(self) -> None:
assert UserOption.objects.get_value(
user=self.user, key="prefers_issue_details_streamlined_ui"
)
assert UserOption.objects.get_value(user=self.user, key="prefers_chonk_ui")

assert not UserOption.objects.get_value(user=self.user, key="extra")

Expand Down
57 changes: 0 additions & 57 deletions tests/sentry/web/frontend/test_react_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,60 +452,3 @@ def test_preconnect(self) -> None:
'<link rel="preconnect" href="https://s1.sentry-cdn.com"'
in response_body.decode("utf-8")
)

def test_prefers_chonk_ui_enforced(self) -> None:
user = self.create_user("[email protected]")
org = self.create_organization(owner=user)
self.login_as(user)

with self.feature(
{
"organizations:chonk-ui": [org.slug],
"organizations:chonk-ui-enforce": [org.slug],
}
):
response = self.client.get("/issues/", HTTP_HOST=f"{org.slug}.testserver")
assert response.status_code == 200
assert response.context["prefers_chonk_ui"] is True

def test_prefers_chonk_ui_user_preference(self) -> None:
from sentry.users.models.user_option import UserOption

user = self.create_user("[email protected]")
org = self.create_organization(owner=user)
self.login_as(user)

UserOption.objects.set_value(user=user, key="prefers_chonk_ui", value=True)

with self.feature({"organizations:chonk-ui": [org.slug]}):
response = self.client.get("/issues/", HTTP_HOST=f"{org.slug}.testserver")
assert response.status_code == 200
assert response.context["prefers_chonk_ui"] is True

def test_prefers_chonk_ui_disabled(self) -> None:
user = self.create_user("[email protected]")
org = self.create_organization(owner=user)
self.login_as(user)

response = self.client.get("/issues/", HTTP_HOST=f"{org.slug}.testserver")
assert response.status_code == 200
assert response.context["prefers_chonk_ui"] is False

def test_prefers_chonk_ui_enforce_overrides_user_preference(self) -> None:
from sentry.users.models.user_option import UserOption

user = self.create_user("[email protected]")
org = self.create_organization(owner=user)
self.login_as(user)

UserOption.objects.set_value(user=user, key="prefers_chonk_ui", value=False)

with self.feature(
{
"organizations:chonk-ui": [org.slug],
"organizations:chonk-ui-enforce": [org.slug],
}
):
response = self.client.get("/issues/", HTTP_HOST=f"{org.slug}.testserver")
assert response.status_code == 200
assert response.context["prefers_chonk_ui"] is True
Loading