(ranger) branch ranger-2.6 updated: RANGER-4984: Ranger Federated User enum order should be correct to avoid potential failure in Ranger Admin

[rmani]

This is an automated email from the ASF dual-hosted git repository.

rmani pushed a commit to branch ranger-2.6
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.6 by this push:
     new 39741b852 RANGER-4984: Ranger Federated User enum order should be 
correct to avoid potential failure in Ranger Admin
39741b852 is described below

commit 39741b852ddab13ff840ace82b52a52dc8ed437b
Author: Ramesh Mani <rm...@apache.org>
AuthorDate: Wed Nov 6 08:03:14 2024 -0800

    RANGER-4984: Ranger Federated User enum order should be correct to avoid 
potential failure in Ranger Admin
---
 .../java/org/apache/ranger/common/RangerCommonEnums.java     | 12 ++++++------
 .../src/main/webapp/react-webapp/src/utils/XAEnums.js        |  2 +-
 security-admin/src/main/webapp/scripts/utils/XAEnums.js      |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java 
b/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java
index ad40b3077..0234e47bb 100644
--- 
a/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java
+++ 
b/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java
@@ -480,12 +480,12 @@ public class RangerCommonEnums {
         */
        public static final int USER_APP = 0;
        public static final int USER_EXTERNAL = 1;
-       public static final int USER_FEDERATED= 2;
-       public static final int USER_AD= 3;
-       public static final int USER_LDAP = 4;
-       public static final int USER_UNIX = 5;
-       public static final int USER_REPO = 6;
-       
+       public static final int USER_AD = 2;
+       public static final int USER_LDAP = 3;
+       public static final int USER_UNIX = 4;
+       public static final int USER_REPO = 5;
+       public static final int USER_FEDERATED = 6;
+
        public static final int GROUP_INTERNAL = 0;
        public static final int GROUP_EXTERNAL = 1;
        public static final int GROUP_AD= 2;
diff --git a/security-admin/src/main/webapp/react-webapp/src/utils/XAEnums.js 
b/security-admin/src/main/webapp/react-webapp/src/utils/XAEnums.js
index 7b75c7669..b8e231e15 100644
--- a/security-admin/src/main/webapp/react-webapp/src/utils/XAEnums.js
+++ b/security-admin/src/main/webapp/react-webapp/src/utils/XAEnums.js
@@ -69,7 +69,7 @@ export const UserTypes = {
     variant: "warning"
   },
   USER_FEDERATED: {
-    value: 2,
+    value: 6,
     label: "Federated",
     variant: "secondary"
   }
diff --git a/security-admin/src/main/webapp/scripts/utils/XAEnums.js 
b/security-admin/src/main/webapp/scripts/utils/XAEnums.js
index 9041908c6..f81fa1619 100644
--- a/security-admin/src/main/webapp/scripts/utils/XAEnums.js
+++ b/security-admin/src/main/webapp/scripts/utils/XAEnums.js
@@ -64,7 +64,8 @@ define(function(require) {
        
        XAEnums.UserTypes = mergeParams(XAEnums.UserTypes, {
                USER_INTERNAL:{value:0, label:'Internal', 
rbkey:'xa.enum.AccessResult.ACCESS_RESULT_ALLOWED', tt: 
'lbl.AccessResult_ACCESS_RESULT_ALLOWED'},
-               USER_EXTERNAL:{value:1, label:'External', 
rbkey:'xa.enum.AccessResult.ACCESS_RESULT_DENIED', tt: 
'lbl.AccessResult_ACCESS_RESULT_DENIED'}
+               USER_EXTERNAL:{value:1, label:'External', 
rbkey:'xa.enum.AccessResult.ACCESS_RESULT_DENIED', tt: 
'lbl.AccessResult_ACCESS_RESULT_DENIED'},
+               USER_FEDERATED:{value:6, label:'Federated', 
rbkey:'xa.enum.AccessResult.ACCESS_RESULT_DENIED', tt: 
'lbl.AccessResult_ACCESS_RESULT_DENIED'}
        });
        
        XAEnums.GroupTypes = mergeParams(XAEnums.GroupTypes, {