From 4f5de51104df6f773a8982710b3260a873b10519 Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Wed, 18 Aug 2021 10:44:58 +0530
Subject: [PATCH] refactor: change default env name from 'global' to 'Global'

---
 components/environments/Edit.vue        | 8 ++++----
 components/environments/Environment.vue | 6 +++---
 components/environments/index.vue       | 8 ++++----
 newstore/environments.ts                | 4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/components/environments/Edit.vue b/components/environments/Edit.vue
index e6a313ed7..364f60138 100644
--- a/components/environments/Edit.vue
+++ b/components/environments/Edit.vue
@@ -10,7 +10,7 @@
             class="input floating-input"
             placeholder=" "
             type="text"
-            :disabled="editingEnvironmentIndex === 'global'"
+            :disabled="editingEnvironmentIndex === 'Global'"
             @keyup.enter="saveEnvironment"
           />
           <label for="selectLabelEnvEdit">
@@ -114,7 +114,7 @@ export default defineComponent({
   props: {
     show: Boolean,
     editingEnvironmentIndex: {
-      type: [Number, String] as PropType<number | "global" | null>,
+      type: [Number, String] as PropType<number | "Global" | null>,
       default: null,
     },
   },
@@ -122,7 +122,7 @@ export default defineComponent({
     const workingEnv = computed(() => {
       if (props.editingEnvironmentIndex === null) return null
 
-      if (props.editingEnvironmentIndex === "global") {
+      if (props.editingEnvironmentIndex === "Global") {
         return {
           name: "Global",
           variables: getGlobalVariables(),
@@ -180,7 +180,7 @@ export default defineComponent({
         variables: this.vars,
       }
 
-      if (this.editingEnvironmentIndex === "global")
+      if (this.editingEnvironmentIndex === "Global")
         setGlobalEnvVariables(environmentUpdated.variables)
       else updateEnvironment(this.editingEnvironmentIndex!, environmentUpdated)
       this.hideModal()
diff --git a/components/environments/Environment.vue b/components/environments/Environment.vue
index 533dfe4e1..6e716c19a 100644
--- a/components/environments/Environment.vue
+++ b/components/environments/Environment.vue
@@ -40,7 +40,7 @@
           "
         />
         <SmartItem
-          v-if="!(environmentIndex === 'global')"
+          v-if="!(environmentIndex === 'Global')"
           icon="remove_circle_outline"
           color="red"
           :label="$t('delete')"
@@ -69,7 +69,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,
     },
   },
@@ -80,7 +80,7 @@ export default Vue.extend({
   },
   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 ae05bf8da..8f207e0f9 100644
--- a/components/environments/index.vue
+++ b/components/environments/index.vue
@@ -76,10 +76,10 @@
     />
     <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"
@@ -139,7 +139,7 @@ export default defineComponent({
       showModalImportExport: false,
       showModalAdd: false,
       showModalEdit: false,
-      editingEnvironmentIndex: undefined as number | "global" | undefined,
+      editingEnvironmentIndex: undefined as number | "Global" | undefined,
     }
   },
   methods: {
@@ -154,7 +154,7 @@ export default defineComponent({
     displayModalImportExport(shouldDisplay: boolean) {
       this.showModalImportExport = shouldDisplay
     },
-    editEnvironment(environmentIndex: number | "global") {
+    editEnvironment(environmentIndex: number | "Global") {
       this.$data.editingEnvironmentIndex = environmentIndex
       this.displayModalEdit(true)
     },
diff --git a/newstore/environments.ts b/newstore/environments.ts
index 9eb99cbd1..64c621122 100644
--- a/newstore/environments.ts
+++ b/newstore/environments.ts
@@ -262,7 +262,7 @@ export const currentEnvironment$ = combineLatest([
 /**
  * Stream returning all the environment variables accessible in
  * the current state (Global + The Selected Environment).
- * NOTE: The source environment attribute will be "global" for Global Env as source.
+ * NOTE: The source environment attribute will be "Global" for Global Env as source.
  */
 export const aggregateEnvs$ = combineLatest([
   currentEnvironment$,
@@ -275,7 +275,7 @@ export const aggregateEnvs$ = combineLatest([
       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