Delete cluster in cluster edit [Cluster management ** HOLD**]

tornjak-frontend/src/components/cluster-edit.js

@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import axios from 'axios';
 import { Dropdown, TextInput, MultiSelect, TextArea } from 'carbon-components-react';
+import Button from '@material-ui/core/Button';
 import GetApiServerUri from './helpers';
 import IsManager from './is_manager';
 import TornjakApi from './tornjak-api-helpers';
@@ -29,6 +30,7 @@ class ClusterEdit extends Component {
     this.onChangeClusterManagedBy = this.onChangeClusterManagedBy.bind(this);
     this.prepareClusterNameList = this.prepareClusterNameList.bind(this);
     this.onChangeAgentsList = this.onChangeAgentsList.bind(this);
+    this.deleteCluster = this.deleteCluster.bind(this);
     this.onSubmit = this.onSubmit.bind(this);
 
     this.state = {
@@ -210,6 +212,36 @@ class ClusterEdit extends Component {
     }
   }
 
+  deleteCluster() {
+    var cluster = this.state.clusterName, successMessage = "";
+    var inputData =
+    {
+      "cluster": {
+        "name": cluster
+      }
+    }
+    if (cluster === "") {
+      return window.alert("Please Choose a Cluster!");
+    }
+    var confirm = window.confirm("Are you sure you want to delete the cluster?");
+    if (!confirm) {
+      return
+    }
+    if (IsManager) {
+      successMessage = this.TornjakApi.clusterDelete(this.props.globalServerSelected, inputData, this.props.clustersListUpdateFunc, this.props.globalClustersList);
+    } else {
+      successMessage = this.TornjakApi.localClusterDelete(inputData, this.props.clustersListUpdateFunc, this.props.globalClustersList);
+    }
+    successMessage.then(function (result) {
+      if (result === "SUCCESS") {
+        window.alert("CLUSTER DELETED SUCCESSFULLY!");
+        window.location.reload();
+      } else {
+        window.alert("Error deleting cluster: " + result);
+      }
+    })
+  }
+
   onSubmit(e) {
     e.preventDefault();
 
@@ -256,13 +288,13 @@ class ClusterEdit extends Component {
           statusOK: "ERROR"
         })
       )
