Skip to content

Commit

Permalink
No emui src diff
Browse files Browse the repository at this point in the history
  • Loading branch information
Dartoxian committed Nov 8, 2023
1 parent dbe46ba commit 3ee6ece
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 78 deletions.
Expand Up @@ -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<EnclaveInfo>) {
Expand Down
Expand Up @@ -10,9 +10,7 @@ type KurtosisClientContextState = {
client: KurtosisClient | null;
};

const KurtosisClientContext = createContext<KurtosisClientContextState>({
client: null,
});
const KurtosisClientContext = createContext<KurtosisClientContextState>({ client: null });

export const KurtosisClientProvider = ({ children }: PropsWithChildren) => {
const [client, setClient] = useState<KurtosisClient>();
Expand Down
Expand Up @@ -98,12 +98,7 @@ export const EnclaveConfigurationForm = forwardRef<
{},
);

onSubmit({
enclaveName: "",
restartServices: false,
...data,
args: newArgs,
});
onSubmit({ enclaveName: "", restartServices: false, ...data, args: newArgs });
};

return (
Expand Down
Expand Up @@ -5,12 +5,5 @@ import { KurtosisArgumentTypeInputProps } from "./KurtosisArgumentTypeInput";
export const StringArgumentInput = (props: Omit<KurtosisArgumentTypeInputProps, "type">) => {
const { register } = useEnclaveConfigurationFormContext();

return (
<Input
{...register(props.name, {
disabled: props.disabled,
required: props.isRequired,
})}
/>
);
return <Input {...register(props.name, { disabled: props.disabled, required: props.isRequired })} />;
};
Expand Up @@ -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;
Expand Down Expand Up @@ -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`,
Expand Down
Expand Up @@ -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)) {
Expand Down
5 changes: 1 addition & 4 deletions enclave-manager/web/src/emui/App.tsx
Expand Up @@ -41,10 +41,7 @@ const KurtosisRouter = () => {
),
children: [
{ path: "/", children: enclaveRoutes(kurtosisClient) },
{
path: "/catalog",
children: catalogRoutes(kurtosisIndexerClient),
},
{ path: "/catalog", children: catalogRoutes(kurtosisIndexerClient) },
],
},
],
Expand Down
9 changes: 2 additions & 7 deletions enclave-manager/web/src/emui/enclaves/enclave/Enclave.tsx
Expand Up @@ -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 },
Expand Down Expand Up @@ -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]);

Expand Down
9 changes: 2 additions & 7 deletions enclave-manager/web/src/emui/enclaves/enclave/loader.ts
Expand Up @@ -8,10 +8,7 @@ import { EnclaveFullInfo } from "../types";
export const loadEnclave = async (
kurtosisClient: KurtosisClient,
uuid?: string,
): Promise<{
routeName: string;
enclave?: Result<EnclaveFullInfo, string>;
}> => {
): Promise<{ routeName: string; enclave?: Result<EnclaveFullInfo, string> }> => {
if (!isDefined(uuid)) {
return {
routeName: "Missing uuid",
Expand Down Expand Up @@ -56,6 +53,4 @@ export const enclaveLoader =
};

export type EnclaveLoaderDeferred = { data: ReturnType<typeof loadEnclave> };
export type EnclaveLoaderResolved = {
data: Awaited<ReturnType<typeof loadEnclave>>;
};
export type EnclaveLoaderResolved = { data: Awaited<ReturnType<typeof loadEnclave>> };
22 changes: 5 additions & 17 deletions enclave-manager/web/src/emui/enclaves/enclave/logs/EnclaveLogs.tsx
Expand Up @@ -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:
Expand All @@ -52,9 +45,7 @@ export const EnclaveLogs = ({ enclave }: EnclaveLogsProps) => {
const navigator = useNavigate();
const revalidator = useRevalidator();
const location = useLocation() as Location<RunStarlarkResolvedType | undefined>;
const [progress, setProgress] = useState<EnclaveLogStage>({
stage: "waiting",
});
const [progress, setProgress] = useState<EnclaveLogStage>({ stage: "waiting" });
const [logLines, setLogLines] = useState<LogLineProps[]>([]);

useEffect(() => {
Expand Down Expand Up @@ -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;
Expand Down
Expand Up @@ -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 },
];
Expand Down

0 comments on commit 3ee6ece

Please sign in to comment.