diff --git a/pkgs/ui/nix/pdefs.nix b/pkgs/ui/nix/pdefs.nix index 9bae9397d..c7a2b7481 100644 --- a/pkgs/ui/nix/pdefs.nix +++ b/pkgs/ui/nix/pdefs.nix @@ -18438,4 +18438,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/pkgs/ui/src/app/machines/layout.tsx b/pkgs/ui/src/app/machines/layout.tsx index eace0be37..e9db5e3fe 100644 --- a/pkgs/ui/src/app/machines/layout.tsx +++ b/pkgs/ui/src/app/machines/layout.tsx @@ -1,5 +1,10 @@ import { MachineContextProvider } from "@/components/hooks/useMachines"; export default function Layout({ children }: { children: React.ReactNode }) { - return {children}; + return ( + // TODO: select flake? + + {children} + + ); } diff --git a/pkgs/ui/src/app/machines/page.tsx b/pkgs/ui/src/app/machines/page.tsx index 9c89d605e..b1d7b4429 100644 --- a/pkgs/ui/src/app/machines/page.tsx +++ b/pkgs/ui/src/app/machines/page.tsx @@ -2,9 +2,6 @@ import { NodeTable } from "@/components/table"; - export default function Page() { - return ( - - ); + return ; } diff --git a/pkgs/ui/src/components/createMachineForm/customConfig.tsx b/pkgs/ui/src/components/createMachineForm/customConfig.tsx index acd9441d9..cc14a9537 100644 --- a/pkgs/ui/src/components/createMachineForm/customConfig.tsx +++ b/pkgs/ui/src/components/createMachineForm/customConfig.tsx @@ -33,7 +33,10 @@ interface PureCustomConfigProps extends FormStepContentProps { } export function CustomConfig(props: FormStepContentProps) { const { formHooks } = props; - const { data, isLoading, error } = useGetMachineSchema("mama"); + const { data, isLoading, error } = useGetMachineSchema( + "defaultFlake", + "mama", + ); // const { data, isLoading, error } = { data: {data:{schema: { // title: 'Test form', // type: 'object', @@ -53,11 +56,11 @@ export function CustomConfig(props: FormStepContentProps) { return {}; }, [data, isLoading, error]); + type ValueType = { default: any }; const initialValues = useMemo( () => Object.entries(schema?.properties || {}).reduce((acc, [key, value]) => { - /*@ts-ignore*/ - const init: any = value?.default; + const init: any = (value as ValueType)?.default; if (init) { return { ...acc, @@ -157,7 +160,7 @@ function PureCustomConfig(props: PureCustomConfigProps) { // ObjectFieldTemplate: ErrorListTemplate: ErrorList, ButtonTemplates: { - SubmitButton: (props) => ( + SubmitButton: () => (