refactor(web) migrate Loading component to TypeScript

agama-project · Dec 10, 2024 · ccc3e34 · ccc3e34
1 parent 7cbed6d
commit ccc3e34
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/web/src/components/layout/Layout.tsx b/web/src/components/layout/Layout.tsx
@@ -28,7 +28,7 @@ import Header, { HeaderProps } from "~/components/layout/Header";
 import { Loading, Sidebar } from "~/components/layout";
 import { IssuesDrawer } from "~/components/core";
 
-type LayoutProps = React.PropsWithChildren<{
+export type LayoutProps = React.PropsWithChildren<{
   mountHeader?: boolean;
   mountSidebar?: boolean;
   headerOptions?: HeaderProps;

diff --git a/web/src/components/layout/Loading.test.jsx → web/src/components/layout/Loading.test.tsx b/web/src/components/layout/Loading.test.jsx → web/src/components/layout/Loading.test.tsx
@@ -35,7 +35,7 @@ jest.mock("~/components/layout/Layout", () => {
 
   return {
     ...layout,
-    Plain: (props) => (
+    Plain: ({ ...props }) => (
       <>
         <div>PlainLayout Mock</div>
         <OriginalPlainLayout {...props} />

diff --git a/web/src/components/layout/Loading.jsx → web/src/components/layout/Loading.tsx b/web/src/components/layout/Loading.jsx → web/src/components/layout/Loading.tsx
@@ -23,10 +23,13 @@
 import React from "react";
 import { EmptyState, EmptyStateIcon, EmptyStateHeader, Spinner } from "@patternfly/react-core";
 import { Center, PlainLayout } from "~/components/layout";
+import { LayoutProps } from "~/components/layout/Layout";
 import { _ } from "~/i18n";
 
 const LoadingIcon = () => <Spinner size="xl" />;
-const Layout = (props) => <PlainLayout mountHeader={false} mountSidebar={false} {...props} />;
+const Layout = (props: LayoutProps) => (
+  <PlainLayout mountHeader={false} mountSidebar={false} {...props} />
+);
 
 function Loading({
   text = _("Loading installation environment, please wait."),