From 6d56f20ae6e5184d00aa89a149bdde9ce532ba4b Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@rapidrtc.com>
Date: Wed, 10 Nov 2021 07:46:29 -0600
Subject: [PATCH] Improved naming based on feedback and a few other
 improvements

Signed-off-by: Andre Wanlin <awanlin@rapidrtc.com>
---
 packages/app/src/components/catalog/EntityPage.tsx        | 4 ++--
 plugins/azure-devops/api-report.md                        | 4 ++--
 .../AzurePullRequestsIcon.tsx}                            | 2 +-
 .../{AzureReposIcon => AzurePullRequestsIcon}/index.ts    | 2 +-
 .../EntityPageAzurePullRequests.tsx}                      | 2 +-
 .../index.ts                                              | 2 +-
 .../src/components/PullRequestTable/PullRequestTable.tsx  | 6 +++---
 plugins/azure-devops/src/index.ts                         | 2 +-
 plugins/azure-devops/src/plugin.ts                        | 8 ++++----
 9 files changed, 16 insertions(+), 16 deletions(-)
 rename plugins/azure-devops/src/components/{AzureReposIcon/AzureReposIcon.tsx => AzurePullRequestsIcon/AzurePullRequestsIcon.tsx} (96%)
 rename plugins/azure-devops/src/components/{AzureReposIcon => AzurePullRequestsIcon}/index.ts (90%)
 rename plugins/azure-devops/src/components/{EntityPageAzureRepos/EntityPageAzureRepos.tsx => EntityPageAzurePullRequests/EntityPageAzurePullRequests.tsx} (94%)
 rename plugins/azure-devops/src/components/{EntityPageAzureRepos => EntityPageAzurePullRequests}/index.ts (88%)

diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 4f95e89636..3b9b381380 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -35,7 +35,7 @@ import {
 } from '@backstage/plugin-api-docs';
 import {
   EntityAzurePipelinesContent,
-  EntityAzureReposContent,
+  EntityAzurePullRequestsContent,
   isAzureDevOpsAvailable,
 } from '@backstage/plugin-azure-devops';
 import { EntityBadgesDialog } from '@backstage/plugin-badges';
