This commit is contained in:
2020-06-03 22:21:52 +00:00
parent 27cb582fb6
commit 3ed6a02e96
17 changed files with 34 additions and 22 deletions

View File

@@ -6,9 +6,6 @@ WIFI change 5g channel to 52,56,60 and 2g channel to 8
recheck before doing as it seems to vary, maybe someone else's is auto switching recheck before doing as it seems to vary, maybe someone else's is auto switching
todo: metrics page not localized "storage" etc
todo: metrics tables have no indexes?
but they need to fetch by date range so...not sure about that one
todo: remove search option from metrics / logs etc as it implies you can search those things and you can't todo: remove search option from metrics / logs etc as it implies you can search those things and you can't

View File

@@ -138,7 +138,7 @@ export default {
//SEARCH //SEARCH
//all forms except the search form //all forms except the search form
if (ctx.icon != "fa-search") { if (!ctx.hideSearch) {
//For all forms but not on the search form itself; if this is necessary for others then make a nosearch or something flag controlled by incoming ctx but if not then this should suffice //For all forms but not on the search form itself; if this is necessary for others then make a nosearch or something flag controlled by incoming ctx but if not then this should suffice
vm.appBar.menuItems.push({ vm.appBar.menuItems.push({
title: window.$gz.translation.get("Search"), title: window.$gz.translation.get("Search"),

View File

@@ -22,7 +22,8 @@ export default {
isMain: true, isMain: true,
icon: "fa-cogs", icon: "fa-cogs",
title: this.$ay.t("AdministrationGlobalSettings"), title: this.$ay.t("AdministrationGlobalSettings"),
helpUrl: "form-adm-global-settings" helpUrl: "form-adm-global-settings",
hideSearch: true
}); });
}, },
created() { created() {

View File

@@ -14,7 +14,8 @@ export default {
isMain: true, isMain: true,
icon: "fa-history", icon: "fa-history",
title: this.$ay.t("History"), title: this.$ay.t("History"),
helpUrl: "form-adm-history" helpUrl: "form-adm-history",
hideSearch: true
}); });
} }
}; };

View File

@@ -14,7 +14,8 @@ export default {
isMain: true, isMain: true,
icon: "fa-ticket-alt", icon: "fa-ticket-alt",
title: this.$ay.t("HelpLicense"), title: this.$ay.t("HelpLicense"),
helpUrl: "form-adm-license" helpUrl: "form-adm-license",
hideSearch: true
}); });
} }
}; };

View File

@@ -14,7 +14,8 @@ export default {
isMain: true, isMain: true,
icon: "fa-chart-line", icon: "fa-chart-line",
title: this.$ay.t("Statistics"), title: this.$ay.t("Statistics"),
helpUrl: "form-adm-statistics" helpUrl: "form-adm-statistics",
hideSearch: true
}); });
} }
}; };

View File

@@ -14,7 +14,8 @@ export default {
isMain: true, isMain: true,
icon: "fa-bullhorn", icon: "fa-bullhorn",
title: this.$ay.t("NotifySubscriptionList"), title: this.$ay.t("NotifySubscriptionList"),
helpUrl: "form-home-notify-subscriptions" helpUrl: "form-home-notify-subscriptions",
hideSearch: true
}); });
} }
}; };

View File

@@ -256,6 +256,7 @@ function generateMenu(vm) {
icon: "fa-key", icon: "fa-key",
title: vm.$ay.t("SetLoginPassword"), title: vm.$ay.t("SetLoginPassword"),
helpUrl: "form-home-password", helpUrl: "form-home-password",
hideSearch: true,
menuItems: [] menuItems: []
}; };

View File

