diff --git a/src/components/AlertsIcon.vue b/src/components/AlertsIcon.vue
index 5375ee7..253ec8c 100644
--- a/src/components/AlertsIcon.vue
+++ b/src/components/AlertsIcon.vue
@@ -1,48 +1,44 @@
-
- {{ test_alerts.length }}
-
+ {{ test_alerts.length }}
{{ alert.client }} - {{ alert.hostname }}
-
- {{ alert.message }}
+
+ {{ alert.message }}
+
{{ alert.timestamp }}
-
- View All Alerts ({{test_alerts.length}})
-
+ View All Alerts ({{test_alerts.length}})
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/components/AutomatedTasksTab.vue b/src/components/AutomatedTasksTab.vue
index 5e3529e..eba23bd 100644
--- a/src/components/AutomatedTasksTab.vue
+++ b/src/components/AutomatedTasksTab.vue
@@ -3,7 +3,14 @@
No Tasks
-
+
No Tasks
@@ -184,10 +191,7 @@ export default {
axios
.delete(`/automation/${pk}/automatedtasks/`)
.then(r => {
- this.$store.dispatch(
- "loadAutomatedTasks",
- this.automatedTasks.pk
- );
+ this.$store.dispatch("loadAutomatedTasks", this.automatedTasks.pk);
this.$store.dispatch("loadChecks", this.automatedTasks.pk);
this.notifySuccess(r.data);
})
diff --git a/src/components/ChecksTab.vue b/src/components/ChecksTab.vue
index 19af94e..73e7fb3 100644
--- a/src/components/ChecksTab.vue
+++ b/src/components/ChecksTab.vue
@@ -313,7 +313,7 @@ export default {
field: "last_run",
align: "left"
},
- { name: "assignedtasks", label: "Assigned Tasks", field: "assigned_task", align: "left" },
+ { name: "assignedtasks", label: "Assigned Tasks", field: "assigned_task", align: "left" }
],
pagination: {
rowsPerPage: 9999
diff --git a/src/components/ProcessManager.vue b/src/components/ProcessManager.vue
index 082f09d..3fb2668 100644
--- a/src/components/ProcessManager.vue
+++ b/src/components/ProcessManager.vue
@@ -161,15 +161,11 @@ export default {
},
startPoll() {
this.poll = true;
- axios
- .get(`/agents/${this.pk}/getprocs/`)
- .then(r => (this.procs = r.data));
+ axios.get(`/agents/${this.pk}/getprocs/`).then(r => (this.procs = r.data));
this.refreshProcs();
},
getAgent() {
- axios
- .get(`/agents/${this.pk}/agentdetail/`)
- .then(r => (this.mem = r.data.total_ram));
+ axios.get(`/agents/${this.pk}/agentdetail/`).then(r => (this.mem = r.data.total_ram));
},
convert(percent) {
const mb = this.mem * 1024;
diff --git a/src/components/ScriptManager.vue b/src/components/ScriptManager.vue
index 69aaf0d..947f96c 100644
--- a/src/components/ScriptManager.vue
+++ b/src/components/ScriptManager.vue
@@ -207,15 +207,16 @@ export default {
});
},
downloadScript() {
- axios.get(`/checks/downloadscript/${this.selectedRow}/`, { responseType: 'blob' })
+ axios
+ .get(`/checks/downloadscript/${this.selectedRow}/`, { responseType: "blob" })
.then(({ data }) => {
- const blob = new Blob([data], { type: 'text/plain' })
- let link = document.createElement('a')
- link.href = window.URL.createObjectURL(blob)
- link.download = this.filename
- link.click()
+ const blob = new Blob([data], { type: "text/plain" });
+ let link = document.createElement("a");
+ link.href = window.URL.createObjectURL(blob);
+ link.download = this.filename;
+ link.click();
})
- .catch(error => console.error(error))
+ .catch(error => console.error(error));
}
},
computed: {
diff --git a/src/components/Services.vue b/src/components/Services.vue
index 2a20e1d..ec9a4c6 100644
--- a/src/components/Services.vue
+++ b/src/components/Services.vue
@@ -12,37 +12,18 @@
hide-bottom
>
-
+
-
+
-
+
-
+
Restart
-
+
Service Details
-
+
{{ props.row.display_name }}
- {{ props.row.start_type }}
- {{ props.row.pid }}
- {{ props.row.status }}
- {{ props.row.username }}
+ {{ props.row.start_type }}
+ {{ props.row.pid }}
+ {{ props.row.status }}
+ {{ props.row.username }}
@@ -121,10 +83,7 @@
Description:
- {{ serviceData.Description }}
+ {{ serviceData.Description }}
@@ -186,10 +145,7 @@
-
+
-
+
@@ -218,7 +169,7 @@ export default {
name: "Services",
props: ["pk"],
mixins: [mixins],
- data () {
+ data() {
return {
servicesData: [],
serviceDetailsModal: false,
@@ -226,12 +177,7 @@ export default {
saveServiceDetailButton: true,
serviceData: {},
startupType: "",
- startupOptions: [
- "Automatic (Delayed Start)",
- "Automatic",
- "Manual",
- "Disabled"
- ],
+ startupOptions: ["Automatic (Delayed Start)", "Automatic", "Manual", "Disabled"],
filter: "",
pagination: {
rowsPerPage: 9999,
@@ -278,7 +224,7 @@ export default {
};
},
methods: {
- changeStartupType (startuptype, name) {
+ changeStartupType(startuptype, name) {
let changed;
switch (startuptype) {
case "Automatic (Delayed Start)":
@@ -315,10 +261,10 @@ export default {
this.notifyError(err.response.data.error);
});
},
- startupTypeChanged () {
+ startupTypeChanged() {
this.saveServiceDetailButton = false;
},
- editService (name) {
+ editService(name) {
this.saveServiceDetailButton = true;
this.serviceDetailsModal = true;
this.serviceDetailVisible = true;
@@ -328,15 +274,9 @@ export default {
this.serviceData = r.data;
this.serviceData.svc_name = name;
this.startupType = this.serviceData.StartType;
- if (
- this.serviceData.StartType === "Auto" &&
- this.serviceData.StartTypeDelayed === true
- ) {
+ if (this.serviceData.StartType === "Auto" && this.serviceData.StartTypeDelayed === true) {
this.startupType = "Automatic (Delayed Start)";
- } else if (
- this.serviceData.StartType === "Auto" &&
- this.serviceData.StartTypeDelayed === false
- ) {
+ } else if (this.serviceData.StartType === "Auto" && this.serviceData.StartTypeDelayed === false) {
this.startupType = "Automatic";
}
this.serviceDetailVisible = false;
@@ -347,7 +287,7 @@ export default {
this.notifyError(err.response.data.error);
});
},
- serviceAction (name, action, fullname) {
+ serviceAction(name, action, fullname) {
let msg, status;
switch (action) {
case "start":
@@ -383,15 +323,15 @@ export default {
this.notifyError(err.response.data.error);
});
},
- async getServices () {
+ async getServices() {
try {
let r = await axios.get(`/services/${this.pk}/services/`);
this.servicesData = [r.data][0].services;
} catch (e) {
- console.log(`ERROR!: ${e}`)
+ console.log(`ERROR!: ${e}`);
}
},
- refreshServices () {
+ refreshServices() {
this.$q.loading.show({ message: "Reloading services..." });
axios
.get(`/services/${this.pk}/refreshedservices/`)
@@ -405,7 +345,7 @@ export default {
});
}
},
- created () {
+ created() {
this.getServices();
}
};
diff --git a/src/components/SubTableTabs.vue b/src/components/SubTableTabs.vue
index 306f3de..60ce5d3 100644
--- a/src/components/SubTableTabs.vue
+++ b/src/components/SubTableTabs.vue
@@ -1,62 +1,62 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/SummaryTab.vue b/src/components/SummaryTab.vue
index 54c73e3..c8752d5 100644
--- a/src/components/SummaryTab.vue
+++ b/src/components/SummaryTab.vue
@@ -30,10 +30,7 @@
-
+
@@ -57,10 +54,7 @@
Disks
-
+
{{ disk.device }} ({{ disk.fstype }})
export default {
name: "SummaryTab",
- data () {
+ data() {
return {};
},
- methods: {
- },
+ methods: {},
computed: {
- summary () {
+ summary() {
return this.$store.state.agentSummary;
},
- disks () {
+ disks() {
const entries = Object.entries(this.summary.disks);
const ret = [];
for (let [k, v] of entries) {
diff --git a/src/components/WindowsUpdates.vue b/src/components/WindowsUpdates.vue
index 83deeef..e8cf294 100644
--- a/src/components/WindowsUpdates.vue
+++ b/src/components/WindowsUpdates.vue
@@ -1,6 +1,8 @@
No agent selected
- Patch management is not available for this agent because it is managed by WSUS
+ Patch management is not available for this agent because it is managed by WSUS
No Patches
@@ -22,16 +24,36 @@
-
+
Inherit
-
+
Approve
-
+
Ignore
-
+
Do Nothing
@@ -47,15 +69,27 @@
Ignore
-
+
Inherit
- Installed
- Pending
- Ignored
- Missing
+
+ Installed
+
+
+ Pending
+
+
+ Ignored
+
+
+ Missing
+
{{ props.row.severity }}
{{ formatMessage(props.row.title) }}
@@ -129,14 +163,7 @@ export default {
sortable: true
}
],
- visibleColumns: [
- "action",
- "installed",
- "severity",
- "title",
- "description",
- "date_installed",
- ]
+ visibleColumns: ["action", "installed", "severity", "title", "description", "date_installed"]
};
},
methods: {
diff --git a/src/components/automation/AutomationManager.vue b/src/components/automation/AutomationManager.vue
index 3081506..82f24d6 100644
--- a/src/components/automation/AutomationManager.vue
+++ b/src/components/automation/AutomationManager.vue
@@ -2,7 +2,15 @@
- Automation Manager
+ Automation Manager
Close
@@ -74,17 +82,11 @@
>
-
- {{ col.label }}
-
+ {{ col.label }}
-
+
{{ props.row.name }}
{{ props.row.desc }}
{{ props.row.active }}
@@ -111,16 +113,16 @@
diff --git a/src/components/automation/modals/PolicyForm.vue b/src/components/automation/modals/PolicyForm.vue
index b7273b6..c5ea762 100644
--- a/src/components/automation/modals/PolicyForm.vue
+++ b/src/components/automation/modals/PolicyForm.vue
@@ -27,18 +27,10 @@
Clients:
-
+
-
- No Results
-
+ No Results
@@ -47,18 +39,10 @@
Sites:
-
+
-
- No Results
-
+ No Results
@@ -67,18 +51,10 @@
Agents:
-
+
-
- No Results
-
+ No Results
@@ -98,8 +74,8 @@ import dropdown_formatter from "@/mixins/dropdown_formatter";
export default {
name: "PolicyForm",
mixins: [mixins, dropdown_formatter],
- props: {"pk": Number},
- data () {
+ props: { pk: Number },
+ data() {
return {
name: "",
desc: "",
@@ -109,18 +85,17 @@ export default {
selectedClients: [],
clientOptions: [],
siteOptions: [],
- agentOptions: [],
+ agentOptions: []
};
},
computed: {
- title () {
- return (this.pk) ? "Edit Policy" : "Add Policy";
+ title() {
+ return this.pk ? "Edit Policy" : "Add Policy";
}
},
methods: {
- getPolicy () {
+ getPolicy() {
this.$store.dispatch("automation/loadPolicy", this.pk).then(r => {
-
this.name = r.data.name;
this.desc = r.data.desc;
this.active = r.data.active;
@@ -144,7 +119,7 @@ export default {
});
});
},
- submit () {
+ submit() {
if (!this.name) {
this.notifyError("Name is required!");
return false;
@@ -160,9 +135,10 @@ export default {
sites: this.selectedSites.map(site => site.value),
clients: this.selectedClients.map(client => client.value)
};
-
+
if (this.pk) {
- this.$store.dispatch("automation/editPolicy", this.pk, formData)
+ this.$store
+ .dispatch("automation/editPolicy", this.pk, formData)
.then(r => {
this.$q.loading.hide();
this.$emit("close");
@@ -173,10 +149,9 @@ export default {
this.$q.loading.hide();
this.notifyError(e.response.data);
});
-
} else {
-
- this.$store.dispatch("automation/addPolicy", formData)
+ this.$store
+ .dispatch("automation/addPolicy", formData)
.then(r => {
this.$q.loading.hide();
this.$emit("close");
@@ -187,11 +162,11 @@ export default {
this.$q.loading.hide();
this.notifyError(e.response.data);
});
-
}
},
- getClients () {
- this.$store.dispatch("loadClients")
+ getClients() {
+ this.$store
+ .dispatch("loadClients")
.then(r => {
this.clientOptions = this.formatClient(r.data);
})
@@ -200,8 +175,9 @@ export default {
this.notifyError(e.response.data);
});
},
- getSites () {
- this.$store.dispatch("loadSites")
+ getSites() {
+ this.$store
+ .dispatch("loadSites")
.then(r => {
this.siteOptions = this.formatSites(r.data);
})
@@ -210,18 +186,19 @@ export default {
this.notifyError(e.response.data);
});
},
- getAgents () {
- this.$store.dispatch("loadAgents")
+ getAgents() {
+ this.$store
+ .dispatch("loadAgents")
.then(r => {
- this.agentOptions = this.formatAgents(r.data)
+ this.agentOptions = this.formatAgents(r.data);
})
.catch(e => {
this.$q.loading.hide();
this.notifyError(e.response.data);
});
- },
+ }
},
- mounted () {
+ mounted() {
//If pk prop is set that means we are editting
if (this.pk) {
this.getPolicy();
diff --git a/src/components/modals/agents/EditAgent.vue b/src/components/modals/agents/EditAgent.vue
index 75ab1b7..8d2b96e 100644
--- a/src/components/modals/agents/EditAgent.vue
+++ b/src/components/modals/agents/EditAgent.vue
@@ -1,24 +1,10 @@
-
+
-
-
-
+
+
+
@@ -26,18 +12,9 @@
Edit {{ agent.hostname }}
-
+
-
+
Site:
-
+
Type:
@@ -124,14 +95,8 @@
/>
-
-
+
+
@@ -317,15 +282,8 @@
-
-
+
+
@@ -341,7 +299,7 @@ import { scheduledTimes } from "@/mixins/data";
export default {
name: "EditAgent",
mixins: [mixins],
- data () {
+ data() {
return {
agentLoaded: false,
clientsLoaded: false,
@@ -366,19 +324,19 @@ export default {
};
},
methods: {
- getAgentInfo () {
+ getAgentInfo() {
axios.get(`/agents/${this.selectedAgentPk}/agentdetail/`).then(r => {
this.agent = r.data;
this.agentLoaded = true;
});
},
- getClientsSites () {
+ getClientsSites() {
axios.get("/clients/loadclients/").then(r => {
this.tree = r.data;
this.clientsLoaded = true;
});
},
- editAgent () {
+ editAgent() {
let data = this.agent;
delete data.services;
delete data.disks;
@@ -396,13 +354,13 @@ export default {
},
computed: {
...mapGetters(["selectedAgentPk"]),
- sites () {
+ sites() {
if (this.agentLoaded && this.clientsLoaded) {
return this.tree[this.agent.client];
}
}
},
- created () {
+ created() {
this.getAgentInfo();
this.getClientsSites();
}
diff --git a/src/components/modals/agents/UpdateAgents.vue b/src/components/modals/agents/UpdateAgents.vue
index 49e815d..14fb3d2 100644
--- a/src/components/modals/agents/UpdateAgents.vue
+++ b/src/components/modals/agents/UpdateAgents.vue
@@ -10,37 +10,18 @@
Select Version
-
+
Select Agent
-
+
-
+
-
+
diff --git a/src/components/modals/alerts/AlertsOverview.vue b/src/components/modals/alerts/AlertsOverview.vue
index 2eda780..db9d3ba 100644
--- a/src/components/modals/alerts/AlertsOverview.vue
+++ b/src/components/modals/alerts/AlertsOverview.vue
@@ -8,14 +8,9 @@
+ All Alerts
- All Alerts
-
-
-
+
@@ -29,7 +24,7 @@ export default {
mixins: [mixins],
data() {
return {
- alerts: [],
+ alerts: []
};
},
methods: {
@@ -38,17 +33,15 @@ export default {
axios
.get("/alerts/")
.then(r => {
- this.alerts = r.data.alerts
+ this.alerts = r.data.alerts;
})
.catch(() => {
this.$q.loading.hide();
this.notifyError("Something went wrong");
});
- },
- },
- computed: {
-
+ }
},
+ computed: {},
created() {
this.getAlerts();
}
diff --git a/src/components/modals/automation/AddAutomatedTask.vue b/src/components/modals/automation/AddAutomatedTask.vue
index fe46684..45b02db 100644
--- a/src/components/modals/automation/AddAutomatedTask.vue
+++ b/src/components/modals/automation/AddAutomatedTask.vue
@@ -185,21 +185,13 @@ export default {
return r;
},
step1Done() {
- return this.step > 1 && this.scriptPk !== null && this.taskName !== null
- ? true
- : false;
+ return this.step > 1 && this.scriptPk !== null && this.taskName !== null ? true : false;
},
step2Done() {
if (this.trigger === "daily") {
- return this.days !== null &&
- this.days.length !== 0 &&
- this.time !== null
- ? true
- : false;
+ return this.days !== null && this.days.length !== 0 && this.time !== null ? true : false;
} else if (this.trigger === "checkfailure") {
- return this.assignedCheck !== null && this.assignedCheck.length !== 0
- ? true
- : false;
+ return this.assignedCheck !== null && this.assignedCheck.length !== 0 ? true : false;
} else if (this.trigger === "manual") {
return true;
} else {
diff --git a/src/components/modals/checks/AddCpuLoadCheck.vue b/src/components/modals/checks/AddCpuLoadCheck.vue
index 9fb713d..49d5063 100644
--- a/src/components/modals/checks/AddCpuLoadCheck.vue
+++ b/src/components/modals/checks/AddCpuLoadCheck.vue
@@ -53,7 +53,7 @@ export default {
},
methods: {
addCheck() {
- const pk = (this.policypk) ? {policy: this.policypk} : {pk: this.agentpk}
+ const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
const data = {
...pk,
diff --git a/src/components/modals/checks/AddDiskSpaceCheck.vue b/src/components/modals/checks/AddDiskSpaceCheck.vue
index 377101d..aaeb919 100644
--- a/src/components/modals/checks/AddDiskSpaceCheck.vue
+++ b/src/components/modals/checks/AddDiskSpaceCheck.vue
@@ -3,23 +3,12 @@
Add Disk Space Check
-
+
-
+
-
-
+
+
@@ -87,10 +69,9 @@ export default {
this.firstdisk = Object.keys(r.data)[0];
});
}
-
},
addCheck() {
- const pk = (this.policypk) ? { policy: this.policypk } : { pk: this.agentpk }
+ const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
const data = {
...pk,
check_type: "diskspace",
diff --git a/src/components/modals/checks/AddMemCheck.vue b/src/components/modals/checks/AddMemCheck.vue
index 452ec57..da2757b 100644
--- a/src/components/modals/checks/AddMemCheck.vue
+++ b/src/components/modals/checks/AddMemCheck.vue
@@ -53,7 +53,7 @@ export default {
},
methods: {
addCheck() {
- const pk = (this.policypk) ? {policy: this.policypk} : {pk: this.agentpk}
+ const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
const data = {
...pk,
diff --git a/src/components/modals/checks/AddPingCheck.vue b/src/components/modals/checks/AddPingCheck.vue
index 7e50f68..77be38d 100644
--- a/src/components/modals/checks/AddPingCheck.vue
+++ b/src/components/modals/checks/AddPingCheck.vue
@@ -57,17 +57,18 @@ export default {
},
methods: {
addCheck() {
- let pk = (this.policypk) ? {policy: this.policypk} : {pk: this.agentpk}
+ let pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
const data = {
...pk,
check_type: "ping",
failures: this.failure,
name: this.pingname,
- ip: this.pingip,
+ ip: this.pingip
};
- axios.post("/checks/addstandardcheck/", data)
+ axios
+ .post("/checks/addstandardcheck/", data)
.then(r => {
this.$emit("close");
diff --git a/src/components/modals/checks/AddScriptCheck.vue b/src/components/modals/checks/AddScriptCheck.vue
index ffc86ef..2dd84af 100644
--- a/src/components/modals/checks/AddScriptCheck.vue
+++ b/src/components/modals/checks/AddScriptCheck.vue
@@ -80,7 +80,7 @@ export default {
this.$store.dispatch("getScripts");
},
addScriptCheck() {
- const pk = (this.policypk) ? {policy: this.policypk} : {pk: this.agentpk}
+ const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
const data = {
...pk,
@@ -99,7 +99,7 @@ export default {
} else {
this.$store.dispatch("loadChecks", this.agentpk);
}
-
+
this.notifySuccess(r.data);
})
.catch(e => this.notifyError(e.response.data));
diff --git a/src/components/modals/checks/AddWinSvcCheck.vue b/src/components/modals/checks/AddWinSvcCheck.vue
index c3e122b..8a167db 100644
--- a/src/components/modals/checks/AddWinSvcCheck.vue
+++ b/src/components/modals/checks/AddWinSvcCheck.vue
@@ -3,13 +3,7 @@
Add Windows Service Check
-
+
@@ -67,10 +61,7 @@
v-model="passIfStartPending"
label="PASS if service is in 'Start Pending' mode"
/>
-
+
-
-
+
+
@@ -136,31 +120,35 @@ export default {
}
},
getRawName() {
- let svc = this.servicesData.find(
- k => k.display_name === this.displayName
- );
+ let svc = this.servicesData.find(k => k.display_name === this.displayName);
this.rawName = [svc].map(j => j.name);
},
addCheck() {
- const pk = (this.policypk) ? { policy: this.policypk } : { pk: this.agentpk }
+ const pk = this.policypk ? { policy: this.policypk } : { pk: this.agentpk };
let rawname, displayname;
if (this.policypk) {
// policy
- if (this.serviceType === 'svcdefault') {
- rawname = { rawname: this.rawName[0] }
- displayname = { displayname: this.displayName }
- if (this.rawName.length === 0) { this.notifyError("Please select a service"); return; }
- } else if (this.serviceType === 'svcmanual') {
- rawname = { rawname: this.manualServiceName }
- displayname = { displayname: this.manualSvcDisplayName }
- if (!this.manualServiceName || !this.manualSvcDisplayName) { this.notifyError("All fields required"); return; }
+ if (this.serviceType === "svcdefault") {
+ rawname = { rawname: this.rawName[0] };
+ displayname = { displayname: this.displayName };
+ if (this.rawName.length === 0) {
+ this.notifyError("Please select a service");
+ return;
+ }
+ } else if (this.serviceType === "svcmanual") {
+ rawname = { rawname: this.manualServiceName };
+ displayname = { displayname: this.manualSvcDisplayName };
+ if (!this.manualServiceName || !this.manualSvcDisplayName) {
+ this.notifyError("All fields required");
+ return;
+ }
}
} else {
// agent
- rawname = { rawname: this.rawName[0] }
- displayname = { displayname: this.displayName }
+ rawname = { rawname: this.rawName[0] };
+ displayname = { displayname: this.displayName };
}
const data = {
diff --git a/src/components/modals/checks/EditCpuLoadCheck.vue b/src/components/modals/checks/EditCpuLoadCheck.vue
index 901c798..055e5b3 100644
--- a/src/components/modals/checks/EditCpuLoadCheck.vue
+++ b/src/components/modals/checks/EditCpuLoadCheck.vue
@@ -53,12 +53,10 @@ export default {
},
methods: {
getCheck() {
- axios
- .get(`/checks/getstandardcheck/cpuload/${this.editCheckPK}/`)
- .then(r => {
- this.threshold = r.data.cpuload;
- this.failure = r.data.failures;
- });
+ axios.get(`/checks/getstandardcheck/cpuload/${this.editCheckPK}/`).then(r => {
+ this.threshold = r.data.cpuload;
+ this.failure = r.data.failures;
+ });
},
editCheck() {
const data = {
@@ -77,7 +75,7 @@ export default {
} else {
this.$store.dispatch("loadChecks", this.agentpk);
}
-
+
this.notifySuccess("CPU load check was edited!");
})
.catch(e => this.notifyError(e.response.data.error));
diff --git a/src/components/modals/checks/EditDiskSpaceCheck.vue b/src/components/modals/checks/EditDiskSpaceCheck.vue
index 5a812bc..d4fc336 100644
--- a/src/components/modals/checks/EditDiskSpaceCheck.vue
+++ b/src/components/modals/checks/EditDiskSpaceCheck.vue
@@ -57,14 +57,12 @@ export default {
},
methods: {
getCheck() {
- axios
- .get(`/checks/getstandardcheck/diskspace/${this.editCheckPK}/`)
- .then(r => {
- this.disks = [r.data.disk];
- this.diskToEdit = r.data.disk;
- this.threshold = r.data.threshold;
- this.failure = r.data.failures;
- });
+ axios.get(`/checks/getstandardcheck/diskspace/${this.editCheckPK}/`).then(r => {
+ this.disks = [r.data.disk];
+ this.diskToEdit = r.data.disk;
+ this.threshold = r.data.threshold;
+ this.failure = r.data.failures;
+ });
},
editCheck() {
const data = {
diff --git a/src/components/modals/checks/EditMemCheck.vue b/src/components/modals/checks/EditMemCheck.vue
index f79b15a..6f2fcc9 100644
--- a/src/components/modals/checks/EditMemCheck.vue
+++ b/src/components/modals/checks/EditMemCheck.vue
@@ -75,7 +75,7 @@ export default {
} else {
this.$store.dispatch("loadChecks", this.agentpk);
}
-
+
this.notifySuccess("Memory check was edited!");
})
.catch(e => this.notifyError(e.response.data.error));
diff --git a/src/components/modals/checks/EditPingCheck.vue b/src/components/modals/checks/EditPingCheck.vue
index 81a0f7f..b16f5dd 100644
--- a/src/components/modals/checks/EditPingCheck.vue
+++ b/src/components/modals/checks/EditPingCheck.vue
@@ -57,13 +57,11 @@ export default {
},
methods: {
getCheck() {
- axios
- .get(`/checks/getstandardcheck/ping/${this.editCheckPK}/`)
- .then(r => {
- this.failure = r.data.failures;
- this.pingname = r.data.name;
- this.pingip = r.data.ip;
- });
+ axios.get(`/checks/getstandardcheck/ping/${this.editCheckPK}/`).then(r => {
+ this.failure = r.data.failures;
+ this.pingname = r.data.name;
+ this.pingip = r.data.ip;
+ });
},
editCheck() {
const data = {
@@ -83,7 +81,7 @@ export default {
} else {
this.$store.dispatch("loadChecks", this.agentpk);
}
-
+
this.notifySuccess("Ping check was edited!");
})
.catch(e => this.notifyError(e.response.data.error));
diff --git a/src/components/modals/checks/EditScriptCheck.vue b/src/components/modals/checks/EditScriptCheck.vue
index 00f12ce..f651e50 100644
--- a/src/components/modals/checks/EditScriptCheck.vue
+++ b/src/components/modals/checks/EditScriptCheck.vue
@@ -57,13 +57,11 @@ export default {
},
methods: {
getScriptCheck() {
- axios
- .get(`/checks/getstandardcheck/script/${this.editCheckPK}/`)
- .then(r => {
- this.failure = r.data.failures;
- this.timeout = r.data.timeout;
- this.scriptName = r.data.script.name;
- });
+ axios.get(`/checks/getstandardcheck/script/${this.editCheckPK}/`).then(r => {
+ this.failure = r.data.failures;
+ this.timeout = r.data.timeout;
+ this.scriptName = r.data.script.name;
+ });
},
editScriptCheck() {
const data = {
@@ -82,7 +80,7 @@ export default {
} else {
this.$store.dispatch("loadChecks", this.agentpk);
}
-
+
this.notifySuccess(r.data);
})
.catch(e => this.notifyError(e.response.data.error));
diff --git a/src/components/modals/checks/EditWinSvcCheck.vue b/src/components/modals/checks/EditWinSvcCheck.vue
index d93bf44..3efb0bb 100644
--- a/src/components/modals/checks/EditWinSvcCheck.vue
+++ b/src/components/modals/checks/EditWinSvcCheck.vue
@@ -7,13 +7,21 @@
-
-
-
+
-
+
@@ -82,7 +90,7 @@ export default {
} else {
this.$store.dispatch("loadChecks", this.agentpk);
}
-
+
this.notifySuccess("Windows service check was edited!");
})
.catch(e => this.notifyError(e.response.data.error));
@@ -90,6 +98,6 @@ export default {
},
mounted() {
this.getService();
- },
+ }
};
\ No newline at end of file
diff --git a/src/components/modals/logs/LogModal.vue b/src/components/modals/logs/LogModal.vue
index 8fc29c5..79c76c7 100644
--- a/src/components/modals/logs/LogModal.vue
+++ b/src/components/modals/logs/LogModal.vue
@@ -10,49 +10,40 @@
>
-
- Debug Log
+ Debug Log
-
+
Close
-
+
-
+
-
- {{ logContent }}
-
+ >
+ {{ logContent }}
+
@@ -94,7 +78,7 @@
\ No newline at end of file
diff --git a/src/views/RemoteBackground.vue b/src/views/RemoteBackground.vue
index 968b757..090fa82 100644
--- a/src/views/RemoteBackground.vue
+++ b/src/views/RemoteBackground.vue
@@ -21,9 +21,11 @@
+ :src="terminalurl"
+ width="100%"
+ height="100%"
+ scrolling="no"
+ >
@@ -37,9 +39,11 @@
+ :src="fileurl"
+ width="100%"
+ height="100%"
+ scrolling="no"
+ >
@@ -63,7 +67,7 @@ export default {
terminalurl: "",
fileurl: "",
tab: "terminal",
- title: ''
+ title: ""
};
},
methods: {
@@ -78,7 +82,7 @@ export default {
meta() {
return {
title: this.title
- }
+ };
},
computed: {
pk() {
diff --git a/src/views/TakeControl.vue b/src/views/TakeControl.vue
index c24dc7a..2d35050 100644
--- a/src/views/TakeControl.vue
+++ b/src/views/TakeControl.vue
@@ -1,29 +1,31 @@
+ :src="takeControlUrl"
+ width="100%"
+ height="100%"
+ scrolling="no"
+ >
\ No newline at end of file
diff --git a/tests/unit/automation/automationmanager.spec.js b/tests/unit/automation/automationmanager.spec.js
index 3ae5c4e..7ff3ff2 100644
--- a/tests/unit/automation/automationmanager.spec.js
+++ b/tests/unit/automation/automationmanager.spec.js
@@ -15,7 +15,7 @@ describe('AutomationManager.vue', () => {
desc: "Description",
active: true,
clients: [],
- sites: [{},{}],
+ sites: [{}, {}],
agents: [{}]
},
{
@@ -24,7 +24,7 @@ describe('AutomationManager.vue', () => {
desc: "Description 2",
active: false,
clients: [],
- sites: [{},{}],
+ sites: [{}, {}],
agents: [{}]
}
];
@@ -45,7 +45,7 @@ describe('AutomationManager.vue', () => {
};
mutations = {
- setSelectedPolicy: jest.fn((state, key) => {state.selectedPolicy = key}),
+ setSelectedPolicy: jest.fn((state, key) => { state.selectedPolicy = key }),
setPolicyChecks: jest.fn(),
setPolicyAutomatedTasks: jest.fn(),
@@ -74,14 +74,14 @@ describe('AutomationManager.vue', () => {
store,
localVue,
stubs: [
- "PolicySubTableTabs",
+ "PolicySubTableTabs",
"PolicyForm"
],
});
});
-
+
// Runs after every test
// This is needed to remove q-dialogs since body doesn't rerender
afterEach(() => {
@@ -107,7 +107,7 @@ describe('AutomationManager.vue', () => {
it("sends vuex mutations and actions when policy is selected", () => {
const row = wrapper.findAll("tbody > tr.q-tr").wrappers[1];
-
+
row.trigger('click');
expect(mutations.setSelectedPolicy).toHaveBeenCalledWith(expect.anything(), 2);
@@ -118,7 +118,7 @@ describe('AutomationManager.vue', () => {
it("shows edit policy modal on edit button press", async () => {
- const button = wrapper.find({ref: "edit"});
+ const button = wrapper.find({ ref: "edit" });
expect(bodyWrapper.find(".q-dialog").exists()).toBe(false);
await button.trigger("click")
@@ -133,7 +133,7 @@ describe('AutomationManager.vue', () => {
it('shows add policy modal on button press', async () => {
- const button = wrapper.find({ref: "new"});
+ const button = wrapper.find({ ref: "new" });
expect(bodyWrapper.find(".q-dialog").exists()).toBe(false);
await button.trigger("click");
@@ -143,7 +143,7 @@ describe('AutomationManager.vue', () => {
it('deletes selected policy', async () => {
- const button = wrapper.find({ref: "delete"});
+ const button = wrapper.find({ ref: "delete" });
expect(bodyWrapper.find(".q-dialog").exists()).toBe(false);
// Select Row
@@ -160,7 +160,7 @@ describe('AutomationManager.vue', () => {
it('shows overview modal when button clicked', async () => {
- const button = wrapper.find({ref: "overview"});
+ const button = wrapper.find({ ref: "overview" });
expect(bodyWrapper.find(".q-dialog").exists()).toBe(false);
await button.trigger("click");
@@ -169,7 +169,7 @@ describe('AutomationManager.vue', () => {
it('calls vuex loadPolicies action when refresh button clicked and clears selected', () => {
- const button = wrapper.find({ref: "refresh"});
+ const button = wrapper.find({ ref: "refresh" });
button.trigger("click");
expect(actions.loadPolicies).toHaveBeenCalled();
@@ -180,4 +180,3 @@ describe('AutomationManager.vue', () => {
});
});
-
\ No newline at end of file
diff --git a/tests/unit/automation/automationmodals.spec.js b/tests/unit/automation/automationmodals.spec.js
index 5c00a59..c2dabcc 100644
--- a/tests/unit/automation/automationmodals.spec.js
+++ b/tests/unit/automation/automationmodals.spec.js
@@ -20,13 +20,13 @@ describe('PolicyForm.vue', () => {
beforeEach(() => {
rootActions = {
- loadClients: jest.fn( () => clients ),
- loadSites: jest.fn( () => sites ),
- loadAgents: jest.fn( () => agents ),
+ loadClients: jest.fn(() => clients),
+ loadSites: jest.fn(() => sites),
+ loadAgents: jest.fn(() => agents),
};
actions = {
- loadPolicy: jest.fn( () => policy ),
+ loadPolicy: jest.fn(() => policy),
addPolicy: jest.fn(),
editPolicy: jest.fn(),
};
@@ -82,4 +82,3 @@ describe('PolicyForm.vue', () => {
})*/
})
-
\ No newline at end of file