Hide users tab from bucket view when LDAP is enabled

Author: Alevsk

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

@@ -280,7 +280,8 @@ const ViewBucket = ({
 
   const bucketName = match.params["bucketName"];
   const ilmEnabled = session.features?.indexOf("ilm") > -1;
-
+  const usersEnabled = session.pages?.indexOf("/users") > -1;
+  console.log("usersEnabled", usersEnabled);
   // check the permissions for creating bucket
   useEffect(() => {
     if (loadingPerms) {
@@ -417,7 +418,7 @@ const ViewBucket = ({
   }, [loadingPolicy, setErrorSnackMessage, bucketName]);
 
   useEffect(() => {
-    if (loadingUsers) {
+    if (loadingUsers && usersEnabled) {
       api
         .invoke("GET", `/api/v1/bucket-users/${bucketName}`)
         .then((res: any) => {
@@ -947,7 +948,7 @@ const ViewBucket = ({
                   <Tab label="Replication" {...a11yProps(1)} />
                 )}
                 <Tab label="Policies" {...a11yProps(2)} />
-                <Tab label="Users" {...a11yProps(3)} />
+                {usersEnabled && <Tab label="Users" {...a11yProps(3)} />}
                 {ilmEnabled && <Tab label="Lifecycle" {...a11yProps(4)} />}
               </Tabs>
             </Grid>
@@ -1056,15 +1057,18 @@ const ViewBucket = ({
                 idField="name"
               />
             </TabPanel>
-            <TabPanel index={3} value={curTab}>
-              <TableWrapper
-                columns={[{ label: "User", elementKey: "accessKey" }]}
-                isLoading={loadingUsers}
-                records={bucketUsers}
-                entityName="Users"
-                idField="accessKey"
-              />
-            </TabPanel>
+
+            {usersEnabled && (
+              <TabPanel index={3} value={curTab}>
+                <TableWrapper
+                  columns={[{ label: "User", elementKey: "accessKey" }]}
+                  isLoading={loadingUsers}
+                  records={bucketUsers}
+                  entityName="Users"
+                  idField="accessKey"
+                />
+              </TabPanel>
+            )}
             <TabPanel index={4} value={curTab}>
               <TableWrapper
                 itemActions={[]}

restapi/error.go

@@ -31,7 +31,8 @@ var (
 	errPolicyNameNotInRequest             = errors.New("error policy name not in request")
 	errPolicyBodyNotInRequest             = errors.New("error policy body not in request")
 	errInvalidEncryptionAlgorithm         = errors.New("error invalid encryption algorithm")
-	errSSENotConfigured                   = errors.New("error server side encryption configuration was not found")
+	errSSENotConfigured                   = errors.New("error server side encryption configuration not found")
+	errBucketLifeCycleNotConfigured       = errors.New("error bucket life cycle configuration not found")
 	errChangePassword                     = errors.New("error please check your current password")
 	errInvalidLicense                     = errors.New("invalid license key")
 	errLicenseNotFound                    = errors.New("license not found")
@@ -99,6 +100,16 @@ func prepareError(err ...error) *models.Error {
 			errorCode = 401
 			errorMessage = errorGenericInvalidSession.Error()
 		}
+		// Bucket life cycle not configured
+		if errors.Is(err[0], errBucketLifeCycleNotConfigured) {
+			errorCode = 404
+			errorMessage = errBucketLifeCycleNotConfigured.Error()
+		}
+		// Encryption not configured
+		if errors.Is(err[0], errSSENotConfigured) {
+			errorCode = 404
+			errorMessage = errSSENotConfigured.Error()
+		}
 		// account change password
 		if madmin.ToErrorResponse(err[0]).Code == "SignatureDoesNotMatch" {
 			errorCode = 403

restapi/user_buckets_lifecycle.go

@@ -106,7 +106,7 @@ func getBucketLifecycleResponse(session *models.Principal, params user_api.GetBu
 
 	bucketEvents, err := getBucketLifecycle(ctx, minioClient, params.BucketName)
 	if err != nil {
-		return nil, prepareError(err)
+		return nil, prepareError(errBucketLifeCycleNotConfigured, err)
 	}
 	return bucketEvents, nil
 }