From 6a3b238c1d20545fc1ad61cd90b7be9c4b4807b1 Mon Sep 17 00:00:00 2001 From: Darya Umrikhina Date: Thu, 22 Aug 2024 16:12:22 +0400 Subject: [PATCH] Login:Src: change display LanguageComboboxWrapper --- packages/login/src/app/(root)/layout.tsx | 29 ++++++++++++++++++--- packages/login/src/components/SimpleNav.tsx | 9 +------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/packages/login/src/app/(root)/layout.tsx b/packages/login/src/app/(root)/layout.tsx index 11fceda241..da87052cf6 100644 --- a/packages/login/src/app/(root)/layout.tsx +++ b/packages/login/src/app/(root)/layout.tsx @@ -26,14 +26,23 @@ import React from "react"; -import { cookies } from "next/headers"; +import { cookies, headers } from "next/headers"; import { getBgPattern } from "@docspace/shared/utils/common"; import { Scrollbar } from "@docspace/shared/components/scrollbar"; import SimpleNav from "@/components/SimpleNav"; -import { getColorTheme, getSettings } from "@/utils/actions"; +import { getColorTheme, getPortalCultures, getSettings } from "@/utils/actions"; import { ContentWrapper, StyledPage } from "@/components/Layout.styled"; +import dynamic from "next/dynamic"; +import { TYPE_LINK_WITHOUT_LNG_COMBOBOX } from "@/utils/constants"; + +const LanguageComboboxWrapper = dynamic( + () => import("@/components/LanguageCombobox"), + { + ssr: false, + }, +); export default async function Layout({ children, @@ -52,13 +61,25 @@ export default async function Layout({ const culture = cookies().get("asc_language")?.value ?? objectSettings?.culture; + const hdrs = headers(); + const type = hdrs.get("x-confirm-type") ?? ""; + + let isComboboxVisible = true; + if (TYPE_LINK_WITHOUT_LNG_COMBOBOX?.includes(type)) { + isComboboxVisible = false; + } + return (
- - +
+ {isComboboxVisible && } + {children} diff --git a/packages/login/src/components/SimpleNav.tsx b/packages/login/src/components/SimpleNav.tsx index c908339a21..454cfe1fc7 100644 --- a/packages/login/src/components/SimpleNav.tsx +++ b/packages/login/src/components/SimpleNav.tsx @@ -84,17 +84,10 @@ const SimpleNav = ({ culture, ); - let isComboboxVisible = isLanguageComboboxVisible; - - const searchParamType = useSearchParams().get("type") ?? ""; - if (TYPE_LINK_WITHOUT_LNG_COMBOBOX?.includes(searchParamType)) { - isComboboxVisible = false; - } - return ( logo-url - {isComboboxVisible && } + {isLanguageComboboxVisible && } ); };