From 4046b916095ff6e7c3543111aa2eef3dc10f6e82 Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Tue, 11 Oct 2022 10:35:14 +0530
Subject: [PATCH] fix: resolved #2771

---
 packages/hoppscotch-app/locales/af.json         |  2 +-
 packages/hoppscotch-app/locales/cs.json         |  2 +-
 packages/hoppscotch-app/locales/da.json         |  2 +-
 packages/hoppscotch-app/locales/el.json         |  2 +-
 packages/hoppscotch-app/locales/en.json         |  2 +-
 packages/hoppscotch-app/locales/fi.json         |  2 +-
 packages/hoppscotch-app/locales/he.json         |  2 +-
 packages/hoppscotch-app/locales/ja.json         |  2 +-
 packages/hoppscotch-app/locales/nl.json         |  2 +-
 packages/hoppscotch-app/locales/no.json         |  2 +-
 packages/hoppscotch-app/locales/pl.json         |  2 +-
 packages/hoppscotch-app/locales/pt.json         |  2 +-
 packages/hoppscotch-app/locales/sr.json         |  2 +-
 packages/hoppscotch-app/locales/sv.json         |  2 +-
 packages/hoppscotch-app/locales/vi.json         |  2 +-
 .../src/components/collections/ChooseType.vue   |  5 ++---
 .../src/components/collections/index.vue        |  7 -------
 .../src/components/environments/ChooseType.vue  |  5 ++---
 .../src/components/environments/index.vue       | 17 +++++++++--------
 .../src/components/environments/my/index.vue    |  2 +-
 .../src/components/environments/teams/index.vue |  2 +-
 .../hoppscotch-app/src/components/smart/Tab.vue |  3 +++
 .../src/components/smart/Tabs.vue               |  3 +++
 23 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/packages/hoppscotch-app/locales/af.json b/packages/hoppscotch-app/locales/af.json
index 4d1c62d7..d3973729 100644
--- a/packages/hoppscotch-app/locales/af.json
+++ b/packages/hoppscotch-app/locales/af.json
@@ -168,7 +168,7 @@
     "members": "Span is leeg",
     "parameters": "Hierdie versoek het geen parameters nie",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Protokolle is leeg",
     "schema": "Koppel aan 'n GraphQL -eindpunt",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/cs.json b/packages/hoppscotch-app/locales/cs.json
index f68e70df..bd4f98d0 100644
--- a/packages/hoppscotch-app/locales/cs.json
+++ b/packages/hoppscotch-app/locales/cs.json
@@ -168,7 +168,7 @@
     "members": "Tým je prázdný",
     "parameters": "Tento požadavek nemá žádné parametry",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Protokoly jsou prázdné",
     "schema": "Připojte se ke koncovému bodu GraphQL",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/da.json b/packages/hoppscotch-app/locales/da.json
index 2bd6e554..5decc16e 100644
--- a/packages/hoppscotch-app/locales/da.json
+++ b/packages/hoppscotch-app/locales/da.json
@@ -168,7 +168,7 @@
     "members": "Holdet er tomt",
     "parameters": "Denne anmodning har ingen parametre",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Protokoller er tomme",
     "schema": "Opret forbindelse til et GraphQL -slutpunkt",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/el.json b/packages/hoppscotch-app/locales/el.json
index cffb9afb..48be0afa 100644
--- a/packages/hoppscotch-app/locales/el.json
+++ b/packages/hoppscotch-app/locales/el.json
@@ -168,7 +168,7 @@
     "members": "Η ομάδα είναι άδεια",
     "parameters": "Αυτό το αίτημα δεν έχει παραμέτρους",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Τα πρωτόκολλα είναι κενά",
     "schema": "Συνδεθείτε σε ένα τελικό σημείο GraphQL",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/en.json b/packages/hoppscotch-app/locales/en.json
index e124a0e5..1d9acb5b 100644
--- a/packages/hoppscotch-app/locales/en.json
+++ b/packages/hoppscotch-app/locales/en.json
@@ -168,7 +168,7 @@
     "members": "Team is empty",
     "parameters": "This request does not have any parameters",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Protocols are empty",
     "schema": "Connect to a GraphQL endpoint to view schema",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/fi.json b/packages/hoppscotch-app/locales/fi.json
