From 10586e5288b12cfee5bf83820adf3256cc61a486 Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Wed, 22 Dec 2021 12:45:11 +0530
Subject: [PATCH] feat: interceptor selector in bottom bar

---
 .../assets/icons/shield-check.svg             |   4 +
 .../hoppscotch-app/components/app/Footer.vue  | 218 ++++++++++--------
 .../components/app/Interceptor.vue            |  95 +++++---
 .../components/http/ResponseMeta.vue          |  19 --
 .../hoppscotch-app/components/smart/Radio.vue |  35 +++
 .../components/smart/RadioGroup.vue           |  22 ++
 6 files changed, 237 insertions(+), 156 deletions(-)
 create mode 100644 packages/hoppscotch-app/assets/icons/shield-check.svg
 create mode 100644 packages/hoppscotch-app/components/smart/Radio.vue
 create mode 100644 packages/hoppscotch-app/components/smart/RadioGroup.vue

diff --git a/packages/hoppscotch-app/assets/icons/shield-check.svg b/packages/hoppscotch-app/assets/icons/shield-check.svg
new file mode 100644
index 00000000..6bca7d0e
--- /dev/null
+++ b/packages/hoppscotch-app/assets/icons/shield-check.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"></path>
+  <path d="M9 12l2 2 4-4"></path>
+</svg>
\ No newline at end of file
diff --git a/packages/hoppscotch-app/components/app/Footer.vue b/packages/hoppscotch-app/components/app/Footer.vue
index c8f4b7cd..e25d897b 100644
--- a/packages/hoppscotch-app/components/app/Footer.vue
+++ b/packages/hoppscotch-app/components/app/Footer.vue
@@ -22,112 +22,126 @@
           }"
           @click.native="ZEN_MODE = !ZEN_MODE"
         />
+        <tippy
+          ref="interceptorOptions"
+          interactive
+          trigger="click"
+          theme="popover"
+          arrow
+        >
+          <template #trigger>
+            <ButtonSecondary
+              v-tippy="{ theme: 'tooltip' }"
+              :title="t('settings.interceptor')"
+              svg="shield-check"
+            />
+          </template>
+          <AppInterceptor />
+        </tippy>
       </div>
       <div class="flex">
-        <span>
-          <tippy
-            ref="options"
-            interactive
-            trigger="click"
-            theme="popover"
-            arrow
-            :on-shown="() => tippyActions.focus()"
+        <tippy
+          ref="options"
+          interactive
+          trigger="click"
+          theme="popover"
+          arrow
+          :on-shown="() => tippyActions.focus()"
+        >
+          <template #trigger>
+            <ButtonSecondary
+              svg="help-circle"
+              class="!rounded-none"
+              :label="`${t('app.help')}`"
+            />
+          </template>
+          <div
+            ref="tippyActions"
+            class="flex flex-col focus:outline-none"
+            tabindex="0"
+            @keyup.d="documentation.$el.click()"
+            @keyup.s="shortcuts.$el.click()"
+            @keyup.c="chat.$el.click()"
+            @keyup.escape="options.tippy().hide()"
           >
