From 3b590b8cf1fbd0b250544f8c6906a19ecd879fe0 Mon Sep 17 00:00:00 2001 From: David Tuite Date: Tue, 22 Jun 2021 10:49:42 +0100 Subject: [PATCH 1/6] Clarify dependency direction in EntityDependsOnResourcesCard Signed-off-by: David Tuite --- .../DependsOnResourcesCard/DependsOnResourcesCard.test.tsx | 4 ++-- .../DependsOnResourcesCard/DependsOnResourcesCard.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx b/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx index f2d41557f9..dc967c5be4 100644 --- a/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx +++ b/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx @@ -66,7 +66,7 @@ describe('', () => { , ); - expect(getByText('Resources')).toBeInTheDocument(); + expect(getByText('Depends on resources')).toBeInTheDocument(); expect( getByText(/No resource is a dependency of this component/i), ).toBeInTheDocument(); @@ -114,7 +114,7 @@ describe('', () => { ); await waitFor(() => { - expect(getByText('Resources')).toBeInTheDocument(); + expect(getByText('Depends on resources')).toBeInTheDocument(); expect(getByText(/target-name/i)).toBeInTheDocument(); }); }); diff --git a/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.tsx b/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.tsx index 163a51b84e..34a8e5824d 100644 --- a/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.tsx +++ b/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.tsx @@ -31,7 +31,7 @@ export const DependsOnResourcesCard = ({ variant = 'gridItem' }: Props) => { return ( Date: Tue, 22 Jun 2021 10:51:49 +0100 Subject: [PATCH 2/6] Disambiguate HasComponentsCard from other component relationship cards Signed-off-by: David Tuite --- .../components/HasComponentsCard/HasComponentsCard.test.tsx | 4 ++-- .../src/components/HasComponentsCard/HasComponentsCard.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx b/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx index 8ba2340444..3a6cb48369 100644 --- a/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx +++ b/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx @@ -66,7 +66,7 @@ describe('', () => { , ); - expect(getByText('Components')).toBeInTheDocument(); + expect(getByText('Has components')).toBeInTheDocument(); expect( getByText(/No component is part of this system/i), ).toBeInTheDocument(); @@ -114,7 +114,7 @@ describe('', () => { ); await waitFor(() => { - expect(getByText('Components')).toBeInTheDocument(); + expect(getByText('Has components')).toBeInTheDocument(); expect(getByText(/target-name/i)).toBeInTheDocument(); }); }); diff --git a/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.tsx b/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.tsx index a54147d6a8..cefdb15a6e 100644 --- a/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.tsx +++ b/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.tsx @@ -31,7 +31,7 @@ export const HasComponentsCard = ({ variant = 'gridItem' }: Props) => { return ( Date: Tue, 22 Jun 2021 10:53:19 +0100 Subject: [PATCH 3/6] Clasify system has resources card Signed-off-by: David Tuite --- .../src/components/HasResourcesCard/HasResourcesCard.test.tsx | 4 ++-- .../src/components/HasResourcesCard/HasResourcesCard.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx b/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx index 80ae4f9aee..72202bd4a6 100644 --- a/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx +++ b/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx @@ -66,7 +66,7 @@ describe('', () => { , ); - expect(getByText('Resources')).toBeInTheDocument(); + expect(getByText('Has resources')).toBeInTheDocument(); expect( getByText(/No resource is part of this system/i), ).toBeInTheDocument(); @@ -114,7 +114,7 @@ describe('', () => { ); await waitFor(() => { - expect(getByText('Resources')).toBeInTheDocument(); + expect(getByText('Has resources')).toBeInTheDocument(); expect(getByText(/target-name/i)).toBeInTheDocument(); }); }); diff --git a/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.tsx b/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.tsx index bf96945602..3a57317a06 100644 --- a/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.tsx +++ b/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.tsx @@ -31,7 +31,7 @@ export const HasResourcesCard = ({ variant = 'gridItem' }: Props) => { return ( Date: Tue, 22 Jun 2021 10:55:24 +0100 Subject: [PATCH 4/6] Clarify the HasSystems card title Signed-off-by: David Tuite --- .../src/components/HasSystemsCard/HasSystemsCard.test.tsx | 4 ++-- .../catalog/src/components/HasSystemsCard/HasSystemsCard.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx b/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx index fba7c88ac1..b1392b7a10 100644 --- a/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx +++ b/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx @@ -66,7 +66,7 @@ describe('', () => { , ); - expect(getByText('Systems')).toBeInTheDocument(); + expect(getByText('Has systems')).toBeInTheDocument(); expect(getByText(/No system is part of this domain/i)).toBeInTheDocument(); }); @@ -112,7 +112,7 @@ describe('', () => { ); await waitFor(() => { - expect(getByText('Systems')).toBeInTheDocument(); + expect(getByText('Has systems')).toBeInTheDocument(); expect(getByText(/target-name/i)).toBeInTheDocument(); }); }); diff --git a/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.tsx b/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.tsx index e5217efe48..b3e756c8dc 100644 --- a/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.tsx +++ b/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.tsx @@ -31,7 +31,7 @@ export const HasSystemsCard = ({ variant = 'gridItem' }: Props) => { return ( Date: Tue, 22 Jun 2021 13:08:54 +0100 Subject: [PATCH 5/6] Clarify title of HasSubcomponentsCard Signed-off-by: David Tuite --- .../HasSubcomponentsCard/HasSubcomponentsCard.test.tsx | 4 ++-- .../components/HasSubcomponentsCard/HasSubcomponentsCard.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx b/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx index d9d8834869..d25cfce216 100644 --- a/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx +++ b/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx @@ -66,7 +66,7 @@ describe('', () => { , ); - expect(getByText('Subcomponents')).toBeInTheDocument(); + expect(getByText('Has subcomponents')).toBeInTheDocument(); expect( getByText(/No subcomponent is part of this component/i), ).toBeInTheDocument(); @@ -114,7 +114,7 @@ describe('', () => { ); await waitFor(() => { - expect(getByText('Subcomponents')).toBeInTheDocument(); + expect(getByText('Has subcomponents')).toBeInTheDocument(); expect(getByText(/target-name/i)).toBeInTheDocument(); }); }); diff --git a/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.tsx b/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.tsx index 67582453e2..ddeffe3fbd 100644 --- a/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.tsx +++ b/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.tsx @@ -30,7 +30,7 @@ export const HasSubcomponentsCard = ({ variant = 'gridItem' }: Props) => { return ( Date: Tue, 22 Jun 2021 22:04:34 +0100 Subject: [PATCH 6/6] Add changeset Signed-off-by: David Tuite --- .changeset/three-tables-smash.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/three-tables-smash.md diff --git a/.changeset/three-tables-smash.md b/.changeset/three-tables-smash.md new file mode 100644 index 0000000000..647647b666 --- /dev/null +++ b/.changeset/three-tables-smash.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog': patch +--- + +Clearer titles for the relationship cards