From 8c66c29367545f55f03acc34e2596e93b735a04d Mon Sep 17 00:00:00 2001
From: rui hildt <rui@mullvad.net>
Date: Tue, 22 Aug 2023 13:28:22 +0200
Subject: [PATCH] Provide activeHost for all pageAction

---
 src/components/Headers/ProxyHeader.vue |  5 ++---
 src/pageaction/PageAction.vue          | 12 +++++++++--
 src/pageaction/views/Home.vue          | 28 --------------------------
 3 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/components/Headers/ProxyHeader.vue b/src/components/Headers/ProxyHeader.vue
index 40eacef4..6037427b 100644
--- a/src/components/Headers/ProxyHeader.vue
+++ b/src/components/Headers/ProxyHeader.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
+import { computed, inject, ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { NIcon } from 'naive-ui';
 
 import FeCog from '@/components/Icons/FeCog.vue';
-import useActiveTab from '@/composables/useActiveTab';
 
 const { currentRoute } = useRouter();
-const { activeTabHost } = useActiveTab();
+const { activeTabHost } = inject('activeTabHost', { activeTabHost: ref('') });
 
 const pageTitle = computed(() => currentRoute.value.meta.title);
 </script>
diff --git a/src/pageaction/PageAction.vue b/src/pageaction/PageAction.vue
index 730e93b2..a4d5d8cc 100644
--- a/src/pageaction/PageAction.vue
+++ b/src/pageaction/PageAction.vue
@@ -1,11 +1,16 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
+import { computed, provide } from 'vue';
 import { useRoute } from 'vue-router';
 import { NScrollbar } from 'naive-ui';
 
 import ProxyHeader from '@/components/Headers/ProxyHeader.vue';
 import SettingsHeader from '@/components/Headers/SettingsHeader.vue';
 
+import useActiveTab from '@/composables/useActiveTab';
+
+const { activeTabHost } = useActiveTab();
+provide('activeTabHost', { activeTabHost });
+
 const path = computed(() => {
   return useRoute().path;
 });
@@ -28,6 +33,9 @@ const path = computed(() => {
 
 <style scoped>
 header {
-  box-shadow: rgb(0 0 0 / 5%) 0 1px 2px 0, rgb(0 0 0 / 5%) 0 1px 4px 0, rgb(0 0 0 / 5%) 0 2px 8px 0;
+  box-shadow:
+    rgb(0 0 0 / 5%) 0 1px 2px 0,
+    rgb(0 0 0 / 5%) 0 1px 4px 0,
+    rgb(0 0 0 / 5%) 0 2px 8px 0;
 }
 </style>
diff --git a/src/pageaction/views/Home.vue b/src/pageaction/views/Home.vue
index 3773e249..1104f630 100644
--- a/src/pageaction/views/Home.vue
+++ b/src/pageaction/views/Home.vue
@@ -1,42 +1,14 @@
 <script lang="ts" setup>
-// import { computed, inject, ref } from 'vue';
-
 import CurrentProxyDetails from '@/components/CurrentProxyDetails.vue';
-// import Button from '@/components/Buttons/Button.vue';
 
 import useSocksProxy from '@/composables/useSocksProxy';
 import useStore from '@/composables/useStore';
 
-// const { activeTabHost } = inject('activeTabHost', { activeTabHost: ref('') });
-
-// const { excludedHosts, customProxies } = useStore();
 const { globalProxyDetails } = useStore();
 const { globalProxyEnabled } = useSocksProxy();
-
-// const isExcluded = computed(() => excludedHosts.value.includes(activeTabHost.value));
-
-// const handleExclude = () => {
-//   // Add existing url to the exception list
-//   excludedHosts.value = [...excludedHosts.value, activeTabHost.value];
-
-//   // Remove any custom proxy
-//   const updatedcustomProxies = { ...customProxies.value };
-//   delete updatedcustomProxies[activeTabHost.value];
-//   customProxies.value = updatedcustomProxies;
-// };
-
-// const handleRemoveExclude = () => {
-//   excludedHosts.value = excludedHosts.value.filter((host) => host !== activeTabHost.value);
-// };
 </script>
 
 <template>
-  <!-- <Button v-if="isExcluded" @click="handleRemoveExclude">Allow proxying for {{ activeTabHost }}</Button>
-  <Button v-else @click="handleExclude">Never proxy {{ activeTabHost }}</Button> -->
-
   <CurrentProxyDetails v-if="globalProxyEnabled" :proxy-details="globalProxyDetails" />
   <div v-else>No proxy currently in use</div>
-
-  <!-- <h1>Custom proxy</h1>
-  <Location /> -->
 </template>