diff options
| author |   Lorraine Welch <lb2391@att.com> | 2020-03-18 12:26:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-03-18 12:26:24 +0000 |
| commit | 6682b263f1a9a55fa9158eb8ef980930e845116d (patch) | |
| tree | 219ffeac8a697db1e7d9dc162dd4666e89800758 | |
| parent | 50e04faa5c8e259d9967637df4281a4ee3053c4d (diff) | |
| parent | f629d7d8521e3714d0a9177e1f8b92aa066e5d46 (diff) | |
Merge "Portal GUI Stuck in "Loading..." Screen"
| -rw-r--r-- | deliveries/.env | 2 | ||||
| -rw-r--r-- | ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java | 2 | ||||
| -rw-r--r-- | portal-FE-os/src/index.html | 16 | ||||
| -rw-r--r-- | version.properties | 4 |
4 files changed, 7 insertions, 17 deletions
diff --git a/deliveries/.env b/deliveries/.env index 47a0924f..614aeb0c 100644 --- a/deliveries/.env +++ b/deliveries/.env @@ -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. diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java index 4d3c82a2..08b0da9b 100644 --- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java +++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java @@ -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"; } diff --git a/portal-FE-os/src/index.html b/portal-FE-os/src/index.html index 5c8085ff..e0dd76c1 100644 --- a/portal-FE-os/src/index.html +++ b/portal-FE-os/src/index.html @@ -58,27 +58,17 @@ 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> diff --git a/version.properties b/version.properties index 756f8a39..f34034bc 100644 --- a/version.properties +++ b/version.properties @@ -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} |