From 72d92d928b83a4dd9bdf528d53dbcc557cf05ba2 Mon Sep 17 00:00:00 2001 From: Jan Dubois Date: Tue, 24 Oct 2023 09:58:13 -0700 Subject: [PATCH 1/2] Display app name as "Rancher Desktop by SUSE" Both in the "General" page and the "About" box. Signed-off-by: Jan Dubois --- background.ts | 2 +- e2e/main.e2e.spec.ts | 2 +- e2e/utils/ProfileUtils.ts | 4 ++-- pkg/rancher-desktop/assets/translations/en-us.yaml | 2 +- pkg/rancher-desktop/pages/FirstRun.vue | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/background.ts b/background.ts index 8e04440c4c4..ca6cface152 100644 --- a/background.ts +++ b/background.ts @@ -286,7 +286,7 @@ Electron.app.whenReady().then(async() => { // TODO: Update this to 2021-... as dev progresses // also needs to be updated in electron-builder.yml copyright: 'Copyright © 2021-2023 SUSE LLC', - applicationName: Electron.app.name, + applicationName: `${ Electron.app.name } by SUSE`, applicationVersion: `Version ${ await getVersion() }`, iconPath: path.join(paths.resources, 'icons', 'logo-square-512.png'), }); diff --git a/e2e/main.e2e.spec.ts b/e2e/main.e2e.spec.ts index 37bba441f5f..a30541fbce1 100644 --- a/e2e/main.e2e.spec.ts +++ b/e2e/main.e2e.spec.ts @@ -33,7 +33,7 @@ test.describe.serial('Main App Test', () => { test('should land on General page', async() => { const navPage = new NavPage(page); - await expect(navPage.mainTitle).toHaveText('Welcome to Rancher Desktop'); + await expect(navPage.mainTitle).toHaveText('Welcome to Rancher Desktop by SUSE'); }); test('should navigate to Port Forwarding and check elements', async() => { diff --git a/e2e/utils/ProfileUtils.ts b/e2e/utils/ProfileUtils.ts index 2e63f62dade..1b61e8e8162 100644 --- a/e2e/utils/ProfileUtils.ts +++ b/e2e/utils/ProfileUtils.ts @@ -201,7 +201,7 @@ export async function testForFirstRunWindow(testPath: string) { try { await retry(async() => { - await expect(navPage.mainTitle).toHaveText('Welcome to Rancher Desktop'); + await expect(navPage.mainTitle).toHaveText('Welcome to Rancher Desktop by SUSE'); }); page = openedPage; windowCountForMainPage = windowCount; @@ -252,7 +252,7 @@ export async function testForNoFirstRunWindow(testPath: string) { try { await retry(async() => { - await expect(navPage.mainTitle).toHaveText('Welcome to Rancher Desktop'); + await expect(navPage.mainTitle).toHaveText('Welcome to Rancher Desktop by SUSE'); }); page = openedPage; windowCountForMainPage = windowCount; diff --git a/pkg/rancher-desktop/assets/translations/en-us.yaml b/pkg/rancher-desktop/assets/translations/en-us.yaml index 66f6efeb884..96d799af066 100644 --- a/pkg/rancher-desktop/assets/translations/en-us.yaml +++ b/pkg/rancher-desktop/assets/translations/en-us.yaml @@ -279,7 +279,7 @@ portForwarding: sortableTables: noRows: There are no port forwarding entries to show general: - title: Welcome to Rancher Desktop + title: Welcome to Rancher Desktop by SUSE description: Rancher Desktop provides Kubernetes and image management through the use of a desktop application. about: title: About diff --git a/pkg/rancher-desktop/pages/FirstRun.vue b/pkg/rancher-desktop/pages/FirstRun.vue index 51fd0830de6..187d4d58034 100644 --- a/pkg/rancher-desktop/pages/FirstRun.vue +++ b/pkg/rancher-desktop/pages/FirstRun.vue @@ -1,7 +1,7 @@