From 9af201924f21c9aa3b298290e4d202cc13ae2e0c Mon Sep 17 00:00:00 2001 From: Ryo Hanafusa Date: Sat, 26 Oct 2024 09:02:32 +0000 Subject: [PATCH 1/4] Use the element's value for initial value to keep the changes in the dialog --- src/components/MonitorSettingDialog.vue | 27 ++++++------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/src/components/MonitorSettingDialog.vue b/src/components/MonitorSettingDialog.vue index e6b2cd1ef..fef6b4f65 100644 --- a/src/components/MonitorSettingDialog.vue +++ b/src/components/MonitorSettingDialog.vue @@ -10,7 +10,7 @@
- + @@ -54,6 +54,9 @@ export default { monitor: { id: null, name: null, + monitor_index: null, + group_index: null, + isClickable: null, }, }; }, @@ -77,7 +80,7 @@ export default { name: monitor.element.name, monitor_index: monitor.index, group_index: group.index, - isClickAble: this.showLink(monitor), + isClickable: monitor.element.sendUrl, }; this.MonitorSettingDialog.show(); @@ -90,25 +93,7 @@ export default { * @returns {void} */ toggleLink(groupIndex, index) { - this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl = !this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl; - }, - - /** - * Should a link to the monitor be shown? - * Attempts to guess if a link should be shown based upon if - * sendUrl is set and if the URL is default or not. - * @param {object} monitor Monitor to check - * @param {boolean} ignoreSendUrl Should the presence of the sendUrl - * property be ignored. This will only work in edit mode. - * @returns {boolean} Should the link be shown? - */ - showLink(monitor, ignoreSendUrl = false) { - // We must check if there are any elements in monitorList to - // prevent undefined errors if it hasn't been loaded yet - if (this.$parent.editMode && ignoreSendUrl && Object.keys(this.$root.monitorList).length) { - return this.$root.monitorList[monitor.element.id].type === "http" || this.$root.monitorList[monitor.element.id].type === "keyword" || this.$root.monitorList[monitor.element.id].type === "json-query"; - } - return monitor.element.sendUrl && monitor.element.url && monitor.element.url !== "https://" && !this.editMode; + this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl = this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl ? 0 : 1; }, }, }; From 2fb3638bd70fc2ac34b2276eb2c47d59b9badc75 Mon Sep 17 00:00:00 2001 From: Ryo Hanafusa Date: Sun, 27 Oct 2024 08:18:46 +0000 Subject: [PATCH 2/4] convert `sendUrl` number -> boolean in toPublicJSON --- server/model/monitor.js | 2 +- src/components/MonitorSettingDialog.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/model/monitor.js b/server/model/monitor.js index 9a30a6689..8c39469a5 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -48,7 +48,7 @@ class Monitor extends BeanModel { let obj = { id: this.id, name: this.name, - sendUrl: this.sendUrl, + sendUrl: !!this.sendUrl, type: this.type, }; diff --git a/src/components/MonitorSettingDialog.vue b/src/components/MonitorSettingDialog.vue index fef6b4f65..2e921b5e3 100644 --- a/src/components/MonitorSettingDialog.vue +++ b/src/components/MonitorSettingDialog.vue @@ -10,7 +10,7 @@
- + @@ -93,7 +93,7 @@ export default { * @returns {void} */ toggleLink(groupIndex, index) { - this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl = this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl ? 0 : 1; + this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl = !this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl; }, }, }; From d3c3808daec62c15aa39d8a943d47c38e8d9b9f5 Mon Sep 17 00:00:00 2001 From: Ryo Hanafusa Date: Mon, 28 Oct 2024 11:33:02 +0000 Subject: [PATCH 3/4] revert showLink without the unused if-statement surrounding ignoreSendUrl --- src/components/MonitorSettingDialog.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/components/MonitorSettingDialog.vue b/src/components/MonitorSettingDialog.vue index 2e921b5e3..d62003a89 100644 --- a/src/components/MonitorSettingDialog.vue +++ b/src/components/MonitorSettingDialog.vue @@ -80,7 +80,7 @@ export default { name: monitor.element.name, monitor_index: monitor.index, group_index: group.index, - isClickable: monitor.element.sendUrl, + isClickable: this.showLink(monitor), }; this.MonitorSettingDialog.show(); @@ -95,6 +95,17 @@ export default { toggleLink(groupIndex, index) { this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl = !this.$root.publicGroupList[groupIndex].monitorList[index].sendUrl; }, + + /** + * Should a link to the monitor be shown? + * Attempts to guess if a link should be shown based upon if + * sendUrl is set and if the URL is default or not. + * @param {object} monitor Monitor to check + * @returns {boolean} Should the link be shown? + */ + showLink(monitor) { + return monitor.element.sendUrl && monitor.element.url && monitor.element.url !== "https://"; + }, }, }; From 061b549d16a02ff7213f482c2a4366f9776e0c2a Mon Sep 17 00:00:00 2001 From: Ryo Hanafusa Date: Mon, 28 Oct 2024 11:33:40 +0000 Subject: [PATCH 4/4] send url always because it's used in showLink --- server/model/monitor.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/model/monitor.js b/server/model/monitor.js index 8c39469a5..c5d2dc701 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -49,13 +49,10 @@ class Monitor extends BeanModel { id: this.id, name: this.name, sendUrl: !!this.sendUrl, + url: this.url, type: this.type, }; - if (this.sendUrl) { - obj.url = this.url; - } - if (showTags) { obj.tags = await this.getTags(); }