pre-pended PRODUCTIZED_BUILD with NEXT_PUBLIC_ (#924)

Signed-off-by: hemahg <[email protected]>
streamshub · Jul 24, 2024 · 3659965 · 3659965
1 parent 5064314
commit 3659965
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 34 deletions.
diff --git a/ui/app/[locale]/AppLayout.tsx b/ui/app/[locale]/AppLayout.tsx
@@ -21,8 +21,7 @@ import { PropsWithChildren, Suspense } from "react";
 
 export function AppLayout({
   children,
-  showLearningLinks,
-}: PropsWithChildren<{ showLearningLinks: boolean }>) {
+}: PropsWithChildren) {
   const t = useTranslations();
   return (
     <Page
@@ -48,7 +47,7 @@ export function AppLayout({
     >
       {/*<HelpContainer>*/}
       <ClusterDrawerProvider>
-        <ClusterDrawer showLearningLinks={showLearningLinks}>
+        <ClusterDrawer>
           <Banner variant={"blue"}>
             <Split>
               <SplitItem isFilled={true}>

diff --git a/ui/app/[locale]/ClusterConnectionDetails.tsx b/ui/app/[locale]/ClusterConnectionDetails.tsx
@@ -11,13 +11,13 @@ import {
 } from "@/libs/patternfly/react-core";
 import { Divider, Stack, StackItem } from "@patternfly/react-core";
 import { useTranslations } from "next-intl";
+import { isProductizedBuild } from "@/utils/env";
+
 
 export async function ClusterConnectionDetails({
   clusterId,
-  showLearningLinks,
 }: {
   clusterId: string;
-  showLearningLinks: boolean;
 }) {
   const t = useTranslations();
   const data = await getKafkaCluster(clusterId);
@@ -103,7 +103,7 @@ export async function ClusterConnectionDetails({
           </ExpandableSection>
         </TextContent>
       </StackItem>
-      {showLearningLinks && (
+      {isProductizedBuild && (
         <StackItem>
           <Divider />
           <Stack hasGutter={true} className={"pf-v5-u-p-lg"}>

diff --git a/ui/app/[locale]/ClusterDrawer.tsx b/ui/app/[locale]/ClusterDrawer.tsx
@@ -17,9 +17,8 @@ import { useTranslations } from "next-intl";
 import { PropsWithChildren, Suspense } from "react";
 
 export function ClusterDrawer({
-  children,
-  showLearningLinks,
-}: PropsWithChildren<{ showLearningLinks: boolean }>) {
+  children
+}: PropsWithChildren) {
   const t = useTranslations();
   const { expanded, clusterId, close } = useClusterDrawerContext();
   return (
@@ -54,7 +53,6 @@ export function ClusterDrawer({
               {clusterId && (
                 <ClusterConnectionDetails
                   clusterId={clusterId}
-                  showLearningLinks={showLearningLinks}
                 />
               )}
             </Suspense>
@@ -63,12 +61,12 @@ export function ClusterDrawer({
       >
         <DrawerContentBody
           className={"pf-v5-u-display-flex pf-v5-u-flex-direction-column"}
-          // style={{
-          //   height: "100%",
-          //   width: "100%",
-          //   overflowY: "auto",
-          //   position: "absolute",
-          // }}
+        // style={{
+        //   height: "100%",
+        //   width: "100%",
+        //   overflowY: "auto",
+        //   position: "absolute",
+        // }}
         >
           {children}
         </DrawerContentBody>

diff --git a/ui/app/[locale]/kafka/[kafkaId]/topics/(page)/ConnectedTopicsTable.tsx b/ui/app/[locale]/kafka/[kafkaId]/topics/(page)/ConnectedTopicsTable.tsx
@@ -7,7 +7,7 @@ import {
   TopicsTableColumns,
 } from "@/components/TopicsTable/TopicsTable";
 import { useRouter } from "@/navigation";
-import { isProductizedBuild, isReadonly } from "@/utils/env";
+import { isReadonly } from "@/utils/env";
 import { useFilterParams } from "@/utils/useFilterParams";
 import { useOptimistic, useTransition } from "react";
 
@@ -193,7 +193,6 @@ export function ConnectedTopicsTable({
       }}
       includeHidden={includeHidden}
       isReadOnly={isReadonly}
-      showLearningLinks={isProductizedBuild}
     />
   );
 }
diff --git a/ui/app/[locale]/layout.tsx b/ui/app/[locale]/layout.tsx
@@ -5,7 +5,6 @@ import NextIntlProvider from "@/app/[locale]/NextIntlProvider";
 import { SessionRefresher } from "@/app/[locale]/SessionRefresher";
 
 import { authOptions } from "@/utils/authOptions";
-import { isProductizedBuild } from "@/utils/env";
 import { getServerSession } from "next-auth";
 import { getTranslations } from "next-intl/server";
 import { notFound } from "next/navigation";
@@ -31,7 +30,7 @@ export default async function Layout({ children, params: { locale } }: Props) {
         <NextIntlProvider locale={locale} messages={messages}>
           <AppSessionProvider session={session}>
             <AppLayoutProvider>
-              <AppLayout showLearningLinks={isProductizedBuild}>
+              <AppLayout>
                 {children}
               </AppLayout>
             </AppLayoutProvider>

diff --git a/ui/components/TopicsTable/TopicsTable.tsx b/ui/components/TopicsTable/TopicsTable.tsx
@@ -78,7 +78,6 @@ export type TopicsTableProps = {
   filterId: string | undefined;
   filterName: string | undefined;
   filterStatus: TopicStatus[] | undefined;
-  showLearningLinks: boolean;
   onEditTopic: (topic: TopicList) => void;
   onDeleteTopic: (topic: TopicList) => void;
   onCreateTopic: () => void;
@@ -112,7 +111,6 @@ export function TopicsTable({
   onFilterIdChange,
   onFilterNameChange,
   onFilterStatusChange,
-  showLearningLinks,
 }: TopicsTableProps) {
   const t = useTranslations("topics");
   return (
@@ -127,7 +125,6 @@ export function TopicsTable({
           canCreate={isReadOnly === false}
           createHref={`${baseurl}/create`}
           onShowHiddenTopics={() => onInternalTopicsChange(true)}
-          showLearningLinks={showLearningLinks}
         />
       }
       emptyStateNoResults={
@@ -301,12 +298,12 @@ export function TopicsTable({
       actions={
         isReadOnly === false
           ? [
-              {
-                label: t("create_topic"),
-                onClick: onCreateTopic,
-                isPrimary: true,
-              },
-            ]
+            {
+              label: t("create_topic"),
+              onClick: onCreateTopic,
+              isPrimary: true,
+            },
+          ]
           : undefined
       }
       tools={[

diff --git a/ui/components/TopicsTable/components/EmptyStateNoTopics.tsx b/ui/components/TopicsTable/components/EmptyStateNoTopics.tsx
@@ -11,17 +11,16 @@ import {
 } from "@/libs/patternfly/react-core";
 import { PlusCircleIcon } from "@/libs/patternfly/react-icons";
 import { useTranslations } from "next-intl";
+import { isProductizedBuild } from "@/utils/env"
 
 export function EmptyStateNoTopics({
   canCreate,
   createHref,
   onShowHiddenTopics,
-  showLearningLinks,
 }: {
   canCreate: boolean;
   createHref: string;
   onShowHiddenTopics: () => void;
-  showLearningLinks: boolean;
 }) {
   const t = useTranslations();
   return (
@@ -45,7 +44,7 @@ export function EmptyStateNoTopics({
             {t("EmptyStateNoTopics.show_internal_topics")}
           </Button>
         </EmptyStateActions>
-        {showLearningLinks && (
+        {isProductizedBuild && (
           <EmptyStateActions>
             <ExternalLink
               testId={"create-topic"}

diff --git a/ui/environment.d.ts b/ui/environment.d.ts
@@ -6,7 +6,7 @@ namespace NodeJS {
     KEYCLOAK_CLIENTID?: string;
     KEYCLOAK_CLIENTSECRET?: string;
     NEXT_PUBLIC_KEYCLOAK_URL?: string;
-    PRODUCTIZED_BUILD?: "true" | "false";
+    NEXT_PUBLIC_PRODUCTIZED_BUILD?: "true" | "false";
     CONSOLE_METRICS_PROMETHEUS_URL?: string;
     LOG_LEVEL?: "fatal" | "error" | "warn" | "info" | "debug" | "trace";
     CONSOLE_MODE?: "read-only" | "read-write";

diff --git a/ui/utils/env.ts b/ui/utils/env.ts
@@ -14,4 +14,4 @@ export const isReadonly = (() => {
   return true;
 })();
 
-export const isProductizedBuild = process.env.PRODUCTIZED_BUILD === "true";
+export const isProductizedBuild = process.env.NEXT_PUBLIC_PRODUCTIZED_BUILD === "true";