From f515ac4f522cb4d6e32cb29e8cec9eb57267914f Mon Sep 17 00:00:00 2001
From: Jason Casareno <jcasareno@csumb.edu>
Date: Mon, 1 Aug 2022 13:15:01 -0700
Subject: [PATCH] Renaming variables and parameters

---
 .../components/http/Variables.vue              | 18 +++++++++---------
 packages/hoppscotch-data/src/variables.ts      | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/hoppscotch-app/components/http/Variables.vue b/packages/hoppscotch-app/components/http/Variables.vue
index 0590a6a47..25fcb08da 100644
--- a/packages/hoppscotch-app/components/http/Variables.vue
+++ b/packages/hoppscotch-app/components/http/Variables.vue
@@ -3,7 +3,7 @@
     <div
       class="sticky z-10 flex items-center justify-between pl-4 border-b bg-primary border-dividerLight top-upperMobileSecondaryStickyFold sm:top-upperSecondaryStickyFold"
     >
-      <label class="font-semibold text-secondaryLight"> Variables </label>
+      <label class="font-semibold text-secondaryLight"> My Variables </label>
       <div class="flex">
         <ButtonSecondary
           v-tippy="{ theme: 'tooltip' }"
@@ -15,28 +15,28 @@
     </div>
     <div>
       <div
-        v-for="(vari, index) in workingVars"
-        :key="`vari-${vari.id}-${index}`"
+        v-for="(variable, index) in workingVars"
+        :key="`vari-${variable.id}-${index}`"
         class="flex border-b divide-x divide-dividerLight border-dividerLight draggable-content group"
       >
         <SmartEnvInput
-          v-model="vari.key"
+          v-model="variable.key"
           :placeholder="`${t('count.parameter', { count: index + 1 })}`"
           @change="
             updateVar(index, {
-              id: vari.id,
+              id: variable.id,
               key: $event,
-              value: vari.value,
+              value: variable.value,
             })
           "
         />
         <SmartEnvInput
-          v-model="vari.value"
+          v-model="variable.value"
           :placeholder="`${t('count.value', { count: index + 1 })}`"
           @change="
             updateVar(index, {
-              id: vari.id,
-              key: vari.key,
+              id: variable.id,
+              key: variable.key,
               value: $event,
             })
           "
diff --git a/packages/hoppscotch-data/src/variables.ts b/packages/hoppscotch-data/src/variables.ts
index 110064706..239a8d2ac 100644
--- a/packages/hoppscotch-data/src/variables.ts
+++ b/packages/hoppscotch-data/src/variables.ts
@@ -32,9 +32,9 @@ const ENV_EXPAND_LOOP = "ENV_EXPAND_LOOP" as const
 export function parseTemplateStringEV(
   str: string,
   variables: Environment["variables"],
-  pathVariables: Variables
+  myVariables: Variables
 ) {
-  if (!variables || !str || !pathVariables) {
+  if (!variables || !str || !myVariables) {
     return E.right(str)
   }
 
@@ -55,7 +55,7 @@ export function parseTemplateStringEV(
   while (result.match(REGEX_MY_VAR) != null && depth <= ENV_MAX_EXPAND_LIMIT) {
     result = decodeURI(encodeURI(result)).replace(
       REGEX_MY_VAR,
-      (_, p1) => pathVariables.find((x) => x.key === p1)?.value || ""
+      (_, p1) => myVariables.find((x) => x.key === p1)?.value || ""
     )
   }
 
@@ -70,9 +70,9 @@ export function parseTemplateStringEV(
 export const parseTemplateStringV = (
   str: string,
   variables: Environment["variables"],
-  pathVariables: Variables
+  myVariables: Variables
 ) =>
   pipe(
-    parseTemplateStringEV(str, variables, pathVariables),
+    parseTemplateStringEV(str, variables, myVariables),
     E.getOrElse(() => str)
   )