Skip to content

Commit

Permalink
restore back to the way it was
Browse files Browse the repository at this point in the history
  • Loading branch information
singularity15 committed Dec 12, 2024
1 parent 470e9fe commit f661e34
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
16 changes: 8 additions & 8 deletions packages/vscode-extension/src/chooseStoryCommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,31 @@ 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;
}
const backlogItemsRelativeUri = atollClient.findLinkUriByRel(currentSprint.links, "related:sprint-backlog-items");
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;
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -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);
}
4 changes: 2 additions & 2 deletions packages/vscode-extension/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
Expand Down Expand Up @@ -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);
}
}

Expand Down
18 changes: 9 additions & 9 deletions packages/vscode-extension/src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ 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) {
atollOutputChannel.appendLine(message);
}

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);
Expand All @@ -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);
}
8 changes: 4 additions & 4 deletions packages/vscode-extension/src/notificationBridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down

0 comments on commit f661e34

Please sign in to comment.