Spinner Issues

keyshade-xyz · Jul 31, 2024 · 7551597 · 7551597
1 parent fcc9619
commit 7551597
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/apps/cli/src/commands/environment/create.environment.ts b/apps/cli/src/commands/environment/create.environment.ts
@@ -1,5 +1,5 @@
 import BaseCommand from '../base.command'
-import { spinner, text, intro, outro } from '@clack/prompts'
+import { spinner, text, outro } from '@clack/prompts'
 import {
   type CommandActionData,
   type CommandArgument,
@@ -63,12 +63,12 @@ export class CreateEnvironment extends BaseCommand {
     }
 
     try {
-      intro('Creating Environment')
+      const spin = spinner()
+      spin.start('Creating Environment')
       const createdEnvironment = await EnvironmentController.createEnvironment(
         environmentData,
         headers
       )
-      const spin = spinner()
       spin.message(`- Name: ${createdEnvironment.name}`)
       spin.message(`- ID: ${createdEnvironment.id}`)
       outro('Environment Created Successfully.')

diff --git a/apps/cli/src/commands/environment/delete.environment.ts b/apps/cli/src/commands/environment/delete.environment.ts
@@ -1,5 +1,5 @@
 import BaseCommand from '../base.command'
-import { intro, outro } from '@clack/prompts'
+import { outro, spinner } from '@clack/prompts'
 import { EnvironmentController } from '@keyshade/api-client'
 import {
   type CommandActionData,
@@ -40,7 +40,8 @@ export class DeleteEnvironment extends BaseCommand {
     }
 
     try {
-      intro('Deleting Environment...')
+      const spin = spinner()
+      spin.start('Deleting Environment...')
       await EnvironmentController.deleteEnvironment(
         { id: environmentId },
         headers

diff --git a/apps/cli/src/commands/environment/get.environment.ts b/apps/cli/src/commands/environment/get.environment.ts
@@ -1,6 +1,6 @@
 import { Logger } from '@/util/logger'
 import BaseCommand from '../base.command'
-import { spinner, intro, outro } from '@clack/prompts'
+import { spinner, outro } from '@clack/prompts'
 import { EnvironmentController } from '@keyshade/api-client'
 import {
   type CommandActionData,
@@ -39,14 +39,14 @@ export class GetEnvironment extends BaseCommand {
       'x-keyshade-token': apiKey
     }
 
-    const spin = spinner()
     try {
-      intro('Getting Environment...')
+      const spin = spinner()
+      spin.start('Getting Environment...')
       const environment = await EnvironmentController.getEnvironmentById(
         { id: environmentId },
         headers
       )
-      spin.start(`Environment ${environmentId}:`)
+      spin.message(`Environment ${environmentId}:`)
       spin.message(`- Name: ${environment.name}`)
       spin.message(`- Description: ${environment.description}`)
       outro('Successfully Fetched the Environment.')

diff --git a/apps/cli/src/commands/environment/list.environment.ts b/apps/cli/src/commands/environment/list.environment.ts
@@ -1,6 +1,6 @@
 import BaseCommand from '../base.command'
 import { EnvironmentController } from '@keyshade/api-client'
-import { intro, spinner, outro } from '@clack/prompts'
+import { spinner, outro } from '@clack/prompts'
 import {
   type CommandActionData,
   type CommandArgument
@@ -44,17 +44,15 @@ export class ListEnvironment extends BaseCommand {
       return
     }
 
-    intro(`Fetching environments for project ${projectId}...`)
-
     try {
-      intro(`Getting all Environment for Project ${projectId}`)
+      const spin = spinner()
+      spin.start(`Getting all Environment for Project ${projectId}`)
       const environments =
         await EnvironmentController.getAllEnvironmentsOfProject(
           { projectId },
           headers
         )
-      const spin = spinner()
-      spin.start(`Environments for project ${projectId}:`)
+      spin.message(`Environments for project ${projectId}:`)
       spin.message(JSON.stringify(environments))
       outro('Fetched all Environments.')
       spin.stop()

diff --git a/apps/cli/src/commands/environment/update.environment.ts b/apps/cli/src/commands/environment/update.environment.ts
@@ -1,6 +1,6 @@
 import { Logger } from '@/util/logger'
 import BaseCommand from '../base.command'
-import { spinner, intro, outro } from '@clack/prompts'
+import { spinner, outro } from '@clack/prompts'
 import { EnvironmentController } from '@keyshade/api-client'
 import {
   type CommandActionData,
@@ -63,13 +63,13 @@ export class UpdateEnvironment extends BaseCommand {
     }
 
     try {
-      intro('Updating Environment...')
+      const spin = spinner()
+      spin.start('Updating Environment...')
       const environments = await EnvironmentController.updateEnvironment(
         environmentData,
         headers
       )
-      const spin = spinner()
-      spin.start(`Environments for project ${environmentId}:`)
+      spin.message(`Environments for project ${environmentId}:`)
       spin.message(JSON.stringify(environments))
       outro('Successfully Updated The Environment')
       spin.stop()