Fix For ONOS-4657
(moved declaration of search fields to be consistent with flow.html)
Change-Id: I2ac62384ee677bb7fcc4ea6d8edfbb0465eb299b
diff --git a/web/gui/src/main/webapp/app/view/group/group.html b/web/gui/src/main/webapp/app/view/group/group.html
index 329b3e1..a09dd18 100644
--- a/web/gui/src/main/webapp/app/view/group/group.html
+++ b/web/gui/src/main/webapp/app/view/group/group.html
@@ -5,6 +5,7 @@
Groups for Device {{devId || "(No device selected)"}}
({{tableData.length}} total)
</h2>
+
<div class="ctrl-btns">
<div class="refresh" ng-class="{active: autoRefresh}"
icon icon-size="42" icon-id="refresh"
@@ -52,6 +53,18 @@
tooltip tt-msg="meterTip"
ng-click="nav('meter')"></div>
</div>
+
+ <div class="search">
+ <input type="text" ng-model="query" placeholder="Search"/>
+ <select ng-model="queryBy">
+ <option value="" disabled>Search By</option>
+ <option value="$">All Fields</option>
+ <option value="id">Group ID</option>
+ <option value="app_id">App ID</option>
+ <option value="state">State</option>
+ <option value="type">Type</option>
+ </select>
+ </div>
</div>
<div class="summary-list" onos-table-resize>
@@ -76,7 +89,7 @@
</td>
</tr>
- <tr ng-repeat-start="group in tableData track by $index"
+ <tr ng-repeat-start="group in tableData | filter:queryFilter track by $index"
ng-repeat-complete row-id="{{group.id}}">
<td>{{group.id}}</td>
<td>{{group.app_id}}</td>
diff --git a/web/gui/src/main/webapp/app/view/group/group.js b/web/gui/src/main/webapp/app/view/group/group.js
index f9c6cd7..50a97c5 100644
--- a/web/gui/src/main/webapp/app/view/group/group.js
+++ b/web/gui/src/main/webapp/app/view/group/group.js
@@ -72,6 +72,15 @@
$scope.brief = !$scope.brief;
};
+ Object.defineProperty($scope, "queryFilter", {
+ get: function() {
+ var out = {};
+ out[$scope.queryBy || "$"] = $scope.query;
+ return out;
+ }
+ });
+
+
$log.log('OvGroupCtrl has been created');
}]);
}());
diff --git a/web/gui/src/main/webapp/app/view/meter/meter.html b/web/gui/src/main/webapp/app/view/meter/meter.html
index 2dc4f04..cd83392 100644
--- a/web/gui/src/main/webapp/app/view/meter/meter.html
+++ b/web/gui/src/main/webapp/app/view/meter/meter.html
@@ -5,6 +5,7 @@
Meters for Device {{devId || "(No device selected)"}}
({{tableData.length}} total)
</h2>
+
<div class="ctrl-btns">
<div class="refresh" ng-class="{active: autoRefresh}"
icon icon-size="42" icon-id="refresh"
@@ -36,6 +37,18 @@
<div class="current-view"
icon icon-id="meterTable" icon-size="42"></div>
</div>
+
+ <div class="search">
+ <input type="text" ng-model="query" placeholder="Search"/>
+ <select ng-model="queryBy">
+ <option value="" disabled>Search By</option>
+ <option value="$">All Fields</option>
+ <option value="id">Meter ID</option>
+ <option value="app_id">App ID</option>
+ <option value="state">State</option>
+ </select>
+ </div>
+
</div>
<div class="summary-list" onos-table-resize>
@@ -59,7 +72,7 @@
</td>
</tr>
- <tr ng-repeat-start="meter in tableData track by $index"
+ <tr ng-repeat-start="meter in tableData | filter:queryFilter track by $index"
ng-repeat-complete row-id="{{meter.id}}">
<td>{{meter.id}}</td>
<td>{{meter.app_id}}</td>
@@ -76,4 +89,4 @@
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/web/gui/src/main/webapp/app/view/meter/meter.js b/web/gui/src/main/webapp/app/view/meter/meter.js
index 35a2e14..0635650 100644
--- a/web/gui/src/main/webapp/app/view/meter/meter.js
+++ b/web/gui/src/main/webapp/app/view/meter/meter.js
@@ -66,6 +66,15 @@
}
};
+ Object.defineProperty($scope, "queryFilter", {
+ get: function() {
+ var out = {};
+ out[$scope.queryBy || "$"] = $scope.query;
+ return out;
+ }
+ });
+
+
$log.log('OvMeterCtrl has been created');
}]);
-}());
\ No newline at end of file
+}());
diff --git a/web/gui/src/main/webapp/app/view/port/port.html b/web/gui/src/main/webapp/app/view/port/port.html
index c40e532..8408718 100644
--- a/web/gui/src/main/webapp/app/view/port/port.html
+++ b/web/gui/src/main/webapp/app/view/port/port.html
@@ -5,6 +5,7 @@
Ports for Device {{devId || "(No device selected)"}}
({{tableData.length}} Ports total)
</h2>
+
<div class="ctrl-btns">
<div class="refresh" ng-class="{active: autoRefresh}"
icon icon-size="42" icon-id="refresh"
@@ -36,6 +37,22 @@
tooltip tt-msg="meterTip"
ng-click="nav('meter')"></div>
</div>
+
+ <div class="search">
+ <input type="text" ng-model="query" placeholder="Search"/>
+ <select ng-model="queryBy">
+ <option value="" disabled>Search By</option>
+ <option value="$">All Fields</option>
+ <option value="id">Port ID </option>
+ <option value="pkt_rx">Pkts Received</option>
+ <option value="pkt_tx">Pkts Sent</option>
+ <option value="bytes_rx">Bytes Received</option>
+ <option value="bytes_tx">Bytes Sent</option>
+ <option value="pkt_rx_drp">Pkts RX Dropped</option>
+ <option value="pkt_rx_drp">Pkts TX Dropped</option>
+ <option value="duration">Duration (sec) </option>
+ </select>
+ </div>
</div>
<div class="summary-list" onos-table-resize>
@@ -47,8 +64,8 @@
<td class="right" colId="pkt_tx" sortable>Pkts Sent </td>
<td class="right" colId="bytes_rx" sortable>Bytes Received </td>
<td class="right" colId="bytes_tx" sortable>Bytes Sent </td>
- <td class="right" colId="pkt_rx_drp" sortable>Pkts Received Dropped </td>
- <td class="right" colId="pkt_tx_drp" sortable>Pkts Sent Dropped </td>
+ <td class="right" colId="pkt_rx_drp" sortable>Pkts RX Dropped </td>
+ <td class="right" colId="pkt_tx_drp" sortable>Pkts TX Dropped </td>
<td class="right" colId="duration" sortable>Duration (sec) </td>
</tr>
</table>
@@ -62,7 +79,7 @@
</td>
</tr>
- <tr ng-repeat="port in tableData track by $index"
+ <tr ng-repeat="port in tableData | filter:queryFilter track by $index"
ng-repeat-complete row-id="{{port.id}}">
<td>{{port.id}}</td>
<td class="right">{{port.pkt_rx}}</td>
diff --git a/web/gui/src/main/webapp/app/view/port/port.js b/web/gui/src/main/webapp/app/view/port/port.js
index 14f1b5a..98a0cfb 100644
--- a/web/gui/src/main/webapp/app/view/port/port.js
+++ b/web/gui/src/main/webapp/app/view/port/port.js
@@ -59,6 +59,14 @@
}
};
+ Object.defineProperty($scope, "queryFilter", {
+ get: function() {
+ var out = {};
+ out[$scope.queryBy || "$"] = $scope.query;
+ return out;
+ }
+ });
+
$log.log('OvPortCtrl has been created');
}]);
}());