diff --git a/apps/web/screens/Article/Article.tsx b/apps/web/screens/Article/Article.tsx index 1ca78a49e537..16bfd88f3b59 100644 --- a/apps/web/screens/Article/Article.tsx +++ b/apps/web/screens/Article/Article.tsx @@ -262,12 +262,14 @@ interface ArticleSidebarProps { article: Article activeSlug?: string | string[] n: (s: string) => string + organizationNamespace: Record } const ArticleSidebar: FC> = ({ article, activeSlug, n, + organizationNamespace, }) => { const { linkResolver } = useLinkResolver() const { activeLocale } = useI18n() @@ -296,7 +298,9 @@ const ArticleSidebar: FC> = ({ {article?.organization && article.organization.length > 0 && ( > = ({ /> )} {article?.subArticles && article.subArticles.length > 0 && ( - + )} []; slug: string }[] stepperNamespace: GetNamespaceQuery['getNamespace'] + organizationNamespace: Record } const ArticleScreen: Screen = ({ @@ -332,6 +342,7 @@ const ArticleScreen: Screen = ({ namespace, stepperNamespace, stepOptionsFromNamespace, + organizationNamespace, }) => { const { activeLocale } = useI18n() const portalRef = useRef() @@ -540,7 +551,8 @@ const ArticleScreen: Screen = ({ // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error make web strict title: article.organization[0].title, - label: n('organization'), + label: + organizationNamespace?.['organization'] ?? n('organization'), // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error make web strict href: getOrganizationLink( @@ -616,6 +628,7 @@ const ArticleScreen: Screen = ({ article={article} n={n} activeSlug={query.subSlug} + organizationNamespace={organizationNamespace} /> } @@ -648,6 +661,7 @@ const ArticleScreen: Screen = ({ n={n} activeSlug={query.subSlug} isMenuDialog + organizationNamespace={organizationNamespace} /> )} @@ -774,6 +788,7 @@ const ArticleScreen: Screen = ({ n={n} activeSlug={query.subSlug} isMenuDialog + organizationNamespace={organizationNamespace} /> )} @@ -910,7 +925,7 @@ ArticleScreen.getProps = async ({ apolloClient, query, locale }) => { const organizationNamespace = extractNamespaceFromOrganization( article.organization?.[0], - ) + ) as Record return { article, @@ -918,6 +933,7 @@ ArticleScreen.getProps = async ({ apolloClient, query, locale }) => { stepOptionsFromNamespace, stepperNamespace, customTopLoginButtonItem: organizationNamespace?.customTopLoginButtonItem, + organizationNamespace, ...getThemeConfig(article), } }