summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstatta <statta@research.att.com>2020-03-17 22:11:02 -0400
committerstatta <statta@research.att.com>2020-03-17 22:11:02 -0400
commitf629d7d8521e3714d0a9177e1f8b92aa066e5d46 (patch)
tree133439f2b9e155476374274242806515bcde3185
parenteda60ff2bff74588c0c9369b29d98ff3625ccbc4 (diff)
Portal GUI Stuck in "Loading..." Screen
Issue-ID: PORTAL-857 Change-Id: I019fa686efa838e74b6accbf4602e70a0783b245 Signed-off-by: statta <statta@research.att.com>
-rw-r--r--deliveries/.env2
-rw-r--r--ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java2
-rw-r--r--portal-FE-os/src/index.html16
-rw-r--r--version.properties4
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}