refactor: better logic for type shapes

hoppscotch · Oct 6, 2023 · c915529 · c915529
1 parent 65656bb
commit c915529
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/packages/hoppscotch-cli/src/types/request.ts b/packages/hoppscotch-cli/src/types/request.ts
@@ -24,17 +24,7 @@ export const HoppEnvExportObject = z.object({
 });
 
 // Shape of the bulk environment export object that is exported from the app.
-export const HoppBulkEnvExportObject = z.array(
-  z.object({
-    name: z.string(),
-    variables: z.array(
-      z.object({
-        key: z.string(),
-        value: z.string(),
-      })
-    ),
-  })
-);
+export const HoppBulkEnvExportObject = z.array(HoppEnvExportObject);
 
 export type HoppEnvs = {
   global: HoppEnvPair[];

diff --git a/packages/hoppscotch-common/src/components/environments/my/Environment.vue b/packages/hoppscotch-common/src/components/environments/my/Environment.vue
@@ -46,7 +46,7 @@
             role="menu"
             @keyup.e="edit!.$el.click()"
             @keyup.d="duplicate!.$el.click()"
-            @keyup.j="exportAsJson!.$el.click()"
+            @keyup.j="exportAsJsonEl!.$el.click()"
             @keyup.delete="
               !(environmentIndex === 'Global')
                 ? deleteAction!.$el.click()
@@ -79,7 +79,7 @@
               "
             />
             <HoppSmartItem
-              ref="exportAsJson"
+              ref="exportAsJsonEl"
               :icon="IconEdit"
               :label="`${t('export.as_json')}`"
               :shortcut="['J']"
@@ -161,7 +161,7 @@ const tippyActions = ref<TippyComponent | null>(null)
 const options = ref<TippyComponent | null>(null)
 const edit = ref<typeof HoppSmartItem>()
 const duplicate = ref<typeof HoppSmartItem>()
-const exportAsJson = ref<typeof HoppSmartItem>()
+const exportAsJsonEl = ref<typeof HoppSmartItem>()
 const deleteAction = ref<typeof HoppSmartItem>()
 
 const removeEnvironment = () => {

diff --git a/packages/hoppscotch-common/src/components/environments/teams/Environment.vue b/packages/hoppscotch-common/src/components/environments/teams/Environment.vue
@@ -39,7 +39,7 @@
             role="menu"
             @keyup.e="edit!.$el.click()"
             @keyup.d="duplicate!.$el.click()"
-            @keyup.j="exportAsJson!.$el.click()"
+            @keyup.j="exportAsJsonEl!.$el.click()"
             @keyup.delete="deleteAction!.$el.click()"
             @keyup.escape="options!.tippy().hide()"
           >
@@ -69,7 +69,7 @@
               "
             />
             <HoppSmartItem
-              ref="exportAsJson"
+              ref="exportAsJsonEl"
               :icon="IconEdit"
               :label="`${t('export.as_json')}`"
               :shortcut="['J']"
@@ -149,7 +149,7 @@ const options = ref<TippyComponent | null>(null)
 const edit = ref<typeof HoppSmartItem>()
 const duplicate = ref<typeof HoppSmartItem>()
 const deleteAction = ref<typeof HoppSmartItem>()
-const exportAsJson = ref<typeof HoppSmartItem>()
+const exportAsJsonEl = ref<typeof HoppSmartItem>()
 
 const removeEnvironment = () => {
   pipe(

diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts
@@ -24,6 +24,7 @@ declare module '@vue/runtime-core' {
     HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
     HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
     HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner']
+    HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable']
     IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
     IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
     IconLucideInbox: typeof import('~icons/lucide/inbox')['default']