You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2020/07/27 23:22:04 UTC

[trafficcontrol] branch master updated: Bugfix Traffic Portal UI (#4917)

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

ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new 8e7c026  Bugfix Traffic Portal UI (#4917)
8e7c026 is described below

commit 8e7c0268ad5935e17c29a5f6537d86161911db7d
Author: rimashah25 <22...@users.noreply.github.com>
AuthorDate: Mon Jul 27 17:21:49 2020 -0600

    Bugfix Traffic Portal UI (#4917)
    
    * Updated .rst files related to xmppId. Also added hash Id field on traffic portal server summary page
    
    * Updated .rst files related to xmppId-1
    
    * Updated CHANGELOG.md
    
    * updated field hash id based on PR comment
    
    * Exposing https port for CIAB-TP
    
    * updated adminPassword for TP-Config
    
    * Reverting changes in TP/config.js
---
 infrastructure/cdn-in-a-box/traffic_portal/Dockerfile                   | 2 ++
 .../app/src/common/modules/table/servers/TableServersController.js      | 2 +-
 traffic_portal/test/end_to_end/conf.json                                | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/infrastructure/cdn-in-a-box/traffic_portal/Dockerfile b/infrastructure/cdn-in-a-box/traffic_portal/Dockerfile
index 024b1bc..4034214 100644
--- a/infrastructure/cdn-in-a-box/traffic_portal/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_portal/Dockerfile
@@ -50,4 +50,6 @@ ADD enroller/server_template.json \
     traffic_portal/run.sh \
     traffic_ops/to-access.sh /
 
+EXPOSE 443
+
 CMD /run.sh
diff --git a/traffic_portal/app/src/common/modules/table/servers/TableServersController.js b/traffic_portal/app/src/common/modules/table/servers/TableServersController.js
index bc5154e..707d38f 100644
--- a/traffic_portal/app/src/common/modules/table/servers/TableServersController.js
+++ b/traffic_portal/app/src/common/modules/table/servers/TableServersController.js
@@ -96,7 +96,7 @@ var TableServersController = function(servers, $scope, $state, $uibModal, $windo
 		{
 			headerName: "Hash ID",
 			field: "xmppId",
-			hide: false
+			hide: true
 		},
 		{
 			headerName: "ID",
diff --git a/traffic_portal/test/end_to_end/conf.json b/traffic_portal/test/end_to_end/conf.json
index d381df0..aa1ecb6 100644
--- a/traffic_portal/test/end_to_end/conf.json
+++ b/traffic_portal/test/end_to_end/conf.json
@@ -10,7 +10,7 @@
     "defaultTimeoutInterval": 600000
   },
   "params": {
-    "adminPassword": "twelve",
+    "adminPassword": "twelve12",
     "adminUser": "admin"
   },
   "seleniumAddress": "http://localhost:4444/wd/hub",