rename to tenants

Author: dvaldivia

pkg/acl/endpoints.go

@@ -35,8 +35,8 @@ var (
 	buckets         = "/buckets"
 	bucketsDetail   = "/buckets/:bucketName"
 	serviceAccounts = "/service-accounts"
-	clusters        = "/clusters"
-	clustersDetail  = "/clusters/:clusterName"
+	tenants         = "/tenants"
+	tenantsDetail   = "/tenants/:tenantName"
 	heal            = "/heal"
 )
 
@@ -192,8 +192,8 @@ var serviceAccountsActionSet = ConfigurationActionSet{
 	actions:     iampolicy.NewActionSet(),
 }
 
-// clustersActionSet temporally no actions needed for clusters sections to work
-var clustersActionSet = ConfigurationActionSet{
+// tenantsActionSet temporally no actions needed for tenants sections to work
+var tenantsActionSet = ConfigurationActionSet{
 	actionTypes: iampolicy.NewActionSet(),
 	actions:     iampolicy.NewActionSet(),
 }
@@ -228,8 +228,8 @@ var endpointRules = map[string]ConfigurationActionSet{
 
 // operatorRules contains the mapping between endpoints and ActionSets for operator only mode
 var operatorRules = map[string]ConfigurationActionSet{
-	clusters:       clustersActionSet,
-	clustersDetail: clustersActionSet,
+	tenants:       tenantsActionSet,
+	tenantsDetail: tenantsActionSet,
 }
 
 // operatorOnly ENV variable

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

@@ -64,10 +64,10 @@ import Trace from "./Trace/Trace";
 import Logs from "./Logs/Logs";
 import Heal from "./Heal/Heal";
 import Watch from "./Watch/Watch";
-import ListClusters from "./Clusters/ListClusters/ListClusters";
+import ListTenants from "./Tenants/ListTenants/ListTenants";
 import { ISessionResponse } from "./types";
 import { saveSessionResponse } from "./actions";
-import ClusterDetails from "./Clusters/ClusterDetails/ClusterDetails";
+import TenantDetails from "./Tenants/TenantDetails/TenantDetails";
 
 function Copyright() {
   return (
@@ -301,11 +301,11 @@ const Console = ({
       path: "/webhook/audit",
     },
     {
-      component: ListClusters,
-      path: "/clusters",
+      component: ListTenants,
+      path: "/tenants",
     },
     {
-      component: ClusterDetails,
+      component: TenantDetails,
       path: "/clusters/:clusterName",
     },
   ];

portal-ui/src/screens/Console/Menu.tsx

@@ -246,8 +246,8 @@ class Menu extends React.Component<MenuProps> {
         group: "Operator",
         type: "item",
         component: NavLink,
-        to: "/clusters",
-        name: "Clusters",
+        to: "/tenants",
+        name: "Tenants",
         icon: <StorageIcon />,
       },
       {

portal-ui/src/screens/Console/Clusters/ListClusters/AddCluster.tsx renamed to portal-ui/src/screens/Console/Tenants/ListTenants/AddTenant.tsx

@@ -30,7 +30,7 @@ import { k8sfactorForDropdown } from "../../../../common/utils";
 import ZonesMultiSelector from "./ZonesMultiSelector";
 import { storageClasses } from "../utils";
 
-interface IAddClusterProps {
+interface IAddTenantProps {
   open: boolean;
   closeModalAndRefresh: (reloadData: boolean) => any;
   classes: any;
@@ -55,14 +55,14 @@ const styles = (theme: Theme) =>
     ...modalBasic,
   });
 
-const AddCluster = ({
+const AddTenant = ({
   open,
   closeModalAndRefresh,
   classes,
-}: IAddClusterProps) => {
+}: IAddTenantProps) => {
   const [addSending, setAddSending] = useState<boolean>(false);
   const [addError, setAddError] = useState<string>("");
-  const [clusterName, setClusterName] = useState<string>("");
+  const [tenantName, setTenantName] = useState<string>("");
   const [imageName, setImageName] = useState<string>("");
   const [serviceName, setServiceName] = useState<string>("");
   const [zones, setZones] = useState<IZone[]>([]);
@@ -87,9 +87,9 @@ const AddCluster = ({
       }
 
       api
-        .invoke("POST", `/api/v1/clusters`, {
-          name: clusterName,
-          service_name: clusterName,
+        .invoke("POST", `/api/v1/tenants`, {
+          name: tenantName,
+          service_name: tenantName,
           enable_ssl: enableSSL,
           enable_mcs: enableMCS,
           access_key: accessKey,
@@ -124,7 +124,7 @@ const AddCluster = ({
 
   return (
     <ModalWrapper
-      title="Create Cluster"
+      title="Create Tenant"
       modalOpen={open}
       onClose={() => {
         setAddError("");
@@ -156,13 +156,13 @@ const AddCluster = ({
             )}
             <Grid item xs={12}>
               <InputBoxWrapper
-                id="cluster-name"
-                name="cluster-name"
+                id="tenant-name"
+                name="tenant-name"
                 onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setClusterName(e.target.value);
+                  setTenantName(e.target.value);
                 }}
-                label="Cluster Name"
-                value={clusterName}
+                label="Tenant Name"
+                value={tenantName}
               />
             </Grid>
             <Grid item xs={12}>
@@ -341,4 +341,4 @@ const AddCluster = ({
   );
 };
 
-export default withStyles(styles)(AddCluster);
+export default withStyles(styles)(AddTenant);

portal-ui/src/screens/Console/Clusters/ListClusters/DeleteCluster.tsx renamed to portal-ui/src/screens/Console/Tenants/ListTenants/DeleteTenant.tsx

@@ -28,10 +28,10 @@ import Typography from "@material-ui/core/Typography";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import api from "../../../../common/api";
 
-interface IDeleteCluster {
+interface IDeleteTenant {
   classes: any;
   deleteOpen: boolean;
-  selectedCluster: string;
+  selectedTenant: string;
   closeDeleteModalAndRefresh: (refreshList: boolean) => any;
 }
 
@@ -42,19 +42,19 @@ const styles = (theme: Theme) =>
     },
   });
 
-const DeleteCluster = ({
+const DeleteTenant = ({
   classes,
   deleteOpen,
-  selectedCluster,
+  selectedTenant,
   closeDeleteModalAndRefresh,
-}: IDeleteCluster) => {
+}: IDeleteTenant) => {
   const [deleteLoading, setDeleteLoading] = useState(false);
   const [deleteError, setDeleteError] = useState("");
 
   useEffect(() => {
     if (deleteLoading) {
       api
-        .invoke("DELETE", `/api/v1/clusters/${selectedCluster}`)
+        .invoke("DELETE", `/api/v1/clusters/${selectedTenant}`)
         .then(() => {
           setDeleteLoading(false);
           setDeleteError("");
@@ -81,11 +81,11 @@ const DeleteCluster = ({
       aria-labelledby="alert-dialog-title"
       aria-describedby="alert-dialog-description"
     >
-      <DialogTitle id="alert-dialog-title">Delete Cluster</DialogTitle>
+      <DialogTitle id="alert-dialog-title">Delete Tenant</DialogTitle>
       <DialogContent>
         {deleteLoading && <LinearProgress />}
         <DialogContentText id="alert-dialog-description">
-          Are you sure you want to delete cluster <b>{selectedCluster}</b>?
+          Are you sure you want to delete tenant <b>{selectedTenant}</b>?
           {deleteError !== "" && (
             <React.Fragment>
               <br />
@@ -119,4 +119,4 @@ const DeleteCluster = ({
   );
 };
 
-export default withStyles(styles)(DeleteCluster);
+export default withStyles(styles)(DeleteTenant);

portal-ui/src/screens/Console/Clusters/ListClusters/ListClusters.tsx renamed to portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx

@@ -24,18 +24,14 @@ import { Button } from "@material-ui/core";
 import { CreateIcon } from "../../../../icons";
 import TableWrapper from "../../Common/TableWrapper/TableWrapper";
 import { MinTablePaginationActions } from "../../../../common/MinTablePaginationActions";
-import AddCluster from "./AddCluster";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import DeleteCluster from "./DeleteCluster";
-import { Link } from "react-router-dom";
 import api from "../../../../common/api";
-import { PolicyList } from "../../Policies/types";
-import { GroupsList } from "../../Groups/types";
-import { stringSort } from "../../../../utils/sortFunctions";
-import { ICluster, IClustersResponse } from "./types";
+import { ITenant, ITenantsResponse } from "./types";
 import { niceBytes } from "../../../../common/utils";
+import DeleteTenant from "./DeleteTenant";
+import AddTenant from "./AddTenant";
 
-interface IClustersList {
+interface ITenantsList {
   classes: any;
 }
 
@@ -83,20 +79,20 @@ const styles = (theme: Theme) =>
     },
   });
 
-const ListClusters = ({ classes }: IClustersList) => {
-  const [createClusterOpen, setCreateClusterOpen] = useState<boolean>(false);
+const ListTenants = ({ classes }: ITenantsList) => {
+  const [createTenantOpen, setCreateTenantOpen] = useState<boolean>(false);
   const [deleteOpen, setDeleteOpen] = useState<boolean>(false);
-  const [selectedCluster, setSelectedCluster] = useState<any>(null);
+  const [selectedTenant, setSelectedTenant] = useState<any>(null);
   const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [filterClusters, setFilterClusters] = useState<string>("");
+  const [filterTenants, setFilterTenants] = useState<string>("");
   const [records, setRecords] = useState<any[]>([]);
   const [offset, setOffset] = useState<number>(0);
   const [rowsPerPage, setRowsPerPage] = useState<number>(10);
   const [page, setPage] = useState<number>(0);
   const [error, setError] = useState<string>("");
 
   const closeAddModalAndRefresh = (reloadData: boolean) => {
-    setCreateClusterOpen(false);
+    setCreateTenantOpen(false);
 
     if (reloadData) {
       setIsLoading(true);
@@ -111,8 +107,8 @@ const ListClusters = ({ classes }: IClustersList) => {
     }
   };
 
-  const confirmDeleteCluster = (cluster: string) => {
-    setSelectedCluster(cluster);
+  const confirmDeleteTenant = (tenant: string) => {
+    setSelectedTenant(tenant);
     setDeleteOpen(true);
   };
 
@@ -129,17 +125,17 @@ const ListClusters = ({ classes }: IClustersList) => {
   };
 
   const tableActions = [
-    { type: "view", to: `/clusters`, sendOnlyId: true },
-    { type: "delete", onClick: confirmDeleteCluster, sendOnlyId: true },
+    { type: "view", to: `/tenants`, sendOnlyId: true },
+    { type: "delete", onClick: confirmDeleteTenant, sendOnlyId: true },
   ];
 
   const filteredRecords = records
     .slice(offset, offset + rowsPerPage)
     .filter((b: any) => {
-      if (filterClusters === "") {
+      if (filterTenants === "") {
         return true;
       } else {
-        if (b.name.indexOf(filterClusters) >= 0) {
+        if (b.name.indexOf(filterTenants) >= 0) {
           return true;
         } else {
           return false;
@@ -154,30 +150,30 @@ const ListClusters = ({ classes }: IClustersList) => {
         api
           .invoke(
             "GET",
-            `/api/v1/clusters?offset=${offset}&limit=${rowsPerPage}`
+            `/api/v1/tenants?offset=${offset}&limit=${rowsPerPage}`
           )
-          .then((res: IClustersResponse) => {
+          .then((res: ITenantsResponse) => {
             if (res === null) {
               setIsLoading(false);
               return;
             }
-            let resClusters: ICluster[] = [];
-            if (res.clusters !== null) {
-              resClusters = res.clusters;
+            let resTenants: ITenant[] = [];
+            if (res.tenants !== null) {
+              resTenants = res.tenants;
             }
 
-            for (let i = 0; i < resClusters.length; i++) {
+            for (let i = 0; i < resTenants.length; i++) {
               const total =
-                resClusters[i].volume_count * resClusters[i].volume_size;
-              resClusters[i].capacity = niceBytes(total + "");
+                resTenants[i].volume_count * resTenants[i].volume_size;
+              resTenants[i].capacity = niceBytes(total + "");
             }
 
-            setRecords(resClusters);
+            setRecords(resTenants);
             setError("");
             setIsLoading(false);
 
             // if we get 0 results, and page > 0 , go down 1 page
-            if ((!res.clusters || res.clusters.length === 0) && page > 0) {
+            if ((!res.tenants || res.tenants.length === 0) && page > 0) {
               const newPage = page - 1;
               setPage(newPage);
             }
@@ -197,34 +193,34 @@ const ListClusters = ({ classes }: IClustersList) => {
 
   return (
     <React.Fragment>
-      {createClusterOpen && (
-        <AddCluster
-          open={createClusterOpen}
+      {createTenantOpen && (
+        <AddTenant
+          open={createTenantOpen}
           closeModalAndRefresh={closeAddModalAndRefresh}
         />
       )}
       {deleteOpen && (
-        <DeleteCluster
+        <DeleteTenant
           deleteOpen={deleteOpen}
-          selectedCluster={selectedCluster}
+          selectedTenant={selectedTenant}
           closeDeleteModalAndRefresh={closeDeleteModalAndRefresh}
         />
       )}
       <Grid container>
         <Grid item xs={12}>
-          <Typography variant="h6">Clusters</Typography>
+          <Typography variant="h6">Tenants</Typography>
         </Grid>
         <Grid item xs={12}>
           <br />
         </Grid>
         <Grid item xs={12} className={classes.actionsTray}>
           <TextField
-            placeholder="Search Clusters"
+            placeholder="Search Tenants"
             className={classes.searchField}
             id="search-resource"
             label=""
             onChange={(val) => {
-              setFilterClusters(val.target.value);
+              setFilterTenants(val.target.value);
             }}
             InputProps={{
               disableUnderline: true,
@@ -240,10 +236,10 @@ const ListClusters = ({ classes }: IClustersList) => {
             color="primary"
             startIcon={<CreateIcon />}
             onClick={() => {
-              setCreateClusterOpen(true);
+              setCreateTenantOpen(true);
             }}
           >
-            Create Cluster
+            Create Tenant
           </Button>
         </Grid>
         <Grid item xs={12}>
@@ -260,7 +256,7 @@ const ListClusters = ({ classes }: IClustersList) => {
             ]}
             isLoading={isLoading}
             records={filteredRecords}
-            entityName="Clusters"
+            entityName="Tenants"
             idField="name"
             paginatorConfig={{
               rowsPerPageOptions: [5, 10, 25],
@@ -283,4 +279,4 @@ const ListClusters = ({ classes }: IClustersList) => {
   );
 };
 
-export default withStyles(styles)(ListClusters);
+export default withStyles(styles)(ListTenants);