From fce519bde49c867e054f470a07bdeec8ba8628ba Mon Sep 17 00:00:00 2001
From: Eddie Ferrer <eddieferrer@user.noreply.github.com>
Date: Tue, 12 Oct 2021 12:34:38 -0700
Subject: [PATCH 1/2] feat: Hide page elements based on query param

* Hides global promo, nav menu and secondary menu if query param kivaAppReferral=true exists

GD-139
---
 src/api/localResolvers/kivaAppReferral.js     | 13 +++++
 src/api/localSchema.graphql                   |  1 +
 .../WwwFrame/LendMenu/TheLendMenu.vue         |  2 +-
 src/components/WwwFrame/TheHeader.vue         |  2 +-
 src/components/WwwFrame/WwwPage.vue           | 49 +++++++++++++++----
 .../query/shared/isKivaAppReferral.graphql    |  3 ++
 6 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 src/api/localResolvers/kivaAppReferral.js
 create mode 100644 src/graphql/query/shared/isKivaAppReferral.graphql

diff --git a/src/api/localResolvers/kivaAppReferral.js b/src/api/localResolvers/kivaAppReferral.js
new file mode 100644
index 0000000000..10756c2e02
--- /dev/null
+++ b/src/api/localResolvers/kivaAppReferral.js
@@ -0,0 +1,13 @@
+export default () => {
+	return {
+		resolvers: {
+			Query: {
+				isKivaAppReferral(obj, args) {
+					// Takes an argument of the query param value
+					// and returns a boolean if it is present and equal to true
+					return args?.kivaAppReferralQueryParam === 'true';
+				},
+			}
+		},
+	};
+};
diff --git a/src/api/localSchema.graphql b/src/api/localSchema.graphql
index fbe4129af8..e11e33a1e5 100644
--- a/src/api/localSchema.graphql
+++ b/src/api/localSchema.graphql
@@ -45,6 +45,7 @@ extend type Query {
 	autolending: Autolending
 	verificationLightbox: VerificationLightbox
 	hasEverLoggedIn: Boolean
+	isKivaAppReferral(kivaAppReferralQueryParam: String): Boolean
 }
 
 extend type My {
diff --git a/src/components/WwwFrame/LendMenu/TheLendMenu.vue b/src/components/WwwFrame/LendMenu/TheLendMenu.vue
index e5c1468e55..2bb8ae9347 100644
--- a/src/components/WwwFrame/LendMenu/TheLendMenu.vue
+++ b/src/components/WwwFrame/LendMenu/TheLendMenu.vue
@@ -113,7 +113,7 @@ export default {
 	},
 	methods: {
 		onOpen() {
-			this.$refs.mega.onOpen();
+			this.$refs?.mega?.onOpen?.();
 		},
 		onClose() {
 			this.$refs.list.onClose();
diff --git a/src/components/WwwFrame/TheHeader.vue b/src/components/WwwFrame/TheHeader.vue
index 972216627c..a8967d2c5f 100755
--- a/src/components/WwwFrame/TheHeader.vue
+++ b/src/components/WwwFrame/TheHeader.vue
@@ -572,7 +572,7 @@ export default {
 		},
 		onLendMenuShow() {
 			if (this.mgHighlightInNavVersion !== 'shown') {
-				this.$refs.lendMenu.onOpen();
+				this.$refs?.lendMenu?.onOpen?.();
 			}
 			this.$kvTrackEvent('TopNav', 'hover-Lend-menu', 'Lend');
 		},
diff --git a/src/components/WwwFrame/WwwPage.vue b/src/components/WwwFrame/WwwPage.vue
index c9d4cbd6fa..d13d40072b 100644
--- a/src/components/WwwFrame/WwwPage.vue
+++ b/src/components/WwwFrame/WwwPage.vue
@@ -1,11 +1,13 @@
 <template>
 	<div class="www-page">
-		<the-banner-area />
-		<the-header
-			:hide-search-in-header="hideSearchInHeader"
-			:theme="headerTheme"
-		/>
-		<slot name="secondary"></slot>
+		<template v-if="!isKivaAppReferral">
+			<the-banner-area />
+			<the-header
+				:hide-search-in-header="hideSearchInHeader"
+				:theme="headerTheme"
+			/>
+			<slot name="secondary"></slot>
+		</template>
 		<main :class="mainClasses">
 			<slot name="tertiary"></slot>
 			<slot></slot>
@@ -21,8 +23,10 @@
 </template>
 
 <script>
-import _get from 'lodash/get';
 import hasEverLoggedInQuery from '@/graphql/query/shared/hasEverLoggedIn.graphql';
+import isKivaAppReferralQuery from '@/graphql/query/shared/isKivaAppReferral.graphql';
+import logReadQueryError from '@/util/logReadQueryError';
+
 import { fetchAllExpSettings } from '@/util/experimentPreFetch';
 import appInstallMixin from '@/plugins/app-install-mixin';
 import CookieBanner from '@/components/WwwFrame/CookieBanner';
@@ -68,15 +72,40 @@ export default {
 			default: '',
 		},
 	},
+	data() {
+		return {
+			isKivaAppReferral: false
+		};
+	},
 	apollo: {
-		preFetch(config, client, args) {
+		preFetch(config, client, { route }) {
 			return Promise.all([
 				client.query({ query: hasEverLoggedInQuery }),
 				fetchAllExpSettings(config, client, {
-					query: _get(args, 'route.query'),
-					path: _get(args, 'route.path')
+					query: route?.query,
+					path: route?.path
 				}),
+				client.query({
+					query: isKivaAppReferralQuery,
+					variables: {
+						kivaAppReferralQueryParam: route?.query?.kivaAppReferral,
+					},
+				})
 			]);
+		},
+	},
+	created() {
+		let referralData = {};
+		try {
+			referralData = this.apollo.readQuery({
+				query: isKivaAppReferralQuery,
+				variables: {
+					kivaAppReferralQueryParam: this.$route?.query?.kivaAppReferral,
+				},
+			});
+			this.isKivaAppReferral = referralData?.isKivaAppReferral || false;
+		} catch (e) {
+			logReadQueryError(e, 'WwwPage isKivaAppReferralQuery');
 		}
 	},
 	computed: {
diff --git a/src/graphql/query/shared/isKivaAppReferral.graphql b/src/graphql/query/shared/isKivaAppReferral.graphql
new file mode 100644
index 0000000000..b933cba419
--- /dev/null
+++ b/src/graphql/query/shared/isKivaAppReferral.graphql
@@ -0,0 +1,3 @@
+query isKivaAppReferral($kivaAppReferralQueryParam: String) {
+	isKivaAppReferral(kivaAppReferralQueryParam: $kivaAppReferralQueryParam) @client
+}

From 151bc756be2f53cd909cc0b5af56acb482ad2ad0 Mon Sep 17 00:00:00 2001
From: Eddie Ferrer <eddieferrer@user.noreply.github.com>
Date: Wed, 13 Oct 2021 09:15:49 -0700
Subject: [PATCH 2/2] Reworked feature without local resolver

---
 src/api/localResolvers/kivaAppReferral.js     | 13 -------
 src/api/localSchema.graphql                   |  1 -
 src/components/WwwFrame/WwwPage.vue           | 36 +++++--------------
 .../query/shared/isKivaAppReferral.graphql    |  3 --
 4 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 src/api/localResolvers/kivaAppReferral.js
 delete mode 100644 src/graphql/query/shared/isKivaAppReferral.graphql

diff --git a/src/api/localResolvers/kivaAppReferral.js b/src/api/localResolvers/kivaAppReferral.js
deleted file mode 100644
index 10756c2e02..0000000000
--- a/src/api/localResolvers/kivaAppReferral.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export default () => {
-	return {
-		resolvers: {
-			Query: {
-				isKivaAppReferral(obj, args) {
-					// Takes an argument of the query param value
-					// and returns a boolean if it is present and equal to true
-					return args?.kivaAppReferralQueryParam === 'true';
-				},
-			}
-		},
-	};
-};
diff --git a/src/api/localSchema.graphql b/src/api/localSchema.graphql
index e11e33a1e5..fbe4129af8 100644
--- a/src/api/localSchema.graphql
+++ b/src/api/localSchema.graphql
@@ -45,7 +45,6 @@ extend type Query {
 	autolending: Autolending
 	verificationLightbox: VerificationLightbox
 	hasEverLoggedIn: Boolean
-	isKivaAppReferral(kivaAppReferralQueryParam: String): Boolean
 }
 
 extend type My {
diff --git a/src/components/WwwFrame/WwwPage.vue b/src/components/WwwFrame/WwwPage.vue
index d13d40072b..34cae2e7a2 100644
--- a/src/components/WwwFrame/WwwPage.vue
+++ b/src/components/WwwFrame/WwwPage.vue
@@ -1,13 +1,12 @@
 <template>
 	<div class="www-page">
-		<template v-if="!isKivaAppReferral">
-			<the-banner-area />
-			<the-header
-				:hide-search-in-header="hideSearchInHeader"
-				:theme="headerTheme"
-			/>
-			<slot name="secondary"></slot>
-		</template>
+		<the-banner-area v-show="!isKivaAppReferral" />
+		<the-header v-show="!isKivaAppReferral"
+			:hide-search-in-header="hideSearchInHeader"
+			:theme="headerTheme"
+		/>
+		<slot name="secondary" v-if="!isKivaAppReferral"></slot>
+
 		<main :class="mainClasses">
 			<slot name="tertiary"></slot>
 			<slot></slot>
@@ -24,8 +23,6 @@
 
 <script>
 import hasEverLoggedInQuery from '@/graphql/query/shared/hasEverLoggedIn.graphql';
-import isKivaAppReferralQuery from '@/graphql/query/shared/isKivaAppReferral.graphql';
-import logReadQueryError from '@/util/logReadQueryError';
 
 import { fetchAllExpSettings } from '@/util/experimentPreFetch';
 import appInstallMixin from '@/plugins/app-install-mixin';
@@ -84,29 +81,12 @@ export default {
 				fetchAllExpSettings(config, client, {
 					query: route?.query,
 					path: route?.path
-				}),
-				client.query({
-					query: isKivaAppReferralQuery,
-					variables: {
-						kivaAppReferralQueryParam: route?.query?.kivaAppReferral,
-					},
 				})
 			]);
 		},
 	},
 	created() {
-		let referralData = {};
-		try {
-			referralData = this.apollo.readQuery({
-				query: isKivaAppReferralQuery,
-				variables: {
-					kivaAppReferralQueryParam: this.$route?.query?.kivaAppReferral,
-				},
-			});
-			this.isKivaAppReferral = referralData?.isKivaAppReferral || false;
-		} catch (e) {
-			logReadQueryError(e, 'WwwPage isKivaAppReferralQuery');
-		}
+		this.isKivaAppReferral = this.$route?.query?.kivaAppReferral === 'true';
 	},
 	computed: {
 		// Hiding basket footer on /lend-beta page
diff --git a/src/graphql/query/shared/isKivaAppReferral.graphql b/src/graphql/query/shared/isKivaAppReferral.graphql
deleted file mode 100644
index b933cba419..0000000000
--- a/src/graphql/query/shared/isKivaAppReferral.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-query isKivaAppReferral($kivaAppReferralQueryParam: String) {
-	isKivaAppReferral(kivaAppReferralQueryParam: $kivaAppReferralQueryParam) @client
-}