>({
// resolver: zodResolver(formSchema),
@@ -85,31 +86,39 @@ const ProviderModal = () => {
}
}, []);
+ useEffect(() => {
+ const queryParams = new URLSearchParams(window.location.search);
+ const redirectIngressUri = queryParams.get('redirectIngressUri');
+ if (redirectIngressUri) {
+ setRedirectIngressUri(redirectIngressUri);
+ }
+ }, []);
+
useEffect(() => {
if (magicLink) {
setProjectId(magicLink?.id_project);
+ setIsProjectIdReady(true);
}
}, [magicLink]);
useEffect(()=>{
- const PROVIDERS = selectedCategory == "All" ? providersArray() : providersArray(selectedCategory);
- const getConnectorsToDisplay = () => {
- // First, check if the company selected custom connectors in the UI or not
- const unwanted_connectors = transformConnectorsStatus(connectorsForProject).filter(connector => connector.status === "false");
- // Filter out the providers present in the unwanted connectors array
- const filteredProviders = PROVIDERS.filter(provider => {
- return !unwanted_connectors.some( (unwanted) =>
- unwanted.category === provider.vertical && unwanted.connector_name === provider.name
- );
- });
- return filteredProviders;
- }
-
- if(connectorsForProject) {
- setData(getConnectorsToDisplay())
+ if (isProjectIdReady && connectorsForProject) {
+ const PROVIDERS = selectedCategory == "All" ? providersArray() : providersArray(selectedCategory);
+ const getConnectorsToDisplay = () => {
+ // First, check if the company selected custom connectors in the UI or not
+ const unwanted_connectors = transformConnectorsStatus(connectorsForProject).filter(connector => connector.status === "false");
+ // Filter out the providers present in the unwanted connectors array
+ const filteredProviders = PROVIDERS.filter(provider => {
+ return !unwanted_connectors.some( (unwanted) =>
+ unwanted.category === provider.vertical && unwanted.connector_name === provider.name
+ );
+ });
+ return filteredProviders;
+ }
+ setData(getConnectorsToDisplay())
}
- }, [connectorsForProject, selectedCategory])
+ }, [connectorsForProject, selectedCategory, isProjectIdReady])
const { open, isReady } = useOAuth({
providerName: selectedProvider?.provider!,
@@ -117,6 +126,7 @@ const ProviderModal = () => {
returnUrl: window.location.href,
projectId: projectId,
linkedUserId: magicLink?.id_linked_user as string,
+ redirectIngressUri,
onSuccess: () => {
console.log('OAuth successful');
setOpenSuccessDialog(true);
diff --git a/apps/webapp/src/app/layout.tsx b/apps/webapp/src/app/layout.tsx
index 8eb767539..a6d8f03e9 100644
--- a/apps/webapp/src/app/layout.tsx
+++ b/apps/webapp/src/app/layout.tsx
@@ -9,7 +9,7 @@ const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "Panora",
- description: "Unfied API",
+ description: "Unified API",
};
export default function RootLayout({
diff --git a/apps/webapp/src/components/Configuration/Webhooks/AddWebhook.tsx b/apps/webapp/src/components/Configuration/Webhooks/AddWebhook.tsx
index 9323c7975..b3537072a 100644
--- a/apps/webapp/src/components/Configuration/Webhooks/AddWebhook.tsx
+++ b/apps/webapp/src/components/Configuration/Webhooks/AddWebhook.tsx
@@ -80,7 +80,6 @@ const AddWebhook = () => {
createWebhookPromise({
url: values.url,
description: values.description,
- id_project: idProject,
scope: selectedScopes,
}),
{
diff --git a/apps/webapp/src/components/Connection/ConnectionTable.tsx b/apps/webapp/src/components/Connection/ConnectionTable.tsx
index 69c583b63..6371a21eb 100644
--- a/apps/webapp/src/components/Connection/ConnectionTable.tsx
+++ b/apps/webapp/src/components/Connection/ConnectionTable.tsx
@@ -55,7 +55,8 @@ export default function ConnectionTable() {
connectionToken: connection.connection_token!
}))
-
+ const INGRESS_REDIRECT = config.DISTRIBUTION == 'selfhost' && config.REDIRECT_WEBHOOK_INGRESS;
+
return (
<>
@@ -114,7 +115,7 @@ export default function ConnectionTable() {
-