Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,24 @@ const SubmissionForm = ({
workflowId?: string;
}) => {
const data = useFragment(SubmissionFormFragment, template);

const repositoryUrl =
data.repository ?? templateSourceToLink(data.templateSource);
const reusedParameterData = useFragment(
SubmissionFormParametersFragment,
prepopulatedParameters,
);

const [searchParams] = useSearchParams();

const parametersSchema = data.arguments as JsonSchema;

const autofilledParameters = mergeParameters(
reusedParameterData,
searchParams,
parametersSchema,
);

const parametersSchema = data.arguments as JsonSchema;

const overriddenKeys = Array.from(new Set(searchParams.keys())).filter(
(key) => {
return parametersSchema.properties && key in parametersSchema.properties;
Expand Down
51 changes: 50 additions & 1 deletion frontend/relay-workflows-lib/lib/utils/workflowRelayUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
} from "../graphql/__generated__/WorkflowTasksFragment.graphql";
import { JSONObject } from "workflows-lib";
import { SubmissionFormParametersFragment$data } from "../components/__generated__/SubmissionFormParametersFragment.graphql";
import { JsonSchema } from "@jsonforms/core";

export function updateSearchParamsWithTaskIds(
updatedTaskIds: string[],
Expand Down Expand Up @@ -95,8 +96,56 @@ export function useFetchedTasks(
export function mergeParameters(
reusedParameterData: SubmissionFormParametersFragment$data | null | undefined,
searchParams: URLSearchParams,
parametersSchema?: JsonSchema,
) {
const searchParameterData = Object.fromEntries(searchParams.entries());
const searchParameterData: JSONObject = {};
if (!parametersSchema) {
return {
...reusedParameterData?.parameters,
...Object.fromEntries(searchParams.entries()),
} as JSONObject;
}

for (const [key, value] of searchParams.entries()) {
const propertySchema = parametersSchema.properties?.[key];

// Ignore URL parameters that do not exist in the template schema.
if (!propertySchema || typeof propertySchema === "boolean") {
continue;
}

if (propertySchema.type === "array" || propertySchema.type === "object") {
try {
const parsedValue: unknown = JSON.parse(value);

const hasExpectedType =
(propertySchema.type === "array" && Array.isArray(parsedValue)) ||
(propertySchema.type === "object" &&
parsedValue !== null &&
typeof parsedValue === "object" &&
!Array.isArray(parsedValue));

if (!hasExpectedType) {
console.warn(
`Ignoring URL parameter "${key}": expected ${propertySchema.type}.`,
);
continue;
}

// Argo workflow parameters are passed as strings.
searchParameterData[key] = parsedValue as JSONObject[keyof JSONObject];
} catch {
console.warn(
`Ignoring URL parameter "${key}": value is not valid JSON.`,
);
}

continue;
}
// Preserve existing behaviour for flat parameters.
searchParameterData[key] = value;
}

return {
...reusedParameterData?.parameters,
...searchParameterData,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { materialCells } from "@jsonforms/material-renderers";
import { JsonSchema, UISchemaElement, createAjv } from "@jsonforms/core";
import { JsonForms } from "@jsonforms/react";
import React, { useState } from "react";

import {
Box,
Divider,
Expand Down Expand Up @@ -44,7 +45,9 @@ const TemplateSubmissionForm: React.FC<TemplateSubmissionFormProps> = ({
const theme = useTheme();
const validator = createAjv({ useDefaults: true, coerceTypes: true });

const [parameters, setParameters] = useState(prepopulatedParameters ?? {});
const [parameters, setParameters] = useState<JSONObject>(
prepopulatedParameters ?? {},
);
const [errors, setErrors] = useState<ErrorObject[]>([]);

const [submitted, setSubmitted] = useState(false);
Expand Down
Loading