Integrate mkube storageclass api with UI

Author: cesnietor

portal-ui/bindata_assetfs.go

@@ -28,7 +28,6 @@ import CheckboxWrapper from "../../Common/FormComponents/CheckboxWrapper/Checkbo
 import SelectWrapper from "../../Common/FormComponents/SelectWrapper/SelectWrapper";
 import { k8sfactorForDropdown } from "../../../../common/utils";
 import ZonesMultiSelector from "./ZonesMultiSelector";
-import { storageClasses } from "../utils";
 
 interface IAddTenantProps {
   open: boolean;
@@ -76,6 +75,11 @@ const AddTenant = ({
   const [enableMCS, setEnableMCS] = useState<boolean>(false);
   const [enableSSL, setEnableSSL] = useState<boolean>(false);
   const [sizeFactor, setSizeFactor] = useState<string>("Gi");
+  const [storageClasses, setStorageClassesList] = useState<string[]>([]);
+
+  useEffect(() => {
+    fetchStorageClassList();
+  }, []);
 
   useEffect(() => {
     if (addSending) {
@@ -87,7 +91,7 @@ const AddTenant = ({
       }
 
       api
-        .invoke("POST", `/api/v1/tenants`, {
+        .invoke("POST", `/api/v1/mkube/tenants`, {
           name: tenantName,
           service_name: tenantName,
           image: imageName,
@@ -124,6 +128,26 @@ const AddTenant = ({
     setVolumeConfiguration(volumeCopy);
   };
 
+  const fetchStorageClassList = () => {
+    api
+      .invoke("GET", `/api/v1/mkube/storage-classes`)
+      .then((res: string[]) => {
+        let classes: string[] = [];
+        if (res !== null) {
+          classes = res;
+        }
+        setStorageClassesList(classes);
+      })
+      .catch((err: any) => {
+        console.log(err);
+      });
+  };
+
+  const storageClassesList = storageClasses.map((s: string) => ({
+    label: s,
+    value: s,
+  }));
+
   return (
     <ModalWrapper
       title="Create Tenant"
@@ -255,7 +279,7 @@ const AddTenant = ({
                 }}
                 label="Storage Class"
                 value={volumeConfiguration.storage_class}
-                options={storageClasses}
+                options={storageClassesList}
               />
             </Grid>
             <Grid item xs={12}>

portal-ui/src/screens/Console/Tenants/ListTenants/AddTenant.tsx

@@ -54,7 +54,7 @@ const DeleteTenant = ({
   useEffect(() => {
     if (deleteLoading) {
       api
-        .invoke("DELETE", `/api/v1/tenants/${selectedTenant}`)
+        .invoke("DELETE", `/api/v1/mkube/tenants/${selectedTenant}`)
         .then(() => {
           setDeleteLoading(false);
           setDeleteError("");

portal-ui/src/screens/Console/Tenants/ListTenants/DeleteTenant.tsx

@@ -150,7 +150,7 @@ const ListTenants = ({ classes }: ITenantsList) => {
         api
           .invoke(
             "GET",
-            `/api/v1/tenants?offset=${offset}&limit=${rowsPerPage}`
+            `/api/v1/mkube/tenants?offset=${offset}&limit=${rowsPerPage}`
           )
           .then((res: ITenantsResponse) => {
             if (res === null) {

portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx

@@ -164,7 +164,7 @@ func FileServerMiddleware(next http.Handler) http.Handler {
 		switch {
 		case strings.HasPrefix(r.URL.Path, "/ws"):
 			serveWS(w, r)
-		case strings.HasPrefix(r.URL.Path, "/api/v1/tenants"):
+		case strings.HasPrefix(r.URL.Path, "/api/v1/mkube"):
 			client := &http.Client{}
 			serverMkube(client, w, r)
 		case strings.HasPrefix(r.URL.Path, "/api"):

portal-ui/src/screens/Console/Tenants/utils.ts

@@ -30,6 +30,7 @@ import (
 // serverMkube handles calls for mkube
 func serverMkube(client *http.Client, w http.ResponseWriter, req *http.Request) {
 	// destination of the request, the mkube server
+	req.URL.Path = strings.Replace(req.URL.Path, "/mkube", "", 1)
 	targetURL := fmt.Sprintf("%s%s", getM3Host(), req.URL.String())
 
 	// set the HTTP method, url, and m3Req body