Remove circular dependencies

In reference to issue #5563 this does the initial work to remove
all the circular dependencies that we have encountered while
building backstage using bazel. The next step will be to implement
a method to catch these circular dependencies before they get
merged in

Signed-off-by: jrusso1020 <jrusso@brex.com>

plugins/cloudbuild/src/components/Cards/Cards.tsx

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import React, { useEffect } from 'react';
-import { useWorkflowRuns } from '../useWorkflowRuns';
-import { WorkflowRun, WorkflowRunsTable } from '../WorkflowRunsTable';
+import { useWorkflowRuns, WorkflowRun } from '../useWorkflowRuns';
+import { WorkflowRunsTable } from '../WorkflowRunsTable';
 import { Entity } from '@backstage/catalog-model';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { WorkflowRunStatus } from '../WorkflowRunStatus';

plugins/cloudbuild/src/components/Router.tsx

@@ -17,7 +17,7 @@ import React from 'react';
 import { Entity } from '@backstage/catalog-model';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { Routes, Route } from 'react-router';
-import { rootRouteRef, buildRouteRef } from '../plugin';
+import { rootRouteRef, buildRouteRef } from '../routes';
 import { WorkflowRunDetails } from './WorkflowRunDetails';
 import { WorkflowRunsTable } from './WorkflowRunsTable';
 import { CLOUDBUILD_ANNOTATION } from './useProjectName';

plugins/cloudbuild/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx

@@ -19,26 +19,14 @@ import RetryIcon from '@material-ui/icons/Replay';
 import GoogleIcon from '@material-ui/icons/CloudCircle';
 import { Link as RouterLink, generatePath } from 'react-router-dom';
 import { Table, TableColumn } from '@backstage/core';
-import { useWorkflowRuns } from '../useWorkflowRuns';
+import { useWorkflowRuns, WorkflowRun } from '../useWorkflowRuns';
 import { WorkflowRunStatus } from '../WorkflowRunStatus';
 import SyncIcon from '@material-ui/icons/Sync';
 import { useProjectName } from '../useProjectName';
 import { Entity } from '@backstage/catalog-model';
-import { Substitutions } from '../../api/types';
-import { buildRouteRef } from '../../plugin';
+import { buildRouteRef } from '../../routes';
 import moment from 'moment';
 
-export type WorkflowRun = {
-  id: string;
-  message: string;
-  url?: string;
-  googleUrl?: string;
-  status: string;
-  substitutions: Substitutions;
-  createTime: string;
-  rerun: () => void;
-};
-
 const generatedColumns: TableColumn[] = [
   {
     title: 'Status',

plugins/cloudbuild/src/components/WorkflowRunsTable/index.ts

@@ -14,4 +14,3 @@
  * limitations under the License.
  */
 export { WorkflowRunsTable, WorkflowRunsTableView } from './WorkflowRunsTable';
-export type { WorkflowRun } from './WorkflowRunsTable';

plugins/cloudbuild/src/components/useWorkflowRuns.ts

@@ -15,10 +15,23 @@
  */
 import { useState } from 'react';
 import { useAsyncRetry } from 'react-use';
-import { WorkflowRun } from './WorkflowRunsTable/WorkflowRunsTable';
 import { cloudbuildApiRef } from '../api/CloudbuildApi';
 import { useApi, errorApiRef } from '@backstage/core';
-import { ActionsListWorkflowRunsForRepoResponseData } from '../api/types';
+import {
+  ActionsListWorkflowRunsForRepoResponseData,
+  Substitutions,
+} from '../api/types';
+
+export type WorkflowRun = {
+  id: string;
+  message: string;
+  url?: string;
+  googleUrl?: string;
+  status: string;
+  substitutions: Substitutions;
+  createTime: string;
+  rerun: () => void;
+};
 
 export function useWorkflowRuns({ projectId }: { projectId: string }) {
   const api = useApi(cloudbuildApiRef);

plugins/cloudbuild/src/plugin.ts

@@ -15,23 +15,13 @@
  */
 import {
   createPlugin,
-  createRouteRef,
   createApiFactory,
   googleAuthApiRef,
   createRoutableExtension,
   createComponentExtension,
 } from '@backstage/core';
 import { cloudbuildApiRef, CloudbuildClient } from './api';
-
-export const rootRouteRef = createRouteRef({
-  path: '',
-  title: 'Google Cloudbuild',
-});
-
-export const buildRouteRef = createRouteRef({
-  path: ':id',
-  title: 'Cloudbuild Run',
-});
+import { rootRouteRef } from './routes';
 
 export const cloudbuildPlugin = createPlugin({
   id: 'cloudbuild',

plugins/cloudbuild/src/routes.ts

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createRouteRef } from '@backstage/core';
+
+export const rootRouteRef = createRouteRef({
+  path: '',
+  title: 'Google Cloudbuild',
+});
+
+export const buildRouteRef = createRouteRef({
+  path: ':id',
+  title: 'Cloudbuild Run',
+});