From 3ee6ecebbb20a020654fcb75d2acd83ab8d5e2bd Mon Sep 17 00:00:00 2001 From: Ben Gazzard Date: Wed, 8 Nov 2023 14:07:09 +0000 Subject: [PATCH] No emui src diff --- .../client/enclaveManager/KurtosisClient.ts | 5 +---- .../enclaveManager/KurtosisClientContext.tsx | 4 +--- .../EnclaveConfigurationForm.tsx | 7 +----- .../inputs/StringArgumentInput.tsx | 9 +------- .../enclaves/modals/ConfigureEnclaveModal.tsx | 14 ++---------- .../modals/ManualCreateEnclaveModal.tsx | 4 +--- enclave-manager/web/src/emui/App.tsx | 5 +---- .../web/src/emui/enclaves/enclave/Enclave.tsx | 9 ++------ .../web/src/emui/enclaves/enclave/loader.ts | 9 ++------ .../enclaves/enclave/logs/EnclaveLogs.tsx | 22 +++++-------------- .../emui/enclaves/enclave/service/Service.tsx | 8 +------ 11 files changed, 18 insertions(+), 78 deletions(-) diff --git a/enclave-manager/web/src/client/enclaveManager/KurtosisClient.ts b/enclave-manager/web/src/client/enclaveManager/KurtosisClient.ts index 193f1fa08d..2d09626ccd 100644 --- a/enclave-manager/web/src/client/enclaveManager/KurtosisClient.ts +++ b/enclave-manager/web/src/client/enclaveManager/KurtosisClient.ts @@ -102,10 +102,7 @@ export abstract class KurtosisClient { numLogLines: isDefined(numLogLines) ? numLogLines : 1500, returnAllLogs: !!returnAllLogs, }); - return this.client.getServiceLogs(request, { - ...this.getHeaderOptions(), - signal: abortController.signal, - }); + return this.client.getServiceLogs(request, { ...this.getHeaderOptions(), signal: abortController.signal }); } async getStarlarkRun(enclave: RemoveFunctions) { diff --git a/enclave-manager/web/src/client/enclaveManager/KurtosisClientContext.tsx b/enclave-manager/web/src/client/enclaveManager/KurtosisClientContext.tsx index c04b0bfd51..cdf334e1ad 100644 --- a/enclave-manager/web/src/client/enclaveManager/KurtosisClientContext.tsx +++ b/enclave-manager/web/src/client/enclaveManager/KurtosisClientContext.tsx @@ -10,9 +10,7 @@ type KurtosisClientContextState = { client: KurtosisClient | null; }; -const KurtosisClientContext = createContext({ - client: null, -}); +const KurtosisClientContext = createContext({ client: null }); export const KurtosisClientProvider = ({ children }: PropsWithChildren) => { const [client, setClient] = useState(); diff --git a/enclave-manager/web/src/components/enclaves/configuration/EnclaveConfigurationForm.tsx b/enclave-manager/web/src/components/enclaves/configuration/EnclaveConfigurationForm.tsx index a142cda64c..dd7b0506e6 100644 --- a/enclave-manager/web/src/components/enclaves/configuration/EnclaveConfigurationForm.tsx +++ b/enclave-manager/web/src/components/enclaves/configuration/EnclaveConfigurationForm.tsx @@ -98,12 +98,7 @@ export const EnclaveConfigurationForm = forwardRef< {}, ); - onSubmit({ - enclaveName: "", - restartServices: false, - ...data, - args: newArgs, - }); + onSubmit({ enclaveName: "", restartServices: false, ...data, args: newArgs }); }; return ( diff --git a/enclave-manager/web/src/components/enclaves/configuration/inputs/StringArgumentInput.tsx b/enclave-manager/web/src/components/enclaves/configuration/inputs/StringArgumentInput.tsx index b234bdbbe3..8357db73ca 100644 --- a/enclave-manager/web/src/components/enclaves/configuration/inputs/StringArgumentInput.tsx +++ b/enclave-manager/web/src/components/enclaves/configuration/inputs/StringArgumentInput.tsx @@ -5,12 +5,5 @@ import { KurtosisArgumentTypeInputProps } from "./KurtosisArgumentTypeInput"; export const StringArgumentInput = (props: Omit) => { const { register } = useEnclaveConfigurationFormContext(); - return ( - - ); + return ; }; diff --git a/enclave-manager/web/src/components/enclaves/modals/ConfigureEnclaveModal.tsx b/enclave-manager/web/src/components/enclaves/modals/ConfigureEnclaveModal.tsx index 7b64fdc726..6b7552057c 100644 --- a/enclave-manager/web/src/components/enclaves/modals/ConfigureEnclaveModal.tsx +++ b/enclave-manager/web/src/components/enclaves/modals/ConfigureEnclaveModal.tsx @@ -85,13 +85,7 @@ export const ConfigureEnclaveModal = ({ case ArgumentValueType.DICT: assertDefined(innerType2, `Cannot parse a dict argument type without knowing innterType2`); return isDefined(value) - ? Object.entries(value).map( - ([k, v]) => ({ - key: k, - value: convertArgValue(innerType2, v), - }), - {}, - ) + ? Object.entries(value).map(([k, v]) => ({ key: k, value: convertArgValue(innerType2, v) }), {}) : []; default: return value; @@ -169,11 +163,7 @@ export const ConfigureEnclaveModal = ({ return; } submit( - { - config: formData, - packageId: kurtosisPackage.name, - apicInfo: apicInfo.toJson(), - }, + { config: formData, packageId: kurtosisPackage.name, apicInfo: apicInfo.toJson() }, { method: "post", action: `/enclave/${enclaveUUID}/logs`, diff --git a/enclave-manager/web/src/components/enclaves/modals/ManualCreateEnclaveModal.tsx b/enclave-manager/web/src/components/enclaves/modals/ManualCreateEnclaveModal.tsx index 40a507934a..1e385b4b84 100644 --- a/enclave-manager/web/src/components/enclaves/modals/ManualCreateEnclaveModal.tsx +++ b/enclave-manager/web/src/components/enclaves/modals/ManualCreateEnclaveModal.tsx @@ -53,9 +53,7 @@ export const ManualCreateEnclaveModal = ({ isOpen, onClose, onConfirm }: ManualC const packageResponse = await kurtosisIndexerClient.readPackage(form.url); setIsLoading(false); if (packageResponse.isErr) { - setError("url", { - message: `Could not load '${form.url}', got error ${packageResponse.error}`, - }); + setError("url", { message: `Could not load '${form.url}', got error ${packageResponse.error}` }); return; } if (!isDefined(packageResponse.value.package)) { diff --git a/enclave-manager/web/src/emui/App.tsx b/enclave-manager/web/src/emui/App.tsx index f3f707fc83..aa829c68ea 100644 --- a/enclave-manager/web/src/emui/App.tsx +++ b/enclave-manager/web/src/emui/App.tsx @@ -41,10 +41,7 @@ const KurtosisRouter = () => { ), children: [ { path: "/", children: enclaveRoutes(kurtosisClient) }, - { - path: "/catalog", - children: catalogRoutes(kurtosisIndexerClient), - }, + { path: "/catalog", children: catalogRoutes(kurtosisIndexerClient) }, ], }, ], diff --git a/enclave-manager/web/src/emui/enclaves/enclave/Enclave.tsx b/enclave-manager/web/src/emui/enclaves/enclave/Enclave.tsx index c9af36f315..14115c24b6 100644 --- a/enclave-manager/web/src/emui/enclaves/enclave/Enclave.tsx +++ b/enclave-manager/web/src/emui/enclaves/enclave/Enclave.tsx @@ -14,10 +14,7 @@ import { EnclaveLogs } from "./logs/EnclaveLogs"; import { EnclaveOverview } from "./overview/EnclaveOverview"; import { EnclaveSource } from "./source/EnclaveSource"; -const tabs: { - path: string; - element: FunctionComponent<{ enclave: EnclaveFullInfo }>; -}[] = [ +const tabs: { path: string; element: FunctionComponent<{ enclave: EnclaveFullInfo }> }[] = [ { path: "overview", element: EnclaveOverview }, { path: "source", element: EnclaveSource }, { path: "logs", element: EnclaveLogs }, @@ -95,9 +92,7 @@ const EnclaveImpl = ({ enclave }: EnclaveImplProps) => { useEffect(() => { if (isDefined(actionData)) { - navigator(`/enclave/${enclave.shortenedUuid}/logs`, { - state: actionData, - }); + navigator(`/enclave/${enclave.shortenedUuid}/logs`, { state: actionData }); } }, [navigator, actionData, activeIndex, enclave.shortenedUuid]); diff --git a/enclave-manager/web/src/emui/enclaves/enclave/loader.ts b/enclave-manager/web/src/emui/enclaves/enclave/loader.ts index 8ee51d6d31..31d949c61c 100644 --- a/enclave-manager/web/src/emui/enclaves/enclave/loader.ts +++ b/enclave-manager/web/src/emui/enclaves/enclave/loader.ts @@ -8,10 +8,7 @@ import { EnclaveFullInfo } from "../types"; export const loadEnclave = async ( kurtosisClient: KurtosisClient, uuid?: string, -): Promise<{ - routeName: string; - enclave?: Result; -}> => { +): Promise<{ routeName: string; enclave?: Result }> => { if (!isDefined(uuid)) { return { routeName: "Missing uuid", @@ -56,6 +53,4 @@ export const enclaveLoader = }; export type EnclaveLoaderDeferred = { data: ReturnType }; -export type EnclaveLoaderResolved = { - data: Awaited>; -}; +export type EnclaveLoaderResolved = { data: Awaited> }; diff --git a/enclave-manager/web/src/emui/enclaves/enclave/logs/EnclaveLogs.tsx b/enclave-manager/web/src/emui/enclaves/enclave/logs/EnclaveLogs.tsx index 78da1c2d0e..15f33babcb 100644 --- a/enclave-manager/web/src/emui/enclaves/enclave/logs/EnclaveLogs.tsx +++ b/enclave-manager/web/src/emui/enclaves/enclave/logs/EnclaveLogs.tsx @@ -23,20 +23,13 @@ export function starlarkResponseLineToLogLineProps(l: StarlarkRunResponseLine): case "instruction": return { message: l.runResponseLine.value.executableInstruction }; case "progressInfo": - return { - message: l.runResponseLine.value.currentStepInfo[l.runResponseLine.value.currentStepNumber], - }; + return { message: l.runResponseLine.value.currentStepInfo[l.runResponseLine.value.currentStepNumber] }; case "instructionResult": return { message: l.runResponseLine.value.serializedInstructionResult }; case "error": - return { - message: l.runResponseLine.value.error.value?.errorMessage || "Unknown error", - status: "error", - }; + return { message: l.runResponseLine.value.error.value?.errorMessage || "Unknown error", status: "error" }; case "runFinishedEvent": - return { - message: l.runResponseLine.value.isRunSuccessful ? "Script completed" : "Script failed", - }; + return { message: l.runResponseLine.value.isRunSuccessful ? "Script completed" : "Script failed" }; case "info": return { message: l.runResponseLine.value.infoMessage }; default: @@ -52,9 +45,7 @@ export const EnclaveLogs = ({ enclave }: EnclaveLogsProps) => { const navigator = useNavigate(); const revalidator = useRevalidator(); const location = useLocation() as Location; - const [progress, setProgress] = useState({ - stage: "waiting", - }); + const [progress, setProgress] = useState({ stage: "waiting" }); const [logLines, setLogLines] = useState([]); useEffect(() => { @@ -88,10 +79,7 @@ export const EnclaveLogs = ({ enclave }: EnclaveLogsProps) => { if (line.runResponseLine.case === "runFinishedEvent") { revalidator.revalidate(); return line.runResponseLine.value.isRunSuccessful - ? { - stage: "done", - totalSteps: oldProgress.stage === "executing" ? oldProgress.totalSteps : null, - } + ? { stage: "done", totalSteps: oldProgress.stage === "executing" ? oldProgress.totalSteps : null } : { stage: "failed" }; } return oldProgress; diff --git a/enclave-manager/web/src/emui/enclaves/enclave/service/Service.tsx b/enclave-manager/web/src/emui/enclaves/enclave/service/Service.tsx index 3ff5beef51..40d021e38d 100644 --- a/enclave-manager/web/src/emui/enclaves/enclave/service/Service.tsx +++ b/enclave-manager/web/src/emui/enclaves/enclave/service/Service.tsx @@ -11,13 +11,7 @@ import { EnclaveLoaderResolved } from "../loader"; import { ServiceLogs } from "./logs/ServiceLogs"; import { ServiceOverview } from "./overview/ServiceOverview"; -const tabs: { - path: string; - element: FunctionComponent<{ - enclave: EnclaveFullInfo; - service: ServiceInfo; - }>; -}[] = [ +const tabs: { path: string; element: FunctionComponent<{ enclave: EnclaveFullInfo; service: ServiceInfo }> }[] = [ { path: "overview", element: ServiceOverview }, { path: "logs", element: ServiceLogs }, ];