Skip to content

feat: allow updating monitor URL and type via Configure #2752

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
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

feat: allow updating monitor URL and type via Configure #2752

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
46579cd
feat: allow updating monitor URL and type via Configure
Yasir-Rafique Aug 8, 2025
db754cb
fix(client): add client-side URL validation to updateMonitor hook
Yasir-Rafique Aug 8, 2025
38fe814
refactor(client): harden URL normalization and validation utilities
Yasir-Rafique Aug 8, 2025
da4b5c9
refactor(client): remove redundant client-side URL validation, rely o…
Yasir-Rafique Aug 8, 2025
81ec448
fix(validation): use Joi for frontend & backend URL validation with h…
Yasir-Rafique Aug 9, 2025
3776441
Merge branch 'develop' into feat/edit-monitor-url-type
Yasir-Rafique Aug 9, 2025
94d171c
Align URL validation across frontend & backend to enforce host-only f…
Yasir-Rafique Aug 9, 2025
4da2ebe
Allow URL paths in monitor validation;
Yasir-Rafique Aug 9, 2025
4fec374
Revert unintended validation.js changes to match upstream develop
Yasir-Rafique Aug 12, 2025
6e3c8b8
refactor: simplify URL adjustment logic in onChange handler for reada…
Yasir-Rafique Aug 14, 2025
d5e4fe0
Merge branch 'develop' into feat/edit-monitor-url-type
Yasir-Rafique Aug 19, 2025
ab177d0
Merge branch 'develop' into feat/edit-monitor-url-type
Yasir-Rafique Aug 26, 2025
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
4 changes: 3 additions & 1 deletion client/src/Hooks/monitorHooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ const useDeleteMonitor = () => {

const useUpdateMonitor = () => {
const [isLoading, setIsLoading] = useState(false);

const navigate = useNavigate();
const updateMonitor = async ({ monitor, redirect }) => {
try {
Expand All @@ -376,10 +377,11 @@ const useUpdateMonitor = () => {
expectedValue: monitor.expectedValue,
ignoreTlsErrors: monitor.ignoreTlsErrors,
jsonPath: monitor.jsonPath,
url: monitor.url,
...((monitor.type === "port" || monitor.type === "game") && {
port: monitor.port,
}),
...(monitor.type == "game" && {
...(monitor.type === "game" && {
gameId: monitor.gameId,
}),
...(monitor.type === "hardware" && {
Expand Down
59 changes: 33 additions & 26 deletions client/src/Pages/Infrastructure/Create/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ const CreateInfrastructureMonitor = () => {
return errorKey ? errors[errorKey] : null;
};

const pageSchema = infrastructureMonitorValidation.fork(["url"], (s) =>
isCreate ? s.required() : s.optional()
);

// Populate form fields if editing
useEffect(() => {
if (isCreate) {
Expand Down Expand Up @@ -196,7 +200,7 @@ const CreateInfrastructureMonitor = () => {
secret: infrastructureMonitor.secret,
};

const { error } = infrastructureMonitorValidation.validate(form, {
const { error } = pageSchema.validate(form, {
abortEarly: false,
});

Expand Down Expand Up @@ -234,6 +238,7 @@ const CreateInfrastructureMonitor = () => {
form = {
...(isCreate ? {} : { _id: monitorId }),
...rest,
url: `http${https ? "s" : ""}://` + infrastructureMonitor.url,
description: form.name,
type: "hardware",
notifications: infrastructureMonitor.notifications,
Expand All @@ -257,8 +262,11 @@ const CreateInfrastructureMonitor = () => {
[name]: value,
});

const adjustedValue =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the logic implemented here can be simplified. So many nested ternary become hard to read in the longer run and maintain.

name === "url" ? (value ? `http${https ? "s" : ""}://${value}` : value) : value;

const { error } = infrastructureMonitorValidation.validate(
{ [name]: value },
{ [name]: adjustedValue },
{ abortEarly: false }
);
setErrors((prev) => ({
Expand Down Expand Up @@ -470,31 +478,30 @@ const CreateInfrastructureMonitor = () => {
onChange={onChange}
error={errors["url"] ? true : false}
helperText={errors["url"]}
disabled={!isCreate}
/>
{isCreate && (
<FieldWrapper
label={t("infrastructureProtocol")}
labelVariant="p"
>
<ButtonGroup>
<Button
variant="group"
filled={https.toString()}
onClick={() => setHttps(true)}
>
{t("https")}
</Button>
<Button
variant="group"
filled={(!https).toString()}
onClick={() => setHttps(false)}
>
{t("http")}
</Button>
</ButtonGroup>
</FieldWrapper>
)}

<FieldWrapper
label={t("infrastructureProtocol")}
labelVariant="p"
>
<ButtonGroup>
<Button
variant="group"
filled={https.toString()}
onClick={() => setHttps(true)}
>
{t("https")}
</Button>
<Button
variant="group"
filled={(!https).toString()}
onClick={() => setHttps(false)}
>
{t("http")}
</Button>
</ButtonGroup>
</FieldWrapper>

<TextInput
type="text"
id="name"
Expand Down
10 changes: 9 additions & 1 deletion server/src/validation/joi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,11 @@ const createMonitorBodyValidation = joi.object({
name: joi.string().required(),
description: joi.string().required(),
type: joi.string().required(),
url: joi.string().required(),
url: joi
.string()
.trim()
.uri({ scheme: ["http", "https"] })
.required(),
ignoreTlsErrors: joi.boolean().default(false),
port: joi.number(),
isActive: joi.boolean(),
Expand All @@ -182,6 +186,10 @@ const createMonitorsBodyValidation = joi.array().items(
);

const editMonitorBodyValidation = joi.object({
url: joi
.string()
.uri({ scheme: ["http", "https"] })
.optional(),
name: joi.string(),
description: joi.string(),
interval: joi.number(),
Expand Down