Merge branch 'development' into trilliumsmith/ts.2046

Author: JackHaeg

.gitignore

@@ -1,4 +1,8 @@
+# vscode dirs
+.devcontainer
+.vscode
 
+# project dirs and files
 node_modules/
 npm-debug.log
 .DS_Store

CONTRIBUTING.md

@@ -106,6 +106,22 @@ Note: Understanding how git remotes work will make collaborating much easier. Yo
 
 ### **2.3 Get up and running**
 
+1. Install NVM (Node Version Manager). NVM allows you to easily manage and switch between multiple versions of Node.
+
+   - Verify the installation: `nvm --version`
+   - Once NVM is verified, run the following commands from the root of the project:
+
+   ```
+   # Install the project's Node version (specified in the .nvmrc file)
+   nvm install
+
+   # Instruct NVM to use the Node version defined in the .nvmrc file
+   nvm use
+
+   ```
+
+   > NOTE: If the major version of Node does not match the version specified in the .nvmrc file, you may need to be explicit with the version and use: `nvm install <version>` and `nvm use <version>`
+
 1. Have [Node](https://nodejs.org/en/download/) and NPM installed locally:
 
    - Verify with `node -v` and `npm -v` respectively.

backend/package.json

@@ -56,7 +56,7 @@
     "morgan": "^1.10.0",
     "node-cron": "^2.0.3",
     "node-fetch": "^2.6.7",
-    "nodemailer": "^6.6.1"
+    "nodemailer": "^7.0.7"
   },
   "directories": {
     "test": "test"

backend/routers/users.router.test.js

@@ -130,7 +130,8 @@ describe('Unit Tests for userRouter', () => {
       done();
     });
 
-    it('should get a specific User by UserId with GET to /api/users/:UserId through UserController', async (done) => {
+    // @TODO: Fix failing test, require investigation. Please referece issue 2036
+    it.skip('should get a specific User by UserId with GET to /api/users/:UserId through UserController', async (done) => {
       //Mock the UserController function that this route calls with expected results
       UserController.user_by_id.mockImplementationOnce((req, res) => {
         return res.status(200).send(mockUser);

backend/test/user.integration.test.js

@@ -16,7 +16,8 @@ const submittedData = {
 };
 var createdUserId = '';
 
-describe('CREATE', () => {
+// @TODO: Fix failing test, require investigation. Please referece issue 2036
+describe.skip('CREATE', () => {
   test('Create a User with POST to /api/users/', async (done) => {
     // Submit a User
     const res = await request
@@ -40,13 +41,17 @@ describe('CREATE', () => {
       .set('x-customrequired-header', backendHeaders)
       .send(submittedData);
     expect(res.status).toBe(409);
-    expect(res.body).toMatchObject({error: { code: 11000, driver: true, name: 'MongoError', index: 0 }, message: 'User already exists'});
+    expect(res.body).toMatchObject({
+      error: { code: 11000, driver: true, name: 'MongoError', index: 0 },
+      message: 'User already exists',
+    });
 
     done();
   });
 });
 
-describe('READ', () => {
+// @TODO: Fix failing test, require investigation. Please referece issue 2036
+describe.skip('READ', () => {
   test('Get a list of Users with with GET to /api/users/', async (done) => {
     // Get all Users
     const res = await request.get('/api/users/').set('x-customrequired-header', backendHeaders);
@@ -85,7 +90,8 @@ describe('READ', () => {
   });
 });
 
-describe('UPDATE', () => {
+// @TODO: Fix failing test, require investigation. Please referece issue 2036
+describe.skip('UPDATE', () => {
   test('Update a User with PATCH to /api/users/:UserId', async (done) => {
     const updatedEmail = {
       email: '[email protected]',
@@ -113,7 +119,8 @@ describe('UPDATE', () => {
   });
 });
 
-describe('DELETE', () => {
+// @TODO: Fix failing test, require investigation. Please referece issue 2036
+describe.skip('DELETE', () => {
   test('Delete a specific user by Id with DELETE /api/users/:UserId', async (done) => {
     // Delete User
     const res = await request
@@ -130,7 +137,6 @@ describe('DELETE', () => {
       .set('x-customrequired-header', backendHeaders);
     expect(res2.body).toEqual({});
 
-
     done();
   });
 });

backend/yarn.lock

@@ -4959,10 +4959,10 @@ node-releases@^1.1.75:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"
   integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==
 
-nodemailer@^6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.1.tgz#2a05fbf205b897d71bf43884167b5d4d3bd01b99"
-  integrity sha512-1xzFN3gqv+/qJ6YRyxBxfTYstLNt0FCtZaFRvf4Sg9wxNGWbwFmGXVpfSi6ThGK6aRxAo+KjHtYSW8NvCsNSAg==
+nodemailer@^7.0.7:
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-7.0.7.tgz#91a16235c08abb7805a4ec1537ca63edca79687f"
+  integrity sha512-jGOaRznodf62TVzdyhKt/f1Q/c3kYynk8629sgJHpRzGZj01ezbgMMWJSAjHADcwTKxco3B68/R+KHJY2T5BaA==
 
 nodemon@^2.0.2:
   version "2.0.4"
@@ -6509,11 +6509,9 @@ throat@^5.0.0:
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
 tmp@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.4.tgz#c6db987a2ccc97f812f17137b36af2b6521b0d13"
+  integrity sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==
 
 [email protected]:
   version "1.0.5"

client/package.json

@@ -32,7 +32,7 @@
     "react-router-dom": "^5.1.2",
     "tailwindcss": "^4.1.10",
     "validator": "^13.7.0",
-    "vite": "^6.3.6",
+    "vite": "^6.4.1",
     "vite-plugin-svgr": "^4.3.0"
   },
   "scripts": {

client/src/components/ProjectForm.jsx

@@ -229,10 +229,11 @@ export default function ProjectForm({
     </Grid>
   );
 
+  const projectName = projectToEdit?.name || '[unnamed project]';
   return (
     <Box sx={{ px: 0.5 }}>
       <Box sx={{ textAlign: 'center' }}>
-        <Typography variant="h1">Project Management</Typography>
+        <Typography variant="h1">{projectName}</Typography>
       </Box>
       {auth.user.accessLevel === 'admin' ||
       auth.user.accessLevel == 'superadmin' ? (