Merge branch 'develop' into #976-add-members-to-raven-team

Author: ninest

src/backend/src/prisma/seed-data/users.seed.ts

@@ -308,6 +308,78 @@ const reidChandler: Prisma.UserCreateInput = {
   role: Role.HEAD
 };
 
+const brooksRobinson: Prisma.UserCreateInput = {
+  firstName: 'Brooks',
+  lastName: 'Robinson',
+  email: 'the.brooksters@orioles.com',
+  googleAuthId: 'fries',
+  role: Role.HEAD
+};
+
+const jimPalmer: Prisma.UserCreateInput = {
+  firstName: 'Jim',
+  lastName: 'Palmer',
+  email: 'jimmy.palms@orioles.com',
+  googleAuthId: 'burger',
+  role: Role.LEADERSHIP
+};
+
+const eddieMurray: Prisma.UserCreateInput = {
+  firstName: 'Eddie',
+  lastName: 'Murray',
+  email: 'eddie.murray@orioles.com',
+  googleAuthId: 'hotdog',
+  role: Role.HEAD
+};
+
+const georgeSisler: Prisma.UserCreateInput = {
+  firstName: 'George',
+  lastName: 'Sisler',
+  email: 'g.sisler@orioles.com',
+  googleAuthId: 'popcorn',
+  role: Role.LEADERSHIP
+};
+
+const urbanShocker: Prisma.UserCreateInput = {
+  firstName: 'Urban',
+  lastName: 'Shocker',
+  email: 'shock.the.game@orioles.com',
+  googleAuthId: 'shocking',
+  role: Role.MEMBER
+};
+
+const kenWilliams: Prisma.UserCreateInput = {
+  firstName: 'Ken',
+  lastName: 'Williams',
+  email: 'justKen@orioles.com',
+  googleAuthId: 'kenough',
+  role: Role.MEMBER
+};
+
+const boogPowell: Prisma.UserCreateInput = {
+  firstName: 'Boog',
+  lastName: 'Powell',
+  email: 'boogs@orioles.com',
+  googleAuthId: 'soda',
+  role: Role.MEMBER
+};
+
+const mannyMachado: Prisma.UserCreateInput = {
+  firstName: 'Manny',
+  lastName: 'Machado',
+  email: 'machoman@orioles.com',
+  googleAuthId: 'macho',
+  role: Role.HEAD
+};
+
+const babyDollJacobson: Prisma.UserCreateInput = {
+  firstName: 'Baby Doll',
+  lastName: 'Jacobson',
+  email: 'bbydoll@orioles.com',
+  googleAuthId: 'babes',
+  role: Role.LEADERSHIP
+};
+
 export const dbSeedAllUsers = {
   thomasEmrax,
   joeShmoe,
@@ -340,5 +412,14 @@ export const dbSeedAllUsers = {
   chrisHorton,
   mikeMacdonald,
   toddMonken,
-  stephenBisciotti
+  stephenBisciotti,
+  brooksRobinson,
+  jimPalmer,
+  eddieMurray,
+  georgeSisler,
+  urbanShocker,
+  kenWilliams,
+  boogPowell,
+  mannyMachado,
+  babyDollJacobson
 };

src/backend/src/prisma/seed.ts

@@ -67,6 +67,15 @@ const performSeed: () => Promise<void> = async () => {
   const mikeMacdonald = await prisma.user.create({ data: dbSeedAllUsers.mikeMacdonald });
   const toddMonken = await prisma.user.create({ data: dbSeedAllUsers.toddMonken });
   const stephenBisciotti = await prisma.user.create({ data: dbSeedAllUsers.stephenBisciotti });
+  const brooksRobinson = await prisma.user.create({ data: dbSeedAllUsers.brooksRobinson });
+  const jimPalmer = await prisma.user.create({ data: dbSeedAllUsers.jimPalmer });
+  const eddieMurray = await prisma.user.create({ data: dbSeedAllUsers.eddieMurray });
+  const georgeSisler = await prisma.user.create({ data: dbSeedAllUsers.georgeSisler });
+  const urbanShocker = await prisma.user.create({ data: dbSeedAllUsers.urbanShocker });
+  const kenWilliams = await prisma.user.create({ data: dbSeedAllUsers.kenWilliams });
+  const boogPowell = await prisma.user.create({ data: dbSeedAllUsers.boogPowell });
+  const mannyMachado = await prisma.user.create({ data: dbSeedAllUsers.mannyMachado });
+  const babyDollJacobson = await prisma.user.create({ data: dbSeedAllUsers.babyDollJacobson });
 
   /**
    * Make initial project so that we can start to create other stuff
@@ -175,7 +184,20 @@ const performSeed: () => Promise<void> = async () => {
   await TeamsService.setTeamMembers(
     brandonHyde,
     orioles.teamId,
-    [adleyRutschman, calRipken, anthonyBernardi].map((user) => user.userId)
+    [
+      adleyRutschman,
+      calRipken,
+      anthonyBernardi,
+      brooksRobinson,
+      jimPalmer,
+      eddieMurray,
+      georgeSisler,
+      urbanShocker,
+      kenWilliams,
+      boogPowell,
+      mannyMachado,
+      babyDollJacobson
+    ].map((user) => user.userId)
   );
   await TeamsService.setTeamMembers(
     thomasEmrax,

src/frontend/src/layouts/Sidebar/Sidebar.tsx

@@ -84,7 +84,7 @@ const Sidebar: React.FC<SideBarProps> = ({ open, handleDrawerClose }) => {
             <NavPageLink {...linkItem} open={open} />
           ))}
         </Box>
-        <Typography className={styles.versionNumber}>4.0.0</Typography>
+        <Typography className={styles.versionNumber}>4.1.0</Typography>
       </Box>
     </NERDrawer>
   );

src/frontend/src/pages/ProjectsPage/ProjectsTable.tsx

@@ -4,7 +4,7 @@
  */
 
 import { Grid, Link, useTheme } from '@mui/material';
-import { DataGrid, GridColDef, GridRow, GridRowProps, GridToolbar } from '@mui/x-data-grid';
+import { DataGrid, GridColDef, GridFilterModel, GridRow, GridRowProps, GridToolbar } from '@mui/x-data-grid';
 import { useState } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
 import { Project, WbsElementStatus } from 'shared';
@@ -114,6 +114,11 @@ const ProjectsTable: React.FC = () => {
     }
   ];
 
+  const filterValues = JSON.parse(
+    // sets filter to a default value if no filter is stored in local storage
+    localStorage.getItem('projectsTableFilter') ?? '{"columnField": "carNumber", "operatorValue": "=", "value": ""}'
+  );
+
   const theme = useTheme();
   return (
     <Grid container xs={12}>
@@ -162,7 +167,21 @@ const ProjectsTable: React.FC = () => {
             quickFilterProps: { debounceMs: 500 }
           }
         }}
+        onFilterModelChange={(filterModel: GridFilterModel) => {
+          localStorage.setItem('projectsTableFilter', JSON.stringify(filterModel.items[0]));
+        }}
         initialState={{
+          filter: {
+            filterModel: {
+              items: [
+                {
+                  columnField: filterValues.columnField,
+                  operatorValue: filterValues.operatorValue,
+                  value: filterValues.value
+                }
+              ]
+            }
+          },
           sorting: {
             sortModel: [{ field: 'wbsNum', sort: 'asc' }]
           },