From e69261744c8cfaec5c616db0dc78f7ce7c538266 Mon Sep 17 00:00:00 2001
From: ev <4164774+ev-sc@users.noreply.github.com>
Date: Wed, 11 Dec 2024 08:00:55 +0000
Subject: [PATCH] Revert name refactor

---
 .../[externalDataProviderType]/page.tsx       | 28 +++++++++----------
 .../review/[externalDataProviderId]/page.tsx  |  8 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/nextjs/src/app/(logged-in)/data-sources/create/connect/[externalDataProviderType]/page.tsx b/nextjs/src/app/(logged-in)/data-sources/create/connect/[externalDataProviderType]/page.tsx
index 8b0e4f677..7e2fde5d1 100644
--- a/nextjs/src/app/(logged-in)/data-sources/create/connect/[externalDataProviderType]/page.tsx
+++ b/nextjs/src/app/(logged-in)/data-sources/create/connect/[externalDataProviderType]/page.tsx
@@ -114,9 +114,9 @@ type FormInputs = CreateExternalDataSourceInput &
   }
 
 export default function Page({
-  params: { externalDataProviderType },
+  params: { externalDataSourceType },
 }: {
-  params: { externalDataProviderType: keyof CreateExternalDataSourceInput }
+  params: { externalDataSourceType: keyof CreateExternalDataSourceInput }
 }) {
   const orgId = useAtomValue(currentOrganisationIdAtom)
   const router = useRouter()
@@ -429,13 +429,13 @@ export default function Page({
   }, [airtableUrl])
 
   async function submitTestConnection(formData: FormInputs) {
-    if (!formData[externalDataProviderType]) {
+    if (!formData[externalDataSourceType]) {
       throw Error('Need some CRM connection details to proceed!')
     }
 
     // To avoid mutation of the form data
     const genericCRMData = Object.assign({}, formData)
-    const CRMSpecificData = formData[externalDataProviderType]
+    const CRMSpecificData = formData[externalDataSourceType]
 
     // Remove specific CRM data from the generic data
     // TODO: make this less fragile. Currently it assumes any nested
@@ -447,7 +447,7 @@ export default function Page({
     }
 
     const input: TestDataSourceQueryVariables['input'] = {
-      [externalDataProviderType]: {
+      [externalDataSourceType]: {
         ...genericCRMData,
         ...CRMSpecificData,
       },
@@ -477,12 +477,12 @@ export default function Page({
   }
 
   async function submitCreateSource(formData: FormInputs) {
-    if (!formData[externalDataProviderType]) {
+    if (!formData[externalDataSourceType]) {
       throw Error('Need some CRM connection details to proceed!')
     }
     // To avoid mutation of the form data
     const genericCRMData = Object.assign({}, formData)
-    let CRMSpecificData = formData[externalDataProviderType]
+    let CRMSpecificData = formData[externalDataSourceType]
 
     // Remove specific CRM data from the generic data
     // TODO: make this less fragile. Currently it assumes any nested
@@ -494,7 +494,7 @@ export default function Page({
     }
 
     let input: CreateExternalDataSourceInput = {
-      [externalDataProviderType]: {
+      [externalDataSourceType]: {
         ...genericCRMData,
         ...CRMSpecificData,
         organisation: { set: orgId },
@@ -762,7 +762,7 @@ export default function Page({
         <h1 className="text-hLg">Testing connection...</h1>
         <p className="text-meepGray-400 max-w-lg">
           Please wait whilst we try to connect to your{' '}
-          {formatCrmNames(externalDataProviderType || 'CRM')} using the
+          {formatCrmNames(externalDataSourceType || 'CRM')} using the
           information you provided
         </p>
         <LoadingIcon />
@@ -770,7 +770,7 @@ export default function Page({
     )
   }
 
-  if (externalDataProviderType === 'airtable') {
+  if (externalDataSourceType === 'airtable') {
     return (
       <div className="space-y-7">
         <header>
@@ -919,7 +919,7 @@ export default function Page({
     )
   }
 
-  if (externalDataProviderType === 'mailchimp') {
+  if (externalDataSourceType === 'mailchimp') {
     return (
       <div className="space-y-7">
         <header>
@@ -1010,7 +1010,7 @@ export default function Page({
       </div>
     )
   }
-  if (externalDataProviderType === 'actionnetwork') {
+  if (externalDataSourceType === 'actionnetwork') {
     const groupSlug = form.watch('actionnetwork.groupSlug')
     const actionNetworkApiUrl = groupSlug
       ? `https://actionnetwork.org/groups/${groupSlug}/apis`
@@ -1109,7 +1109,7 @@ export default function Page({
       </div>
     )
   }
-  if (externalDataProviderType === 'editablegooglesheets') {
+  if (externalDataSourceType === 'editablegooglesheets') {
     const hasOauthParams = searchParams.get('state') && searchParams.get('code')
     // The presence of the params and absence of an oauthCredentialsResult
     // means the query has either not yet been sent, or is in progress.
@@ -1283,7 +1283,7 @@ export default function Page({
     )
   }
 
-  if (externalDataProviderType === 'tickettailor') {
+  if (externalDataSourceType === 'tickettailor') {
     return (
       <div className="space-y-7">
         <header>
diff --git a/nextjs/src/app/(logged-in)/data-sources/create/review/[externalDataProviderId]/page.tsx b/nextjs/src/app/(logged-in)/data-sources/create/review/[externalDataProviderId]/page.tsx
index bc221aa88..4d0c74481 100644
--- a/nextjs/src/app/(logged-in)/data-sources/create/review/[externalDataProviderId]/page.tsx
+++ b/nextjs/src/app/(logged-in)/data-sources/create/review/[externalDataProviderId]/page.tsx
@@ -49,9 +49,9 @@ const GET_UPDATE_CONFIG = gql`
 `
 
 export default function Page({
-  params: { externalDataProviderId },
+  params: { externalDataSourceId },
 }: {
-  params: { externalDataProviderId: string }
+  params: { externalDataSourceId: string }
 }) {
   const router = useRouter()
   const context = useContext(CreateAutoUpdateFormContext)
@@ -65,7 +65,7 @@ export default function Page({
     AutoUpdateCreationReviewQueryVariables
   >(GET_UPDATE_CONFIG, {
     variables: {
-      ID: externalDataProviderId,
+      ID: externalDataSourceId,
     },
   })
 
@@ -145,7 +145,7 @@ export default function Page({
           </div>
           <div>
             <TriggerUpdateButton
-              id={externalDataProviderId}
+              id={externalDataSourceId}
               className="w-full"
               variant="reverse"
             />