From 5e61d020718f0dc551354633a881c0fb4a6a07ca Mon Sep 17 00:00:00 2001
From: dizzy <diosmosis@users.noreply.github.com>
Date: Tue, 23 Nov 2021 00:20:47 -0800
Subject: Revert "[Vue] do not decode model value of site name in site
 selector, so it is always matches the DB value (#18356)" (#18364)

This reverts commit 8c7539f073e7a49311cbe6dc2474eb1bbfb8718d.
---
 .../vue/src/SiteSelector/SiteSelector.adapter.ts         |  3 ++-
 plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue   | 16 +++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'plugins/CoreHome/vue/src')

diff --git a/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.adapter.ts b/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.adapter.ts
index f1c01fe6fc..b3438d2bb7 100644
--- a/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.adapter.ts
+++ b/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.adapter.ts
@@ -8,6 +8,7 @@
 import { INgModelController, ITimeoutService } from 'angular';
 import createAngularJsAdapter from '../createAngularJsAdapter';
 import SiteSelector from './SiteSelector.vue';
+import Matomo from '../Matomo/Matomo';
 
 export default createAngularJsAdapter<[ITimeoutService]>({
   component: SiteSelector,
@@ -77,7 +78,7 @@ export default createAngularJsAdapter<[ITimeoutService]>({
 
     $timeout(() => {
       if (attrs.siteid && attrs.sitename) {
-        vm.modelValue = { id: attrs.siteid, name: attrs.sitename };
+        vm.modelValue = { id: attrs.siteid, name: Matomo.helper.htmlDecode(attrs.sitename) };
         ngModel.$setViewValue({ ...vm.modelValue });
       }
     });
diff --git a/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue b/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue
index 08181aa906..52884f6815 100644
--- a/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue
+++ b/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue
@@ -32,7 +32,7 @@
       />
       <span>
         <span
-          v-text="decodedName || firstSiteNameDecoded"
+          v-text="selectedSite?.name || firstSiteName"
           v-if="selectedSite?.name || !placeholder"
         />
         <span
@@ -151,7 +151,7 @@ export default defineComponent({
       Object,
       default: {
         id: Matomo.idSite,
-        name: Matomo.siteName,
+        name: Matomo.helper.htmlDecode(Matomo.siteName),
       },
     },
     showSelectedSite: {
@@ -209,7 +209,7 @@ export default defineComponent({
       sites: [],
       selectedSite: {
         id: Matomo.idSite,
-        name: Matomo.siteName,
+        name: Matomo.helper.htmlDecode(Matomo.siteName),
       },
       autocompleteMinSites: parseInt(Matomo.config.autocomplete_min_sites as string, 10),
     };
@@ -242,13 +242,6 @@ export default defineComponent({
     this.onSearchInputKeydown = debounce(this.onSearchInputKeydown.bind(this));
   },
   computed: {
-    decodedName() {
-      if (!this.selectedSite) {
-        return null;
-      }
-
-      return Matomo.helper.htmlDecode(this.selectedSite.name);
-    },
     shouldFocusOnSearch() {
       return (this.showSitesList && this.autocompleteMinSites <= this.sites.length)
         || this.searchTerm;
@@ -264,9 +257,6 @@ export default defineComponent({
     firstSiteName() {
       return this.sites && this.sites.length > 0 ? this.sites[0].name : '';
     },
-    firstSiteNameDecoded() {
-      return Matomo.helper.htmlDecode(this.firstSiteName);
-    },
     urlAllSites() {
       const newQuery = MatomoUrl.stringify({
         ...MatomoUrl.urlParsed.value,
-- 
cgit v1.2.3