Merge branch 'main' into preferences-notifications

pages/accountLists/[accountListId]/coaching/[coachingId].page.tsx

@@ -3,7 +3,10 @@ import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 import { useRouter } from 'next/router';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
-import { CoachingDetail } from 'src/components/Coaching/CoachingDetail/CoachingDetail';
+import {
+  AccountListTypeEnum,
+  CoachingDetail,
+} from 'src/components/Coaching/CoachingDetail/CoachingDetail';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import Loading from 'src/components/Loading';
 
@@ -23,8 +26,8 @@ const CoachingPage: React.FC = () => {
       </Head>
       {accountListId && coachingId && isReady ? (
         <CoachingDetail
-          coachingId={coachingId as string}
-          isAccountListId={false}
+          accountListId={coachingId as string}
+          accountListType={AccountListTypeEnum.Coaching}
         />
       ) : (
         <Loading loading />

pages/accountLists/[accountListId]/reports/coaching.page.tsx

@@ -4,7 +4,10 @@ import { useTranslation } from 'react-i18next';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import Loading from '../../../../src/components/Loading';
 import { useAccountListId } from '../../../../src/hooks/useAccountListId';
-import { CoachingDetail } from 'src/components/Coaching/CoachingDetail/CoachingDetail';
+import {
+  AccountListTypeEnum,
+  CoachingDetail,
+} from 'src/components/Coaching/CoachingDetail/CoachingDetail';
 import { suggestArticles } from 'src/lib/helpScout';
 
 const CoachingReportPage = (): ReactElement => {
@@ -24,7 +27,10 @@ const CoachingReportPage = (): ReactElement => {
         </title>
       </Head>
       {accountListId ? (
-        <CoachingDetail coachingId={accountListId} isAccountListId={true} />
+        <CoachingDetail
+          accountListId={accountListId}
+          accountListType={AccountListTypeEnum.Own}
+        />
       ) : (
         <Loading loading />
       )}

pages/api/Schema/index.ts

@@ -33,8 +33,6 @@ import UpdateCommentTypeDefs from './Tasks/Comments/UpdateComments/updateComment
 import { UpdateCommentResolvers } from './Tasks/Comments/UpdateComments/resolvers';
 import AccountListDonorAccountsTypeDefs from './AccountListDonorAccounts/accountListDonorAccounts.graphql';
 import { AccountListDonorAccountsResolvers } from './AccountListDonorAccounts/resolvers';
-import AccountListCoachUserTypeDefs from './AccountListCoachUser/accountListCoachUser.graphql';
-import { AccountListCoachUserResolvers } from './AccountListCoachUser/resolvers';
 import AccountListCoachesTypeDefs from './AccountListCoaches/accountListCoaches.graphql';
 import { AccountListCoachesResolvers } from './AccountListCoaches/resolvers';
 import ReportsPledgeHistoriesTyeDefs from './reports/pledgeHistories/pledgeHistories.graphql';
@@ -65,10 +63,6 @@ const schema = buildSubgraphSchema([
     typeDefs: AccountListDonorAccountsTypeDefs,
     resolvers: AccountListDonorAccountsResolvers,
   },
-  {
-    typeDefs: AccountListCoachUserTypeDefs,
-    resolvers: AccountListCoachUserResolvers,
-  },
   {
     typeDefs: AppointmentResultsTypeDefs,
     resolvers: AppointmentResultsResolvers,

pages/api/graphql-rest.page.ts

@@ -54,7 +54,6 @@ import {
   UpdateComment,
 } from './Schema/Tasks/Comments/UpdateComments/datahandler';
 import { getAccountListDonorAccounts } from './Schema/AccountListDonorAccounts/dataHandler';
-import { getAccountListCoachUsers } from './Schema/AccountListCoachUser/dataHandler';
 import { getAccountListCoaches } from './Schema/AccountListCoaches/dataHandler';
 import { getReportsPledgeHistories } from './Schema/reports/pledgeHistories/dataHandler';
 import { DateTime, Duration, Interval } from 'luxon';
@@ -173,11 +172,6 @@ class MpdxRestApi extends RESTDataSource {
     return getAccountListAnalytics(data);
   }
 
-  async getAccountListCoachUsers(accountListId: string) {
-    const { data } = await this.get(`account_lists/${accountListId}/coaches`);
-    return getAccountListCoachUsers(data);
-  }
-
   async getAppointmentResults(
     accountListId: string,
     endDate: string,

src/components/Coaching/CoachingDetail/CoachingDetail.stories.tsx

@@ -1,6 +1,9 @@
 import React, { ReactElement } from 'react';
-import { LoadCoachingDetailQuery } from './LoadCoachingDetail.generated';
-import { CoachingDetail } from './CoachingDetail';
+import {
+  LoadAccountListCoachingDetailQuery,
+  LoadCoachingDetailQuery,
+} from './LoadCoachingDetail.generated';
+import { AccountListTypeEnum, CoachingDetail } from './CoachingDetail';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
 
 export default {
@@ -21,14 +24,19 @@ export const Default = (): ReactElement => {
         },
       }}
     >
-      <CoachingDetail coachingId={coachingId} isAccountListId={false} />
+      <CoachingDetail
+        accountListId={coachingId}
+        accountListType={AccountListTypeEnum.Coaching}
+      />
     </GqlMockedProvider>
   );
 };
 
 export const AccountListDetail = (): ReactElement => {
   return (
-    <GqlMockedProvider<{ LoadCoachingDetail: LoadCoachingDetailQuery }>
+    <GqlMockedProvider<{
+      LoadAccountListCoachingDetail: LoadAccountListCoachingDetailQuery;
+    }>
       mocks={{
         LoadAccountListCoachingDetail: {
           accountList: {
@@ -38,7 +46,10 @@ export const AccountListDetail = (): ReactElement => {
         },
       }}
     >
-      <CoachingDetail coachingId={coachingId} isAccountListId={true} />
+      <CoachingDetail
+        accountListId={coachingId}
+        accountListType={AccountListTypeEnum.Own}
+      />
     </GqlMockedProvider>
   );
 };