-      if (IsManager) {
-        if (this.props.globalServerSelected !== "" && (this.props.globalErrorMessage === "OK" || this.props.globalErrorMessage === "")) {
-          this.TornjakApi.populateClustersUpdate(this.props.globalServerSelected, this.props.clustersListUpdateFunc, this.props.tornjakMessageFunc);
-        }
-      } else {
-        this.TornjakApi.populateLocalClustersUpdate(this.props.clustersListUpdateFunc, this.props.tornjakMessageFunc);
+    if (IsManager) {
+      if (this.props.globalServerSelected !== "" && (this.props.globalErrorMessage === "OK" || this.props.globalErrorMessage === "")) {
+        this.TornjakApi.populateClustersUpdate(this.props.globalServerSelected, this.props.clustersListUpdateFunc, this.props.tornjakMessageFunc);
       }
+    } else {
+      this.TornjakApi.populateLocalClustersUpdate(this.props.clustersListUpdateFunc, this.props.tornjakMessageFunc);
+    }
   }
   render() {
     const ClusterNames = this.state.clusterNameList, ClusterType = this.props.clusterTypeList;
@@ -372,9 +404,17 @@ class ClusterEdit extends Component {
                   disabled
                 />
               </div>
-              <div className="form-group">
+              <div className="edit-cluster-button">
                 <input type="submit" value="Edit Cluster" className="btn btn-primary" />
               </div>
+              <div className="delete-cluster-button">
+                <Button
+                  variant="contained"
+                  color="secondary"
+                  onClick={this.deleteCluster}>
+                  Delete Cluster
+                </Button>
+              </div>
               <div>
                 {this.state.statusOK === "OK" &&
                   <p className="success-message">--CLUSTER SUCCESSFULLY EDITED--</p>

tornjak-frontend/src/components/cluster-management.js

@@ -68,7 +68,6 @@ class ClusterManagement extends Component {
     // user prefered option
     localClusterTypeList[0] = this.state.clusterTypeManualEntryOption;
     // cluster type list
-    console.log("this.props.globalClusterTypeInfo", this.props.globalClusterTypeInfo)
     for (let i = 0; i < this.props.globalClusterTypeInfo.length; i++) {
       localClusterTypeList[i + 1] = this.props.globalClusterTypeInfo[i];
     }

tornjak-frontend/src/components/style.css

@@ -161,4 +161,12 @@
   .no-data {
     margin-top: 120px;
     margin-left: 200px;
+  }
+
+  .edit-cluster-button {
+    display: inline-block;
+  }
+  .delete-cluster-button {
+    width: 180px;
+    float: right;
   }

tornjak-frontend/src/components/tornjak-api-helpers.js

@@ -101,8 +101,9 @@ class TornjakApi extends Component {
   // populateTornjakAgentInfo returns tornjak info of requested agents including cluster name and selector
   populateTornjakAgentInfo = (serverName, agentworkloadSelectorInfoFunc, inputData) => {
     axios.post(GetApiServerUri("/manager-api/tornjak/agents/list/") + serverName, inputData,
-              { crossdomain: true,
-              })
+      {
+        crossdomain: true,
+      })
       .then(response => {
         agentworkloadSelectorInfoFunc(response.data["agents"]);
       })
@@ -114,8 +115,9 @@ class TornjakApi extends Component {
   // populateLocalTornjakAgentInfo returns tornjak info of requested agents including cluster name and selector
   populateLocalTornjakAgentInfo = (agentworkloadSelectorInfoFunc, inputData) => {
     axios.post(GetApiServerUri("/api/tornjak/agents/list"), inputData,
-              { crossdomain: true,
-              })
+      {
+        crossdomain: true,
+      })
       .then(response => {
         agentworkloadSelectorInfoFunc(response.data["agents"])
       })
@@ -171,39 +173,39 @@ class TornjakApi extends Component {
   }
 
   populateEntriesUpdate = (serverName, entriesListUpdateFunc, tornjakMessageFunc) => {
-    axios.get(GetApiServerUri('/manager-api/entry/list/') + serverName, {crossdomain: true})
-    .then(response => {
-      if(!response.data["entries"]) {
+    axios.get(GetApiServerUri('/manager-api/entry/list/') + serverName, { crossdomain: true })
+      .then(response => {
+        if (!response.data["entries"]) {
+          entriesListUpdateFunc([]);
+        } else { entriesListUpdateFunc(response.data["entries"]); }
+        tornjakMessageFunc(response.statusText);
+      }).catch(error => {
         entriesListUpdateFunc([]);
-      } else {entriesListUpdateFunc(response.data["entries"]);}
-      tornjakMessageFunc(response.statusText);
-    }).catch(error => {
-      entriesListUpdateFunc([]);
-      tornjakMessageFunc("Error retrieving " + serverName + " : " + error + (typeof (error.response) !== "undefined" ? ":" + error.response.data : ""));
-    })
+        tornjakMessageFunc("Error retrieving " + serverName + " : " + error + (typeof (error.response) !== "undefined" ? ":" + error.response.data : ""));
+      })
   }
 
   populateLocalEntriesUpdate = (entriesListUpdateFunc, tornjakMessageFunc) => {
-    axios.get(GetApiServerUri('/api/entry/list'), {crossdomain: true})
-    .then(response => {
-      if(!response.data["entries"]) {
+    axios.get(GetApiServerUri('/api/entry/list'), { crossdomain: true })
+      .then(response => {
+        if (!response.data["entries"]) {
+          entriesListUpdateFunc([]);
+        } else { entriesListUpdateFunc(response.data["entries"]); }
+        tornjakMessageFunc(response.statusText);
+      }).catch(error => {
+        console.log(error);
         entriesListUpdateFunc([]);
-      } else {entriesListUpdateFunc(response.data["entries"]);}
-      tornjakMessageFunc(response.statusText);
-    }).catch(error => {
-      console.log(error);
-      entriesListUpdateFunc([]);
-      tornjakMessageFunc(error.message);
-    })
+        tornjakMessageFunc(error.message);
+      })
   }
 
   // populateAgentsUpdate returns the list of agents with their info in manager mode for the selected server
   populateAgentsUpdate = (serverName, agentsListUpdateFunc, tornjakMessageFunc) => {
     axios.get(GetApiServerUri('/manager-api/agent/list/') + serverName, { crossdomain: true })
       .then(response => {
-        if(!response.data["agents"]) {
+        if (!response.data["agents"]) {
           agentsListUpdateFunc([]);
-        } else {agentsListUpdateFunc(response.data["agents"]);}
+        } else { agentsListUpdateFunc(response.data["agents"]); }
         tornjakMessageFunc(response.statusText);
       }).catch(error => {
         agentsListUpdateFunc([]);
@@ -216,9 +218,9 @@ class TornjakApi extends Component {
   populateLocalAgentsUpdate = (agentsListUpdateFunc, tornjakMessageFunc) => {
     axios.get(GetApiServerUri('/api/agent/list'), { crossdomain: true })
       .then(response => {
-        if(!response.data["agents"]) {
+        if (!response.data["agents"]) {
           agentsListUpdateFunc([]);
-        } else {agentsListUpdateFunc(response.data["agents"]);}
+        } else { agentsListUpdateFunc(response.data["agents"]); }
         tornjakMessageFunc(response.statusText);
       })
       .catch((error) => {
@@ -252,6 +254,39 @@ class TornjakApi extends Component {
       })
   }
 
+  // clusterDelete - returns success message after successful deletion of a cluster in manager mode
+  async clusterDelete(serverName, inputData, clustersListUpdateFunc, globalClustersList) {
+    const response = await axios.post(GetApiServerUri("/manager-api/tornjak/clusters/delete/") + serverName, inputData,
+      {
+        crossdomain: true,
+      })
+      .then(function (response) {
+        clustersListUpdateFunc(globalClustersList.filter(el =>
+          el.name !== inputData))
+        return response.data;
+      })
+      .catch(function (error) {
+        return error.message;
+      })
+      return response;
+  }
+
+  // localClusterDelete - returns success message after successful deletion of a cluster in Local mode for the server
+  async localClusterDelete(inputData, clustersListUpdateFunc, globalClustersList) {
+    const response = await axios.post(GetApiServerUri("/api/tornjak/clusters/delete"), inputData,
+      {
+        crossdomain: true,
+      })
+      .then(function (response) {
+        clustersListUpdateFunc(globalClustersList.filter(el =>
+          el.name !== inputData))
+        return response.data;
+      })
+      .catch(function (error) {
+        return error.message;
+      })
+      return response;
+  }
 }
 
 export default TornjakApi;