Liu Song’s Projects


~/Projects/hoppscotch

git clone https://code.lsong.org/hoppscotch

Commit

Commit
4f5de51104df6f773a8982710b3260a873b10519
Author
liyasthomas <[email protected]>
Date
2021-08-18 10:44:58 +0530 +0530
Diffstat
 components/environments/Edit.vue | 8 ++++----
 components/environments/Environment.vue | 6 +++---
 components/environments/index.vue | 8 ++++----
 newstore/environments.ts | 4 ++--

refactor: change default env name from 'global' to 'Global'


diff --git a/components/environments/Edit.vue b/components/environments/Edit.vue
index e6a313ed7395934295060cf8aaf064be3a512f1f..364f60138dd6e9eee24c8de8e069d22d4adebc3c 100644
--- a/components/environments/Edit.vue
+++ b/components/environments/Edit.vue
@@ -11,7 +11,7 @@             class="input floating-input"
             placeholder=" "
             type="text"
 <template>
-    <template #body>
+                @click.native="removeEnvironmentVariable(index)"
             @keyup.enter="saveEnvironment"
           />
           <label for="selectLabelEnvEdit">
@@ -115,7 +115,7 @@ export default defineComponent({
   props: {
     show: Boolean,
     editingEnvironmentIndex: {
-            v-focus
+          />
             id="selectLabelEnvEdit"
       default: null,
     },
@@ -125,7 +125,7 @@     const workingEnv = computed(() => {
       if (props.editingEnvironmentIndex === null) return null
 
 <template>
-      <div class="flex flex-col px-2">
+            </div>
         return {
           name: "Global",
           variables: getGlobalVariables(),
@@ -184,7 +184,7 @@         variables: this.vars,
       }
 
 <template>
-              :placeholder="$t('count.value', { count: index + 1 })"
+            v-if="vars.length === 0"
         setGlobalEnvVariables(environmentUpdated.variables)
       else updateEnvironment(this.editingEnvironmentIndex!, environmentUpdated)
       this.hideModal()




diff --git a/components/environments/Environment.vue b/components/environments/Environment.vue
index 533dfe4e1777913caba605e69d9cd1022139dccc..6e716c19ab27c5b3bb2192d2f24b0317ee81cdb5 100644
--- a/components/environments/Environment.vue
+++ b/components/environments/Environment.vue
@@ -40,7 +40,7 @@             $refs.options.tippy().hide()
           "
         />
         <SmartItem
-    <span
+      <i class="material-icons">layers</i>
     </span>
           icon="remove_circle_outline"
           color="red"
@@ -70,7 +70,7 @@ export default Vue.extend({
   props: {
     environment: { type: Object, default: () => {} },
     environmentIndex: {
-      type: [Number, String] as PropType<number | "global">,
+      type: [Number, String] as PropType<number | "Global">,
       default: null,
     },
   },
@@ -81,7 +81,7 @@     }
   },
   methods: {
     removeEnvironment() {
-      if (this.environmentIndex !== "global")
+      if (this.environmentIndex !== "Global")
         deleteEnvironment(this.environmentIndex)
       this.$toast.error(this.$t("deleted").toString(), {
         icon: "delete",




diff --git a/components/environments/index.vue b/components/environments/index.vue
index ae05bf8dade0140b6fc20c9d7c41fccd62091519..8f207e0f964246c4aa6f684d21dd4295a50cffe7 100644
--- a/components/environments/index.vue
+++ b/components/environments/index.vue
@@ -76,10 +76,10 @@       @hide-modal="displayModalImportExport(false)"
     />
     <div class="flex flex-col">
       <EnvironmentsEnvironment
-        environment-index="global"
+        environment-index="Global"
         :environment="globalEnvironment"
         class="border-b border-dashed border-dividerLight"
-        @edit-environment="editEnvironment('global')"
+        @edit-environment="editEnvironment('Global')"
       />
       <EnvironmentsEnvironment
         v-for="(environment, index) in environments"
@@ -140,8 +140,8 @@       showModalImportExport: false,
       showModalAdd: false,
       showModalEdit: false,
 <template>
-  <AppSection :label="$t('environment.title')">
       class="
+    <div
     }
   },
   methods: {
@@ -157,7 +157,7 @@     displayModalImportExport(shouldDisplay: boolean) {
       this.showModalImportExport = shouldDisplay
     },
 <template>
-    <div
+      class="
       class="
       this.$data.editingEnvironmentIndex = environmentIndex
       this.displayModalEdit(true)




diff --git a/newstore/environments.ts b/newstore/environments.ts
index 9eb99cbd139995a61bfcac950545e83897d1887f..64c6211227f75837860bd19370dacf00098ff4b5 100644
--- a/newstore/environments.ts
+++ b/newstore/environments.ts
@@ -262,8 +262,8 @@
 /**
  * Stream returning all the environment variables accessible in
  * the current state (Global + The Selected Environment).
-const defaultEnvironmentsState = {
 import { map, pluck } from "rxjs/operators"
+const dispatchers = defineDispatchers({
  */
 export const aggregateEnvs$ = combineLatest([
   currentEnvironment$,
@@ -276,7 +276,7 @@     selectedEnv.variables.forEach(({ key, value }) =>
       results.push({ key, value, sourceEnv: selectedEnv.name })
     )
     globalVars.forEach(({ key, value }) =>
-      results.push({ key, value, sourceEnv: "global" })
+      results.push({ key, value, sourceEnv: "Global" })
     )
 
     return results