From 6cc710c84c44832a156fd481e2e2776c06a63db1 Mon Sep 17 00:00:00 2001
From: KaemonIsland <kaemonlovendahl@outlook.com>
Date: Wed, 16 Feb 2022 09:24:47 -0700
Subject: [PATCH] Change useProjectName to synchronous code

Signed-off-by: KaemonIsland <kaemonlovendahl@outlook.com>
---
 .../WorkflowRunDetails/WorkflowRunDetails.tsx         | 11 ++++-------
 .../WorkflowRunDetails/useWorkflowRunJobs.ts          |  2 +-
 .../WorkflowRunDetails/useWorkflowRunsDetails.ts      |  2 +-
 .../components/WorkflowRunLogs/WorkflowRunLogs.tsx    |  2 +-
 .../WorkflowRunsTable/WorkflowRunsTable.tsx           |  6 +++---
 .../github-actions/src/components/useProjectName.ts   | 10 ++--------
 6 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx
index d1930bf5dd..1e38d23d31 100644
--- a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx
+++ b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx
@@ -170,22 +170,19 @@ export const WorkflowRunDetails = ({ entity }: { entity: Entity }) => {
   const hostname = readGitHubIntegrationConfigs(
     config.getOptionalConfigArray('integrations.github') ?? [],
   )[0].host;
-  const [owner, repo] = projectName.value ? projectName.value.split('/') : [];
+  const [owner, repo] = (projectName && projectName.split('/')) || [];
   const details = useWorkflowRunsDetails({ hostname, owner, repo });
   const jobs = useWorkflowRunJobs({ hostname, owner, repo });
 
-  const error = projectName.error || (projectName.value && details.error);
-  const loading = projectName.loading || details.loading || !details.value;
-
   const classes = useStyles();
 
-  if (error && error.message) {
+  if (details.error && details.error.message) {
     return (
       <Typography variant="h6" color="error">
-        Failed to load build, {error.message}
+        Failed to load build, {details.error.message}
       </Typography>
     );
-  } else if (loading) {
+  } else if (details.loading) {
     return <LinearProgress />;
   }
   return (
diff --git a/plugins/github-actions/src/components/WorkflowRunDetails/useWorkflowRunJobs.ts b/plugins/github-actions/src/components/WorkflowRunDetails/useWorkflowRunJobs.ts
index 002d379ed1..43fd7cdb5e 100644
--- a/plugins/github-actions/src/components/WorkflowRunDetails/useWorkflowRunJobs.ts
+++ b/plugins/github-actions/src/components/WorkflowRunDetails/useWorkflowRunJobs.ts
@@ -37,7 +37,7 @@ export const useWorkflowRunJobs = ({
           repo,
           id: parseInt(id, 10),
         })
-      : Promise.reject('No repo/owner provided');
+      : Promise.reject(Error('No repo/owner provided'));
   }, [repo, owner, id]);
   return jobs;
 };
diff --git a/plugins/github-actions/src/components/WorkflowRunDetails/useWorkflowRunsDetails.ts b/plugins/github-actions/src/components/WorkflowRunDetails/useWorkflowRunsDetails.ts
index ef9b4f7ccf..dd5b62c733 100644
--- a/plugins/github-actions/src/components/WorkflowRunDetails/useWorkflowRunsDetails.ts
+++ b/plugins/github-actions/src/components/WorkflowRunDetails/useWorkflowRunsDetails.ts
@@ -37,7 +37,7 @@ export const useWorkflowRunsDetails = ({
           repo,
           id: parseInt(id, 10),
         })
-      : Promise.reject('No repo/owner provided');
+      : Promise.reject(Error('No repo/owner provided'));
   }, [repo, owner, id]);
   return details;
 };
diff --git a/plugins/github-actions/src/components/WorkflowRunLogs/WorkflowRunLogs.tsx b/plugins/github-actions/src/components/WorkflowRunLogs/WorkflowRunLogs.tsx
index 0f1670bbbc..43c1233cfb 100644
--- a/plugins/github-actions/src/components/WorkflowRunLogs/WorkflowRunLogs.tsx
+++ b/plugins/github-actions/src/components/WorkflowRunLogs/WorkflowRunLogs.tsx
@@ -83,7 +83,7 @@ export const WorkflowRunLogs = ({
   const hostname = readGitHubIntegrationConfigs(
     config.getOptionalConfigArray('integrations.github') ?? [],
   )[0].host;
-  const [owner, repo] = projectName.value ? projectName.value.split('/') : [];
+  const [owner, repo] = (projectName && projectName.split('/')) || [];
   const jobLogs = useDownloadWorkflowRunLogs({
     hostname,
     owner,
diff --git a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
index 81fa036221..aa175caab6 100644
--- a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
+++ b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
@@ -157,7 +157,7 @@ export const WorkflowRunsTable = ({
   branch?: string;
 }) => {
   const config = useApi(configApiRef);
-  const { value: projectName, loading } = useProjectName(entity);
+  const projectName = useProjectName(entity);
   // TODO: Get github hostname from metadata annotation
   const hostname = readGitHubIntegrationConfigs(
     config.getOptionalConfigArray('integrations.github') ?? [],
@@ -172,7 +172,7 @@ export const WorkflowRunsTable = ({
     });
 
   const githubHost = hostname || 'github.com';
-  const hasNoRuns = !loading && !tableProps.loading && !runs;
+  const hasNoRuns = !tableProps.loading && !runs;
 
   return hasNoRuns ? (
     <EmptyState
@@ -193,7 +193,7 @@ export const WorkflowRunsTable = ({
     <WorkflowRunsTableView
       {...tableProps}
       runs={runs}
-      loading={loading || tableProps.loading}
+      loading={tableProps.loading}
       retry={retry}
       onChangePageSize={setPageSize}
       onChangePage={setPage}
diff --git a/plugins/github-actions/src/components/useProjectName.ts b/plugins/github-actions/src/components/useProjectName.ts
index b9be7a49c9..4a3cc8d41e 100644
--- a/plugins/github-actions/src/components/useProjectName.ts
+++ b/plugins/github-actions/src/components/useProjectName.ts
@@ -13,15 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import useAsync from 'react-use/lib/useAsync';
 import { Entity } from '@backstage/catalog-model';
 
 export const GITHUB_ACTIONS_ANNOTATION = 'github.com/project-slug';
 
-export const useProjectName = (entity: Entity) => {
-  const { value, loading, error } = useAsync(async () => {
-    return entity?.metadata.annotations?.[GITHUB_ACTIONS_ANNOTATION] ?? '';
-  });
-  return { value, loading, error };
-};
+export const useProjectName = (entity: Entity) =>
+  entity?.metadata.annotations?.[GITHUB_ACTIONS_ANNOTATION] ?? '';