From 968a3a9b8422262ea8a90fe71476762a3b68091b Mon Sep 17 00:00:00 2001 From: "M. Palanikannan" <73993394+Palanikannan1437@users.noreply.github.com> Date: Tue, 20 Aug 2024 20:03:23 +0530 Subject: [PATCH] fix: show silo iframe only if all variables are configured (#881) --- .../[workspaceSlug]/(projects)/settings/imports/page.tsx | 6 ++++-- web/ee/components/iframe/silo-iframe.tsx | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/app/[workspaceSlug]/(projects)/settings/imports/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/imports/page.tsx index fb12275a67..c1eac5c035 100644 --- a/web/app/[workspaceSlug]/(projects)/settings/imports/page.tsx +++ b/web/app/[workspaceSlug]/(projects)/settings/imports/page.tsx @@ -11,7 +11,7 @@ import { EUserWorkspaceRoles } from "@/constants/workspace"; // helpers import { cn } from "@/helpers/common.helper"; // hooks -import { useUser, useWorkspace } from "@/hooks/store"; +import { useInstance, useUser, useWorkspace } from "@/hooks/store"; // plane web components import IntegrationGuide from "@/plane-web/components/integration/guide"; // plane web hooks @@ -25,6 +25,8 @@ const ImportsPage = observer(() => { userProfile: { data: userProfile }, membership: { currentWorkspaceRole }, } = useUser(); + const { config } = useInstance(); + const { currentWorkspace } = useWorkspace(); // derived values @@ -44,7 +46,7 @@ const ImportsPage = observer(() => { ); - if (!isSiloIntegrationEnabled) + if (!isSiloIntegrationEnabled || !config?.silo_base_url) return ( <> diff --git a/web/ee/components/iframe/silo-iframe.tsx b/web/ee/components/iframe/silo-iframe.tsx index 8028396237..8aa9c21ff9 100644 --- a/web/ee/components/iframe/silo-iframe.tsx +++ b/web/ee/components/iframe/silo-iframe.tsx @@ -3,10 +3,9 @@ import { useRef, useCallback, useEffect, useState } from "react"; import { useParams } from "next/navigation"; import { useTheme } from "next-themes"; import useSWR from "swr"; -import { LogoSpinner } from "@/components/common"; +import { Spinner } from "@plane/ui"; import { cn } from "@/helpers/common.helper"; import { ServiceAPITokenService } from "@/plane-web/services/api_token.service"; -import { Spinner } from "@plane/ui"; interface CustomIframeProps { srcBase: string;