@@ -268,7 +268,7 @@ const errorsContent = (
 const pullRequestsContent = (
   <EntitySwitch>
     <EntitySwitch.Case if={isAzureDevOpsAvailable}>
-      <EntityAzureReposContent defaultLimit={25} />
+      <EntityAzurePullRequestsContent defaultLimit={25} />
     </EntitySwitch.Case>
 
     <EntitySwitch.Case>
diff --git a/plugins/azure-devops/api-report.md b/plugins/azure-devops/api-report.md
index fef690ed08..578c2492a9 100644
--- a/plugins/azure-devops/api-report.md
+++ b/plugins/azure-devops/api-report.md
@@ -28,10 +28,10 @@ export const EntityAzurePipelinesContent: ({
   defaultLimit?: number | undefined;
 }) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "EntityAzureReposContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "EntityAzurePullRequestsContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const EntityAzureReposContent: ({
+export const EntityAzurePullRequestsContent: ({
   defaultLimit,
 }: {
   defaultLimit?: number | undefined;
diff --git a/plugins/azure-devops/src/components/AzureReposIcon/AzureReposIcon.tsx b/plugins/azure-devops/src/components/AzurePullRequestsIcon/AzurePullRequestsIcon.tsx
similarity index 96%
rename from plugins/azure-devops/src/components/AzureReposIcon/AzureReposIcon.tsx
rename to plugins/azure-devops/src/components/AzurePullRequestsIcon/AzurePullRequestsIcon.tsx
index ca0bd2bcf6..bb4cb8c081 100644
--- a/plugins/azure-devops/src/components/AzureReposIcon/AzureReposIcon.tsx
+++ b/plugins/azure-devops/src/components/AzurePullRequestsIcon/AzurePullRequestsIcon.tsx
@@ -18,7 +18,7 @@ import { SvgIcon, SvgIconProps } from '@material-ui/core';
 
 import React from 'react';
 
-export const AzureReposIcon = (props: SvgIconProps) => (
+export const AzurePullRequestsIcon = (props: SvgIconProps) => (
   <SvgIcon {...props} viewBox="0 0 512 512">
     <circle
       fill="none"
diff --git a/plugins/azure-devops/src/components/AzureReposIcon/index.ts b/plugins/azure-devops/src/components/AzurePullRequestsIcon/index.ts
similarity index 90%
rename from plugins/azure-devops/src/components/AzureReposIcon/index.ts
rename to plugins/azure-devops/src/components/AzurePullRequestsIcon/index.ts
index 2bed6bd5f0..1f49119b4b 100644
--- a/plugins/azure-devops/src/components/AzureReposIcon/index.ts
+++ b/plugins/azure-devops/src/components/AzurePullRequestsIcon/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { AzureReposIcon } from './AzureReposIcon';
+export { AzurePullRequestsIcon } from './AzurePullRequestsIcon';
diff --git a/plugins/azure-devops/src/components/EntityPageAzureRepos/EntityPageAzureRepos.tsx b/plugins/azure-devops/src/components/EntityPageAzurePullRequests/EntityPageAzurePullRequests.tsx
similarity index 94%
rename from plugins/azure-devops/src/components/EntityPageAzureRepos/EntityPageAzureRepos.tsx
rename to plugins/azure-devops/src/components/EntityPageAzurePullRequests/EntityPageAzurePullRequests.tsx
index b6050606ff..3d1a3ef77a 100644
--- a/plugins/azure-devops/src/components/EntityPageAzureRepos/EntityPageAzureRepos.tsx
+++ b/plugins/azure-devops/src/components/EntityPageAzurePullRequests/EntityPageAzurePullRequests.tsx
@@ -17,7 +17,7 @@
 import { PullRequestTable } from '../PullRequestTable/PullRequestTable';
 import React from 'react';
 
-export const EntityPageAzureRepos = ({
+export const EntityPageAzurePullRequests = ({
   defaultLimit,
 }: {
   defaultLimit?: number;
diff --git a/plugins/azure-devops/src/components/EntityPageAzureRepos/index.ts b/plugins/azure-devops/src/components/EntityPageAzurePullRequests/index.ts
similarity index 88%
rename from plugins/azure-devops/src/components/EntityPageAzureRepos/index.ts
rename to plugins/azure-devops/src/components/EntityPageAzurePullRequests/index.ts
index 517869027f..2ec6c5bf04 100644
--- a/plugins/azure-devops/src/components/EntityPageAzureRepos/index.ts
+++ b/plugins/azure-devops/src/components/EntityPageAzurePullRequests/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { EntityPageAzureRepos } from './EntityPageAzureRepos';
+export { EntityPageAzurePullRequests } from './EntityPageAzurePullRequests';
diff --git a/plugins/azure-devops/src/components/PullRequestTable/PullRequestTable.tsx b/plugins/azure-devops/src/components/PullRequestTable/PullRequestTable.tsx
index 81cf3fd56a..ad744f2cb7 100644
--- a/plugins/azure-devops/src/components/PullRequestTable/PullRequestTable.tsx
+++ b/plugins/azure-devops/src/components/PullRequestTable/PullRequestTable.tsx
@@ -27,7 +27,7 @@ import {
 } from '@backstage/plugin-azure-devops-common';
 import React, { useState } from 'react';
 
-import { AzureReposIcon } from '../AzureReposIcon';
+import { AzurePullRequestsIcon } from '../AzurePullRequestsIcon';
 import { DateTime } from 'luxon';
 import { PullRequestStatusButtonGroup } from '../PullRequestStatusButtonGroup';
 import { useEntity } from '@backstage/plugin-catalog-react';
@@ -46,7 +46,7 @@ const columns: TableColumn[] = [
     width: 'auto',
     render: (row: Partial<PullRequest>) => (
       <Box display="flex" alignItems="center">
-        <Link to={row.link || ''}>{row.title}</Link>
+        <Link to={row.link ?? ''}>{row.title}</Link>
         <Box paddingLeft={1}>
           {row.isDraft && (
             <Chip
@@ -121,7 +121,7 @@ export const PullRequestTable = ({ defaultLimit }: PullRequestTableProps) => {
       }}
       title={
         <Box display="flex" alignItems="center">
-          <AzureReposIcon style={{ fontSize: 30 }} />
+          <AzurePullRequestsIcon style={{ fontSize: 30 }} />
           <Box mr={1} />
           Azure Repos - Pull Requests ({items ? items.length : 0})
           <Box position="absolute" right={320} top={20}>
diff --git a/plugins/azure-devops/src/index.ts b/plugins/azure-devops/src/index.ts
index 94cc4ff367..4da533b534 100644
--- a/plugins/azure-devops/src/index.ts
+++ b/plugins/azure-devops/src/index.ts
@@ -16,6 +16,6 @@
 export {
   azureDevOpsPlugin,
   EntityAzurePipelinesContent,
-  EntityAzureReposContent,
+  EntityAzurePullRequestsContent,
   isAzureDevOpsAvailable,
 } from './plugin';
diff --git a/plugins/azure-devops/src/plugin.ts b/plugins/azure-devops/src/plugin.ts
index 595a168d6e..55ec293360 100644
--- a/plugins/azure-devops/src/plugin.ts
+++ b/plugins/azure-devops/src/plugin.ts
@@ -57,12 +57,12 @@ export const EntityAzurePipelinesContent = azureDevOpsPlugin.provide(
   }),
 );
 
-export const EntityAzureReposContent = azureDevOpsPlugin.provide(
+export const EntityAzurePullRequestsContent = azureDevOpsPlugin.provide(
   createRoutableExtension({
-    name: 'EntityAzureReposContent',
+    name: 'EntityAzurePullRequestsContent',
     component: () =>
-      import('./components/EntityPageAzureRepos').then(
-        m => m.EntityPageAzureRepos,
+      import('./components/EntityPageAzurePullRequests').then(
+        m => m.EntityPageAzurePullRequests,
       ),
     mountPoint: azureDevOpsRouteRef,
   }),