diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx index a61990ed24..a6c613ded7 100644 --- a/packages/app/src/App.tsx +++ b/packages/app/src/App.tsx @@ -106,7 +106,6 @@ import { RequirePermission } from '@backstage/plugin-permission-react'; import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common'; import { PlaylistIndexPage } from '@backstage/plugin-playlist'; import { TwoColumnLayout } from './components/scaffolder/customScaffolderLayouts'; -import { exploreTools } from './exploreTools'; const app = createApp({ apis, @@ -243,10 +242,7 @@ const routes = ( - } - /> + } /> } diff --git a/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.tsx b/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.tsx index c7ed23e185..79d8fda6fe 100644 --- a/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.tsx +++ b/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.tsx @@ -33,51 +33,37 @@ import { import { useApi } from '@backstage/core-plugin-api'; const Body = (props: { exploreTools?: Array }) => { - var exploreTools; - if (!props?.exploreTools) { - const exploreToolsConfigApi = useApi(exploreToolsConfigRef); - const { - value: tools, - loading, - error, - } = useAsync(async () => { - return await exploreToolsConfigApi.getTools(); - }, [exploreToolsConfigApi]); + const exploreToolsConfigApi = useApi(exploreToolsConfigRef); + const { + value: tools, + loading, + error, + } = useAsync(async () => { + if (props?.exploreTools) return props?.exploreTools; + return await exploreToolsConfigApi.getTools(); + }, [exploreToolsConfigApi]); - if (loading) { - return ; - } + if (loading) { + return ; + } - if (error) { - return ; - } + if (error) { + return ; + } - if (!tools?.length) { - return ( - - ); - } - exploreTools = tools; - } else if (props?.exploreTools) { - exploreTools = props?.exploreTools; - if (!props?.exploreTools?.length) { - return ( - - ); - } + if (!tools?.length) { + return ( + + ); } return ( - {exploreTools?.map((tool, index) => ( + {tools?.map((tool, index) => ( ))}