From 7b8f3db86091817eb84ded97a00b1104bfd32ca1 Mon Sep 17 00:00:00 2001
From: Josh Krawczyk <josh@torchlake.com>
Date: Fri, 29 May 2020 09:45:05 -0400
Subject: [PATCH 1/5] More Vue Tests

---
 .../components/automation/PolicyChecksTab.vue |  72 +++-
 .../components/modals/checks/ScriptCheck.vue  |   4 +
 web/src/store/store.js                        |   6 +
 .../unit/automation/automationmanager.spec.js |  24 +-
 web/tests/unit/automation/checksData.js       | 102 +++++
 web/tests/unit/automation/formmodal.spec.js   | 234 +++++-----
 .../unit/automation/policycheckstab.spec.js   | 398 ++++++++++++++++++
 .../unit/automation/policytasksstab.spec.js   |   1 +
 8 files changed, 682 insertions(+), 159 deletions(-)
 create mode 100644 web/tests/unit/automation/checksData.js
 create mode 100644 web/tests/unit/automation/policycheckstab.spec.js
 create mode 100644 web/tests/unit/automation/policytasksstab.spec.js

diff --git a/web/src/components/automation/PolicyChecksTab.vue b/web/src/components/automation/PolicyChecksTab.vue
index efe6137e..7a048809 100644
--- a/web/src/components/automation/PolicyChecksTab.vue
+++ b/web/src/components/automation/PolicyChecksTab.vue
@@ -8,6 +8,7 @@
         icon="fas fa-plus" 
         label="Add Check" 
         text-color="black"
+        ref="add"
       >
         <q-menu>
           <q-list dense style="min-width: 200px">
@@ -62,6 +63,7 @@
         push 
         @click="onRefresh(checks.id)" 
         icon="refresh"
+        ref="refresh"
       />
       <template v-if="allChecks === undefined || allChecks.length === 0">
         <p>No Checks</p>
@@ -105,6 +107,7 @@
                     clickable 
                     v-close-popup 
                     @click="showEditDialog(props.row.check_type)"
+                    id="context-edit"
                   >
                     <q-item-section side>
                       <q-icon name="edit" />
@@ -115,6 +118,7 @@
                     clickable
                     v-close-popup
                     @click="deleteCheck(props.row.id, props.row.check_type)"
+                    id="context-delete"
                   >
                     <q-item-section side>
                       <q-icon name="delete" />
@@ -124,7 +128,12 @@
 
                   <q-separator></q-separator>
 
-                  <q-item clickable v-close-popup @click="showPolicyCheckStatusModal(props.row)">
+                  <q-item 
+                    clickable 
+                    v-close-popup 
+                    @click="showPolicyCheckStatusModal(props.row)"
+                    id="context-status"
+                  >
                     <q-item-section side>
                       <q-icon name="sync" />
                     </q-item-section>
@@ -158,6 +167,7 @@
                 <span
                   style="cursor:pointer;color:blue;text-decoration:underline"
                   @click="showPolicyCheckStatusModal(props.row)"
+                  class="status-cell"
                 >
                   See Status
                 </span>
@@ -178,8 +188,11 @@
     </q-dialog>
     
     <!-- add/edit modals -->
-    <q-dialog v-model="showDialog">
+    <q-dialog 
+      v-model="showDialog"
+      @hide="hideDialog">
       <component 
+        v-if="dialogComponent !== null"
         :is="dialogComponent" 
         @close="hideDialog" 
         :policypk="checks.id" 
@@ -193,11 +206,39 @@
 import { mapState, mapGetters } from "vuex";
 import mixins, { notifySuccessConfig, notifyErrorConfig } from "@/mixins/mixins";
 import PolicyStatus from "@/components/automation/modals/PolicyStatus";
