diff --git a/ui/app/[locale]/AppMasthead.tsx b/ui/app/[locale]/AppMasthead.tsx index b8b3ecc85..6907a171e 100644 --- a/ui/app/[locale]/AppMasthead.tsx +++ b/ui/app/[locale]/AppMasthead.tsx @@ -50,7 +50,7 @@ export function AppMasthead() { {t("common.title")} diff --git a/ui/app/[locale]/ClusterConnectionDetails.tsx b/ui/app/[locale]/ClusterConnectionDetails.tsx index 538935a9a..f322208a0 100644 --- a/ui/app/[locale]/ClusterConnectionDetails.tsx +++ b/ui/app/[locale]/ClusterConnectionDetails.tsx @@ -105,25 +105,13 @@ export async function ClusterConnectionDetails({ - - {t( - "ClusterConnectionDetails.developing_kafka_client_applications", - )} + + {t("ClusterConnectionDetails.developing_kafka_client_applications",)} - - {t("ClusterConnectionDetails.amq_streams_portal")} + + {t("ClusterConnectionDetails.streams_portal")} diff --git a/ui/app/[locale]/home/page.tsx b/ui/app/[locale]/home/page.tsx index ceea88e58..cc5ac0af5 100644 --- a/ui/app/[locale]/home/page.tsx +++ b/ui/app/[locale]/home/page.tsx @@ -1,3 +1,4 @@ +import { useTranslations } from "next-intl"; import { getConsumerGroups } from "@/api/consumerGroups/actions"; import { getKafkaCluster, getKafkaClusters } from "@/api/kafka/actions"; import { ClusterList } from "@/api/kafka/schema"; @@ -40,6 +41,7 @@ import { Suspense } from "react"; import styles from "./home.module.css"; export default function Home() { + const t = useTranslations(); const allClusters = getKafkaClusters(); return ( <> @@ -48,10 +50,10 @@ export default function Home() {
- Welcome to the AMQ streams console + Welcome to the {t("common.product")} console - The Red Hat AMQ Streams console provides a user interface for + The {t("common.brand")} {t("common.product")} console provides a user interface for managing and monitoring your streaming resources @@ -90,15 +92,14 @@ export default function Home() { Recently viewed topics{" "} - The last 5 topics this account has accessed from the AMQ - Streams console. + The last 5 topics this account has accessed from the {t("common.product")} console. } @@ -164,7 +165,7 @@ export default function Home() { dataListCells={[ - AMQ Streams on OpenShift Overview + {t("common.product")} on OpenShift Overview , @@ -173,12 +174,7 @@ export default function Home() { , - + View documentation , @@ -192,7 +188,7 @@ export default function Home() { dataListCells={[ - Getting Started with AMQ Streams on Openshift + Getting Started with {t("common.product")} on Openshift , @@ -201,12 +197,7 @@ export default function Home() { , - + View documentation , @@ -229,12 +220,7 @@ export default function Home() { , - + View documentation , @@ -257,12 +243,7 @@ export default function Home() { , - + View documentation , @@ -342,6 +323,7 @@ async function ConnectedClustersTable({ } async function RecentTopics() { + const t = useTranslations(); const viewedTopics = await getViewedTopics(); return viewedTopics.length > 0 ? ( @@ -349,17 +331,11 @@ async function RecentTopics() { - When you start looking at specific topics through the AMQ Streams - console, they"ll start showing here. + When you start looking at specific topics through the {t("common.product")} console, they"ll start showing here. - + Using the Topic Operator to manage Kafka topics diff --git a/ui/messages/en.json b/ui/messages/en.json index de003207d..9eb0c0a9d 100644 --- a/ui/messages/en.json +++ b/ui/messages/en.json @@ -1,9 +1,20 @@ { "common": { - "title": "Red Hat AMQ Streams console", - "description": "Red Hat AMQ is a lightweight, high-performance, robust messaging platform.", + "brand": "Red Hat", + "product": "Streams for Apache Kafka", + "title": "Red Hat Streams for Apache Kafka console", + "description": "Red Hat Streams for Apache Kafka is a lightweight, high-performance, robust messaging platform.", "search_hint": "Filter by {label}" }, + "learning": { + "links": { + "overview": "https://access.redhat.com/documentation/en-us/red_hat_amq_streams/2.5/html/amq_streams_on_openshift_overview", + "gettingStarted": "https://access.redhat.com/documentation/en-us/red_hat_amq_streams/2.5/html/getting_started_with_amq_streams_on_openshift", + "connecting": "https://access.redhat.com/documentation/en-us/red_hat_amq_streams/2.5/html/developing_kafka_client_applications", + "topicOperatorUse": "https://access.redhat.com/documentation/en-us/red_hat_amq_streams/2.5/html/deploying_and_managing_amq_streams_on_openshift/using-the-topic-operator-str#doc-wrapper" + + } + }, "RefreshButton": { "refresh_button_label": "Refresh", "refresh_description": "Reload contents", @@ -158,7 +169,7 @@ }, "ManagedTopicLabel": { "label": "Managed", - "tooltip": "Managed topics are created using the KafkaTopic custom resource and are created and updated in the Kafka cluster by the AMQ Streams Topic Operator." + "tooltip": "Managed topics are created using the KafkaTopic custom resource and are created and updated in the Kafka cluster by the Streams for Apache Kafka Topic Operator." }, "AdvancedSearch": { "dialog_label": "Search messages", @@ -220,7 +231,7 @@ "internal_Servers_bootstraps_description": "Internal listeners provide client access to a Kafka cluster only from within the OpenShift cluster.", "when_you_have_established_a_connection": "When you have established a connection, you can begin consuming messages from Kafka topics or producing messages to them.", "developing_kafka_client_applications": "Developing Kafka client applications", - "amq_streams_portal": "AMQ Streams portal" + "streams_portal": "Streams for Apache Kafka portal" }, "ClusterDrawer": { "cluster_connection_details": "Cluster connection details" diff --git a/ui/public/Logo-Red_Hat-AMQ-A-Reverse-RGB.svg b/ui/public/Logo-Red_Hat-AMQ-A-Reverse-RGB.svg deleted file mode 100644 index 896ca52e0..000000000 --- a/ui/public/Logo-Red_Hat-AMQ-A-Reverse-RGB.svg +++ /dev/null @@ -1 +0,0 @@ -Logo-Red_Hat-AMQ-A-Reverse-RGB \ No newline at end of file diff --git a/ui/public/logo.png b/ui/public/logo.png deleted file mode 100644 index 5278b0066..000000000 Binary files a/ui/public/logo.png and /dev/null differ diff --git a/ui/public/masthead-logo.svg b/ui/public/masthead-logo.svg new file mode 100644 index 000000000..046bffaf7 --- /dev/null +++ b/ui/public/masthead-logo.svg @@ -0,0 +1,93 @@ + + + Red Hat Streams for Apache Kafka logo + + + + + + + + + + + + + Red Hat Streams for Apache Kafka logo + + + + Streams for Apache Kafka + diff --git a/ui/public/strimzi-dark-picto.png b/ui/public/strimzi-dark-picto.png deleted file mode 100644 index 76ef86603..000000000 Binary files a/ui/public/strimzi-dark-picto.png and /dev/null differ diff --git a/ui/public/strimzi-dark.png b/ui/public/strimzi-dark.png deleted file mode 100644 index 06c50c232..000000000 Binary files a/ui/public/strimzi-dark.png and /dev/null differ diff --git a/ui/public/strimzi.png b/ui/public/strimzi.png deleted file mode 100644 index c91b03ee9..000000000 Binary files a/ui/public/strimzi.png and /dev/null differ diff --git a/ui/tests/playwright/HomePage.test.tsx b/ui/tests/playwright/HomePage.test.tsx index 4732c094a..14f23b4d2 100644 --- a/ui/tests/playwright/HomePage.test.tsx +++ b/ui/tests/playwright/HomePage.test.tsx @@ -30,7 +30,7 @@ test("Home page", async ({ page }) => { ); const inputValues = await page.locator('.pf-v5-c-form-control input[type="text"]').evaluateAll((inputs) => inputs.map((input) => (input as HTMLInputElement).value) - ); + ); expect(inputValues.every((value) => value.length > 1)).toBe(true); //await page.waitForSelector('span[class="pf-v5-c-form-control pf-m-readonly"] input[id="text-input-13"]'); }); @@ -42,30 +42,30 @@ test("Home page", async ({ page }) => { await test.step("Data cells in each row are present", async () => { const dataCells = await page.locator('table[aria-label="Kafka clusters"] tbody tr td').evaluateAll((tds) => tds.map((td) => td.textContent?.trim() ?? "") - ); + ); expect(dataCells.length).toBeGreaterThan(0); }); await test.step("Text on Home Page", async () => { // Assertions for the presence of specific strings in the inner text of page elements expect(await page.innerText("body")).toContain( - "Welcome to the AMQ streams console", + "Welcome to the Streams for Apache Kafka console", ); expect(await page.innerText("body")).toContain( "Platform: OpenShift Cluster", ); expect(await page.innerText("body")).toContain("Recently viewed topics"); expect(await page.innerText("body")).toContain( - 'When you start looking at specific topics through the AMQ Streams console, they"ll start showing here.', + 'When you start looking at specific topics through the Streams for Apache Kafka console, they"ll start showing here.', ); expect(await page.innerText("body")).toContain( - "AMQ Streams on OpenShift Overview", + "Streams for Apache Kafka on OpenShift Overview", ); expect(await page.innerText("body")).toContain( "Recommended learning resources", ); expect(await page.innerText("body")).toContain( - "Getting Started with AMQ Streams on Openshift", + "Getting Started with Streams for Apache Kafka on Openshift", ); expect(await page.innerText("body")).toContain( "Connect to a Kafka cluster from an application", diff --git a/ui/tests/playwright/auth.setup.ts b/ui/tests/playwright/auth.setup.ts index 88fc88c28..a67f803a1 100644 --- a/ui/tests/playwright/auth.setup.ts +++ b/ui/tests/playwright/auth.setup.ts @@ -13,7 +13,7 @@ setup("authenticate", async ({ page }) => { // Sometimes login flow sets cookies in the process of several redirects. await page.waitForURL("./home", { waitUntil: "commit" }); await expect( - page.getByText("Welcome to the AMQ streams console"), + page.getByText("Welcome to the Streams for Apache Kafka console"), ).toBeVisible(); await page.context().storageState({ path: authFile });