From f442310ea69467df05ef8a2e9de6f66c700ac938 Mon Sep 17 00:00:00 2001 From: ev <4164774+ev-sc@users.noreply.github.com> Date: Tue, 10 Dec 2024 15:56:29 +0000 Subject: [PATCH 1/5] Remove test data --- .../create/connect/[externalDataProviderType]/page.tsx | 7 ------- 1 file changed, 7 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 b93afd4e3..8b0e4f677 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 @@ -158,13 +158,6 @@ export default function Page({ const form = useForm({ defaultValues: { ...defaultValues, - // REMOVE - airtable: { - baseId: 'appZ9UYXvsIrTbYQs', - tableId: 'tblGrH67nWM4ROgwf', - apiKey: - 'patpg0NikxPjHb59O.8b72db8273cc25526b582e47efe0bba18882e679aec15ea3c854f59c8af3263c', - }, } as FormInputs, }) From 37156d793f1f0857361546903a6564148371101d Mon Sep 17 00:00:00 2001 From: ev <4164774+ev-sc@users.noreply.github.com> Date: Tue, 10 Dec 2024 16:01:49 +0000 Subject: [PATCH 2/5] Correct font --- nextjs/src/app/reports/[id]/(components)/ReportSidebarLeft.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextjs/src/app/reports/[id]/(components)/ReportSidebarLeft.tsx b/nextjs/src/app/reports/[id]/(components)/ReportSidebarLeft.tsx index 7a906aa80..428b619e5 100644 --- a/nextjs/src/app/reports/[id]/(components)/ReportSidebarLeft.tsx +++ b/nextjs/src/app/reports/[id]/(components)/ReportSidebarLeft.tsx @@ -49,7 +49,7 @@ export function ReportSidebarLeft() { Configuration - + Click on "Configuration" to visualise your data 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 3/5] 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({

Testing connection...

Please wait whilst we try to connect to your{' '} - {formatCrmNames(externalDataProviderType || 'CRM')} using the + {formatCrmNames(externalDataSourceType || 'CRM')} using the information you provided

@@ -770,7 +770,7 @@ export default function Page({ ) } - if (externalDataProviderType === 'airtable') { + if (externalDataSourceType === 'airtable') { return (
@@ -919,7 +919,7 @@ export default function Page({ ) } - if (externalDataProviderType === 'mailchimp') { + if (externalDataSourceType === 'mailchimp') { return (
@@ -1010,7 +1010,7 @@ export default function Page({
) } - 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({
) } - 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 (
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({
From 920f878194dcc277b4469316e69397122a4b00da Mon Sep 17 00:00:00 2001 From: ev <4164774+ev-sc@users.noreply.github.com> Date: Wed, 11 Dec 2024 08:05:53 +0000 Subject: [PATCH 4/5] Use single line query --- hub/models.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hub/models.py b/hub/models.py index be93d5f6b..ed2aea9c0 100644 --- a/hub/models.py +++ b/hub/models.py @@ -1596,11 +1596,10 @@ async def create_import_record(record): async def create_import_record(record): structured_data = get_update_data(record) - wards = Area.objects.filter( + ward = await Area.objects.filter( area_type__code="WD23", gss=self.get_record_field(record, self.geography_column), - ) - ward = await sync_to_async(wards.first)() + ).afirst() coord = ward.point.centroid postcode_data: PostcodesIOResult = await loaders[ "postcodesIOFromPoint" From 19bcce645b68e0836c67406cf72aab3f7419d60c Mon Sep 17 00:00:00 2001 From: ev <4164774+ev-sc@users.noreply.github.com> Date: Wed, 11 Dec 2024 08:11:16 +0000 Subject: [PATCH 5/5] Revert folder name --- .../page.tsx | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nextjs/src/app/(logged-in)/data-sources/create/connect/{[externalDataProviderType] => [externalDataSourceType]}/page.tsx (100%) 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/[externalDataSourceType]/page.tsx similarity index 100% rename from nextjs/src/app/(logged-in)/data-sources/create/connect/[externalDataProviderType]/page.tsx rename to nextjs/src/app/(logged-in)/data-sources/create/connect/[externalDataSourceType]/page.tsx