From 342e1c5cfc72ed287446435c9bdc38565fac16ab Mon Sep 17 00:00:00 2001 From: victormorfin97 Date: Fri, 27 Aug 2021 08:17:51 -0500 Subject: [PATCH] update to the correct type the new prop Signed-off-by: victormorfin97 --- plugins/scaffolder/src/components/Router.tsx | 7 +++++-- .../src/components/ScaffolderPage/ScaffolderPage.tsx | 7 +++++-- .../src/components/TemplateList/TemplateList.tsx | 6 ++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx index 6a08d46ec9..9e4736ab9f 100644 --- a/plugins/scaffolder/src/components/Router.tsx +++ b/plugins/scaffolder/src/components/Router.tsx @@ -14,8 +14,9 @@ * limitations under the License. */ -import React from 'react'; +import React, { ComponentType } from 'react'; import { Routes, Route, useOutlet } from 'react-router'; +import { TemplateEntityV1beta2 } from '@backstage/catalog-model'; import { ScaffolderPage } from './ScaffolderPage'; import { TemplatePage } from './TemplatePage'; import { TaskPage } from './TaskPage'; @@ -30,7 +31,9 @@ import { import { useElementFilter } from '@backstage/core-plugin-api'; type RouterProps = { - TemplateCardComponent?: (props: any) => JSX.Element | null; + TemplateCardComponent?: + | ComponentType<{ template: TemplateEntityV1beta2 }> + | undefined; }; export const Router = ({ TemplateCardComponent }: RouterProps) => { diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx index e0d6a7b565..ec7bd6f468 100644 --- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx +++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx @@ -23,6 +23,7 @@ import { Page, SupportButton, } from '@backstage/core-components'; +import { TemplateEntityV1beta2 } from '@backstage/catalog-model'; import { useRouteRef } from '@backstage/core-plugin-api'; import { EntityKindPicker, @@ -32,7 +33,7 @@ import { UserListPicker, } from '@backstage/plugin-catalog-react'; import { makeStyles } from '@material-ui/core'; -import React from 'react'; +import React, { ComponentType } from 'react'; import { registerComponentRouteRef } from '../../routes'; import { TemplateList } from '../TemplateList'; import { TemplateTypePicker } from '../TemplateTypePicker'; @@ -47,7 +48,9 @@ const useStyles = makeStyles(theme => ({ })); export type ScaffolderPageProps = { - TemplateCardComponent?: (props: any) => JSX.Element | null; + TemplateCardComponent?: + | ComponentType<{ template: TemplateEntityV1beta2 }> + | undefined; }; export const ScaffolderPageContents = ({ diff --git a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx index b90ed1d8a6..fb9a73f85e 100644 --- a/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx +++ b/plugins/scaffolder/src/components/TemplateList/TemplateList.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import React from 'react'; +import React, { ComponentType } from 'react'; import { TemplateEntityV1beta2 } from '@backstage/catalog-model'; import { ItemCardGrid, @@ -28,7 +28,9 @@ import { TemplateCard, TemplateCardProps } from '../TemplateCard'; export type Props = TemplateCardProps; export type TemplateListProps = { - TemplateCardComponent?: (props: Props) => JSX.Element | null; + TemplateCardComponent?: + | ComponentType<{ template: TemplateEntityV1beta2 }> + | undefined; }; export const TemplateList = ({ TemplateCardComponent }: TemplateListProps) => {