[임대현] #186 unknown group info에 filter wizard 아이콘 추가.

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@4104 84d0f5b1-2673-498c-a247-62c4ff18d310

src/main/webapp/scripts/controllers/filteredMap.js

@@ -250,6 +250,13 @@ pinpointApp.controller('FilteredMapCtrl', [ 'filterConfig', '$scope', '$routePar
             openFilteredMapWithFilterVo(oServerMapFilterVo, filterTargetRpcList);
         });
 
+        /**
+         * scope event on linkInfoDetails.openFilterWizard
+         */
+        $scope.$on('linkInfoDetails.openFilterWizard', function (event, oServerMapFilterVo, oServerMapHintVo) {
+            $scope.$broadcast('serverMap.openFilterWizard', oServerMapFilterVo, oServerMapHintVo);
+        });
+
         /**
          * scope event on linkInfoDetails.ResponseSummary.barClicked
          */

src/main/webapp/scripts/controllers/main.js

@@ -222,11 +222,18 @@ pinpointApp.controller('MainCtrl', [ 'filterConfig', '$scope', '$timeout', '$rou
             openFilteredMapWithFilterVo(oServerMapFilterVo, oServerMapHintVo);
         });
 
+        /**
+         * scope event on linkInfoDetails.openFilterWizard
+         */
+        $scope.$on('linkInfoDetails.openFilterWizard', function (event, oServerMapFilterVo, oServerMapHintVo) {
+            $scope.$broadcast('serverMap.openFilterWizard', oServerMapFilterVo, oServerMapHintVo);
+        });
+
         /**
          * scope event on linkInfoDetails.ResponseSummary.barClicked
          */
-        $scope.$on('linkInfoDetails.ResponseSummary.barClicked', function (event, oServerMapFilterVo, oServerMapHintVo) {
-            openFilteredMapWithFilterVo(oServerMapFilterVo, oServerMapHintVo);
+        $scope.$on('linkInfoDetails.ResponseSummary.barClicked', function (event, link) {
+            openFilteredMapWithFilterVo(link);
         });
 
         /**

src/main/webapp/scripts/directives/linkInfoDetails.js

@@ -415,6 +415,15 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', 'HelixChartV
                     scope.$broadcast('linkInfoDetails.openFilteredMap', oServerMapFilterVo, oServerMapHintVo);
                 };
 
+                /**
+                 * open filter wizard
+                 * @param index
+                 */
+                scope.openFilterWizard = function (index) {
+                    var link = htLastLink.unknownLinkGroup[index];
+                    scope.$broadcast('linkInfoDetails.openFilterWizard', link);
+                };
+
                 /**
                  * render link agent charts
                  * @param applicationName

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

@@ -47,7 +47,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts'
                 // define private variables of methods
                 var showServerMap, setNodeContextMenuPosition, reset, emitDataExisting,
                     setLinkContextMenuPosition, setBackgroundContextMenuPosition, serverMapCallback, setLinkOption,
-                    zoomToFit, updateLastSelection;
+                    zoomToFit, updateLastSelection, openFilterWizard;
 
 
                 // bootstrap
@@ -409,41 +409,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts'
                     });
                 };
 
-                /**
-                 * scope passing transaction response to scatter chart
-                 */
-                scope.passingTransactionResponseToScatterChart = function () {
-                    scope.$emit('serverMap.passingTransactionResponseToScatterChart', htLastNode);
-                    reset();
-                };
-
-                /**
-                 * passing transaction list
-                 */
-                scope.passingTransactionList = function () {
-                    var oServerMapFilterVo = new ServerMapFilterVo();
-
-                    oServerMapFilterVo
-                        .setMainApplication(htLastLink.filterApplicationName)
-                        .setMainServiceTypeCode(htLastLink.filterApplicationServiceTypeCode)
-                        .setFromApplication(htLastLink.fromNode.applicationName)
-                        .setFromServiceType(htLastLink.fromNode.serviceType)
-                        .setToApplication(htLastLink.toNode.applicationName)
-                        .setToServiceType(htLastLink.toNode.serviceType);
-
-                    var oServerMapHintVo = new ServerMapHintVo();
-                    if (htLastLink.sourceInfo.isWas && htLastLink.targetInfo.isWas) {
-                        oServerMapHintVo.setHint(htLastLink.toNode.applicationName, htLastLink.filterTargetRpcList)
-                    }
-
-                    scope.$broadcast('serverMap.openFilteredMap', oServerMapFilterVo, oServerMapHintVo);
-                    reset();
-                };
-
-                /**
-                 * open filter wizard
-                 */
-                scope.openFilterWizard = function () {
+                openFilterWizard = function () {
                     reset();
                     var oSidebarTitleVo = new SidebarTitleVo;
 
@@ -508,13 +474,51 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts'
                                     };
                                 }
                                 if (!scope.$$phase) {
-                                     scope.$digest();
+                                    scope.$digest();
                                 }
 
                             });
                     }
                 };
 
+                /**
+                 * scope passing transaction response to scatter chart
+                 */
+                scope.passingTransactionResponseToScatterChart = function () {
+                    scope.$emit('serverMap.passingTransactionResponseToScatterChart', htLastNode);
+                    reset();
+                };
+
+                /**
+                 * passing transaction list
+                 */
+                scope.passingTransactionList = function () {
+                    var oServerMapFilterVo = new ServerMapFilterVo();
+
+                    oServerMapFilterVo
+                        .setMainApplication(htLastLink.filterApplicationName)
+                        .setMainServiceTypeCode(htLastLink.filterApplicationServiceTypeCode)
+                        .setFromApplication(htLastLink.fromNode.applicationName)
+                        .setFromServiceType(htLastLink.fromNode.serviceType)
+                        .setToApplication(htLastLink.toNode.applicationName)
+                        .setToServiceType(htLastLink.toNode.serviceType);
+
+                    var oServerMapHintVo = new ServerMapHintVo();
+                    if (htLastLink.sourceInfo.isWas && htLastLink.targetInfo.isWas) {
+                        oServerMapHintVo.setHint(htLastLink.toNode.applicationName, htLastLink.filterTargetRpcList)
+                    }
+
+                    scope.$broadcast('serverMap.openFilteredMap', oServerMapFilterVo, oServerMapHintVo);
+                    reset();
+                };
+
+                /**
+                 * open filter wizard
+                 */
+                scope.openFilterWizard = function () {
+                    openFilterWizard();
+                };
+
                 /**
                  * zoom to fit
                  */