index 578f60dc..a7104ecd 100644
--- a/packages/hoppscotch-app/locales/fi.json
+++ b/packages/hoppscotch-app/locales/fi.json
@@ -168,7 +168,7 @@
     "members": "Joukkue on tyhjä",
     "parameters": "Tässä pyynnössä ei ole parametreja",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Protokollat ovat tyhjiä",
     "schema": "Muodosta yhteys GraphQL -päätepisteeseen",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/he.json b/packages/hoppscotch-app/locales/he.json
index e741f487..93923d8b 100644
--- a/packages/hoppscotch-app/locales/he.json
+++ b/packages/hoppscotch-app/locales/he.json
@@ -168,7 +168,7 @@
     "members": "הקבוצה ריקה",
     "parameters": "לבקשה זו אין פרמטרים",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "הפרוטוקולים ריקים",
     "schema": "התחבר לנקודת קצה של GraphQL",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/ja.json b/packages/hoppscotch-app/locales/ja.json
index fd2ac808..a554af56 100644
--- a/packages/hoppscotch-app/locales/ja.json
+++ b/packages/hoppscotch-app/locales/ja.json
@@ -168,7 +168,7 @@
     "members": "Team is empty",
     "parameters": "This request does not have any parameters",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Protocols are empty",
     "schema": "Connect to a GraphQL endpoint to view schema",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/nl.json b/packages/hoppscotch-app/locales/nl.json
index 6e138343..ab8481d9 100644
--- a/packages/hoppscotch-app/locales/nl.json
+++ b/packages/hoppscotch-app/locales/nl.json
@@ -168,7 +168,7 @@
     "members": "Team is leeg",
     "parameters": "Dit verzoek heeft geen parameters",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Protocollen zijn leeg",
     "schema": "Verbinding maken met een GraphQL-eindpunt",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/no.json b/packages/hoppscotch-app/locales/no.json
index 740be4ec..547de43b 100644
--- a/packages/hoppscotch-app/locales/no.json
+++ b/packages/hoppscotch-app/locales/no.json
@@ -168,7 +168,7 @@
     "members": "Teamet er tomt",
     "parameters": "Denne forespørselen har ingen parametere",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Protokoller er tomme",
     "schema": "Koble til et GraphQL-endepunkt",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/pl.json b/packages/hoppscotch-app/locales/pl.json
index 2c1b3ea9..f7f23a0f 100644
--- a/packages/hoppscotch-app/locales/pl.json
+++ b/packages/hoppscotch-app/locales/pl.json
@@ -168,7 +168,7 @@
     "members": "Zespół jest pusty",
     "parameters": "To żądanie nie ma żadnych parametrów",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Protokoły są puste",
     "schema": "Połącz się z punktem końcowym GraphQL",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/pt.json b/packages/hoppscotch-app/locales/pt.json
index b4b491ed..a759008d 100644
--- a/packages/hoppscotch-app/locales/pt.json
+++ b/packages/hoppscotch-app/locales/pt.json
@@ -168,7 +168,7 @@
     "members": "Time está vazio",
     "parameters": "Esta solicitação não possui parâmetros",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Os protocolos estão vazios",
     "schema": "Conecte-se a um endpoint GraphQL",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/sr.json b/packages/hoppscotch-app/locales/sr.json
index de7b6db7..4af1ffaf 100644
--- a/packages/hoppscotch-app/locales/sr.json
+++ b/packages/hoppscotch-app/locales/sr.json
@@ -168,7 +168,7 @@
     "members": "Тим је празан",
     "parameters": "Овај захтев нема параметре",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Протоколи су празни",
     "schema": "Повежите се са ГрапхКЛ крајњом тачком",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/sv.json b/packages/hoppscotch-app/locales/sv.json
index 455f8b84..9b949c03 100644
--- a/packages/hoppscotch-app/locales/sv.json
+++ b/packages/hoppscotch-app/locales/sv.json
@@ -168,7 +168,7 @@
     "members": "Teamet är tomt",
     "parameters": "Denna begäran har inga parametrar",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Protokoll är tomma",
     "schema": "Anslut till en GraphQL -slutpunkt",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/locales/vi.json b/packages/hoppscotch-app/locales/vi.json
