Skip to content

Add basic json check to variable value #50277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbovenzi merged 1 commit into from
May 6, 2025
Merged

Add basic json check to variable value #50277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 33 additions & 9 deletions airflow-core/src/airflow/ui/src/pages/Variables/ManageVariable/VariableForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Box, Field, HStack, Input, Spacer, Textarea } from "@chakra-ui/react";
import { Box, Field, HStack, Input, Spacer, Textarea, Text } from "@chakra-ui/react";
import { Controller, useForm } from "react-hook-form";
import { FiSave } from "react-icons/fi";

Expand All @@ -29,6 +29,16 @@ export type VariableBody = {
value: string;
};

const isJsonString = (string: string) => {
try {
JSON.parse(string);
} catch {
return false;
}

return true;
};

type VariableFormProps = {
readonly error: unknown;
readonly initialVariable: VariableBody;
Expand Down Expand Up @@ -80,14 +90,28 @@ const VariableForm = ({ error, initialVariable, isPending, manageMutate, setErro
<Controller
control={control}
name="value"
render={({ field }) => (
<Field.Root mt={4}>
<Field.Label fontSize="md">
Value <Field.RequiredIndicator />
</Field.Label>
<Textarea {...field} size="sm" />
</Field.Root>
)}
render={({ field, fieldState }) => {
const showJsonWarning =
field.value.startsWith("{") || field.value.startsWith("[") ? !isJsonString(field.value) : false;

return (
<Field.Root invalid={Boolean(fieldState.error)} mt={4} required>
<Field.Label fontSize="md">
Value <Field.RequiredIndicator />
</Field.Label>
<Textarea {...field} size="sm" />
{showJsonWarning ? (
<Text color="fg.warning" fontSize="xs">
Invalid JSON
</Text>
) : undefined}
{fieldState.error ? <Field.ErrorText>{fieldState.error.message}</Field.ErrorText> : undefined}
</Field.Root>
);
}}
rules={{
required: "Value is required",
}}
/>

<Controller
Expand Down