From c861f4415fec4c9081bd1f6f5e91aa3642918261 Mon Sep 17 00:00:00 2001 From: "althaf.hameez" Date: Thu, 15 Oct 2020 14:24:21 +0800 Subject: [PATCH 1/8] Use organization name as the prefix for Service Catalog --- plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx b/plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx index 92f51ace06..9d658d7122 100644 --- a/plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx +++ b/plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx @@ -15,6 +15,7 @@ */ import { + configApiRef, Header, HomepageTimer, identityApiRef, @@ -33,12 +34,13 @@ const CatalogLayout = ({ children }: Props) => { const greeting = getTimeBasedGreeting(); const profile = useApi(identityApiRef).getProfile(); const userId = useApi(identityApiRef).getUserId(); + const orgName = useApi(configApiRef).getOptionalString('organization.name'); return (
From 9c779c0b09e69602926f8f8aaa3f9700d31637f1 Mon Sep 17 00:00:00 2001 From: "althaf.hameez" Date: Thu, 15 Oct 2020 14:59:30 +0800 Subject: [PATCH 2/8] Fix e2e tests --- .../default-app/packages/app/cypress/integration/app.js | 2 +- packages/e2e-test/src/commands/run.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js b/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js index dde26b7b39..2d63193fbf 100644 --- a/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js +++ b/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js @@ -1,6 +1,6 @@ describe('App', () => { it('should render the catalog', () => { cy.visit('/'); - cy.contains('Backstage Service Catalog'); + cy.contains('Spotify Service Catalog'); }); }); diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts index cfe0ad9685..7775fb29b2 100644 --- a/packages/e2e-test/src/commands/run.ts +++ b/packages/e2e-test/src/commands/run.ts @@ -301,7 +301,7 @@ async function testAppServe(pluginName: string, appDir: string) { try { const browser = new Browser(); - await waitForPageWithText(browser, '/', 'Backstage Service Catalog'); + await waitForPageWithText(browser, '/', 'Spotify Service Catalog'); await waitForPageWithText( browser, `/${pluginName}`, From 1f4f856cd4ae8d62d45d374b82a04f18fccf8d34 Mon Sep 17 00:00:00 2001 From: "althaf.hameez" Date: Thu, 15 Oct 2020 16:25:15 +0800 Subject: [PATCH 3/8] Revert --- .../default-app/packages/app/cypress/integration/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js b/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js index 2d63193fbf..dde26b7b39 100644 --- a/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js +++ b/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js @@ -1,6 +1,6 @@ describe('App', () => { it('should render the catalog', () => { cy.visit('/'); - cy.contains('Spotify Service Catalog'); + cy.contains('Backstage Service Catalog'); }); }); From 0d67d11eb349f810a0069588a2496a47a04a1718 Mon Sep 17 00:00:00 2001 From: "althaf.hameez" Date: Thu, 15 Oct 2020 16:54:36 +0800 Subject: [PATCH 4/8] fix --- .../default-app/packages/app/cypress/integration/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js b/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js index dde26b7b39..2d63193fbf 100644 --- a/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js +++ b/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js @@ -1,6 +1,6 @@ describe('App', () => { it('should render the catalog', () => { cy.visit('/'); - cy.contains('Backstage Service Catalog'); + cy.contains('Spotify Service Catalog'); }); }); From 94e8a38953397f3b69bef54880d6d20375c05e01 Mon Sep 17 00:00:00 2001 From: "althaf.hameez" Date: Thu, 15 Oct 2020 18:08:22 +0800 Subject: [PATCH 5/8] Acme corporation fix --- .../default-app/packages/app/cypress/integration/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js b/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js index 2d63193fbf..227e218fe6 100644 --- a/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js +++ b/packages/create-app/templates/default-app/packages/app/cypress/integration/app.js @@ -1,6 +1,6 @@ describe('App', () => { it('should render the catalog', () => { cy.visit('/'); - cy.contains('Spotify Service Catalog'); + cy.contains('Acme Corporation Service Catalog'); }); }); From 37015caeb9679197dbdb4aa887168ab8e9399fef Mon Sep 17 00:00:00 2001 From: "althaf.hameez" Date: Thu, 15 Oct 2020 18:25:48 +0800 Subject: [PATCH 6/8] Revert to backstage --- packages/e2e-test/src/commands/run.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts index 7775fb29b2..cfe0ad9685 100644 --- a/packages/e2e-test/src/commands/run.ts +++ b/packages/e2e-test/src/commands/run.ts @@ -301,7 +301,7 @@ async function testAppServe(pluginName: string, appDir: string) { try { const browser = new Browser(); - await waitForPageWithText(browser, '/', 'Spotify Service Catalog'); + await waitForPageWithText(browser, '/', 'Backstage Service Catalog'); await waitForPageWithText( browser, `/${pluginName}`, From a6c47b3d180e12dbf05d58c3097c025954165d95 Mon Sep 17 00:00:00 2001 From: "althaf.hameez" Date: Thu, 15 Oct 2020 18:42:26 +0800 Subject: [PATCH 7/8] Acme --- packages/e2e-test/src/commands/run.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts index cfe0ad9685..e7e23f4825 100644 --- a/packages/e2e-test/src/commands/run.ts +++ b/packages/e2e-test/src/commands/run.ts @@ -301,7 +301,7 @@ async function testAppServe(pluginName: string, appDir: string) { try { const browser = new Browser(); - await waitForPageWithText(browser, '/', 'Backstage Service Catalog'); + await waitForPageWithText(browser, '/', 'Acme Corporation Service Catalog'); await waitForPageWithText( browser, `/${pluginName}`, From 4e5d8b28ac54b0bdba1dc443ffeeb57c911f02ff Mon Sep 17 00:00:00 2001 From: "althaf.hameez" Date: Thu, 15 Oct 2020 18:53:46 +0800 Subject: [PATCH 8/8] Fix prettier --- packages/e2e-test/src/commands/run.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts index e7e23f4825..c05aed0b83 100644 --- a/packages/e2e-test/src/commands/run.ts +++ b/packages/e2e-test/src/commands/run.ts @@ -301,7 +301,11 @@ async function testAppServe(pluginName: string, appDir: string) { try { const browser = new Browser(); - await waitForPageWithText(browser, '/', 'Acme Corporation Service Catalog'); + await waitForPageWithText( + browser, + '/', + 'Acme Corporation Service Catalog', + ); await waitForPageWithText( browser, `/${pluginName}`,