-            <template #trigger>
-              <ButtonSecondary
-                svg="help-circle"
-                class="!rounded-none"
-                :label="`${t('app.help')}`"
-              />
-            </template>
-            <div
-              ref="tippyActions"
-              class="flex flex-col focus:outline-none"
-              tabindex="0"
-              @keyup.d="documentation.$el.click()"
-              @keyup.s="shortcuts.$el.click()"
-              @keyup.c="chat.$el.click()"
-              @keyup.escape="options.tippy().hide()"
-            >
-              <SmartItem
-                ref="documentation"
-                svg="book"
-                :label="`${t('app.documentation')}`"
-                to="https://docs.hoppscotch.io"
-                blank
-                :shortcut="['D']"
-                @click.native="options.tippy().hide()"
-              />
-              <SmartItem
-                ref="shortcuts"
-                svg="zap"
-                :label="`${t('app.keyboard_shortcuts')}`"
-                :shortcut="['S']"
-                @click.native="
-                  () => {
-                    showShortcuts = true
-                    options.tippy().hide()
-                  }
-                "
-              />
-              <SmartItem
-                ref="chat"
-                svg="message-circle"
-                :label="`${t('app.chat_with_us')}`"
-                :shortcut="['C']"
-                @click.native="
-                  () => {
-                    chatWithUs()
-                    options.tippy().hide()
-                  }
-                "
-              />
-              <hr />
-              <SmartItem
-                svg="github"
-                :label="`${t('app.github')}`"
-                to="https://github.com/hoppscotch/hoppscotch"
-                blank
-                @click.native="options.tippy().hide()"
-              />
-              <SmartItem
-                svg="twitter"
-                :label="`${t('app.twitter')}`"
-                to="https://hoppscotch.io/twitter"
-                blank
-                @click.native="options.tippy().hide()"
-              />
-              <SmartItem
-                svg="user-plus"
-                :label="`${t('app.invite')}`"
-                @click.native="
-                  () => {
-                    showShare = true
-                    options.tippy().hide()
-                  }
-                "
-              />
-              <SmartItem
-                svg="lock"
-                :label="`${t('app.terms_and_privacy')}`"
-                to="https://docs.hoppscotch.io/privacy"
-                blank
-                @click.native="options.tippy().hide()"
-              />
-              <SmartItem
-                svg="gift"
-                :label="`${t('app.whats_new')}`"
-                to="https://docs.hoppscotch.io/changelog"
-                blank
-                @click.native="options.tippy().hide()"
-              />
-              <!-- <SmartItem :label="t('app.status')" /> -->
-              <div class="flex opacity-50 py-2 px-4">
-                {{ `${t("app.name")} ${t("app.version")}` }}
-              </div>
+            <SmartItem
+              ref="documentation"
+              svg="book"
+              :label="`${t('app.documentation')}`"
+              to="https://docs.hoppscotch.io"
+              blank
+              :shortcut="['D']"
+              @click.native="options.tippy().hide()"
+            />
+            <SmartItem
+              ref="shortcuts"
+              svg="zap"
+              :label="`${t('app.keyboard_shortcuts')}`"
+              :shortcut="['S']"
+              @click.native="
+                () => {
+                  showShortcuts = true
+                  options.tippy().hide()
+                }
+              "
+            />
+            <SmartItem
+              ref="chat"
+              svg="message-circle"
+              :label="`${t('app.chat_with_us')}`"
+              :shortcut="['C']"
+              @click.native="
+                () => {
+                  chatWithUs()
+                  options.tippy().hide()
+                }
+              "
+            />
+            <hr />
+            <SmartItem
+              svg="github"
+              :label="`${t('app.github')}`"
+              to="https://github.com/hoppscotch/hoppscotch"
+              blank
+              @click.native="options.tippy().hide()"
+            />
+            <SmartItem
+              svg="twitter"
+              :label="`${t('app.twitter')}`"
+              to="https://hoppscotch.io/twitter"
+              blank
+              @click.native="options.tippy().hide()"
+            />
+            <SmartItem
+              svg="user-plus"
+              :label="`${t('app.invite')}`"
+              @click.native="
+                () => {
+                  showShare = true
+                  options.tippy().hide()
+                }
+              "
+            />
+            <SmartItem
+              svg="lock"
+              :label="`${t('app.terms_and_privacy')}`"
+              to="https://docs.hoppscotch.io/privacy"
+              blank
+              @click.native="options.tippy().hide()"
+            />
+            <SmartItem
+              svg="gift"
+              :label="`${t('app.whats_new')}`"
+              to="https://docs.hoppscotch.io/changelog"
+              blank
+              @click.native="options.tippy().hide()"
+            />
+            <!-- <SmartItem :label="t('app.status')" /> -->
+            <div class="flex opacity-50 py-2 px-4">
+              {{ `${t("app.name")} ${t("app.version")}` }}
             </div>
