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

feat: visually indicate nested env expand overflow

Browse Source
This commit is contained in:
liyasthomas
2022-01-29 18:42:19 +05:30
parent 0668be971b
commit 65fc660881
33 changed files with 95 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/hoppscotch-app/assets/scss/styles.scss
View File

@@ -158,6 +158,11 @@ a {
@apply ml-1;
@apply my-0;
@apply truncate;
&.expand-loop {
@apply bg-error;
@apply text-accentContrast;
}
}
}

19
packages/hoppscotch-app/components/smart/EnvInput.vue
View File

@@ -213,14 +213,22 @@ export default defineComponent({
.substring(position.start, position.end + 1)
.slice(2, -2)
result += `<span class="${highlightPositions[k].style} ${
this.aggregateEnvs.find((k) => k.key === envVar)?.value === undefined
this.aggregateEnvs.find((k) => k.key === envVar)?.value ===
undefined ||
this.getEnvValue(this.constructEnv(envVar)) === "ENV_EXPAND_LOOP"
? "bg-red-400 text-red-50 hover:bg-red-600"
: "bg-accentDark text-accentContrast hover:bg-accent"
}" v-tippy data-tippy-content="${this.getEnvName(
this.aggregateEnvs.find((k) => k.key === envVar)?.sourceEnv
)}<xmp>${this.getEnvValue(
this.constructEnv(envVar)
)}</xmp>">${this.safe_tags_replace(
)}<xmp class='${
this.getEnvValue(this.constructEnv(envVar)) === "ENV_EXPAND_LOOP"
? "expand-loop"
: "found"
}'>${
this.getEnvValue(this.constructEnv(envVar)) === "ENV_EXPAND_LOOP"
? this.$t("environment.nested_overflow")
: this.getEnvValue(this.constructEnv(envVar))
}</xmp>">${this.safe_tags_replace(
this.internalValue.substring(position.start, position.end + 1)
)}</span>`
startingPosition = position.end + 1
@@ -478,6 +486,7 @@ export default defineComponent({
},
getEnvValue(value) {
if (value) return value.replace(/"/g, "&quot;")
if (value === "ENV_EXPAND_LOOP") return "ENV_EXPAND_LOOP"
// it does not filter special characters before adding them to HTML.
return "not found"
},
@@ -491,7 +500,7 @@ export default defineComponent({
if (E.isLeft(result)) {
console.error("error", result.left)
return ""
return result.left
} else {
return result.right
}

57
packages/hoppscotch-app/helpers/terndoc/ecma.json
View File

@@ -281,15 +281,11 @@
"!stdProto": "Function",
"apply": {
"!type": "fn(this: ?, args: [?])",
"!effects": [
"call and return !this this=!0 !1.<i> !1.<i> !1.<i>"
]
"!effects": ["call and return !this this=!0 !1.<i> !1.<i> !1.<i>"]
},
"call": {
"!type": "fn(this: ?, args?: ?) -> !this.!ret",
"!effects": [
"call and return !this this=!0 !1 !2 !3 !4"
]
"!effects": ["call and return !this this=!0 !1 !2 !3 !4"]
},
"bind": {
"!type": "fn(this: ?, args?: ?) -> !custom:Function_bind"
@@ -304,9 +300,7 @@
},
"from": {
"!type": "fn(arrayLike: ?, mapFn?: fn(elt: ?, i: number) -> ?, thisArg?: ?) -> [!0.<i>]",
"!effects": [
"call !1 this=!2 !0.<i> number"
]
"!effects": ["call !1 this=!2 !0.<i> number"]
},
"of": {
"!type": "fn(elementN: ?) -> [!0]"
@@ -330,18 +324,14 @@
},
"push": {
"!type": "fn(newelt: ?) -> number",
"!effects": [
"propagate !0 !this.<i>"
]
"!effects": ["propagate !0 !this.<i>"]
},
"shift": {
"!type": "fn() -> !this.<i>"
},
"unshift": {
"!type": "fn(newelt: ?) -> number",
"!effects": [
"propagate !0 !this.<i>"
]
"!effects": ["propagate !0 !this.<i>"]
},
"slice": {
"!type": "fn(from?: number, to?: number) -> !this"
@@ -351,9 +341,7 @@
},
"sort": {
"!type": "fn(compare?: fn(a: ?, b: ?) -> number)",
"!effects": [
"call !0 !this.<i> !this.<i>"
]
"!effects": ["call !0 !this.<i> !this.<i>"]
},
"indexOf": {
"!type": "fn(elt: ?, from?: number) -> number"
@@ -363,45 +351,31 @@
},
"every": {
"!type": "fn(test: fn(elt: ?, i: number, array: +Array) -> bool, context?: ?) -> bool",
"!effects": [
"call !0 this=!1 !this.<i> number !this"
]
"!effects": ["call !0 this=!1 !this.<i> number !this"]
},
"some": {
"!type": "fn(test: fn(elt: ?, i: number, array: +Array) -> bool, context?: ?) -> bool",
"!effects": [
"call !0 this=!1 !this.<i> number !this"
]
"!effects": ["call !0 this=!1 !this.<i> number !this"]
},
"filter": {
"!type": "fn(test: fn(elt: ?, i: number, array: +Array) -> bool, context?: ?) -> !this",
"!effects": [
"call !0 this=!1 !this.<i> number !this"
]
"!effects": ["call !0 this=!1 !this.<i> number !this"]
},
"forEach": {
"!type": "fn(f: fn(elt: ?, i: number, array: +Array), context?: ?)",
"!effects": [
"call !0 this=!1 !this.<i> number !this"
]
"!effects": ["call !0 this=!1 !this.<i> number !this"]
},
"map": {
"!type": "fn(f: fn(elt: ?, i: number, array: +Array) -> ?, context?: ?) -> [!0.!ret]",
"!effects": [
"call !0 this=!1 !this.<i> number !this"
]
"!effects": ["call !0 this=!1 !this.<i> number !this"]
},
"reduce": {
"!type": "fn(combine: fn(sum: ?, elt: ?, i: number, array: +Array) -> ?, init?: ?) -> !0.!ret",
"!effects": [
"call !0 !1 !this.<i> number !this"
]
"!effects": ["call !0 !1 !this.<i> number !this"]
},
"reduceRight": {
"!type": "fn(combine: fn(sum: ?, elt: ?, i: number, array: +Array) -> ?, init?: ?) -> !0.!ret",
"!effects": [
"call !0 !1 !this.<i> number !this"
]
"!effects": ["call !0 !1 !this.<i> number !this"]
},
"copyWithin": {
"!type": "fn(target: number, start: number, end?: number) -> !this"
@@ -797,9 +771,10 @@
"toJSON": {
"!type": "fn() -> string"
}
}
},
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"Error": {
"error": {
"!type": "fn(message: string)",
"prototype": {
"name": {

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

@@ -165,7 +165,8 @@
"no_environment": "Geen omgewing nie",
"select": "Kies omgewing",
"title": "Omgewings",
"variable_list": "Veranderlike lys"
"variable_list": "Veranderlike lys",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Dit lyk nie asof hierdie blaaier ondersteuning vir bedieners gestuurde geleenthede het nie.",

3
packages/hoppscotch-app/locales/ar.json
View File

@@ -166,7 +166,8 @@
"no_environment": "لا بيئة",
"select": "حدد البيئة",
"title": "البيئات",
"variable_list": "قائمة متغيرة"
"variable_list": "قائمة متغيرة",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "يبدو أن هذا المستعرض لا يدعم أحداث إرسال الخادم.",

3
packages/hoppscotch-app/locales/ca.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Sense entorn",
"select": "Seleccioneu un entorn",
"title": "Entorns",
"variable_list": "Llista de variables"
"variable_list": "Llista de variables",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Sembla que aquest navegador no és compatible amb els esdeveniments enviats per servidor.",

3
packages/hoppscotch-app/locales/cn.json
View File

@@ -165,7 +165,8 @@
"no_environment": "无环境",
"select": "选择环境",
"title": "环境",
"variable_list": "变量列表"
"variable_list": "变量列表",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "该浏览器似乎不支持 SSE。",

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

@@ -165,7 +165,8 @@
"no_environment": "Žádné prostředí",
"select": "Vyberte prostředí",
"title": "Prostředí",
"variable_list": "Seznam proměnných"
"variable_list": "Seznam proměnných",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Zdá se, že tento prohlížeč nemá podporu událostí odeslaných serverem.",

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

@@ -165,7 +165,8 @@
"no_environment": "Intet miljø",
"select": "Vælg miljø",
"title": "Miljøer",
"variable_list": "Variabel liste"
"variable_list": "Variabel liste",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Det ser ikke ud til, at denne browser understøtter Server Sent Events.",

3
packages/hoppscotch-app/locales/de.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Keine Umgebung",
"select": "Umgebung auswählen",
"title": "Umgebungen",
"variable_list": "Variablenliste"
"variable_list": "Variablenliste",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Dieser Browser scheint keine Unterstützung für vom Server gesendete Ereignisse zu haben.",

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

@@ -165,7 +165,8 @@
"no_environment": "Χωρίς περιβάλλον",
"select": "Επιλέξτε περιβάλλον",
"title": "Περιβάλλοντα",
"variable_list": "Λίστα μεταβλητών"
"variable_list": "Λίστα μεταβλητών",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Αυτό το πρόγραμμα περιήγησης δεν φαίνεται να υποστηρίζει διακομιστές που έχουν σταλεί συμβάντα.",

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

@@ -165,7 +165,8 @@
"no_environment": "No environment",
"select": "Select environment",
"title": "Environments",
"variable_list": "Variable List"
"variable_list": "Variable List",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "This browser doesn't seems to have Server Sent Events support.",

3
packages/hoppscotch-app/locales/es.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Sin entorno",
"select": "Seleccionar entorno",
"title": "Entornos",
"variable_list": "Lista de variables"
"variable_list": "Lista de variables",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Este navegador no parece ser compatible con los eventos enviados por el servidor.",

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

@@ -165,7 +165,8 @@
"no_environment": "Ei ympäristöä",
"select": "Valitse ympäristö",
"title": "Ympäristöt",
"variable_list": "Muuttujien luettelo"
"variable_list": "Muuttujien luettelo",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Tämä selain ei näytä tukevan palvelimen lähettämiä tapahtumia.",

3
packages/hoppscotch-app/locales/fr.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Pas d'environnement",
"select": "Sélectionnez l'environnement",
"title": "Environnements",
"variable_list": "Liste des variables"
"variable_list": "Liste des variables",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Ce navigateur ne semble pas prendre en charge les événements envoyés par le serveur.",

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

@@ -165,7 +165,8 @@
"no_environment": "אין סביבה",
"select": "בחר סביבה",
"title": "סביבות",
"variable_list": "רשימת משתנים"
"variable_list": "רשימת משתנים",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "נראה שלדפדפן זה אין תמיכה באירועי שרת נשלח.",

3
packages/hoppscotch-app/locales/hu.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Nincs környezet",
"select": "Környezet kiválasztása",
"title": "Környezetek",
"variable_list": "Változólista"
"variable_list": "Változólista",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Úgy tűnik, hogy ez a böngésző nem támogatja a kiszolgáló által küldött eseményeket.",

3
packages/hoppscotch-app/locales/it.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Nessun ambiente",
"select": "Seleziona ambiente",
"title": "Ambienti",
"variable_list": "Elenco variabili"
"variable_list": "Elenco variabili",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Questo browser non sembra supportare gli eventi inviati dal server (Server Sent Events).",

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

@@ -165,7 +165,8 @@
"no_environment": "環境なし",
"select": "環境を選択する",
"title": "環境",
"variable_list": "変数リスト"
"variable_list": "変数リスト",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "このブラウザはサーバー送信イベントをサポートしていないようです。",

3
packages/hoppscotch-app/locales/ko.json
View File

@@ -165,7 +165,8 @@
"no_environment": "환경 없음",
"select": "환경 선택",
"title": "환경",
"variable_list": "변수 목록"
"variable_list": "변수 목록",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "이 브라우저는 서버 전송 이벤트를 지원하지 않는 것 같습니다.",

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

@@ -165,7 +165,8 @@
"no_environment": "Geen omgeving",
"select": "Selecteer omgeving",
"title": "omgevingen",
"variable_list": "Variabele lijst"
"variable_list": "Variabele lijst",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Deze browser lijkt geen ondersteuning te hebben voor door de server verzonden gebeurtenissen.",

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

@@ -165,7 +165,8 @@
"no_environment": "Ingen miljø",
"select": "Velg miljø",
"title": "Miljøer",
"variable_list": "Variabel liste"
"variable_list": "Variabel liste",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Denne nettleseren ser ikke ut til å ha Server Sent Events -støtte.",

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

@@ -165,7 +165,8 @@
"no_environment": "Brak środowiska",
"select": "Wybierz środowisko",
"title": "Środowiska",
"variable_list": "Lista zmiennych"
"variable_list": "Lista zmiennych",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Wygląda na to, że ta przeglądarka nie obsługuje zdarzeń wysłanych przez serwer.",

3
packages/hoppscotch-app/locales/pt-br.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Sem ambiente",
"select": "Selecione o ambiente",
"title": "Ambientes",
"variable_list": "Lista de Variáveis"
"variable_list": "Lista de Variáveis",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Este navegador não parece ter suporte para eventos enviados pelo servidor.",

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

@@ -165,7 +165,8 @@
"no_environment": "Sem ambiente",
"select": "Selecione o ambiente",
"title": "Ambientes",
"variable_list": "Lista de Variáveis"
"variable_list": "Lista de Variáveis",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Este navegador não parece ter suporte para eventos enviados pelo servidor.",

3
packages/hoppscotch-app/locales/ro.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Fără mediu",
"select": "Selectați mediul",
"title": "Medii",
"variable_list": "Lista variabilelor"
"variable_list": "Lista variabilelor",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Acest browser pare să nu aibă suport pentru Server Sent Events.",

3
packages/hoppscotch-app/locales/ru.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Нет окружающей среды",
"select": "Выберите среду",
"title": "Среды",
"variable_list": "Список переменных"
"variable_list": "Список переменных",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Похоже, в этом браузере нет поддержки событий, отправленных сервером.",

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

@@ -166,7 +166,8 @@
"no_environment": "Нема окружења",
"select": "Изаберите окружење",
"title": "Енвиронментс",
"variable_list": "Листа променљивих"
"variable_list": "Листа променљивих",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Изгледа да овај прегледач нема подршку за Послане догађаје са сервера.",

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

@@ -165,7 +165,8 @@
"no_environment": "Ingen miljö",
"select": "Välj miljö",
"title": "Miljöer",
"variable_list": "Variabel lista"
"variable_list": "Variabel lista",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Den här webbläsaren verkar inte ha stöd för Server Sent Events.",

3
packages/hoppscotch-app/locales/tr.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Ortam yok",
"select": "Ortam seçin",
"title": "Ortamlar",
"variable_list": "Değişken Listesi"
"variable_list": "Değişken Listesi",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Bu tarayıcıda Sunucu Gönderilen Olaylar desteği yok gibi görünüyor.",

3
packages/hoppscotch-app/locales/tw.json
View File

@@ -165,7 +165,8 @@
"no_environment": "無環境",
"select": "選擇環境",
"title": "環境",
"variable_list": "變數列表"
"variable_list": "變數列表",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "此瀏覽器似乎不支援 SSE。",

3
packages/hoppscotch-app/locales/uk.json
View File

@@ -165,7 +165,8 @@
"no_environment": "Жодного середовища",
"select": "Виберіть середовище",
"title": "Середовища",
"variable_list": "Список змінних"
"variable_list": "Список змінних",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Схоже, цей браузер не підтримує події, надіслані сервером.",

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

@@ -165,7 +165,8 @@
"no_environment": "Không có môi trường",
"select": "Chọn môi trường",
"title": "Môi trường",
"variable_list": "Danh sách biến"
"variable_list": "Danh sách biến",
"nested_overflow": "nested environment variables are limited to 10 levels"
},
"error": {
"browser_support_sse": "Trình duyệt này dường như không có hỗ trợ Sự kiện do Máy chủ gửi.",