Compare commits

...

3 commits

Author SHA1 Message Date
robert-cardillo
f05f1304e5
Merge ffbd312f29 into 778363a948 2024-11-11 10:08:57 +00:00
Dorence Deng
778363a948
fix(notification): #5323 fix EditMonitor.vue useToast error (#5333)
Some checks failed
Auto Test / e2e-test (push) Has been cancelled
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / check-linters (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
validate / json-yaml-validate (push) Has been cancelled
validate / validate (push) Has been cancelled
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
2024-11-11 11:08:43 +01:00
robert-cardillo
ffbd312f29 Browser Engine waits for the selector specified in Friendly Name wrapped with brackets, if specified 2024-10-23 12:58:10 +03:00
2 changed files with 14 additions and 5 deletions

View file

@ -240,10 +240,19 @@ class RealBrowserMonitorType extends MonitorType {
const context = await browser.newContext(); const context = await browser.newContext();
const page = await context.newPage(); const page = await context.newPage();
const res = await page.goto(monitor.url, { let res;
const matches = monitor.name.match(/\[(.*?)\]/);
if (matches) {
res = await page.goto(monitor.url, {
timeout: monitor.interval * 1000 * 0.8,
});
await page.waitForSelector(matches[1], { timeout: monitor.interval * 1000 * 0.8 });
} else {
res = await page.goto(monitor.url, {
waitUntil: "networkidle", waitUntil: "networkidle",
timeout: monitor.interval * 1000 * 0.8, timeout: monitor.interval * 1000 * 0.8,
}); });
}
let filename = jwt.sign(monitor.id, server.jwtSecret) + ".png"; let filename = jwt.sign(monitor.id, server.jwtSecret) + ".png";

View file

@ -1065,7 +1065,7 @@ import { hostNameRegexPattern } from "../util-frontend";
import HiddenInput from "../components/HiddenInput.vue"; import HiddenInput from "../components/HiddenInput.vue";
import EditMonitorConditions from "../components/EditMonitorConditions.vue"; import EditMonitorConditions from "../components/EditMonitorConditions.vue";
const toast = useToast; const toast = useToast();
const pushTokenLength = 32; const pushTokenLength = 32;