-          </tippy>
-        </span>
+          </div>
+        </tippy>
         <ButtonSecondary
           v-tippy="{ theme: 'tooltip' }"
           svg="zap"
diff --git a/packages/hoppscotch-app/components/app/Interceptor.vue b/packages/hoppscotch-app/components/app/Interceptor.vue
index 55576dd6..39418609 100644
--- a/packages/hoppscotch-app/components/app/Interceptor.vue
+++ b/packages/hoppscotch-app/components/app/Interceptor.vue
@@ -8,59 +8,84 @@
         {{ t("settings.interceptor_description") }}
       </p>
     </div>
-    <SmartToggle
-      :on="PROXY_ENABLED"
-      @change="toggleSettingKey('PROXY_ENABLED')"
-    >
-      {{ t("settings.proxy") }}
-    </SmartToggle>
-    <SmartToggle
-      :on="EXTENSIONS_ENABLED"
-      @change="toggleSettingKey('EXTENSIONS_ENABLED')"
-    >
-      {{ t("settings.extensions") }}:
-      {{
-        extensionVersion != null
-          ? `v${extensionVersion.major}.${extensionVersion.minor}`
-          : t("settings.extension_ver_not_reported")
-      }}
-    </SmartToggle>
+    <SmartRadioGroup
+      :radios="interceptors"
+      :selected="interceptorSelection"
+      @change="toggleSettingKey"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
-import { defineComponent } from "@nuxtjs/composition-api"
+import { computed, ref, watchEffect } from "@nuxtjs/composition-api"
 import { KeysMatching } from "~/types/ts-utils"
-import { SettingsType, toggleSetting, useSetting } from "~/newstore/settings"
+import {
+  applySetting,
+  SettingsType,
+  toggleSetting,
+  useSetting,
+} from "~/newstore/settings"
 import { hasExtensionInstalled } from "~/helpers/strategies/ExtensionStrategy"
-import { useI18n } from "~/helpers/utils/composables"
+import { useI18n, usePolled } from "~/helpers/utils/composables"
 
 const t = useI18n()
 
 const PROXY_ENABLED = useSetting("PROXY_ENABLED")
 const EXTENSIONS_ENABLED = useSetting("EXTENSIONS_ENABLED")
 
