Complete coaching sidebar

CruGlobal · Nov 8, 2023 · ea24882 · ea24882
1 parent efe00c5
commit ea24882
Show file tree

Hide file tree

Showing 21 changed files with 1,002 additions and 257 deletions.
diff --git a/pages/accountLists/[accountListId]/coaching/[coachingId].page.tsx b/pages/accountLists/[accountListId]/coaching/[coachingId].page.tsx
@@ -23,8 +23,8 @@ const CoachingPage: React.FC = () => {
       </Head>
       {accountListId && coachingId && isReady ? (
         <CoachingDetail
-          coachingId={coachingId as string}
-          isAccountListId={false}
+          accountListId={coachingId as string}
+          accountListType="coached"
         />
       ) : (
         <Loading loading />

diff --git a/pages/accountLists/[accountListId]/reports/coaching.page.tsx b/pages/accountLists/[accountListId]/reports/coaching.page.tsx
@@ -24,7 +24,7 @@ const CoachingReportPage = (): ReactElement => {
         </title>
       </Head>
       {accountListId ? (
-        <CoachingDetail coachingId={accountListId} isAccountListId={true} />
+        <CoachingDetail accountListId={accountListId} accountListType="own" />
       ) : (
         <Loading loading />
       )}

diff --git a/pages/api/Schema/AccountListCoachUser/accountListCoachUser.graphql b/pages/api/Schema/AccountListCoachUser/accountListCoachUser.graphql
diff --git a/pages/api/Schema/AccountListCoachUser/dataHandler.ts b/pages/api/Schema/AccountListCoachUser/dataHandler.ts
diff --git a/pages/api/Schema/AccountListCoachUser/resolvers.ts b/pages/api/Schema/AccountListCoachUser/resolvers.ts
diff --git a/pages/api/Schema/index.ts b/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,

diff --git a/pages/api/graphql-rest.page.ts b/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,

diff --git a/src/components/Coaching/CoachingDetail/CoachingDetail.stories.tsx b/src/components/Coaching/CoachingDetail/CoachingDetail.stories.tsx
@@ -1,5 +1,8 @@
 import React, { ReactElement } from 'react';
-import { LoadCoachingDetailQuery } from './LoadCoachingDetail.generated';
+import {
+  LoadAccountListCoachingDetailQuery,
+  LoadCoachingDetailQuery,
+} from './LoadCoachingDetail.generated';
 import { CoachingDetail } from './CoachingDetail';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
 
@@ -21,14 +24,16 @@ export const Default = (): ReactElement => {
         },
       }}
     >
-      <CoachingDetail coachingId={coachingId} isAccountListId={false} />
+      <CoachingDetail accountListId={coachingId} accountListType="coached" />
     </GqlMockedProvider>
   );
 };
 
 export const AccountListDetail = (): ReactElement => {
   return (
-    <GqlMockedProvider<{ LoadCoachingDetail: LoadCoachingDetailQuery }>
+    <GqlMockedProvider<{
+      LoadAccountListCoachingDetail: LoadAccountListCoachingDetailQuery;
+    }>
       mocks={{
         LoadAccountListCoachingDetail: {
           accountList: {
@@ -38,7 +43,7 @@ export const AccountListDetail = (): ReactElement => {
         },
       }}
     >
-      <CoachingDetail coachingId={coachingId} isAccountListId={true} />
+      <CoachingDetail accountListId={coachingId} accountListType="own" />
     </GqlMockedProvider>
   );
 };