Skip to content

Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia

chore: merge hoppscotch/release/2023.8.3 into hoppscotch/release/2023.12.0

Andrew Bastin93ce86f32d09
diff --cc packages/hoppscotch-common/src/components/collections/index.vue
index 7b8c43b69,c903a068f..734752163
--- a/packages/hoppscotch-common/src/components/collections/index.vue
+++ b/packages/hoppscotch-common/src/components/collections/index.vue
@@@ -18,13 -18,12 +18,12 @@@
"
>
<WorkspaceCurrent :section="t('tab.collections')" />
-
- <HoppSmartInput
+ <input
v-model="filterTexts"
- :placeholder="t('action.search')"
- input-styles="py-2 pl-4 pr-2 bg-transparent !border-0"
type="search"
- :autofocus="false"
+ autocomplete="off"
- class="flex w-full p-4 py-2 bg-transparent h-8"
++ class="flex h-8 w-full bg-transparent p-4 py-2"
+ :placeholder="t('action.search')"
:disabled="collectionsType.type === 'team-collections'"
/>
</div>
diff --cc packages/hoppscotch-common/src/components/graphql/Sidebar.vue
index 3b0155887,b297814ab..b91d481c5
--- a/packages/hoppscotch-common/src/components/graphql/Sidebar.vue
+++ b/packages/hoppscotch-common/src/components/graphql/Sidebar.vue
@@@ -30,8 -30,8 +30,8 @@@
v-model="graphqlFieldsFilterText"
type="search"
autocomplete="off"
- class="flex w-full p-4 py-2 bg-transparent h-8"
++ class="flex h-8 w-full bg-transparent p-4 py-2"
:placeholder="`${t('action.search')}`"
- class="flex flex-1 bg-transparent p-4 py-2"
/>
<div class="flex">
<HoppButtonSecondary
diff --cc packages/hoppscotch-common/src/components/history/index.vue
index cb71b8a0f,0c3a48eec..7e124cbcb
--- a/packages/hoppscotch-common/src/components/history/index.vue
+++ b/packages/hoppscotch-common/src/components/history/index.vue
@@@ -9,7 -9,7 +9,7 @@@
v-model="filterText"
type="search"
autocomplete="off"
- class="flex flex-1 bg-transparent p-4 py-2"
- class="flex w-full p-4 py-2 bg-transparent h-8"
++ class="flex h-8 w-full bg-transparent p-4 py-2"
:placeholder="`${t('action.search')}`"
/>
<div class="flex">
diff --cc packages/hoppscotch-common/src/components/teams/Edit.vue
index bc70c1bf4,28129a90b..d08ca54ab
--- a/packages/hoppscotch-common/src/components/teams/Edit.vue
+++ b/packages/hoppscotch-common/src/components/teams/Edit.vue
@@@ -35,12 -35,12 +35,12 @@@
v-if="
!teamDetails.loading &&
E.isRight(teamDetails.data) &&
- teamDetails.data.right.team.teamMembers
+ teamDetails.data.right.team?.teamMembers
"
- class="border rounded border-divider"
+ class="rounded border border-divider"
>
<HoppSmartPlaceholder
- v-if="teamDetails.data.right.team.teamMembers === 0"
+ v-if="teamDetails.data.right.team.teamMembers.length === 0"
:src="`/images/states/${colorMode.value}/add_group.svg`"
:alt="`${t('empty.members')}`"
:text="t('empty.members')"