@@ -347,6 +347,7 @@ function generateMenu(vm) {
icon: "fa-search", icon: "fa-search",
title: vm.$ay.t("Search"), title: vm.$ay.t("Search"),
helpUrl: "form-home-search", helpUrl: "form-home-search",
hideSearch: true,
formData: { formData: {
ayaType: window.$gz.type.UserOptions ayaType: window.$gz.type.UserOptions
}, },

View File

@@ -370,6 +370,7 @@ function generateMenu(vm) {
icon: "fa-user-cog", icon: "fa-user-cog",
title: vm.$ay.t("UserSettings"), title: vm.$ay.t("UserSettings"),
helpUrl: "form-home-user-settings", helpUrl: "form-home-user-settings",
hideSearch: true,
formData: { formData: {
ayaType: window.$gz.type.UserOptions ayaType: window.$gz.type.UserOptions
}, },

View File

@@ -369,6 +369,7 @@ function generateMenu(vm) {
icon: "fa-file-archive", icon: "fa-file-archive",
title: vm.$ay.t("Backup"), title: vm.$ay.t("Backup"),
helpUrl: "form-ops-backup", helpUrl: "form-ops-backup",
hideSearch: true,
formData: {}, formData: {},
menuItems: [] menuItems: []
}; };

View File

@@ -180,6 +180,7 @@ function generateMenu(vm) {
icon: "fa-robot", icon: "fa-robot",
title: vm.$ay.t("ServerJobs"), title: vm.$ay.t("ServerJobs"),
helpUrl: "form-ops-jobs", helpUrl: "form-ops-jobs",
hideSearch: true,
menuItems: [ menuItems: [
{ {
title: vm.$ay.t("Copy"), title: vm.$ay.t("Copy"),

View File

@@ -152,6 +152,7 @@ function generateMenu(vm) {
icon: "fa-history", icon: "fa-history",
title: vm.$ay.t("ServerLog"), title: vm.$ay.t("ServerLog"),
helpUrl: "form-ops-log", helpUrl: "form-ops-log",
hideSearch: true,
menuItems: [ menuItems: [
{ {
title: vm.$ay.t("Copy"), title: vm.$ay.t("Copy"),

View File

@@ -328,7 +328,7 @@ export default {
labels: window.$gz._.map(this.db.topTables, "name"), labels: window.$gz._.map(this.db.topTables, "name"),
datasets: [ datasets: [
{ {
label: this.$ay.t("MetricTopTablesSize"), label: this.$ay.t("MetricTopTablesSize"),
data: window.$gz._.map(this.db.topTables, "value"), data: window.$gz._.map(this.db.topTables, "value"),
backgroundColor: getPalette( backgroundColor: getPalette(
this.db.topTables ? this.db.topTables.length : 3 this.db.topTables ? this.db.topTables.length : 3
@@ -503,14 +503,15 @@ function generateMenu(vm) {
icon: "fa-file-medical-alt", icon: "fa-file-medical-alt",
title: vm.$ay.t("ServerMetrics"), title: vm.$ay.t("ServerMetrics"),
helpUrl: "form-ops-metrics", helpUrl: "form-ops-metrics",
hideSearch: true,
menuItems: [ menuItems: [
{ // {
title: vm.$ay.t("Copy"), // title: vm.$ay.t("Copy"),
icon: "fa-copy", // icon: "fa-copy",
surface: false, // surface: false,
key: FORM_KEY + ":copylog", // key: FORM_KEY + ":copylog",
vm: vm // vm: vm
} // }
] ]
}; };
@@ -527,10 +528,10 @@ function clickHandler(menuItem) {
let m = window.$gz.menu.parseMenuItem(menuItem); let m = window.$gz.menu.parseMenuItem(menuItem);
if (m.owner == FORM_KEY && !m.disabled) { if (m.owner == FORM_KEY && !m.disabled) {
switch (m.key) { switch (m.key) {
case "copylog": // case "copylog":
//put the log info on the clipboard: // //put the log info on the clipboard:
window.$gz.util.copyToClipboard("SERVER LOG\n" + m.vm.log); // window.$gz.util.copyToClipboard("SERVER LOG\n" + m.vm.log);
break; // break;
default: default:
window.$gz.eventBus.$emit( window.$gz.eventBus.$emit(
"notify-warning", "notify-warning",

View File

@@ -14,7 +14,8 @@ export default {
isMain: true, isMain: true,
icon: "fa-bullhorn", icon: "fa-bullhorn",
title: this.$ay.t("NotificationSettings"), title: this.$ay.t("NotificationSettings"),
helpUrl: "form-ops-notification-settings" helpUrl: "form-ops-notification-settings",
hideSearch: true
}); });
} }
}; };

View File

@@ -89,6 +89,7 @@ function generateMenu(vm) {
icon: "fa-binoculars", icon: "fa-binoculars",
title: vm.$ay.t("ServerProfiler"), title: vm.$ay.t("ServerProfiler"),
helpUrl: "form-ops-profile", helpUrl: "form-ops-profile",
hideSearch: true,
menuItems: [ menuItems: [
// { // {
// title: vm.$ay.t("Copy"), // title: vm.$ay.t("Copy"),

View File

@@ -254,6 +254,7 @@ function generateMenu(vm) {
icon: "fa-door-open", icon: "fa-door-open",
title: vm.$ay.t("ServerState"), title: vm.$ay.t("ServerState"),
helpUrl: "form-ops-server-state", helpUrl: "form-ops-server-state",
hideSearch: true,
formData: { formData: {
ayaType: window.$gz.type.UserOptions ayaType: window.$gz.type.UserOptions
}, },