chore: cleanup and refactoring

This commit is contained in:
hadestructhor
2025-02-18 00:45:53 +01:00
parent afae736972
commit e44ec55eda
9 changed files with 91 additions and 43 deletions
-1
View File
@@ -95,7 +95,6 @@ class Database {
"patch-maintenance-table2.sql": true,
"patch-add-gamedig-monitor.sql": true,
"patch-add-google-analytics-status-page-tag.sql": true,
"patch-add-umami-analytics-status-page.sql": true,
"patch-http-body-encoding.sql": true,
"patch-add-description-monitor.sql": true,
"patch-api-key-table.sql": true,
+10 -10
View File
@@ -121,13 +121,13 @@ class StatusPage extends BeanModel {
const head = $("head");
if (statusPage.googleAnalyticsTagId) {
let escapedGoogleAnalyticsScript = googleAnalytics.getGoogleAnalyticsScript(statusPage.googleAnalyticsTagId);
if (statusPage.analyticsType === "google" && statusPage.analyticsId) {
let escapedGoogleAnalyticsScript = googleAnalytics.getGoogleAnalyticsScript(statusPage.analyticsId);
head.append($(escapedGoogleAnalyticsScript));
}
if (statusPage.umamiAnalyticsDomainUrl && statusPage.umamiAnalyticsWebsiteId) {
let escapedUmamiAnalyticsScript = umamiAnalytics.getUmamiAnalyticsScript(statusPage.umamiAnalyticsDomainUrl, statusPage.umamiAnalyticsWebsiteId);
if (statusPage.analyticsType === "umami" && statusPage.analyticsDomainUrl && statusPage.analyticsId) {
let escapedUmamiAnalyticsScript = umamiAnalytics.getUmamiAnalyticsScript(statusPage.analyticsDomainUrl, statusPage.analyticsId);
head.append($(escapedUmamiAnalyticsScript));
}
@@ -413,9 +413,9 @@ class StatusPage extends BeanModel {
customCSS: this.custom_css,
footerText: this.footer_text,
showPoweredBy: !!this.show_powered_by,
googleAnalyticsId: this.google_analytics_tag_id,
umamiAnalyticsDomainUrl: this.umami_analytics_domain_url,
umamiAnalyticsWebsiteId: this.umami_analytics_website_id,
analyticsId: this.analytics_id,
analyticsDomainUrl: this.analytics_domain_url,
analyticsType: this.analytics_type,
showCertificateExpiry: !!this.show_certificate_expiry,
};
}
@@ -438,9 +438,9 @@ class StatusPage extends BeanModel {
customCSS: this.custom_css,
footerText: this.footer_text,
showPoweredBy: !!this.show_powered_by,
googleAnalyticsId: this.google_analytics_tag_id,
umamiAnalyticsDomainUrl: this.umami_analytics_domain_url,
umamiAnalyticsWebsiteId: this.umami_analytics_website_id,
analyticsId: this.analytics_id,
analyticsDomainUrl: this.analytics_domain_url,
analyticsType: this.analytics_type,
showCertificateExpiry: !!this.show_certificate_expiry,
};
}
@@ -166,9 +166,9 @@ module.exports.statusPageSocketHandler = (socket) => {
statusPage.show_powered_by = config.showPoweredBy;
statusPage.show_certificate_expiry = config.showCertificateExpiry;
statusPage.modified_date = R.isoDateTime();
statusPage.google_analytics_tag_id = config.googleAnalyticsId;
statusPage.umami_analytics_domain_url = config.umamiAnalyticsDomainUrl;
statusPage.umami_analytics_website_id = config.umamiAnalyticsWebsiteId;
statusPage.analytics_id = config.analyticsId;
statusPage.analytics_domain_url = config.analyticsDomainUrl;
statusPage.analytics_type = config.analyticsType;
await R.store(statusPage);