index 371fb684..1f4a70c8 100644
--- a/packages/hoppscotch-app/locales/vi.json
+++ b/packages/hoppscotch-app/locales/vi.json
@@ -168,7 +168,7 @@
     "members": "Đội trống",
     "parameters": "Yêu cầu này không có bất kỳ thông số nào",
     "pending_invites": "There are no pending invites for this team",
-    "profile": "Login in to view your profile",
+    "profile": "Login to view your profile",
     "protocols": "Giao thức trống",
     "schema": "Kết nối với một điểm cuối GraphQL",
     "shortcodes": "Shortcodes are empty",
diff --git a/packages/hoppscotch-app/src/components/collections/ChooseType.vue b/packages/hoppscotch-app/src/components/collections/ChooseType.vue
index 41fe6fd4..c62d2ebe 100644
--- a/packages/hoppscotch-app/src/components/collections/ChooseType.vue
+++ b/packages/hoppscotch-app/src/components/collections/ChooseType.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-show="show">
+  <div>
     <SmartTabs
       :id="'collections_tab'"
       v-model="selectedCollectionTab"
@@ -10,9 +10,9 @@
         :label="`${t('collection.my_collections')}`"
       />
       <SmartTab
-        v-if="currentUser"
         :id="'team-collections'"
         :label="`${t('collection.team_collections')}`"
+        :disabled="!currentUser"
       >
         <SmartIntersection @intersecting="onTeamSelectIntersect">
           <tippy
