Merge pull request #26 from matomo-org/PG-5045-separate-alert-message

Separate alert message for Custom Alerts screen

Author: AltamashShaikh

MicrosoftTeams.php

@@ -100,6 +100,7 @@ public function addJsGlobalVariables(&$out)
         }
 
         $out .= 'var msTeamsShouldShowWebhookNotification = ' . json_encode($shouldShowNotification) . ';';
+        $out .= 'var msTeamsAlertModule = ' . json_encode($module) . ';';
     }
 
     public function getClientSideTranslationKeys(&$translationKeys)
@@ -115,6 +116,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'MicrosoftTeams_TenantIdDescription';
         $translationKeys[] = 'MicrosoftTeams_TeamsEnterYourWebhookUrlText';
         $translationKeys[] = 'MicrosoftTeams_MicrosoftTeamsWebhookUrlDeprecatedNoticeText';
+        $translationKeys[] = 'MicrosoftTeams_MicrosoftTeamsWebhookUrlDeprecatedNoticeTextCustomAlerts';
     }
 
     /**

javascripts/alertNotification.js

@@ -5,7 +5,11 @@ $(function () {
     if (window.msTeamsShouldShowWebhookNotification) {
         var UI = require('piwik/UI');
         var notification = new UI.Notification();
-        var message = _pk_translate('MicrosoftTeams_MicrosoftTeamsWebhookUrlDeprecatedNoticeText', ['<a href="https://matomo.org/faq/reports/how-to-get-microsoft-teams-webhook-url/" target="_blank" rel="noreferrer noopener">', '</a>'])
+        var translationKey = 'MicrosoftTeams_MicrosoftTeamsWebhookUrlDeprecatedNoticeText';
+        if (window.msTeamsAlertModule && window.msTeamsAlertModule === 'CustomAlerts') {
+            translationKey = 'MicrosoftTeams_MicrosoftTeamsWebhookUrlDeprecatedNoticeTextCustomAlerts';
+        }
+        var message = _pk_translate(translationKey, ['<a href="https://matomo.org/faq/reports/how-to-get-microsoft-teams-webhook-url/" target="_blank" rel="noreferrer noopener">', '</a>'])
         notification.show(message,{
           context: 'warning',
           id: 'msTeamsDeprecatedNotification'

lang/en.json

@@ -19,6 +19,7 @@
         "PleaseFindYourReport": "Here is your %1$s report for %2$s.",
         "MicrosoftTeamsAlertContent": "%1$s has been triggered for website %2$s as the metric %3$s in report %4$s %5$s.",
         "ClientSecretExpiryNote": "%1$sNote:%2$s The client secret is scheduled to expire on %3$s. Please generate a new token and update it in Matomo to ensure uninterrupted scheduled reports.",
-        "MicrosoftTeamsWebhookUrlDeprecatedNoticeText": "Your Microsoft Teams report is using an outdated webhook URL. Follow this %1$sguide%2$s to create a new one."
+        "MicrosoftTeamsWebhookUrlDeprecatedNoticeText": "Your Microsoft Teams report is using an outdated webhook URL. Follow this %1$sguide%2$s to create a new one.",
+        "MicrosoftTeamsWebhookUrlDeprecatedNoticeTextCustomAlerts": "Your Microsoft Teams alert is using an outdated webhook URL. Follow this %1$sguide%2$s to create a new one."
     }
 }