Portal GUI Stuck in "Loading..." Screen 33/103833/1
authorstatta <statta@research.att.com>
Wed, 18 Mar 2020 02:11:02 +0000 (22:11 -0400)
committerstatta <statta@research.att.com>
Wed, 18 Mar 2020 02:11:02 +0000 (22:11 -0400)
Issue-ID: PORTAL-857
Change-Id: I019fa686efa838e74b6accbf4602e70a0783b245
Signed-off-by: statta <statta@research.att.com>
deliveries/.env
ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java
portal-FE-os/src/index.html
version.properties

index 47a0924..614aeb0 100644 (file)
@@ -38,7 +38,7 @@ CLI_IMG_NAME=onap/cli
 
 # This is the first portion of the Docker image tag
 # that is published to the ONAP registry.
-PORTAL_VERSION=2.6.0
+PORTAL_VERSION=3.2.0
 
 # This is used during builds and in docker-compose;
 # it is never published to the ONAP registry.
index 4d3c82a..08b0da9 100644 (file)
@@ -68,7 +68,7 @@ public class ONAPWelcomeController extends EPRestrictedBaseController{
                return "/index";
     }
        
-       @RequestMapping(value = {"/applicationsHome", "/dashboard", "/widgetsHome", "/kpidash*", "/admins", "/users", "/portalAdmins", "/applications", "/widgets", "/functionalMenu", "/contactUs", "/getAccess","/appCatalog", "/widgetOnboarding", "/accountOnboarding"}, method = RequestMethod.GET)
+       @RequestMapping(value = {"/app/*","/applicationsHome", "/dashboard", "/widgetsHome", "/kpidash*", "/admins", "/users", "/portalAdmins", "/applications", "/widgets", "/functionalMenu", "/contactUs", "/getAccess","/appCatalog", "/widgetOnboarding", "/accountOnboarding"}, method = RequestMethod.GET)
     public String getEcompSinglePage(HttpServletRequest request, HttpServletResponse response) {
                return "forward:/index.html";
     }
index 5c8085f..e0dd76c 100644 (file)
           head.insertBefore(baseNode,head.childNodes[0] || null);
           window.base = base;
         }
-        if (window.location.href.includes('webtest.csp.att.com') || window.location.href.includes('www.e-access.att.com') || window.location.href.includes('ecomp.e-access.att.com')) {
-          //change to webjuction context
-          var base = window.location.pathname.substring(0, nthIndex(window.location.pathname, "/", 3) + 1);
-          //document.write("<base href='/ecompportal/ecompportal/' />");
+       
+          var base = window.location.pathname.substring(0, nthIndex(window.location.pathname,"/", 2) + 1);
           addBaseHref(base);
 
-        } else {
-          //not webjunction
-          var base = window.location.pathname.substring(0, nthIndex(window.location.pathname,"/", 1) + 1);
-          //document.write("<base href='/ecompportal/' />");
-          addBaseHref(base);
-
-        }
+        
       </script>
   <meta charset="utf-8">
   <title>ONAP Portal</title>
-  <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <link rel="stylesheet" href="styles.19ce2a92d11ceb6c5db4.css">
 </head>
 <body>
   <app-root>Loading...</app-root>
index 756f8a3..f34034b 100644 (file)
@@ -2,8 +2,8 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major=2
-minor=5
+major=3
+minor=2
 patch=0
 
 base_version=${major}.${minor}.${patch}