last endpoints

Author: walker-sean

src/backend/src/services/users.services.ts

@@ -11,14 +11,14 @@ import {
   UserScheduleSettings,
   AuthenticatedUser,
   AvailabilityCreateArgs,
-  ProjectGantt,
-  UserWithScheduleSettings
+  UserWithScheduleSettings,
+  ProjectOverview
 } from 'shared';
 import prisma from '../prisma/prisma';
 import { AccessDeniedException, HttpException, NotFoundException } from '../utils/errors.utils';
 import { generateAccessToken } from '../utils/auth.utils';
-import { projectGanttTransformer } from '../transformers/projects.transformer';
-import { getProjectGanttQueryArgs } from '../prisma-query-args/projects.query-args';
+import { projectOverviewTransformer } from '../transformers/projects.transformer';
+import { getProjectOverviewQueryArgs } from '../prisma-query-args/projects.query-args';
 import userSecureSettingsTransformer from '../transformers/user-secure-settings.transformer';
 import userScheduleSettingsTransformer from '../transformers/user-schedule-settings.transformer';
 import { userTransformer, userWithScheduleSettingsTransformer } from '../transformers/user.transformer';
@@ -147,7 +147,7 @@ export default class UsersService {
    * @param organizationId the id of the organization the user is in
    * @returns the user's favorite projects
    */
-  static async getUsersFavoriteProjects(userId: string, organization: Organization): Promise<ProjectGantt[]> {
+  static async getUsersFavoriteProjects(userId: string, organization: Organization): Promise<ProjectOverview[]> {
     const requestedUser = await prisma.user.findUnique({ where: { userId } });
     if (!requestedUser) throw new NotFoundException('User', userId);
 
@@ -162,10 +162,10 @@ export default class UsersService {
           organizationId: organization.organizationId
         }
       },
-      ...getProjectGanttQueryArgs(organization.organizationId)
+      ...getProjectOverviewQueryArgs(organization.organizationId)
     });
 
-    return projects.map(projectGanttTransformer);
+    return projects.map(projectOverviewTransformer);
   }
 
   /**

src/frontend/src/hooks/users.hooks.ts

@@ -33,9 +33,9 @@ import {
   UserScheduleSettings,
   SetUserScheduleSettingsPayload,
   Task,
-  ProjectOverview,
   UserWithRole,
-  UserWithScheduleSettings
+  UserWithScheduleSettings,
+  ProjectOverview
 } from 'shared';
 import { useAuth } from './auth.hooks';
 import { useContext } from 'react';

src/frontend/src/pages/HomePage/AdminHomePage.tsx

@@ -4,9 +4,6 @@
  */
 
 import { Typography, Grid, Box } from '@mui/material';
-import { useSingleUserSettings } from '../../hooks/users.hooks';
-import LoadingIndicator from '../../components/LoadingIndicator';
-import ErrorPage from '../ErrorPage';
 import PageLayout, { PAGE_GRID_HEIGHT } from '../../components/PageLayout';
 import { AuthenticatedUser } from 'shared';
 import WorkPackagesSelectionView from './components/WorkPackagesSelectionView';
