[pull] master from getsentry:master

.pre-commit-config.yaml

@@ -100,7 +100,7 @@ repos:
       - id: format
         name: format
         language: system
-        types_or: [yaml, ts, tsx, javascript, jsx, css, mdx, markdown]
+        types_or: [yaml, ts, tsx, javascript, jsx, css, mdx, markdown, json]
         entry: ./node_modules/.bin/oxfmt
 
       - id: knip

eslint.config.ts

@@ -310,8 +310,6 @@ export default typescript.config([
     rules: {
       'array-callback-return': 'error',
       'block-scoped-var': 'error',
-      'consistent-return': 'error',
-      'default-case': 'error',
       'dot-notation': 'error',
       eqeqeq: 'error',
       'guard-for-in': 'off', // TODO(ryan953): Fix violations and enable this rule
@@ -604,6 +602,10 @@ export default typescript.config([
           '@typescript-eslint/no-for-in-array': 'error',
           '@typescript-eslint/no-unnecessary-template-expression': 'error',
           '@typescript-eslint/no-unnecessary-type-assertion': 'error',
+          '@typescript-eslint/switch-exhaustiveness-check': [
+            'error',
+            {considerDefaultExhaustiveForUnions: true},
+          ],
           '@typescript-eslint/only-throw-error': 'error',
           '@typescript-eslint/prefer-optional-chain': 'error',
           '@typescript-eslint/prefer-promise-reject-errors': 'error',

migrations_lockfile.txt

@@ -31,7 +31,7 @@ replays: 0007_organizationmember_replay_access
 
 seer: 0005_delete_seerorganizationsettings
 
-sentry: 1057_drop_legacy_alert_rule_tables
+sentry: 1058_change_code_mapping_unique_constraint
 
 social_auth: 0003_social_auth_json_field
 

package.json

@@ -123,8 +123,8 @@
     "@swc/plugin-emotion": "14.3.0",
     "@tanstack/query-async-storage-persister": "5.83.1",
     "@tanstack/react-devtools": "0.9.9",
-    "@tanstack/react-form": "^1.28.0",
-    "@tanstack/react-form-devtools": "0.2.17",
+    "@tanstack/react-form": "1.28.6",
+    "@tanstack/react-form-devtools": "0.2.20",
     "@tanstack/react-pacer": "^0.17.0",
     "@tanstack/react-pacer-devtools": "0.5.3",
     "@tanstack/react-query": "5.85.0",
@@ -264,8 +264,8 @@
     "eslint-plugin-no-relative-import-paths": "^1.6.1",
     "eslint-plugin-react": "7.37.5",
     "eslint-plugin-react-hooks": "6.1.0",
-    "eslint-plugin-regexp": "^3.0.0",
     "eslint-plugin-react-you-might-not-need-an-effect": "0.5.3",
+    "eslint-plugin-regexp": "^3.0.0",
     "eslint-plugin-sentry": "^2.10.0",
     "eslint-plugin-testing-library": "^7.16.0",
     "eslint-plugin-typescript-sort-keys": "^3.3.0",

src/sentry/constants.py

@@ -727,7 +727,6 @@ class InsightModules(Enum):
 # Seer Org level default for code review triggers
 DEFAULT_CODE_REVIEW_TRIGGERS: list[str] = [
     "on_ready_for_review",
-    "on_new_commit",
 ]
 SEER_DEFAULT_CODING_AGENT_DEFAULT = "seer"
 SEER_AUTOMATED_RUN_STOPPING_POINT_DEFAULT = "code_changes"

src/sentry/integrations/api/endpoints/organization_code_mappings.py

@@ -70,13 +70,15 @@ def organization(self):
 
     def validate(self, attrs):
         query = RepositoryProjectPathConfig.objects.filter(
-            project_id=attrs.get("project_id"), stack_root=attrs.get("stack_root")
+            project_id=attrs.get("project_id"),
+            stack_root=attrs.get("stack_root"),
+            source_root=attrs.get("source_root"),
         )
         if self.instance:
             query = query.exclude(id=self.instance.id)
         if query.exists():
             raise serializers.ValidationError(
-                "Code path config already exists with this project and stack trace root"
+                "Code path config already exists with this project, stack trace root, and source root"
             )
         return attrs
 

src/sentry/integrations/api/endpoints/organization_code_mappings_bulk.py

@@ -256,11 +256,9 @@ def post(self, request: Request, organization: Organization) -> Response:
                         config = RepositoryProjectPathConfig.objects.select_for_update().get(
                             project=project,
                             stack_root=mapping["stack_root"],
+                            source_root=mapping["source_root"],
                         )
-                        for key, value in {
-                            **defaults,
-                            "source_root": mapping["source_root"],
-                        }.items():
+                        for key, value in defaults.items():
                             setattr(config, key, value)
                         created = False
                     except RepositoryProjectPathConfig.DoesNotExist:

src/sentry/integrations/models/repository_project_path_config.py

@@ -37,7 +37,7 @@ class RepositoryProjectPathConfig(DefaultFieldsModelExisting):
     class Meta:
         app_label = "sentry"
         db_table = "sentry_repositoryprojectpathconfig"
-        unique_together = (("project", "stack_root"),)
+        unique_together = (("project", "stack_root", "source_root"),)
 
     def __repr__(self) -> str:
         return (