+import AddDiskSpaceCheck from "@/components/modals/checks/AddDiskSpaceCheck";
+import EditDiskSpaceCheck from "@/components/modals/checks/EditDiskSpaceCheck";
+import AddPingCheck from "@/components/modals/checks/AddPingCheck";
+import EditPingCheck from "@/components/modals/checks/EditPingCheck";
+import AddCpuLoadCheck from "@/components/modals/checks/AddCpuLoadCheck";
+import EditCpuLoadCheck from "@/components/modals/checks/EditCpuLoadCheck";
+import AddMemCheck from "@/components/modals/checks/AddMemCheck";
+import EditMemCheck from "@/components/modals/checks/EditMemCheck";
+import AddWinSvcCheck from "@/components/modals/checks/AddWinSvcCheck";
+import EditWinSvcCheck from "@/components/modals/checks/EditWinSvcCheck";
+import AddScriptCheck from "@/components/modals/checks/AddScriptCheck";
+import EditScriptCheck from "@/components/modals/checks/EditScriptCheck";
+import AddEventLogCheck from "@/components/modals/checks/AddEventLogCheck";
+import EditEventLogCheck from "@/components/modals/checks/EditEventLogCheck";
 
 export default {
   name: "PolicyChecksTab",
   components: {
-    PolicyStatus
+    PolicyStatus,
+    AddDiskSpaceCheck,
+    EditDiskSpaceCheck,
+    AddPingCheck,
+    EditPingCheck,
+    AddCpuLoadCheck,
+    EditCpuLoadCheck,
+    AddMemCheck,
+    EditMemCheck,
+    AddWinSvcCheck,
+    EditWinSvcCheck,
+    AddScriptCheck,
+    EditScriptCheck,
+    AddEventLogCheck,
+    EditEventLogCheck
   },
   mixins: [mixins],
   data() {
@@ -242,40 +283,38 @@ export default {
       this.$store.dispatch("automation/loadPolicyChecks", id);
     },
     showAddDialog(component) {
-      this.dialogComponent = () => import(`@/components/modals/checks/${component}`);
+      this.dialogComponent = component;
       this.showDialog = true;
     },
     showEditDialog(category) {
-      let component = null;
-
       switch (category) {
         case "diskspace":
-          component = "EditDiskSpaceCheck";
+          this.dialogComponent = "EditDiskSpaceCheck";
           break;
         case "ping":
-          component = "EditPingCheck";
+          this.dialogComponent = "EditPingCheck";
           break;
         case "cpuload":
-          tcomponent = "EditCpuLoadCheck";
+          this.dialogComponent = "EditCpuLoadCheck";
           break;
         case "memory":
-          component = "EditMemCheck";
+          this.dialogComponent = "EditMemCheck";
           break;
         case "winsvc":
-          component = "EditWinSvcCheck";
+          this.dialogComponent = "EditWinSvcCheck";
           break;
         case "script":
-          component = "EditScriptCheck";
+          this.dialogComponent = "EditScriptCheck";
           break;
         case "eventlog":
-          component = "EditEventLogCheck";
+          this.dialogComponent = "EditEventLogCheck";
           break;
         default:
           return null;
       }
 
-      this.dialogComponent = () => import(`@/components/modals/checks/${component}`);
       this.showDialog = true;
+
     },
     hideDialog(component) {
       this.showDialog = false;
@@ -284,10 +323,9 @@ export default {
     deleteCheck(pk, check_type) {
       this.$q
         .dialog({
-          title: "Are you sure?",
-          message: `Delete ${check_type} check`,
+          title: `Delete ${check_type} check`,
+          ok: { label: "Delete", color: "negative" },
           cancel: true,
-          persistent: true
         })
         .onOk(() => {
           const data = { pk: pk, checktype: check_type };
diff --git a/web/src/components/modals/checks/ScriptCheck.vue b/web/src/components/modals/checks/ScriptCheck.vue
index 339852e8..8c83adc8 100644
--- a/web/src/components/modals/checks/ScriptCheck.vue
+++ b/web/src/components/modals/checks/ScriptCheck.vue
@@ -65,6 +65,10 @@
 
 <script>
 import axios from "axios";
+<<<<<<< HEAD:web/src/components/modals/checks/ScriptCheck.vue
+=======
+import { mapState, mapGetters } from "vuex";
+>>>>>>> More Vue Tests:web/src/components/modals/checks/AddScriptCheck.vue
 import mixins from "@/mixins/mixins";
 import { mapGetters, mapState } from "vuex";
 export default {
diff --git a/web/src/store/store.js b/web/src/store/store.js
index 85ddabaf..ee7668c0 100644
--- a/web/src/store/store.js
+++ b/web/src/store/store.js
@@ -153,6 +153,12 @@ export const store = new Vuex.Store({
         context.commit("setChecks", r.data);
       });
     },
+    loadDefaultServices(context) {
+      return axios.get("/services/getdefaultservices/");
+    },
+    loadAgentServices(context, agentpk) {
+      return axios.get(`/services/${agentpk}/services/`);
+    },
     editCheckAlertAction(context, data) {
       return axios.patch("/checks/checkalert/", data);
     },
diff --git a/web/tests/unit/automation/automationmanager.spec.js b/web/tests/unit/automation/automationmanager.spec.js
index f96f9cdd..3940d90f 100644
--- a/web/tests/unit/automation/automationmanager.spec.js
+++ b/web/tests/unit/automation/automationmanager.spec.js
@@ -6,8 +6,18 @@ import "@/quasar.js"
 const localVue = createLocalVue();
 localVue.use(Vuex);
 
-describe("AutomationManager.vue", () => {
+const bodyWrapper = createWrapper(document.body);
 
+// This is needed to remove q-dialogs since body doesn't rerender
+afterEach(() => {
+  const dialogs = document.querySelectorAll(".q-dialog");
+  const menus = document.querySelectorAll(".q-menu");
+  dialogs.forEach(x => x.remove());
+  menus.forEach(x => x.remove());
+});
+
+describe("AutomationManager.vue", () => {
+  
   const policiesData = [
     {
       id: 1,
@@ -29,7 +39,6 @@ describe("AutomationManager.vue", () => {
     }
   ];
 
-  const bodyWrapper = createWrapper(document.body);
   let wrapper;
   let state, mutations, actions, store;
 
@@ -83,17 +92,6 @@ describe("AutomationManager.vue", () => {
 
   });
 
-
-  // Runs after every test
-  // This is needed to remove q-dialogs since body doesn't rerender
-  afterEach(() => {
-    const dialogs = document.querySelectorAll(".q-dialog");
-    const menus = document.querySelectorAll(".q-menu");
-    dialogs.forEach(x => x.remove());
-    menus.forEach(x => x.remove());
-  });
-
-
   // The Tests
   it("calls vuex loadPolicies action on mount", () => {
 
diff --git a/web/tests/unit/automation/checksData.js b/web/tests/unit/automation/checksData.js
new file mode 100644
index 00000000..bf35f96f
--- /dev/null
+++ b/web/tests/unit/automation/checksData.js
@@ -0,0 +1,102 @@
+
+const common = {
+    email_alert: false,
+    failure_count: 0,
+    failures: 5,
+    history: [],
+    last_run: null,
+    more_info: null,
+    status: "pending",
+    task_on_failure: null,
+    text_alert: false,
+    agent: null,
+    policy: 1
+  };
+
+const diskcheck = {
+id: 1,
+check_type: "diskspace",
+disk: "C:",
+threshold: 25,
+readable_desc: "Disk space check: Drive C",
+...common
+};
+
+const cpuloadcheck = {
+id: 2,
+check_type: "cpuload",
+cpuload: 85,
+readable_desc: "CPU Load check: > 85%",
+...common
+};
+
+const memcheck = {
+id: 3,
+check_type: "memory",
+threshold: 75,
+readable_desc: "Memory checks: > 85%",
+...common
+};
+
+const scriptcheck = {
+id: 4,
+check_type: "script",
+execution_time: "0.0000",
+retcode: 0,
+script: {
+    description: "Test",
+    filename: "local_admin_group.bat",
+    filepath: "salt://scripts//userdefined//local_admin_group.bat",
+    id: 1,
+    name: "Test Script",
+    shell: "cmd"
+},
+stderr: null,
+stdout: null,
+timeout: 120,
+readable_desc: "Script check: Test Script",
+...common
+};
+
+const winservicecheck = {
+id: 5,
+check_type: "winsvc",
+pass_if_start_pending: false,
+restart_if_stopped: false,
+svc_display_name: "Agent Activation Runtime_1232as",
+svc_name: "AarSvc_1232as",
+readable_desc: "Service check: Agent Activation Runtime_1232as",
+...common
+};
+
+const pingcheck = {
+id: 6,
+name: "fghfgh",
+check_type: "ping",
+ip: "10.10.10.10",
+readable_desc: "Ping Check: Test Ping Check",
+...common
+};
+
+const eventlogcheck = {
+id: 7,
+desc: "asasasa",
+check_type: "eventlog",
+log_name: "Application",
+event_id: 1456,
+event_type: "ERROR",
+fail_when: "contains",
+search_last_days: 1,
+readable_desc: "Event log check: asdsasa",
+...common,
+};
+
+export {
+  diskcheck,
+  cpuloadcheck,
+  memcheck,
+  scriptcheck,
+  winservicecheck,
+  pingcheck,
+  eventlogcheck
+}
\ No newline at end of file
diff --git a/web/tests/unit/automation/formmodal.spec.js b/web/tests/unit/automation/formmodal.spec.js
index 8802ac63..216a482b 100644
--- a/web/tests/unit/automation/formmodal.spec.js
+++ b/web/tests/unit/automation/formmodal.spec.js
@@ -7,80 +7,126 @@ import "@/quasar.js";
 const localVue = createLocalVue();
 localVue.use(Vuex);
 
-describe("PolicyForm.vue", () => {
+/***   TEST DATA   ***/
+const clients = [ 
+  {
+    id: 1, 
+    client: "Test Client"
+  }, 
+  {
+    id: 2, 
+    client: "Test Client2"
+  },
+  {
+    id: 3, 
+    client: "Test Client3"
+  } 
+];
+const sites = [ 
+  {
+    id: 1, 
+    site: "Site Name", 
+    client_name: "Test Client"
+  }, 
+  {
+    id: 2, 
+    site: "Site Name2", 
+    client_name: "Test Client2"
+  } 
+];
 
-  const clients = [ 
-    {
-      id: 1, 
-      client: "Test Client"
-    }, 
-    {
-      id: 2, 
-      client: "Test Client2"
-    },
-    {
-      id: 3, 
-      client: "Test Client3"
-    } 
-  ];
-  const sites = [ 
-    {
-      id: 1, 
-      site: "Site Name", 
-      client_name: "Test Client"
-    }, 
-    {
-      id: 2, 
-      site: "Site Name2", 
-      client_name: "Test Client2"
-    } 
-  ];
+const policy = {
+  id: 1,
+  name: "Test Policy",
+  desc: "Test Desc",
+  active: true,
+  clients: [],
+  sites: []
+};
 
-  const policy = {
-    id: 1,
-    name: "Test Policy",
-    desc: "Test Desc",
-    active: true,
-    clients: [],
-    sites: []
+let actions, rootActions, store;
+beforeEach(() => {
+  rootActions = {
+    loadClients: jest.fn(() => new Promise(res => res({ data: clients }))),
+    loadSites: jest.fn(() => new Promise(res => res({ data: sites }))),
   };
 
-  let actions, rootActions, store;
+  actions = {
+    loadPolicy: jest.fn(() => new Promise(res => res({ data: policy }))),
+    addPolicy: jest.fn(() => new Promise(res => res())),
+    editPolicy: jest.fn(() => new Promise(res => res())),
+  };
 
-  // Runs before every test
+  store = new Vuex.Store({
+    actions: rootActions,
+    modules: {
+      automation: {
+        namespaced: true,
+        actions,
+      }
+    }
+  });
+})
+
+/***   TEST SUITES   ***/
+describe("PolicyForm.vue when editting", () => {
+
+  let wrapper;
   beforeEach(() => {
 
-    rootActions = {
-      loadClients: jest.fn(() => new Promise(res => res({ data: clients }))),
-      loadSites: jest.fn(() => new Promise(res => res({ data: sites }))),
-    };
-
-    actions = {
-      loadPolicy: jest.fn(() => new Promise(res => res({ data: policy }))),
-      addPolicy: jest.fn(() => new Promise(res => res())),
-      editPolicy: jest.fn(() => new Promise(res => res())),
-    };
-
-    store = new Vuex.Store({
-      actions: rootActions,
-      modules: {
-        automation: {
-          namespaced: true,
-          actions,
-        }
+    wrapper = mount(PolicyForm, {
+      localVue,
+      store,
+      propsData: {
+        pk: 1
       }
     });
 
   });
 
-  // The Tests
-  it("calls vuex actions on mount", () => {
+  /***   TESTS   ***/
+  it("calls vuex actions on mount with pk prop set", () => {
 
-    const wrapper = mount(PolicyForm, {
+    expect(rootActions.loadClients).toHaveBeenCalled();
+    expect(rootActions.loadSites).toHaveBeenCalled();
+    expect(actions.loadPolicy).toHaveBeenCalledWith(expect.anything(), 1);
+
+  });
+
+  it("sends the correct edit action on submit", async () => {
+
+    await flushPromises();
+    const form = wrapper.findComponent({ ref: "form" });
+    form.vm.$emit("submit");
+    await wrapper.vm.$nextTick();
+
+    expect(actions.addPolicy).not.toHaveBeenCalled();
+    expect(actions.editPolicy).toHaveBeenCalledWith(expect.anything(), policy);
+    
+  });
+
+  it("Renders correct title on edit", () => {
+
+    expect(wrapper.vm.title).toBe("Edit Policy");
+  });
+
+});
+  
+describe("PolicyForm.vue when adding", () => {
+
+  let wrapper;
+  beforeEach(() => {
+
+    wrapper = mount(PolicyForm, {
       localVue,
       store
     });
 
+  });
+
+  /***   TESTS   ***/
+  it("calls vuex actions on mount", () => {
+
     expect(rootActions.loadClients).toHaveBeenCalled();
     expect(rootActions.loadSites).toHaveBeenCalled();
 
@@ -89,29 +135,8 @@ describe("PolicyForm.vue", () => {
 
   });
 
-  it("calls vuex actions on mount with pk prop set", () => {
-
-    mount(PolicyForm, {
-      localVue,
-      store,
-      propsData: {
-        pk: 1
-      }
-    });
-
-    expect(rootActions.loadClients).toHaveBeenCalled();
-    expect(rootActions.loadSites).toHaveBeenCalled();
-    expect(actions.loadPolicy).toHaveBeenCalledWith(expect.anything(), 1);
-
-  });
-
   it("Sets client and site options correctly", async () => {
 
-    const wrapper = mount(PolicyForm, {
-      localVue,
-      store
-    });
-
     // Make sure the promises are resolved
     await flushPromises();
 
@@ -119,13 +144,8 @@ describe("PolicyForm.vue", () => {
     expect(wrapper.vm.siteOptions).toHaveLength(2);
 
   });
-  
-  it("sends the correct add action on submit", async () => {
 
-    const wrapper = mount(PolicyForm, {
-      localVue,
-      store
-    });
+  it("sends the correct add action on submit", async () => {
 
     wrapper.setData({name: "Test Policy"});
     const form = wrapper.findComponent({ ref: "form" });
@@ -137,33 +157,8 @@ describe("PolicyForm.vue", () => {
 
   });
 
-  it("sends the correct edit action on submit", async () => {
-
-    const wrapper = mount(PolicyForm, {
-      localVue,
-      store,
-      propsData: {
-        pk: 1
-      }
-    });
-
-    await flushPromises();
-    const form = wrapper.findComponent({ ref: "form" });
-    form.vm.$emit("submit");
-    await wrapper.vm.$nextTick();
-
-    expect(actions.addPolicy).not.toHaveBeenCalled();
-    expect(actions.editPolicy).toHaveBeenCalledWith(expect.anything(), policy);
-    
-  });
-  
   it("sends error when name isn't set on submit", async () => {
 
-    const wrapper = mount(PolicyForm, {
-      localVue,
-      store
-    });
-
     const form = wrapper.findComponent({ ref: "form" });
     form.vm.$emit("submit");
     await wrapper.vm.$nextTick();
@@ -172,28 +167,9 @@ describe("PolicyForm.vue", () => {
     expect(actions.editPolicy).not.toHaveBeenCalled();
   });
 
-  it("Renders correct title on edit", () => {
-
-    const wrapper = mount(PolicyForm, {
-      localVue,
-      store,
-      propsData: {
-        pk: 1
-      }
-    });
-
-    expect(wrapper.vm.title).toBe("Edit Policy");
-  });
-
   it("Renders correct title on add", () => {
 
-    const wrapper = mount(PolicyForm, {
-      localVue,
-      store,
-    });
-
     expect(wrapper.vm.title).toBe("Add Policy");
   });
 
-});
-  
+});
\ No newline at end of file
diff --git a/web/tests/unit/automation/policycheckstab.spec.js b/web/tests/unit/automation/policycheckstab.spec.js
new file mode 100644
index 00000000..549f77e4
--- /dev/null
+++ b/web/tests/unit/automation/policycheckstab.spec.js
@@ -0,0 +1,398 @@
+import { mount, shallowMount, createLocalVue, createWrapper } from "@vue/test-utils";
+import PolicyChecksTab from "@/components/automation/PolicyChecksTab";
+import Vuex from "vuex";
+import "@/quasar.js";
+
+// Import Test Data
+import {
+  diskcheck,
+  cpuloadcheck,
+  memcheck,
+  scriptcheck,
+  winservicecheck,
+  pingcheck,
+  eventlogcheck
+} from "./checksData.js";
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+const bodyWrapper = createWrapper(document.body);
+
+// This is needed to remove q-dialogs since body doesn't rerender
+afterEach(() => {
+  const dialogs = document.querySelectorAll(".q-dialog");
+  const menus = document.querySelectorAll(".q-menu");
+  dialogs.forEach(x => x.remove());
+  menus.forEach(x => x.remove());
+});
+
+/***   TEST SUITES   ***/
+describe("PolicyChecksTab.vue with no policy selected", () => {
+
+  let wrapper, state, store;
+  // Runs before every test
+  beforeEach(() => {
+
+    // Create the Test store
+    state = {
+      checks: {},
+    };
+
+    store = new Vuex.Store({
+      modules: {
+        automation: {
+          namespaced: true,
+          state,
+        }
+      }
+    });
+
+    wrapper = shallowMount(PolicyChecksTab, {
+      store,
+      localVue
+    });
+  
+  });
+
+  /***   TESTS   ***/
+  it("renders text when policy is selected with no checks", () => {
+
+    expect(wrapper.html()).toContain("No Policy Selected");
+  });
+
+});
+
+describe("PolicyChecksTab.vue with policy selected and no checks", () => {
+
+  // Used for the add check test loop
+  const addChecksMenu = [
+    { name: "AddDiskSpaceCheck", index: 0 },
+    { name: "AddPingCheck", index: 1},
+    { name: "AddCpuLoadCheck", index: 2},
+    { name: "AddMemCheck", index: 3},
+    { name: "AddWinSvcCheck", index: 4},
+    { name: "AddScriptCheck", index: 5},
+    { name: "AddEventLogCheck", index: 6}
+  ];
+
+  let wrapper, store, state, actions, getters;
+  // Runs before every test
+  beforeEach(() => {
+
+    // Create the Test store
+    state = {
+      checks: {
+        id: 1,
+        name: "Test Policy",
+        diskchecks: [],
+        cpuloadchecks: [],
+        memchecks: [],
+        scriptchecks: [],
+        winservicechecks: [],
+        pingchecks: [],
+        eventlogchecks: []
+      }
+    };
+
+    getters = {
+      allChecks(state) {
+        return [
+        ...state.checks.diskchecks,
+        ...state.checks.cpuloadchecks,
+        ...state.checks.memchecks,
+        ...state.checks.scriptchecks,
+        ...state.checks.winservicechecks,
+        ...state.checks.pingchecks,
+        ...state.checks.eventlogchecks
+        ];
+      }
+    };
+
+    actions = {
+      loadPolicyChecks: jest.fn()
+    };
+
+    store = new Vuex.Store({
+      modules: {
+        automation: {
+          namespaced: true,
+          state,
+          getters,
+          actions
+        }
+      }
+    });
+
+    // Mount all sub components except the ones specified
+    wrapper = mount(PolicyChecksTab, {
+      store,
+      localVue,
+      stubs: [
+        "AddDiskSpaceCheck",
+        "AddPingCheck",
+        "AddCpuLoadCheck",
+        "AddMemCheck",
+        "AddWinSvcCheck",
+        "AddScriptCheck",
+        "AddEventLogCheck"
+      ]
+    });
+  
+  });
+
+  it("renders text when policy is selected with no checks", () => {
+
+    expect(wrapper.html()).toContain("No Checks");
+  });
+
+  it("sends vuex actions on refresh button click", () => {
+
+    wrapper.findComponent({ ref: "refresh" }).trigger("click");
+    expect(actions.loadPolicyChecks).toHaveBeenCalledWith(expect.anything(), 1);
+  });
+
+  // Create a test for each Add modal
+  addChecksMenu.forEach(item => {
+    it(`opens ${item.name} Dialog`, async () => {
+
+      const addButton = wrapper.findComponent({ ref: "add" });
+
+      expect(bodyWrapper.find(".q-dialog").exists()).toBe(false);
+      expect(bodyWrapper.find(".q-menu").exists()).toBe(false);
+
+      await addButton.trigger("click");
+      expect(bodyWrapper.find(".q-menu").exists()).toBe(true);
+
+      // Selects correct menu item
+      await bodyWrapper.findAll(".q-item").wrappers[item.index].trigger("click");
+      expect(bodyWrapper.find(".q-dialog").exists()).toBe(true);
+      expect(wrapper.vm.showDialog).toBe(true);
+      expect(wrapper.vm.dialogComponent).toBe(item.name);
+    });
+  
+  });
+
+});
+
+describe("PolicyChecksTab.vue with policy selected and checks", () => {
+
+  // Used for the edit check test loop
+  const editChecksModals = [
+    {name: "EditDiskSpaceCheck", index: 0, id: 1},
+    {name: "EditCpuLoadCheck", index: 1, id: 2},
+    {name: "EditMemCheck", index: 2, id: 3},
+    {name: "EditScriptCheck", index: 3, id: 4},
+    {name: "EditWinSvcCheck", index: 4, id: 5},
+    {name: "EditPingCheck", index: 5, id: 6},
+    {name: "EditEventLogCheck", index: 6, id: 7}
+  ];
+
+  let state, rootActions, actions, getters, store, wrapper;
+  // Runs before every test
+  beforeEach(() => {
+
+    // Create the Test store
+    state = {
+      checks: {
+        id: 1,
+        name: "Test Policy",
+        diskchecks: [diskcheck],
+        cpuloadchecks: [cpuloadcheck],
+        memchecks: [memcheck],
+        scriptchecks: [scriptcheck],
+        winservicechecks: [winservicecheck],
+        pingchecks: [pingcheck],
+        eventlogchecks: [eventlogcheck]
+      },
+    };
+
+    getters = {
+      allChecks(state) {
+        return [
+          ...state.checks.diskchecks,
+          ...state.checks.cpuloadchecks,
+          ...state.checks.memchecks,
+          ...state.checks.scriptchecks,
+          ...state.checks.winservicechecks,
+          ...state.checks.pingchecks,
+          ...state.checks.eventlogchecks
+        ];
+      }
+    };
+
+    actions = {
+      loadPolicyChecks: jest.fn()
+    };
+
+    rootActions = {
+      editCheckAlertAction: jest.fn(),
+      deleteCheck: jest.fn()
+    };
+
+    store = new Vuex.Store({
+      actions: rootActions,
+      modules: {
+        automation: {
+          namespaced: true,
+          state,
+          getters,
+          actions
+        }
+      }
+    });
+
+    // Mount all sub components except the ones specified
+    wrapper = mount(PolicyChecksTab, {
+      store,
+      localVue,
+      stubs: [
+        "EditDiskSpaceCheck",
+        "EditPingCheck",
+        "EditCpuLoadCheck",
+        "EditMemCheck",
+        "EditWinSvcCheck",
+        "EditScriptCheck",
+        "EditEventLogCheck",
+        "PolicyStatus"
+      ]
+    });
+
+  });
+
+  /***   TESTS   ***/
+  it("renders the correct number of rows based on checks", () => {
+
+    const rows = wrapper.findAll(".q-table > tbody > .q-tr").wrappers;
+    expect(rows).toHaveLength(7);
+  });
+
+  // Create a test for each Edit modal
+  editChecksModals.forEach(item => {
+    it(`show ${item.name} Dialog`, async () => {
+
+      expect(bodyWrapper.find(".q-dialog").exists()).toBe(false);
+      expect(bodyWrapper.find(".q-menu").exists()).toBe(false);
+
+      const row = wrapper.findAll(".q-table > tbody > .q-tr").wrappers[item.index];
+      await row.trigger("contextmenu");
+      expect(bodyWrapper.find(".q-menu").exists()).toBe(true);
+      
+      await bodyWrapper.find("#context-edit").trigger("click");
+      expect(bodyWrapper.find(".q-dialog").exists()).toBe(true);
+      expect(wrapper.vm.showDialog).toBe(true);
+      expect(wrapper.vm.dialogComponent).toBe(item.name);
+      expect(wrapper.vm.editCheckPK).toBe(item.id);
+    });
+
+  });
+
+  it("shows policy status modal on cell click", async () => {
+
+    expect(bodyWrapper.find(".q-dialog").exists()).toBe(false);
+
+    const row = wrapper.findAll(".status-cell").wrappers[0];
+    await row.trigger("click");
+    expect(bodyWrapper.find(".q-dialog").exists()).toBe(true);
+    expect(wrapper.vm.statusCheck).toEqual(diskcheck);
+  });
+
+  it("shows policy status modal on context menu item click", async () => {
+
+    expect(bodyWrapper.find(".q-dialog").exists()).toBe(false);
+    expect(bodyWrapper.find(".q-menu").exists()).toBe(false);
+
+    const row = wrapper.findAll(".q-table > tbody > .q-tr").wrappers[0];
+    await row.trigger("contextmenu");
+    expect(bodyWrapper.find(".q-menu").exists()).toBe(true);
+
+    await bodyWrapper.find("#context-status").trigger("click");
+    expect(bodyWrapper.find(".q-dialog").exists()).toBe(true);
+    expect(wrapper.vm.statusCheck).toEqual(diskcheck);
+  });
+
+  it("renders correct description for checks", () => {
+
+    expect(wrapper.find(".q-table").html()).toContain("Disk Space Drive C: &gt; 25%");
+    expect(wrapper.find(".q-table").html()).toContain("Avg CPU Load &gt; 85%");
+    expect(wrapper.find(".q-table").html()).toContain("Avg memory usage &gt; 75%");
+    expect(wrapper.find(".q-table").html()).toContain("Script check: Test Script");
+    expect(wrapper.find(".q-table").html()).toContain("Service Check - Agent Activation Runtime_1232as");
+    expect(wrapper.find(".q-table").html()).toContain("Ping fghfgh (10.10.10.10)");
+    expect(wrapper.find(".q-table").html()).toContain("Event Log Check - asasasa");
+  });
+
+  it("deletes check", async () => {
+
+    expect(bodyWrapper.find(".q-dialog").exists()).toBe(false);
+    expect(bodyWrapper.find(".q-menu").exists()).toBe(false);
+
+    const row = wrapper.findAll(".q-table > tbody > .q-tr").wrappers[0];
+    await row.trigger("contextmenu");
+    expect(bodyWrapper.find(".q-menu").exists()).toBe(true);
+
+    await bodyWrapper.find("#context-delete").trigger("click");
+    expect(bodyWrapper.find(".q-dialog").exists()).toBe(true);
+
+    //Get OK button on confirmation dialog and click it
+    await bodyWrapper.findAll(".q-btn").wrappers[1].trigger("click");
+
+    expect(rootActions.deleteCheck).toHaveBeenCalledWith(expect.anything(), {pk: 1, checktype:"diskspace"});
+    expect(actions.loadPolicyChecks).toHaveBeenCalled();
+
+  });
+
+  it("enables and disables text alerts for check", async () => {
+
+    //Get first checkbox in first row
+    const row = wrapper.findAll(".q-checkbox").wrappers[0];
+
+    //Enable Text Alert
+    await row.trigger("click");
+
+    expect(rootActions.editCheckAlertAction).toHaveBeenCalledWith(expect.anything(), {
+      alertType: "text",
+      checkid: 1,
+      category: "diskspace",
+      action: "enabled"
+    });
+
+    //Disable Text Alert
+    await row.trigger("click");
+
+    expect(rootActions.editCheckAlertAction).toHaveBeenCalledWith(expect.anything(), {
+      alertType: "text",
+      checkid: 1,
+      category: "diskspace",
+      action: "disabled"
+    });
+  });
+
+  it("enables and disables email alerts for check", async () => {
+
+    //Get second checkbox in first row
+    const row = wrapper.findAll(".q-checkbox").wrappers[1];
+
+    //Enable Text Alert
+    await row.trigger("click");
+
+    expect(rootActions.editCheckAlertAction).toHaveBeenCalledWith(expect.anything(), {
+      alertType: "email",
+      checkid: 1,
+      category: "diskspace",
+      action: "enabled"
+    });
+
+    //Disable Text Alert
+    await row.trigger("click");
+
+    expect(rootActions.editCheckAlertAction).toHaveBeenCalledWith(expect.anything(), {
+      alertType: "email",
+      checkid: 1,
+      category: "diskspace",
+      action: "disabled"
+    });
+  });
+
+  /* TODO: test @close and @hide events */
+});
diff --git a/web/tests/unit/automation/policytasksstab.spec.js b/web/tests/unit/automation/policytasksstab.spec.js
new file mode 100644
index 00000000..4c3ba928
--- /dev/null
+++ b/web/tests/unit/automation/policytasksstab.spec.js
@@ -0,0 +1 @@
+// TODO after checks rework
\ No newline at end of file

From b7880516bef3c1495cd7c55c5da7507a7c3a1367 Mon Sep 17 00:00:00 2001
From: Josh Krawczyk <josh@torchlake.com>
Date: Fri, 29 May 2020 16:14:41 -0400
Subject: [PATCH 2/5] Fixing automation Api with Checks changes

---
 api/tacticalrmm/automation/serializers.py     | 15 +++++++-
 api/tacticalrmm/automation/urls.py            |  1 +
 api/tacticalrmm/automation/views.py           | 12 ++++--
 api/tacticalrmm/checks/urls.py                |  1 -
 api/tacticalrmm/checks/views.py               |  7 ----
 .../components/automation/PolicyChecksTab.vue | 37 +++++++++----------
 web/src/store/automation.js                   | 12 +-----
 7 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/api/tacticalrmm/automation/serializers.py b/api/tacticalrmm/automation/serializers.py
index 0812b114..e56bf326 100644
--- a/api/tacticalrmm/automation/serializers.py
+++ b/api/tacticalrmm/automation/serializers.py
@@ -1,8 +1,8 @@
 from rest_framework import serializers
 
 from .models import Policy
-from autotasks.models import AutomatedTask
 from autotasks.serializers import TaskSerializer
+from checks.serializers import CheckSerializer
 
 
 class PolicySerializer(serializers.ModelSerializer):
@@ -18,6 +18,19 @@ class PolicyRelationSerializer(serializers.ModelSerializer):
         depth = 2
 
 
+class CheckPolicySerializer(serializers.ModelSerializer):
+
+    checks = CheckSerializer(many=True, read_only=True)
+
+    class Meta:
+        model = Policy
+        fields = (
+            "id",
+            "name",
+            "checks",
+        )
+
+
 class AutoTaskPolicySerializer(serializers.ModelSerializer):
 
     autotasks = TaskSerializer(many=True, read_only=True)
diff --git a/api/tacticalrmm/automation/urls.py b/api/tacticalrmm/automation/urls.py
index b4c15fe6..c0b3e65d 100644
--- a/api/tacticalrmm/automation/urls.py
+++ b/api/tacticalrmm/automation/urls.py
@@ -6,6 +6,7 @@ urlpatterns = [
     path("policies/<int:pk>/related/", views.GetRelated.as_view()),
     path("policies/overview/", views.OverviewPolicy.as_view()),
     path("policies/<pk>/", views.GetUpdateDeletePolicy.as_view()),
+    path("<int:pk>/policychecks/", views.PolicyCheck.as_view()),
     path("<int:pk>/policyautomatedtasks/", views.PolicyAutoTask.as_view()),
     path("runwintask/<int:pk>/", views.RunPolicyTask.as_view()),
 ]
diff --git a/api/tacticalrmm/automation/views.py b/api/tacticalrmm/automation/views.py
index cca922ef..c4ce8dc3 100644
--- a/api/tacticalrmm/automation/views.py
+++ b/api/tacticalrmm/automation/views.py
@@ -1,14 +1,10 @@
-
-
 from django.db import DataError
 from django.shortcuts import get_object_or_404
 
-
 from rest_framework.views import APIView
 from rest_framework.response import Response
 from rest_framework import status
 
-
 from .models import Policy
 from agents.models import Agent
 from scripts.models import Script
@@ -25,6 +21,7 @@ from .serializers import (
     PolicySerializer,
     PolicyRelationSerializer,
     AutoTaskPolicySerializer,
+    CheckPolicySerializer
 )
 
 class GetAddPolicies(APIView):
@@ -106,6 +103,7 @@ class PolicyAutoTask(APIView):
         policy = get_object_or_404(Policy, pk=pk)
         return Response(AutoTaskPolicySerializer(policy).data)
 
+
 class RunPolicyTask(APIView):
     def get(self, request, pk):
 
@@ -113,6 +111,12 @@ class RunPolicyTask(APIView):
         return Response("ok")
 
 
+class PolicyCheck(APIView):
+    def get(self, request, pk):
+        policy = get_object_or_404(Policy, pk=pk)
+        return Response(CheckPolicySerializer(policy).data)
+
+
 class OverviewPolicy(APIView):
     def get(self, request):
 
diff --git a/api/tacticalrmm/checks/urls.py b/api/tacticalrmm/checks/urls.py
index 66cd9614..8121eb49 100644
--- a/api/tacticalrmm/checks/urls.py
+++ b/api/tacticalrmm/checks/urls.py
@@ -5,7 +5,6 @@ urlpatterns = [
     path("checks/", views.GetAddCheck.as_view()),
     path("<int:pk>/check/", views.GetUpdateDeleteCheck.as_view()),
     path("<pk>/loadchecks/", views.load_checks),
-    path("<pk>/loadpolicychecks/", views.load_policy_checks),
     path("checkrunner/", views.check_runner),
     path("getalldisks/", views.get_disks_for_policies),
     path("runchecks/<pk>/", views.run_checks),
diff --git a/api/tacticalrmm/checks/views.py b/api/tacticalrmm/checks/views.py
index fcb7920e..5103d209 100644
--- a/api/tacticalrmm/checks/views.py
+++ b/api/tacticalrmm/checks/views.py
@@ -156,13 +156,6 @@ def load_checks(request, pk):
     checks = Check.objects.filter(agent__pk=pk)
     return Response(CheckSerializer(checks, many=True).data)
 
-
-@api_view()
-def load_policy_checks(request, pk):
-    policy = get_object_or_404(Policy, pk=pk)
-    return Response(PolicyChecksSerializer(policy).data)
-
-
 @api_view()
 def get_disks_for_policies(request):
     return Response(DiskCheck.all_disks())
diff --git a/web/src/components/automation/PolicyChecksTab.vue b/web/src/components/automation/PolicyChecksTab.vue
index 7a048809..94281f05 100644
--- a/web/src/components/automation/PolicyChecksTab.vue
+++ b/web/src/components/automation/PolicyChecksTab.vue
@@ -12,7 +12,7 @@
       >
         <q-menu>
           <q-list dense style="min-width: 200px">
-            <q-item clickable v-close-popup @click="showAddDialog('AddDiskSpaceCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('DiskSpaceCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="far fa-hdd" />
               </q-item-section>
@@ -36,7 +36,7 @@
               </q-item-section>
               <q-item-section>Memory Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showAddDialog('AddWinSvcCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('WinSvcCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-cogs" />
               </q-item-section>
@@ -99,14 +99,14 @@
           </template>
           <!-- body slots -->
           <template v-slot:body="props">
-            <q-tr @contextmenu="editCheckPK = props.row.id" :props="props">
+            <q-tr :props="props">
               <!-- context menu -->
               <q-menu context-menu>
                 <q-list dense style="min-width: 200px">
                   <q-item 
                     clickable 
                     v-close-popup 
-                    @click="showEditDialog(props.row.check_type)"
+                    @click="showEditDialog(props.row)"
                     id="context-edit"
                   >
                     <q-item-section side>
@@ -117,7 +117,7 @@
                   <q-item
                     clickable
                     v-close-popup
-                    @click="deleteCheck(props.row.id, props.row.check_type)"
+                    @click="deleteCheck(props.row)"
                     id="context-delete"
                   >
                     <q-item-section side>
@@ -206,16 +206,14 @@
 import { mapState, mapGetters } from "vuex";
 import mixins, { notifySuccessConfig, notifyErrorConfig } from "@/mixins/mixins";
 import PolicyStatus from "@/components/automation/modals/PolicyStatus";
-import AddDiskSpaceCheck from "@/components/modals/checks/AddDiskSpaceCheck";
-import EditDiskSpaceCheck from "@/components/modals/checks/EditDiskSpaceCheck";
+import DiskSpaceCheck from "@/components/modals/checks/DiskSpaceCheck";
 import AddPingCheck from "@/components/modals/checks/AddPingCheck";
 import EditPingCheck from "@/components/modals/checks/EditPingCheck";
 import AddCpuLoadCheck from "@/components/modals/checks/AddCpuLoadCheck";
 import EditCpuLoadCheck from "@/components/modals/checks/EditCpuLoadCheck";
 import AddMemCheck from "@/components/modals/checks/AddMemCheck";
 import EditMemCheck from "@/components/modals/checks/EditMemCheck";
-import AddWinSvcCheck from "@/components/modals/checks/AddWinSvcCheck";
-import EditWinSvcCheck from "@/components/modals/checks/EditWinSvcCheck";
+import WinSvcCheck from "@/components/modals/checks/WinSvcCheck";
 import AddScriptCheck from "@/components/modals/checks/AddScriptCheck";
 import EditScriptCheck from "@/components/modals/checks/EditScriptCheck";
 import AddEventLogCheck from "@/components/modals/checks/AddEventLogCheck";
@@ -225,16 +223,14 @@ export default {
   name: "PolicyChecksTab",
   components: {
     PolicyStatus,
-    AddDiskSpaceCheck,
-    EditDiskSpaceCheck,
+    DiskSpaceCheck,
     AddPingCheck,
     EditPingCheck,
     AddCpuLoadCheck,
     EditCpuLoadCheck,
     AddMemCheck,
     EditMemCheck,
-    AddWinSvcCheck,
-    EditWinSvcCheck,
+    WinSvcCheck,
     AddScriptCheck,
     EditScriptCheck,
     AddEventLogCheck,
@@ -286,10 +282,10 @@ export default {
       this.dialogComponent = component;
       this.showDialog = true;
     },
-    showEditDialog(category) {
-      switch (category) {
+    showEditDialog(check) {
+      switch (check.check_type) {
         case "diskspace":
-          this.dialogComponent = "EditDiskSpaceCheck";
+          this.dialogComponent = "DiskSpaceCheck";
           break;
         case "ping":
           this.dialogComponent = "EditPingCheck";
@@ -301,7 +297,7 @@ export default {
           this.dialogComponent = "EditMemCheck";
           break;
         case "winsvc":
-          this.dialogComponent = "EditWinSvcCheck";
+          this.dialogComponent = "WinSvcCheck";
           break;
         case "script":
           this.dialogComponent = "EditScriptCheck";
@@ -313,6 +309,7 @@ export default {
           return null;
       }
 
+      this.editCheckPK = check.id;
       this.showDialog = true;
 
     },
@@ -320,15 +317,15 @@ export default {
       this.showDialog = false;
       this.dialogComponent = null;
     },
-    deleteCheck(pk, check_type) {
+    deleteCheck(check) {
       this.$q
         .dialog({
-          title: `Delete ${check_type} check`,
+          title: `Delete ${check.check_type} check`,
           ok: { label: "Delete", color: "negative" },
           cancel: true,
         })
         .onOk(() => {
-          const data = { pk: pk, checktype: check_type };
+          const data = { pk: check.pk, checktype: check.check_type };
           this.$store
             .dispatch("deleteCheck", data)
             .then(r => {
diff --git a/web/src/store/automation.js b/web/src/store/automation.js
index 1d776d0b..860cca05 100644
--- a/web/src/store/automation.js
+++ b/web/src/store/automation.js
@@ -11,15 +11,7 @@ export default {
 
   getters: {
     allChecks(state) {
-      return [
-        ...state.checks.diskchecks,
-        ...state.checks.cpuloadchecks,
-        ...state.checks.memchecks,
-        ...state.checks.scriptchecks,
-        ...state.checks.winservicechecks,
-        ...state.checks.pingchecks,
-        ...state.checks.eventlogchecks
-      ];
+      return state.checks.checks
     },
     selectedPolicyPk(state) {
       return state.selectedPolicy;
@@ -56,7 +48,7 @@ export default {
       });
     },
     loadPolicyChecks(context, pk) {
-      axios.get(`/checks/${pk}/loadpolicychecks/`).then(r => {
+      axios.get(`/automation/${pk}/policychecks/`).then(r => {
         context.commit("setPolicyChecks", r.data);
       });
     },

From d298f375c2b18d63d8bc5de50fc4233604be102a Mon Sep 17 00:00:00 2001
From: Josh Krawczyk <josh@torchlake.com>
Date: Sat, 30 May 2020 10:04:12 -0400
Subject: [PATCH 3/5] Checks refactor

---
 api/tacticalrmm/automation/serializers.py     | 15 +-------
 api/tacticalrmm/automation/urls.py            |  1 -
 api/tacticalrmm/automation/views.py           | 12 ++----
 api/tacticalrmm/checks/urls.py                |  1 +
 api/tacticalrmm/checks/views.py               |  7 ++++
 .../components/automation/PolicyChecksTab.vue | 37 ++++++++++---------
 web/src/store/automation.js                   | 12 +++++-
 7 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/api/tacticalrmm/automation/serializers.py b/api/tacticalrmm/automation/serializers.py
index e56bf326..0812b114 100644
--- a/api/tacticalrmm/automation/serializers.py
+++ b/api/tacticalrmm/automation/serializers.py
@@ -1,8 +1,8 @@
 from rest_framework import serializers
 
 from .models import Policy
+from autotasks.models import AutomatedTask
 from autotasks.serializers import TaskSerializer
-from checks.serializers import CheckSerializer
 
 
 class PolicySerializer(serializers.ModelSerializer):
@@ -18,19 +18,6 @@ class PolicyRelationSerializer(serializers.ModelSerializer):
         depth = 2
 
 
-class CheckPolicySerializer(serializers.ModelSerializer):
-
-    checks = CheckSerializer(many=True, read_only=True)
-
-    class Meta:
-        model = Policy
-        fields = (
-            "id",
-            "name",
-            "checks",
-        )
-
-
 class AutoTaskPolicySerializer(serializers.ModelSerializer):
 
     autotasks = TaskSerializer(many=True, read_only=True)
diff --git a/api/tacticalrmm/automation/urls.py b/api/tacticalrmm/automation/urls.py
index c0b3e65d..b4c15fe6 100644
--- a/api/tacticalrmm/automation/urls.py
+++ b/api/tacticalrmm/automation/urls.py
@@ -6,7 +6,6 @@ urlpatterns = [
     path("policies/<int:pk>/related/", views.GetRelated.as_view()),
     path("policies/overview/", views.OverviewPolicy.as_view()),
     path("policies/<pk>/", views.GetUpdateDeletePolicy.as_view()),
-    path("<int:pk>/policychecks/", views.PolicyCheck.as_view()),
     path("<int:pk>/policyautomatedtasks/", views.PolicyAutoTask.as_view()),
     path("runwintask/<int:pk>/", views.RunPolicyTask.as_view()),
 ]
diff --git a/api/tacticalrmm/automation/views.py b/api/tacticalrmm/automation/views.py
index c4ce8dc3..cca922ef 100644
--- a/api/tacticalrmm/automation/views.py
+++ b/api/tacticalrmm/automation/views.py
@@ -1,10 +1,14 @@
+
+
 from django.db import DataError
 from django.shortcuts import get_object_or_404
 
+
 from rest_framework.views import APIView
 from rest_framework.response import Response
 from rest_framework import status
 
+
 from .models import Policy
 from agents.models import Agent
 from scripts.models import Script
@@ -21,7 +25,6 @@ from .serializers import (
     PolicySerializer,
     PolicyRelationSerializer,
     AutoTaskPolicySerializer,
-    CheckPolicySerializer
 )
 
 class GetAddPolicies(APIView):
@@ -103,7 +106,6 @@ class PolicyAutoTask(APIView):
         policy = get_object_or_404(Policy, pk=pk)
         return Response(AutoTaskPolicySerializer(policy).data)
 
-
 class RunPolicyTask(APIView):
     def get(self, request, pk):
 
@@ -111,12 +113,6 @@ class RunPolicyTask(APIView):
         return Response("ok")
 
 
-class PolicyCheck(APIView):
-    def get(self, request, pk):
-        policy = get_object_or_404(Policy, pk=pk)
-        return Response(CheckPolicySerializer(policy).data)
-
-
 class OverviewPolicy(APIView):
     def get(self, request):
 
diff --git a/api/tacticalrmm/checks/urls.py b/api/tacticalrmm/checks/urls.py
index 8121eb49..66cd9614 100644
--- a/api/tacticalrmm/checks/urls.py
+++ b/api/tacticalrmm/checks/urls.py
@@ -5,6 +5,7 @@ urlpatterns = [
     path("checks/", views.GetAddCheck.as_view()),
     path("<int:pk>/check/", views.GetUpdateDeleteCheck.as_view()),
     path("<pk>/loadchecks/", views.load_checks),
+    path("<pk>/loadpolicychecks/", views.load_policy_checks),
     path("checkrunner/", views.check_runner),
     path("getalldisks/", views.get_disks_for_policies),
     path("runchecks/<pk>/", views.run_checks),
diff --git a/api/tacticalrmm/checks/views.py b/api/tacticalrmm/checks/views.py
index 5103d209..fcb7920e 100644
--- a/api/tacticalrmm/checks/views.py
+++ b/api/tacticalrmm/checks/views.py
@@ -156,6 +156,13 @@ def load_checks(request, pk):
     checks = Check.objects.filter(agent__pk=pk)
     return Response(CheckSerializer(checks, many=True).data)
 
+
+@api_view()
+def load_policy_checks(request, pk):
+    policy = get_object_or_404(Policy, pk=pk)
+    return Response(PolicyChecksSerializer(policy).data)
+
+
 @api_view()
 def get_disks_for_policies(request):
     return Response(DiskCheck.all_disks())
diff --git a/web/src/components/automation/PolicyChecksTab.vue b/web/src/components/automation/PolicyChecksTab.vue
index 94281f05..7a048809 100644
--- a/web/src/components/automation/PolicyChecksTab.vue
+++ b/web/src/components/automation/PolicyChecksTab.vue
@@ -12,7 +12,7 @@
       >
         <q-menu>
           <q-list dense style="min-width: 200px">
-            <q-item clickable v-close-popup @click="showAddDialog('DiskSpaceCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('AddDiskSpaceCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="far fa-hdd" />
               </q-item-section>
@@ -36,7 +36,7 @@
               </q-item-section>
               <q-item-section>Memory Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showAddDialog('WinSvcCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('AddWinSvcCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-cogs" />
               </q-item-section>
@@ -99,14 +99,14 @@
           </template>
           <!-- body slots -->
           <template v-slot:body="props">
-            <q-tr :props="props">
+            <q-tr @contextmenu="editCheckPK = props.row.id" :props="props">
               <!-- context menu -->
               <q-menu context-menu>
                 <q-list dense style="min-width: 200px">
                   <q-item 
                     clickable 
                     v-close-popup 
-                    @click="showEditDialog(props.row)"
+                    @click="showEditDialog(props.row.check_type)"
                     id="context-edit"
                   >
                     <q-item-section side>
@@ -117,7 +117,7 @@
                   <q-item
                     clickable
                     v-close-popup
-                    @click="deleteCheck(props.row)"
+                    @click="deleteCheck(props.row.id, props.row.check_type)"
                     id="context-delete"
                   >
                     <q-item-section side>
@@ -206,14 +206,16 @@
 import { mapState, mapGetters } from "vuex";
 import mixins, { notifySuccessConfig, notifyErrorConfig } from "@/mixins/mixins";
 import PolicyStatus from "@/components/automation/modals/PolicyStatus";
-import DiskSpaceCheck from "@/components/modals/checks/DiskSpaceCheck";
+import AddDiskSpaceCheck from "@/components/modals/checks/AddDiskSpaceCheck";
+import EditDiskSpaceCheck from "@/components/modals/checks/EditDiskSpaceCheck";
 import AddPingCheck from "@/components/modals/checks/AddPingCheck";
 import EditPingCheck from "@/components/modals/checks/EditPingCheck";
 import AddCpuLoadCheck from "@/components/modals/checks/AddCpuLoadCheck";
 import EditCpuLoadCheck from "@/components/modals/checks/EditCpuLoadCheck";
 import AddMemCheck from "@/components/modals/checks/AddMemCheck";
 import EditMemCheck from "@/components/modals/checks/EditMemCheck";
-import WinSvcCheck from "@/components/modals/checks/WinSvcCheck";
+import AddWinSvcCheck from "@/components/modals/checks/AddWinSvcCheck";
+import EditWinSvcCheck from "@/components/modals/checks/EditWinSvcCheck";
 import AddScriptCheck from "@/components/modals/checks/AddScriptCheck";
 import EditScriptCheck from "@/components/modals/checks/EditScriptCheck";
 import AddEventLogCheck from "@/components/modals/checks/AddEventLogCheck";
@@ -223,14 +225,16 @@ export default {
   name: "PolicyChecksTab",
   components: {
     PolicyStatus,
-    DiskSpaceCheck,
+    AddDiskSpaceCheck,
+    EditDiskSpaceCheck,
     AddPingCheck,
     EditPingCheck,
     AddCpuLoadCheck,
     EditCpuLoadCheck,
     AddMemCheck,
     EditMemCheck,
-    WinSvcCheck,
+    AddWinSvcCheck,
+    EditWinSvcCheck,
     AddScriptCheck,
     EditScriptCheck,
     AddEventLogCheck,
@@ -282,10 +286,10 @@ export default {
       this.dialogComponent = component;
       this.showDialog = true;
     },
-    showEditDialog(check) {
-      switch (check.check_type) {
+    showEditDialog(category) {
+      switch (category) {
         case "diskspace":
-          this.dialogComponent = "DiskSpaceCheck";
+          this.dialogComponent = "EditDiskSpaceCheck";
           break;
         case "ping":
           this.dialogComponent = "EditPingCheck";
@@ -297,7 +301,7 @@ export default {
           this.dialogComponent = "EditMemCheck";
           break;
         case "winsvc":
-          this.dialogComponent = "WinSvcCheck";
+          this.dialogComponent = "EditWinSvcCheck";
           break;
         case "script":
           this.dialogComponent = "EditScriptCheck";
@@ -309,7 +313,6 @@ export default {
           return null;
       }
 
-      this.editCheckPK = check.id;
       this.showDialog = true;
 
     },
@@ -317,15 +320,15 @@ export default {
       this.showDialog = false;
       this.dialogComponent = null;
     },
-    deleteCheck(check) {
+    deleteCheck(pk, check_type) {
       this.$q
         .dialog({
-          title: `Delete ${check.check_type} check`,
+          title: `Delete ${check_type} check`,
           ok: { label: "Delete", color: "negative" },
           cancel: true,
         })
         .onOk(() => {
-          const data = { pk: check.pk, checktype: check.check_type };
+          const data = { pk: pk, checktype: check_type };
           this.$store
             .dispatch("deleteCheck", data)
             .then(r => {
diff --git a/web/src/store/automation.js b/web/src/store/automation.js
index 860cca05..1d776d0b 100644
--- a/web/src/store/automation.js
+++ b/web/src/store/automation.js
@@ -11,7 +11,15 @@ export default {
 
   getters: {
     allChecks(state) {
-      return state.checks.checks
+      return [
+        ...state.checks.diskchecks,
+        ...state.checks.cpuloadchecks,
+        ...state.checks.memchecks,
+        ...state.checks.scriptchecks,
+        ...state.checks.winservicechecks,
+        ...state.checks.pingchecks,
+        ...state.checks.eventlogchecks
+      ];
     },
     selectedPolicyPk(state) {
       return state.selectedPolicy;
@@ -48,7 +56,7 @@ export default {
       });
     },
     loadPolicyChecks(context, pk) {
-      axios.get(`/automation/${pk}/policychecks/`).then(r => {
+      axios.get(`/checks/${pk}/loadpolicychecks/`).then(r => {
         context.commit("setPolicyChecks", r.data);
       });
     },

From 466c31596798b265621838e1b6e4c064df34fbd6 Mon Sep 17 00:00:00 2001
From: Josh Krawczyk <josh@torchlake.com>
Date: Sat, 30 May 2020 11:38:51 -0400
Subject: [PATCH 4/5] Changes api and views to match new checks rework. Fixed
 the Vue tests to match the new data

---
 api/tacticalrmm/automation/serializers.py     |   2 +
 api/tacticalrmm/automation/urls.py            |   1 +
 api/tacticalrmm/automation/views.py           |   8 +
 api/tacticalrmm/checks/serializers.py         |  26 ----
 api/tacticalrmm/checks/urls.py                |   1 -
 api/tacticalrmm/checks/views.py               |   8 +-
 .../automation/AutomationManager.vue          |   2 +-
 .../components/automation/PolicyChecksTab.vue | 115 +++++++--------
 .../components/modals/checks/ScriptCheck.vue  |   4 -
 web/src/store/automation.js                   |  16 +-
 web/src/store/store.js                        |   4 +-
 .../unit/automation/automationmanager.spec.js |   6 +-
 .../unit/automation/policycheckstab.spec.js   | 137 +++++++++---------
 web/tests/unit/automation/policytasksstab.js  |   8 +
 .../unit/automation/policytasksstab.spec.js   |   1 -
 15 files changed, 145 insertions(+), 194 deletions(-)
 create mode 100644 web/tests/unit/automation/policytasksstab.js
 delete mode 100644 web/tests/unit/automation/policytasksstab.spec.js

diff --git a/api/tacticalrmm/automation/serializers.py b/api/tacticalrmm/automation/serializers.py
index 0812b114..81151e4f 100644
--- a/api/tacticalrmm/automation/serializers.py
+++ b/api/tacticalrmm/automation/serializers.py
@@ -3,6 +3,7 @@ from rest_framework import serializers
 from .models import Policy
 from autotasks.models import AutomatedTask
 from autotasks.serializers import TaskSerializer
+from checks.serializers import CheckSerializer
 
 
 class PolicySerializer(serializers.ModelSerializer):
@@ -29,3 +30,4 @@ class AutoTaskPolicySerializer(serializers.ModelSerializer):
             "name",
             "autotasks",
         )
+        
\ No newline at end of file
diff --git a/api/tacticalrmm/automation/urls.py b/api/tacticalrmm/automation/urls.py
index b4c15fe6..c0b3e65d 100644
--- a/api/tacticalrmm/automation/urls.py
+++ b/api/tacticalrmm/automation/urls.py
@@ -6,6 +6,7 @@ urlpatterns = [
     path("policies/<int:pk>/related/", views.GetRelated.as_view()),
     path("policies/overview/", views.OverviewPolicy.as_view()),
     path("policies/<pk>/", views.GetUpdateDeletePolicy.as_view()),
+    path("<int:pk>/policychecks/", views.PolicyCheck.as_view()),
     path("<int:pk>/policyautomatedtasks/", views.PolicyAutoTask.as_view()),
     path("runwintask/<int:pk>/", views.RunPolicyTask.as_view()),
 ]
diff --git a/api/tacticalrmm/automation/views.py b/api/tacticalrmm/automation/views.py
index cca922ef..d5ef9fb8 100644
--- a/api/tacticalrmm/automation/views.py
+++ b/api/tacticalrmm/automation/views.py
@@ -13,6 +13,7 @@ from .models import Policy
 from agents.models import Agent
 from scripts.models import Script
 from clients.models import Client, Site
+from checks.models import Check
 
 from clients.serializers import (
     ClientSerializer,
@@ -27,6 +28,8 @@ from .serializers import (
     AutoTaskPolicySerializer,
 )
 
+from checks.serializers import CheckSerializer
+
 class GetAddPolicies(APIView):
     def get(self, request):
 
@@ -112,6 +115,11 @@ class RunPolicyTask(APIView):
         # TODO: Run tasks for all Agents under policy
         return Response("ok")
 
+class PolicyCheck(APIView):
+    def get(self, request, pk):
+        checks = Check.objects.filter(policy__pk=pk)
+        return Response(CheckSerializer(checks, many=True).data)
+
 
 class OverviewPolicy(APIView):
     def get(self, request):
diff --git a/api/tacticalrmm/checks/serializers.py b/api/tacticalrmm/checks/serializers.py
index a529b4cc..95052bf5 100644
--- a/api/tacticalrmm/checks/serializers.py
+++ b/api/tacticalrmm/checks/serializers.py
@@ -57,29 +57,3 @@ class CheckSerializer(serializers.ModelSerializer):
                 )
 
         return val
-
-
-""" class PolicyChecksSerializer(serializers.ModelSerializer):
-    diskchecks = DiskCheckSerializer(many=True, read_only=True)
-    cpuloadchecks = CpuLoadCheckSerializer(many=True, read_only=True)
-    memchecks = MemCheckSerializer(many=True, read_only=True)
-    pingchecks = PingCheckSerializer(many=True, read_only=True)
-    winservicechecks = WinServiceCheckSerializer(many=True, read_only=True)
-    scriptchecks = ScriptCheckSerializer(many=True, read_only=True)
-    eventlogchecks = EventLogCheckSerializer(many=True, read_only=True)
-
-    class Meta:
-        model = Policy
-        fields = (
-            "id",
-            "name",
-            "active",
-            "diskchecks",
-            "cpuloadchecks",
-            "memchecks",
-            "pingchecks",
-            "winservicechecks",
-            "scriptchecks",
-            "eventlogchecks",
-        )
- """
diff --git a/api/tacticalrmm/checks/urls.py b/api/tacticalrmm/checks/urls.py
index 66cd9614..8121eb49 100644
--- a/api/tacticalrmm/checks/urls.py
+++ b/api/tacticalrmm/checks/urls.py
@@ -5,7 +5,6 @@ urlpatterns = [
     path("checks/", views.GetAddCheck.as_view()),
     path("<int:pk>/check/", views.GetUpdateDeleteCheck.as_view()),
     path("<pk>/loadchecks/", views.load_checks),
-    path("<pk>/loadpolicychecks/", views.load_policy_checks),
     path("checkrunner/", views.check_runner),
     path("getalldisks/", views.get_disks_for_policies),
     path("runchecks/<pk>/", views.run_checks),
diff --git a/api/tacticalrmm/checks/views.py b/api/tacticalrmm/checks/views.py
index fcb7920e..2242cfc6 100644
--- a/api/tacticalrmm/checks/views.py
+++ b/api/tacticalrmm/checks/views.py
@@ -157,12 +157,6 @@ def load_checks(request, pk):
     return Response(CheckSerializer(checks, many=True).data)
 
 
-@api_view()
-def load_policy_checks(request, pk):
-    policy = get_object_or_404(Policy, pk=pk)
-    return Response(PolicyChecksSerializer(policy).data)
-
-
 @api_view()
 def get_disks_for_policies(request):
-    return Response(DiskCheck.all_disks())
+    return Response(Check.all_disks())
diff --git a/web/src/components/automation/AutomationManager.vue b/web/src/components/automation/AutomationManager.vue
index 0391efa3..b51f36ac 100644
--- a/web/src/components/automation/AutomationManager.vue
+++ b/web/src/components/automation/AutomationManager.vue
@@ -247,7 +247,7 @@ export default {
     },
     clearRow() {
       this.$store.commit("automation/setSelectedPolicy", null);
-      this.$store.commit("automation/setPolicyChecks", {});
+      this.$store.commit("automation/setPolicyChecks", []);
       this.$store.commit("automation/setPolicyAutomatedTasks", {});
     },
     refresh() {
diff --git a/web/src/components/automation/PolicyChecksTab.vue b/web/src/components/automation/PolicyChecksTab.vue
index 7a048809..59c76a76 100644
--- a/web/src/components/automation/PolicyChecksTab.vue
+++ b/web/src/components/automation/PolicyChecksTab.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="Object.keys(checks).length === 0">No Policy Selected</div>
+  <div v-if="selectedPolicy === null">No Policy Selected</div>
   <div class="row" v-else>
     <div class="col-12">
       <q-btn 
@@ -12,43 +12,43 @@
       >
         <q-menu>
           <q-list dense style="min-width: 200px">
-            <q-item clickable v-close-popup @click="showAddDialog('AddDiskSpaceCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('DiskSpaceCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="far fa-hdd" />
               </q-item-section>
               <q-item-section>Disk Space Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showAddDialog('AddPingCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('PingCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-network-wired" />
               </q-item-section>
               <q-item-section>Ping Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showAddDialog('AddCpuLoadCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('CpuLoadCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-microchip" />
               </q-item-section>
               <q-item-section>CPU Load Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showAddDialog('AddMemCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('MemCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-memory" />
               </q-item-section>
               <q-item-section>Memory Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showAddDialog('AddWinSvcCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('WinSvcCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-cogs" />
               </q-item-section>
               <q-item-section>Windows Service Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showAddDialog('AddScriptCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('ScriptCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-terminal" />
               </q-item-section>
               <q-item-section>Script Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showAddDialog('AddEventLogCheck')">
+            <q-item clickable v-close-popup @click="showAddDialog('EventLogCheck')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-clipboard-list" />
               </q-item-section>
@@ -61,18 +61,18 @@
         dense 
         flat 
         push 
-        @click="onRefresh(checks.id)" 
+        @click="onRefresh(selectedPolicy)" 
         icon="refresh"
         ref="refresh"
       />
-      <template v-if="allChecks === undefined || allChecks.length === 0">
+      <template v-if="checks.length === 0">
         <p>No Checks</p>
       </template>
       <template v-else>
         <q-table
           dense
           class="tabs-tbl-sticky"
-          :data="allChecks"
+          :data="checks"
           :columns="columns"
           :row-key="row => row.id + row.check_type"
           binary-state-sort
@@ -99,14 +99,14 @@
           </template>
           <!-- body slots -->
           <template v-slot:body="props">
-            <q-tr @contextmenu="editCheckPK = props.row.id" :props="props">
+            <q-tr :props="props">
               <!-- context menu -->
               <q-menu context-menu>
                 <q-list dense style="min-width: 200px">
                   <q-item 
                     clickable 
                     v-close-popup 
-                    @click="showEditDialog(props.row.check_type)"
+                    @click="showEditDialog(props.row)"
                     id="context-edit"
                   >
                     <q-item-section side>
@@ -117,7 +117,7 @@
                   <q-item
                     clickable
                     v-close-popup
-                    @click="deleteCheck(props.row.id, props.row.check_type)"
+                    @click="deleteCheck(props.row)"
                     id="context-delete"
                   >
                     <q-item-section side>
@@ -195,8 +195,9 @@
         v-if="dialogComponent !== null"
         :is="dialogComponent" 
         @close="hideDialog" 
-        :policypk="checks.id" 
-        :editCheckPK="editCheckPK"
+        :policypk="selectedPolicy" 
+        :checkpk="editCheckPK"
+        :mode="!!editCheckPK ? 'edit' : 'add'"
       />
     </q-dialog>
   </div>
@@ -206,39 +207,25 @@
 import { mapState, mapGetters } from "vuex";
 import mixins, { notifySuccessConfig, notifyErrorConfig } from "@/mixins/mixins";
 import PolicyStatus from "@/components/automation/modals/PolicyStatus";
-import AddDiskSpaceCheck from "@/components/modals/checks/AddDiskSpaceCheck";
-import EditDiskSpaceCheck from "@/components/modals/checks/EditDiskSpaceCheck";
-import AddPingCheck from "@/components/modals/checks/AddPingCheck";
-import EditPingCheck from "@/components/modals/checks/EditPingCheck";
-import AddCpuLoadCheck from "@/components/modals/checks/AddCpuLoadCheck";
-import EditCpuLoadCheck from "@/components/modals/checks/EditCpuLoadCheck";
-import AddMemCheck from "@/components/modals/checks/AddMemCheck";
-import EditMemCheck from "@/components/modals/checks/EditMemCheck";
-import AddWinSvcCheck from "@/components/modals/checks/AddWinSvcCheck";
-import EditWinSvcCheck from "@/components/modals/checks/EditWinSvcCheck";
-import AddScriptCheck from "@/components/modals/checks/AddScriptCheck";
-import EditScriptCheck from "@/components/modals/checks/EditScriptCheck";
-import AddEventLogCheck from "@/components/modals/checks/AddEventLogCheck";
-import EditEventLogCheck from "@/components/modals/checks/EditEventLogCheck";
+import DiskSpaceCheck from "@/components/modals/checks/DiskSpaceCheck";
+import PingCheck from "@/components/modals/checks/PingCheck";
+import CpuLoadCheck from "@/components/modals/checks/CpuLoadCheck";
+import MemCheck from "@/components/modals/checks/MemCheck";
+import WinSvcCheck from "@/components/modals/checks/WinSvcCheck";
+import ScriptCheck from "@/components/modals/checks/ScriptCheck";
+import EventLogCheck from "@/components/modals/checks/EventLogCheck";
 
 export default {
   name: "PolicyChecksTab",
   components: {
     PolicyStatus,
-    AddDiskSpaceCheck,
-    EditDiskSpaceCheck,
-    AddPingCheck,
-    EditPingCheck,
-    AddCpuLoadCheck,
-    EditCpuLoadCheck,
-    AddMemCheck,
-    EditMemCheck,
-    AddWinSvcCheck,
-    EditWinSvcCheck,
-    AddScriptCheck,
-    EditScriptCheck,
-    AddEventLogCheck,
-    EditEventLogCheck
+    DiskSpaceCheck,
+    PingCheck,
+    CpuLoadCheck,
+    MemCheck,
+    WinSvcCheck,
+    ScriptCheck,
+    EventLogCheck,
   },
   mixins: [mixins],
   data() {
@@ -286,33 +273,33 @@ export default {
       this.dialogComponent = component;
       this.showDialog = true;
     },
-    showEditDialog(category) {
-      switch (category) {
+    showEditDialog(check) {
+      switch (check.check_type) {
         case "diskspace":
-          this.dialogComponent = "EditDiskSpaceCheck";
+          this.dialogComponent = "DiskSpaceCheck";
           break;
         case "ping":
-          this.dialogComponent = "EditPingCheck";
+          this.dialogComponent = "PingCheck";
           break;
         case "cpuload":
-          this.dialogComponent = "EditCpuLoadCheck";
+          this.dialogComponent = "CpuLoadCheck";
           break;
         case "memory":
-          this.dialogComponent = "EditMemCheck";
+          this.dialogComponent = "MemCheck";
           break;
         case "winsvc":
-          this.dialogComponent = "EditWinSvcCheck";
+          this.dialogComponent = "WinSvcCheck";
           break;
         case "script":
-          this.dialogComponent = "EditScriptCheck";
+          this.dialogComponent = "ScriptCheck";
           break;
         case "eventlog":
-          this.dialogComponent = "EditEventLogCheck";
+          this.dialogComponent = "EventLogCheck";
           break;
         default:
           return null;
       }
-
+      this.editCheckPK = check.id
       this.showDialog = true;
 
     },
@@ -320,22 +307,22 @@ export default {
       this.showDialog = false;
       this.dialogComponent = null;
     },
-    deleteCheck(pk, check_type) {
+    deleteCheck(check) {
       this.$q
         .dialog({
-          title: `Delete ${check_type} check`,
+          title: `Delete ${check.check_type} check`,
           ok: { label: "Delete", color: "negative" },
           cancel: true,
         })
         .onOk(() => {
-          const data = { pk: pk, checktype: check_type };
+          const data = { pk: check.id, checktype: check.check_type };
           this.$store
             .dispatch("deleteCheck", data)
             .then(r => {
-              this.$store.dispatch("automation/loadPolicyChecks", this.checks.id);
-              this.$q.notify(notifySuccessConfig);
+              this.$store.dispatch("automation/loadPolicyChecks", check.id);
+              this.$q.notify(notifySuccessConfig("Check Deleted!"));
             })
-            .catch(e => this.$q.notify(notifyErrorConfig));
+            .catch(e => this.$q.notify(notifyErrorConfig("An Error Occurred while deleting")));
         });
     },
     showPolicyCheckStatusModal(check) {
@@ -364,12 +351,10 @@ export default {
     }
   },
   computed: {
-    ...mapState({
-      checks: state => state.automation.checks
-    }),
     ...mapGetters({
-      allChecks: "automation/allChecks"
-    })
+      checks: "automation/checks",
+      selectedPolicy: "automation/selectedPolicyPk"
+      })
   }
 };
 </script>
diff --git a/web/src/components/modals/checks/ScriptCheck.vue b/web/src/components/modals/checks/ScriptCheck.vue
index 8c83adc8..339852e8 100644
--- a/web/src/components/modals/checks/ScriptCheck.vue
+++ b/web/src/components/modals/checks/ScriptCheck.vue
@@ -65,10 +65,6 @@
 
 <script>
 import axios from "axios";
-<<<<<<< HEAD:web/src/components/modals/checks/ScriptCheck.vue
-=======
-import { mapState, mapGetters } from "vuex";
->>>>>>> More Vue Tests:web/src/components/modals/checks/AddScriptCheck.vue
 import mixins from "@/mixins/mixins";
 import { mapGetters, mapState } from "vuex";
 export default {
diff --git a/web/src/store/automation.js b/web/src/store/automation.js
index 1d776d0b..0c11ae6f 100644
--- a/web/src/store/automation.js
+++ b/web/src/store/automation.js
@@ -4,22 +4,14 @@ export default {
   namespaced: true,
   state: {
     selectedPolicy: null,
-    checks: {},
+    checks: [],
     automatedTasks: {},
     policies: [],
   },
 
   getters: {
-    allChecks(state) {
-      return [
-        ...state.checks.diskchecks,
-        ...state.checks.cpuloadchecks,
-        ...state.checks.memchecks,
-        ...state.checks.scriptchecks,
-        ...state.checks.winservicechecks,
-        ...state.checks.pingchecks,
-        ...state.checks.eventlogchecks
-      ];
+    checks(state) {
+      return state.checks;
     },
     selectedPolicyPk(state) {
       return state.selectedPolicy;
@@ -56,7 +48,7 @@ export default {
       });
     },
     loadPolicyChecks(context, pk) {
-      axios.get(`/checks/${pk}/loadpolicychecks/`).then(r => {
+      axios.get(`/automation/${pk}/policychecks/`).then(r => {
         context.commit("setPolicyChecks", r.data);
       });
     },
diff --git a/web/src/store/store.js b/web/src/store/store.js
index ee7668c0..90b84bf9 100644
--- a/web/src/store/store.js
+++ b/web/src/store/store.js
@@ -202,7 +202,7 @@ export const store = new Vuex.Store({
             child_single.push({
               label: sites_arr[i].split("|")[0],
               id: sites_arr[i].split("|")[1],
-              raw: sites_arr[i],
+              raw: `Site|${sites_arr[i]}`,
               header: "generic",
               icon: "apartment",
               iconColor: sites_arr[i].split("|")[2]
@@ -211,7 +211,7 @@ export const store = new Vuex.Store({
           output.push({
             label: prop.split("|")[0],
             id: prop.split("|")[1],
-            raw: prop,
+            raw: `Client|${prop}`,
             header: "root",
             icon: "business",
             iconColor: prop.split("|")[2],
diff --git a/web/tests/unit/automation/automationmanager.spec.js b/web/tests/unit/automation/automationmanager.spec.js
index 3940d90f..bda8223b 100644
--- a/web/tests/unit/automation/automationmanager.spec.js
+++ b/web/tests/unit/automation/automationmanager.spec.js
@@ -97,7 +97,7 @@ describe("AutomationManager.vue", () => {
 
     expect(actions.loadPolicies).toHaveBeenCalled();
     expect(mutations.setSelectedPolicy).toHaveBeenCalledWith(expect.anything(), null);
-    expect(mutations.setPolicyChecks).toHaveBeenCalledWith(expect.anything(), {});
+    expect(mutations.setPolicyChecks).toHaveBeenCalledWith(expect.anything(), []);
     expect(mutations.setPolicyAutomatedTasks).toHaveBeenCalledWith(expect.anything(), {});
 
   });
@@ -206,7 +206,7 @@ describe("AutomationManager.vue", () => {
     expect(bodyWrapper.find(".q-dialog").exists()).toBe(true);
 
     expect(mutations.setSelectedPolicy).toHaveBeenCalledWith(expect.anything(), null);
-    expect(mutations.setPolicyChecks).toHaveBeenCalledWith(expect.anything(), {});
+    expect(mutations.setPolicyChecks).toHaveBeenCalledWith(expect.anything(), []);
     expect(mutations.setPolicyAutomatedTasks).toHaveBeenCalledWith(expect.anything(), {});
 
   });
@@ -218,7 +218,7 @@ describe("AutomationManager.vue", () => {
     button.trigger("click");
     expect(actions.loadPolicies).toHaveBeenCalled();
     expect(mutations.setSelectedPolicy).toHaveBeenCalledWith(expect.anything(), null);
-    expect(mutations.setPolicyChecks).toHaveBeenCalledWith(expect.anything(), {});
+    expect(mutations.setPolicyChecks).toHaveBeenCalledWith(expect.anything(), []);
     expect(mutations.setPolicyAutomatedTasks).toHaveBeenCalledWith(expect.anything(), {});
 
   });
diff --git a/web/tests/unit/automation/policycheckstab.spec.js b/web/tests/unit/automation/policycheckstab.spec.js
index 549f77e4..67e58741 100644
--- a/web/tests/unit/automation/policycheckstab.spec.js
+++ b/web/tests/unit/automation/policycheckstab.spec.js
@@ -30,13 +30,24 @@ afterEach(() => {
 /***   TEST SUITES   ***/
 describe("PolicyChecksTab.vue with no policy selected", () => {
 
-  let wrapper, state, store;
+  let wrapper, state, getters, store;
   // Runs before every test
   beforeEach(() => {
 
+    // Create the Test store
     // Create the Test store
     state = {
-      checks: {},
+      checks: [],
+      selectedPolicy: null
+    };
+
+    getters = {
+      checks(state) {
+        return state.checks
+      },
+      selectedPolicyPk(state) {
+        return state.selectedPolicy
+      }
     };
 
     store = new Vuex.Store({
@@ -44,6 +55,7 @@ describe("PolicyChecksTab.vue with no policy selected", () => {
         automation: {
           namespaced: true,
           state,
+          getters
         }
       }
     });
@@ -67,13 +79,13 @@ describe("PolicyChecksTab.vue with policy selected and no checks", () => {
 
   // Used for the add check test loop
   const addChecksMenu = [
-    { name: "AddDiskSpaceCheck", index: 0 },
-    { name: "AddPingCheck", index: 1},
-    { name: "AddCpuLoadCheck", index: 2},
-    { name: "AddMemCheck", index: 3},
-    { name: "AddWinSvcCheck", index: 4},
-    { name: "AddScriptCheck", index: 5},
-    { name: "AddEventLogCheck", index: 6}
+    { name: "DiskSpaceCheck", index: 0 },
+    { name: "PingCheck", index: 1},
+    { name: "CpuLoadCheck", index: 2},
+    { name: "MemCheck", index: 3},
+    { name: "WinSvcCheck", index: 4},
+    { name: "ScriptCheck", index: 5},
+    { name: "EventLogCheck", index: 6}
   ];
 
   let wrapper, store, state, actions, getters;
@@ -82,30 +94,16 @@ describe("PolicyChecksTab.vue with policy selected and no checks", () => {
 
     // Create the Test store
     state = {
-      checks: {
-        id: 1,
-        name: "Test Policy",
-        diskchecks: [],
-        cpuloadchecks: [],
-        memchecks: [],
-        scriptchecks: [],
-        winservicechecks: [],
-        pingchecks: [],
-        eventlogchecks: []
-      }
+      checks: [],
+      selectedPolicy: 1
     };
 
     getters = {
-      allChecks(state) {
-        return [
-        ...state.checks.diskchecks,
-        ...state.checks.cpuloadchecks,
-        ...state.checks.memchecks,
-        ...state.checks.scriptchecks,
-        ...state.checks.winservicechecks,
-        ...state.checks.pingchecks,
-        ...state.checks.eventlogchecks
-        ];
+      checks(state) {
+        return state.checks
+      },
+      selectedPolicyPk(state) {
+        return state.selectedPolicy
       }
     };
 
@@ -129,13 +127,13 @@ describe("PolicyChecksTab.vue with policy selected and no checks", () => {
       store,
       localVue,
       stubs: [
-        "AddDiskSpaceCheck",
-        "AddPingCheck",
-        "AddCpuLoadCheck",
-        "AddMemCheck",
-        "AddWinSvcCheck",
-        "AddScriptCheck",
-        "AddEventLogCheck"
+        "DiskSpaceCheck",
+        "PingCheck",
+        "CpuLoadCheck",
+        "MemCheck",
+        "WinSvcCheck",
+        "ScriptCheck",
+        "EventLogCheck"
       ]
     });
   
@@ -179,45 +177,40 @@ describe("PolicyChecksTab.vue with policy selected and checks", () => {
 
   // Used for the edit check test loop
   const editChecksModals = [
-    {name: "EditDiskSpaceCheck", index: 0, id: 1},
-    {name: "EditCpuLoadCheck", index: 1, id: 2},
-    {name: "EditMemCheck", index: 2, id: 3},
-    {name: "EditScriptCheck", index: 3, id: 4},
-    {name: "EditWinSvcCheck", index: 4, id: 5},
-    {name: "EditPingCheck", index: 5, id: 6},
-    {name: "EditEventLogCheck", index: 6, id: 7}
+    {name: "DiskSpaceCheck", index: 0, id: 1},
+    {name: "CpuLoadCheck", index: 1, id: 2},
+    {name: "MemCheck", index: 2, id: 3},
+    {name: "ScriptCheck", index: 3, id: 4},
+    {name: "WinSvcCheck", index: 4, id: 5},
+    {name: "PingCheck", index: 5, id: 6},
+    {name: "EventLogCheck", index: 6, id: 7}
   ];
 
   let state, rootActions, actions, getters, store, wrapper;
   // Runs before every test
   beforeEach(() => {
 
+    // Create the Test store
     // Create the Test store
     state = {
-      checks: {
-        id: 1,
-        name: "Test Policy",
-        diskchecks: [diskcheck],
-        cpuloadchecks: [cpuloadcheck],
-        memchecks: [memcheck],
-        scriptchecks: [scriptcheck],
-        winservicechecks: [winservicecheck],
-        pingchecks: [pingcheck],
-        eventlogchecks: [eventlogcheck]
-      },
+      checks: [
+        diskcheck,
+        cpuloadcheck,
+        memcheck,
+        scriptcheck,
+        winservicecheck,
+        pingcheck,
+        eventlogcheck
+      ],
+      selectedPolicy: 1
     };
 
     getters = {
-      allChecks(state) {
-        return [
-          ...state.checks.diskchecks,
-          ...state.checks.cpuloadchecks,
-          ...state.checks.memchecks,
-          ...state.checks.scriptchecks,
-          ...state.checks.winservicechecks,
-          ...state.checks.pingchecks,
-          ...state.checks.eventlogchecks
-        ];
+      checks(state) {
+        return state.checks
+      },
+      selectedPolicyPk(state) {
+        return state.selectedPolicy
       }
     };
 
@@ -247,13 +240,13 @@ describe("PolicyChecksTab.vue with policy selected and checks", () => {
       store,
       localVue,
       stubs: [
-        "EditDiskSpaceCheck",
-        "EditPingCheck",
-        "EditCpuLoadCheck",
-        "EditMemCheck",
-        "EditWinSvcCheck",
-        "EditScriptCheck",
-        "EditEventLogCheck",
+        "DiskSpaceCheck",
+        "PingCheck",
+        "CpuLoadCheck",
+        "MemCheck",
+        "WinSvcCheck",
+        "ScriptCheck",
+        "EventLogCheck",
         "PolicyStatus"
       ]
     });
diff --git a/web/tests/unit/automation/policytasksstab.js b/web/tests/unit/automation/policytasksstab.js
new file mode 100644
index 00000000..ffbe7e60
--- /dev/null
+++ b/web/tests/unit/automation/policytasksstab.js
@@ -0,0 +1,8 @@
+import { mount, shallowMount, createLocalVue, createWrapper } from "@vue/test-utils";
+import PolicyAutomatedTasksTab from "@/components/automation/PolicyAutomatedTasksTab";
+import Vuex from "vuex";
+import "@/quasar.js";
+
+describe.skip("PolicyAutomatedTasks.vue", () => {
+    // TODO after checks rework
+});
\ No newline at end of file
diff --git a/web/tests/unit/automation/policytasksstab.spec.js b/web/tests/unit/automation/policytasksstab.spec.js
deleted file mode 100644
index 4c3ba928..00000000
--- a/web/tests/unit/automation/policytasksstab.spec.js
+++ /dev/null
@@ -1 +0,0 @@
-// TODO after checks rework
\ No newline at end of file

From ac3905ee08556a99f58fe2352bf5b75d6471299e Mon Sep 17 00:00:00 2001
From: Josh Krawczyk <josh@torchlake.com>
Date: Sat, 30 May 2020 11:51:55 -0400
Subject: [PATCH 5/5] Fix Django Tests

---
 api/tacticalrmm/checks/tests.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/tacticalrmm/checks/tests.py b/api/tacticalrmm/checks/tests.py
index 54292972..7f1c10e5 100644
--- a/api/tacticalrmm/checks/tests.py
+++ b/api/tacticalrmm/checks/tests.py
@@ -4,7 +4,7 @@ from .serializers import CheckSerializer  # , PolicyChecksSerializer
 
 class TestCheckViews(BaseTestCase):
     def test_add_disk_check(self):
-        url = "/checks/addstandardcheck/"
+        url = "/checks/"
         disk_data = {
             "pk": self.agent.pk,
             "check_type": "diskspace",
@@ -22,7 +22,7 @@ class TestCheckViews(BaseTestCase):
         self.check_not_authenticated("post", url)
 
     def test_add_policy_disk_check(self):
-        url = "/checks/addstandardcheck/"
+        url = "/checks/"
         policy_disk_data = {
             "policy": self.policy.pk,
             "check_type": "diskspace",
@@ -32,7 +32,7 @@ class TestCheckViews(BaseTestCase):
         }
         resp = self.client.post(url, policy_disk_data, format="json")
         self.assertEqual(resp.status_code, 200)
-        data = PolicyChecksSerializer(self.policy).data
+        data = CheckSerializer(self.policy).data
         self.assertEqual(data["diskchecks"][0]["threshold"], 87)
         self.assertEqual(data["diskchecks"][0]["failures"], 1)
         self.assertEqual(data["diskchecks"][0]["disk"], "M:")