From b647277333a9569e61536d82e0f7579d4448cd64 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Fri, 27 Jan 2023 19:02:34 -0800 Subject: [PATCH 1/2] UseOrganizations infer the data type from the loaders --- apps/webapp/app/hooks/useOrganizations.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/webapp/app/hooks/useOrganizations.ts b/apps/webapp/app/hooks/useOrganizations.ts index 55afb7cdd15..2aa1e337001 100644 --- a/apps/webapp/app/hooks/useOrganizations.ts +++ b/apps/webapp/app/hooks/useOrganizations.ts @@ -1,17 +1,17 @@ -import type { - getOrganizationFromSlug, - Organization, -} from "~/models/organization.server"; -import type { PrismaReturnType } from "~/utils"; +import type { UseDataFunctionReturn } from "remix-typedjson"; +import type { loader as appLoader } from "~/routes/__app"; +import type { loader as orgLoader } from "~/routes/__app/orgs/$organizationSlug"; import { hydrateObject, useMatchesData } from "~/utils"; -export function useOrganizations(): Organization[] | undefined { +export function useOrganizations() { const routeMatch = useMatchesData("routes/__app"); if (!routeMatch || !routeMatch.data.organizations) { return undefined; } - return hydrateObject(routeMatch.data.organizations); + return hydrateObject< + UseDataFunctionReturn["organizations"] + >(routeMatch.data.organizations); } export function useCurrentOrganization() { @@ -26,7 +26,7 @@ export function useCurrentOrganization() { } const result = hydrateObject< - PrismaReturnType + UseDataFunctionReturn["organization"] >(routeMatch.data.organization); if (result == null) return undefined; From 49810df7352041c072bc5e7196d40fff8c25c161 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Fri, 27 Jan 2023 19:27:49 -0800 Subject: [PATCH 2/2] Removed Typeform --- .../app/components/CreateNewWorkflow.tsx | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/apps/webapp/app/components/CreateNewWorkflow.tsx b/apps/webapp/app/components/CreateNewWorkflow.tsx index 591f8337cea..2e2d061888a 100644 --- a/apps/webapp/app/components/CreateNewWorkflow.tsx +++ b/apps/webapp/app/components/CreateNewWorkflow.tsx @@ -84,22 +84,14 @@ export function CreateNewWorkflowNoWorkflows() { Easily authenticate with APIs using the supported integrations below. If there's an integration we don't yet support,{" "} - - {" "} + let us know + {" "} and we'll add it. -
{getProviders(false).map((provider) => (