RANGER-4138 Build ranger-react UI and backbone UI code base in webapp

Signed-off-by: Madhan Neethiraj <[email protected]>
apache · Oct 27, 2023 · 7a22b82 · 7a22b82
1 parent de049b9
commit 7a22b82
Show file tree

Hide file tree

Showing 6 changed files with 439 additions and 680 deletions.
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
diff --git a/security-admin/src/main/webapp/index.html → ...admin/src/main/webapp/backbone-index.html b/security-admin/src/main/webapp/index.html → ...admin/src/main/webapp/backbone-index.html
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/Header.jsx b/security-admin/src/main/webapp/react-webapp/src/views/Header.jsx
@@ -41,7 +41,8 @@ class Header extends Component {
 
   render() {
     const userProps = getUserProfile();
-    const apiUrl = getBaseUrl() + "apidocs/index.html";
+    const apiUrl = getBaseUrl() + "apidocs/swagger.html";
+    const backboneUrl = getBaseUrl() + "backbone-index.html";
     const loginId = (
       <span className="login-id">
         <i className="fa fa-user-circle fa-lg"></i>
@@ -118,7 +119,6 @@ class Header extends Component {
                   Audit
                 </Nav.Link>
               )}
-
               {hasAccessToTab("Security Zone") && (
                 <React.Fragment>
                   {!isKeyAdmin() && (
@@ -150,7 +150,7 @@ class Header extends Component {
                   )}
                 </React.Fragment>
               )}
-              <>
+              <React.Fragment>
                 {(hasAccessToTab("Users/Groups") ||
                   isAuditor() ||
                   isSystemAdmin()) && (
@@ -173,7 +173,7 @@ class Header extends Component {
                     )}
                   </NavDropdown>
                 )}
-              </>
+              </React.Fragment>
             </Nav>
             <Nav>
               <NavDropdown title={loginId} id="user-dropdown" alignRight>
@@ -184,6 +184,9 @@ class Header extends Component {
                 >
                   <i className="fa fa-user"></i> Profile
                 </NavDropdown.Item>
+                <a class="dropdown-item" href={backboneUrl}>
+                  <i className="fa fa fa-sign-out"></i> Backbone UI
+                </a>
                 <a className="dropdown-item" href={apiUrl} target="_blank">
                   <i className="fa fa-user"></i> API Documentation
                 </a>

diff --git a/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBarBody.jsx b/security-admin/src/main/webapp/react-webapp/src/views/SideBar/SideBarBody.jsx
@@ -607,9 +607,17 @@ export const SideBarBody = (props) => {
                   Profile
                 </NavLink>
               </li>
-              {/* <li className="list-group-item">
-                <a href={backboneUrl}>Backbone Classic UI</a>
-              </li> */}
+              <li className="list-group-item">
+                <a
+                  href={backboneUrl}
+                  onClick={() => {
+                    props.closeCollapse();
+                    localStorage.clear();
+                  }}
+                >
+                  Backbone Classic UI
+                </a>
+              </li>
               <li className="list-group-item">
                 <a
                   href={apiUrl}

diff --git a/security-admin/src/main/webapp/scripts/views/common/ProfileBar.js b/security-admin/src/main/webapp/scripts/views/common/ProfileBar.js
@@ -44,7 +44,8 @@ define(function(require){
     		return {
     			userProfile : this.userProfile,
     			oldUi : localStorage.getItem('setOldUI') == "true" ? false : true ,
-				swaggerUI : urlString+"/apidocs/swagger.html"
+				swaggerUI : urlString+"/apidocs/swagger.html",
+				reactUI : urlString+"/index.html"
     		};
     	},
 

diff --git a/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html b/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html
@@ -22,16 +22,17 @@
             </a>
             <div class="dropdown-menu dropdown-menu-right">
                 <a class="dropdown-item" href="#!/userprofile"><i class="fa fa-user m-r-xs"></i> Profile </a>
+                <a class="dropdown-item" href={{reactUI}}><i class="fa fa-sign-out m-r-xs"></i> React UI </a>
                 <a class="dropdown-item" href={{swaggerUI}} target='_blank'><i class="fa fa-user m-r-xs"></i> API Documentation </a>
-                <a class="dropdown-item" href="javascript:;" class="_allowNav" data-id="logout"><i class="fa fa-power-off m-r-xs"></i> Log Out </a>
                 {{#if oldUi}}
                     <a class="dropdown-item" href="javascript:;" data-id="oldNewSwitch" data-value="true">
                       <i class="fa fa-sign-out m-r-xs"></i> Switch to classic UI </a>
                 {{else}}
                     <a class="dropdown-item" href="javascript:;" data-id="oldNewSwitch" data-value="false">
                       <i class="fa fa-sign-out m-r-xs"></i> Switch to latest UI </a>
                 {{/if}}
+                <a class="dropdown-item" href="javascript:;" class="_allowNav" data-id="logout"><i class="fa fa-power-off m-r-xs"></i> Log Out </a>
             </div>
         </li>
     </ul>
-</div>
+</div>