@@ -18,11 +15,6 @@ interface AdminHomePageProps {
 }
 
 const AdminHomePage = ({ user }: AdminHomePageProps) => {
-  const { isLoading, isError, error, data: userSettingsData } = useSingleUserSettings(user.userId);
-
-  if (isLoading || !userSettingsData) return <LoadingIndicator />;
-  if (isError) return <ErrorPage error={error} message={error.message} />;
-
   return (
     <PageLayout title="Home" hidePageTitle>
       <Typography variant="h3" marginLeft="auto" sx={{ marginTop: 2, textAlign: 'center', pt: 3, padding: 0 }}>

src/frontend/src/pages/HomePage/GuestHomePage.tsx

@@ -4,9 +4,6 @@
  */
 
 import { Box, Grid, Stack, Typography } from '@mui/material';
-import { useSingleUserSettings } from '../../hooks/users.hooks';
-import LoadingIndicator from '../../components/LoadingIndicator';
-import ErrorPage from '../ErrorPage';
 import PageLayout, { PAGE_GRID_HEIGHT } from '../../components/PageLayout';
 import { AuthenticatedUser } from 'shared';
 import MemberEncouragement from './components/MemberEncouragement';
@@ -21,7 +18,6 @@ interface GuestHomePageProps {
 }
 
 const GuestHomePage = ({ user }: GuestHomePageProps) => {
-  const { isLoading, isError, error, data: userSettingsData } = useSingleUserSettings(user.userId);
   const [showModal, setShowModal] = useState(false);
 
   // shows modal only once per session
@@ -33,9 +29,6 @@ const GuestHomePage = ({ user }: GuestHomePageProps) => {
     }
   }, []);
 
-  if (isLoading || !userSettingsData) return <LoadingIndicator />;
-  if (isError) return <ErrorPage error={error} message={error.message} />;
-
   return (
     <PageLayout title="Home" hidePageTitle>
       <Typography variant="h3" marginLeft="auto" sx={{ marginTop: 2, textAlign: 'center', pt: 3, padding: 0 }}>

src/frontend/src/pages/HomePage/LeadHomePage.tsx

@@ -4,9 +4,6 @@
  */
 
 import { Box, Grid, Typography } from '@mui/material';
-import { useSingleUserSettings } from '../../hooks/users.hooks';
-import LoadingIndicator from '../../components/LoadingIndicator';
-import ErrorPage from '../ErrorPage';
 import PageLayout, { PAGE_GRID_HEIGHT } from '../../components/PageLayout';
 import { AuthenticatedUser } from 'shared';
 import ChangeRequestsToReview from './components/ChangeRequestsToReview';
@@ -19,11 +16,6 @@ interface LeadHomePageProps {
 }
 
 const LeadHomePage = ({ user }: LeadHomePageProps) => {
-  const { isLoading, isError, error, data: userSettingsData } = useSingleUserSettings(user.userId);
-
-  if (isLoading || !userSettingsData) return <LoadingIndicator />;
-  if (isError) return <ErrorPage error={error} message={error.message} />;
-
   return (
     <PageLayout title="Home" hidePageTitle>
       <Typography variant="h3" marginLeft="auto" sx={{ marginTop: 2, textAlign: 'center', pt: 3, padding: 0 }}>

src/frontend/src/pages/HomePage/MemberHomePage.tsx

@@ -4,9 +4,6 @@
  */
 
 import { Box, Grid, Typography } from '@mui/material';
-import { useSingleUserSettings } from '../../hooks/users.hooks';
-import LoadingIndicator from '../../components/LoadingIndicator';
-import ErrorPage from '../ErrorPage';
 import PageLayout, { PAGE_GRID_HEIGHT } from '../../components/PageLayout';
 import { AuthenticatedUser } from 'shared';
 import MyTasks from './components/MyTasks';
@@ -18,11 +15,6 @@ interface MemberHomePageProps {
 }
 
 const MemberHomePage = ({ user }: MemberHomePageProps) => {
-  const { isLoading, isError, error, data: userSettingsData } = useSingleUserSettings(user.userId);
-
-  if (isLoading || !userSettingsData) return <LoadingIndicator />;
-  if (isError) return <ErrorPage error={error} message={error.message} />;
-
   return (
     <PageLayout title="Home" hidePageTitle>
       <Typography variant="h3" marginLeft="auto" sx={{ marginTop: 2, textAlign: 'center', pt: 3, padding: 0 }}>

src/frontend/src/pages/SettingsPage/SettingsDetails.tsx

@@ -2,7 +2,7 @@ import { useAuth } from '../../hooks/auth.hooks';
 import { Box, Grid, Typography } from '@mui/material';
 import DetailDisplay from '../../components/DetailDisplay';
 import LoadingIndicator from '../../components/LoadingIndicator';
-import { useCurrentUser, useCurrentUserSecureSettings, useSingleUserSettings } from '../../hooks/users.hooks';
+import { useCurrentUser } from '../../hooks/users.hooks';
 import ErrorPage from '../ErrorPage';
 import { useAllTeams } from '../../hooks/teams.hooks';
 import { displayEnum } from '../../utils/pipes';
@@ -11,34 +11,10 @@ import { isUserOnTeam } from '../../utils/teams.utils';
 const SettingsDetails: React.FC = () => {
   const auth = useAuth();
   const user = useCurrentUser();
-  const {
-    isLoading: settingsIsLoading,
-    isError: settingsIsError,
-    error: settingsError,
-    data: userSettingsData
-  } = useSingleUserSettings(user.userId);
-  const {
-    isLoading: secureSettingsIsLoading,
-    isError: secureSettingsIsError,
-    error: secureSettingsError,
-    data: userSecureSettings
-  } = useCurrentUserSecureSettings();
   const { isLoading: allTeamsIsLoading, isError: allTeamsIsError, data: teams, error: allTeamsError } = useAllTeams();
 
-  if (secureSettingsIsError) return <ErrorPage error={secureSettingsError} message={secureSettingsError.message} />;
-  if (settingsIsError) return <ErrorPage error={settingsError} message={settingsError.message} />;
   if (allTeamsIsError) return <ErrorPage error={allTeamsError} message={allTeamsError.message} />;
-  if (
-    auth.isLoading ||
-    !auth.user ||
-    settingsIsLoading ||
-    !userSettingsData ||
-    secureSettingsIsLoading ||
-    !userSecureSettings ||
-    allTeamsIsLoading ||
-    !teams
-  )
-    return <LoadingIndicator />;
+  if (auth.isLoading || !auth.user || allTeamsIsLoading || !teams) return <LoadingIndicator />;
 
   const userTeams = teams.filter((team) => isUserOnTeam(team, user));