jest to root package.json + fix test issues

package.json

@@ -70,9 +70,14 @@
     "@babel/preset-env": "7.19.1",
     "@babel/preset-react": "7.18.6",
     "@babel/preset-typescript": "7.18.6",
+    "@types/jest": "28.1.8",
     "babel-loader": "8.1.0",
     "babel-plugin-named-asset-import": "0.3.7",
     "babel-preset-react-app": "10.0.1",
+    "jest": "29.0.3",
+    "jest-cli": "29.0.3",
+    "jest-css-modules-transform": "4.4.2",
+    "jest-environment-jsdom": "28.1.3",
     "prettier": "3.2.5",
     "rollup": "2.79.0",
     "rollup-plugin-image": "1.0.2",
@@ -81,6 +86,7 @@
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-postcss": "4.0.2",
     "rollup-plugin-typescript2": "0.36.0",
+    "ts-jest": "29.0.2",
     "typescript": "4.6.4"
   }
 }

packages/shared/package.json

@@ -4,7 +4,7 @@
   "description": "Atoll shared code that is common to electron desktop client and web app",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
-  "types": "dist/index.d.ts",
+  "types": "dist/src/index.d.ts",
   "files": [
     "dist"
   ],
@@ -68,7 +68,6 @@
     "@testing-library/react": "10.0.4",
     "@types/history": "4.7.5",
     "@types/i18next": "13.0.0",
-    "@types/jest": "28.1.8",
     "@types/node": "13.13.4",
     "@types/react": "16.9.34",
     "@types/react-dom": "16.9.5",
@@ -83,18 +82,13 @@
     "bs-logger": "0.2.6",
     "copy-webpack-plugin": "5.1.1",
     "cpx": "1.5.0",
-    "jest": "28.1.3",
-    "jest-cli": "28.1.3",
-    "jest-css-modules-transform": "4.4.2",
-    "jest-environment-jsdom": "28.1.3",
     "launchdarkly-js-client-sdk": "2.22.1",
     "lodash.memoize": "4.1.2",
     "make-error": "1.3.6",
     "opener": "1.5.2",
     "redux-mock-store": "1.5.4",
     "storybook-addon-root-attribute": "1.0.2",
     "storybook-dark-mode": "1.1.2",
-    "ts-jest": "28.0.8",
     "ts-node": "10.9.1"
   }
 }

packages/vscode-extension/src/chooseStoryCommands.ts

@@ -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;
     }
@@ -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);
 }

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);
     }
 }
 

packages/vscode-extension/src/logger.ts

@@ -1,23 +1,23 @@
 // externals
 import * as vscode from "vscode";
 
-const outputChannel = vscode.window.createOutputChannel("Atoll");
+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) {
-    outputChannel.appendLine(message);
+    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);
@@ -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);
 }

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: {

packages/web-app/package.json

@@ -75,7 +75,6 @@
     "@types/express": "4.17.2",
     "@types/express-ws": "3.0.0",
     "@types/history": "4.7.5",
-    "@types/jest": "25.2.1",
     "@types/jsonwebtoken": "8.3.9",
     "@types/node": "13.13.4",
     "@types/react": "16.9.34",
@@ -97,18 +96,13 @@
     "file-loader": "5.1.0",
     "fs-extra": "9.0.0",
     "html-webpack-plugin": "4.5.2",
-    "jest": "29.0.3",
-    "jest-cli": "29.0.3",
-    "jest-css-modules-transform": "4.4.2",
-    "jest-environment-jsdom": "28.1.3",
     "mini-css-extract-plugin": "0.9.0",
     "nodemon": "2.0.2",
     "postcss-loader": "3.0.0",
     "react-dev-utils": "12.0.1",
     "regenerator-runtime": "0.13.3",
     "semver": "7.3.4",
     "terser-webpack-plugin": "2.3.7",
-    "ts-jest": "29.0.2",
     "ts-node": "10.9.1",
     "url-loader": "3.0.0",
     "webpack": "4.41.6",

packages/web-app/src/server/api/handlers/featureToggles.ts

@@ -6,7 +6,7 @@ import { respondWithNotImplemented, respondWithObj } from "../utils/responder";
 
 // consts/enums
 import { FEATURE_TOGGLE_LIST } from "../../api/data/featureToggles";
-import { buildResponseWithItem } from "api/utils/responseBuilder";
+import { buildResponseWithItem } from "../utils/responseBuilder";
 
 export const featureTogglesHandler = function (req: Request, res: Response) {
     const userId = req.params.userId || "";

packages/web-app/src/server/api/handlers/sprints.ts

@@ -32,7 +32,7 @@ import {
     rollbackWithMessageAndStatus,
     start
 } from "./utils/handlerContext";
-import { buildResponseWithItem, isRestApiCollectionResult, isRestApiItemResult } from "api/utils/responseBuilder";
+import { buildResponseWithItem, isRestApiCollectionResult, isRestApiItemResult } from "../utils/responseBuilder";
 
 export const sprintsGetHandler = async (req: Request, res) => {
     const params = getParamsFromRequest(req);

packages/web-app/src/server/api/handlers/userPreferences.ts

@@ -23,7 +23,6 @@ import {
     handleUnexpectedErrorResponse,
     start
 } from "./utils/handlerContext";
-import { respondWithObj } from "api/utils/responder";
 
 export const userPreferencesGetHandler = async function (req: Request, res: Response) {
     const packageJson = findPackageJson(__dirname);

packages/web-app/src/server/dataaccess/connection.ts

@@ -10,10 +10,26 @@ if (!dbConfig) {
     console.error("Unable to retrieve database configuration - set ATOLL_DATABASE_URL for local development");
 }
 
+const portNumberFromStringOrNumberr = (val: string | number | undefined | null): number | undefined | null => {
+    if (val === "") {
+        return undefined;
+    }
+    if (val === 0) {
+        return 0;
+    }
+    if (!val) {
+        return val as unknown as number | undefined | null;
+    }
+    if (typeof val === "string") {
+        return parseInt(val);
+    }
+    return val;
+};
+
 const buildOptions = (): Options => {
     const options: Options = {
         host: dbConfig.host,
-        port: dbConfig.port,
+        port: portNumberFromStringOrNumberr(dbConfig.port),
         dialect: "postgres",
         dialectOptions: {},
         pool: {