@@ -98,7 +98,6 @@ const tippyActions = ref<any | null>(null)
 const selectedCollectionTab = ref<CollectionTabs>("my-collections")
 
 defineProps<{
-  show: boolean
   collectionsType: {
     type: "my-collections" | "team-collections"
     selectedTeam: Team | undefined
diff --git a/packages/hoppscotch-app/src/components/collections/index.vue b/packages/hoppscotch-app/src/components/collections/index.vue
index 83cabf2f..141a9d59 100644
--- a/packages/hoppscotch-app/src/components/collections/index.vue
+++ b/packages/hoppscotch-app/src/components/collections/index.vue
@@ -18,7 +18,6 @@
       </div>
       <CollectionsChooseType
         :collections-type="collectionsType"
-        :show="showTeamCollections"
         @update-collection-type="updateCollectionType"
         @update-selected-team="updateSelectedTeam"
       />
@@ -323,12 +322,6 @@ export default defineComponent({
     }
   },
   computed: {
-    showTeamCollections() {
-      if (this.currentUser == null) {
-        return false
-      }
-      return true
-    },
     filteredCollections() {
       const collections =
         this.collectionsType.type === "my-collections"
diff --git a/packages/hoppscotch-app/src/components/environments/ChooseType.vue b/packages/hoppscotch-app/src/components/environments/ChooseType.vue
index 0498e2f1..1b637cc8 100644
--- a/packages/hoppscotch-app/src/components/environments/ChooseType.vue
+++ b/packages/hoppscotch-app/src/components/environments/ChooseType.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-show="show">
+  <div>
     <SmartTabs
       :id="'environments_tab'"
       v-model="selectedEnvironmentTab"
@@ -10,9 +10,9 @@
         :label="`${t('environment.my_environments')}`"
       />
       <SmartTab
-        v-if="currentUser"
         :id="'team-environments'"
         :label="`${t('environment.team_environments')}`"
+        :disabled="!currentUser"
       >
         <SmartIntersection @intersecting="onTeamSelectIntersect">
           <tippy
@@ -98,7 +98,6 @@ const tippyActions = ref<any | null>(null)
 const selectedEnvironmentTab = ref<EnvironmentTabs>("my-environments")
 
 defineProps<{
-  show: boolean
   environmentType: {
     type: "my-environments" | "team-environments"
     selectedTeam: SelectedTeam
diff --git a/packages/hoppscotch-app/src/components/environments/index.vue b/packages/hoppscotch-app/src/components/environments/index.vue
index 7df6b2ef..d5ccf86b 100644
--- a/packages/hoppscotch-app/src/components/environments/index.vue
+++ b/packages/hoppscotch-app/src/components/environments/index.vue
@@ -151,7 +151,6 @@
       </tippy>
       <EnvironmentsChooseType
         :environment-type="environmentType"
-        :show="showTeamEnvironment"
         @update-environment-type="updateEnvironmentType"
         @update-selected-team="updateSelectedTeam"
       />
@@ -202,13 +201,6 @@ const environmentType = ref<EnvironmentsChooseType>({
 
 const currentUser = useReadonlyStream(currentUser$, null)
 
-const showTeamEnvironment = computed(() => {
-  if (currentUser.value == null) {
-    return false
-  }
-  return true
-})
-
 const updateSelectedTeam = (newSelectedTeam: SelectedTeam) => {
   environmentType.value.selectedTeam = newSelectedTeam
 }
@@ -232,6 +224,15 @@ watch(
   }
 )
 
+watch(
+  () => currentUser.value,
+  (newValue) => {
+    if (!newValue) {
+      updateEnvironmentType("my-environments")
+    }
+  }
+)
+
 const myEnvironments = useReadonlyStream(environments$, [])
 
 const selectedEnvironmentIndex = useStream(
diff --git a/packages/hoppscotch-app/src/components/environments/my/index.vue b/packages/hoppscotch-app/src/components/environments/my/index.vue
index a1287e50..1979197c 100644
--- a/packages/hoppscotch-app/src/components/environments/my/index.vue
+++ b/packages/hoppscotch-app/src/components/environments/my/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div
-      class="sticky z-10 top-upperPrimaryStickyFold flex justify-between flex-1 border-b border-dividerLight bg-primary"
+      class="sticky z-10 flex justify-between flex-1 border-b top-upperPrimaryStickyFold border-dividerLight bg-primary"
     >
       <ButtonSecondary
         :icon="IconPlus"
diff --git a/packages/hoppscotch-app/src/components/environments/teams/index.vue b/packages/hoppscotch-app/src/components/environments/teams/index.vue
index a335372d..e4910d61 100644
--- a/packages/hoppscotch-app/src/components/environments/teams/index.vue
+++ b/packages/hoppscotch-app/src/components/environments/teams/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div
-      class="sticky z-10 top-upperSecondaryStickyFold flex justify-between flex-1 border-b border-dividerLight bg-primary"
+      class="sticky z-10 flex justify-between flex-1 border-b top-upperSecondaryStickyFold border-dividerLight bg-primary"
     >
       <ButtonSecondary
         v-if="team === undefined || team.myRole === 'VIEWER'"
diff --git a/packages/hoppscotch-app/src/components/smart/Tab.vue b/packages/hoppscotch-app/src/components/smart/Tab.vue
index ed8673b8..ecc86247 100644
--- a/packages/hoppscotch-app/src/components/smart/Tab.vue
+++ b/packages/hoppscotch-app/src/components/smart/Tab.vue
@@ -23,11 +23,13 @@ const props = withDefaults(
     icon?: Component | object | string | null
     info?: string | null
     indicator?: boolean
+    disabled?: boolean
   }>(),
   {
     icon: null,
     indicator: false,
     info: null,
+    disabled: false,
   }
 )
 
@@ -41,6 +43,7 @@ const tabMeta = computed<TabMeta>(() => ({
   indicator: props.indicator,
   info: props.info,
   label: props.label,
+  disabled: props.disabled,
 }))
 
 const {
diff --git a/packages/hoppscotch-app/src/components/smart/Tabs.vue b/packages/hoppscotch-app/src/components/smart/Tabs.vue
index 46bdc365..180e94ca 100644
--- a/packages/hoppscotch-app/src/components/smart/Tabs.vue
+++ b/packages/hoppscotch-app/src/components/smart/Tabs.vue
@@ -25,8 +25,10 @@
               :class="[
                 { active: modelValue === tabID },
                 { vertical: vertical },
+                { 'opacity-75 !cursor-not-allowed': tabMeta.disabled },
               ]"
               :aria-label="tabMeta.label || ''"
+              :disabled="tabMeta.disabled"
               role="button"
               @keyup.enter="selectTab(tabID)"
               @click="selectTab(tabID)"
@@ -80,6 +82,7 @@ export type TabMeta = {
   icon: string | Component | null
   indicator: boolean
   info: string | null
+  disabled: boolean
 }
 
 export type TabProvider = {