From 2488e6402e5eea5255099ba07f65f99930d548f3 Mon Sep 17 00:00:00 2001 From: Ionys <9364594+Ionys320@users.noreply.github.com> Date: Fri, 13 Dec 2024 09:40:21 +0100 Subject: [PATCH 1/5] feat(public URL): Add a public URL field and use it for the status page --- .../2024-12-12-2255-add-public-url.js | 13 +++++++++++++ server/model/monitor.js | 3 ++- server/server.js | 1 + src/components/MonitorSettingDialog.vue | 4 ++-- src/components/PublicGroupList.vue | 1 + src/lang/en.json | 4 +++- src/pages/EditMonitor.vue | 14 ++++++++++++++ test/e2e/specs/status-page.spec.js | 13 ++++++++++++- 8 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 db/knex_migrations/2024-12-12-2255-add-public-url.js diff --git a/db/knex_migrations/2024-12-12-2255-add-public-url.js b/db/knex_migrations/2024-12-12-2255-add-public-url.js new file mode 100644 index 000000000..0cd97240d --- /dev/null +++ b/db/knex_migrations/2024-12-12-2255-add-public-url.js @@ -0,0 +1,13 @@ +// Add column publicUrl to monitor table +exports.up = function (knex) { + return knex.schema + .alterTable("monitor", function (table) { + table.text("publicUrl", "text"); + }); +}; + +exports.down = function (knex) { + return knex.schema.alterTable("monitor", function (table) { + table.dropColumn("publicUrl"); + }); +}; diff --git a/server/model/monitor.js b/server/model/monitor.js index 3ad8cfafc..cb82bb85c 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -53,7 +53,7 @@ class Monitor extends BeanModel { }; if (this.sendUrl) { - obj.url = this.url; + obj.url = this.publicUrl ?? this.url; // Use publicUrl if available, otherwise use url } if (showTags) { @@ -91,6 +91,7 @@ class Monitor extends BeanModel { id: this.id, name: this.name, description: this.description, + publicUrl: this.publicUrl, path, pathName, parent: this.parent, diff --git a/server/server.js b/server/server.js index ec5ad49f6..15f062a6f 100644 --- a/server/server.js +++ b/server/server.js @@ -790,6 +790,7 @@ let needSetup = false; bean.parent = monitor.parent; bean.type = monitor.type; bean.url = monitor.url; + bean.publicUrl = monitor.publicUrl; bean.method = monitor.method; bean.body = monitor.body; bean.headers = monitor.headers; diff --git a/src/components/MonitorSettingDialog.vue b/src/components/MonitorSettingDialog.vue index e6b2cd1ef..d0ff80b00 100644 --- a/src/components/MonitorSettingDialog.vue +++ b/src/components/MonitorSettingDialog.vue @@ -10,7 +10,7 @@
- + @@ -29,7 +29,7 @@
-
diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue index bacddbf13..cc8e97a7b 100644 --- a/src/components/PublicGroupList.vue +++ b/src/components/PublicGroupList.vue @@ -59,6 +59,7 @@ :class="{'link-active': true, 'btn-link': true}" icon="cog" class="action me-3" @click="$refs.monitorSettingDialog.show(group, monitor)" + data-testid="monitor-setting" />
diff --git a/src/lang/en.json b/src/lang/en.json index e215f1031..b0f801db7 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -1051,5 +1051,7 @@ "RabbitMQ Password": "RabbitMQ Password", "rabbitmqHelpText": "To use the monitor, you will need to enable the Management Plugin in your RabbitMQ setup. For more information, please consult the {rabitmq_documentation}.", "SendGrid API Key": "SendGrid API Key", - "Separate multiple email addresses with commas": "Separate multiple email addresses with commas" + "Separate multiple email addresses with commas": "Separate multiple email addresses with commas", + "Public URL": "Public URL", + "publicUrlDescription": "The public URL of the monitor. Can be displayed on the status page as the monitor link." } diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index a83f91cab..d656c95ac 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -719,6 +719,16 @@ + +
+ + + +
+ {{ $t("publicUrlDescription") }} +
+
+
@@ -1727,6 +1737,10 @@ message HealthCheckResponse { this.monitor.url = this.monitor.url.trim(); } + if (this.monitor.publicUrl) { + this.monitor.publicUrl = this.monitor.publicUrl.trim(); + } + let createdNewParent = false; if (this.draftGroupName && this.monitor.parent === -1) { diff --git a/test/e2e/specs/status-page.spec.js b/test/e2e/specs/status-page.spec.js index f525dfc6f..18aadba52 100644 --- a/test/e2e/specs/status-page.spec.js +++ b/test/e2e/specs/status-page.spec.js @@ -12,6 +12,8 @@ test.describe("Status Page", () => { const monitorName = "Monitor for Status Page"; const tagName = "Client"; const tagValue = "Acme Inc"; + const monitorUrl = "https://www.example.com/status"; + const monitorPublicUrl = "https://www.example.com"; // Status Page const footerText = "This is footer text."; @@ -30,13 +32,14 @@ test.describe("Status Page", () => { await expect(page.getByTestId("monitor-type-select")).toBeVisible(); await page.getByTestId("monitor-type-select").selectOption("http"); await page.getByTestId("friendly-name-input").fill(monitorName); - await page.getByTestId("url-input").fill("https://www.example.com/"); + await page.getByTestId("url-input").fill(monitorUrl); await page.getByTestId("add-tag-button").click(); await page.getByTestId("tag-name-input").fill(tagName); await page.getByTestId("tag-value-input").fill(tagValue); await page.getByTestId("tag-color-select").click(); // Vue-Multiselect component await page.getByTestId("tag-color-select").getByRole("option", { name: "Orange" }).click(); await page.getByTestId("tag-submit-button").click(); + await page.getByTestId("public-url-input").fill(monitorPublicUrl); await page.getByTestId("save-button").click(); await page.waitForURL("/dashboard/*"); // wait for the monitor to be created @@ -79,6 +82,12 @@ test.describe("Status Page", () => { await page.getByTestId("monitor-select").getByRole("option", { name: monitorName }).click(); await expect(page.getByTestId("monitor")).toHaveCount(1); await expect(page.getByTestId("monitor-name")).toContainText(monitorName); + await expect(page.getByTestId("monitor-name")).not.toHaveAttribute("href"); + + // Set public url on + await page.getByTestId("monitor-settings").click(); + await page.getByTestId("show-clickable-link").check(); + await page.getByTestId("monitor-settings-close").click(); // Save the changes await screenshot(testInfo, page); @@ -94,6 +103,8 @@ test.describe("Status Page", () => { await expect(page.getByTestId("footer-text")).toContainText(footerText); await expect(page.getByTestId("powered-by")).toHaveCount(0); + await expect(page.getByTestId("monitor-name")).toHaveAttribute("href", monitorPublicUrl); + await expect(page.getByTestId("update-countdown-text")).toContainText("00:"); const updateCountdown = Number((await page.getByTestId("update-countdown-text").textContent()).match(/(\d+):(\d+)/)[2]); expect(updateCountdown).toBeGreaterThanOrEqual(refreshInterval); // cant be certain when the timer will start, so ensure it's within expected range From 69d1e332174d52b78650fa2bf06337d489165650 Mon Sep 17 00:00:00 2001 From: Ionys <9364594+Ionys320@users.noreply.github.com> Date: Fri, 13 Dec 2024 09:47:42 +0100 Subject: [PATCH 2/5] lint: Fix `data-testid` position --- src/components/MonitorSettingDialog.vue | 2 +- src/components/PublicGroupList.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MonitorSettingDialog.vue b/src/components/MonitorSettingDialog.vue index d0ff80b00..9e2b780b0 100644 --- a/src/components/MonitorSettingDialog.vue +++ b/src/components/MonitorSettingDialog.vue @@ -10,7 +10,7 @@
- + diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue index cc8e97a7b..6837245db 100644 --- a/src/components/PublicGroupList.vue +++ b/src/components/PublicGroupList.vue @@ -58,8 +58,8 @@ v-if="editMode" :class="{'link-active': true, 'btn-link': true}" icon="cog" class="action me-3" - @click="$refs.monitorSettingDialog.show(group, monitor)" data-testid="monitor-setting" + @click="$refs.monitorSettingDialog.show(group, monitor)" />
From c4cdd0f263ca3e5d8ccae2606a5b47ad9fb1dede Mon Sep 17 00:00:00 2001 From: Ionys <9364594+Ionys320@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:47:22 +0100 Subject: [PATCH 3/5] fix(SQL column): Correct the SQL column name to snake case --- ...55-add-public-url.js => 2024-12-13-1641-add-public-url.js} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename db/knex_migrations/{2024-12-12-2255-add-public-url.js => 2024-12-13-1641-add-public-url.js} (75%) diff --git a/db/knex_migrations/2024-12-12-2255-add-public-url.js b/db/knex_migrations/2024-12-13-1641-add-public-url.js similarity index 75% rename from db/knex_migrations/2024-12-12-2255-add-public-url.js rename to db/knex_migrations/2024-12-13-1641-add-public-url.js index 0cd97240d..7efe25108 100644 --- a/db/knex_migrations/2024-12-12-2255-add-public-url.js +++ b/db/knex_migrations/2024-12-13-1641-add-public-url.js @@ -2,12 +2,12 @@ exports.up = function (knex) { return knex.schema .alterTable("monitor", function (table) { - table.text("publicUrl", "text"); + table.text("public_url", "text"); }); }; exports.down = function (knex) { return knex.schema.alterTable("monitor", function (table) { - table.dropColumn("publicUrl"); + table.dropColumn("public_url"); }); }; From 9c0fb1ca366880b200ed36b30217cf59ecf84c78 Mon Sep 17 00:00:00 2001 From: Ionys <9364594+Ionys320@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:48:41 +0100 Subject: [PATCH 4/5] fix(E2E): Fix the `data-testid` of the monitor settings button --- src/components/PublicGroupList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue index 6837245db..8750ae148 100644 --- a/src/components/PublicGroupList.vue +++ b/src/components/PublicGroupList.vue @@ -58,7 +58,7 @@ v-if="editMode" :class="{'link-active': true, 'btn-link': true}" icon="cog" class="action me-3" - data-testid="monitor-setting" + data-testid="monitor-settings" @click="$refs.monitorSettingDialog.show(group, monitor)" /> From 393b18b2cdac127669f16226ff21ade71b05b846 Mon Sep 17 00:00:00 2001 From: Ionys <9364594+Ionys320@users.noreply.github.com> Date: Mon, 16 Dec 2024 18:30:27 +0100 Subject: [PATCH 5/5] Remove an oblivious comment Co-authored-by: Adam Stachowicz --- server/model/monitor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/model/monitor.js b/server/model/monitor.js index cb82bb85c..d8bc4c4cd 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -53,7 +53,7 @@ class Monitor extends BeanModel { }; if (this.sendUrl) { - obj.url = this.publicUrl ?? this.url; // Use publicUrl if available, otherwise use url + obj.url = this.publicUrl ?? this.url; } if (showTags) {