From f661e34ce01cb805cf0f0ff708b92170e6eaf9f0 Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 12 Dec 2024 09:35:20 -0500 Subject: [PATCH] restore back to the way it was --- .../src/chooseStoryCommands.ts | 16 ++++++++-------- packages/vscode-extension/src/extension.ts | 4 ++-- packages/vscode-extension/src/logger.ts | 18 +++++++++--------- .../vscode-extension/src/notificationBridge.ts | 8 ++++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/vscode-extension/src/chooseStoryCommands.ts b/packages/vscode-extension/src/chooseStoryCommands.ts index 97290b8..1ed5b78 100755 --- a/packages/vscode-extension/src/chooseStoryCommands.ts +++ b/packages/vscode-extension/src/chooseStoryCommands.ts @@ -39,12 +39,12 @@ export async function chooseStory(context: ExtensionContext) { ); return; } - logInfo("Fetching data for current sprint from Atoll server...", MessageStyle.outputChannelAndMessage); + logInfo("Fetching data for current sprint from Atoll server...", MessageStyle.OutputChannelAndMessage); const currentSprint = await atollClient.fetchSprintByUri(currentSprintUri); if (currentSprint === null) { logInfo( "The last sprint is complete and there is no new sprint in the Atoll database for this project!", - MessageStyle.outputChannelAndMessage + MessageStyle.OutputChannelAndMessage ); return; } @@ -52,18 +52,18 @@ export async function chooseStory(context: ExtensionContext) { if (backlogItemsRelativeUri === null) { logInfo( "No link is available in current sprint for sprint backlog items - this is unexpected! Contact support.", - MessageStyle.outputChannelAndMessage + MessageStyle.OutputChannelAndMessage ); return; } - logInfo("Fetching data for sprint backlog items from Atoll server...", MessageStyle.outputChannelAndMessage); + logInfo("Fetching data for sprint backlog items from Atoll server...", MessageStyle.OutputChannelAndMessage); const backlogItemsUri = atollClient.buildFullUri(backlogItemsRelativeUri); const sprintBacklogItems = await atollClient.fetchSprintBacklogItemsByUri(backlogItemsUri); if (sprintBacklogItems === null || sprintBacklogItems.length === 0) { logInfo( "There are no sprint backlog items available - please add sprint backlog items first!", - MessageStyle.outputChannelAndMessage + MessageStyle.OutputChannelAndMessage ); return; } @@ -77,14 +77,14 @@ export async function chooseStory(context: ExtensionContext) { }; const backlogItemName = await window.showQuickPick(backlogItemsSorted, quickPickOptions); if (!backlogItemName) { - logWarning("Aborted backlog item selection.", MessageStyle.outputChannelAndMessage); + logWarning("Aborted backlog item selection.", MessageStyle.OutputChannelAndMessage); return; } const matchingSBIs = sprintBacklogItems.filter((backlogItem) => buildUniqueBacklogItemName(backlogItem) === backlogItemName); if (matchingSBIs.length !== 1) { logError( `Only expected a single backlog item match, but ${matchingSBIs.length} were found!`, - MessageStyle.outputChannelAndMessage + MessageStyle.OutputChannelAndMessage ); return; } @@ -119,5 +119,5 @@ export async function chooseStory(context: ExtensionContext) { } await state.saveSettings(context); - logInfo(`Backlog item "${id} - ${matchingSBI.storyPhrase}" selected.`, MessageStyle.outputChannelAndMessage); + logInfo(`Backlog item "${id} - ${matchingSBI.storyPhrase}" selected.`, MessageStyle.OutputChannelAndMessage); } diff --git a/packages/vscode-extension/src/extension.ts b/packages/vscode-extension/src/extension.ts index 721281f..fed7889 100755 --- a/packages/vscode-extension/src/extension.ts +++ b/packages/vscode-extension/src/extension.ts @@ -33,7 +33,7 @@ async function reconnectToAtoll() { try { const result = await atollClient.reconnect(state.atollServerUrl || "", notificationBridge.handleNotification); if (result) { - logInfo(`Unable to set up with refresh token: ${result}`, MessageStyle.outputChannelAndMessage); + logInfo(`Unable to set up with refresh token: ${result}`, MessageStyle.OutputChannelAndMessage); } } catch (err) { logError(`Catch triggered: ${err}`); @@ -104,7 +104,7 @@ async function initialActivation(context: vscode.ExtensionContext) { // NOTE: This is intentionally done directly with window.showErrorMessage just in case there's // a problem with `logError` related code - it is essential that the user sees this. vscode.window.showErrorMessage("Unable to activate Atoll (see output log for details)"); - logError(`Unable to activate Atoll: ${err}`, MessageStyle.outputChannel); + logError(`Unable to activate Atoll: ${err}`, MessageStyle.OutputChannel); } } diff --git a/packages/vscode-extension/src/logger.ts b/packages/vscode-extension/src/logger.ts index 51bd1f5..e871757 100755 --- a/packages/vscode-extension/src/logger.ts +++ b/packages/vscode-extension/src/logger.ts @@ -4,9 +4,9 @@ import * as vscode from "vscode"; const atollOutputChannel = vscode.window.createOutputChannel("Atoll"); export enum MessageStyle { - outputChannel = 1, // shows as "console log" style message only - messageOnly = 2, // shows as "toast" style notification only - outputChannelAndMessage = 3 // console log & toast + OutputChannel = 1, // shows as "console log" style message only + MessageOnly = 2, // shows as "toast" style notification only + OutputChannelAndMessage = 3 // console log & toast } function log(message: string) { @@ -14,10 +14,10 @@ function log(message: string) { } function logCommon(level: string, message: string, messageStyle: MessageStyle) { - if (messageStyle === MessageStyle.outputChannel || messageStyle === MessageStyle.outputChannelAndMessage) { + if (messageStyle === MessageStyle.OutputChannel || messageStyle === MessageStyle.OutputChannelAndMessage) { log(`${level.toUpperCase()} - ${message}`); } - if (messageStyle === MessageStyle.messageOnly || messageStyle === MessageStyle.outputChannelAndMessage) { + if (messageStyle === MessageStyle.MessageOnly || messageStyle === MessageStyle.OutputChannelAndMessage) { switch (level) { case "info": { vscode.window.showInformationMessage(message); @@ -39,18 +39,18 @@ function logCommon(level: string, message: string, messageStyle: MessageStyle) { } } -export function logDebug(message: string, messageStyle: MessageStyle = MessageStyle.outputChannel) { +export function logDebug(message: string, messageStyle: MessageStyle = MessageStyle.OutputChannel) { logCommon("debug", message, messageStyle); } -export function logInfo(message: string, messageStyle: MessageStyle = MessageStyle.outputChannel) { +export function logInfo(message: string, messageStyle: MessageStyle = MessageStyle.OutputChannel) { logCommon("info", message, messageStyle); } -export function logWarning(message: string, messageStyle: MessageStyle = MessageStyle.outputChannel) { +export function logWarning(message: string, messageStyle: MessageStyle = MessageStyle.OutputChannel) { logCommon("warning", message, messageStyle); } -export function logError(message: string, messageStyle: MessageStyle = MessageStyle.outputChannel) { +export function logError(message: string, messageStyle: MessageStyle = MessageStyle.OutputChannel) { logCommon("error", message, messageStyle); } diff --git a/packages/vscode-extension/src/notificationBridge.ts b/packages/vscode-extension/src/notificationBridge.ts index 56f7e88..0ef6c25 100755 --- a/packages/vscode-extension/src/notificationBridge.ts +++ b/packages/vscode-extension/src/notificationBridge.ts @@ -8,19 +8,19 @@ import { logDebug, logError, logInfo, logWarning, MessageStyle } from "./logger" export const handleNotification = async (message: string, level: string) => { switch (level) { case "debug": { - logDebug(message, MessageStyle.outputChannel); + logDebug(message, MessageStyle.OutputChannel); break; } case "info": { - logInfo(message, MessageStyle.outputChannelAndMessage); + logInfo(message, MessageStyle.OutputChannelAndMessage); break; } case "warn": { - logWarning(message, MessageStyle.outputChannelAndMessage); + logWarning(message, MessageStyle.OutputChannelAndMessage); break; } case "error": { - logError(message, MessageStyle.outputChannelAndMessage); + logError(message, MessageStyle.OutputChannelAndMessage); break; } default: {