From 4b67ffc5e5ccfb6df4580ed2c314c47c0e9551a7 Mon Sep 17 00:00:00 2001 From: sadnub Date: Thu, 28 Oct 2021 10:34:16 -0400 Subject: [PATCH] rework deployments ui, implement client/site permisssions, and tests --- src/api/clients.js | 20 ++ src/components/Deployment.vue | 136 -------------- src/components/FileBar.vue | 23 +-- src/components/clients/Deployment.vue | 171 ++++++++++++++++++ src/components/clients/NewDeployment.vue | 132 ++++++++++++++ .../modals/clients/NewDeployment.vue | 150 --------------- 6 files changed, 330 insertions(+), 302 deletions(-) delete mode 100644 src/components/Deployment.vue create mode 100644 src/components/clients/Deployment.vue create mode 100644 src/components/clients/NewDeployment.vue delete mode 100644 src/components/modals/clients/NewDeployment.vue diff --git a/src/api/clients.js b/src/api/clients.js index e502a8f..faa9c6e 100644 --- a/src/api/clients.js +++ b/src/api/clients.js @@ -2,6 +2,7 @@ import axios from "axios" const baseUrl = "/clients" +// client endpoints export async function fetchClients() { try { const { data } = await axios.get(`${baseUrl}/`) @@ -31,6 +32,7 @@ export async function removeClient(id, params = {}) { return data } +// site endpoints export async function fetchSites() { try { const { data } = await axios.get(`${baseUrl}/sites/`) @@ -59,3 +61,21 @@ export async function removeSite(id, params = {}) { const { data } = await axios.delete(`${baseUrl}/sites/${id}/`, { params: params }) return data } + +// deployment endpoints +export async function fetchDeployments() { + try { + const { data } = await axios.get(`${baseUrl}/deployments/`) + return data + } catch (e) { console.error(e) } +} + +export async function saveDeployment(payload) { + const { data } = await axios.post(`${baseUrl}/deployments/`, payload) + return data +} + +export async function removeDeployment(id, params = {}) { + const { data } = await axios.delete(`${baseUrl}/deployments/${id}/`, { params: params }) + return data +} \ No newline at end of file diff --git a/src/components/Deployment.vue b/src/components/Deployment.vue deleted file mode 100644 index 0bd71cd..0000000 --- a/src/components/Deployment.vue +++ /dev/null @@ -1,136 +0,0 @@ - - - \ No newline at end of file diff --git a/src/components/FileBar.vue b/src/components/FileBar.vue index adb3233..3a4d64c 100644 --- a/src/components/FileBar.vue +++ b/src/components/FileBar.vue @@ -48,7 +48,7 @@ Install Agent - + Manage Deployments @@ -163,10 +163,6 @@ - - - - @@ -195,7 +191,7 @@ import AdminManager from "@/components/AdminManager"; import InstallAgent from "@/components/modals/agents/InstallAgent"; import AuditManager from "@/components/logs/AuditManager"; import BulkAction from "@/components/modals/agents/BulkAction"; -import Deployment from "@/components/Deployment"; +import Deployment from "@/components/clients/Deployment"; import ServerMaintenance from "@/components/modals/core/ServerMaintenance"; import CodeSign from "@/components/modals/coresettings/CodeSign"; import PermissionsManager from "@/components/accounts/PermissionsManager"; @@ -208,7 +204,6 @@ export default { EditCoreSettings, InstallAgent, AdminManager, - Deployment, ServerMaintenance, CodeSign, PermissionsManager, @@ -220,7 +215,6 @@ export default { showEditCoreSettingsModal: false, showAdminManager: false, showInstallAgent: false, - showDeployment: false, showCodeSign: false, }; }, @@ -248,14 +242,6 @@ export default { } window.open(url, "_blank"); }, - showBulkActionModal(mode) { - this.bulkMode = mode; - this.showBulkAction = true; - }, - closeBulkActionModal() { - this.bulkMode = null; - this.showBulkAction = false; - }, showAutomationManager() { this.$q.dialog({ component: AutomationManager, @@ -338,6 +324,11 @@ export default { component: PendingActions, }); }, + showDeployments() { + this.$q.dialog({ + component: Deployment, + }); + }, edited() { this.$emit("edit"); }, diff --git a/src/components/clients/Deployment.vue b/src/components/clients/Deployment.vue new file mode 100644 index 0000000..6f5b760 --- /dev/null +++ b/src/components/clients/Deployment.vue @@ -0,0 +1,171 @@ + + + \ No newline at end of file diff --git a/src/components/clients/NewDeployment.vue b/src/components/clients/NewDeployment.vue new file mode 100644 index 0000000..0545ffa --- /dev/null +++ b/src/components/clients/NewDeployment.vue @@ -0,0 +1,132 @@ + + + \ No newline at end of file diff --git a/src/components/modals/clients/NewDeployment.vue b/src/components/modals/clients/NewDeployment.vue deleted file mode 100644 index 4f8261a..0000000 --- a/src/components/modals/clients/NewDeployment.vue +++ /dev/null @@ -1,150 +0,0 @@ - - - \ No newline at end of file