cleanup & fixes

matomo-org · Sep 18, 2023 · d71e232 · d71e232
1 parent 420c0de
commit d71e232
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 103 deletions.
diff --git a/templates/trackingCodeReact.twig b/templates/trackingCodeReact.twig
@@ -16,7 +16,6 @@
 <p>{{'SitesManager_SiteWithoutDataCloudflareFollowStepsIntro'|translate}}</p>
 <div
         vue-entry="TagManager.TrackingSPAPage"
-        current-action="{{ action|json_encode }}"
         show-container-row="{{ showContainerRow|json_encode }}"
         js-framework="react"
 >

diff --git a/templates/trackingSPA.twig b/templates/trackingSPA.twig
@@ -4,9 +4,8 @@
 <br>
 <p>{{ 'SitesManager_SiteWithoutDataCloudflareFollowStepsIntro'|translate }}</p>
 <div
-        vue-entry="TagManager.TrackingSPAPage"
-        current-action="{{ action|json_encode }}"
-        show-container-row="{{ showContainerRow|json_encode }}"
+    vue-entry="TagManager.TrackingSPAPage"
+    show-container-row="{{ showContainerRow|json_encode }}"
 >
 </div>
 <br>

diff --git a/tests/UI/EmptySite_React_spec.js b/tests/UI/EmptySite_React_spec.js
@@ -24,7 +24,7 @@ describe("EmptySite_React", function () {
     await page.waitForSelector('#start-tracking-details .codeblock', {visible: true});
     await page.evaluate(function () {
       // since containerID will be random and keeps changing
-      var selector = $('#reactjs .codeblock');
+      var selector = $('#start-tracking-details .codeblock');
       selector.text(selector.text().replace(/http(.*)container_(.*).js/g, 'http://localhost/js/container_test123.js'));
     });
 

diff --git a/tests/UI/expected-screenshots/EmptySite_React_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_React_emptySiteDashboard.png
diff --git a/vue/dist/TagManager.umd.js b/vue/dist/TagManager.umd.js
diff --git a/vue/dist/TagManager.umd.min.js b/vue/dist/TagManager.umd.min.js
diff --git a/vue/src/TagmanagerTrackingCode/TagManagerTrackingCode.less b/vue/src/TagmanagerTrackingCode/TagManagerTrackingCode.less
@@ -1,6 +1,5 @@
 .tagManagerTrackingCode {
   padding-top: 1rem;
-  display: inline-block;
 
   > .row, > .row .row {
     margin-bottom: 0;
@@ -18,4 +17,8 @@
   label[for="containers"], label[for="environment"] {
     top: -4px !important;
   }
+
+  .siteSelector {
+    max-width: 100%;
+  }
 }
diff --git a/vue/src/TagmanagerTrackingCode/TrackingCodeCommon.vue b/vue/src/TagmanagerTrackingCode/TrackingCodeCommon.vue
@@ -156,7 +156,6 @@ function ucfirst(s: string): string {
 export default defineComponent({
   props: {
     showContainerRow: Boolean,
-    currentAction: String,
     showBottom: Boolean,
     showDescription: Boolean,
     showPlainMtmSteps: Boolean,

diff --git a/vue/src/TagmanagerTrackingCode/TrackingSPAPage.vue b/vue/src/TagmanagerTrackingCode/TrackingSPAPage.vue
@@ -5,11 +5,10 @@
 -->
 <template>
   <ol class="list-style-decimal">
-    <li>
+    <li ref="step1" v-show="step1HasContent">
       <span v-html="$sanitize(setupStep1)" v-if="showContainerRow"></span>
       <TrackingCodeCommon
         :show-container-row="showContainerRow"
-        :current-action="currentAction"
         :showBottom="false"
         :showDescription="false"
         @fetchInstallInstructions="fetchInstallInstructionsSPA"
@@ -76,7 +75,6 @@ interface TagmanagerTrackingSPAPageState {
 export default defineComponent({
   props: {
     showContainerRow: Boolean,
-    currentAction: String,
     jsFramework: String,
   },
   components: {
@@ -174,6 +172,10 @@ export default defineComponent({
     },
   },
   computed: {
+    step1HasContent() {
+      const elem = this.$refs.step1 as HTMLElement;
+      return elem && elem.textContent !== '';
+    },
     fetchFollowStep3() {
       return translate(
         'TagManager_SPAFollowStep3',