Skip to content

fix: preserve advanced matching toggle #3680

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

Open
jhcpeixoto wants to merge 1 commit into
base: develop
Choose a base branch
from
+22 −2
Open

fix: preserve advanced matching toggle #3680

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion client/src/Hooks/useMonitorForm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ const getBaseDefaults = (data?: Monitor | null) => ({
geoCheckInterval: data?.geoCheckInterval || 300000,
});

const hasAdvancedMatchingConfig = (data?: Monitor | null) =>
Boolean(
data?.useAdvancedMatching ||
data?.matchMethod ||
data?.expectedValue ||
data?.jsonPath
);

export const useMonitorForm = ({
data = null,
defaultType = "http",
Expand All @@ -38,7 +46,7 @@ export const useMonitorForm = ({
type: "http",
url: data?.url || "",
ignoreTlsErrors: data?.ignoreTlsErrors || false,
useAdvancedMatching: data?.useAdvancedMatching || false,
useAdvancedMatching: hasAdvancedMatchingConfig(data),
matchMethod: data?.matchMethod || "",
expectedValue: data?.expectedValue || "",
jsonPath: data?.jsonPath || "",
Expand Down
14 changes: 13 additions & 1 deletion client/src/Pages/CreateMonitor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ const CreateMonitorPage = () => {
resolver: zodResolver(schema),
defaultValues: defaults,
});
const { control, watch, handleSubmit, clearErrors } = form;
const { control, watch, handleSubmit, clearErrors, setValue } = form;

useEffect(() => {
form.reset(defaults);
Expand All @@ -260,6 +260,10 @@ const CreateMonitorPage = () => {
const watchedUseAdvancedMatching = watch("useAdvancedMatching") as boolean;
const watchGeoCheckEnabled = watch("geoCheckEnabled") as boolean;

const enableAdvancedMatching = () => {
setValue("useAdvancedMatching", true, { shouldDirty: true });
};

useEffect(() => {
clearErrors();
}, [watchedType, clearErrors]);
Expand Down Expand Up @@ -1092,6 +1096,10 @@ const CreateMonitorPage = () => {
<TextField
{...field}
value={field.value ?? ""}
onChange={(event) => {
enableAdvancedMatching();
field.onChange(event);
}}
fieldLabel={t(
"pages.createMonitor.form.advanced.option.expectedValue.label"
)}
Expand All @@ -1108,6 +1116,10 @@ const CreateMonitorPage = () => {
<TextField
{...field}
value={field.value ?? ""}
onChange={(event) => {
enableAdvancedMatching();
field.onChange(event);
}}
fieldLabel={t(
"pages.createMonitor.form.advanced.option.jsonPath.label"
)}
Expand Down
Loading