Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 00:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 106

Fleet UI: Fix package form preinstall sql to handle invalid sql as savable (#37283)

Browse source
This commit is contained in:
RachelElysia 2025-12-15 14:31:55 -05:00 committed by GitHub
parent 1b60a539d3
commit fffafed67a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
frontend/pages/SoftwarePage/components/forms/PackageForm/helpers.tsx
View file

@ -1,7 +1,6 @@
import React from "react";
// @ts-ignore
import validateQuery from "components/forms/validators/validate_query";
import { validateQuery } from "components/forms/validators/validate_query";
import { getExtensionFromFileName } from "utilities/file/fileUtils";
import { IPackageFormData, IPackageFormValidation } from "./PackageForm";
@ -35,16 +34,22 @@ const FORM_VALIDATION_CONFIG: Record<
validations: [
{
name: "invalidQuery",
isValid: (formData) => {
// Allow all SQL including empty SQL: this field never blocks form submission Request: #35058
isValid: () => true,
message: (formData) => {
const query = formData.preInstallQuery;
return (
query === undefined || query === "" || validateQuery(query).valid
);
if (!query) {
return "";
}
const { error } = validateQuery(query);
// Return error text (or empty string)
return error || "";
},
message: (formData) => validateQuery(formData.preInstallQuery).error,
},
],
},
installScript: {
validations: [
{
@ -182,6 +187,14 @@ export const generateFormValidation = (formData: IPackageFormData) => {
if (!failedValidation) {
formValidation[objKey] = {
isValid: true,
// still compute error message for preInstallQuery since it can have warnings
// of bad SQL but still allow form submission
...(objKey === "preInstallQuery" && {
message: getErrorMessage(
formData,
FORM_VALIDATION_CONFIG[objKey].validations[0].message
),
}),
};
} else {
formValidation.isValid = false;