@@ -677,6 +681,11 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts'
                 scope.$on('serverMap.zoomToFit', function (event) {
                     zoomToFit();
                 });
+
+                scope.$on('serverMap.openFilterWizard', function (event, link) {
+                    htLastLink = link;
+                    openFilterWizard();
+                });
             }
         };
     }]);

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

@@ -669,6 +669,8 @@ pinpointApp.service('ServerMapDao', [ 'serverMapDaoConfig', function ServerMapDa
     this.getUnknownLinkDataByUnknownLinkGroup = function (applicationMapData, unknownLinkGroup) {
         for (var k in unknownLinkGroup) {
             unknownLinkGroup[k] = self.getLinkDataByKey(applicationMapData, unknownLinkGroup[k].key);
+            unknownLinkGroup[k]['fromNode'] = self.getNodeDataByKey(applicationMapData, unknownLinkGroup[k].from);
+            unknownLinkGroup[k]['toNode'] = self.getNodeDataByKey(applicationMapData, unknownLinkGroup[k].to);
         }
 
         return unknownLinkGroup;

src/main/webapp/views/linkInfoDetails.html

@@ -38,23 +38,27 @@
 
 
 
-                    <a class="btn btn-default btn-xs" href title="Show Load" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 20px; right:5px;"
+                    <a class="btn btn-default btn-xs" href title="Show Load" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 20px; right:5px;color:#8a6d3b"
                        ng-click="showLinkResponseSummaryForUnknown=!showLinkResponseSummaryForUnknown;renderLinkLoad(link.targetInfo.applicationName, index)" ng-show="showLinkResponseSummaryForUnknown">
                         <span class="glyphicon glyphicon-stats"></span>
                     </a>
-                    <a class="btn btn-default btn-xs" href title="Show Response Summary" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 20px; right:5px;"
+                    <a class="btn btn-default btn-xs" href title="Show Response Summary" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 20px; right:5px;color:#8a6d3b"
                        ng-click="showLinkResponseSummaryForUnknown=!showLinkResponseSummaryForUnknown;renderLinkResponseSummary(link.targetInfo.applicationName, index)" ng-show="!showLinkResponseSummaryForUnknown">
                         <span class="glyphicon glyphicon-stats"></span>
                     </a>
 
                     <a class="btn btn-default btn-xs" href ng-click="showLinkDetailInformation(index)"
-                       title="Show Link Information" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 50px; right:5px;">
+                       title="Show Link Information" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 50px; right:5px;color:#31708f;">
                         <span class="glyphicon glyphicon-info-sign"></span>
                     </a>
-                    <a class="btn btn-default btn-xs" href title="Filter Transaction" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 80px; right:5px;"
+                    <a class="btn btn-default btn-xs" href title="Filter Transaction" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 80px; right:5px;color:#3c763d"
                        ng-click="passingTransactionMapFromLinkInfoDetails(index)">
                         <span class="glyphicon glyphicon-filter"></span>
                     </a>
+                    <a class="btn btn-default btn-xs" href title="Filter Transaction Wizard" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 110px; right:5px;color:#a94442;"
+                       ng-click="openFilterWizard(index)">
+                        <span class="glyphicon glyphicon-filter"></span>
+                    </a>
                 </div>
             </div>
         </div>

src/main/webapp/views/nodeInfoDetails.html

@@ -36,16 +36,16 @@
                         <load-chart namespace="forNode_{{node.applicationName | applicationNameToClassName}}"></load-chart>
                     </div>
 
-                    <a class="btn btn-default btn-xs" href title="Show Load" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 20px; right:5px;"
+                    <a class="btn btn-default btn-xs" href title="Show Load" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 20px; right:5px;color:#8a6d3b"
                        ng-click="showNodeResponseSummaryForUnknown=!showNodeResponseSummaryForUnknown;renderNodeLoad(node.applicationName, index)" ng-show="showNodeResponseSummaryForUnknown">
                         <span class="glyphicon glyphicon-stats"></span>
                     </a>
-                    <a class="btn btn-default btn-xs" href title="Show Response Summary" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 20px; right:5px;"
+                    <a class="btn btn-default btn-xs" href title="Show Response Summary" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 20px; right:5px;color:#8a6d3b"
                        ng-click="showNodeResponseSummaryForUnknown=!showNodeResponseSummaryForUnknown;renderNodeResponseSummary(node.applicationName, index)" ng-show="!showNodeResponseSummaryForUnknown">
                         <span class="glyphicon glyphicon-stats"></span>
                     </a>
                     <a class="btn btn-default btn-xs" href ng-click="showNodeDetailInformation(index)"
-                       title="Show Node Information" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 50px; right:5px;">
+                       title="Show Node Information" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 50px; right:5px;color:#31708f;">
                         <span class="glyphicon glyphicon-info-sign"></span>
                     </a>
                     <!--<a class="btn btn-default btn-xs" href title="Filter Transaction" data-toggle="tooltip" data-placement="left" style="position: absolute;top: 50px; right:5px;"-->