Update matomo.org links with campaign parameters vue components

matomo-org · Oct 12, 2023 · bd68136 · bd68136
1 parent 5a444d0
commit bd68136
Show file tree

Hide file tree

Showing 6 changed files with 1,344 additions and 1,924 deletions.
diff --git a/vue/dist/GoogleAnalyticsImporter.umd.js b/vue/dist/GoogleAnalyticsImporter.umd.js
diff --git a/vue/dist/GoogleAnalyticsImporter.umd.min.js b/vue/dist/GoogleAnalyticsImporter.umd.min.js
diff --git a/vue/src/Configure/ConfigureConnection.vue b/vue/src/Configure/ConfigureConnection.vue
@@ -90,6 +90,7 @@
 import { defineComponent } from 'vue';
 import {
   translate,
+  externalLink,
 } from 'CoreHome';
 
 export default defineComponent({
@@ -146,21 +147,19 @@ export default defineComponent({
   },
   computed: {
     setupGoogleAnalyticsImportFaq() {
-      const url = 'https://matomo.org/faq/general/set-up-google-analytics-import/';
       return translate(
         'GoogleAnalyticsImporter_ConfigureTheImporterLabel3',
-        `<a href="${url}" rel="noreferrer noopener" target="_blank">`,
+        externalLink('https://matomo.org/faq/general/set-up-google-analytics-import/'),
         '</a>',
       );
     },
     isUploadButtonDisabled() {
       return this.isSelectingFile || this.isUploading;
     },
     getAdvanceConnectStep01Text() {
-      const faqLink = 'https://matomo.org/faq/general/set-up-google-analytics-import/';
       return this.translate(
         'GoogleAnalyticsImporter_GAImportNoDataScreenStep01',
-        `<a href="${faqLink}" target="_blank" rel="noreferrer noopener">`,
+        externalLink('https://matomo.org/faq/general/set-up-google-analytics-import/'),
         '</a>',
       );
     },
@@ -171,19 +170,18 @@ export default defineComponent({
       );
     },
     getAdvanceConnectStep04Text() {
-      const faqLink = 'https://matomo.org/faq/general/running-the-google-analytics-import/';
       return this.translate(
         'GoogleAnalyticsImporter_GAImportNoDataScreenStep04',
         `<a href="${this.indexActionUrl}" target="_blank" rel="noreferrer noopener">`,
         '</a>',
-        `<a href="${faqLink}" target="_blank" rel="noreferrer noopener">`,
+        externalLink('https://matomo.org/faq/general/running-the-google-analytics-import/'),
         '</a>',
       );
     },
     getAdvanceConnectStep05Text() {
       return this.translate(
         'GoogleAnalyticsImporter_GAImportNoDataScreenStep05',
-        `<a href="${this.indexActionUrl}" target="_blank" rel="noreferrer noopener">`,
+        externalLink(this.indexActionUrl),
         '</a>',
       );
     },

diff --git a/vue/src/ImportScheduler/ImportScheduler.vue b/vue/src/ImportScheduler/ImportScheduler.vue
@@ -130,6 +130,7 @@ import {
   NotificationsStore,
   AjaxHelper,
   parseDate,
+  externalLink,
 } from 'CoreHome';
 import { Field } from 'CorePluginsAdmin';
 
@@ -252,10 +253,9 @@ export default defineComponent({
       );
     },
     forceIgnoreOutOfCustomDimSlotErrorHelp() {
-      const url = 'https://matomo.org/docs/custom-dimensions/';
       return translate(
         'GoogleAnalyticsImporter_ForceCustomDimensionSlotCheckHelp',
-        `<a href="${url}" rel="noreferrer noopener" target="_blank">`,
+        externalLink('https://matomo.org/docs/custom-dimensions/'),
         '</a>',
       );
     },

diff --git a/vue/src/ImportScheduler/ImportSchedulerGA4.vue b/vue/src/ImportScheduler/ImportSchedulerGA4.vue
@@ -121,6 +121,7 @@ import {
   NotificationsStore,
   AjaxHelper,
   parseDate,
+  externalLink,
 } from 'CoreHome';
 import { Field } from 'CorePluginsAdmin';
 
@@ -258,10 +259,9 @@ export default defineComponent({
         '</b>');
     },
     forceIgnoreOutOfCustomDimSlotErrorHelp() {
-      const url = 'https://matomo.org/docs/custom-dimensions/';
       return translate(
         'GoogleAnalyticsImporter_ForceCustomDimensionSlotCheckHelp',
-        `<a href="${url}" rel="noreferrer noopener" target="_blank">`,
+        externalLink('https://matomo.org/docs/custom-dimensions/'),
         '</a>',
       );
     },

diff --git a/vue/src/ImportStatus/ImportStatusRow.vue b/vue/src/ImportStatus/ImportStatusRow.vue
@@ -162,7 +162,12 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { MatomoUrl, translate, Matomo } from 'CoreHome';
+import {
+  MatomoUrl,
+  translate,
+  Matomo,
+  externalLink,
+} from 'CoreHome';
 
 export default defineComponent({
   props: {
@@ -192,7 +197,7 @@ export default defineComponent({
     errorMessageBugReportRequest() {
       return translate(
         'GoogleAnalyticsImporter_ErrorMessageBugReportRequest',
-        '<a href="https://forum.matomo.org/" rel="noreferrer noopener" target="_blank">',
+        externalLink('https://forum.matomo.org/'),
         '</a>',
       );
     },