From e78eaa9bb630bb05d42ffda7ab910fc082208ecd Mon Sep 17 00:00:00 2001 From: Ivan Shmidt Date: Mon, 18 May 2020 18:44:19 +0200 Subject: [PATCH] fix: lint --- plugins/circleci/src/state/useBuildWithSteps.ts | 13 +++++++------ .../src/state/{useBuilds.tsx => useBuilds.ts} | 11 ++++++----- plugins/circleci/src/state/useSettings.ts | 5 +++-- 3 files changed, 16 insertions(+), 13 deletions(-) rename plugins/circleci/src/state/{useBuilds.tsx => useBuilds.ts} (94%) diff --git a/plugins/circleci/src/state/useBuildWithSteps.ts b/plugins/circleci/src/state/useBuildWithSteps.ts index 8abc08f580..7aba770851 100644 --- a/plugins/circleci/src/state/useBuildWithSteps.ts +++ b/plugins/circleci/src/state/useBuildWithSteps.ts @@ -15,10 +15,10 @@ */ import { errorApiRef, useApi } from '@backstage/core'; import { useCallback } from 'react'; -import { circleCIApiRef, GitType } from '../api/index'; -import { useSettings } from './useSettings'; -import { useAsyncPolling } from './useAsyncPolling'; import { useAsyncRetry } from 'react-use'; +import { circleCIApiRef, GitType } from '../api/index'; +import { useAsyncPolling } from './useAsyncPolling'; +import { useSettings } from './useSettings'; const INTERVAL_AMOUNT = 1500; export function useBuildWithSteps(buildId: number) { @@ -28,8 +28,9 @@ export function useBuildWithSteps(buildId: number) { const getBuildWithSteps = useCallback(async () => { if (owner === '' || repo === '' || token === '') { - return; + return Promise.reject('No credentials provided'); } + try { const options = { token: token, @@ -39,8 +40,8 @@ export function useBuildWithSteps(buildId: number) { type: GitType.GITHUB, }, }; - const b = await api.getBuild(buildId, options); - return Promise.resolve(b); + const build = await api.getBuild(buildId, options); + return Promise.resolve(build); } catch (e) { errorApi.post(e); return Promise.reject(e); diff --git a/plugins/circleci/src/state/useBuilds.tsx b/plugins/circleci/src/state/useBuilds.ts similarity index 94% rename from plugins/circleci/src/state/useBuilds.tsx rename to plugins/circleci/src/state/useBuilds.ts index 4435c2b8bd..248cc677f6 100644 --- a/plugins/circleci/src/state/useBuilds.tsx +++ b/plugins/circleci/src/state/useBuilds.ts @@ -14,10 +14,10 @@ * limitations under the License. */ import { errorApiRef, useApi } from '@backstage/core'; -import { GitType, BuildSummary } from 'circleci-api'; -import { useState, useEffect, useCallback } from 'react'; -import { circleCIApiRef } from '../api/index'; +import { BuildSummary, GitType } from 'circleci-api'; +import { useCallback, useEffect, useState } from 'react'; import { useAsyncRetry } from 'react-use'; +import { circleCIApiRef } from '../api/index'; import { CITableBuildInfo } from '../pages/BuildsPage/lib/CITable'; import { useSettings } from './useSettings'; @@ -80,9 +80,10 @@ export function useBuilds() { const getBuilds = useCallback( async ({ limit, offset }: { limit: number; offset: number }) => { - if (owner === '' || repo === '') { - return; + if (owner === '' || repo === '' || token === '') { + return Promise.reject('No credentials provided'); } + try { return await api.getBuilds( { limit, offset }, diff --git a/plugins/circleci/src/state/useSettings.ts b/plugins/circleci/src/state/useSettings.ts index 04ce83a0a9..5482abeb8b 100644 --- a/plugins/circleci/src/state/useSettings.ts +++ b/plugins/circleci/src/state/useSettings.ts @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { errorApiRef, useApi } from '@backstage/core'; import { useContext, useEffect } from 'react'; -import { AppContext, STORAGE_KEY } from '.'; -import { useApi, errorApiRef } from '@backstage/core'; +import { AppContext, STORAGE_KEY } from './AppState'; import { Settings } from './types'; + export function useSettings() { const [settings, dispatch] = useContext(AppContext);