Change the serviceTypeCode for serviceTypeName of the URL

web/src/main/webapp/scripts/directives/agentList.js

@@ -87,7 +87,7 @@ pinpointApp.directive('agentList', [ 'agentListConfig', '$rootScope', function (
              */
             scope.$on('agentList.initialize', function (event, navbarVo) {
                 oNavbarVo = navbarVo;
-                showAgentGroup(oNavbarVo.getApplicationName(), oNavbarVo.getServiceTypeCode(), oNavbarVo.getQueryStartTime(), oNavbarVo.getQueryEndTime(), oNavbarVo.getAgentId());
+                showAgentGroup(oNavbarVo.getApplicationName(), oNavbarVo.getServiceTypeName(), oNavbarVo.getQueryStartTime(), oNavbarVo.getQueryEndTime(), oNavbarVo.getAgentId());
             });
         }
     };

web/src/main/webapp/scripts/directives/serverMap.js

@@ -136,7 +136,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts'
                  * @param linkRouting
                  * @param linkCurve
                  */
-                showServerMap = function (applicationName, serviceTypeCode, to, period, filterText, hintText, linkRouting, linkCurve) {
+                showServerMap = function (applicationName, serviceTypeName, to, period, filterText, hintText, linkRouting, linkCurve) {
                     oProgressBar.startLoading();
                     oAlert.hideError();
                     oAlert.hideWarning();
@@ -148,7 +148,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts'
 
                     htLastQuery = {
                         applicationName: applicationName,
-                        serviceTypeCode: serviceTypeCode,
+                        serviceTypeName: serviceTypeName,
                         from: to - period,
                         to: to,
                         originTo: scope.oNavbarVo.getQueryEndTime(),
@@ -710,14 +710,14 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts'
                     scope.bShowServerMapStatus = true;
                     bUseLinkContextMenu = bUseBackgroundContextMenu = true;
                     bUseNodeContextMenu = false;
-                    showServerMap(navbarVo.getApplicationName(), navbarVo.getServiceTypeCode(), navbarVo.getQueryEndTime(), navbarVo.getQueryPeriod(), navbarVo.getFilter(), navbarVo.getHint(), scope.linkRouting, scope.linkCurve);
+                    showServerMap(navbarVo.getApplicationName(), navbarVo.getServiceTypeName(), navbarVo.getQueryEndTime(), navbarVo.getQueryPeriod(), navbarVo.getFilter(), navbarVo.getHint(), scope.linkRouting, scope.linkCurve);
                 });
 
                 /**
                  * scope event on serverMap.fetch
                  */
                 scope.$on('serverMap.fetch', function (event, queryPeriod, queryEndTime) {
-                    showServerMap(scope.oNavbarVo.getApplicationName(), scope.oNavbarVo.getServiceTypeCode(), queryEndTime, queryPeriod, scope.oNavbarVo.getFilter(), scope.oNavbarVo.getHint(), scope.linkRouting, scope.linkCurve);
+                    showServerMap(scope.oNavbarVo.getApplicationName(), scope.oNavbarVo.getServiceTypeName(), queryEndTime, queryPeriod, scope.oNavbarVo.getFilter(), scope.oNavbarVo.getHint(), scope.linkRouting, scope.linkCurve);
                 });
 
                 /**

web/src/main/webapp/scripts/services/NavbarVo.js

@@ -58,7 +58,7 @@ pinpointApp.factory('NavbarVo', function () {
             return self._sApplication.split('@')[0];
         };
 
-        this.getServiceTypeCode = function () {
+        this.getServiceTypeName = function () {
             return self._sApplication.split('@')[1];
         };
 

web/src/main/webapp/scripts/services/ServerMapDao.js

@@ -28,7 +28,7 @@ pinpointApp.service('ServerMapDao', [ 'serverMapDaoConfig', function ServerMapDa
             dataType: 'json',
             data: {
                 applicationName: query.applicationName,
-                serviceTypeCode: query.serviceTypeCode,
+                serviceTypeName: query.serviceTypeName,
                 from: query.from,
                 to: query.to
             },
@@ -53,7 +53,7 @@ pinpointApp.service('ServerMapDao', [ 'serverMapDaoConfig', function ServerMapDa
     this.getFilteredServerMapData = function (query, cb) {
         var data = {
             applicationName: query.applicationName,
-            serviceTypeCode: query.serviceTypeCode,
+            serviceTypeName: query.serviceTypeName,
             from: query.from,
             to: query.to,
             originTo: query.originTo,

web/src/main/webapp/views/linkInfoDetails.html

@@ -82,7 +82,7 @@
                 <li ng-repeat="(name, histogram) in sourceHistogram" ng-init="linkInstanceShow[name]=false">
                     <span class="glyphicon glyphicon-hdd"></span>
                     {{name}}
-                    <a class="btn btn-default btn-xs" ng-show-debug="instance.hasInspector" ng-href="#/inspector/{{fromNode.applicationName}}@{{fromNode.serviceTypeCode}}/{{oNavbarVo.getReadablePeriod()}}/{{oNavbarVo.getQueryEndDateTime()}}/{{name}}" link="_blank" title="Inspect Agents" alt="Inspect Agents">Inspector</a>
+                    <a class="btn btn-default btn-xs" ng-show-debug="instance.hasInspector" ng-href="#/inspector/{{fromNode.applicationName}}@{{fromNode.serviceType}}/{{oNavbarVo.getReadablePeriod()}}/{{oNavbarVo.getQueryEndDateTime()}}/{{name}}" link="_blank" title="Inspect Agents" alt="Inspect Agents">Inspector</a>
                     <button type="button" class="btn btn-xs" ng-click="linkInstanceShow[name]=!linkInstanceShow[name];renderLinkAgentCharts(name);"
                             ng-class="{true:'btn-danger', false:'btn-default'}[histogram.Error > 0]">
                         <span class="glyphicon" ng-class="{true:'glyphicon-minus',false:'glyphicon-plus'}[linkInstanceShow[name]==true]"></span>

web/src/main/webapp/views/navbar.html

@@ -8,7 +8,7 @@
                     <li style="margin-top:0px;">
                         <div ng-hide="showStaticApplication" style="margin-top:5px;" id="navbar_application">
                             <select class="application" ng-disabled="disableApplication" id="navbar_application">
-                                <option ng-repeat="app in applications" value="{{app.value}}">{{app.text}}</option>
+                                <option ng-repeat="app in applications" value="{{app.text}}">{{app.text}}</option>
                             </select>
                             <img ng-hide="hideFakeApplication" src="images/navbar_application_fake.png" style="position:absolute;left:0;top:5px;">
                         </div>

web/src/main/webapp/views/nodeInfoDetails.html

@@ -81,7 +81,7 @@
                         <li ng-repeat="instance in server.instanceList" ng-init="instance.showChart=false">
                             <span class="glyphicon glyphicon-hdd"></span>
                             {{instance.name}}
-                            <a class="btn btn-default btn-xs" ng-show="instance.hasInspector" ng-href="#/inspector/{{node.applicationName}}@{{node.serviceTypeCode}}/{{oNavbarVo.getReadablePeriod()}}/{{oNavbarVo.getQueryEndDateTime()}}/{{instance.name}}" target="_blank" title="Inspect Agents" alt="Inspect Agents">Inspector</a>
+                            <a class="btn btn-default btn-xs" ng-show="instance.hasInspector" ng-href="#/inspector/{{node.applicationName}}@{{node.serviceType}}/{{oNavbarVo.getReadablePeriod()}}/{{oNavbarVo.getQueryEndDateTime()}}/{{instance.name}}" target="_blank" title="Inspect Agents" alt="Inspect Agents">Inspector</a>
                             <button type="button" class="btn btn-xs" ng-click="instance.showChart=!instance.showChart;renderNodeAgentCharts(instance.name);"
                                     ng-show="agentHistogram[instance.name]" ng-class="{true:'btn-danger', false:'btn-default'}[agentHistogram[instance.name].Error > 0]">
                                 <span class="glyphicon" ng-class="{true:'glyphicon-minus',false:'glyphicon-plus'}[instance.showChart==true]"></span>