-const toggleSettingKey = <K extends KeysMatching<SettingsType, boolean>>(
+const toggleSettingKey = <
+  K extends KeysMatching<SettingsType | "BROWSER_ENABLED", boolean>
+>(
   key: K
 ) => {
-  if (key === "EXTENSIONS_ENABLED" && PROXY_ENABLED.value) {
-    toggleSetting("PROXY_ENABLED")
+  interceptorSelection.value = key
+  if (key === "EXTENSIONS_ENABLED") {
+    applySetting("EXTENSIONS_ENABLED", true)
+    if (PROXY_ENABLED.value) toggleSetting("PROXY_ENABLED")
   }
-  if (key === "PROXY_ENABLED" && EXTENSIONS_ENABLED.value) {
-    toggleSetting("EXTENSIONS_ENABLED")
+  if (key === "PROXY_ENABLED") {
+    applySetting("PROXY_ENABLED", true)
+    if (EXTENSIONS_ENABLED.value) toggleSetting("EXTENSIONS_ENABLED")
+  }
+  if (key === "BROWSER_ENABLED") {
+    applySetting("PROXY_ENABLED", false)
+    applySetting("EXTENSIONS_ENABLED", false)
   }
-  toggleSetting(key)
 }
-</script>
 
-<script lang="ts">
-export default defineComponent({
-  data() {
-    return {
-      extensionVersion: hasExtensionInstalled()
-        ? window.__POSTWOMAN_EXTENSION_HOOK__.getVersion()
-        : null,
-    }
+const extensionVersion = usePolled(5000, (stopPolling) => {
+  const result = hasExtensionInstalled()
+    ? window.__POSTWOMAN_EXTENSION_HOOK__.getVersion()
+    : null
+
+  // We don't need to poll anymore after we get value
+  if (result) stopPolling()
+
+  return result
+})
+
+const interceptors = computed(() => [
+  { value: "BROWSER_ENABLED", label: t("state.none") },
+  { value: "PROXY_ENABLED", label: t("settings.proxy") },
+  {
+    value: "EXTENSIONS_ENABLED",
+    label:
+      `${t("settings.extensions")}: ` +
+      (extensionVersion.value !== null
+        ? `v${extensionVersion.value.major}.${extensionVersion.value.minor}`
+        : t("settings.extension_ver_not_reported")),
   },
+])
+
+const interceptorSelection = ref("")
+
+watchEffect(() => {
+  if (PROXY_ENABLED.value) {
+    interceptorSelection.value = "PROXY_ENABLED"
+  } else if (EXTENSIONS_ENABLED.value) {
+    interceptorSelection.value = "EXTENSIONS_ENABLED"
+  } else {
+    interceptorSelection.value = "BROWSER_ENABLED"
+  }
 })
 </script>
diff --git a/packages/hoppscotch-app/components/http/ResponseMeta.vue b/packages/hoppscotch-app/components/http/ResponseMeta.vue
index 9374ea89..9e20baf3 100644
--- a/packages/hoppscotch-app/components/http/ResponseMeta.vue
+++ b/packages/hoppscotch-app/components/http/ResponseMeta.vue
@@ -122,25 +122,6 @@
             {{ `${response.meta.responseSize} B` }}
           </span>
         </div>
-        <div class="inline-flex">
-          <tippy
-            ref="options"
-            interactive
-            trigger="click"
-            theme="popover"
-            arrow
-          >
-            <template #trigger>
-              <ButtonSecondary
-                v-tippy="{ theme: 'tooltip' }"
-                :title="t('settings.interceptor')"
-                svg="globe"
-                class="!p-0"
-              />
-            </template>
-            <AppInterceptor />
-          </tippy>
-        </div>
       </div>
     </div>
   </div>
diff --git a/packages/hoppscotch-app/components/smart/Radio.vue b/packages/hoppscotch-app/components/smart/Radio.vue
new file mode 100644
index 00000000..90085d72
--- /dev/null
+++ b/packages/hoppscotch-app/components/smart/Radio.vue
@@ -0,0 +1,35 @@
+<template>
+  <label
+    class="cursor-pointer flex-nowrap transition inline-flex items-center justify-center group hover:text-secondaryDark"
+  >
+    <input
+      type="radio"
+      :value="value"
+      :checked="value === selected"
+      class="appearance-none cursor-pointer mr-4 transition rounded-full h-4 w-4 border-2 border-divider group-hover:border-accentDark checked:border-4 checked:border-accent focus:outline-none"
+      @change="$emit('change', value)"
+    />
+    <span class="font-semibold transition">{{ label }}</span>
+  </label>
+</template>
+
+<script>
+import { defineComponent } from "@nuxtjs/composition-api"
+
+export default defineComponent({
+  props: {
+    value: {
+      type: String,
+      default: "",
+    },
+    label: {
+      type: String,
+      default: "",
+    },
+    selected: {
+      type: String,
+      default: "",
+    },
+  },
+})
+</script>
diff --git a/packages/hoppscotch-app/components/smart/RadioGroup.vue b/packages/hoppscotch-app/components/smart/RadioGroup.vue
new file mode 100644
index 00000000..7f5b3caa
--- /dev/null
+++ b/packages/hoppscotch-app/components/smart/RadioGroup.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="flex flex-col space-y-4 items-start">
+    <SmartRadio
+      v-for="(radio, index) in radios"
+      :key="`radio-${index}`"
+      :value="radio.value"
+      :label="radio.label"
+      :selected="selected"
+      @change="$emit('change', radio.value)"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+defineProps<{
+  radios: Array<{
+    value: string
+    label: string
+  }>
+  selected: string
+}>()
+</script>