Merge pull request #3317 from kiva/VUE-761-trim-route-link

fix: trim link from global-promo-banner and incoming route used in Co…
kiva · Oct 8, 2021 · fa62648 · fa62648
2 parents 652dd7c + 1c5eb2f
commit fa62648
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/components/WwwFrame/PromotionalBanner/Banners/GenericPromoBanner.vue b/src/components/WwwFrame/PromotionalBanner/Banners/GenericPromoBanner.vue
@@ -2,10 +2,10 @@
 	<div class="row align-center generic-banner">
 		<component
 			:is="currentWrapperComponent"
-			:to="promoBannerContent.link"
-			:href="promoBannerContent.link"
+			:to="trimmedLink"
+			:href="trimmedLink"
 			:target="isExternalLink ? '_blank' : '_self'"
-			:class="{ 'banner-link' : promoBannerContent.link, 'banner-wrapper' : !promoBannerContent.link}"
+			:class="{ 'banner-link' : trimmedLink, 'banner-wrapper' : !trimmedLink}"
 			v-kv-track-event="handleTracking"
 		>
 			<kv-icon :name="iconKey" :class="`${iconKey}-icon icon`" />
@@ -64,6 +64,9 @@ export default {
 				return ['promo', 'click-Contentful-banner', this.promoBannerContent.richText];
 			}
 			return this.promoBannerContent.kvTrackEvent;
+		},
+		trimmedLink() {
+			return this.promoBannerContent?.link?.trim() ?? '';
 		}
 	},
 };

diff --git a/src/pages/ContentfulPage.vue b/src/pages/ContentfulPage.vue
@@ -260,21 +260,21 @@ export default {
 		preFetchVariables({ route }) {
 			return {
 				contentType: 'page',
-				contentKey: route?.meta?.contentfulPage(route),
+				contentKey: route?.meta?.contentfulPage(route)?.trim(),
 			};
 		},
 		variables() {
 			return {
 				contentType: 'page',
-				contentKey: this.$route?.meta?.contentfulPage(this.$route),
+				contentKey: this.$route?.meta?.contentfulPage(this.$route)?.trim(),
 			};
 		},
 		preFetch(config, client, args) {
 			return client.query({
 				query: contentfulEntries,
 				variables: {
 					contentType: 'page',
-					contentKey: args?.route?.meta?.contentfulPage(args?.route),
+					contentKey: args?.route?.meta?.contentfulPage(args?.route)?.trim(),
 				}
 			}).then(({ data }) => {
 				// Get Contentful page data