From 4e2ec6a308d91967119e054448e78017ff88b304 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:47:48 +0200 Subject: [PATCH 01/21] Update WelcomeTitle.tsx Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .../WelcomeTitle/WelcomeTitle.tsx | 58 +++++++++---------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx index 49ae38d90c..d4c39e2a29 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx +++ b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx @@ -13,39 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { - alertApiRef, - identityApiRef, - useApi, -} from '@backstage/core-plugin-api'; -import { Tooltip, Typography } from '@material-ui/core'; -import React, { useEffect, useMemo } from 'react'; -import useAsync from 'react-use/lib/useAsync'; -import { getTimeBasedGreeting } from './timeUtil'; +import { renderInTestApp } from '@backstage/test-utils'; +import React from 'react'; +import { WelcomeTitle } from './WelcomeTitle'; -export const WelcomeTitle = () => { - const identityApi = useApi(identityApiRef); - const alertApi = useApi(alertApiRef); - const greeting = useMemo(() => getTimeBasedGreeting(), []); +describe('', () => { + afterEach(() => jest.resetAllMocks()); - const { value: profile, error } = useAsync(() => - identityApi.getProfileInfo(), - ); + test('should greet user with default greeting', async () => { + jest + .spyOn(global.Date, 'now') + .mockImplementation(() => new Date('1970-01-01T23:00:00').valueOf()); - useEffect(() => { - if (error) { - alertApi.post({ - message: `Failed to load user identity: ${error}`, - severity: 'error', - }); - } - }, [error, alertApi]); + const { getByText } = await renderInTestApp(); - return ( - - {`${greeting.greeting}${ - profile?.displayName ? `, ${profile?.displayName}` : '' - }!`} - - ); -}; + expect(getByText(/Get some rest, Guest/)).toBeInTheDocument(); + }); + + test('should greet user with multiple languages', async () => { + jest + .spyOn(global.Date, 'now') + .mockImplementation(() => new Date('2023-07-03T14:00:00').valueOf()); + + const languages = ['English', 'Spanish']; + const { getByText } = await renderInTestApp( + , + ); + + expect(getByText(/Good afternoon, Guest/)).toBeInTheDocument(); + }); +}); From e547a8a3b8d8fc085ece3b52cb2173cb5c314237 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:48:13 +0200 Subject: [PATCH 02/21] Update WelcomeTitle.tsx Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .../WelcomeTitle/WelcomeTitle.tsx | 60 +++++++++++-------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx index d4c39e2a29..d32ff42ea5 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx +++ b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx @@ -13,33 +13,43 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { renderInTestApp } from '@backstage/test-utils'; -import React from 'react'; -import { WelcomeTitle } from './WelcomeTitle'; +import { + alertApiRef, + identityApiRef, + useApi, +} from '@backstage/core-plugin-api'; +import { Tooltip, Typography } from '@material-ui/core'; +import React, { useEffect, useMemo } from 'react'; +import useAsync from 'react-use/lib/useAsync'; +import { getTimeBasedGreeting } from './timeUtil'; -describe('', () => { - afterEach(() => jest.resetAllMocks()); +interface WelcomeTitleLanguageProps { + language?: string[]; +} - test('should greet user with default greeting', async () => { - jest - .spyOn(global.Date, 'now') - .mockImplementation(() => new Date('1970-01-01T23:00:00').valueOf()); +export const WelcomeTitle = ({ language }: WelcomeTitleLanguageProps) => { + const identityApi = useApi(identityApiRef); + const alertApi = useApi(alertApiRef); + const greeting = useMemo(() => getTimeBasedGreeting(language), [language]); - const { getByText } = await renderInTestApp(); + const { value: profile, error } = useAsync(() => + identityApi.getProfileInfo(), + ); - expect(getByText(/Get some rest, Guest/)).toBeInTheDocument(); - }); + useEffect(() => { + if (error) { + alertApi.post({ + message: `Failed to load user identity: ${error}`, + severity: 'error', + }); + } + }, [error, alertApi]); - test('should greet user with multiple languages', async () => { - jest - .spyOn(global.Date, 'now') - .mockImplementation(() => new Date('2023-07-03T14:00:00').valueOf()); - - const languages = ['English', 'Spanish']; - const { getByText } = await renderInTestApp( - , - ); - - expect(getByText(/Good afternoon, Guest/)).toBeInTheDocument(); - }); -}); + return ( + + {`${greeting.greeting}${ + profile?.displayName ? `, ${profile?.displayName}` : '' + }!`} + + ); +}; From 0ec9d0c9192839cd3dd4cdbc2a91b32eaa40fcdc Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:48:33 +0200 Subject: [PATCH 03/21] Update timeUtil.ts Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .../WelcomeTitle/timeUtil.ts | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/timeUtil.ts b/plugins/home/src/homePageComponents/WelcomeTitle/timeUtil.ts index 8df7703b44..ee8f8fe556 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/timeUtil.ts +++ b/plugins/home/src/homePageComponents/WelcomeTitle/timeUtil.ts @@ -22,7 +22,10 @@ import goodEvening from './locales/goodEvening.locales.json'; // every time the user navigates. const greetingRandomSeed = Math.floor(Math.random() * 1000000); -export function getTimeBasedGreeting(): { language: string; greeting: string } { +export function getTimeBasedGreeting(language?: string[] | undefined): { + language: string; + greeting: string; +} { const random = (array: string[]) => array[greetingRandomSeed % array.length]; const currentHour = new Date(Date.now()).getHours(); @@ -32,12 +35,26 @@ export function getTimeBasedGreeting(): { language: string; greeting: string } { greeting: 'Get some rest', }; } + const timeOfDay = (hour: number): { [language: string]: string } => { if (hour < 12) return goodMorning; if (hour < 17) return goodAfternoon; return goodEvening; }; + const greetings = timeOfDay(currentHour); + + if (Array.isArray(language) && language.length > 0) { + const validLanguages = language.filter(lang => lang && greetings[lang]); + if (validLanguages.length > 0) { + const greetingsKey = random(validLanguages); + return { + language: greetingsKey, + greeting: greetings[greetingsKey], + }; + } + } + const greetingsKey = random(Object.keys(greetings)); return { language: greetingsKey, From 7492035327752cc91db6aa4f5e37f66517e5e07c Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:48:56 +0200 Subject: [PATCH 04/21] Update WelcomeTitle.test.tsx Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .../WelcomeTitle/WelcomeTitle.test.tsx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx index 839ecdbae1..d4c39e2a29 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx +++ b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx @@ -20,7 +20,7 @@ import { WelcomeTitle } from './WelcomeTitle'; describe('', () => { afterEach(() => jest.resetAllMocks()); - test('should greet user', async () => { + test('should greet user with default greeting', async () => { jest .spyOn(global.Date, 'now') .mockImplementation(() => new Date('1970-01-01T23:00:00').valueOf()); @@ -29,4 +29,17 @@ describe('', () => { expect(getByText(/Get some rest, Guest/)).toBeInTheDocument(); }); + + test('should greet user with multiple languages', async () => { + jest + .spyOn(global.Date, 'now') + .mockImplementation(() => new Date('2023-07-03T14:00:00').valueOf()); + + const languages = ['English', 'Spanish']; + const { getByText } = await renderInTestApp( + , + ); + + expect(getByText(/Good afternoon, Guest/)).toBeInTheDocument(); + }); }); From dfd0b8d16b886b0e077c8eb658f53bab766537ba Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:49:14 +0200 Subject: [PATCH 05/21] Update WelcomeTitle.test.tsx Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .../WelcomeTitle/WelcomeTitle.test.tsx | 50 +++++++++---------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx index d4c39e2a29..6d14aa7a95 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx +++ b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx @@ -1,5 +1,5 @@ /* - * Copyright 2021 The Backstage Authors + * Copyright 2023 The Backstage Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,33 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { renderInTestApp } from '@backstage/test-utils'; -import React from 'react'; + +import { Header } from '@backstage/core-components'; +import { wrapInTestApp } from '@backstage/test-utils'; +import React, { ComponentType, PropsWithChildren } from 'react'; import { WelcomeTitle } from './WelcomeTitle'; -describe('', () => { - afterEach(() => jest.resetAllMocks()); +export default { + title: 'Plugins/Home/Components/WelcomeTitle', + decorators: [ + (Story: ComponentType>) => wrapInTestApp(), + ], +}; - test('should greet user with default greeting', async () => { - jest - .spyOn(global.Date, 'now') - .mockImplementation(() => new Date('1970-01-01T23:00:00').valueOf()); +export const Default = () => { + return
} pageTitleOverride="Home" />; +}; - const { getByText } = await renderInTestApp(); - - expect(getByText(/Get some rest, Guest/)).toBeInTheDocument(); - }); - - test('should greet user with multiple languages', async () => { - jest - .spyOn(global.Date, 'now') - .mockImplementation(() => new Date('2023-07-03T14:00:00').valueOf()); - - const languages = ['English', 'Spanish']; - const { getByText } = await renderInTestApp( - , - ); - - expect(getByText(/Good afternoon, Guest/)).toBeInTheDocument(); - }); -}); +export const withLanguage = () => { + const languages = ['English', 'Spanish']; + return ( +
} + pageTitleOverride="Home" + /> + ); +}; From a559ff68de7e4e59f5b29a80cfd206e7b0d38823 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:53:32 +0200 Subject: [PATCH 06/21] Create quiet-starfishes-kick.md Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .changeset/quiet-starfishes-kick.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/quiet-starfishes-kick.md diff --git a/.changeset/quiet-starfishes-kick.md b/.changeset/quiet-starfishes-kick.md new file mode 100644 index 0000000000..b8d7b8f7c2 --- /dev/null +++ b/.changeset/quiet-starfishes-kick.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-home': patch +--- + +The `getTimeBasedGreeting` function has been updated to support an optional language parameter. Now, callers of the function can provide a language as input to receive a greeting in that specific language. If no language is provided, the function will automatically select a random greeting based on the current time. From 87176d85875bf08b6d31c51ee7aa453a4caeda4d Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 11:22:12 +0200 Subject: [PATCH 07/21] Update index.ts Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- plugins/home/src/homePageComponents/WelcomeTitle/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/index.ts b/plugins/home/src/homePageComponents/WelcomeTitle/index.ts index ca237511e7..8ca4d4bcc0 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/index.ts +++ b/plugins/home/src/homePageComponents/WelcomeTitle/index.ts @@ -14,3 +14,4 @@ * limitations under the License. */ export { WelcomeTitle } from './WelcomeTitle'; +export type { WelcomeTitleLanguageProps } from './WelcomeTitle'; From a2c9987cc502e5fc8201efd32b40a6773b12ef9d Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 11:22:50 +0200 Subject: [PATCH 08/21] Update WelcomeTitle.tsx Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .../home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx index d32ff42ea5..84753a9fbb 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx +++ b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx @@ -23,9 +23,9 @@ import React, { useEffect, useMemo } from 'react'; import useAsync from 'react-use/lib/useAsync'; import { getTimeBasedGreeting } from './timeUtil'; -interface WelcomeTitleLanguageProps { +export type WelcomeTitleLanguageProps = { language?: string[]; -} +}; export const WelcomeTitle = ({ language }: WelcomeTitleLanguageProps) => { const identityApi = useApi(identityApiRef); From fdd1b471bcd65b1f7faf4500de632e403e3ca588 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 12:02:36 +0200 Subject: [PATCH 09/21] Update index.ts Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- plugins/home/src/homePageComponents/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/home/src/homePageComponents/index.ts b/plugins/home/src/homePageComponents/index.ts index 6a3978c595..36d2335afe 100644 --- a/plugins/home/src/homePageComponents/index.ts +++ b/plugins/home/src/homePageComponents/index.ts @@ -16,3 +16,4 @@ export type { ToolkitContentProps, Tool } from './Toolkit'; export type { ClockConfig } from './HeaderWorldClock'; +export type { WelcomeTitleLanguageProps } from './WelcomeTitle'; From ddc7ec4f8fe9e0123ef64f08970f27a8e7c526eb Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 12:33:34 +0200 Subject: [PATCH 10/21] Added Test case Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .../WelcomeTitle/WelcomeTitle.test.tsx | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx index 6d14aa7a95..8a8b1bae0b 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx +++ b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx @@ -14,28 +14,32 @@ * limitations under the License. */ -import { Header } from '@backstage/core-components'; -import { wrapInTestApp } from '@backstage/test-utils'; -import React, { ComponentType, PropsWithChildren } from 'react'; +import { renderInTestApp } from '@backstage/test-utils'; +import React from 'react'; import { WelcomeTitle } from './WelcomeTitle'; -export default { - title: 'Plugins/Home/Components/WelcomeTitle', - decorators: [ - (Story: ComponentType>) => wrapInTestApp(), - ], -}; +describe('', () => { + afterEach(() => jest.resetAllMocks()); -export const Default = () => { - return
} pageTitleOverride="Home" />; -}; + test('should greet user', async () => { + jest + .spyOn(global.Date, 'now') + .mockImplementation(() => new Date('1970-01-01T23:00:00').valueOf()); -export const withLanguage = () => { - const languages = ['English', 'Spanish']; - return ( -
} - pageTitleOverride="Home" - /> + const { getByText } = await renderInTestApp(); + + expect(getByText(/Get some rest, Guest/)).toBeInTheDocument(); + }); +}); + +test('should greet user with a single language', async () => { + jest + .spyOn(global.Date, 'now') + .mockImplementation(() => new Date('1970-01-01T10:00:00').valueOf()); + + const { getByText } = await renderInTestApp( + , ); -}; + + expect(getByText(/Good morning, Guest/)).toBeInTheDocument(); +}); From b4c3065480c1a5d71a0638503c463307a0bd7009 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 12:34:14 +0200 Subject: [PATCH 11/21] Update Storybook Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .../WelcomeTitle/WelcomeTitle.stories.tsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.stories.tsx b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.stories.tsx index d7d12f02c6..6d14aa7a95 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.stories.tsx +++ b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.stories.tsx @@ -29,3 +29,13 @@ export default { export const Default = () => { return
} pageTitleOverride="Home" />; }; + +export const withLanguage = () => { + const languages = ['English', 'Spanish']; + return ( +
} + pageTitleOverride="Home" + /> + ); +}; From 54e3cfe03884fbe28a0c236c2e7e2a6179cb5a15 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 13:00:12 +0200 Subject: [PATCH 12/21] Update api-report.md Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- plugins/home/api-report.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/home/api-report.md b/plugins/home/api-report.md index 1001f27b51..34e81dce1b 100644 --- a/plugins/home/api-report.md +++ b/plugins/home/api-report.md @@ -44,7 +44,7 @@ export type ClockConfig = { export const ComponentAccordion: (props: { title: string; expanded?: boolean | undefined; - Content: () => JSX.Element; + Content: () => JSX.Element /** @public */; Actions?: (() => JSX.Element) | undefined; Settings?: (() => JSX.Element) | undefined; ContextProvider?: ((props: any) => JSX.Element) | undefined; @@ -184,5 +184,12 @@ export type ToolkitContentProps = { }; // @public -export const WelcomeTitle: () => JSX.Element; +export const WelcomeTitle: ({ + language, +}: WelcomeTitleLanguageProps) => JSX.Element; + +// @public (undocumented) +export type WelcomeTitleLanguageProps = { + language?: string[]; +}; ``` From 2c0746d2af4ecaaabd464c7377c858b8095ebd1e Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 13:00:38 +0200 Subject: [PATCH 13/21] Update WelcomeTitle.tsx Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .../home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx index 84753a9fbb..9981d91873 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx +++ b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx @@ -23,6 +23,7 @@ import React, { useEffect, useMemo } from 'react'; import useAsync from 'react-use/lib/useAsync'; import { getTimeBasedGreeting } from './timeUtil'; +/** @public */ export type WelcomeTitleLanguageProps = { language?: string[]; }; From be8aa3a8f5f7fb0159d067d15e73860365402558 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 13:22:13 +0200 Subject: [PATCH 14/21] Update api-report.md Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> From d74425050524f7a1e5b0205e2a552f552fb25254 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 19:53:39 +0200 Subject: [PATCH 15/21] Fix API report Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- plugins/home/api-report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/home/api-report.md b/plugins/home/api-report.md index 34e81dce1b..5442714430 100644 --- a/plugins/home/api-report.md +++ b/plugins/home/api-report.md @@ -44,7 +44,7 @@ export type ClockConfig = { export const ComponentAccordion: (props: { title: string; expanded?: boolean | undefined; - Content: () => JSX.Element /** @public */; + Content: () => JSX.Element; Actions?: (() => JSX.Element) | undefined; Settings?: (() => JSX.Element) | undefined; ContextProvider?: ((props: any) => JSX.Element) | undefined; From 7d2ef2b57297a23dda1b7b2abe0f81ad513d3f47 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 19:54:46 +0200 Subject: [PATCH 16/21] update copyright date Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .../src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx index 8a8b1bae0b..dfeac300c4 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx +++ b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.test.tsx @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Backstage Authors + * Copyright 2021 The Backstage Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 28ebdf9023b080fe8c10a050e2d8099e2f713342 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 19:57:06 +0200 Subject: [PATCH 17/21] Update quiet-starfishes-kick.md Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .changeset/quiet-starfishes-kick.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/quiet-starfishes-kick.md b/.changeset/quiet-starfishes-kick.md index b8d7b8f7c2..162a9e0467 100644 --- a/.changeset/quiet-starfishes-kick.md +++ b/.changeset/quiet-starfishes-kick.md @@ -2,4 +2,4 @@ '@backstage/plugin-home': patch --- -The `getTimeBasedGreeting` function has been updated to support an optional language parameter. Now, callers of the function can provide a language as input to receive a greeting in that specific language. If no language is provided, the function will automatically select a random greeting based on the current time. +Now, user can provide a language (optional) as input to receive a greeting in that specific language. Example: From bd3b824cce7b935befba9d7c1dc5c72bb1127cf4 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 20:12:02 +0200 Subject: [PATCH 18/21] Update quiet-starfishes-kick.md Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .changeset/quiet-starfishes-kick.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/quiet-starfishes-kick.md b/.changeset/quiet-starfishes-kick.md index 162a9e0467..548e28aa31 100644 --- a/.changeset/quiet-starfishes-kick.md +++ b/.changeset/quiet-starfishes-kick.md @@ -2,4 +2,4 @@ '@backstage/plugin-home': patch --- -Now, user can provide a language (optional) as input to receive a greeting in that specific language. Example: +Now, user can provide a language (optional) as input to receive a greeting in that specific language. Example: `````` From 35c7cadf15256833938826551257d3b0a0c71c7b Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Sun, 9 Jul 2023 20:22:06 +0200 Subject: [PATCH 19/21] Ran prettier Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .changeset/quiet-starfishes-kick.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/quiet-starfishes-kick.md b/.changeset/quiet-starfishes-kick.md index 548e28aa31..af9ee4b64e 100644 --- a/.changeset/quiet-starfishes-kick.md +++ b/.changeset/quiet-starfishes-kick.md @@ -2,4 +2,4 @@ '@backstage/plugin-home': patch --- -Now, user can provide a language (optional) as input to receive a greeting in that specific language. Example: `````` +Now, user can provide a language (optional) as input to receive a greeting in that specific language. Example: `` From a3659dae6d9282cd911db77ee30760377bf84233 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Thu, 20 Jul 2023 19:34:58 +0200 Subject: [PATCH 20/21] Update .changeset/quiet-starfishes-kick.md Co-authored-by: Camila Belo Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- .changeset/quiet-starfishes-kick.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/quiet-starfishes-kick.md b/.changeset/quiet-starfishes-kick.md index af9ee4b64e..2fc8ed632e 100644 --- a/.changeset/quiet-starfishes-kick.md +++ b/.changeset/quiet-starfishes-kick.md @@ -2,4 +2,4 @@ '@backstage/plugin-home': patch --- -Now, user can provide a language (optional) as input to receive a greeting in that specific language. Example: `` +Now, user can provide a language (optional) as input to receive a greeting in that specific language. Example: `` From fd534808b9db2b99d79af2bfe99861b36e68a566 Mon Sep 17 00:00:00 2001 From: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> Date: Fri, 21 Jul 2023 17:07:23 +0200 Subject: [PATCH 21/21] Removed undefined Signed-off-by: Gaurav Pandey <36168816+grvpandey11@users.noreply.github.com> --- plugins/home/src/homePageComponents/WelcomeTitle/timeUtil.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/timeUtil.ts b/plugins/home/src/homePageComponents/WelcomeTitle/timeUtil.ts index ee8f8fe556..707f42baf7 100644 --- a/plugins/home/src/homePageComponents/WelcomeTitle/timeUtil.ts +++ b/plugins/home/src/homePageComponents/WelcomeTitle/timeUtil.ts @@ -22,7 +22,7 @@ import goodEvening from './locales/goodEvening.locales.json'; // every time the user navigates. const greetingRandomSeed = Math.floor(Math.random() * 1000000); -export function getTimeBasedGreeting(language?: string[] | undefined): { +export function getTimeBasedGreeting(language?: string[]): { language: string; greeting: string; } {