From 1a142ae8a42fb018e9c746f853e3d5c460dc544d Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 26 Apr 2021 21:36:50 +0200
Subject: [PATCH] catalog: switch out time-based greeting for plain title

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/witty-lies-shave.md                      |  5 +++++
 .../src/components/CatalogPage/CatalogLayout.tsx    | 13 ++++---------
 .../src}/utils/locales/goodAfternoon.locales.json   |  0
 .../src}/utils/locales/goodEvening.locales.json     |  0
 .../src}/utils/locales/goodMorning.locales.json     |  0
 .../CatalogPage => welcome/src}/utils/timeUtil.js   |  0
 .../src}/utils/timeUtil.test.js                     |  0
 7 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/witty-lies-shave.md
 rename plugins/{catalog/src/components/CatalogPage => welcome/src}/utils/locales/goodAfternoon.locales.json (100%)
 rename plugins/{catalog/src/components/CatalogPage => welcome/src}/utils/locales/goodEvening.locales.json (100%)
 rename plugins/{catalog/src/components/CatalogPage => welcome/src}/utils/locales/goodMorning.locales.json (100%)
 rename plugins/{catalog/src/components/CatalogPage => welcome/src}/utils/timeUtil.js (100%)
 rename plugins/{catalog/src/components/CatalogPage => welcome/src}/utils/timeUtil.test.js (100%)

diff --git a/.changeset/witty-lies-shave.md b/.changeset/witty-lies-shave.md
new file mode 100644
index 0000000000..4c0aeef80a
--- /dev/null
+++ b/.changeset/witty-lies-shave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Switch out the time-based personal greeting for a plain title on the catalog index page.
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx b/plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx
index 298aeacfec..c038f3f08c 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogLayout.tsx
@@ -18,29 +18,24 @@ import {
   configApiRef,
   Header,
   HomepageTimer,
-  identityApiRef,
   Page,
   useApi,
 } from '@backstage/core';
 import React from 'react';
-import { getTimeBasedGreeting } from './utils/timeUtil';
 
 type Props = {
   children?: React.ReactNode;
 };
 
 const CatalogLayout = ({ children }: Props) => {
-  const greeting = getTimeBasedGreeting();
-  const profile = useApi(identityApiRef).getProfile();
-  const userId = useApi(identityApiRef).getUserId();
-  const orgName = useApi(configApiRef).getOptionalString('organization.name');
+  const orgName =
+    useApi(configApiRef).getOptionalString('organization.name') ?? 'Backstage';
 
   return (
     <Page themeId="home">
       <Header
-        title={`${greeting.greeting}, ${profile.displayName || userId}!`}
-        subtitle={`${orgName || 'Backstage'} Service Catalog`}
-        tooltip={greeting.language}
+        title={`${orgName} Catalog`}
+        subtitle={`Index of software components in ${orgName}`}
         pageTitleOverride="Home"
       >
         <HomepageTimer />
diff --git a/plugins/catalog/src/components/CatalogPage/utils/locales/goodAfternoon.locales.json b/plugins/welcome/src/utils/locales/goodAfternoon.locales.json
similarity index 100%
rename from plugins/catalog/src/components/CatalogPage/utils/locales/goodAfternoon.locales.json
rename to plugins/welcome/src/utils/locales/goodAfternoon.locales.json
diff --git a/plugins/catalog/src/components/CatalogPage/utils/locales/goodEvening.locales.json b/plugins/welcome/src/utils/locales/goodEvening.locales.json
similarity index 100%
rename from plugins/catalog/src/components/CatalogPage/utils/locales/goodEvening.locales.json
rename to plugins/welcome/src/utils/locales/goodEvening.locales.json
diff --git a/plugins/catalog/src/components/CatalogPage/utils/locales/goodMorning.locales.json b/plugins/welcome/src/utils/locales/goodMorning.locales.json
similarity index 100%
rename from plugins/catalog/src/components/CatalogPage/utils/locales/goodMorning.locales.json
rename to plugins/welcome/src/utils/locales/goodMorning.locales.json
diff --git a/plugins/catalog/src/components/CatalogPage/utils/timeUtil.js b/plugins/welcome/src/utils/timeUtil.js
similarity index 100%
rename from plugins/catalog/src/components/CatalogPage/utils/timeUtil.js
rename to plugins/welcome/src/utils/timeUtil.js
diff --git a/plugins/catalog/src/components/CatalogPage/utils/timeUtil.test.js b/plugins/welcome/src/utils/timeUtil.test.js
similarity index 100%
rename from plugins/catalog/src/components/CatalogPage/utils/timeUtil.test.js
rename to plugins/welcome/src/utils/timeUtil.test.js