Frontend changes and api and backend changes to delete server

Signed-off-by: Harshit Gupta <[email protected]>

Author: atpugtihsrah

api/manager/api.go

@@ -36,3 +36,7 @@ func (s *Server) RegisterServer(inp RegisterServerRequest) error {
 
 	return s.db.CreateServerEntry(sinfo)
 }
+
+type DeleteServerRequest struct {
+	Server managertypes.ServerInfo `json:"server"`
+}

api/manager/server.go

@@ -185,6 +185,7 @@ func (s *Server) HandleRequests() {
 	// Manger-specific
 	rtr.HandleFunc("/manager-api/server/list", corsHandler(s.serverList))
 	rtr.HandleFunc("/manager-api/server/register", corsHandler(s.serverRegister))
+	rtr.HandleFunc("/manager-api/server/delete/", corsHandler(s.serverDelete))
 
 	// SPIRE server info calls
 	rtr.HandleFunc("/manager-api/healthcheck/{server:.*}", corsHandler(s.apiServerProxyFunc("/api/v1/spire/healthcheck", http.MethodGet)))
@@ -330,3 +331,50 @@ func (s *Server) serverRegister(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 }
+
+func (s *Server) serverDelete(w http.ResponseWriter, r *http.Request) {
+	fmt.Println("Endpoint Hit: Server Delete")
+
+	buf := new(strings.Builder)
+
+	n, err := io.Copy(buf, r.Body)
+	if err != nil {
+		emsg := fmt.Sprintf("Error parsing data: %v", err.Error())
+		retError(w, emsg, http.StatusBadRequest)
+		return
+	}
+	data := buf.String()
+
+	var input DeleteServerRequest
+	if n == 0 {
+		input = DeleteServerRequest{}
+	} else {
+		err := json.Unmarshal([]byte(data), &input)
+		if err != nil {
+			emsg := fmt.Sprintf("Error parsing data: %v", err.Error())
+			retError(w, emsg, http.StatusBadRequest)
+			return
+		}
+	}
+
+	if input.Server.Name == "" {
+		retError(w, "Server name is missing", http.StatusBadRequest)
+		return
+	}
+
+	err = s.db.DeleteServer(input.Server.Name)
+	if err != nil {
+		emsg := fmt.Sprintf("Error: %v", err.Error())
+		retError(w, emsg, http.StatusInternalServerError)
+		return
+	}
+
+	cors(w, r)
+	_, err = w.Write([]byte("SUCCESS"))
+
+	if err != nil {
+		emsg := fmt.Sprintf("Error: %v", err.Error())
+		retError(w, emsg, http.StatusInternalServerError)
+		return
+	}
+}

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

@@ -10,6 +10,7 @@ import {
   ServerInfo,
   EntriesList,
   ClustersList,
+  ServersList,
   DebugServerInfo,
   FederationsList
 } from './types';
@@ -344,6 +345,23 @@ class TornjakApi extends Component<TornjakApiProp, TornjakApiState> {
     return response.data;
   }
 
+  async serverDelete(inputData: { server: { name: string; }; }, serversListUpdateFunc: { (globalServersList: ServersList[]): void }, globalServersList: any[]) {
+    const response = await axios.post(GetApiServerUri("/manager-api/server/delete/"), inputData,
+      {
+        crossdomain: true,
+      })
+      .then(function (response) {
+        serversListUpdateFunc(globalServersList.filter(el =>
+          el.name !== inputData))
+        return response.data;
+      })
+      .catch(function (error) {
+        return error.message;
+      })
+    return response;
+  }
+
+
   // populateClustersUpdate returns the list of clusters with their info in manager mode for the selected server
   populateClustersUpdate = (serverName: string,
     clustersListUpdateFunc: { (globalClustersList: ClustersList[]): void; },

frontend/src/tables/servers-list-table.tsx

@@ -1,15 +1,17 @@
 import React from "react";
 import { connect } from 'react-redux';
-// import IsManager from 'components/is_manager';
+import IsManager from 'components/is_manager';
 import {
     serversListUpdateFunc
 } from 'redux/actions';
 import Table from './list-table';
 import { ServersList } from "components/types";
-// import { DenormalizedRow } from "carbon-components-react";
+import { DenormalizedRow } from "carbon-components-react";
 import { RootState } from "redux/reducers";
 import TornjakApi from 'components/tornjak-api-helpers';
 
+
+
 // ServersListTable takes in 
 // listTableData: servers data to be rendered on table
 // returns servers data inside a carbon component table with specified functions
@@ -50,7 +52,7 @@ class ServersListTable extends React.Component<ServersListTableProp, ServersList
             listTableData: [],
         };
         this.prepareTableData = this.prepareTableData.bind(this);
-        // this.deleteServer = this.deleteServer.bind(this);
+        this.deleteServer = this.deleteServer.bind(this);
     }
 
     componentDidMount() {
@@ -85,30 +87,25 @@ class ServersListTable extends React.Component<ServersListTableProp, ServersList
         })
     }
 
-    //Note: future implementation - server delete function 
-    // keep code
-    // deleteServer(selectedRows: readonly DenormalizedRow[]) {
-    //     if (!selectedRows || selectedRows.length === 0) return "";
-    //     let server: { name: string }[] = [], successMessage
+    deleteServer(selectedRows: readonly DenormalizedRow[]) {
+        if (!selectedRows || selectedRows.length === 0) return "";
+        if (!IsManager) return "";
+        let server: { name: string }[] = [], successMessage
 
-    //     for (let i = 0; i < selectedRows.length; i++) {
-    //         server[i] = { name: selectedRows[i].cells[1].value };
-    //         if (IsManager) {
-    //             successMessage = this.TornjakApi.serverDelete(this.props.globalServerSelected, { server: server[i] }, this.props.serversListUpdateFunc, this.props.globalServersList);
-    //         } else {
-    //             successMessage = this.TornjakApi.localServerDelete({ server: server[i] }, this.props.serversListUpdateFunc, this.props.globalServersList);
-    //         }
-    //         successMessage.then(function (result) {
-    //             if (result === "SUCCESS") {
-    //                 window.alert(`CLUSTER "${server[i].name}" DELETED SUCCESSFULLY!`);
-    //                 window.location.reload();
-    //             } else {
-    //                 window.alert(`Error deleting server "${server[i].name}": ` + result);
-    //             }
-    //             return;
-    //         })
-    //     }
-    // }
+        for (let i = 0; i < selectedRows.length; i++) {
+            server[i] = { name: selectedRows[i].cells[1].value };
+            successMessage = this.TornjakApi.serverDelete({ server: server[i] }, this.props.serversListUpdateFunc, this.props.globalServersList);
+            successMessage.then(function (result) {
+                if (result === "SUCCESS") {
+                    window.alert(`SERVER "${server[i].name}" DELETED SUCCESSFULLY!`);
+                    window.location.reload();
+                } else {
+                    window.alert(`Error deleting server "${server[i].name}": ` + result);
+                }
+                return;
+            })
+        }
+    }
 
 
     render() {
@@ -141,7 +138,7 @@ class ServersListTable extends React.Component<ServersListTableProp, ServersList
                     entityType={"Server"}
                     listTableData={listTableData}
                     headerData={headerData}
-                    deleteEntity={undefined}
+                    deleteEntity={this.deleteServer}
                     banEntity={undefined}
                     downloadEntity={undefined} />
             </div>