From 7551597aefdf6d4a6f3a5ca5e5b25a69934315d0 Mon Sep 17 00:00:00 2001 From: vr-varad Date: Wed, 31 Jul 2024 10:59:04 +0530 Subject: [PATCH] Spinner Issues --- .../cli/src/commands/environment/create.environment.ts | 6 +++--- .../cli/src/commands/environment/delete.environment.ts | 5 +++-- apps/cli/src/commands/environment/get.environment.ts | 8 ++++---- apps/cli/src/commands/environment/list.environment.ts | 10 ++++------ .../cli/src/commands/environment/update.environment.ts | 8 ++++---- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/apps/cli/src/commands/environment/create.environment.ts b/apps/cli/src/commands/environment/create.environment.ts index cc5a1d19..00a73773 100644 --- 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 index e6880475..df2b0853 100644 --- 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 index 1ce663d2..f206b610 100644 --- 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 index 458daa56..56177938 100644 --- 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 index e0ccb3b0..483c8849 100644 --- 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()