Merge pull request #12222 from diox/fix-abuse-report-api-app-profile

Fix abuse report API docs & app_profile value for install source

docs/topics/api/abuse.rst

@@ -97,7 +97,7 @@ to if necessary.
 
   .. note::
 
-      This should match what is documented for ``addonsManager.install.extra_keys.method`` in `Firefox telemetry event definition <https://searchfox.org/mozilla-central/source/toolkit/components/telemetry/Events.yaml>`_. The values are normalized by being converted to lowercase with the ``:`` and ``-`` characters converted to ``_``. In addition, extra values are supported for backwards-compatibility purposes, since Firefox before version 70 merged source and method into the same value. If an unsupported value is sent for this parameter, it will be silently changed to special ``other`` instead of raising a 400 error.
+      This should match what is documented for ``addonsManager.install.extra_keys.method`` in `Firefox telemetry event definition <https://searchfox.org/mozilla-central/source/toolkit/components/telemetry/Events.yaml>`_ except that the values are normalized by being converted to lowercase with the ``:`` and ``-`` characters converted to ``_``. In addition, extra values are supported for backwards-compatibility purposes, since Firefox before version 70 merged source and method into the same value. If an unsupported value is sent for this parameter, it will be silently changed to special ``other`` instead of raising a 400 error.
 
  ===========================  =================================================
                        Value  Description
@@ -125,28 +125,28 @@ to if necessary.
 
   .. note::
 
-      This should match what is documented for ``addonsManager.install.extra_keys.method`` in `Firefox telemetry event definition <https://searchfox.org/mozilla-central/source/toolkit/components/telemetry/Events.yaml>`_. The values are normalized by being converted to lowercase with the ``:`` and ``-`` characters converted to ``_``. We support the additional ``other`` value as a catch-all. If an unsupported value is sent for this parameter, it will be silently changed to ``other`` instead of raising a 400 error.
+      This should match what is documented for ``addonsManager.install.extra_keys.method`` in `Firefox telemetry event definition <https://searchfox.org/mozilla-central/source/toolkit/components/telemetry/Events.yaml>`_ except that the values are normalized by being converted to lowercase with the ``:`` and ``-`` characters converted to ``_``. We support the additional ``other`` value as a catch-all. If an unsupported value is sent for this parameter, it will be silently changed to ``other`` instead of raising a 400 error.
 
  ===========================  =================================================
                        Value  Description
  ===========================  =================================================
-               \about:addons  Add-ons Manager
-            \about:debugging  Add-ons Debugging
-          \about:preferences  Preferences
+                about_addons  Add-ons Manager
+             about_debugging  Add-ons Debugging
+           about_preferences  Preferences
                          amo  AMO
-                \app:profile  App Profile
+                 app_profile  App Profile
                        disco  Disco Pane
                 distribution  Included in build
                    extension  Extension
-           enterprise-policy  Enterprise Policy
-                    file-url  File URL
-                  gmp-plugin  GMP Plugin
+           enterprise_policy  Enterprise Policy
+                    file_url  File URL
+                  gmp_plugin  GMP Plugin
                     internal  Internal
                       plugin  Plugin
                        rtamo  Return To AMO
                         sync  Sync
-                system-addon  System Add-on
-             temporary-addon  Temporary Add-on
+                system_addon  System Add-on
+             temporary_addon  Temporary Add-on
                      unknown  Unknown
                        other  Other
  ===========================  =================================================

src/olympia/abuse/models.py

@@ -96,7 +96,7 @@ class AbuseReport(ModelBase):
         ('ABOUT_DEBUGGING', 2, 'Add-ons Debugging'),
         ('ABOUT_PREFERENCES', 3, 'Preferences'),
         ('AMO', 4, 'AMO'),
-        ('APP:PROFILE', 5, 'app:profile'),
+        ('APP_PROFILE', 5, 'App Profile'),
         ('DISCO', 6, 'Disco Pane'),
         ('DISTRIBUTION', 7, 'Included in build'),
         ('EXTENSION', 8, 'Extension'),

src/olympia/abuse/tests/test_models.py

@@ -109,7 +109,7 @@ class TestAbuse(TestCase):
             (2, 'Add-ons Debugging'),
             (3, 'Preferences'),
             (4, 'AMO'),
-            (5, 'app:profile'),
+            (5, 'App Profile'),
             (6, 'Disco Pane'),
             (7, 'Included in build'),
             (8, 'Extension'),
@@ -132,7 +132,7 @@ class TestAbuse(TestCase):
             (2, 'about_debugging'),
             (3, 'about_preferences'),
             (4, 'amo'),
-            (5, 'app:profile'),
+            (5, 'app_profile'),
             (6, 'disco'),
             (7, 'distribution'),
             (8, 'extension'),