From 44389c61b866929807a60580c173ddc46ba0ef49 Mon Sep 17 00:00:00 2001
From: Nikita Nek Dudnik <nikdudnik@gmail.com>
Date: Mon, 18 May 2020 14:14:03 +0200
Subject: [PATCH] Fix functions crossreference

---
 plugins/circleci/.eslintrc.js                  |  3 ---
 plugins/circleci/src/state/useAsyncPolling.ts  |  2 +-
 .../circleci/src/state/useBuildWithSteps.ts    | 12 ++++++------
 plugins/circleci/src/state/useBuilds.tsx       | 18 +++++++++---------
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/plugins/circleci/.eslintrc.js b/plugins/circleci/.eslintrc.js
index f1f18a58c8..13573efa9c 100644
--- a/plugins/circleci/.eslintrc.js
+++ b/plugins/circleci/.eslintrc.js
@@ -1,6 +1,3 @@
 module.exports = {
   extends: [require.resolve('@backstage/cli/config/eslint')],
-  rules: {
-    'no-use-before-define': ['error', { variables: false }],
-  },
 };
diff --git a/plugins/circleci/src/state/useAsyncPolling.ts b/plugins/circleci/src/state/useAsyncPolling.ts
index b82d023934..2f8de0c2fe 100644
--- a/plugins/circleci/src/state/useAsyncPolling.ts
+++ b/plugins/circleci/src/state/useAsyncPolling.ts
@@ -33,5 +33,5 @@ export const useAsyncPolling = (
   const stopPolling = () => {
     isPolling.current = false;
   };
-  return { isPolling, startPolling, stopPolling };
+  return { startPolling, stopPolling };
 };
diff --git a/plugins/circleci/src/state/useBuildWithSteps.ts b/plugins/circleci/src/state/useBuildWithSteps.ts
index 96d3a3f159..3cfe830b25 100644
--- a/plugins/circleci/src/state/useBuildWithSteps.ts
+++ b/plugins/circleci/src/state/useBuildWithSteps.ts
@@ -29,11 +29,6 @@ export function useBuildWithSteps(buildId: number) {
   const api = useApi(circleCIApiRef);
   const errorApi = useApi(errorApiRef);
 
-  const { isPolling, startPolling, stopPolling } = useAsyncPolling(
-    () => getBuildWithSteps(),
-    INTERVAL_AMOUNT,
-  );
-
   const getBuildWithSteps = async () => {
     try {
       const options = {
@@ -45,12 +40,17 @@ export function useBuildWithSteps(buildId: number) {
         },
       };
       const build = await api.getBuild(buildId, options);
-      if (isPolling) dispatch({ type: 'setBuildWithSteps', payload: build });
+      dispatch({ type: 'setBuildWithSteps', payload: build });
     } catch (e) {
       errorApi.post(e);
     }
   };
 
+  const { startPolling, stopPolling } = useAsyncPolling(
+    getBuildWithSteps,
+    INTERVAL_AMOUNT,
+  );
+
   const restartBuild = async () => {
     try {
       await api.retry(buildId, {
diff --git a/plugins/circleci/src/state/useBuilds.tsx b/plugins/circleci/src/state/useBuilds.tsx
index d46ac642a5..4a8908a09f 100644
--- a/plugins/circleci/src/state/useBuilds.tsx
+++ b/plugins/circleci/src/state/useBuilds.tsx
@@ -27,10 +27,6 @@ export function useBuilds() {
 
   const api = useApi(circleCIApiRef);
   const errorApi = useApi(errorApiRef);
-  const { isPolling, startPolling, stopPolling } = useAsyncPolling(
-    () => getBuilds(),
-    INTERVAL_AMOUNT,
-  );
 
   const getBuilds = async () => {
     if (settings.owner === '' || settings.repo === '') return;
@@ -43,16 +39,20 @@ export function useBuilds() {
           type: GitType.GITHUB,
         },
       });
-      if (isPolling)
-        dispatch({
-          type: 'setBuilds',
-          payload: newBuilds,
-        });
+      dispatch({
+        type: 'setBuilds',
+        payload: newBuilds,
+      });
     } catch (e) {
       errorApi.post(e);
     }
   };
 
+  const { startPolling, stopPolling } = useAsyncPolling(
+    getBuilds,
+    INTERVAL_AMOUNT,
+  );
+
   const restartBuild = async (buildId: number) => {
     try {
       await api.retry(buildId, {