Merge branch 'bmarjanovic/fix-missing-ui-text' into 'master'

Fix missing UI text

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134249



Merged-by: Justin Ho Tuan Duong <hduong@gitlab.com>
Approved-by: Justin Ho Tuan Duong <hduong@gitlab.com>
Reviewed-by: Justin Ho Tuan Duong <hduong@gitlab.com>
Reviewed-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Co-authored-by: bmarjanovic <bmarjanovic@gitlab.com>

app/assets/javascripts/integrations/constants.js

@@ -59,6 +59,8 @@ export const integrationTriggerEvents = {
   DEPLOYMENT: 'deployment_events',
   ALERT: 'alert_events',
   INCIDENT: 'incident_events',
+  GROUP_MENTION: 'group_mention_events',
+  GROUP_CONFIDENTIAL_MENTION: 'group_confidential_mention_events',
 };
 
 export const integrationTriggerEventTitles = {
@@ -88,6 +90,12 @@ export const integrationTriggerEventTitles = {
   [integrationTriggerEvents.INCIDENT]: s__(
     'IntegrationEvents|An incident is created, closed, or reopened',
   ),
+  [integrationTriggerEvents.GROUP_MENTION]: s__(
+    'IntegrationEvents|A group is mentioned in a public context',
+  ),
+  [integrationTriggerEvents.GROUP_CONFIDENTIAL_MENTION]: s__(
+    'IntegrationEvents|A group is mentioned in a confidential context',
+  ),
 };
 
 export const billingPlans = {

app/helpers/integrations_helper.rb

@@ -30,10 +30,6 @@ def integration_event_title(event)
       _("Alert")
     when "incident"
       _("Incident")
-    when "group_mention"
-      _("Group mention in public")
-    when "group_confidential_mention"
-      _("Group mention in private")
     end
   end
   # rubocop:enable Metrics/CyclomaticComplexity
@@ -295,10 +291,6 @@ def default_integration_event_description(event)
       s_("ProjectService|Trigger event when a new, unique alert is recorded.")
     when "incident", "incident_events"
       s_("ProjectService|Trigger event when an incident is created.")
-    when "group_mention"
-      s_("ProjectService|Trigger event when a group is mentioned in a public context.")
-    when "group_confidential_mention"
-      s_("ProjectService|Trigger event when a group is mentioned in a confidential context.")
     when "build_events"
       s_("ProjectService|Trigger event when a build is created.")
     when "archive_trace_events"

locale/gitlab.pot

@@ -22623,12 +22623,6 @@ msgstr ""
 msgid "Group membership expiration date removed"
 msgstr ""
-msgid "Group mention in private"
-msgstr ""
-
-msgid "Group mention in public"
-msgstr ""
-
 msgid "Group milestone"
 msgstr ""
@@ -25268,6 +25262,12 @@ msgstr ""
 msgid "IntegrationEvents|A deployment is started or finished"
 msgstr ""
+msgid "IntegrationEvents|A group is mentioned in a confidential context"
+msgstr ""
+
+msgid "IntegrationEvents|A group is mentioned in a public context"
+msgstr ""
+
 msgid "IntegrationEvents|A merge request is created, merged, closed, or reopened"
 msgstr ""
@@ -37021,12 +37021,6 @@ msgstr ""
 msgid "ProjectService|Trigger event when a deployment starts or finishes."
 msgstr ""
-msgid "ProjectService|Trigger event when a group is mentioned in a confidential context."
-msgstr ""
-
-msgid "ProjectService|Trigger event when a group is mentioned in a public context."
-msgstr ""
-
 msgid "ProjectService|Trigger event when a merge request is created, updated, or merged."
 msgstr ""