btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

fix: resolved #2771

Browse Source
This commit is contained in:
Liyas Thomas
2022-10-11 10:35:14 +05:30
parent e6652109c5
commit 4046b91609
23 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-app/locales/af.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/cs.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/da.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/el.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/en.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/fi.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/he.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/ja.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/nl.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/no.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/pl.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/pt.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/sr.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/sv.json
View File

@@ -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",

2
packages/hoppscotch-app/locales/vi.json
View File

@@ -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",

5
packages/hoppscotch-app/src/components/collections/ChooseType.vue
View File

@@ -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

7
packages/hoppscotch-app/src/components/collections/index.vue
View File

@@ -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"

5
packages/hoppscotch-app/src/components/environments/ChooseType.vue
View File

@@ -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

17
packages/hoppscotch-app/src/components/environments/index.vue
View File

@@ -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(

2
packages/hoppscotch-app/src/components/environments/my/index.vue
View File

@@ -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"

2
packages/hoppscotch-app/src/components/environments/teams/index.vue
View File

@@ -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'"

3
packages/hoppscotch-app/src/components/smart/Tab.vue
View File

@@ -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 {

3
packages/hoppscotch-app/src/components/smart/Tabs.vue
View File

@@ -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 = {